4385 files changed, 26992 insertions, 80143 deletions

diff --git a/dev-haskell/abstract-deque-tests/Manifest b/dev-haskell/abstract-deque-tests/Manifest
deleted file mode 100644
index 085d45549eef..000000000000
--- a/dev-haskell/abstract-deque-tests/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST abstract-deque-tests-0.3.tar.gz 11427 BLAKE2B 2a43e52bb0a5b7634f179e5857eb01d76429134345003fc2f3b14460363221940f8296ac3adc5f024e2578e684664092c2ec5c1b2eb45af378ec32011e1dca67 SHA512 0e7ecb27d156e91c156a81866a1854aabd0fa88b57598575fbacb578bbfa769ba4de699158e8e12a7d26afe583e2a397b871ac0c08819a5b63bef749f8c1c213
diff --git a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild b/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
deleted file mode 100644
index 395fef9d78f9..000000000000
--- a/dev-haskell/abstract-deque-tests/abstract-deque-tests-0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A test-suite for any queue or double-ended queue satisfying an interface"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/test-framework-0.6:=[profile?]
-	>=dev-haskell/test-framework-hunit-0.2.7:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/abstract-deque-tests/metadata.xml b/dev-haskell/abstract-deque-tests/metadata.xml
deleted file mode 100644
index a1162f03bb91..000000000000
--- a/dev-haskell/abstract-deque-tests/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides tests that can be used with any queue implementation
-		that satisfies the `abstract-deque` interface.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/abstract-deque/Manifest b/dev-haskell/abstract-deque/Manifest
index 27194190ad05..d92e3de5e1de 100644
--- a/dev-haskell/abstract-deque/Manifest
+++ b/dev-haskell/abstract-deque/Manifest
@@ -1,2 +1 @@
-DIST abstract-deque-0.2.2.tar.gz 15771 BLAKE2B 91979cf7d95ddb1fb349cf767806c81e46d8f8820ef8986efa3e77aa123d3f271865204ab7deb34b25be7c3fb20b942008671f9a880cfda339c8a7527ab3e75e SHA512 0a572a4943b90c7a99955f522b790c1ba3149f29ff072927d4f49013e174491a48312dcbbc45df271196d8f90725ea1b9ecc60ed218f71646bbb703555ded1b9
 DIST abstract-deque-0.3.tar.gz 7219 BLAKE2B 46bb9997b6ff7dc111bafb650feaf35fa2955d2b2db34dbb964c982a042967bec5994b43e333b2b248717f6e486347a202b3abc2c688e305e9fa683b3ef59df6 SHA512 9293a366918f54458ffe13f6737bab2bee961b730732eff563d900b451bf5f7dde30276c9406bfc5c0ea64104afb70db3588b13d478bf9c60842dad906195f7a
diff --git a/dev-haskell/abstract-deque/abstract-deque-0.2.2.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.2.2.ebuild
deleted file mode 100644
index 6403895eddf6..000000000000
--- a/dev-haskell/abstract-deque/abstract-deque-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstract, parameterized interface to mutable Deques"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree-queue/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="usecas"
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-haskell/test-framework-0.6:=[profile?]
-		>=dev-haskell/test-framework-hunit-0.2.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag usecas usecas)
-}
diff --git a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
index 5682b4832025..0a02da239316 100644
--- a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
+++ b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.4
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="usecas"
 
 RDEPEND="dev-haskell/random:=[profile?]
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
 "
 
+PATCHES=("${FILESDIR}"/${P}-atomic-primops.patch)
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag usecas usecas)
diff --git a/dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch b/dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch
new file mode 100644
index 000000000000..83d408fc7fe4
--- /dev/null
+++ b/dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/750206
+--- a/Data/Concurrent/Deque/Reference.hs
++++ b/Data/Concurrent/Deque/Reference.hs
+@@ -27,7 +27,7 @@ import Data.IORef
+ 
+ #ifdef USE_CAS
+ #warning "abstract-deque: reference implementation using CAS..."
+-import Data.CAS (atomicModifyIORefCAS)
++import Data.Atomics (atomicModifyIORefCAS)
+ -- Toggle these and compare performance:
+ modify = atomicModifyIORefCAS
+ _is_using_CAS = True
diff --git a/dev-haskell/abstract-deque/metadata.xml b/dev-haskell/abstract-deque/metadata.xml
index d611f698e043..12ebe3519664 100644
--- a/dev-haskell/abstract-deque/metadata.xml
+++ b/dev-haskell/abstract-deque/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild b/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
index 85415be3df23..d36aa894cbed 100644
--- a/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
+++ b/dev-haskell/abstract-par/abstract-par-0.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/abstract-par/metadata.xml b/dev-haskell/abstract-par/metadata.xml
index 0dd7f40405b4..8902881b1334 100644
--- a/dev-haskell/abstract-par/metadata.xml
+++ b/dev-haskell/abstract-par/metadata.xml
@@ -1,27 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The 'Par' monad(s) offer an alternative
-		parallel programming API to that provided by the
-		@parallel@ package.
-		A 'Par' monad allows the simple description of
-		parallel computations, and can be used to add
-		parallelism to pure Haskell code.  The basic API
-		is straightforward: a @Par@ monad supports forking
-		and simple communication in terms of 'IVar's.
-		This module is an interface module only. It
-		provides a number of type clasess, but not an
-		implementation.  The type classes separate different
-		levels of @Par@ functionality.  See the
-		"Control.Monad.Par.Class" module for more details.
-		The 'monad-par' library is one example of a
-		concrete library providing this interface.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">simonmar/monad-par</remote-id>
 	</upstream>
diff --git a/dev-haskell/ac-ppm/Manifest b/dev-haskell/ac-ppm/Manifest
deleted file mode 100644
index ad3ac868235e..000000000000
--- a/dev-haskell/ac-ppm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST AC-PPM-1.1.1.tar.gz 2958 BLAKE2B c2d5c96eebde31a45d8bd3c956687d01fc0c56906b841816bfcc80912831324fde0ccbb67f7aff99fc3efe4797fafcec554cd2599806168c9ea8c975d6f1eb0f SHA512 c296cb02fa9d70ca1f75bfdda8e307f66c800ac0e7b110bdd4af685c6acc506f3310456519d2445f850263baa22aa317266c68166bfcb551d297296d8c4de5ef
diff --git a/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild b/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild
deleted file mode 100644
index fb0afc8557c9..000000000000
--- a/dev-haskell/ac-ppm/ac-ppm-1.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="AC-PPM"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Trivial package for writing PPM images"
-HOMEPAGE="https://hackage.haskell.org/package/AC-PPM"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/ac-ppm/metadata.xml b/dev-haskell/ac-ppm/metadata.xml
deleted file mode 100644
index 435999615a27..000000000000
--- a/dev-haskell/ac-ppm/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package is written in 100% Haskell and enables you to
-		write PPM (\&quot;Portable Pixel Map\&quot;) images in human-readable
-		text format as well as the more efficient binary format.
-		It uses the ByteString library for maximum efficiency.
-		For those that don&#39;t know, PPM is an image file format
-		which is trivially simple, but therefore horribly inefficient.
-		None the less, many programs can read PPM files, so this
-		package represents an easy way to write Haskell code that
-		generates images, without having to depend on any external
-		C code.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/adjunctions/Manifest b/dev-haskell/adjunctions/Manifest
index e9bb05873ffb..5559da4b7fad 100644
--- a/dev-haskell/adjunctions/Manifest
+++ b/dev-haskell/adjunctions/Manifest
@@ -1,3 +1,2 @@
-DIST adjunctions-4.2.2.tar.gz 15442 BLAKE2B 8e8a7405aa4e2d0e17acae9c22220b9dea7b1cdf27aa7969143998c1f81710cc22e85d8f896b1c981e0b1d2557c2e84dff891c48fee1a7738020d1b34813a544 SHA512 039fd506839a1955d89e7c4ae3cb6c824e30a85b2f2e59de341b8b6f54bf2f363f047902a619dc35d6f86e5e71c1f1741181f1d2b86a233557d37b9f873cffdf
-DIST adjunctions-4.3.tar.gz 15651 BLAKE2B c63a84d01d50db942d6f6f58e8244322ee135eeee22f4816d01d7aeec314151a2f0a0fde2958d5c6707bfb59d008d5c6bdbab3a97da06ca442b12c76a538add8 SHA512 8045848e84627f4458b7784c5f50d81e6482daa9a9fea58eec32630cca825fc9a616474992b1ff74bb16f1ae4aeb464fa0ee1906d0e613f341138b39cda8ffa7
+DIST adjunctions-4.4.2.tar.gz 17201 BLAKE2B d9951182ba124a5de173dacbc9963f16fd540df5bbc3c6bdcef78d05e6e6d59f53ec102b045d02de7a3081d4ee01e5ed0daff50146341904a229271d5125ef22 SHA512 3785268bd3971f16dc0f2517556127590e8fb87f8e2cb8dfc74c356a8496ac1f2a46115097c4750d1d92eb21f25e0beec0a248d3442da2c8f6eb9da8cc4c51e3
 DIST adjunctions-4.4.tar.gz 19891 BLAKE2B 6057f990bbcea406e2c12253828c1defac8b7b1eeeff4b89054b528fcea94b80df9bc8672cfd13783aaab6864acc708d0c1428dd72800c695db5f29e7954a96e SHA512 30f4fb8a30d8428e032d322a9a627e7ebc44b2c737e87670907134a5aa6019145f2c3e6b2e7f8e00d5ffbe1ce4b4a5c812c3ee976257419d7d429b19db28918c
diff --git a/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild b/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
deleted file mode 100644
index ec4669ca9c0e..000000000000
--- a/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Adjunctions and representable functors"
-HOMEPAGE="https://github.com/ekmett/adjunctions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/adjunctions/adjunctions-4.3.ebuild b/dev-haskell/adjunctions/adjunctions-4.3.ebuild
deleted file mode 100644
index 7d6d1da0c844..000000000000
--- a/dev-haskell/adjunctions/adjunctions-4.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Adjunctions and representable functors"
-HOMEPAGE="https://github.com/ekmett/adjunctions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.5:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/adjunctions/adjunctions-4.4.2.ebuild b/dev-haskell/adjunctions/adjunctions-4.4.2.ebuild
new file mode 100644
index 000000000000..4c77a491faf4
--- /dev/null
+++ b/dev-haskell/adjunctions/adjunctions-4.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Adjunctions and representable functors"
+HOMEPAGE="https://github.com/ekmett/adjunctions/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
+	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/void-0.5.5.1:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+	)
+"
diff --git a/dev-haskell/adjunctions/adjunctions-4.4.ebuild b/dev-haskell/adjunctions/adjunctions-4.4.ebuild
index fb56b2288d83..95acfc45ad33 100644
--- a/dev-haskell/adjunctions/adjunctions-4.4.ebuild
+++ b/dev-haskell/adjunctions/adjunctions-4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.4.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
@@ -36,9 +36,6 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'containers          >= 0.3     && < 0.6' 'containers          >= 0.3'
-}
+CABAL_CHDEPS=(
+	'containers          >= 0.3     && < 0.6' 'containers          >= 0.3'
+)
diff --git a/dev-haskell/adjunctions/metadata.xml b/dev-haskell/adjunctions/metadata.xml
index ad9ebf4754f9..6f4d6e325a29 100644
--- a/dev-haskell/adjunctions/metadata.xml
+++ b/dev-haskell/adjunctions/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Adjunctions
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">adjunctions</remote-id>
 		<remote-id type="github">ekmett/adjunctions</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/aeson-compat/Manifest b/dev-haskell/aeson-compat/Manifest
deleted file mode 100644
index b9010739b38e..000000000000
--- a/dev-haskell/aeson-compat/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST aeson-compat-0.3.6.tar.gz 8956 BLAKE2B 82a201543c2719e2bffbca1682e4181980ea5a26b7f0df782b5a5db7f99cbd60c477988d011ef8149f9f93fe8740935ef1fd174881cff62431d830b82da08708 SHA512 2d2bd172a1335886894df73fbb999ce5b8ae5ff710866560278b4bcf27a5ef4a2ff025a0a97cc4f764e85819bf6a9771bdaf7acbd830f1baee5f3133ff5c185d
-DIST aeson-compat-0.3.9.tar.gz 7441 BLAKE2B c370023ca56ddcd1f60cd4ee57e29299178bb04f9fad274e3109424df926c357faeab4e22416938b71f5f3109cf90ed8b3282fe14250ac17c872ea887998a8bc SHA512 84da7cbace32527d0e20d32415ba770d14417ad4dd9ca0f86e8b5f100449af8a51a7b32c7dfdd7b3557764bd7dfc9ae4aa0a95999bc34b074f49d243a4f4bc46
diff --git a/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild b/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild
deleted file mode 100644
index 00a02581e95a..000000000000
--- a/dev-haskell/aeson-compat/aeson-compat-0.3.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility layer for aeson"
-HOMEPAGE="https://github.com/phadej/aeson-compat#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base-compat-0.6.0:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-orphans-0.4.5 <dev-haskell/base-orphans-0.6
-		>=dev-haskell/quickcheck-2.7.6
-		>=dev-haskell/quickcheck-instances-0.3 <dev-haskell/quickcheck-instances-0.3.13
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck            >=2.7.6 && <2.9.2' 'QuickCheck            >=2.7.6'
-}
diff --git a/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild b/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild
deleted file mode 100644
index afeccade5caf..000000000000
--- a/dev-haskell/aeson-compat/aeson-compat-0.3.9-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility layer for aeson"
-HOMEPAGE="https://github.com/phadej/aeson-compat#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/attoparsec-iso8601-1.0.0.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
-	>=dev-haskell/base-compat-0.6.0:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?]
-	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1.0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/base-orphans-0.4.5 <dev-haskell/base-orphans-0.9
-		>=dev-haskell/quickcheck-2.10
-		>=dev-haskell/quickcheck-instances-0.3.16 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base                     >=4.6  && <4.13' 'base                     >=4.6' \
-		'base-compat              >=0.6.0 && <0.11' 'base-compat              >=0.6.0' \
-		'hashable                 >=1.2  && <1.3' 'hashable                 >=1.2' \
-		'semigroups               >=0.18.5 && <0.19' 'semigroups               >=0.18.5' \
-		'time                     >=1.4.0.1 && <1.9' 'time                     >=1.4.0.1' \
-		'tasty                 >=0.10 && <1.2' 'tasty                 >=0.10' \
-		'QuickCheck            >=2.10 && <2.13' 'QuickCheck            >=2.10'
-}
diff --git a/dev-haskell/aeson-compat/metadata.xml b/dev-haskell/aeson-compat/metadata.xml
deleted file mode 100644
index ae80fa7672b9..000000000000
--- a/dev-haskell/aeson-compat/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Compatibility layer for @aeson@
-	</longdescription>
-	<upstream>
-		<remote-id type="github">phadej/aeson-compat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/aeson-diff/Manifest b/dev-haskell/aeson-diff/Manifest
deleted file mode 100644
index 54c6ad89ebfc..000000000000
--- a/dev-haskell/aeson-diff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aeson-diff-1.1.0.8.tar.gz 16521 BLAKE2B fb72ea03dc4b35791f151f22c4fab3f9cafecd604c520137c79af5e4c71772399516d0120bd01e2335fbf7747525babedf5603e5e8d3ba244a9907c81c9f1ea8 SHA512 5a5f703dec592c0cfd825eb1899006350649c52bf810ff1aaaf4134ebfbc11f5fbe9e7f158a8c3a21dbef4902b1f9e94148bc116e27418b2b786f6d31c7561fb
diff --git a/dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild b/dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild
deleted file mode 100644
index d44881aa49be..000000000000
--- a/dev-haskell/aeson-diff/aeson-diff-1.1.0.8.ebuild
+++ /dev/null
@@ -1,48 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extract and apply patches to JSON documents"
-HOMEPAGE="https://github.com/thsutton/aeson-diff"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Ambiguous module name ‘Data.Vector’: found in multiple packages: AC-Vector-Fancy-2.4.0 vector-0.12.0.2
-RESTRICT=test
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/edit-distance-vector:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/doctest-0.9
-		dev-haskell/glob
-		dev-haskell/hlint
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.9 && <4.14' 'base >=4.9'
-}
diff --git a/dev-haskell/aeson-diff/metadata.xml b/dev-haskell/aeson-diff/metadata.xml
deleted file mode 100644
index e984d020b504..000000000000
--- a/dev-haskell/aeson-diff/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		
-		This is a small library for working with changes to JSON documents. It
-		includes a library and two command-line executables in the style of the
-		diff(1) and patch(1) commands available on many systems.
-		
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/aeson-pretty/Manifest b/dev-haskell/aeson-pretty/Manifest
index b0cfebb396a9..3ff96125c846 100644
--- a/dev-haskell/aeson-pretty/Manifest
+++ b/dev-haskell/aeson-pretty/Manifest
@@ -1,4 +1,3 @@
-DIST aeson-pretty-0.7.1.tar.gz 4811 BLAKE2B 4a8cb1d51376cdc403f5bbff92b012ca6e88bc02283cfe2a0990611a7b74153d820a4d5b826b92f58d8afa14e67b5336453864add33e7716efd9bc0adc949cde SHA512 53522c5235b8252c0a293ebe6a988cfb7f61cc575df664a27851652a47b948acd322898e70e128c91d1aaf6b5bd27c8a1717edcc3ea423f34e7943791a301326
-DIST aeson-pretty-0.7.2.tar.gz 4838 BLAKE2B cc2ae346a7fbc13f854cf4bb716be68b2e45e2c15848cc5b77c15275fe0d43288a1987e5a95835ba923269612b8914338fca5e25c0ce66e59d9798a4e821ec55 SHA512 beabdb13c1a7c5a8fa7acdfe0e0f7b6b00d901d6aada360c17e43704cddd92d6464901885dd529710cc090c9649aa63b7241a5155178f0ff27145ed1ef4f347b
-DIST aeson-pretty-0.8.2.tar.gz 5456 BLAKE2B 7fef48f20aca649a49b84f79790ad7b6605c5f4655a5d8bea965104ffed0436449ebed7b6f40079164e86d4a016c7259fc48d35ce1e74caff5c805d7599bef15 SHA512 ec3af960b6afff9eb25d3679c23f8c627b9baeb0c10bcd9eb1ac60cc118988e6e47904d7e93bb4e260578fa41b58cfa7bd797fa5e0043c985a8f2b574b7d243a
-DIST aeson-pretty-0.8.8.tar.gz 5600 BLAKE2B cac5605b17405868ea373806021e9ba2b3bd3bcb864e97067d4086289a53c2118922e318fb966172a0c0cf0df900e577698afdcea1291464151fc0a01f359dde SHA512 5867343c5d51d632bb299fcbc00cdb29b0feb1931f0ff9c3cf89c5752f1a103c68c9e6fa65e8538ac19212853c39f6d1d6e0c2d9f0bf49fe001c1bfd792db779
+DIST aeson-pretty-0.8.10.tar.gz 5894 BLAKE2B 11f743ec9eaf301412efdde98b7237b0445a1089532804271613fb189e9b58ceab9cf2f710ff6a9e40f9755413fb110df63f2a80449469d3d655eb684338f76b SHA512 9eb39f5d70fe841d10c4e9fcacc3b380aa2a377590e8165f11c11318f7cdacb26757713efbb2b8324b57d1d5d89a1b210094ac6ab385a4dd32a9f6591847c4ac
+DIST aeson-pretty-0.8.9.cabal 2549 BLAKE2B 8039fb1ab628e04e0661331860ee2340c1dde9ed971619bdceb8b31500037fa94977034e07a9b8722b7bba818bda0b9b23cc608b71084121c276bce9a7e805da SHA512 b602bd81625dfd00906dd61613c2f4446f88c3afb82a0dec960de62802f5db17d2d77895f22108660f500831d9b0f24f5709b45b0f17f98630442842954dd5b7
+DIST aeson-pretty-0.8.9.tar.gz 5802 BLAKE2B 85d13676bb6f569a9df0f88a0882f493a6a2e55a74e702fa14f1d419b337f2a9f9d531de3dbd5283c80237e6fac11babf5aaba8f29aaf272ce6fc062412f1878 SHA512 00c99799cbe9e268109116f909ea0d9ef2708e578ec363ba5455b43d76d1f89bc9820dcbd3a63a1fb300460d97a71105f028f4ad9853b56ce16a097826b1d3d5
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
deleted file mode 100644
index 16cd9f8ef3ea..000000000000
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON pretty-printing library and command-line tool"
-HOMEPAGE="https://github.com/informatikr/aeson-pretty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lib-only"
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	!lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
-			>=dev-haskell/cmdargs-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lib-only lib-only)
-}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild
deleted file mode 100644
index 00f61b2b36df..000000000000
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON pretty-printing library and command-line tool"
-HOMEPAGE="https://github.com/informatikr/aeson-pretty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lib-only"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
-			>=dev-haskell/cmdargs-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lib-only lib-only)
-}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.10.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.10.ebuild
new file mode 100644
index 000000000000..4e095248d035
--- /dev/null
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.8.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="JSON pretty-printing library and command-line tool"
+HOMEPAGE="https://github.com/informatikr/aeson-pretty"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+executable"
+
+RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.14.0:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	>=dev-haskell/aeson-1.1:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+	executable? ( >=dev-haskell/aeson-0.6:=[profile?]
+			>=dev-haskell/attoparsec-0.10:=[profile?]
+			dev-haskell/attoparsec-aeson:=[profile?]
+			>=dev-haskell/cmdargs-0.7:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	if use executable; then
+		local lib_flag=-lib-only
+	else
+		local lib_flag=lib-only
+	fi
+
+	haskell-cabal_src_configure \
+		--flag="${lib_flag}"
+}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild
deleted file mode 100644
index 1bd4653f52f1..000000000000
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON pretty-printing library and command-line tool"
-HOMEPAGE="https://github.com/informatikr/aeson-pretty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lib-only"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
-			>=dev-haskell/cmdargs-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lib-only lib-only)
-}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild
deleted file mode 100644
index 9e23eefb7e8d..000000000000
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.8.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON pretty-printing library and command-line tool"
-HOMEPAGE="https://github.com/informatikr/aeson-pretty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lib-only"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/base-compat-0.9:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?]
-	>=dev-haskell/semigroups-0.18.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
-			>=dev-haskell/cmdargs-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lib-only lib-only)
-}
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild
new file mode 100644
index 000000000000..9ea9df617e03
--- /dev/null
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.8.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="JSON pretty-printing library and command-line tool"
+HOMEPAGE="https://github.com/informatikr/aeson-pretty"
+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"
+IUSE="lib-only"
+
+RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.14.0:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	!lib-only? ( >=dev-haskell/aeson-0.6:=[profile?]
+			>=dev-haskell/attoparsec-0.10:=[profile?]
+			>=dev-haskell/cmdargs-0.7:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag lib-only lib-only)
+}
+
+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/aeson-pretty/metadata.xml b/dev-haskell/aeson-pretty/metadata.xml
index a7cb017d960f..260b34f47acb 100644
--- a/dev-haskell/aeson-pretty/metadata.xml
+++ b/dev-haskell/aeson-pretty/metadata.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
+		<flag name="executable">build/install the command-line tool as well as the library</flag>
 		<flag name="lib-only">don't build 'aeson-pretty' executable.</flag>
 	</use>
-	<longdescription>
-		A JSON pretty-printing library compatible with aeson as well as
-		a command-line tool to improve readabilty of streams of JSON data.
-		
-		The /library/ provides the function "encodePretty". It is a drop-in
-		replacement for aeson's "encode" function, producing JSON-ByteStrings for
-		human readers.
-		
-		The /command-line tool/ reads JSON from stdin and writes prettified JSON
-		to stdout. It also offers a complementary "compact"-mode, essentially the
-		opposite of pretty-printing. If you specify @-flib-only@ like this
-		
-		&gt; cabal install -flib-only aeson-pretty
-		
-		the command-line tool will NOT be installed.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">aeson-pretty</remote-id>
 		<remote-id type="github">informatikr/aeson-pretty</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/aeson-qq/Manifest b/dev-haskell/aeson-qq/Manifest
deleted file mode 100644
index 3e9f2137da30..000000000000
--- a/dev-haskell/aeson-qq/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aeson-qq-0.7.4.tar.gz 4202 BLAKE2B adf425ea18b06658aaa509693a65a80d8bac4aa46013e9d30de9b8e46772239ab18ccb975207c95b773e2253722a347c36ed5417a112c751f91a1b92ee8b8464 SHA512 4ca302f27d03698d661bf04c8fa2cfb2d725988e694f62bddfd0ae544e64c6b4980b796cf4b85e13fd9ae289922b242e649abc71df2588306cd024d38e7d90fb
-DIST aeson-qq-0.8.1.tar.gz 4286 BLAKE2B 1b1e66d5a9c3f67f43b46665f246c1e83ffdcb92193be69614d49a8236f54b9ad97ca2304bb7e7100c246e682e68cf6ec81ebe3c3fcb1e8019986507a8a45630 SHA512 b1c697c60b7ec721f7801f5ff242ddceaa19a9ada257e7c6b3d3ef502163c058a50bed1110f8fbf761fa8f3da79abec33a04edb2b6555b0d6cf9a0710ad0302d
-DIST aeson-qq-0.8.3.tar.gz 4751 BLAKE2B 538c51c52470ad628326f67d4822812b352e7141c94ec2e385fc889d869c512705ee4ee58951c31e8422ccdd2ab855cfe4262a874864bd19b60e0ad67132798a SHA512 f7ef90529b4c9661ffc54ab8ebfc73c9966e6338591b871678be2a6e63ecf30089fd33279a074bd8d1905d71c8198ea5cc24c828d6e940e7af7585ba826a0c29
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
deleted file mode 100644
index 1ca2f1bb4ce9..000000000000
--- a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JSON quasiquoter for Haskell"
-HOMEPAGE="https://github.com/zalora/aeson-qq"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/haskell-src-meta-0.1.0:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.8.1.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.8.1.ebuild
deleted file mode 100644
index 1295dabd282f..000000000000
--- a/dev-haskell/aeson-qq/aeson-qq-0.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JSON quasiquoter for Haskell"
-HOMEPAGE="https://github.com/zalora/aeson-qq"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base-compat:=[profile?]
-	>=dev-haskell/haskell-src-meta-0.1.0:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild
deleted file mode 100644
index 229b7a3ccb24..000000000000
--- a/dev-haskell/aeson-qq/aeson-qq-0.8.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JSON quasiquoter for Haskell"
-HOMEPAGE="https://github.com/sol/aeson-qq#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base-compat:=[profile?]
-	>=dev-haskell/haskell-src-meta-0.1.0:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/aeson-qq/metadata.xml b/dev-haskell/aeson-qq/metadata.xml
deleted file mode 100644
index 93baffe1b288..000000000000
--- a/dev-haskell/aeson-qq/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@aeson-qq@ provides a JSON quasiquoter for Haskell.
-		
-		This package exposes the function `aesonQQ` that compile-time
-		converts a string representation of a JSON value into a
-		`Data.Aeson.Value`.  `aesonQQ` has the signature
-		
-		&gt;aesonQQ :: QuasiQuoter
-		
-		Consult the @README@ for documentation:
-		&lt;https://github.com/zalora/aeson-qq#readme&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">zalora/aeson-qq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/aeson/Manifest b/dev-haskell/aeson/Manifest
index a960cc0e8a7e..50aa1b5d1de5 100644
--- a/dev-haskell/aeson/Manifest
+++ b/dev-haskell/aeson/Manifest
@@ -1,6 +1,4 @@
-DIST aeson-0.6.2.1.tar.gz 110417 BLAKE2B 718321a0042771672e0e713ac35572f00e4e8feb1f9a4ed5e44c1b9e483aea6c6690f2c0107d8d1c23638308a14779efd5f90b7e0d026e23d49a9806d0ab5ae6 SHA512 01bd894f09a7e09ceb8cf3112dcb2dc290886d042c85f6db464526118767a1159ba94296f0419e500ab4059d7dc4f3a4e3a5e46aed0e032cc2e263ae207cc0ad
-DIST aeson-0.7.0.6.tar.gz 141565 BLAKE2B cad9f7826ee36241414341a50ad3bc5f2540412f667096cb0a3a6c8ac266c68a74bc887c58f89ee265693f2a60e096b016dcc21c99e0479dd6f27950e0476bd4 SHA512 68a34188e3fb3a4c99a9b2380b5b0e294c2e4a11321162cda7fc6b73c81e6706d51f77c069df4ada68e372867891fdee9ca2443993f802b06aa5137170e613ea
-DIST aeson-0.8.0.2.tar.gz 143850 BLAKE2B 23c8167d29d9ce82b43ca07904ba21bb6e6c8fba8a0bd2cc4a94bdc6869b338f728238d5a824425b2438515b39f0aedcf3d105d0a37315bf955c0f1cd623ea0f SHA512 fb5a976302b1422c11b0d20848dfa6b9f596874e59dd325868269fd61f4b2ee2b4bf12683c3758d7f24566564cfddb6426e64fb1f159bb8feb2eb35fb223caf0
-DIST aeson-0.9.0.1.tar.gz 154482 BLAKE2B 4ad5b665b1659279f5788c8a665916adc487bbd74138886b0dbf71eecfeba47d65734173e54062bcbee051f41bd7a536cd331c5f8b57c64a2b3aa4881f314df3 SHA512 04de524b10843fb12f8d51e72560d67a94e761edb515c472d891a61b56ab867c8fd8ed26d5fd7b2dc637a9b7ac1705e764a104e9253342984b755bb0f0e9128c
-DIST aeson-1.0.2.1.tar.gz 241837 BLAKE2B a8a4e0c9315c0e3b1a35ea9f87945200a324383e0cdcaf941809fbfb55f4c5d9e94206059d1457a3e825c2a52fdad16544e0b3aba09c35957829a15b28972199 SHA512 2647cc22cec7bfbb9ac27e20a471333a7abd436bd338d8069093259fdf3829b04c16043ff669382461a4fdfa84dfd4f59837ece704f7a773ebf4aca21afa5e8e
-DIST aeson-1.4.7.1.tar.gz 277911 BLAKE2B bffac6e82e7220f270fce44055859b27a97740b6f012f4e51d0970acd38a7bcd40d9bc3c4f1ba1df0df4d3d38dac0b8731dfdfe1f902b07a38efeaea842587d2 SHA512 236ed1b2cc4b39d49277cea5b787b6107c7efbe1c0d73de2005d400746bacf44c6b8ef5d26619395e24844f8948115685963ec7d03a998d0b728ab992e32e705
+DIST aeson-2.0.3.0-rev1.cabal 5867 BLAKE2B c64638d037ee4599a15c2c2c051b569649f57663312aaebc10c2a47cf2dfd834d03e8e4c909d70874737fd407f46f75744052ebe9319cde8ef56e4676115dbe0 SHA512 54b3ed453d6ec93a73d4bb639132164e1ffa698e87076577da39137ec2bb62b0c1a2f66d9412e1adad97d7d6cc32a6738e0495b0c4d312c183d7a29d01a29784
+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
diff --git a/dev-haskell/aeson/aeson-0.6.2.1.ebuild b/dev-haskell/aeson/aeson-0.6.2.1.ebuild
deleted file mode 100644
index 4497b45385f6..000000000000
--- a/dev-haskell/aeson/aeson-0.6.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.8.6.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/text-0.11.1.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-0.7.0.6.ebuild b/dev-haskell/aeson/aeson-0.7.0.6.ebuild
deleted file mode 100644
index 764ae3414fb2..000000000000
--- a/dev-haskell/aeson/aeson-0.7.0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.4:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/text-0.11.1.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/attoparsec
-		dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2
-		dev-haskell/text
-		dev-haskell/unordered-containers
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-0.8.0.2.ebuild b/dev-haskell/aeson/aeson-0.8.0.2.ebuild
deleted file mode 100644
index 1dcae51bc9c9..000000000000
--- a/dev-haskell/aeson/aeson-0.8.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.4:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-0.9.0.1.ebuild b/dev-haskell/aeson/aeson-0.9.0.1.ebuild
deleted file mode 100644
index 8e312c3bb82d..000000000000
--- a/dev-haskell/aeson/aeson-0.9.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.0:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[bytestring-builder,profile?] <dev-haskell/scientific-0.4:=[bytestring-builder,profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.0:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/aeson/aeson-1.0.2.1.ebuild b/dev-haskell/aeson/aeson-1.0.2.1.ebuild
deleted file mode 100644
index 344aade92cdc..000000000000
--- a/dev-haskell/aeson/aeson-1.0.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -developer,-fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.1:=[profile?]
-	>=dev-haskell/base-compat-0.9.1:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/dlist-0.2:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/hashable-1.1.2.0:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/tagged-0.8.3:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.0:=[profile?]
-	>=dev-haskell/vector-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.6
-		dev-haskell/base16-bytestring
-		>=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.12
-		>=dev-haskell/hashable-1.2.4.0
-		>=dev-haskell/hashable-time-0.2 <dev-haskell/hashable-time-0.3
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9.3
-		>=dev-haskell/quickcheck-instances-0.3.12
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer \
-		--flag=-fast
-}
diff --git a/dev-haskell/aeson/aeson-1.4.7.1.ebuild b/dev-haskell/aeson/aeson-1.4.7.1.ebuild
deleted file mode 100644
index cbb99b44a856..000000000000
--- a/dev-haskell/aeson/aeson-1.4.7.1.ebuild
+++ /dev/null
@@ -1,65 +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.4.9999
-#hackport: flags: -developer,-bytestring-builder
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast JSON parsing and encoding"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cffi fast"
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.12:=[profile?]
-	>=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
-	>=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/nats-1.1.1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/primitive-0.6.3.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-abstraction-0.2.8.0:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
-	>=dev-haskell/transformers-compat-0.6.2:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/base-compat
-		>=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.9
-		dev-haskell/base16-bytestring
-		>=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
-		>=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.14
-		>=dev-haskell/hashable-time-0.2 <dev-haskell/hashable-time-0.3
-		>=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1
-		>=dev-haskell/quickcheck-2.10.0.1 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bytestring-builder \
-		$(cabal_flag cffi cffi) \
-		--flag=-developer \
-		$(cabal_flag fast fast)
-}
diff --git a/dev-haskell/aeson/aeson-2.0.3.0.ebuild b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
new file mode 100644
index 000000000000..2f374da46b2a
--- /dev/null
+++ b/dev-haskell/aeson/aeson-2.0.3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: -developer,-bytestring-builder,-fast
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast JSON parsing and encoding"
+HOMEPAGE="https://github.com/haskell/aeson"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cffi +ordered-keymap"
+
+RDEPEND=">=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?]
+	>=dev-haskell/contravariant-1.4.1:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
+	>=dev-haskell/data-fix-0.3.2:=[profile?] <dev-haskell/data-fix-0.4:=[profile?]
+	>=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?]
+	>=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=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:=[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?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-short-0.1.5:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+	>=dev-haskell/th-abstraction-0.3.0.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+	>=dev-haskell/time-compat-1.9.6:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.5:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-haskell/witherable-0.4.2:=[profile?] <dev-haskell/witherable-0.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/base-compat
+		>=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.9
+		dev-haskell/base16-bytestring
+		>=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
+		>=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.15
+		>=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1
+		>=dev-haskell/quickcheck-instances-0.3.26.1 <dev-haskell/quickcheck-instances-0.4
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bytestring-builder \
+		$(cabal_flag cffi cffi) \
+		--flag=-developer \
+		--flag=-fast \
+		$(cabal_flag ordered-keymap ordered-keymap)
+}
diff --git a/dev-haskell/aeson/aeson-2.1.2.1.ebuild b/dev-haskell/aeson/aeson-2.1.2.1.ebuild
new file mode 100644
index 000000000000..7d33c94268c2
--- /dev/null
+++ b/dev-haskell/aeson/aeson-2.1.2.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: -developer,-bytestring-builder,-fast
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast JSON parsing and encoding"
+HOMEPAGE="https://github.com/haskell/aeson"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cffi +ordered-keymap"
+
+RESTRICT=test # one test case fails
+
+RDEPEND="
+	>=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.14:=[profile?]
+	>=dev-haskell/data-fix-0.3.2:=[profile?] <dev-haskell/data-fix-0.4:=[profile?]
+	>=dev-haskell/dlist-0.8.0.4:=[profile?] <dev-haskell/dlist-1.1:=[profile?]
+	>=dev-haskell/generically-0.1:=[profile?] <dev-haskell/generically-0.2:=[profile?]
+	>=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=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:=[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?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-short-0.1.5:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+	>=dev-haskell/th-abstraction-0.3.0.0:=[profile?] <dev-haskell/th-abstraction-0.6:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.3:=[profile?]
+	>=dev-haskell/time-compat-1.9.6:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.5:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.12.0.1:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-haskell/witherable-0.4.2:=[profile?] <dev-haskell/witherable-0.5:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+	|| (
+		( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
+		( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+	)
+	dev-haskell/text:=[profile?]
+	cffi? (
+		<dev-haskell/text-2.0:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? (
+		dev-haskell/base-compat
+		>=dev-haskell/base-orphans-0.5.3 <dev-haskell/base-orphans-0.10
+		dev-haskell/base16-bytestring
+		>=dev-haskell/diff-0.4 <dev-haskell/diff-0.5
+		>=dev-haskell/generic-deriving-1.10 <dev-haskell/generic-deriving-1.15
+		>=dev-haskell/integer-logarithms-1 <dev-haskell/integer-logarithms-1.1
+		>=dev-haskell/quickcheck-instances-0.3.29 <dev-haskell/quickcheck-instances-0.4
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bytestring-builder \
+		$(cabal_flag cffi cffi) \
+		--flag=-developer \
+		--flag=-fast \
+		$(cabal_flag ordered-keymap ordered-keymap)
+}
diff --git a/dev-haskell/aeson/metadata.xml b/dev-haskell/aeson/metadata.xml
index 057fca61d1ca..91c30329a7a5 100644
--- a/dev-haskell/aeson/metadata.xml
+++ b/dev-haskell/aeson/metadata.xml
@@ -1,74 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A JSON parsing and encoding library optimized for ease of use
-		and high performance.
-
-		/Note/: if you use GHCi or Template Haskell, please see the
-		@README@ file for important details about building this package,
-		and other packages that depend on it:
-		&lt;https://github.com/mailrank/aeson#readme&gt;
-
-		Parsing performance on a late 2010 MacBook Pro (2.66GHz Core i7),
-		for mostly-English tweets from Twitter's JSON search API:
-
-		* 0.8 KB, 32-bit GHC 6.12.3: 30538 msg\/sec (24.9 MB\/sec)
-
-		* 0.8 KB, 64-bit GHC 7.0.3: 31204 msg\/sec (25.4 MB\/sec)
-
-		* 6.4 KB, 32-bit GHC 6.12.3: 6731 msg\/sec (42.3 MB\/sec)
-
-		* 6.4 KB, 64-bit GHC 7.0.3: 6627 msg\/sec (41.7 MB\/sec)
-
-		* 11.8 KB, 32-bit GHC 6.12.3: 3751 msg\/sec (43.2 MB\/sec)
-
-		* 11.8 KB, 64-bit GHC 7.0.3: 3381 msg\/sec (38.9 MB\/sec)
-
-		* 31.2 KB, 32-bit GHC 6.12.3: 1306 msg\/sec (39.8 MB\/sec)
-
-		* 31.2 KB, 64-bit GHC 7.0.3: 1132 msg\/sec (34.5 MB\/sec)
-
-		* 61.5 KB, 32-bit GHC 6.12.3: 616 msg\/sec (37.0 MB\/sec)
-
-		* 61.5 KB, 64-bit GHC 7.0.3: 534 msg\/sec (32.1 MB\/sec)
-
-		Handling heavily-escaped text is a little more work.  Here is
-		parsing performance with Japanese tweets, where much of the text
-		is entirely Unicode-escaped.
-
-		* 14.6 KB, 32-bit GHC 6.12.3: 2315 msg\/sec (33.1 MB\/sec)
-
-		* 14.6 KB, 64-bit GHC 7.0.3: 1986 msg\/sec (28.4 MB\/sec)
-
-		* 44.1 KB, 32-bit GHC 6.12.3: 712 msg\/sec (30.7 MB\/sec)
-
-		* 44.1 KB, 64-bit GHC 7.0.3: 634 msg\/sec (27.3 MB\/sec)
-
-		* 82.9 KB, 32-bit GHC 6.12.3: 377 msg\/sec (30.5 MB\/sec)
-
-		* 82.9 KB, 64-bit GHC 7.0.3: 332 msg\/sec (26.9 MB\/sec)
-
-		Encoding performance on the same machine and data:
-
-		* English, 854 bytes: 43439 msg\/sec (35.4 MB/sec)
-
-		* English, 6.4 KB: 7127 msg\/sec (44.8 MB/sec)
-
-		* Engish, 61.5 KB: 765 msg\/sec (46.0 MB/sec)
-
-		* Japanese, 14.6 KB: 4727 msg\/sec (67.5 MB/sec)
-
-		* Japanese, 44.1 KB: 1505 msg\/sec (64.8 MB/sec)
-
-		(A note on naming: in Greek mythology, Aeson was the father of Jason.)
-	</longdescription>
 	<use>
 		<flag name="cffi">Controls whether to include c-ffi bits or pure haskell. Default to False for security.</flag>
-		<flag name="fast">compile without optimizations</flag>
+		<flag name="ordered-keymap">Use ordered @Data.Map.Strict@ for KeyMap implementation.</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">aeson</remote-id>
+		<remote-id type="github">haskell/aeson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/alex-tools/Manifest b/dev-haskell/alex-tools/Manifest
deleted file mode 100644
index f9e6e7c5d06b..000000000000
--- a/dev-haskell/alex-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST alex-tools-0.4.tar.gz 4507 BLAKE2B 3475957bfe9eda85b53bd4a541cf4441b6eece6901834723c84e4e9877579e8b45258f045aece44ed0d1f17f17f3ab77ea61d56421f07b998bf0a5b7f69e915c SHA512 d4282acdd6f734e3077802d3e87588eaf704f449fb9a46cc330f17a067bb142d948b7c0ae430def970e0b4dc5caf533b226e02112bdc9a2b1c79b552d3abc681
diff --git a/dev-haskell/alex-tools/alex-tools-0.4.ebuild b/dev-haskell/alex-tools/alex-tools-0.4.ebuild
deleted file mode 100644
index c02ea0293355..000000000000
--- a/dev-haskell/alex-tools/alex-tools-0.4.ebuild
+++ /dev/null
@@ -1,33 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A set of functions for a common use case of Alex"
-HOMEPAGE="http://hackage.haskell.org/package/alex-tools"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.7 && <4.12' 'base >=4.7' \
-		'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0 && <2.16'
-}
diff --git a/dev-haskell/alex-tools/metadata.xml b/dev-haskell/alex-tools/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/alex-tools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/alex/Manifest b/dev-haskell/alex/Manifest
index 2b7c0b6ef25c..7171c96ded47 100644
--- a/dev-haskell/alex/Manifest
+++ b/dev-haskell/alex/Manifest
@@ -1,5 +1,3 @@
-DIST alex-3.1.3.tar.gz 99868 BLAKE2B 9a7d03fed24dfec82584edc5043ee9cac141649035910f7fa075c41e67d6d57dcde99363fc0f4ff83a6f535bbc462fdf4cfad6e92785a480351e38e079ec9aeb SHA512 f09f720627b9f2cae5d9d3a99488c2249e82c9310f0a436bccbd5238bd3215fae287706ee6f7530533c801348bdbfebc9fd54cafc15a75d528462b2ee987eb3c
-DIST alex-3.1.7.tar.gz 103624 BLAKE2B c7ca36113bf5951621906dffc47481e8e4a2cb2007773de7480b63379d648ca2b2b2c73d835eb981d1f46087a8adeec1887898e6d1c5205c8e1c7308bab7ec90 SHA512 0c4e87011617d8f8ad7cdf32b91e3ecc65ad66ea378c8086de8cbeb7ae3b37df478fb834e3bc453e3448fcae9d03b19ce9844bba35ad66a3cdf6e912790fe0a1
-DIST alex-3.2.1.tar.gz 111167 BLAKE2B efad30da0e26303d08d74b762a83ad3ddc0ec8069942b0e5ae170e480dde6b65771f5cb4fedfd27e9379719c2eebbaef68d33328a87be49dc60a0e7b86861619 SHA512 97e2e1677efcde5ec04a393f8b768f97a291ff63a3411cc0a0aef18b75e6825307d22d9c379eb7775dde519ebf60378e07c9181ea1a8bf9ea2ef631d7071c2e7
-DIST alex-3.2.4.tar.gz 110688 BLAKE2B 182f58317bcca6c72f54f63792e04a9108d9311e7f1dd8b7247f847fe577e0ba1297f442a4f533f5b55ee1f7963167d9818149807b46fb400818d163cc18a939 SHA512 e9e99caef4bc985aa37bd42488121f9b83c4f3026c9745ad12f50b5896e9f7c07f48a753c647c30ff16be804529d2478f8d90fa38e352f1d8861e610651c871a
-DIST alex-3.2.5.tar.gz 108531 BLAKE2B 283f8f619f72e72da0786b1f8975b256d4aa0c075be849d50763e7d57201089e2e8c09a59df27f1ff21d90e9fead94e8466ddd63d61a6055fbfb4bb6e18161fe SHA512 5823fb066c5ec67256108cfc1550703b86881f319337922e7248fb33def374f0010c60605538a49cfaaa880b0f73ace9dba6d088c078f3c455c5d9adce2719c9
+DIST alex-13732056ff8d287f2ee0c4ecb968efe04516c890.tar.gz 103395 BLAKE2B 1254655ec480fe648238df6864d9623f0128bcdbcfca22f5b63e85b24183ece5e21ae8dc5e1a26c5f511233c420a33dc19a6fcbc2824ae56043ba75fc38e5d49 SHA512 5c7e9e0633ea4536fb4be981c123d42bc3ac035732ad5cb88d9f9b38199d13f7ef211f4e2f1fc475490019461bb56eafb702c3b4c61417dd1cc6c555c1a436d2
+DIST alex-3.2.7.1.tar.gz 108229 BLAKE2B 1c1c3488c6e0f559003de5edc1250afdd09098eb4da3414d8c461d03ee5f08b94f80e6f6d32366f6d8d0563a068ee8b2a1c9cb7b78bbbf0a1dcf3767ea448ffd SHA512 f8ff12de874b905449fdda0d704f9e4ac30fa3e60e965f82d7bb2d6e3974cf926f85134d32878c48faf0ec4a002ea7240cf6696e1cbcad25a0eebb9d1850cc07
+DIST alex-3.2.7.2.tar.gz 85450 BLAKE2B fcb752b24b475e5502b686dec717f613c7fbda8eeb3583f4807e419960479ddaea0e578e7ab81974e480ad9ecf59d8a0bf94341da72d247221e9d2905206641f SHA512 925c652883a12c3d271b212d1a83df15e98b3c8b5a70aecc91786db601101f9544722a04969bc4d84265910c1994cfb79fc6d50aa01a04604c4bb11735513a58
diff --git a/dev-haskell/alex/alex-3.1.3.ebuild b/dev-haskell/alex/alex-3.1.3.ebuild
deleted file mode 100644
index f7ade6c53c42..000000000000
--- a/dev-haskell/alex/alex-3.1.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="https://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/quickcheck-2
-	>=dev-lang/ghc-6.10.4
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )"
-
-src_prepare() {
-	# drop depend on itself and happy, otherwise cabal tries to regenerate it
-	rm src/{Scan.x,Parser.y} || die
-
-	for f in Scan Parser; do
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-	dodoc README
-}
diff --git a/dev-haskell/alex/alex-3.1.7.ebuild b/dev-haskell/alex/alex-3.1.7.ebuild
deleted file mode 100644
index 47cfe0e5d3c2..000000000000
--- a/dev-haskell/alex/alex-3.1.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +small_base
-
-CABAL_FEATURES="bin test-suite"
-inherit autotools eutils haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="https://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-haskell/quickcheck-2:2=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )
-"
-
-src_prepare() {
-	# drop depend on itself and happy, otherwise cabal tries to regenerate it
-	rm src/{Scan.x,Parser.y} || die
-
-	for f in Scan Parser; do
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false \
-		--flag=small_base
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all
-}
-
-src_install() {
-	cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-	dodoc README
-}
diff --git a/dev-haskell/alex/alex-3.2.1.ebuild b/dev-haskell/alex/alex-3.2.1.ebuild
deleted file mode 100644
index 4301b5a3c4ff..000000000000
--- a/dev-haskell/alex/alex-3.2.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +small_base
-
-CABAL_FEATURES="test-suite"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="https://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-haskell/quickcheck-2:2=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )
-"
-
-RESTRICT=test # fails tests
-
-src_prepare() {
-	default
-
-	# drop depend on itself and happy, otherwise cabal tries to regenerate it
-	rm src/{Scan.x,Parser.y} || die
-
-	for f in Scan Parser; do
-		mv "${S}/dist/build/alex/alex-tmp/$f.hs" "${S}"/src/ || die
-	done
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false \
-		--flag=small_base
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-}
diff --git a/dev-haskell/alex/alex-3.2.4.ebuild b/dev-haskell/alex/alex-3.2.4.ebuild
deleted file mode 100644
index 8fb18f3a96ac..000000000000
--- a/dev-haskell/alex/alex-3.2.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: +small_base
-
-CABAL_FEATURES="test-suite"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="https://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )
-"
-
-src_prepare() {
-	default
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false \
-		--flag=small_base
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_test() {
-	# 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
-	# 2. use freshly built ALEX= binary and datadir path
-	alex_datadir="${S}"/data \
-	emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		dohtml -r "${S}/doc/alex/"
-	fi
-}
diff --git a/dev-haskell/alex/alex-3.2.5.ebuild b/dev-haskell/alex/alex-3.2.5.ebuild
deleted file mode 100644
index 504ef0e79fb0..000000000000
--- a/dev-haskell/alex/alex-3.2.5.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.4.9999
-#hackport: flags: +small_base
-
-CABAL_FEATURES="test-suite"
-inherit autotools haskell-cabal
-
-DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
-HOMEPAGE="http://www.haskell.org/alex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-		app-text/docbook-xsl-stylesheets
-		>=dev-libs/libxslt-1.1.2 )
-"
-
-src_prepare() {
-	default
-
-	if use doc; then
-		cd "${S}/doc/"
-		eautoreconf
-	fi
-}
-src_configure() {
-	# make sure we don't accidentally use those
-	# installed in system
-	haskell-cabal_src_configure \
-		--with-alex=false \
-		--with-happy=false \
-		--flag=small_base
-
-	if use doc; then
-		cd "${S}/doc/"
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C "${S}/doc/" -j1
-	fi
-}
-
-src_test() {
-	# 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
-	# 2. use freshly built ALEX= binary and datadir path
-	alex_datadir="${S}"/data \
-	emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	if use doc; then
-		doman "${S}/doc/alex.1"
-		docinto html
-		dodoc -r "${S}/doc/alex/"
-	fi
-}
diff --git a/dev-haskell/alex/alex-3.2.7.1.ebuild b/dev-haskell/alex/alex-3.2.7.1.ebuild
new file mode 100644
index 000000000000..c8cefbf899a3
--- /dev/null
+++ b/dev-haskell/alex/alex-3.2.7.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit autotools haskell-cabal
+
+DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
+HOMEPAGE="https://www.haskell.org/alex/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=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 )
+"
+
+src_prepare() {
+	default
+
+	if use doc; then
+		cd "${S}/doc/"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# make sure we don't accidentally use those
+	# installed in system
+	haskell-cabal_src_configure \
+		--with-alex=false \
+		--with-happy=false \
+		--flag=small_base
+
+	if use doc; then
+		cd "${S}/doc/"
+		econf
+	fi
+}
+
+src_compile() {
+	haskell-cabal_src_compile
+
+	if use doc; then
+		emake -C "${S}/doc/" -j1
+	fi
+}
+
+src_test() {
+	# 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
+	# 2. use freshly built ALEX= binary and datadir path
+	alex_datadir="${S}"/data \
+	emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	if use doc; then
+		doman "${S}/doc/alex.1"
+		docinto html
+		dodoc -r "${S}/doc/alex/"
+	fi
+}
diff --git a/dev-haskell/alex/alex-3.2.7.2.ebuild b/dev-haskell/alex/alex-3.2.7.2.ebuild
new file mode 100644
index 000000000000..0b2e45036a1b
--- /dev/null
+++ b/dev-haskell/alex/alex-3.2.7.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Alex is a tool for generating lexical analysers in Haskell"
+HOMEPAGE="https://www.haskell.org/alex/"
+
+GIT_REPO="https://github.com/haskell/${PN}"
+GIT_COMMIT="13732056ff8d287f2ee0c4ecb968efe04516c890"
+GIT_P="${PN}-${GIT_COMMIT}"
+GIT_S="${WORKDIR}/${GIT_P}"
+SRC_URI+=" doc? (
+	${GIT_REPO}/archive/${GIT_COMMIT}.tar.gz -> ${GIT_P}.tar.gz
+)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinx-rtd-theme
+	)
+"
+src_prepare() {
+	if use doc; then
+		cp -a "${GIT_S}/doc/" "${S}" || die
+		eapply "${FILESDIR}/${PN}-3.2.7.2-fix-docs.patch"
+	fi
+
+	haskell-cabal_src_prepare
+}
+
+src_configure() {
+	# make sure we don't accidentally use those
+	# installed in system
+	haskell-cabal_src_configure \
+		--with-alex=false \
+		--with-happy=false \
+		--flag=small_base
+}
+
+src_compile() {
+	haskell-cabal_src_compile
+
+	if use doc; then
+		emake -C "${S}/doc/" -j1
+	fi
+}
+
+src_test() {
+	# 1. workaround Setup.hs deadlock: https://github.com/haskell/cabal/issues/2398
+	# 2. use freshly built ALEX= binary and datadir path
+	alex_datadir="${S}"/data \
+	emake -k -C tests all ALEX="${S}"/dist/build/alex/alex
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	if use doc; then
+		dodoc -r "${S}/doc/_build/html"
+	fi
+}
diff --git a/dev-haskell/alex/files/alex-3.2.7.2-fix-docs.patch b/dev-haskell/alex/files/alex-3.2.7.2-fix-docs.patch
new file mode 100644
index 000000000000..2ed25658754d
--- /dev/null
+++ b/dev-haskell/alex/files/alex-3.2.7.2-fix-docs.patch
@@ -0,0 +1,46 @@
+From e461c3b0935a05a169aa22a1b113c08f8989eea6 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sat, 8 Apr 2023 12:18:36 -0600
+Subject: [PATCH 1/1] Fix documentation
+
+contributing.rst refers to a non-existant 'bug-fixes' doc
+
+conf.py refers to non-existant '_static' directory
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ doc/conf.py          | 2 +-
+ doc/contributing.rst | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index ea3862d..718b0e6 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -49,7 +49,7 @@ html_theme = 'sphinx_rtd_theme'
+ # Add any paths that contain custom static files (such as style sheets) here,
+ # relative to this directory. They are copied after the builtin static files,
+ # so a file named "default.css" will overwrite the builtin "default.css".
+-html_static_path = ['_static']
++#html_static_path = ['_static']
+ 
+ # The name of the Pygments (syntax highlighting) style to use.
+ pygments_style = 'sphinx'
+diff --git a/doc/contributing.rst b/doc/contributing.rst
+index 6df2865..e889b90 100644
+--- a/doc/contributing.rst
++++ b/doc/contributing.rst
+@@ -8,8 +8,8 @@ Contributing to Alex
+ Source Code Repository
+ ----------------------
+ 
+-Alex is hosted on `GitHub <https://github.com/haskell/alex>`__.
+-As previously discussed in `bug-reports`_, we use the built-in `GitHub issue tracker <https://github.com/haskell/alex/issues>`__ for Alex.
++Alex is hosted on `GitHub <https://github.com/haskell/alex>`__,
++and we use the built-in `GitHub issue tracker <https://github.com/haskell/alex/issues>`__ for Alex.
+ We also use `GitHub pull requests <https://github.com/haskell/alex/pulls>`__ for managing changes;
+ feel free to submit them!
+ 
+-- 
+2.39.2
+
diff --git a/dev-haskell/alex/metadata.xml b/dev-haskell/alex/metadata.xml
index 244d701ec388..fc9c458f8018 100644
--- a/dev-haskell/alex/metadata.xml
+++ b/dev-haskell/alex/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Alex is a tool for generating lexical analysers in Haskell
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">alex</remote-id>
+		<remote-id type="github">haskell/alex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild b/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
index 98195b831952..f57ca6381068 100644
--- a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
+++ b/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.1.9999
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +pkgconfig
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,12 +15,19 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?]
-		<dev-haskell/extensible-exceptions-0.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		media-libs/alsa-lib"
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	media-libs/alsa-lib
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
+	>=dev-haskell/cabal-1.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=pkgconfig
+}
diff --git a/dev-haskell/alsa-core/metadata.xml b/dev-haskell/alsa-core/metadata.xml
index 8474e22c52ad..937381521944 100644
--- a/dev-haskell/alsa-core/metadata.xml
+++ b/dev-haskell/alsa-core/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides access to ALSA infrastructure,
-		that is needed by both alsa-seq and alsa-pcm.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/alsa-mixer/Manifest b/dev-haskell/alsa-mixer/Manifest
index e537536d2faa..fcd0ada3a9a7 100644
--- a/dev-haskell/alsa-mixer/Manifest
+++ b/dev-haskell/alsa-mixer/Manifest
@@ -1,4 +1 @@
-DIST alsa-mixer-0.1.2.tar.gz 6901 BLAKE2B c33ba2abb9d220bafc04ee0c6fb0508c9029db813c56304964b5bc83c143370a4389c8960b34555fc9f50a7936d5168581b7283a3dbc4e3592b7e8962b9eb75a SHA512 fae4c1f9b65d47a55b2674b04c38f46fc440222c7215b1bb95de14b7c642068392a73c0cebb08b4e3cf49ab824ec78a57d942279364e28bfa45be471f1b8fdfa
-DIST alsa-mixer-0.2.0.2.tar.gz 7184 BLAKE2B 0cb5005e16345a75c6b6b16b09cf2a0317b430f7bf11207a824e1970e250d13e38999bc5fb722c78439cc15d60318914d1a0eaad7ee4ebfc042ba056a919b332 SHA512 f480008cfe5dd87e01b22bd3af44caee17095dc1be2e535acdca4cb2b56cd87fb086b8222ae10b1ca866818469dff7309ea6e0b7ec22ad83cdff07e6a702aa76
-DIST alsa-mixer-0.2.0.3.tar.gz 7269 BLAKE2B 43008051829b8dde0edf33216b61649c2a3974d43fc4f00cde5d2e21809afdc23d89642bdb7526856d4fd929843211a44a6cb0f924fae79247b678ad870facbb SHA512 32bce115331a622cdc944c9dbeb8ae886793330a4eadce35de857145d4440d7bc8bbac518b7739613436958b392133bae5f1da2cd91c6d21810373fda8a69083
 DIST alsa-mixer-0.3.0.tar.gz 7304 BLAKE2B 02c6b267664ef2add57c28c18b110eef250f4a1b1c34bd3ef97127b5c0a7548291a9a86e8c0c8df58c3e7f6383c6d4408a792a01644cf58266e1a55fced32bea SHA512 01ab1ae9645daf8d38dd03c3f32de7baf75a92fe72af48e0d5a6a1f49044fc49eac24cb216a05598e318ee939e598939070e43ae9aadeb88da9309c51abbd360
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.1.2-r2.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.1.2-r2.ebuild
deleted file mode 100644
index 72b831eeed27..000000000000
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ALSA simple mixer API"
-HOMEPAGE="https://hackage.haskell.org/package/alsa-mixer"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/alsa-core-0.5*:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		media-libs/alsa-lib"
-DEPEND="${RDEPEND}
-		dev-haskell/c2hs
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild
deleted file mode 100644
index f8bdc7633943..000000000000
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ALSA simple mixer API"
-HOMEPAGE="https://github.com/ttuegel/alsa-mixer"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	media-libs/alsa-lib
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild
deleted file mode 100644
index 4dc35593c667..000000000000
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ALSA simple mixer API"
-HOMEPAGE="https://github.com/ttuegel/alsa-mixer"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	media-libs/alsa-lib
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild
index 564a44494d08..4e541f9e442e 100644
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild
+++ b/dev-haskell/alsa-mixer/alsa-mixer-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.5.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
diff --git a/dev-haskell/alsa-mixer/metadata.xml b/dev-haskell/alsa-mixer/metadata.xml
index 442f7bd356ae..bb10207d9bac 100644
--- a/dev-haskell/alsa-mixer/metadata.xml
+++ b/dev-haskell/alsa-mixer/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides haskell bindings to the ALSA simple mixer API.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">ttuegel/alsa-mixer</remote-id>
 	</upstream>
diff --git a/dev-haskell/alut/Manifest b/dev-haskell/alut/Manifest
deleted file mode 100644
index 666dbde24add..000000000000
--- a/dev-haskell/alut/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ALUT-2.4.0.2.tar.gz 26231 BLAKE2B 0af581e97d58ca4358e5675ecbe17891b45f229fb2a1fa6316f3a060001ab36604bb627d6d1b8ae78ace3e382860d65df5a9aea20c82e0bf8bbd5450bb31b32b SHA512 b2ede23635f73660db008e402567c376ef77c081312b76767a2c6d5a4f30bac7e3e8c6533da371828470865218cdb076be4dac07c11bdda0feb7889552d024f1
-DIST ALUT-2.4.0.3.tar.gz 25587 BLAKE2B acdc2878748c322acb630e05a2712f73aecee2ab1d789fe338e15b86b758cf708b962a5268ae159a5ace12f8749e772c8b654cbe97a13ae90fc65b2ad51e193d SHA512 3ca21f4846618c197e4d7fec49f20e9964ffe9ef320fd0880a307743f9b2240b1fa4004da630e000bb2255cad42ed081ca47d84bf8dd1fca72d0cfbf818ecda1
diff --git a/dev-haskell/alut/alut-2.4.0.2.ebuild b/dev-haskell/alut/alut-2.4.0.2.ebuild
deleted file mode 100644
index 9a502fbcb348..000000000000
--- a/dev-haskell/alut/alut-2.4.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ALUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenAL Utility Toolkit"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	media-libs/freealut
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples buildexamples) \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/alut/alut-2.4.0.3.ebuild b/dev-haskell/alut/alut-2.4.0.3.ebuild
deleted file mode 100644
index 28bf060d07a5..000000000000
--- a/dev-haskell/alut/alut-2.4.0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ALUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenAL Utility Toolkit"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/openal-1.7:=[profile?] <dev-haskell/openal-1.8:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	media-libs/freealut
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples buildexamples) \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/alut/metadata.xml b/dev-haskell/alut/metadata.xml
deleted file mode 100644
index da1f27875e62..000000000000
--- a/dev-haskell/alut/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">haskell-openal/ALUT</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/annotated-wl-pprint/Manifest b/dev-haskell/annotated-wl-pprint/Manifest
deleted file mode 100644
index c44b061f57b1..000000000000
--- a/dev-haskell/annotated-wl-pprint/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST annotated-wl-pprint-0.7.0.tar.gz 10338 BLAKE2B 3210f0ecde3e9689ea17c27210cb11a260c02b8db9dc285335c715330202918f5d22792a27ea5f89dd7946d8e6deac5911bc81ed8e207095426e82a07753e090 SHA512 1e7ea93a63c500ebb23458202c62ed37eee7f462bbc4c390822de37fd0f411983eed49fed4c69ffb32705519f9aa956131d14ad930f21b48b28c5de5d4095f0a
diff --git a/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild b/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
deleted file mode 100644
index 8ce6b6b8794d..000000000000
--- a/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer, with annotation support"
-HOMEPAGE="https://github.com/david-christiansen/annotated-wl-pprint"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.10.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/annotated-wl-pprint/metadata.xml b/dev-haskell/annotated-wl-pprint/metadata.xml
deleted file mode 100644
index 5a30faac9d8f..000000000000
--- a/dev-haskell/annotated-wl-pprint/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a modified version of wl-pprint, which was based on Wadler's
-		paper "A Prettier  Printer".  See the haddocks for full info.  This
-		version allows the library user to annotate the text with semantic
-		information, which can later be rendered in a variety of ways.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/ansi-terminal-types/Manifest b/dev-haskell/ansi-terminal-types/Manifest
new file mode 100644
index 000000000000..19ceb2e07a54
--- /dev/null
+++ b/dev-haskell/ansi-terminal-types/Manifest
@@ -0,0 +1,2 @@
+DIST ansi-terminal-types-0.11.5-rev1.cabal 1482 BLAKE2B a15dd696455d69c5685db41bfe48ecd9eceeecad0b84616a891202bd5ae4c3db6dc659343a522a785ad98a781d0689be9ea5f5dfa2109d117f8e1a238dcfe553 SHA512 ac36e6d542d70cfc440fcb675c3139879b480a2197559e3bb2b2f6d927370d8cfbc21d9005bca4d87b05ecd0c7c631fd1a941760f0b2d0151dd31d1bc93f48d1
+DIST ansi-terminal-types-0.11.5.tar.gz 4660 BLAKE2B 99acf20cead2bca1c293ed4ce9b89f8516416cfb6323d75c67c1f794e3ee04b2ed5783f324485903ce4f36542424412618de5c124f518d2dd3a272a5de3560be SHA512 a37ef258985f9979c0abcc5187cbccea3629b7c74ab52d57f61d0a1c6e4ea5a5bb5d1bcb5176ea5115afa55b6c6f09b75ad918a41b9c1420684845b8928ec070
diff --git a/dev-haskell/ansi-terminal-types/ansi-terminal-types-0.11.5.ebuild b/dev-haskell/ansi-terminal-types/ansi-terminal-types-0.11.5.ebuild
new file mode 100644
index 000000000000..e49b0cb4383a
--- /dev/null
+++ b/dev-haskell/ansi-terminal-types/ansi-terminal-types-0.11.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Types and functions used to represent SGR aspects"
+HOMEPAGE="https://github.com/UnkindPartition/ansi-terminal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/colour-2.1.0:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/ansi-terminal-types/metadata.xml b/dev-haskell/ansi-terminal-types/metadata.xml
new file mode 100644
index 000000000000..c3b2a8511d2b
--- /dev/null
+++ b/dev-haskell/ansi-terminal-types/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">ansi-terminal-types</remote-id>
+		<remote-id type="github">UnkindPartition/ansi-terminal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/ansi-terminal/Manifest b/dev-haskell/ansi-terminal/Manifest
index c12c36b76794..4e5302074e32 100644
--- a/dev-haskell/ansi-terminal/Manifest
+++ b/dev-haskell/ansi-terminal/Manifest
@@ -1,3 +1,2 @@
 DIST ansi-terminal-0.10.3.tar.gz 35863 BLAKE2B 8535a0dcfbf4287abee8c52cd951d155c30b8a2de73a4799ad51e093ff4651fd2bcc771a61627c143f2f48b7cc66e9bb125166be1b13d2d51bcdf1d1666450ee SHA512 231dfaaef2e7b1fb40a0e63bcdce984f914dd0c17af90bc2415c127d503dc438d1952dadfbb524f9ae83d872b30a353d875dda74eb492536cf8953c1e4224187
-DIST ansi-terminal-0.6.2.1.tar.gz 14652 BLAKE2B ae068a4e0a1c4f17c01d4e5aa7c1daa350ea5b5b18e8dfadebb2f4be5891076f2c78e82a829bc8638bfd69cce2e847c0910a56a18661b764e2fc9f785d375386 SHA512 6a38f6ec13ca2c2669c707eeab1749fa7ca1805fa162cc024867cf0cabb5746c8844bc2188680de3f9dd748cfcb72917b88ac9122ff6b86459c80aa061f2adbf
-DIST ansi-terminal-0.6.2.3.tar.gz 21964 BLAKE2B 3c3fdb0cd5808978e474602df9f722a4a349162975618e0144aa9b863039b0b8dc73d106c441481b8755f338fe252a9c0effc269a468b55f51fb9c025c648b75 SHA512 3d2999d0dcd45950240731ae9bbf5b65fbd5b00660b4f6387afa2e3db89f2f1a6690ea72311348cddd8e27fa31c447f282795c2ae1b76a5306aade785eb3448d
+DIST ansi-terminal-1.0.tar.gz 31745 BLAKE2B 8abca65206e9999ec18823da827466065d16d9f99f37310f852cde29159e3819b2bb9e3c64878271bd9412cf5377afc925267b372960627dad57cc70f6ef4037 SHA512 008b8d96b9ef128124aa094d5043ffbc4364a7441850ba98da620ab4dc5df8540736dc9f92abbe9097ee96a5f592723e5b14f9bbaa1ddfecf3af36cd46311b82
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
index 98a4b995a5ea..afe703125486 100644
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
+++ b/dev-haskell/ansi-terminal/ansi-terminal-0.10.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
-HOMEPAGE="https://github.com/feuerbach/ansi-terminal"
+HOMEPAGE="https://github.com/UnkindPartition/ansi-terminal"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="example"
 
 RDEPEND=">=dev-haskell/colour-2.1.0:=[profile?]
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild
deleted file mode 100644
index 13c6af519a09..000000000000
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
-HOMEPAGE="https://github.com/feuerbach/ansi-terminal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="example"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag example example)
-}
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
deleted file mode 100644
index 41a36a2397f2..000000000000
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple ANSI terminal support, with Windows compatibility"
-HOMEPAGE="https://github.com/feuerbach/ansi-terminal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="example"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag example example)
-}
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-1.0.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-1.0.ebuild
new file mode 100644
index 000000000000..f540c0412d3c
--- /dev/null
+++ b/dev-haskell/ansi-terminal/ansi-terminal-1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -win32-2-13-1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple ANSI terminal support"
+HOMEPAGE="https://github.com/UnkindPartition/ansi-terminal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="example"
+
+RDEPEND="
+	~dev-haskell/ansi-terminal-types-0.11.5:=[profile?]
+	>=dev-haskell/colour-2.1.0:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag example example) \
+		--flag=-win32-2-13-1
+}
diff --git a/dev-haskell/ansi-terminal/metadata.xml b/dev-haskell/ansi-terminal/metadata.xml
index 5c68501a1743..ae4ef182c883 100644
--- a/dev-haskell/ansi-terminal/metadata.xml
+++ b/dev-haskell/ansi-terminal/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		ANSI terminal support for Haskell: allows cursor movement, screen clearing, color output showing or hiding the cursor, and
-		changing the title. Compatible with Windows and those Unixes with ANSI terminals, but only GHC is supported as a compiler.
-	</longdescription>
 	<use>
-		<flag name="example">Build the example application.</flag>
+		<flag name="example">Build the example application</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">feuerbach/ansi-terminal</remote-id>
+		<remote-id type="hackage">ansi-terminal</remote-id>
+		<remote-id type="github">UnkindPartition/ansi-terminal</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/ansi-wl-pprint/Manifest b/dev-haskell/ansi-wl-pprint/Manifest
index c6e3d7ef46c1..176387badfc5 100644
--- a/dev-haskell/ansi-wl-pprint/Manifest
+++ b/dev-haskell/ansi-wl-pprint/Manifest
@@ -1,3 +1,3 @@
-DIST ansi-wl-pprint-0.6.7.1.tar.gz 14862 BLAKE2B 4b51ea893ce5aa80e40d53b928ef3cc076a3271da50d715faf52e6f067be270b5362a2e3ef6d1890cf9aa2c4397c1b9c7e75aaf05214fab42a930098470750ac SHA512 e0524f7ba0e6ba3eefc2c04d0186579c70687c65d672e11b09a6b4352ae51f2b30e9c4a4753ca30840d24c82be8f6faa1183c29a2ee154b8c2485e1c01cad546
-DIST ansi-wl-pprint-0.6.7.3.tar.gz 14983 BLAKE2B d9de853cb03cdb23f061820aee0ac48abc513db4e0feb00529869f2ace742843b312d74fa737897b5690720a3537154f1b876e309360cdc41ffe1f84b93521ba SHA512 c5b41ee5890251ff3524bca9d5d0b457b54838906f4145e09e68cf88cb11e7bd59e05ba99c660ad61a9fcfb4e9201be4c916de2a066dfca12922292790590eba
-DIST ansi-wl-pprint-0.6.8.2.tar.gz 16491 BLAKE2B dd0619b5ee9f043b225dcafdc7dc4f8b095ccd24644f03cd46c3596765ecb3c2eba7955f5cf4032664b9da9473ee508c59c4b18e7b30725ab81c00fa96e5f2ad SHA512 00c39dcdd90071011d2db6e196c472fddc61bf3ee4baed0414de1a1ef1e13801fceb647a718018e1a644d2276845af7bc58d5bf72dcb35d193ef6391ba2f8ac3
+DIST ansi-wl-pprint-0.6.9-rev3.cabal 2425 BLAKE2B ea9e5f58811e8ffcda756b73c8ef5c7507fc25ce183b4a6fa3872d703752a74ad8de63376b900d6b61b077be0af9099b2b3da3240b7267ae2f72bcd50d412e22 SHA512 f7af7c4adcf43ffa199bb71828442e9b99eecb1450ff966771ee0f3b9b249cb20e7d2a70d1c54955b2f162a1acf0b6912f7cee09f00686da31b6522f501c05bf
+DIST ansi-wl-pprint-0.6.9.tar.gz 16723 BLAKE2B c0ddfa0651ab8bc008546d3c5520cb85c3e7d7c676c634e89978de0a4e3d2927e4bce6337306b0d0d5821af3d0202eafea48e203c298e707b6b82b8a5c6404e6 SHA512 2a66236f740f0b45b6133555e8b1315dc85ece1c16dd51e4aa7f31d2fee03d66869af5f81e6383aa840f503c2cad46f3655f53b784ebca7b3480efb53eea2a04
+DIST ansi-wl-pprint-1.0.2.tar.gz 5699 BLAKE2B cd644c9a0cfc3d99470b3755e159b60faf4433132701aac9746425c38e40fc16c0fcf5405ebb05ed972e49194d90abbb0bb90a41bcdefc217e8664646964432e SHA512 2b6db1f25b180f53f2a81d2658d36f91d7b112aa242709e0693712ea6974cb0790ea56789678e714cd572ea226f2803484af572ae6fc7c4dc84536020701e3ac
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
deleted file mode 100644
index 431e2141b3d2..000000000000
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
-HOMEPAGE="https://github.com/batterseapower/ansi-wl-pprint"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="example"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag example example)
-}
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
deleted file mode 100644
index 0c0665c9290e..000000000000
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
-HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="example"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag example example)
-}
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild
deleted file mode 100644
index ca01de330e4b..000000000000
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.8.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
-HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="example"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
-	>=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag example example)
-}
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'ansi-terminal >= 0.4.0 && < 0.9' 'ansi-terminal >= 0.4.0'
-}
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild
new file mode 100644
index 000000000000..685e910d628e
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
+HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples example)
+}
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-1.0.2.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-1.0.2.ebuild
new file mode 100644
index 000000000000..98c3fd2836cc
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-1.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
+HOMEPAGE="https://github.com/ekmett/ansi-wl-pprint"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-haskell/prettyprinter-compat-ansi-wl-pprint-1.0.2:=[profile?] <dev-haskell/prettyprinter-compat-ansi-wl-pprint-1.0.3:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	examples? (
+		dev-haskell/ansi-terminal:=[profile?]
+		dev-haskell/prettyprinter:=[profile?]
+		dev-haskell/prettyprinter-ansi-terminal:=[profile?]
+		dev-haskell/text:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples example)
+}
diff --git a/dev-haskell/ansi-wl-pprint/metadata.xml b/dev-haskell/ansi-wl-pprint/metadata.xml
index 2ffd00b91707..65ffa89968bc 100644
--- a/dev-haskell/ansi-wl-pprint/metadata.xml
+++ b/dev-haskell/ansi-wl-pprint/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This is a pretty printing library based on Wadler's paper "A Prettier Printer". It has been enhanced with support for ANSI terminal colored output using the ansi-terminal package.
-	</longdescription>
-	<use>
-		<flag name="example">Build the example application.</flag>
-	</use>
 	<upstream>
-		<remote-id type="github">batterseapower/ansi-wl-pprint</remote-id>
+		<remote-id type="hackage">ansi-wl-pprint</remote-id>
+		<remote-id type="github">ekmett/ansi-wl-pprint</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/appar/Manifest b/dev-haskell/appar/Manifest
index ae8842816921..467db224c579 100644
--- a/dev-haskell/appar/Manifest
+++ b/dev-haskell/appar/Manifest
@@ -1,2 +1 @@
-DIST appar-0.1.4.tar.gz 3904 BLAKE2B bf9be10c63f5cf33b034f771fe38496daf178c251c8f0c1d2d923b524b6de6bfd2583ab2e41dc5319238a7d7e902836684f1363a1c8dbd6aeb9b0114f69b2d6f SHA512 cc4d7a0c910e20ae32f787db894fec29374aed19c208a79012f78e048bdc8383262f124187242654ca7df981647644b9cabb6fd3a4af8d02d7c4e90b46e726ac
 DIST appar-0.1.8.tar.gz 4037 BLAKE2B 1f8bfdaadbbbb6c950aabdcefe13df9b4325eb7e78a3c0f3f26285196f23c8427e867db79472aa08dfaa932b0cdc02303f02288c9f158d5158e2327da44c8577 SHA512 6954f4e966685fc47d91b34c527c524bdea29d2c8eba14f4c4ed1d268ee812926d23d2daf1b63c92b72d99be83b536f7ebc498f5981f8f4cd5c3c1e7769f0290
diff --git a/dev-haskell/appar/appar-0.1.4.ebuild b/dev-haskell/appar/appar-0.1.4.ebuild
deleted file mode 100644
index 6d2c91a37786..000000000000
--- a/dev-haskell/appar/appar-0.1.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple applicative parser"
-HOMEPAGE="https://hackage.haskell.org/package/appar"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/appar/appar-0.1.8.ebuild b/dev-haskell/appar/appar-0.1.8.ebuild
index eda1f1780826..24b4ad8aa020 100644
--- a/dev-haskell/appar/appar-0.1.8.ebuild
+++ b/dev-haskell/appar/appar-0.1.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
diff --git a/dev-haskell/appar/metadata.xml b/dev-haskell/appar/metadata.xml
index 14c1fd1f6ab3..937381521944 100644
--- a/dev-haskell/appar/metadata.xml
+++ b/dev-haskell/appar/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A simple applicative parser in Parsec style
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/argparser/Manifest b/dev-haskell/argparser/Manifest
deleted file mode 100644
index 337cc1b01a4d..000000000000
--- a/dev-haskell/argparser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST argparser-0.3.4.tar.gz 14562 BLAKE2B d3c8fa436f9cc63f5d344423b88290363eab401cc82b53ebd0a638e1020031c4994aa0d5e10b1868579e8a0f6beed7df2a908a834e735179546d10a85358692e SHA512 c7aa03426e42df57ea02ad86d044624ce8e7c0e5b3ce124434fa64a172c8dbf70001e1353b9d3bb15ad780535adc8c0426939d1b26e52a7c51b17987fc72d7d7
diff --git a/dev-haskell/argparser/argparser-0.3.4.ebuild b/dev-haskell/argparser/argparser-0.3.4.ebuild
deleted file mode 100644
index fdc8a77e44d0..000000000000
--- a/dev-haskell/argparser/argparser-0.3.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Command line parsing framework for console applications"
-HOMEPAGE="https://hackage.haskell.org/package/argparser"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >dev-haskell/htf-0.9
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/argparser/metadata.xml b/dev-haskell/argparser/metadata.xml
deleted file mode 100644
index 4723062c2054..000000000000
--- a/dev-haskell/argparser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a combinator library for defining a command line parser.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/arithmoi/Manifest b/dev-haskell/arithmoi/Manifest
deleted file mode 100644
index f1cbc8d5c3d7..000000000000
--- a/dev-haskell/arithmoi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arithmoi-0.4.1.3.tar.gz 66196 BLAKE2B d576f3cace1ea39a55b6e9bcc3e3e6d941fe8ec6a0b31435f404bb0151a4170d4079cad96eefbb319c08ecc3aae5ab6141500b75925617b5fa4e6c86539fe93c SHA512 abc5939207e502dffd91b3a4e2b9c688eef388a6b9354576fcb4badf4625da1cad0e9698cb42b293b37cc29427ad2679170452374fbf6cd5e614d53db34cd9f6
-DIST arithmoi-0.4.2.0.tar.gz 84676 BLAKE2B 971b2ba5cca0e2af9944a06f02f02b5ff2c0e613a3c3f6963fdd906c4d617ab19ceabc8bc16f8c7fe12d6fd540c439b1af138da7bed75494cdb3d4f41993e255 SHA512 687f12aef8baf98c778498b9a0bb33f0ac3175d009ba8dcd14d6ff8bb13252120f6821e80932410a1413637b591f81b92e0ecd25cd7870464e1629f3d0bf866c
-DIST arithmoi-0.4.3.0.tar.gz 93661 BLAKE2B ff815ab9bcd8bd5ccbfcdde134049e98aebaf3c41b693b56c8048d918cc778fcb4ab321486d20b4084a61e340c0a00ae45541c12da4f8d19c7e28df81168a4a7 SHA512 0c67237a84a2c7e2abc1bbc78176e64e7f6ac23399c765dba316d429391f351734eacb924960d69d4fc603b17a4df1b40985bcbc8bbb7c51805eb72a0346b545
diff --git a/dev-haskell/arithmoi/arithmoi-0.4.1.3.ebuild b/dev-haskell/arithmoi/arithmoi-0.4.1.3.ebuild
deleted file mode 100644
index 1373b0dff83a..000000000000
--- a/dev-haskell/arithmoi/arithmoi-0.4.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient basic number-theoretic functions. Primes, powers, integer logarithms"
-HOMEPAGE="https://github.com/cartazio/arithmoi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-llvm
-}
diff --git a/dev-haskell/arithmoi/arithmoi-0.4.2.0.ebuild b/dev-haskell/arithmoi/arithmoi-0.4.2.0.ebuild
deleted file mode 100644
index 9cd1dac878e7..000000000000
--- a/dev-haskell/arithmoi/arithmoi-0.4.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -check-bounds
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient basic number-theoretic functions. Primes, powers, integer logarithms"
-HOMEPAGE="https://github.com/cartazio/arithmoi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.1 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check-bounds
-}
diff --git a/dev-haskell/arithmoi/arithmoi-0.4.3.0.ebuild b/dev-haskell/arithmoi/arithmoi-0.4.3.0.ebuild
deleted file mode 100644
index 9dbab2e1c796..000000000000
--- a/dev-haskell/arithmoi/arithmoi-0.4.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -check-bounds
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient basic number-theoretic functions. Primes, powers, integer logarithms"
-HOMEPAGE="https://github.com/cartazio/arithmoi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.7.6 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/smallcheck-1.1 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9
-		>=dev-haskell/transformers-compat-0.4 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check-bounds
-}
diff --git a/dev-haskell/arithmoi/metadata.xml b/dev-haskell/arithmoi/metadata.xml
deleted file mode 100644
index c32026c57e0a..000000000000
--- a/dev-haskell/arithmoi/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library of basic functionality needed for
-		number-theoretic calculations. The aim of this library
-		is to provide efficient implementations of the functions.
-		Primes and related things (totients, factorisation),
-		powers (integer roots and tests, modular exponentiation),
-		integer logarithms.
-		Note: Requires GHC &gt;= 6.12 with the integer-gmp package
-		for efficiency. Portability is on the to-do list (with
-		low priority, however).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">cartazio/arithmoi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/arrows/Manifest b/dev-haskell/arrows/Manifest
deleted file mode 100644
index 1672acc0144e..000000000000
--- a/dev-haskell/arrows/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST arrows-0.4.4.1.tar.gz 12261 BLAKE2B b5272da27d18c11b91ccbf7bd27cbfebfed0ffeab6ea36fcb10f932c73a05a4ac9410e46f363ae54231e73c5221420192a28bd50e0ed879241b127b0235b1cf3 SHA512 642bc893ba5a01d139498fdd8d97531daf76c583eee3317ee7b0cb15bdd5304022a0c7d9280d1eef58bba40de9782cea01325c8fed45232c15261c49b060d352
-DIST arrows-0.4.4.2.tar.gz 12701 BLAKE2B b8654f3a4a2b86dba64ccd307d6344522d9622989b5d0c0394dc534a994dcd11867aa15702d16ea330c5772931e0fd8dbcb140124ddee8a7713fd208004edcb3 SHA512 596d5433c49bd20960533f6d773af7d07ae71f90dd2badc426ba1fba473bf28e29308861f1f7b7c3fc775e968cbd02bb421342258f77028ac41185d41970f64a
diff --git a/dev-haskell/arrows/arrows-0.4.4.1-r1.ebuild b/dev-haskell/arrows/arrows-0.4.4.1-r1.ebuild
deleted file mode 100644
index ce9124ad5848..000000000000
--- a/dev-haskell/arrows/arrows-0.4.4.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Arrow classes and transformers"
-HOMEPAGE="https://www.haskell.org/arrows/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stream:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/arrows/arrows-0.4.4.2.ebuild b/dev-haskell/arrows/arrows-0.4.4.2.ebuild
deleted file mode 100644
index b43f01473700..000000000000
--- a/dev-haskell/arrows/arrows-0.4.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Arrow classes and transformers"
-HOMEPAGE="https://www.haskell.org/arrows/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stream:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/arrows/metadata.xml b/dev-haskell/arrows/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/arrows/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/ascii-progress/Manifest b/dev-haskell/ascii-progress/Manifest
deleted file mode 100644
index aae83002139e..000000000000
--- a/dev-haskell/ascii-progress/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ascii-progress-0.2.1.2.tar.gz 6385 BLAKE2B 881137613669a9e043c801769dd290d4c96c5aabeb7a50951bcb984f612be3722aa866bd48f61751538a076e97cb347b555c19932af2c25ce9233607efab01a9 SHA512 cc1a9f1d48d522fe3a8d9afe7a200c2bd4f9e573f99ccae0993af75ab15ede8bfe7630776385e680af3540661613c60cf7aa81a08b9b83b5d8f72aaf8f869b52
diff --git a/dev-haskell/ascii-progress/ascii-progress-0.2.1.2.ebuild b/dev-haskell/ascii-progress/ascii-progress-0.2.1.2.ebuild
deleted file mode 100644
index bfaf52102657..000000000000
--- a/dev-haskell/ascii-progress/ascii-progress-0.2.1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A simple progress bar for the console"
-HOMEPAGE="https://github.com/yamadapc/haskell-ascii-progress"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	>=dev-haskell/async-2.0.1.5:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	>=dev-haskell/data-default-0.5.3:=[profile?]
-	dev-haskell/http:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.6 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/ascii-progress/metadata.xml b/dev-haskell/ascii-progress/metadata.xml
deleted file mode 100644
index 0bf7ce133e01..000000000000
--- a/dev-haskell/ascii-progress/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A simple Haskell progress bar for the console. Heavily borrows from TJ
-		Holowaychuk's Node.JS project
-		&lt;https://github.com/tj/node-progress progress&gt;
-		
-		&lt;https://github.com/yamadapc/haskell-ascii-progress github&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yamadapc/haskell-ascii-progress</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/asn1-data/Manifest b/dev-haskell/asn1-data/Manifest
deleted file mode 100644
index defab5401bd6..000000000000
--- a/dev-haskell/asn1-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST asn1-data-0.7.1.tar.gz 17500 BLAKE2B 4c24167096019d7834c8ebb6fe3d36b41ac366042ea69aa7e0fbc745af7d05bf204e15d4137f2b57ef2f30f5c2cd4905859cf6deedda4966412a23a3c2bcac90 SHA512 dc6021daf15e5f9b93703641780c6d81c6b385d2127bcc2f735ecaf54d1be5163ad5e9ae291a3e223ff05cf03e8bbf11af0791ee810a0ba174e9cc9e9fd910d0
-DIST asn1-data-0.7.2.tar.gz 17672 BLAKE2B a4d088400c58efe6528f49eb728f5be902f91fe8de32391e1267ec5ba596c51095df91444b41577d52554778e4589121c9d65243f0fb744277ce933729b062fa SHA512 739c2a9e99a978ba5384da5d5ed388554471f2f6e898c9e07f26de6c6d48bbb236d83b6e2281be7ce4d9db6225acb230010393e1cd368ef9cf4f65eddb8e1e38
diff --git a/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild b/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild
deleted file mode 100644
index 57ddbe06aacf..000000000000
--- a/dev-haskell/asn1-data/asn1-data-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild b/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild
deleted file mode 100644
index b0b445edcae0..000000000000
--- a/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test
-}
diff --git a/dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch b/dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch
deleted file mode 100644
index 8bf958454bef..000000000000
--- a/dev-haskell/asn1-data/files/asn1-data-0.7.1-ghc-7.10.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Data/ASN1/Parse.hs b/Data/ASN1/Parse.hs
-index eeea2be..83bc80e 100644
---- a/Data/ASN1/Parse.hs
-+++ b/Data/ASN1/Parse.hs
-@@ -24 +24 @@ import Control.Monad.Error
--import Control.Applicative ((<$>))
-+import Control.Applicative ((<$>), Applicative)
-@@ -25,7 +25,7 @@ import Control.Applicative ((<$>))
- 
- -- | Parse ASN1 Monad
- newtype ParseASN1 a = P { runP :: ErrorT String (State [ASN1]) a }
--        deriving (Functor, Monad, MonadError String)
-+        deriving (Functor, Applicative, Monad, MonadError String)
- 
- -- | run the parse monad over a stream and returns the result and the remaining ASN1 Stream.
- runParseASN1State :: ParseASN1 a -> [ASN1] -> Either String (a,[ASN1])
diff --git a/dev-haskell/asn1-data/metadata.xml b/dev-haskell/asn1-data/metadata.xml
deleted file mode 100644
index 03e145ac586e..000000000000
--- a/dev-haskell/asn1-data/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ASN1 data reader and writer in raw form with supports for high level forms of ASN1 (BER, CER and DER).
-		
-		All interfaces use the enumerator interface.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-asn1-data</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/asn1-encoding/Manifest b/dev-haskell/asn1-encoding/Manifest
index d71a932b3032..2f1c7490b709 100644
--- a/dev-haskell/asn1-encoding/Manifest
+++ b/dev-haskell/asn1-encoding/Manifest
@@ -1,5 +1 @@
-DIST asn1-encoding-0.8.1.3.tar.gz 16099 BLAKE2B ef97e3cc0d40fcaa98d319f373efb7807cfbb890ce9b23f3e1f3af7ad56e005478ea387f5a35cbc59a719cddbe98bcf5b6e75a75c71106570f5f959a5f8e6d42 SHA512 be5d97db5904cb71fd99db919a6da8e958b3e0aedaea6bbd21d316fc41dd79852d8567edecb75eb212279a9f6af3d566d3e8aa5f5f22f46a8d9ca0883af64dd9
-DIST asn1-encoding-0.9.0.tar.gz 15997 BLAKE2B 3e5aa3aadec8495303528d868b7eb76c3ebaa8f915fd73149cefc2fc7f87eae053456dd02a986f86e08ab0e25fa7f21ec7dbbd2898934af54b6bf9aeaa02deb8 SHA512 b7693c74ba01d46d93371faa1df14bdef233b8b0fcbd4de0d6a853e41795622e1edc79c278372976454107d97f8a6ba10c44cab2539103796d56b9df4fa4b0ee
-DIST asn1-encoding-0.9.3.tar.gz 16069 BLAKE2B 6929de8cccb95ce918f74951650b8ca49007da16cb9ad7417ad7434d0bb4031d2d5b906c0fbb4d643ae6fc290da90b47546b9f6cd171fdbcb51328226dd12c1c SHA512 c6e2f45403504da1740fb581083306ce1fbdaa54f9aa05f5c80a67517ad1d82140fde887cc88e0a6c9b9d778ada2013b6725c4debd1e7522729434b246ce1160
-DIST asn1-encoding-0.9.4.tar.gz 16127 BLAKE2B 247a3561aa9113c6b5c4cea846404cbdb00c1800f07fd636b0e79da109ef9c39d98ea04bd360bfcee26e0386ad2a314195ec4855fb72fc35e644048d2821ba6f SHA512 d9d8d6208a9d4eb6e106918b2c35ce026c5c5f0108263378b10dc1bffaf46c5737a557bbcb68f912bbe3c89b01e8be9c7c6dd0125fe29e19dcbcd30840317955
 DIST asn1-encoding-0.9.6.tar.gz 17343 BLAKE2B 6730f92353469ddb618c3537712b01c5537ed8a1733ad559d58371c28442102fcd05ebcce01cf9bc45bb1f85cb6e57dd3f8acdfef6103551139c4f4a2a01e162 SHA512 e31362881ebec21be5dab1c46284ea6e2571dd87f5c730690787303363a01712945ba85969c39bb2e2d76f9bcefce5d3bad247564e4b6959008804346f65fc9c
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.8.1.3.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.8.1.3.ebuild
deleted file mode 100644
index 5413f76530ea..000000000000
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.8.1.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/asn1-types-0.2.1:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2:2=[profile?]
-		>=dev-haskell/test-framework-0.3:=[profile?]
-		>=dev-haskell/test-framework-quickcheck2-0.2:=[profile?] )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild
deleted file mode 100644
index ad70a428d48f..000000000000
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/hourglass-0.2.6:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck
-		dev-haskell/text )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-32bit-tests.patch
-}
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.3.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.3.ebuild
deleted file mode 100644
index 08526efbf0a0..000000000000
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/hourglass-0.2.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/mtl
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck
-		dev-haskell/text )
-"
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.4.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.4.ebuild
deleted file mode 100644
index c3a0db6ffdc8..000000000000
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ASN1 data reader and writer in RAW, BER and DER forms"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/hourglass-0.2.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/mtl
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck
-		dev-haskell/text )
-"
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
index 6157709240c4..0c343d8d18e9 100644
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
+++ b/dev-haskell/asn1-encoding/asn1-encoding-0.9.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.1.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
diff --git a/dev-haskell/asn1-encoding/files/asn1-encoding-0.9.0-32bit-tests.patch b/dev-haskell/asn1-encoding/files/asn1-encoding-0.9.0-32bit-tests.patch
deleted file mode 100644
index 2b45be985bba..000000000000
--- a/dev-haskell/asn1-encoding/files/asn1-encoding-0.9.0-32bit-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-On 32-bit systems Hourglass silently breaks dates
-out of range '1970 +- 68' years due to use of
-'time_t' and 'gmtime_r' from installed libc.
-
-Workaround test failures by not testing times out of this range.
-
-Github-bug: https://github.com/vincenthz/hs-hourglass/issues/21
-Github-bug: https://github.com/vincenthz/hs-asn1/issues/12
-diff --git a/tests/Tests.hs b/tests/Tests.hs
-index 5a82ec9..525de82 100644
---- a/tests/Tests.hs
-+++ b/tests/Tests.hs
-@@ -88,7 +88,10 @@ instance Arbitrary BitArray where
- 
- instance Arbitrary Date where
-     arbitrary = do
--        y <- choose (1951, 2050)
-+        -- 2037 and not 2050
-+        -- due to a limitation of 'timeConvert' on 32-bit systems:
-+        --  https://github.com/vincenthz/hs-hourglass/issues/21
-+        y <- choose (1951, 2037)
-         m <- elements [ January .. December]
-         d <- choose (1, 30)
-         return $ normalizeDate $ Date y m d
diff --git a/dev-haskell/asn1-encoding/metadata.xml b/dev-haskell/asn1-encoding/metadata.xml
index 798454e0e839..a3611218cbaa 100644
--- a/dev-haskell/asn1-encoding/metadata.xml
+++ b/dev-haskell/asn1-encoding/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		ASN1 data reader and writer in raw form with supports for high level forms of ASN1 (BER, and DER).
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-asn1</remote-id>
 	</upstream>
diff --git a/dev-haskell/asn1-parse/Manifest b/dev-haskell/asn1-parse/Manifest
index 9e446e406fd2..3794cabd26f3 100644
--- a/dev-haskell/asn1-parse/Manifest
+++ b/dev-haskell/asn1-parse/Manifest
@@ -1,3 +1 @@
-DIST asn1-parse-0.8.1.tar.gz 2724 BLAKE2B 5caca79503128c9971ba1a66fe52de5fc5dcf854495562262e540c74c48aa21168399f09811d518e506bbb6fd89222dafbf074d310a4b5cd63be3a60ac0e71ef SHA512 d175903a4e2eacaf56b3c641c3a78adebfdbe263678a59c0ba44d5c1185408800f1aabad3d0ce622fe1029e204699477b36565df5bd1049ebba0df10f72eb128
-DIST asn1-parse-0.9.1.tar.gz 2785 BLAKE2B 829fe0a8cf9e1bd5b69207ac8c197e73511236d8c6260196c1ccff8ec78965ce8a6434abdf227607e0b56cd57a0af6501bcca3653518258aa93fceee5868ca92 SHA512 69799adf27188a8b1468cfc35c5a17ffe668aa30f585e8d8ff0b9153936a8825e9d548fca38d8e4ea5823ae511f179c5b56c5fe804260048bd3c5e373a077d17
-DIST asn1-parse-0.9.4.tar.gz 2860 BLAKE2B 9e9d1ae63a125215143ec31f10149fb3cd4e821c83b91e99031de8fabe73cd0c91ebba6c2ca77ec78a2093e5d1760483f4174e409d957f5f86045b91444b85c4 SHA512 10579753addf0580d33f2d7d8571bedb3b4ff3d485891dd7db8b75ae09550cbd42ee9d00a452263810079eeb77ec630687b193a6d4b538bfdb683b92c9e64637
+DIST asn1-parse-0.9.5.tar.gz 2951 BLAKE2B 000ef16e2ecca8e8b045dcb9c5b21955ca75b957380f47c6707b7083a22980bf45ed89007fdc1fe9f46f167513aefcfb713457ce0cb192522d14414bc8e76356 SHA512 d352422479a4bb31a6c7ea02fc3da701d1417bb37a9f029636f6e2646530e4bd8a8de65e192b2beaa5b0b115487c45f42252acf05f58e5f513dea4c81be59a7f
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.8.1.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.8.1.ebuild
deleted file mode 100644
index 464ce4971ae5..000000000000
--- a/dev-haskell/asn1-parse/asn1-parse-0.8.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monadic parser for ASN1 stream types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.8:=[profile?]
-	>=dev-haskell/asn1-types-0.2:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild
deleted file mode 100644
index 6a61113e5c3e..000000000000
--- a/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monadic parser for ASN1 stream types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild
deleted file mode 100644
index 24224124c10a..000000000000
--- a/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monadic parser for ASN1 stream types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild
new file mode 100644
index 000000000000..c23dee5ce33e
--- /dev/null
+++ b/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple monadic parser for ASN1 stream types"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1"
+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/asn1-encoding-0.9:=[profile?]
+	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/asn1-parse/metadata.xml b/dev-haskell/asn1-parse/metadata.xml
index 26861d6a2692..a3611218cbaa 100644
--- a/dev-haskell/asn1-parse/metadata.xml
+++ b/dev-haskell/asn1-parse/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Simple monadic parser for ASN1 stream types, when ASN1 pattern matching is not convenient.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-asn1</remote-id>
 	</upstream>
diff --git a/dev-haskell/asn1-types/Manifest b/dev-haskell/asn1-types/Manifest
index 743eba5ffd4d..28fbedd10480 100644
--- a/dev-haskell/asn1-types/Manifest
+++ b/dev-haskell/asn1-types/Manifest
@@ -1,5 +1,2 @@
-DIST asn1-types-0.2.0.tar.gz 5248 BLAKE2B b84ede6c89da0d73937a2fd08d5f9fce230ebd5f9882fda948d6b6e1efbe2c614d694f435c2fa7afff3b29ae6172bf5a3d2257804f8815b42d91f3dda1bb8321 SHA512 da28b3565c74eba8faf5de4f9cb24d90242412d4fbc358199b803c1f0b50c6c4dca89aada813d7126fb482300cfd3d43130be2f700d4c7943de2966870936cd9
-DIST asn1-types-0.2.3.tar.gz 5411 BLAKE2B 4309a5fa877d46898f446b995dfb37414f0110acef42ed96353589cacf8a2cb8c9a9fae922215baf3eac2d0c8c3561c5f5bac6e877acf761cf0bbf8fc9fa2b81 SHA512 09074e2fbadd2cb79f8c8cd7fb2d64794d7bcfe09a9eea345b98895ad855ea187fb33882c420a380ee362e61990824d6b365e75ed5fa429d994bd7e0582ddbdf
-DIST asn1-types-0.3.0.tar.gz 5391 BLAKE2B 506ca6f853911f3b412ebc8bed53558976b1229c30fa0ea2fde2b84b747bc5a13e63e43be042ebd911f9dc527603776d7d7fc865086c5ac8a3861fe6994bbc76 SHA512 7955320acb2a7801cc268d8cc7bbf2a9c8c127b151d89c1abffd0994f6cecb57979b25612f7efc922c82d9abeb7dc5ff6db2d08e26fdd1c36a6bfcd428b122be
-DIST asn1-types-0.3.2.tar.gz 6424 BLAKE2B 6c3a0016297b928a6744e6068cad7fa159151c5b726e961e8b918f576bf2e7cf8df9e2ded904517ee4afe4a64b4437e0d38f073569893a37eade6a52d9b481d8 SHA512 d5eb4c9f4fc44ff06b4d0d4c6be4ad2b43e01478de6ca48d2a78bad69d828f1c48095ccb4542546357f8934141b4c96f156d954072b91f1695ef1536ddc50e08
 DIST asn1-types-0.3.3.tar.gz 6478 BLAKE2B 3ed6229e8eb1215e47dbbe6791598744ab99a8613c3c5401a504a88f84d9ed82170b2372a19935458d619eb28d9e633d3d5cec324c453b5b67e50a95af2b730b SHA512 d83fca6d585103f7d112a314bfa4da98bf055cbc7541b55717db6260295fcb7dd96d1ac9a25e39ea31881f1a8454d19ed004d59f3c20118b26ef155a99ec5278
+DIST asn1-types-0.3.4.tar.gz 6472 BLAKE2B 429381cd73b1ce99f0ca73f95d767eed6b0286cde2c95605427547eaa7cd81a72fa1c72cfb562dcb253f3acb15c71a445e516d6901436c3eabc643353b1a5807 SHA512 0c2b76f134a77da65ecaa797d92b2ee273a72e9bd4467d354012c2b584216cdf2084974393fa4b850207720a3e0801d4a5af5f15137574ff1d7a341c5014184d
diff --git a/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild b/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild
deleted file mode 100644
index 1a71982ebaa9..000000000000
--- a/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN.1 types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/asn1-types/asn1-types-0.2.3.ebuild b/dev-haskell/asn1-types/asn1-types-0.2.3.ebuild
deleted file mode 100644
index 5021d0c80c99..000000000000
--- a/dev-haskell/asn1-types/asn1-types-0.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN.1 types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild
deleted file mode 100644
index 2743f9fcf58d..000000000000
--- a/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN.1 types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hourglass:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.2.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.2.ebuild
deleted file mode 100644
index c5e3907a1efd..000000000000
--- a/dev-haskell/asn1-types/asn1-types-0.3.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="ASN.1 types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1/tree/master/types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
index e1e050ef0dde..83b3ca1d397b 100644
--- a/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
+++ b/dev-haskell/asn1-types/asn1-types-0.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hourglass:=[profile?]
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.4.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.4.ebuild
new file mode 100644
index 000000000000..5f7ea1e863d3
--- /dev/null
+++ b/dev-haskell/asn1-types/asn1-types-0.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ASN.1 types"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1"
+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/hourglass:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/asn1-types/metadata.xml b/dev-haskell/asn1-types/metadata.xml
index a2d6d3d44b11..07b9d41ed273 100644
--- a/dev-haskell/asn1-types/metadata.xml
+++ b/dev-haskell/asn1-types/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		ASN.1 standard types
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-asn1-types</remote-id>
 	</upstream>
diff --git a/dev-haskell/assoc/Manifest b/dev-haskell/assoc/Manifest
new file mode 100644
index 000000000000..e17310607d2b
--- /dev/null
+++ b/dev-haskell/assoc/Manifest
@@ -0,0 +1,2 @@
+DIST assoc-1.0.2.tar.gz 3047 BLAKE2B 07f409ce555ac5f041d83db94829638e00ec50175499d42263f19570bc9f58788522ba4edc058450e90912b75aa21f7bfbdcd054cd5025a4aa0cb88b74020c9d SHA512 20fd0056dcc2dff9504e090be5c2ef27692a795133620e60b9382cfdfbaf26d1019617acf48f0f762e22d699068bc4dbd35a714177ce3a36761c0065708b9168
+DIST assoc-1.1.tar.gz 3193 BLAKE2B fd5a68cc7040a48c7a5c4b8e3e525d92dff9e3f3a03b0fa8b3e7eada2aafbaf92a0fbed671935b3192b8a5b3a5a8e903be63715ceecca7fb6d00c80adfabd251 SHA512 1ce6f3ca4ce9de3457b07ef995ec1819b0013bf90ee20c97ef7152b164c6751ea7f435ae28e4b55e9976ffa720aed7e2491daf5254480dd4b980e23d3420e9bb
diff --git a/dev-haskell/assoc/assoc-1.0.2.ebuild b/dev-haskell/assoc/assoc-1.0.2.ebuild
new file mode 100644
index 000000000000..78322c8ab38b
--- /dev/null
+++ b/dev-haskell/assoc/assoc-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="swap and assoc: Symmetric and Semigroupy Bifunctors"
+HOMEPAGE="https://hackage.haskell.org/package/assoc"
+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/bifunctors-5.5.5:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
+
+CABAL_CHDEPS=(
+	'base        >=4.3   && <4.15' 'base        >=4.3'
+)
diff --git a/dev-haskell/assoc/assoc-1.1.ebuild b/dev-haskell/assoc/assoc-1.1.ebuild
new file mode 100644
index 000000000000..da591fd067ca
--- /dev/null
+++ b/dev-haskell/assoc/assoc-1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="swap and assoc: Symmetric and Semigroupy Bifunctors"
+HOMEPAGE="https://hackage.haskell.org/package/assoc"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+tagged"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+	tagged? (
+		>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/assoc/metadata.xml b/dev-haskell/assoc/metadata.xml
new file mode 100644
index 000000000000..36be56b76ead
--- /dev/null
+++ b/dev-haskell/assoc/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+	<use>
+		<flag name="tagged">You can disable the use of the `tagged` package using `-f-tagged`.
+
+Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">assoc</remote-id>
+		<remote-id type="github">phadej/assoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/async/Manifest b/dev-haskell/async/Manifest
index 119f48535bbb..55c58a488c27 100644
--- a/dev-haskell/async/Manifest
+++ b/dev-haskell/async/Manifest
@@ -1,4 +1,2 @@
-DIST async-2.0.1.4.tar.gz 8349 BLAKE2B 3323c08beddd482a3d0442fd64afebabb01cd8307dae2650ee27687ca247c73eaf0ce45f953180ecf4f706705041933cd0387699ca1592d72b63761932b47790 SHA512 8b170644ce92f9788e22771239542e46ee14b9898404744f6a97b955ef22ae4b3fa280ea759f228cb22f2083b5ee007f39c61063f82e5cce8f6bf1c6df789a71
-DIST async-2.0.2.tar.gz 8565 BLAKE2B 8bda599c7a5bd30b67d73de87f136eae3535619e3eb274b928f6536cc2c4f6f03d73ff31e619f8681449fdf501aa08b83c2324e1121ffcfeaa69d732df7675d7 SHA512 beac3452aca98f9c41fb86b1b9e105a324df5a05e10c7d616927bb94888d6d2ed5385e0ec901fdfa050a43e991f5089757d3941ce97db98c148a159893bddc1e
-DIST async-2.1.1.tar.gz 10565 BLAKE2B a379efe6df6c58d1962d820b0f1370c87af487b61f7c3ed32fb22398d77be8265a9577d44793624fd8b0d41c930c2f94106511d816df9600e7b7a17b897641bc SHA512 85a878389f019df0038f7b0ea82e8619f30eed97cc5c53438dbcaef128c08cdf5658afa203605434a2e1eb885fc28515a30c83341cb1b77331362205d521972b
-DIST async-2.2.2.tar.gz 12927 BLAKE2B a0fa95525153e1065888072d4c7590a6184fbbedd957d0a7867235414681c9959be385a75007160d50fb3a9e015c83651175c4399f24b7a0d981cfbe0f8bf250 SHA512 6984c74b76dc1db73363ca2e360d2be6f2e7b4de5c7de452c4df7ee996b2256790a8cecb532af6d7d675541315a16f8e4ce566c5f79e4102e4a857f057e2d811
+DIST async-2.2.4-rev3.cabal 3112 BLAKE2B f6ba4c03655f37c60e45a5033b7d5a5c229e7db42544e9a960068d9c8852b1731f9907f7df2e554b3e461e1aba49cc8569eb74dda34b7b7874959165c3e86d05 SHA512 607f99484695767eb69b8650247cc6ca9a9d5e74eafa81d42dc01aa735dd2e6eec3021fbc232cafc4573e630f981ab31e090c6de04b99e2f0d450ea664dca3ea
+DIST async-2.2.4.tar.gz 14148 BLAKE2B c47e47a4bbe98d05bdd6b8ad89888013643f36ea5ede8af306b98749cec3cf9c3e87330339af4152cf7e84f5b9ced39c1eb69079921d4c0b7c993191bc052c2d SHA512 24f37f974dd7573138475d04c0fccb97fcbd8b3de56f7d06199b8f936fd9a29cd0ba0574212a753a81de8958b3292ecee79d0e8d0d2f51eb91874424e6219569
diff --git a/dev-haskell/async/async-2.0.1.4.ebuild b/dev-haskell/async/async-2.0.1.4.ebuild
deleted file mode 100644
index e28d980b1ffa..000000000000
--- a/dev-haskell/async/async-2.0.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.2:=[profile?]
-		<dev-haskell/stm-2.5:=[profile?]
-		>=dev-lang/ghc-7.0.1:="
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-		)
-		>=dev-haskell/cabal-1.8"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.3 && < 4.7' 'base >= 4.3'
-}
diff --git a/dev-haskell/async/async-2.0.2.ebuild b/dev-haskell/async/async-2.0.2.ebuild
deleted file mode 100644
index ae4a6972f17b..000000000000
--- a/dev-haskell/async/async-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/async/async-2.1.1.ebuild b/dev-haskell/async/async-2.1.1.ebuild
deleted file mode 100644
index 82258ee2f15b..000000000000
--- a/dev-haskell/async/async-2.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/async/async-2.2.2.ebuild b/dev-haskell/async/async-2.2.2.ebuild
deleted file mode 100644
index 56eecdbe0d44..000000000000
--- a/dev-haskell/async/async-2.2.2.ebuild
+++ /dev/null
@@ -1,42 +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.1.9999
-#hackport: flags: -bench
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Run IO operations asynchronously and wait for their results"
-HOMEPAGE="https://github.com/simonmar/async"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-2.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.3 && < 4.14' 'base >= 4.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bench
-}
diff --git a/dev-haskell/async/async-2.2.4-r1.ebuild b/dev-haskell/async/async-2.2.4-r1.ebuild
new file mode 100644
index 000000000000..2b522272e173
--- /dev/null
+++ b/dev-haskell/async/async-2.2.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -bench
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Run IO operations asynchronously and wait for their results"
+HOMEPAGE="https://github.com/simonmar/async"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/hashable-1.1.2.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		dev-haskell/hunit
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bench
+}
diff --git a/dev-haskell/async/metadata.xml b/dev-haskell/async/metadata.xml
index 85a5a5773f03..fadb019c43bb 100644
--- a/dev-haskell/async/metadata.xml
+++ b/dev-haskell/async/metadata.xml
@@ -1,53 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a higher-level interface over
-		threads, in which an @Async a@ is a concurrent
-		thread that will eventually deliver a value of
-		type @a@.  The package provides ways to create
-		@Async@ computations, wait for their results, and
-		cancel them.
-		
-		Using @Async@ is safer than using threads in two
-		ways:
-		
-		* When waiting for a thread to return a result,
-		if the thread dies with an exception then the
-		caller must either re-throw the exception
-		('wait') or handle it ('waitCatch'); the
-		exception cannot be ignored.
-		
-		* The API makes it possible to build a tree of
-		threads that are automatically killed when
-		their parent dies (see 'withAsync').
-		
-		Changes in 2.0.1.3:
-		
-		* Bump @base@ dependency to allow 4.6
-		
-		Changes in 2.0.1.2:
-		
-		* Bump @stm@ dependency to 2.4
-		
-		Changes in 2.0.1.1:
-		
-		* Safe Haskell support: @Control.Concurrent.Async@ is now @Trustworthy@
-		
-		Changes in 2.0.1.0:
-		
-		* Added a @Functor@ instance for @Async@
-		
-		* Added @asyncBound@, @asyncOn@, @asyncWithUnmask@, @asyncOnWithUnmask@, @withAsyncBound@, @withAsyncOn@, @withAsyncWithUnmask@, @withAsyncOnWithUnmask@.
-		
-		* Added @mapConcurrently@
-		
-		* Added @Concurrently@ (with @Applicative@ and @Alternative@ instances)
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">async</remote-id>
 		<remote-id type="github">simonmar/async</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/atomic-primops/Manifest b/dev-haskell/atomic-primops/Manifest
index 79e296ebd790..f6726618f84e 100644
--- a/dev-haskell/atomic-primops/Manifest
+++ b/dev-haskell/atomic-primops/Manifest
@@ -1,5 +1 @@
-DIST atomic-primops-0.4.tar.gz 24982 BLAKE2B c8b730a6eb7c8ed438b56b1fab88d318ee1ebfc9455ff0383655481fc695078de6b86d4db97fc2be5aa147fe9f5e08594a9605eff687b11b0a01970254949403 SHA512 981610ad2aa22a9e8a629f04bbf5d42f3a62dabde9787c2481597357a6f7bf9b894bc2c1bab8dfc92002789021704e2725abecac55a4fbd4c263821327cd8023
-DIST atomic-primops-0.6.1.1.tar.gz 30423 BLAKE2B 623ac4829251532003df6e2c5609240554c644a0172f6e6c5ca9fd14b469c5647eb19875af46e49f1887687f98a9bd256ef8904b8eabb1e843b04323975dee42 SHA512 02e1fd969320fb477b430b57333aba09fe4dabc04df9d03ea6996d6d11d6f2b442d28828d7cf77690fae35f3a90cc2222054466acdd214b5c5bde3cbdaf3b94e
-DIST atomic-primops-0.7.tar.gz 30560 BLAKE2B b1ff65b125f29b35a846e217d8e5a95a489924ae131cbbd877d1957de40ba6d244d99fbd8711c8e267fe0f9d8154152c2670ec32ac0a7dd6fb283f12a3aeb616 SHA512 5231515cb37e4f31b35232ff60ee8bd9c273ee8c9c1e08cb5c84b82d3381afb9301979a4774362145be22c08d5c4852afaaa3c7d67b8e1613abbb477c533b8a4
-DIST atomic-primops-0.8.0.4.tar.gz 34075 BLAKE2B 7f1c25d5ff200965704cebd9f7e9abda83e1e14893278cc3b4a44bc48e1cf409c885ceb1670244acdf19ef47e11ffc16b56872c41917983f3fd5b0abd1226f7c SHA512 c130d1f51093f2f6c80c15ff4f8f92ca9cc6c81f9e00d1ead5b87bb13f4998b5234a005a2ff6d62d4e33355c08dcd83a06981fb8a6332d1ed21cbdafebcf1194
-DIST atomic-primops-0.8.3.tar.gz 34880 BLAKE2B 44bda52c0e6f52fe6663f70b4f55b630fe89bb12e41f50134b54f51524a9f839aacf65e658cba72f8071a188db7b6b09ab81ccfaf95354d52dfe2a5b39befff6 SHA512 c92371741ea6e0a0208d539abea73c53269b155f3dc84ebea7b20afab5882852756a0c15fdc309c9a9d6ad575589d8f8a99adb9117bbe3d7465d97b17af08b09
+DIST atomic-primops-0.8.4.tar.gz 33639 BLAKE2B 5293b6f839599fe7a47c8f3f13a03df12fe8a5d7223a4b488a86b7f1f2c208ecd01f75acf7378668b4f91046221d9076875e05ca2611bb51d6ff1ad7a2e0d8f6 SHA512 a9e873e6f4eba26541d370c5ee3b81b518a1bf0f54d303d26a2065ba47eac7db1366436661b108c0648503386ffb9cb121567236c9635bf30d4e523a2d63a8b4
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild
deleted file mode 100644
index e2e6c727a616..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib haddock hoogle hscolour profile"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree-queue/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/bits-atomic:=[profile?]
-		dev-haskell/cabal:=[profile?]
-		dev-haskell/primitive:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		profile? ( !<dev-haskell/cabal-1.17 )
-		>=dev-haskell/cabal-1.8"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.6.1.1.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.6.1.1.ebuild
deleted file mode 100644
index dc888e1bc44f..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.6.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.7.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.7.ebuild
deleted file mode 100644
index dc888e1bc44f..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.0.4.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.0.4.ebuild
deleted file mode 100644
index 6df3b6ac70ff..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.8.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild
deleted file mode 100644
index 1c12a46173f3..000000000000
--- a/dev-haskell/atomic-primops/atomic-primops-0.8.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
new file mode 100644
index 000000000000..40072d8e285b
--- /dev/null
+++ b/dev-haskell/atomic-primops/atomic-primops-0.8.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A safe approach to CAS and other atomic ops in Haskell"
+HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug"
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug)
+}
diff --git a/dev-haskell/atomic-primops/metadata.xml b/dev-haskell/atomic-primops/metadata.xml
index 3b5e2361d2c4..e7eb4b93a250 100644
--- a/dev-haskell/atomic-primops/metadata.xml
+++ b/dev-haskell/atomic-primops/metadata.xml
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="debug">Enable extra internal checks.</flag>
+	</use>
 	<longdescription>
-		After GHC 7.4 a new `casMutVar#` primop became available, but it's
+		After GHC 7.4 a new `casMutVar#` primop became available, but it&#39;s
 		difficult to use safely, because pointer equality is a highly
 		unstable property in Haskell.  This library provides a safer method
-		based on the concept of "Tickets".
+		based on the concept of &quot;Tickets&quot;.
 		
-		Also, this library uses the "foreign primop" capability of GHC to
+		Also, this library uses the &quot;foreign primop&quot; capability of GHC to
 		add access to other variants that may be of
 		interest, specifically, compare and swap inside an array.
+		
+		Note that as of GHC 7.8, the relevant primops have been included in GHC itself.
+		This library is engineered to work pre- and post-GHC-7.8, while exposing the
+		same interface.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
diff --git a/dev-haskell/attoparsec-aeson/Manifest b/dev-haskell/attoparsec-aeson/Manifest
new file mode 100644
index 000000000000..ef6b1a022ecf
--- /dev/null
+++ b/dev-haskell/attoparsec-aeson/Manifest
@@ -0,0 +1 @@
+DIST attoparsec-aeson-2.1.0.0.tar.gz 1484 BLAKE2B 11f65f27998f854c620f6fd196c2965d098427a81868fdd6aeb8654afb7e6489c5948b29a56946abfd7a24255a4a0dd15ee317e59e6a3e651f7b6d702a17f638 SHA512 9923fa28399257a79a52ae027ff839bf7c4f9c30560790064ffc42fd372a611d55a7f3630cf094825637cf32c7dff18a8ad02294a5c811e445cfee0a1197dd58
diff --git a/dev-haskell/attoparsec-aeson/attoparsec-aeson-2.1.0.0.ebuild b/dev-haskell/attoparsec-aeson/attoparsec-aeson-2.1.0.0.ebuild
new file mode 100644
index 000000000000..e84b4ba3d3fd
--- /dev/null
+++ b/dev-haskell/attoparsec-aeson/attoparsec-aeson-2.1.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing of aeson's Value with attoparsec"
+HOMEPAGE="https://github.com/haskell/aeson"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/attoparsec-aeson/metadata.xml b/dev-haskell/attoparsec-aeson/metadata.xml
new file mode 100644
index 000000000000..d1697fabc99e
--- /dev/null
+++ b/dev-haskell/attoparsec-aeson/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">attoparsec-aeson</remote-id>
+		<remote-id type="github">haskell/aeson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/attoparsec-conduit/Manifest b/dev-haskell/attoparsec-conduit/Manifest
deleted file mode 100644
index 608a15227f44..000000000000
--- a/dev-haskell/attoparsec-conduit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST attoparsec-conduit-1.0.1.2.tar.gz 4361 BLAKE2B f183c01074752963a9b1089cf877ecdb1e37fbcc420205e944b26c0f1927e785545f72887269f912f55ee8e74bbade607b318a89b3bac7b8d4cabc924969824c SHA512 25707a2ec55ce8da553cea00cc8b89866ada472cedfb21b4e37d477d9d405dc7b640dfc01b32878c71de886cf67c68b27c94e4911ec23850a55f648fcb1aabd7
-DIST attoparsec-conduit-1.1.0.tar.gz 1210 BLAKE2B b2a02358ff9516971d1abcca57c3c6e2eb9b83f83af3bbd9ed3b89af4977329fbf7dc9b776cef7383715d7911cfde0df41601aff07d50160c1bb3b463f3eedb6 SHA512 7a883b25cc1bfed03a35593927d51dba920fca8d29e610adb7a409807867241847583f68550cc1344a2e333639a703db860ac6c8f6e19f36595a9001e9334472
diff --git a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild b/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild
deleted file mode 100644
index 6926e9445ee6..000000000000
--- a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Consume attoparsec parsers via conduit"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-		=dev-haskell/conduit-1.0*:=[profile?]
-		>=dev-haskell/text-0.11:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/resourcet
-		)"
diff --git a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild b/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild
deleted file mode 100644
index 00a88875ab4c..000000000000
--- a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Consume attoparsec parsers via conduit. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/attoparsec-conduit/metadata.xml b/dev-haskell/attoparsec-conduit/metadata.xml
deleted file mode 100644
index f58272adb545..000000000000
--- a/dev-haskell/attoparsec-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Turn attoparsec parsers into sinks.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/attoparsec-enumerator/Manifest b/dev-haskell/attoparsec-enumerator/Manifest
deleted file mode 100644
index c7f5c7482e4a..000000000000
--- a/dev-haskell/attoparsec-enumerator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST attoparsec-enumerator-0.3.4.tar.gz 2485 BLAKE2B e5d290228bec79723b4693e1c6e56e318483e2c60fd226022fc968903cbfd25ca6b8f09a2a4376c1671b3bd2dbf72e35f1a9f39e1d0ac8187e3e9b71f0c37744 SHA512 caf6bc858c9c0f41f3ec332cf4149bdc9233cad112579eb79a20dff1893994cee365c2863a47a72fef8d30aaab1d30b506b98c3a8b8429c461811f717c8fd31d
diff --git a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
deleted file mode 100644
index 27b6b385987c..000000000000
--- a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pass input from an enumerator to an Attoparsec parser"
-HOMEPAGE="https://john-millikin.com/software/attoparsec-enumerator/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/attoparsec-enumerator/metadata.xml b/dev-haskell/attoparsec-enumerator/metadata.xml
deleted file mode 100644
index 4f48a5c05d4f..000000000000
--- a/dev-haskell/attoparsec-enumerator/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library allows an Attoparsec parser to receive input incrementally
-		from an enumerator. This could be used for parsing large files, or
-		implementing binary network protocols.
-		
-		&gt; (-# LANGUAGE OverloadedStrings #-)
-		&gt;
-		&gt; import Control.Applicative
-		&gt; import Data.Attoparsec
-		&gt; import Data.Attoparsec.Enumerator
-		&gt; import Data.Enumerator
-		&gt; import Data.Enumerator.Binary (enumHandle)
-		&gt; import Data.Enumerator.List
-		&gt; import System.IO
-		&gt;
-		&gt; parser = string "foo" &lt;|&gt; string "bar"
-		&gt;
-		&gt; main = do
-		&gt;     xy &lt;- run_ (enumHandle 1 stdin $$ do
-		&gt;         x &lt;- iterParser parser
-		&gt;         y &lt;- iterParser parser
-		&gt;         return (x, y))
-		&gt;     print xy
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/attoparsec-iso8601/Manifest b/dev-haskell/attoparsec-iso8601/Manifest
index 0e4a91f5164e..b663c7854dcd 100644
--- a/dev-haskell/attoparsec-iso8601/Manifest
+++ b/dev-haskell/attoparsec-iso8601/Manifest
@@ -1 +1,3 @@
-DIST attoparsec-iso8601-1.0.1.0.tar.gz 4317 BLAKE2B 80c7f9dc3bb52799117177daf5389882413656713d7b0671694f725110e0ebfe54d93ff6e439359556d3f0895354d3ba6994287967eda3f05c9d4d4cbc2dabc0 SHA512 a1d751d388446a7d2f628d7112b72beab338061bf2f8dc74c26549f0e93ebbb955bd9082db8a70db71cd80ceb576b22a94195c34f816eb6cecd5c584cb100e8b
+DIST attoparsec-iso8601-1.0.2.1.tar.gz 4457 BLAKE2B f613d95643c53cc01061e0ee88c1bc42a05d3b9d5f60993b1a3744b09ff74a2d039bd5c75e23696ba0c6953227dd9bcd47cbdd4be719448698cfb9774b8600a6 SHA512 7be279057d0338c5825f5a9d578df23364325e274334d0cca37a4cba6a3a626202994fa284f529b08c3e1067278f6a1fbabbcaf2769a845efdaa05605ed4a6e0
+DIST attoparsec-iso8601-1.1.0.0-rev1.cabal 1402 BLAKE2B c039631ec6d84035997dd470a9e57b834ca2708cc3b05c52bf0aed2cd62c79ba4adadb5283f7228134b8e23c98f9124c9a7fb201f77ce02e748788182e2d6c92 SHA512 551b71c88fb410d84bd284818c7882850a6916eb3ddb63eb8e1cec7bd1181275241f1f502ad59bf07eb07c39662fed5a2edade0ec83e9580791d044afd2d8477
+DIST attoparsec-iso8601-1.1.0.0.tar.gz 5564 BLAKE2B 8e4a5e43e38f5c9f1f052b4c9d25988d70c2b2b23a0a9d7df2d1158c8fe6e3c64a5453ff6b053301352816593a4c2f441723f1da826a64e9c346b3d99c7dd8bf SHA512 4613c2e1b492c4ebf30d1788e8b067592e507e226bd85caacc1844d5a486c1b9c8727117e426763122836205b7341b8603ac15566facd3f0338b55e784f4dfe0
diff --git a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
deleted file mode 100644
index e7b5c6dd1290..000000000000
--- a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +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.9999
-#hackport: flags: -developer -fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing of ISO 8601 dates, originally from aeson"
-HOMEPAGE="https://github.com/bos/aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="developer fast"
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.0.1:=[profile?]
-	>=dev-haskell/base-compat-0.9.1:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-	cabal_chdeps \
-		'base-compat >= 0.9.1 && < 0.11' 'base-compat >= 0.9.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag developer developer) \
-		--flag=-developer -fast \
-		$(cabal_flag fast fast)
-}
diff --git a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild
new file mode 100644
index 000000000000..d1abf2973fd2
--- /dev/null
+++ b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.0.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -developer,+fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing of ISO 8601 dates, originally from aeson"
+HOMEPAGE="https://github.com/haskell/aeson"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?]
+	>=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer \
+		--flag=fast
+}
diff --git a/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.1.0.0-r1.ebuild b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.1.0.0-r1.ebuild
new file mode 100644
index 000000000000..9b0f0f390a57
--- /dev/null
+++ b/dev-haskell/attoparsec-iso8601/attoparsec-iso8601-1.1.0.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing of ISO 8601 dates, originally from aeson"
+HOMEPAGE="https://github.com/haskell/aeson"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/attoparsec-0.14.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base-compat-batteries-0.10.0:=[profile?] <dev-haskell/base-compat-batteries-0.14:=[profile?]
+	>=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	|| (
+		( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3.0.0 )
+		( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+	)
+	dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/attoparsec-iso8601/metadata.xml b/dev-haskell/attoparsec-iso8601/metadata.xml
index 3aa55903869c..9623d88b74f5 100644
--- a/dev-haskell/attoparsec-iso8601/metadata.xml
+++ b/dev-haskell/attoparsec-iso8601/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="developer">operate in developer mode</flag>
-		<flag name="fast">compile without optimizations</flag>
-	</use>
+	<upstream>
+		<remote-id type="hackage">attoparsec-iso8601</remote-id>
+		<remote-id type="github">haskell/aeson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/attoparsec/Manifest b/dev-haskell/attoparsec/Manifest
index efea42deadb7..878932895f29 100644
--- a/dev-haskell/attoparsec/Manifest
+++ b/dev-haskell/attoparsec/Manifest
@@ -1,7 +1,2 @@
-DIST attoparsec-0.10.4.0.tar.gz 36268 BLAKE2B 88fc72f059c5b241a9d75aed3d5d41b5157378ce6a468b71fef4f751255999e39fb9637cd5f7abf394b4df8baa6da3ec20802be69a6a4c49541149846e929081 SHA512 f32db51d6c4e8119fb28a8d51f6d7452f8870765b652992f577602aba0ecb9e81522fd4919a907f1b7b8ff06d21d4bd64c05b86f808b098f93fbb22daaaa7e8f
-DIST attoparsec-0.11.2.1.tar.gz 36439 BLAKE2B 45a80493fd5c5351eb3ce046bde91bb736bf6e76b6edd2993405ee5a6d9dae1cab2a18871c10e166e8d7aa218c8bd30ea3f1180fd3008b7ac1b66dc71b526269 SHA512 33f27bad5e13e515a07a77247a31822e136531da8d9aa7c15ad9cf1205d681c53b68d09c2e09d3b6c2fba9ec7bfae640f6ac0a9ed45cd421b11cabb1f5cd4282
-DIST attoparsec-0.12.1.5.tar.gz 64844 BLAKE2B 6810d621a29d0670d104c81d57ed4fe30aae1b6149bad23bb50e890b69fd1e44f872783ef93e27e6f1aad514f09942dba0bb8ad699d5a8203873fda516d6d26b SHA512 e861b93bfcdeb284c95e7c96d2a41754e2ad061f169842523bd8680b60743f0d6d300e13237d17b776f60b338152b4fa10679aeb95d1cf0c9d073e093952e9e4
-DIST attoparsec-0.13.0.1.tar.gz 66039 BLAKE2B 1272ec5d2d64325d2f68d277e25a494b4b64a028ce64284de6868385730be5a797727632252b93becc947103093299468a9d6045ef461127274712957df982c5 SHA512 596a1bda128c116b9e56decf0f5850b01f58c4b0bb81454155a1ee7b4c6b7143476cb9d66f02fba10e6fa5d5fb7a47dead6265dd3d98baeea4d8fa4a9958289c
-DIST attoparsec-0.13.0.2.tar.gz 67669 BLAKE2B f93d118968adf24446c5f99c45f504db4efe4c9d2ff0884782b2c629d0595d46079afe3824cc2e7acd69f73cf14ec8ccd244be2adfa666b4b1a0b1f804509ef5 SHA512 3b9453e5e4baca58182c8463b4ff988eb66b3984e93e7f38ea4378d3a6265ed7044cbb896aaa3c797f6389e953f73e8c6994024db1cb7aec1e165f007c010754
-DIST attoparsec-0.13.1.0.tar.gz 159512 BLAKE2B bb4326254d6c7df13ff021d9eb369dd9ac97022b24af630db9b36fdabfb5719fe11792453a68f032d61fba78e11fef8e417c892733fa5af22704701815cd5783 SHA512 bb66cab56208975b252a418a43eecbe85f3f2f3d16ff53accecade02885bc45828eb5dc5b79565d8d3f2ed955ac0400f9733658eed516aef8bb41b829c747d9e
-DIST attoparsec-0.13.2.3.tar.gz 162346 BLAKE2B 02bcd5d2c4993db547a723fa9f30ddca882a3c13d7c68073e9ed2b093def2f86062b5d9d5c87d9a5ccd13d59ef1b2f962537979320d56444027a1fc931dc98fc SHA512 84805ff547f1aa5eebd320c1bd738bc1098a9789fb330eff7bdcb1b0477e9709d86f93bd8848f4a8501a123b6add6bd22af59cfa94af66f1d57703745706a194
+DIST attoparsec-0.14.4-rev4.cabal 5679 BLAKE2B d03ea52e19bc1e07da35f298245e613040f26d45b63322bc7995566802f71ec9d8aca05d96abc0585e06006053413abe5e58590bcd4fbfe1b13583d8e80788d3 SHA512 b879016ea2ff3ebb7b92d39282d48735d2d063ca94dc7cb6552a4d34607afe778876771911c844bd88cad6065aeb2ab85b7e41bbc8d4f1fe9de205af1a77db56
+DIST attoparsec-0.14.4.tar.gz 160701 BLAKE2B eb7094b0e1b064f5b10c198950b33a085722ee22bd6f0036c8e53aa5475f1b40fe08d528ec3afd547b13cd5712a51e5bcb86a8465a59174a35d603b3f9c13a0a SHA512 48aa7743b24def2db7041e3e0189d9844194c42b5d216ff5060806a80eb550200ddcb11e9321a910ac4881ffdd7381d80a4b88a73acfb29209c650eababb925b
diff --git a/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild b/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild
deleted file mode 100644
index f577ca17ae25..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11.1.5:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/quickcheck-2.4
-			>=dev-haskell/test-framework-0.4
-			>=dev-haskell/test-framework-quickcheck2-0.2
-		)
-		>=dev-haskell/cabal-1.8"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild b/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild
deleted file mode 100644
index 02e15680c43c..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/scientific-0.2:=[profile?]
-	>=dev-haskell/text-0.11.3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.12.1.5.ebuild b/dev-haskell/attoparsec/attoparsec-0.12.1.5.ebuild
deleted file mode 100644
index 3c7db8e51ccf..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.12.1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		>=dev-haskell/test-framework-0.8.0.2
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.3
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild
deleted file mode 100644
index 647f2842da87..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		>=dev-haskell/test-framework-0.8.0.2
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.3
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.0.2.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.0.2.ebuild
deleted file mode 100644
index 4b5f758a7eae..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-quickcheck-0.8
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
deleted file mode 100644
index 77d51b7649dd..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-quickcheck-0.8
-		dev-haskell/vector )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
deleted file mode 100644
index 20e44cf82d48..000000000000
--- a/dev-haskell/attoparsec/attoparsec-0.13.2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 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: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Fast combinator parsing for bytestrings and text"
-HOMEPAGE="https://github.com/bos/attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # QC-2.10 finds contradiction
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/text-1.1.1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/attoparsec/attoparsec-0.14.4-r1.ebuild b/dev-haskell/attoparsec/attoparsec-0.14.4-r1.ebuild
new file mode 100644
index 000000000000..0ea6ec5604e8
--- /dev/null
+++ b/dev-haskell/attoparsec/attoparsec-0.14.4-r1.ebuild
@@ -0,0 +1,47 @@
+# 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: -developer
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast combinator parsing for bytestrings and text"
+HOMEPAGE="https://github.com/bgamari/attoparsec"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15
+		dev-haskell/quickcheck-unicode
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-quickcheck-0.8
+		dev-haskell/vector
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
diff --git a/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild b/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild
new file mode 100644
index 000000000000..d1a1be678f48
--- /dev/null
+++ b/dev-haskell/attoparsec/attoparsec-0.14.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+RESTRICT=test # disabled at build time
+
+DESCRIPTION="Fast combinator parsing for bytestrings and text"
+HOMEPAGE="https://github.com/bgamari/attoparsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
+#	test? ( >=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15
+#		dev-haskell/quickcheck-unicode
+#		>=dev-haskell/tasty-0.11
+#		>=dev-haskell/tasty-quickcheck-0.8
+#		dev-haskell/vector )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
diff --git a/dev-haskell/attoparsec/metadata.xml b/dev-haskell/attoparsec/metadata.xml
index 470df1227e2d..90b0090fc01f 100644
--- a/dev-haskell/attoparsec/metadata.xml
+++ b/dev-haskell/attoparsec/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A fast parser combinator library, aimed particularly at dealing
-		efficiently with network protocols and complicated text/binary
-		file formats.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">bos/attoparsec</remote-id>
+		<remote-id type="hackage">attoparsec</remote-id>
+		<remote-id type="github">bgamari/attoparsec</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/authenticate-oauth/Manifest b/dev-haskell/authenticate-oauth/Manifest
deleted file mode 100644
index bd99a05472ed..000000000000
--- a/dev-haskell/authenticate-oauth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST authenticate-oauth-1.6.0.1.tar.gz 9470 BLAKE2B 9326a4dfeeaede4d9b69e7f92be66b7d3f4d74fab30fdeb3e63e7741f33d5ec68f287b35a4c7a424084aa693881c9e23b78fd2f7ebb1c1a32073cef7e23d7078 SHA512 b2a6310097a6edc5bd3c38052a2eca73d3f398c0b9ff4b8f1d43a1f4dc83b7297df12f3fc0bfdecfce17e600f90b13c4c9e3f31c02b17d7fec0134a34c093fd6
diff --git a/dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild b/dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild
deleted file mode 100644
index 4494268101f2..000000000000
--- a/dev-haskell/authenticate-oauth/authenticate-oauth-1.6.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library to authenticate with OAuth for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/http-client-0.3:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/rsa-2.0:=[profile?] <dev-haskell/rsa-2.5:=[profile?]
-	>=dev-haskell/sha-1.4:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/authenticate-oauth/metadata.xml b/dev-haskell/authenticate-oauth/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/authenticate-oauth/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/authenticate/Manifest b/dev-haskell/authenticate/Manifest
deleted file mode 100644
index 2f481265cb14..000000000000
--- a/dev-haskell/authenticate/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST authenticate-1.3.2.11.tar.gz 8728 BLAKE2B 5c2a319ed40dc4b5cacfb7f5824e240cc9f60b95db6aca45b5ebfc6974f6bdd228386b889bf7eba65850dca88ef0c0d00e67e17aa75bc6308838a446e256c8bc SHA512 8e1358bd6dd62f10b372fd5df6bd2b50f1c161ade466316efa9e036c17be97e7c561eab968a2e17d28cc12988db454618bf11b8c9bc5e9a20d864423756eccb5
-DIST authenticate-1.3.3.1.tar.gz 8703 BLAKE2B cfeb564029efa9ffceac72dcf9f506feeefe5cdf4c133785f55d71659ff398248f1ce286db8585c93039f6b03c291892e8df8fb110db5a5c8f5d2424acb45332 SHA512 e2caa227dfc4a4878ac7011d79d98c539320cb2fe5d9e260a9c71951486ba8af396fbcd0ccf3cb80205063881c7922f3d1a62d693ff8e1529b88e3cfc2e3c5c8
-DIST authenticate-1.3.3.2.tar.gz 8785 BLAKE2B 43307b9551e9894805a26bced9aeeda87464bfd9e92666a329a3c424afdf6bae74e03262316d98a97b45bfda74369287e8b9e766e9b4f8dc9919294fd3b7a811 SHA512 98fd1e5fde51c9e2db10c9d22429d8c51914f28ec8493457a77afa5a9dc41a8e9920b27583d5aac9752a3b39561713f87489043c552396d132c75139a8e46927
-DIST authenticate-1.3.5.tar.gz 8817 BLAKE2B cfd9a4e9f8a6d4f76cb3c3e1e496c8eafbc5b675cc14b38463bb4175d3bcab86d1561a3434f6638062905e9bf3543f689cae5b4510283bb4da3c513a56014510 SHA512 12962fcf71c732a7e709e7069d46691917b9ee9f2af6aab5556b76a4556b6ffc39e52082a4fcdbe501c2cbc7cc496b1164b6a9f2c3883597fcdd0a8298d4ac1a
diff --git a/dev-haskell/authenticate/authenticate-1.3.2.11.ebuild b/dev-haskell/authenticate/authenticate-1.3.2.11.ebuild
deleted file mode 100644
index 8e82f22b13c5..000000000000
--- a/dev-haskell/authenticate/authenticate-1.3.2.11.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication methods for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	>=dev-haskell/http-conduit-1.5:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/authenticate/authenticate-1.3.3.1.ebuild b/dev-haskell/authenticate/authenticate-1.3.3.1.ebuild
deleted file mode 100644
index cdd34dbdff0d..000000000000
--- a/dev-haskell/authenticate/authenticate-1.3.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication methods for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	>=dev-haskell/http-conduit-1.5:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/authenticate/authenticate-1.3.3.2.ebuild b/dev-haskell/authenticate/authenticate-1.3.3.2.ebuild
deleted file mode 100644
index b182fd80e883..000000000000
--- a/dev-haskell/authenticate/authenticate-1.3.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication methods for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	>=dev-haskell/http-conduit-1.5:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/authenticate/authenticate-1.3.5.ebuild b/dev-haskell/authenticate/authenticate-1.3.5.ebuild
deleted file mode 100644
index 5f168e7885e2..000000000000
--- a/dev-haskell/authenticate/authenticate-1.3.5.ebuild
+++ /dev/null
@@ -1,43 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication methods for Haskell web applications"
-HOMEPAGE="https://github.com/yesodweb/authenticate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	>=dev-haskell/html-conduit-1.3:=[profile?]
-	>=dev-haskell/http-conduit-1.5:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/authenticate/metadata.xml b/dev-haskell/authenticate/metadata.xml
deleted file mode 100644
index 17e204eb451f..000000000000
--- a/dev-haskell/authenticate/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Focus is on third-party authentication methods, such as OpenID and BrowserID.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">yesodweb/authenticate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/auto-update/Manifest b/dev-haskell/auto-update/Manifest
index c12bf7cbdcb0..80ae980f1a76 100644
--- a/dev-haskell/auto-update/Manifest
+++ b/dev-haskell/auto-update/Manifest
@@ -1,4 +1 @@
-DIST auto-update-0.1.2.2.tar.gz 6651 BLAKE2B 0fd4a69ad9835d476a1b873fdb72da65582382307f943d673af71b3a4b8032c7a48fce4e08b81efbbcd0cf4d16f24bdf521af66ec9d654d170221a0a7e309813 SHA512 40358d82324653b20433041262b13f4491cfa51b58ace9554d292c09f8f0d979aed19244d4d204b34f8a296a259b968a4c3c639650e06adc7057b53057c67a74
-DIST auto-update-0.1.3.tar.gz 6799 BLAKE2B 7aff212b55b975153d066dd5637c24a6e3d66da59315a94c0af0c55bbadd1d5562cae3fead19625c6a8b459d90aa2fd085b8acf70769a24099550204892c2912 SHA512 54eb034f75d214d428a2ba4d830e4301d5c4ca0df5c55c54aaa5257bc561c1033a34f4e65c3f64606591f03aff8194b04397ffa298a779a8ee0b46fc7ed32ad3
-DIST auto-update-0.1.4.tar.gz 8607 BLAKE2B 0f2a86e45a67576db44880ba738f55d9f5bb630022e52c6514c6aad5318620c0036c669800840b59c7103852c9564a690e9827401f4457fd906b6d75a781bf54 SHA512 071e3b630503462320de3229ee955f378f95d69d6404b9bc4c6b493341f565ef04c41e12eafa4f7d7a85826dec0eed150fc58a77a2ce9f3b802dfc2a240ea45d
 DIST auto-update-0.1.6.tar.gz 10929 BLAKE2B fcc4c1909fcc52b5f8aca48e3662d494104b153c3511d56054457078a63ef5be1a56a0dc61aa1d87edbaef90526d03476046d0e13fcd748c33d163317a637a02 SHA512 ff0f4f835d0b24aafbe18dbc42a9c3cc396cea24be3f4b13b5f5dac49b3b21030c941c8b09a5c33ba175c9902d076aa12fc9eb5a6a79c94ee5c9b60935fa047f
diff --git a/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild b/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild
deleted file mode 100644
index c34667bd42bf..000000000000
--- a/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficiently run periodic, on-demand actions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/auto-update/auto-update-0.1.3.ebuild b/dev-haskell/auto-update/auto-update-0.1.3.ebuild
deleted file mode 100644
index 382dec6ba00f..000000000000
--- a/dev-haskell/auto-update/auto-update-0.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficiently run periodic, on-demand actions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/auto-update/auto-update-0.1.4.ebuild b/dev-haskell/auto-update/auto-update-0.1.4.ebuild
deleted file mode 100644
index 94ff2e57eaf2..000000000000
--- a/dev-haskell/auto-update/auto-update-0.1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficiently run periodic, on-demand actions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/auto-update/auto-update-0.1.6.ebuild b/dev-haskell/auto-update/auto-update-0.1.6.ebuild
index 576e43979d73..6fdca292797a 100644
--- a/dev-haskell/auto-update/auto-update-0.1.6.ebuild
+++ b/dev-haskell/auto-update/auto-update-0.1.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.1
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/auto-update/metadata.xml b/dev-haskell/auto-update/metadata.xml
index b0223bf6088a..29c6f0a61284 100644
--- a/dev-haskell/auto-update/metadata.xml
+++ b/dev-haskell/auto-update/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/aws/Manifest b/dev-haskell/aws/Manifest
index f7b3eacc87cf..5847acb0bd11 100644
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@@ -1 +1,3 @@
+DIST aws-0.22-rev3.cabal 15515 BLAKE2B 7936d1ba22ef5d60baf8804d5d77b5202f6fcef31b63cba9c06ffe5f66aae8d584c3877887e408033efe36bc9cf04c738c545ca61e9eceeaee61bb168ac1e062 SHA512 a6a1d639cedf6929f60cf4b4187fbefb72f7024cbdaa3c3d383acc933be1f03b139c4b58a34afaf7ecdc355ee507f4411e9953f98127850d4978a6ba859f4e8e
 DIST aws-0.22.tar.gz 106122 BLAKE2B b4ff46e2742d53323c80952c303a4605d13600fd60085a2e0501af2fc0a74f0c2769c6bf0692710bbfd972c474b9cab26fd97e9126fdcfb3eaff90afbab1d9ae SHA512 e7ff376c47a7ca7a65c8f10f19e591d4a4b4d2cfa333b4727f88f0b170d7acb0aff402617f2d617c522fe5d16ce92b249a23f1fb0a8bfe5bbefaef2931b786bd
+DIST aws-0.24.tar.gz 106782 BLAKE2B 3e9feb13f3e21577c0bf9969865f3475c40e466a2377cd659171166e6b9727b6c501f4a31b7de4720fc6a0ec4d4b266732e3c2eb34d0b4bb38527a6babfebe4a SHA512 d453ea185a47b0fb93d2e8849ea81e1b0bae081aa81d280f94618d8fb357b6e4b71a43a6c8df0e4ba2b64390346daf50672ed9f9849cc6737a5ae58b5ac52af8
diff --git a/dev-haskell/aws/aws-0.22-r1.ebuild b/dev-haskell/aws/aws-0.22-r1.ebuild
deleted file mode 100644
index d5a5b18362a0..000000000000
--- a/dev-haskell/aws/aws-0.22-r1.ebuild
+++ /dev/null
@@ -1,79 +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.4.9999
-#hackport: flags: networkbsd:network-3
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Amazon Web Services (AWS) for Haskell"
-HOMEPAGE="https://github.com/aristidb/aws"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-3 examples"
-
-RESTRICT=test # requires aws account
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
-	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
-	>=dev-haskell/cryptonite-0.11:=[profile?]
-	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
-	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	examples? ( >=dev-haskell/errors-2.0:=[profile?] )
-	network-3? ( >=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
-		>=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
-	!network-3? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/aeson-0.7
-		>=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.7
-		>=dev-haskell/lifted-base-0.2
-		>=dev-haskell/mtl-2.1
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.8
-		>=dev-haskell/tasty-hunit-0.8
-		>=dev-haskell/tasty-quickcheck-0.8
-		>=dev-haskell/text-1.1
-		>=dev-haskell/transformers-base-0.4
-		!examples? ( >=dev-haskell/errors-2.0 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples) \
-		$(cabal_flag network-3 networkbsd)
-}
diff --git a/dev-haskell/aws/aws-0.22-r5.ebuild b/dev-haskell/aws/aws-0.22-r5.ebuild
new file mode 100644
index 000000000000..5467613144fc
--- /dev/null
+++ b/dev-haskell/aws/aws-0.22-r5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: +networkbsd
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Amazon Web Services (AWS) for Haskell"
+HOMEPAGE="https://github.com/aristidb/aws"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RESTRICT=test # requires aws account
+
+RDEPEND=">=dev-haskell/aeson-2.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+	>=dev-haskell/cryptonite-0.11:=[profile?]
+	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?]
+	>=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
+	>=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+	examples? ( >=dev-haskell/errors-2.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+"
+
+PATCHES=( "${FILESDIR}"/${P}-aeson-2.patch )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples) \
+		--flag=networkbsd
+}
diff --git a/dev-haskell/aws/aws-0.24.ebuild b/dev-haskell/aws/aws-0.24.ebuild
new file mode 100644
index 000000000000..acd4e2c2fe01
--- /dev/null
+++ b/dev-haskell/aws/aws-0.24.ebuild
@@ -0,0 +1,71 @@
+# 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: +networkbsd
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Amazon Web Services (AWS) for Haskell"
+HOMEPAGE="https://github.com/aristidb/aws"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RESTRICT=test # requires aws account
+
+RDEPEND=">=dev-haskell/aeson-2.0.0.0:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/byteable-0.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+	>=dev-haskell/cryptonite-0.11:=[profile?]
+	>=dev-haskell/data-default-0.5.3:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-1.0:=[profile?]
+	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/monad-control-0.3:=[profile?]
+	>=dev-haskell/network-3:=[profile?] <dev-haskell/network-4:=[profile?]
+	>=dev-haskell/network-bsd-2.8:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-haskell/xml-conduit-1.8:=[profile?] <dev-haskell/xml-conduit-2.0:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+	examples? ( >=dev-haskell/errors-2.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/http-client-0.3 <dev-haskell/http-client-0.8
+		>=dev-haskell/lifted-base-0.2
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.8
+		>=dev-haskell/tasty-hunit-0.8
+		>=dev-haskell/tasty-quickcheck-0.8
+		>=dev-haskell/transformers-base-0.4
+		!examples? ( >=dev-haskell/errors-2.0 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples) \
+		--flag=networkbsd
+}
diff --git a/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch b/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch
deleted file mode 100644
index 4d2db5d35a5f..000000000000
--- a/dev-haskell/aws/files/aws-0.11.3-ghc-7.10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- aws-0.11.3-orig/aws.cabal	2015-03-24 05:26:53.000000000 +1100
-+++ aws-0.11.3/aws.cabal	2015-04-04 10:18:21.057164803 +1100
-@@ -126,7 +126,7 @@
-                        cryptohash           >= 0.11    && < 0.12,
-                        data-default         >= 0.5.3   && < 0.6,
-                        directory            >= 1.0     && < 1.3,
--                       filepath             >= 1.1     && < 1.4,
-+                       filepath             >= 1.1     && < 1.5,
-                        http-conduit         >= 2.1     && < 2.2,
-                        http-types           >= 0.7     && < 0.9,
-                        lifted-base          >= 0.1     && < 0.3,
---- aws-0.11.3-orig/Examples/DynamoDb.hs	2015-03-24 05:26:53.000000000 +1100
-+++ aws-0.11.3/Examples/DynamoDb.hs	2015-04-04 10:18:43.712140567 +1100
-@@ -1,5 +1,6 @@
- {-# LANGUAGE OverloadedStrings   #-}
- {-# LANGUAGE ScopedTypeVariables #-}
-+{-# LANGUAGE FlexibleContexts #-}
- 
- module Main where
- 
diff --git a/dev-haskell/aws/files/aws-0.22-aeson-2.patch b/dev-haskell/aws/files/aws-0.22-aeson-2.patch
new file mode 100644
index 000000000000..25d5966ed0a7
--- /dev/null
+++ b/dev-haskell/aws/files/aws-0.22-aeson-2.patch
@@ -0,0 +1,185 @@
+From 7af7586c5d244d07f77d49e5fdc739e6e8e54816 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joeyh@joeyh.name>
+Date: Mon, 18 Oct 2021 14:35:30 -0400
+Subject: [PATCH] build with aeson 2
+
+---
+ Aws/DynamoDb/Commands/Table.hs      |  4 +--
+ Aws/DynamoDb/Commands/UpdateItem.hs |  5 ++--
+ Aws/DynamoDb/Core.hs                | 39 +++++++++++++++--------------
+ aws.cabal                           |  2 +-
+ 4 files changed, 26 insertions(+), 24 deletions(-)
+
+diff --git a/Aws/DynamoDb/Commands/Table.hs b/Aws/DynamoDb/Commands/Table.hs
+index 5fb42e0..a5fe025 100644
+--- a/Aws/DynamoDb/Commands/Table.hs
++++ b/Aws/DynamoDb/Commands/Table.hs
+@@ -35,9 +35,9 @@ module Aws.DynamoDb.Commands.Table
+ import           Control.Applicative
+ import           Data.Aeson            ((.!=), (.:), (.:?), (.=))
+ import qualified Data.Aeson            as A
++import qualified Data.Aeson.KeyMap     as KM
+ import qualified Data.Aeson.Types      as A
+ import           Data.Char             (toUpper)
+-import qualified Data.HashMap.Strict   as M
+ import           Data.Scientific       (Scientific)
+ import qualified Data.Text             as T
+ import           Data.Time
+@@ -281,7 +281,7 @@ data TableDescription
+ 
+ instance A.FromJSON TableDescription where
+     parseJSON = A.withObject "Table must be an object" $ \o -> do
+-        t <- case (M.lookup "Table" o, M.lookup "TableDescription" o) of
++        t <- case (KM.lookup "Table" o, KM.lookup "TableDescription" o) of
+                 (Just (A.Object t), _) -> return t
+                 (_, Just (A.Object t)) -> return t
+                 _ -> fail "Table description must have key 'Table' or 'TableDescription'"
+diff --git a/Aws/DynamoDb/Commands/UpdateItem.hs b/Aws/DynamoDb/Commands/UpdateItem.hs
+index 0d94a59..1152b5a 100644
+--- a/Aws/DynamoDb/Commands/UpdateItem.hs
++++ b/Aws/DynamoDb/Commands/UpdateItem.hs
+@@ -31,6 +31,7 @@ module Aws.DynamoDb.Commands.UpdateItem
+ -------------------------------------------------------------------------------
+ import           Control.Applicative
+ import           Data.Aeson
++import qualified Data.Aeson.Key      as AK
+ import           Data.Default
+ import qualified Data.Text           as T
+ import           Prelude
+@@ -91,9 +92,9 @@ instance ToJSON AttributeUpdates where
+     toJSON = object . map mk . getAttributeUpdates
+         where
+           mk AttributeUpdate { auAction = UDelete, auAttr = auAttr } =
+-            (attrName auAttr) .= object
++            (AK.fromText (attrName auAttr)) .= object
+             ["Action" .= UDelete]
+-          mk AttributeUpdate { .. } = (attrName auAttr) .= object
++          mk AttributeUpdate { .. } = AK.fromText (attrName auAttr) .= object
+             ["Value" .= (attrVal auAttr), "Action" .= auAction]
+ 
+ 
+diff --git a/Aws/DynamoDb/Core.hs b/Aws/DynamoDb/Core.hs
+index 1c116d3..b9a6cc4 100644
+--- a/Aws/DynamoDb/Core.hs
++++ b/Aws/DynamoDb/Core.hs
+@@ -128,6 +128,8 @@ import           Control.Monad.Trans.Resource (throwM)
+ import qualified Crypto.Hash                  as CH
+ import           Data.Aeson
+ import qualified Data.Aeson                   as A
++import qualified Data.Aeson.Key               as AK
++import qualified Data.Aeson.KeyMap            as KM
+ import           Data.Aeson.Types             (Pair, parseEither)
+ import qualified Data.Aeson.Types             as A
+ import qualified Data.Attoparsec.ByteString   as AttoB (endOfInput)
+@@ -141,7 +143,6 @@ import           Data.Conduit
+ import           Data.Conduit.Attoparsec      (sinkParser)
+ import           Data.Default
+ import           Data.Function                (on)
+-import qualified Data.HashMap.Strict          as HM
+ import           Data.Int
+ import           Data.IORef
+ import           Data.List
+@@ -536,7 +537,7 @@ instance ToJSON PrimaryKey where
+     toJSON (PrimaryKey h (Just r)) =
+       let Object p1 = toJSON h
+           Object p2 = toJSON r
+-      in Object (p1 `HM.union` p2)
++      in Object (p1 `KM.union` p2)
+ 
+ instance FromJSON PrimaryKey where
+     parseJSON p = do
+@@ -544,8 +545,8 @@ instance FromJSON PrimaryKey where
+        case length l of
+           1 -> return $ head l 
+           _ -> fail "Unable to parse PrimaryKey"     
+-      where listPKey p'= map (\(txt,dval)-> hk txt dval)
+-                          . HM.toList <$> parseJSON p'
++      where listPKey p'= map (\(k,dval)-> hk (AK.toText k) dval)
++                          . KM.toList <$> parseJSON p'
+ 
+ 
+ -- | A key-value pair
+@@ -661,9 +662,9 @@ instance ToJSON Attribute where
+ -------------------------------------------------------------------------------
+ -- | Parse a JSON object that contains attributes
+ parseAttributeJson :: Value -> A.Parser [Attribute]
+-parseAttributeJson (Object v) = mapM conv $ HM.toList v
++parseAttributeJson (Object v) = mapM conv $ KM.toList v
+     where
+-      conv (k, o) = Attribute k <$> parseJSON o
++      conv (k, o) = Attribute (AK.toText k) <$> parseJSON o
+ parseAttributeJson _ = error "Attribute JSON must be an Object"
+ 
+ 
+@@ -674,7 +675,7 @@ attributesJson as = object $ map attributeJson as
+ 
+ -- | Convert into JSON pair
+ attributeJson :: Attribute -> Pair
+-attributeJson (Attribute nm v) = nm .= v
++attributeJson (Attribute nm v) = AK.fromText nm .= v
+ 
+ 
+ -------------------------------------------------------------------------------
+@@ -962,7 +963,7 @@ conditionsJson key (Conditions op es) = b ++ a
+     where
+       a = if null es
+           then []
+-          else [key .= object (map conditionJson es)]
++          else [AK.fromText key .= object (map conditionJson es)]
+ 
+       b = if length (take 2 es) > 1
+           then ["ConditionalOperator" .= String (rendCondOp op) ]
+@@ -1046,7 +1047,7 @@ renderCondOp c = case c of
+ 
+ 
+ conditionJson :: Condition -> Pair
+-conditionJson Condition{..} = condAttr .= condOp
++conditionJson Condition{..} = AK.fromText condAttr .= condOp
+ 
+ 
+ instance ToJSON CondOp where
+@@ -1076,12 +1077,12 @@ data ConsumedCapacity = ConsumedCapacity {
+ 
+ 
+ instance FromJSON ConsumedCapacity where
+-    parseJSON (Object v) = ConsumedCapacity
+-      <$> v .: "CapacityUnits"
+-      <*> (HM.toList <$> v .:? "GlobalSecondaryIndexes" .!= mempty)
+-      <*> (HM.toList <$> v .:? "LocalSecondaryIndexes" .!= mempty)
+-      <*> (v .:? "Table" >>= maybe (return Nothing) (.: "CapacityUnits"))
+-      <*> v .: "TableName"
++    parseJSON (Object o) = ConsumedCapacity
++      <$> o .: "CapacityUnits"
++      <*> (map (\(k, v) -> (AK.toText k, v)) . KM.toList <$> o .:? "GlobalSecondaryIndexes" .!= mempty)
++      <*> (map (\(k, v) -> (AK.toText k, v)) . KM.toList <$> o .:? "LocalSecondaryIndexes" .!= mempty)
++      <*> (o .:? "Table" >>= maybe (return Nothing) (.: "CapacityUnits"))
++      <*> o .: "TableName"
+     parseJSON _ = fail "ConsumedCapacity must be an Object."
+ 
+ 
+@@ -1115,8 +1116,8 @@ data ItemCollectionMetrics = ItemCollectionMetrics {
+ 
+ 
+ instance FromJSON ItemCollectionMetrics where
+-    parseJSON (Object v) = ItemCollectionMetrics
+-      <$> (do m <- v .: "ItemCollectionKey"
+-              return $ head $ HM.toList m)
+-      <*> v .: "SizeEstimateRangeGB"
++    parseJSON (Object o) = ItemCollectionMetrics
++      <$> (do m <- o .: "ItemCollectionKey"
++              return $ (\(k, v) -> (AK.toText k, v)) $ head $ KM.toList m)
++      <*> o .: "SizeEstimateRangeGB"
+     parseJSON _ = fail "ItemCollectionMetrics must be an Object."
+
+
+--- a/aws.cabal      2022-07-25 08:47:06.270139909 +1000
++++ b/aws.cabal   2022-07-25 08:47:28.497479783 +1000
+@@ -35,7 +35,7 @@
+   Default: True
+ 
+ Library
+-  build-depends: aeson <1.6
++  build-depends: aeson >= 2.0
+ 
+   Exposed-modules:
+                        Aws
diff --git a/dev-haskell/aws/metadata.xml b/dev-haskell/aws/metadata.xml
index de6f465da317..6fe81a3157ca 100644
--- a/dev-haskell/aws/metadata.xml
+++ b/dev-haskell/aws/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="network-3">Use network-3</flag>
-	</use>
-	<longdescription>
-		Bindings for Amazon Web Services (AWS), with the aim of supporting all AWS services. To see a high level overview of the library, see the README at &lt;https://github.com/aristidb/aws/blob/master/README.org&gt;.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">aws</remote-id>
 		<remote-id type="github">aristidb/aws</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/barbies/Manifest b/dev-haskell/barbies/Manifest
new file mode 100644
index 000000000000..613ce0bf4784
--- /dev/null
+++ b/dev-haskell/barbies/Manifest
@@ -0,0 +1 @@
+DIST barbies-2.0.4.0.tar.gz 51770 BLAKE2B 23707bf90c4cf05beb1e1cc9c529d5968b2cf88ea445cc6f566f7ab8d175d5abe9e50f74383fb2ee55c1ee2c6cd3f02998fc241de0c5410d1eb899915b9e10ef SHA512 52b6a3dabbd1a9fc6c734c372927a6c746c22f7904bb36d47e8d3861425dcbef246ccad3aed38c55498bea7dbcb90dcd2454982a52c6c6f61b23bb38b8a53ae3
diff --git a/dev-haskell/barbies/barbies-2.0.4.0.ebuild b/dev-haskell/barbies/barbies-2.0.4.0.ebuild
new file mode 100644
index 000000000000..7c0b781c245f
--- /dev/null
+++ b/dev-haskell/barbies/barbies-2.0.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Classes for working with types that can change clothes"
+HOMEPAGE="https://github.com/jcpetruzza/barbies#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-haskell/distributive:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+	)
+"
diff --git a/dev-haskell/barbies/metadata.xml b/dev-haskell/barbies/metadata.xml
new file mode 100644
index 000000000000..7ac724eff070
--- /dev/null
+++ b/dev-haskell/barbies/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">barbies</remote-id>
+		<remote-id type="github">jcpetruzza/barbies</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/base-compat-batteries/Manifest b/dev-haskell/base-compat-batteries/Manifest
index 43b7be06991d..a1e3a81f5046 100644
--- a/dev-haskell/base-compat-batteries/Manifest
+++ b/dev-haskell/base-compat-batteries/Manifest
@@ -1 +1,3 @@
-DIST base-compat-batteries-0.11.1.tar.gz 16748 BLAKE2B bd24a8fb165b8056023f7280745ce972d2036df33cd72f2824055455899d2643b4ca90d116d1692795ea504f0c03a97bc256eaeba7db491f35961061d28d0aba SHA512 a0149db9fae3664507c715e569209a9b996084cfb1f4dc125914eea57c2142ba8ddad559257dbf405c2b91d78d10c570c25e5a3c80bf50eb6bf5d31dfe65c217
+DIST base-compat-batteries-0.12.1-rev2.cabal 8891 BLAKE2B b7d6ebe0a100757dc6b95b3dcc25b5922b7a5c781c726fe69549d21631be0339dd08a0017427830e35c36dd2074b5be55b6f71d6555c6ca0050e7b825b2cb1b0 SHA512 38d81b3d72e9cb731d5c25310e71a5f73b004a37a4211315fb750c29e3bbccca40daeae175d25f8c602d1b2d13eee899cf5b2dea401d1aa5bf821b588b93572a
+DIST base-compat-batteries-0.12.1.tar.gz 17623 BLAKE2B c5bd92d32b4dbd67e28fc355a06c6e431be28f52db08f7ae9ba5fb067ac9536cbbf6c1315bf09417278856f1402bbc8376b51b34d564f0d0d15e21d0f317b4f1 SHA512 346ad1e53e4712017e610d1883e91371c1bbdefdce35b2830b8807e207f6fbd2233e2be153d85b6632059f58d3d9c74435537719823533ddddd47d96b231b0cf
+DIST base-compat-batteries-0.13.0.tar.gz 19320 BLAKE2B 20935aefca4709eef035de8fd8538b9be1f926e62571629949458c48028c68b51fb8ed7e58862225355273576f18baadc9be4f2d2262efe93592b2765b0ad804 SHA512 3f509034ea6ef1de86985082dd949abefa6570a2c14338571a263221d1a3f9da17a77918174aecb8d7fb83970da2a362f1d3ac0f3c5a5bca76edbcac368edeef
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
deleted file mode 100644
index f4b6f1ce6ff5..000000000000
--- a/dev-haskell/base-compat-batteries/base-compat-batteries-0.11.1.ebuild
+++ /dev/null
@@ -1,35 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="base-compat with extra batteries"
-HOMEPAGE="http://hackage.haskell.org/package/base-compat-batteries"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/base-compat-0.11.1:=[profile?]
-	>=dev-haskell/bifunctors-5.5.2:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
-	>=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
-	>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.18.4:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/transformers-compat-0.6:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-1.1:=[profile?]
-	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild
new file mode 100644
index 000000000000..2e6a2be81b5c
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/base-compat-batteries-0.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 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 test-suite"
+CABAL_HACKAGE_REVISION="2"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="base-compat with extra batteries"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat-batteries"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="~dev-haskell/base-compat-0.12.1:=[profile?]
+	>=dev-haskell/contravariant-1.5:=[profile?] <dev-haskell/contravariant-1.6:=[profile?]
+	>=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-1.8
+		dev-haskell/quickcheck )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild b/dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild
new file mode 100644
index 000000000000..b4df2533f1c3
--- /dev/null
+++ b/dev-haskell/base-compat-batteries/base-compat-batteries-0.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="base-compat with extra batteries"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat-batteries"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	~dev-haskell/base-compat-0.13.0:=[profile?]
+	>=dev-haskell/foldable1-classes-compat-0.1:=[profile?] <dev-haskell/foldable1-classes-compat-0.2:=[profile?]
+	>=dev-haskell/onetuple-0.4:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/hspec-1.8
+		dev-haskell/quickcheck
+	)
+"
diff --git a/dev-haskell/base-compat-batteries/metadata.xml b/dev-haskell/base-compat-batteries/metadata.xml
index 012220248aca..b019d00e8863 100644
--- a/dev-haskell/base-compat-batteries/metadata.xml
+++ b/dev-haskell/base-compat-batteries/metadata.xml
@@ -1,29 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides functions available in later versions of @base@ to
-		a wider range of compilers, without requiring you to use CPP
-		pragmas in your code.
-		
-		This package provides the same API as the
-		@&lt;http://hackage.haskell.org/package/base-compat base-compat&gt;@
-		library, but depends on compatibility packages
-		(such as @semigroups@) to offer a wider support window than
-		@base-compat@, which has no dependencies. Most of the modules
-		in this library have the same names as in @base-compat@
-		to make it easier to switch between the two. There also exist
-		versions of each module with the suffix @.Repl.Batteries@,
-		which are distinct from anything in @base-compat@, to allow
-		for easier use in GHCi.
-		
-		See
-		@&lt;https://github.com/haskell-compat/base-compat/blob/master/base-compat/README.markdown#dependencies here&gt;@
-		for a more comprehensive list of differences between
-		@base-compat@ and @base-compat-batteries@.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">base-compat-batteries</remote-id>
+		<remote-id type="github">haskell-compat/base-compat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/base-compat/Manifest b/dev-haskell/base-compat/Manifest
index aab85081995c..196151c01fbd 100644
--- a/dev-haskell/base-compat/Manifest
+++ b/dev-haskell/base-compat/Manifest
@@ -1,6 +1,2 @@
-DIST base-compat-0.11.1.tar.gz 33691 BLAKE2B a598582e1a76b2b83d4168da3fbdf2b0ab34127d60ba46c9803101d075989000bed7f01384d58292d96c1099857964c74d9d7bad092fca94502442b635a82245 SHA512 d92a81e670535b4ca6fd95d51800972bbc52008ef21ccc22119341974c45bec66ed725c795da8d94c8ef824dfaa7f9c03a173b643daf339a4759c49453cfcec8
-DIST base-compat-0.2.1.tar.gz 9158 BLAKE2B 642c7f5f5b2a91cd6e38a6643cc719e5fa60f261c50bbda708b284daa2ccbbee2a3ae95f13f0c3180baf398b7f5db85d011f6ec944a2dd17b6ab73ec92225dd2 SHA512 959ce234c61211dc62850f656bb8342aa1fe0c849607a32d43f23d121eb1cb4c3f25a8b669042d9e76aa2f634708219e1a15a4a9afa89e3a3e1a4276b73c0214
-DIST base-compat-0.4.2.tar.gz 4094 BLAKE2B 3b17f5a74b14e4eac0b7269edac3b457bfa55d45584a31117fb847f8dd340a9df613e1686369262a55772b8364527b98100bbee66312e63ccf4468c3a499984c SHA512 5f55b68d59b22a2cd6f197a3f783ad3d088afaadb27ad9810c66b9407d0e43c938901ac1a53eba54edae4cf519b2625e19a4934b09702cd9e32b9815fdc8305d
-DIST base-compat-0.5.0.tar.gz 4342 BLAKE2B 8e1c16683be353d7eb949c1bf9893f7e0f02fc5ec46c88abfd388fed62da06851cc74ec26c866651b14ad111ee4fbdf008d50957f5e008c7f31a275f6dc341b1 SHA512 d591c96922720fd42ca01744f289b4ef2e228704bd2cb4b7aac5bf5a0de3b5ad5eaf46fe5f2a56e903e3a94ecf228ed494896f8a491173f9077be35c834a0377
-DIST base-compat-0.8.2.tar.gz 16053 BLAKE2B 93f3ef7773c78001a155866698c51c66917a80ee61c82a5c51217b09969a781dfc03a6428d9dfa39a3b2a984dfce57b621a682f099cbe94b9776fde86aeb25b7 SHA512 3942ba0f03a2ee979130d185321f6f48fc3e71a610fb0e65d0b4cfa1ff0112776670a4322d141e9b6465060b44c2d5cf4acff3928648800927b90ce36c2b3760
-DIST base-compat-0.9.1.tar.gz 26251 BLAKE2B 06d204cb6cc904cbaf3cc66d01356c18eb1440ddfe6fbf787f0bf547263a83b80c3a4740231888b68ffd419ad6bf2ddb840aea344d70c11b295e9e4d3cba8fc2 SHA512 e79cb17f96c6abb170cfb836c1ff5a6cb2916dee46f00e3701a8fe264eb06bc4b0f0b825f40e2a151f18b5ee67d98ef713877ee22253d862e175185909c8eeba
+DIST base-compat-0.12.1.tar.gz 35504 BLAKE2B 8b450d9b89509b36c4810d9c1471c782af3f782c7069f764ec79952c61ac59db8cfac3def772b8f7b61c311c7761ad793226aec1a58ea7d521733a2563e1abc5 SHA512 2ae3e1baad0d0f25c227a9b066ea266cff4f274448c418546d37c6274d77df4349215722fce3d6eaae2093ad31c9b2c70b02f1233513eaa59a59c6255669d318
+DIST base-compat-0.13.0.tar.gz 40057 BLAKE2B 34c90979269daea2585773f006e53d8191a01806b37e9359341a64b7c2806cdf449a23040cf46c25b63fc9036820426a7be8c01b9149643a11492192d53587b8 SHA512 6b9602f72a4bf04fc52c1fd3727fad1ba1ac85d2c572e2189f4da96f59698350c403930af10ae2e2b43cf06aac3fcb2a2609374d4d3b8a1dadfb554913d96d72
diff --git a/dev-haskell/base-compat/base-compat-0.11.1.ebuild b/dev-haskell/base-compat/base-compat-0.11.1.ebuild
deleted file mode 100644
index 402e34980302..000000000000
--- a/dev-haskell/base-compat/base-compat-0.11.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="http://hackage.haskell.org/package/base-compat"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/base-compat/base-compat-0.12.1.ebuild b/dev-haskell/base-compat/base-compat-0.12.1.ebuild
new file mode 100644
index 000000000000..7adea7054d7b
--- /dev/null
+++ b/dev-haskell/base-compat/base-compat-0.12.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 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 compatibility layer for base"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/base-compat/base-compat-0.13.0.ebuild b/dev-haskell/base-compat/base-compat-0.13.0.ebuild
new file mode 100644
index 000000000000..9704f477be1f
--- /dev/null
+++ b/dev-haskell/base-compat/base-compat-0.13.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A compatibility layer for base"
+HOMEPAGE="https://hackage.haskell.org/package/base-compat"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/base-compat/base-compat-0.2.1.ebuild b/dev-haskell/base-compat/base-compat-0.2.1.ebuild
deleted file mode 100644
index 82f11fa7a567..000000000000
--- a/dev-haskell/base-compat/base-compat-0.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/setenv
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/base-compat/base-compat-0.4.2.ebuild b/dev-haskell/base-compat/base-compat-0.4.2.ebuild
deleted file mode 100644
index 39c06040db80..000000000000
--- a/dev-haskell/base-compat/base-compat-0.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/errorcall-eq-instance:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/base-compat/base-compat-0.5.0.ebuild b/dev-haskell/base-compat/base-compat-0.5.0.ebuild
deleted file mode 100644
index ad4826f42cba..000000000000
--- a/dev-haskell/base-compat/base-compat-0.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/errorcall-eq-instance:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-compat/base-compat-0.8.2.ebuild b/dev-haskell/base-compat/base-compat-0.8.2.ebuild
deleted file mode 100644
index 1788e054d370..000000000000
--- a/dev-haskell/base-compat/base-compat-0.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-compat/base-compat-0.9.1.ebuild b/dev-haskell/base-compat/base-compat-0.9.1.ebuild
deleted file mode 100644
index 02610269e88d..000000000000
--- a/dev-haskell/base-compat/base-compat-0.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A compatibility layer for base"
-HOMEPAGE="https://hackage.haskell.org/package/base-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-compat/metadata.xml b/dev-haskell/base-compat/metadata.xml
index 46296b14ebec..477d462857a1 100644
--- a/dev-haskell/base-compat/metadata.xml
+++ b/dev-haskell/base-compat/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Ban CPP from your code.  See the README for what is covered:
-		&lt;https://github.com/sol/base-compat#readme&gt;
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">base-compat</remote-id>
+		<remote-id type="github">haskell-compat/base-compat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/base-noprelude/Manifest b/dev-haskell/base-noprelude/Manifest
deleted file mode 100644
index e5d9b986e87e..000000000000
--- a/dev-haskell/base-noprelude/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST base-noprelude-4.13.0.0.tar.gz 2864 BLAKE2B 25d13ae8a2cbee524d46cfe351abbe77321b61dd118bc26b8d275179fdaa5d429450c3e99a12518646bfaa13258a5ffaa9eaf0cb0bd7bb84a93187ae175f6d36 SHA512 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf
diff --git a/dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild b/dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild
deleted file mode 100644
index db91878d219a..000000000000
--- a/dev-haskell/base-noprelude/base-noprelude-4.13.0.0.ebuild
+++ /dev/null
@@ -1,31 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="\"base\" package sans \"Prelude\" module"
-HOMEPAGE="https://github.com/hvr/base-noprelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.8.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.0
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'build-depends:       base ==4.13.0.0' 'build-depends:       base >=4.13.0.0'
-}
diff --git a/dev-haskell/base-noprelude/metadata.xml b/dev-haskell/base-noprelude/metadata.xml
deleted file mode 100644
index d90faa18c748..000000000000
--- a/dev-haskell/base-noprelude/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package simplifies defining custom &quot;Prelude&quot;s without having
-		to use @-XNoImplicitPrelude@ by re-exporting the full module-hierarchy of
-		the [base-4.13.0.0](https://hackage.haskell.org/package/base-4.13.0.0)
-		package /except/ for the &quot;Prelude&quot; module.
-		
-		An usage example for such a &quot;Prelude&quot;-replacement is available with
-		the [Prelude](http://hackage.haskell.org/package/Prelude) package.
-		
-		Starting with GHC 7.10 &amp; Cabal-1.22 this package makes use of the
-		package-level @reexported-modules@ feature.
-		
-		Each version of @base-noprelude@ depends on a specific
-		@base@-version and thus mirrors @base@&#39;s
-		versioning (with the exception that @base-noprelude@ needs to add an
-		/additional/ 5th version component in case of bug-fix releases).
-		
-		See &lt;https://github.com/hvr/base-noprelude&gt; for more information.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/base-orphans/Manifest b/dev-haskell/base-orphans/Manifest
index a403a23f3ed6..d2469804410a 100644
--- a/dev-haskell/base-orphans/Manifest
+++ b/dev-haskell/base-orphans/Manifest
@@ -1,3 +1,2 @@
-DIST base-orphans-0.3.2.tar.gz 12608 BLAKE2B c2e14671dc69c083a8910e4debd64d472382ca4f35c781ccb207f9f8be5193321c7d0c2941455175ed9e813d1eb53ac8617b86a2ec2227bd2f1181b1bb8260de SHA512 2c62148c49e123a8e6f95ac65c4b8998c73f3f0d0bfc71e90058f3d75d760b048f8b3f8a0e88ac80c39947ce3d3d42243b66a2370045e44cbacb1f054335303c
-DIST base-orphans-0.5.4.tar.gz 16834 BLAKE2B 3eb1427497c744b64ab1bd122f005f1ba75f2eb9a76c62fda2fe950c77f3a06b0969268eaf15fa759642f16512e707164c8ad2846f30f283c32a99e0df25ed66 SHA512 41338450e2669936ff8bedbd59954b988154f286e9beb37f4ab98983070b5a99bc3340e3b56fe2701c2a7cc3eed0d8dd549241f1b19c252ea4db8600dd5b5fab
-DIST base-orphans-0.8.2.tar.gz 20727 BLAKE2B bf9c46e1d142bfbebb64a74eed6d367c253e16bc7ac5503b71afa0894b9d890773410d2b5542a5e927bdc76f349ecf7cc06156199f98ba8dce1d675873d4104d SHA512 f438d3434fa2f276af3bd23288e4cab2af94dfbb392b0a7eec747af3fed3856cdac2ce5f9476962cbf5ddbb2e48577469155101e84f7603534fc4d097da882e9
+DIST base-orphans-0.8.6.tar.gz 24255 BLAKE2B 8e8106cbdb58956ef6fc7c133e5a5c5537af8fa1ab56545a533f7c061361583b3921e77fdae2277a39cbc505a7e108fb672942528fe752fd7ef0506a4821547b SHA512 53cda663ee88e2ea53cf6b6d07b625a8343a6a26474bff9fa09554ee094e50429239615a892460fd676e9c3f80cbda0ad824052d785694fdbf1f2a90fa1e29ff
+DIST base-orphans-0.9.0.tar.gz 26025 BLAKE2B f5c5f6266b3f9ab746d76deae58f304827dea6f32dc95474c21314ee7dc3a7836428bc967e0e2ca2e19c39e063e1116ea4db1932f4d35e409a598d44991844e1 SHA512 63700bbd7f59ce598bd855de9e708559245bbac438d1585e5bdec3d0671d4940da3a25684abe727d88353c886eff5913da1fbbe98eada8f2325b20f1f7ffcf55
diff --git a/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild b/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild
deleted file mode 100644
index 6a58930e985b..000000000000
--- a/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backwards-compatible orphan instances for base"
-HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild b/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
deleted file mode 100644
index 015bf719a80e..000000000000
--- a/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backwards-compatible orphan instances for base"
-HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/base-orphans/base-orphans-0.8.2.ebuild b/dev-haskell/base-orphans/base-orphans-0.8.2.ebuild
deleted file mode 100644
index f7b80070c8c4..000000000000
--- a/dev-haskell/base-orphans/base-orphans-0.8.2.ebuild
+++ /dev/null
@@ -1,26 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Backwards-compatible orphan instances for base"
-HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends: base-orphans[test]->hspec->hspec-core->temporary->sxceptions->test-framework->base-orphans
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild b/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild
new file mode 100644
index 000000000000..d585fa60c896
--- /dev/null
+++ b/dev-haskell/base-orphans/base-orphans-0.8.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+RESTRICT=test # disabled at build time
+
+DESCRIPTION="Backwards-compatible orphan instances for base"
+HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+#	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+#		dev-haskell/quickcheck )
diff --git a/dev-haskell/base-orphans/base-orphans-0.9.0.ebuild b/dev-haskell/base-orphans/base-orphans-0.9.0.ebuild
new file mode 100644
index 000000000000..b9b1124f43f6
--- /dev/null
+++ b/dev-haskell/base-orphans/base-orphans-0.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backwards-compatible orphan instances for base"
+HOMEPAGE="https://github.com/haskell-compat/base-orphans#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/quickcheck
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/base-orphans/metadata.xml b/dev-haskell/base-orphans/metadata.xml
index ded6ee8fd1c2..9b4ac4f22a89 100644
--- a/dev-haskell/base-orphans/metadata.xml
+++ b/dev-haskell/base-orphans/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		@base-orphans@ defines orphan instances that mimic instances available in later versions of @base@ to a wider (older) range of compilers. @base-orphans@ does not export anything except the orphan instances themselves and complements @&lt;http://hackage.haskell.org/package/base-compat base-compat&gt;@.
-		
-		See the README for what instances are covered: &lt;https://github.com/haskell-compat/base-orphans#readme&gt;
-	</longdescription>
 	<upstream>
-		<remote-id type="github">haskell-compat/base-orphans#readme</remote-id>
+		<remote-id type="hackage">base-orphans</remote-id>
+		<remote-id type="github">haskell-compat/base-orphans</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/base-prelude/Manifest b/dev-haskell/base-prelude/Manifest
deleted file mode 100644
index 93e8278e51ea..000000000000
--- a/dev-haskell/base-prelude/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST base-prelude-1.0.1.1.tar.gz 4038 BLAKE2B 11f5a26beb32e8e4d1841d1e98984fee9df9fae92083a06f2e322b2c9054be33fff395ebe6552a2ccfe278cb1d119589269040dd6421b1d58d30c6276ab4b18d SHA512 6bcb0794488d9b0805f6385257d6d04ef8cbadd2445534e688a66ac18863be4af2878be968c9733fd58a60dc8c7531f6a7cedd193b46342feb43a3f1f023b757
-DIST base-prelude-1.3.tar.gz 4323 BLAKE2B 3d36ddfa5528f16d4323f690c42fe8871f563cbfc926d5e79831ddb0aebe5ca705842bb87d21dc960bbfaa088a298f7f810dd085228877755678b3daa6c67b4c SHA512 de0f500e0d2d962491951445e7409f337bbf5614417cf6dd54cf04e1dad9ad181bc09648c9f7e0201838fde38ca86b2f89eb40805c9d9df7afb9dbaae565eda9
diff --git a/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild b/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild
deleted file mode 100644
index 33b5ac4f71b5..000000000000
--- a/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The most complete prelude formed solely from the \"base\" package"
-HOMEPAGE="https://github.com/nikita-volkov/base-prelude"
-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.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/base-prelude/base-prelude-1.3.ebuild b/dev-haskell/base-prelude/base-prelude-1.3.ebuild
deleted file mode 100644
index ea9b6f056b64..000000000000
--- a/dev-haskell/base-prelude/base-prelude-1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The most complete prelude formed solely from the \"base\" package"
-HOMEPAGE="https://github.com/nikita-volkov/base-prelude"
-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.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/base-prelude/metadata.xml b/dev-haskell/base-prelude/metadata.xml
deleted file mode 100644
index ca9a5160de97..000000000000
--- a/dev-haskell/base-prelude/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library which aims to reexport all the non-conflicting and
-		most general definitions from the \&quot;base\&quot; package.
-		This includes APIs for applicatives, arrows, monoids, foldables, traversables,
-		exceptions, generics, ST, MVars and STM.
-		
-		This package will never have any dependencies other than \&quot;base\&quot;.
-		
-		/Versioning policy/
-		
-		The versioning policy of this package deviates from PVP in the sense
-		that its exports in part are transitively determined by the version of \&quot;base\&quot;.
-		Therefore it&#39;s recommended for the users of \&quot;base-prelude\&quot; to specify
-		the bounds of \&quot;base\&quot; as well.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/base-unicode-symbols/Manifest b/dev-haskell/base-unicode-symbols/Manifest
index b6ed780367ec..d22c75d5217c 100644
--- a/dev-haskell/base-unicode-symbols/Manifest
+++ b/dev-haskell/base-unicode-symbols/Manifest
@@ -1,2 +1 @@
-DIST base-unicode-symbols-0.2.2.4.tar.gz 5562 BLAKE2B 7482612b993cd4470a6268d49a5384a3907c95506092ff54b96ce2b823744fca9fd3ab18980b193da7a48fd572b84833b916446d73e34cbcbd54161b3c410016 SHA512 8dcdafa1075ccea8f188b880b90430b7e86270f68fcca47bbee7fa7e695bc90765566e09a0f032103d8cf2a265069e80288f56714190c9e68470141e469a994d
 DIST base-unicode-symbols-0.2.4.2.tar.gz 6584 BLAKE2B 5081d04cdbe5c7d75a1896a48728b72547016b99aa35f403ef43184a45bd69c6b15da0f6c6977b8a03c2b84ce92a63f5dbe4f8a1dee04d5d42a67675d93c5912 SHA512 127ba0a6c6f50e16c0bb0634bc7ee84d3596e541ccfd1be1ad261e85fab695613fd415e6a913a02f5dbc10dcaa9e3217db3123b564d070351e5a6a7c9a64b462
diff --git a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild
deleted file mode 100644
index 604c441cccbb..000000000000
--- a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode alternatives for common functions and operators"
-HOMEPAGE="https://haskell.org/haskellwiki/Unicode-symbols"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
index 905982501871..e313b921e66f 100644
--- a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
+++ b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Unicode alternatives for common functions and operators"
-HOMEPAGE="https://haskell.org/haskellwiki/Unicode-symbols"
+HOMEPAGE="http://haskell.org/haskellwiki/Unicode-symbols"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base-unicode-symbols/metadata.xml b/dev-haskell/base-unicode-symbols/metadata.xml
index ca23dac36027..937381521944 100644
--- a/dev-haskell/base-unicode-symbols/metadata.xml
+++ b/dev-haskell/base-unicode-symbols/metadata.xml
@@ -1,25 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package defines new symbols for a number of functions,
-		operators and types in the base package.
-		
-		All symbols are documented with their actual definition and
-		information regarding their Unicode code point. They should be
-		completely interchangeable with their definitions.
-		
-		For further Unicode goodness you can enable the @UnicodeSyntax@
-		language extension \[1\]. This extension enables Unicode characters
-		to be used to stand for certain ASCII character sequences,
-		i.e. &amp;#x2192; instead of @-&gt;@, &amp;#x2200; instead of @forall@ and many
-		others.
-		
-		Original idea by P&amp;#xE9;ter Divi&amp;#xE1;nszky.
-		
-		\[1\] &lt;http://www.haskell.org/ghc/docs/latest/html/users_guide/syntax-extns.html#unicode-syntax&gt;
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/base16-bytestring/Manifest b/dev-haskell/base16-bytestring/Manifest
index 9321540ac69b..b4a20f800e84 100644
--- a/dev-haskell/base16-bytestring/Manifest
+++ b/dev-haskell/base16-bytestring/Manifest
@@ -1 +1,2 @@
-DIST base16-bytestring-0.1.1.6.tar.gz 3694 BLAKE2B 81ea5573cc853a6fb55400b28b7a667ba175a6ae65547dd7ae8b450a72d950c4513bf464f1646c4f8167a2e477974180d85a1884a22b468c5646a5c8b6da2186 SHA512 699bc1f7819a1c0cea0154626f8799301bc9360bc997a5e9313a605ec33ea04d77219b100693021fd43e01d8d979374db07e6e3fabef5301c411f335e30a8cba
+DIST base16-bytestring-0.1.1.7.tar.gz 5136 BLAKE2B 65fbfb5288cae1cd17d4955c9ec55a40d00cd90556dd6c3923d110988612859e2301f4d9c2317a0b24f6dc1532fbb82b3b53133499c24ba276eb1f6754707a1f SHA512 33c4c1e35489cee42ced9fffed3ee11bfe976dc167adc3ab715c224e69025fd9634cb010ee09bf86aa71170e12172c823964fdc3bed4611c599f686beea2985e
+DIST base16-bytestring-1.0.2.0.tar.gz 7219 BLAKE2B 021e49d0e72b23d13928ec08957861b0f7a6c4291c5280403413e89382166653ae5a96ecadc82dc63a7c94a1771e2de0bbd6630b40ed312e221b1c5c125d8280 SHA512 61e483c08f3cd81c0ffa891bd6f4aa5ff222d8184880deb5aeeae8184bd6efdbb373ca6bece2cd597490492107c91a2f4fd6ca9c71c712e298bce7418b9f7135
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
deleted file mode 100644
index 1edae186f55f..000000000000
--- a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast base16 (hex) encoding and decoding for ByteStrings"
-HOMEPAGE="https://github.com/bos/base16-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild
new file mode 100644
index 000000000000..8f719d6cfdd2
--- /dev/null
+++ b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast base16 (hex) encoding and decoding for ByteStrings"
+HOMEPAGE="https://github.com/haskell/base16-bytestring"
+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"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild
new file mode 100644
index 000000000000..149b0d0369e2
--- /dev/null
+++ b/dev-haskell/base16-bytestring/base16-bytestring-1.0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="RFC 4648-compliant Base16 encodings for ByteStrings"
+HOMEPAGE="https://github.com/haskell/base16-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/base16-bytestring/metadata.xml b/dev-haskell/base16-bytestring/metadata.xml
index 4a6a62905750..997be21f7ed6 100644
--- a/dev-haskell/base16-bytestring/metadata.xml
+++ b/dev-haskell/base16-bytestring/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Fast base16 (hex) encoding and decoding for ByteStrings
-	</longdescription>
 	<upstream>
-		<remote-id type="github">bos/base16-bytestring</remote-id>
+		<remote-id type="hackage">base16-bytestring</remote-id>
+		<remote-id type="github">haskell/base16-bytestring</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/base64-bytestring/Manifest b/dev-haskell/base64-bytestring/Manifest
index 96d13c879268..24dd714790ae 100644
--- a/dev-haskell/base64-bytestring/Manifest
+++ b/dev-haskell/base64-bytestring/Manifest
@@ -1,3 +1,2 @@
-DIST base64-bytestring-1.0.0.1.tar.gz 9080 BLAKE2B 272bd4cd4a87c76d5d85bf0bda4b9659168e9623deaebfdc2cedc7083b833fda9512775d17096e8f01b6ca1a1f73c9d1bfa5059b7564f1f3dc2cd467322cfbc8 SHA512 6936b34955b89a275f5bd71c74bbad2be6ff9e2023ac652bdbc9c5b10dd624e3862fc348849858fdb5c7b8aacc36ab4cda8bc6ea797c129b6b28d7e2e2e610e7
-DIST base64-bytestring-1.0.0.2.tar.gz 9830 BLAKE2B c6f860dd665efd9304225adc4cebc8adadb2972d135b859eaea6fef6b5fa8e8521b45a6fce355538dacebb6bf9eb7573b5eb3ca91333d1a0a115c6cc0c1c1a4b SHA512 8d8880cf806aa3932068e0a6faecde084829e72e73cf0a6b4eac99ae852dffbd85f968918546e18920044dd34c65b67bed1c62b6fe71f48b118bc337d86030e4
 DIST base64-bytestring-1.0.0.3.tar.gz 10104 BLAKE2B 00dca0236c739704f45991d974b99715c2c903d8ee228b7fbe3524d690496248d8b6acc798e8c42c70d4bc382b9c79f4f54bd2a858d3863207bb93fa44478ab6 SHA512 e4e244752491ac279a88afc4ceb0fe4c44b75fc369ff47ec29e3c99996b4be967051034c94f0c659d47a153d6b9e0b65a75ea419fdfd52fd50cdc0da2dca7db6
+DIST base64-bytestring-1.2.1.0.tar.gz 13743 BLAKE2B d9776517c76fdeec5df4fe720755d7aaa7206d1570b45f1abeda50cb9f553576ed973a3ba0bb6438c64ecc8644ff298d15ed2fa0575929c156a543d9f9124398 SHA512 730d5fd7bd1cf90792d0eea75de1fd333c6cab73f4d178db6d3c7006d77f222734a53bb10ef3a296862ca31338e2ae387acfdd44b119014cff7a0a13362e6e96
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild
deleted file mode 100644
index ac47f9b4cad0..000000000000
--- a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast base64 encoding and decoding for ByteStrings"
-HOMEPAGE="https://github.com/bos/base64-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.2.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.2.ebuild
deleted file mode 100644
index 25eb5e8e056d..000000000000
--- a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast base64 encoding and decoding for ByteStrings"
-HOMEPAGE="https://github.com/haskell/base64-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/split
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild
index 458d52682faa..f281d2c5bb5c 100644
--- a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild
+++ b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.2.1.0.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.2.1.0.ebuild
new file mode 100644
index 000000000000..305384d3794b
--- /dev/null
+++ b/dev-haskell/base64-bytestring/base64-bytestring-1.2.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast base64 encoding and decoding for ByteStrings"
+HOMEPAGE="https://github.com/haskell/base64-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/base64-bytestring/metadata.xml b/dev-haskell/base64-bytestring/metadata.xml
index 165c7f0e429c..0093a6a3e552 100644
--- a/dev-haskell/base64-bytestring/metadata.xml
+++ b/dev-haskell/base64-bytestring/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Fast base64 encoding and deconding for ByteStrings
-	</longdescription>
 	<upstream>
-		<remote-id type="github">bos/base64-bytestring</remote-id>
+		<remote-id type="hackage">base64-bytestring</remote-id>
+		<remote-id type="github">haskell/base64-bytestring</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/base64/Manifest b/dev-haskell/base64/Manifest
new file mode 100644
index 000000000000..32757fc573f4
--- /dev/null
+++ b/dev-haskell/base64/Manifest
@@ -0,0 +1,2 @@
+DIST base64-0.4.2.4-rev3.cabal 2862 BLAKE2B 3038bc0d78af581c777855db20cbd108b93f063233b7020c1a7ec1734cfa620cf44af8e8d2984f82335e829a9169639f206ac8ee351fc5d8aacfdd2ccac15ccf SHA512 98ff6439f2a812f0c121f8b37cc2b2e45ae6658d3d55f28f339961d56a4967a60fe9f1cbba0de0d0f7c9c63df2e6327551edbe1af773ee7e1257339ad4969389
+DIST base64-0.4.2.4.tar.gz 22065 BLAKE2B c6e794a55e25da6e5f2dd3d793d4f6d2fe759b8923a9d84fdcb9e251018ee579e80db8658afef0448a918fe4e87eda06357b6644d21499f4b8b44936d4f307e2 SHA512 cf7e0f3b7dbd336ecee0aad8df93793c9f72dbfc882f2f5491e3910693f2c530bb2d9762baea729cb7c5cc2a4c3bf130fdff2aa2661fc23e0c8d726de58deb6f
diff --git a/dev-haskell/base64/base64-0.4.2.4.ebuild b/dev-haskell/base64/base64-0.4.2.4.ebuild
new file mode 100644
index 000000000000..064fa0a7d244
--- /dev/null
+++ b/dev-haskell/base64/base64-0.4.2.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern RFC 4648-compliant Base64 library"
+HOMEPAGE="https://github.com/emilypi/base64"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	|| ( ( >=dev-haskell/text-1.2 <dev-haskell/text-1.3 )
+		( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 ) )
+	dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( dev-haskell/base64-bytestring
+		dev-haskell/quickcheck
+		dev-haskell/random-bytestring
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+		dev-haskell/text )
+"
diff --git a/dev-haskell/base64/metadata.xml b/dev-haskell/base64/metadata.xml
new file mode 100644
index 000000000000..fa170158148f
--- /dev/null
+++ b/dev-haskell/base64/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">base64</remote-id>
+		<remote-id type="github">emilypi/base64</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/basement/Manifest b/dev-haskell/basement/Manifest
index 3ed82f269c4c..ff64c96e6048 100644
--- a/dev-haskell/basement/Manifest
+++ b/dev-haskell/basement/Manifest
@@ -1 +1,2 @@
-DIST basement-0.0.11.tar.gz 134032 BLAKE2B 52d9d674841d048b53011589c7a87c7cd7e45655db3c7bc2c99574b8a49bace33f20abf7d4614cf3106e2b87cb67340e5d2f76416889038c2e081c1f62f46bdb SHA512 2396e692fcaa080418eb90c38148dbb2465490ffaa5e35d141573d32729794dffb444bdddd55082878520a22629cfead5fdc1ac98f1d369600cc3165b64730d5
+DIST basement-0.0.12.tar.gz 134142 BLAKE2B cf0ff62bdd69cdcb075b5e63e9d60e7033ac85007101cd8c1d38776cbd1b60b336606e502a91ab8fb7275273f9fa3eae7344f0e47aa269bada2649c7be07caad SHA512 4515fbecfb8280cfd669313d236a5e3b4ef45ba3fd3da8626073fa3a44a889370c48c582ea633eac5df4a5e716c495cf827deb9239274fbdb63a14d19f9682fb
+DIST basement-0.0.16.tar.gz 134837 BLAKE2B f3be5d658e96f5eb6512e2089421185ac67d634a6a61cab13c183d138a34bb6d5a42146f57b08ba0b5c6b4cb0af0b6c9b0af42410602a24b8756917b49ea6cb6 SHA512 dde9a98047e8bece8d938161c95cc25a5924193a271e40120d3a96f02927b5050a8d3abed6c34ae1910bb17c07feb46664dca39d7ba594afc78c055ed27023d9
diff --git a/dev-haskell/basement/basement-0.0.11.ebuild b/dev-haskell/basement/basement-0.0.11.ebuild
deleted file mode 100644
index ea25452e60fb..000000000000
--- a/dev-haskell/basement/basement-0.0.11.ebuild
+++ /dev/null
@@ -1,24 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Foundation scrap box of array & string"
-HOMEPAGE="https://github.com/haskell-foundation/foundation#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/basement/basement-0.0.12.ebuild b/dev-haskell/basement/basement-0.0.12.ebuild
new file mode 100644
index 000000000000..6ba5c0feea65
--- /dev/null
+++ b/dev-haskell/basement/basement-0.0.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Foundation scrap box of array & string"
+HOMEPAGE="https://github.com/haskell-foundation/foundation#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+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/basement/basement-0.0.16.ebuild b/dev-haskell/basement/basement-0.0.16.ebuild
new file mode 100644
index 000000000000..889c4511c3a0
--- /dev/null
+++ b/dev-haskell/basement/basement-0.0.16.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Foundation scrap box of array & string"
+HOMEPAGE="https://github.com/haskell-foundation/foundation#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/basement/metadata.xml b/dev-haskell/basement/metadata.xml
index b6fc07589f5d..eaf9f7355248 100644
--- a/dev-haskell/basement/metadata.xml
+++ b/dev-haskell/basement/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Foundation most basic primitives without any dependencies
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">basement</remote-id>
+		<remote-id type="github">haskell-foundation/foundation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/basic-prelude/Manifest b/dev-haskell/basic-prelude/Manifest
deleted file mode 100644
index 28f0406604ea..000000000000
--- a/dev-haskell/basic-prelude/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST basic-prelude-0.3.11.tar.gz 5234 BLAKE2B 4f4fe53affabf8fb21b3dc950dce46f9102410be56a2e03c3e9b7e75f2230e77740adb674d4056781e2e0c734e75522081f421db64e0ce6c03e77e24fcbf43d4 SHA512 450fe8f2c628d93b4a092c29cf229e0722b31604204b3b82956ea19e682c0a3bf83665046425f422185c4b9ab22e65bd87788f814279cb6e4e4aa9057aac9445
-DIST basic-prelude-0.4.1.tar.gz 5513 BLAKE2B 6d6e85b610a60ef7bc123daaaacb52984bb6a53874d424c85c1fe800b7cdb2f120bd7a4564ba60b002b4440e0beff8b96268d8da0af7fd6c8aabd156efe9e0ef SHA512 5a7d692cccc6e2a9dbc7a947611334583f8f99a455c302f4904b4c5461436cebc5e1a90d450990fa11927fe7f3dd41f10aca8720d538fb926ece11cdcd4a0a10
diff --git a/dev-haskell/basic-prelude/basic-prelude-0.3.11.ebuild b/dev-haskell/basic-prelude/basic-prelude-0.3.11.ebuild
deleted file mode 100644
index d5194572b3db..000000000000
--- a/dev-haskell/basic-prelude/basic-prelude-0.3.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes"
-HOMEPAGE="https://github.com/snoyberg/basic-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashable:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/basic-prelude/basic-prelude-0.4.1.ebuild b/dev-haskell/basic-prelude/basic-prelude-0.4.1.ebuild
deleted file mode 100644
index 1007c669aa9d..000000000000
--- a/dev-haskell/basic-prelude/basic-prelude-0.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes"
-HOMEPAGE="https://github.com/snoyberg/basic-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashable:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/basic-prelude/metadata.xml b/dev-haskell/basic-prelude/metadata.xml
deleted file mode 100644
index b666bf9348f9..000000000000
--- a/dev-haskell/basic-prelude/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The premise of @basic-prelude@ is that there are a lot of very commonly desired features missing from the standard @Prelude@, such as commonly used operators (@\&lt;$\&gt;@ and @&gt;=&gt;@, for instance) and imports for common datatypes (e.g., @ByteString@ and @Vector@). At the same time, there are lots of other components which are more debatable, such as providing polymorphic versions of common functions.
-		
-		So @basic-prelude@ is intended to give a common foundation for a number of alternate preludes. The package provides two modules: @CorePrelude@ provides the common ground for other preludes to build on top of, while @BasicPrelude@ exports @CorePrelude@ together with commonly used list functions to provide a drop-in replacement for the standard @Prelude@.
-		
-		Users wishing to have an improved @Prelude@ can use @BasicPrelude@. Developers wishing to create a new prelude should use @CorePrelude@.
-		
-		Release history:
-		
-		[0.3] Moved a number of exports from @BasicPrelude@ to @CorePrelude@ and vice-versa.
-		
-		[0.2] Renamed @BasicPrelude@ to @CorePrelude@ and added a new @BasicPrelude@ module provided a full-featured @Prelude@ alternative. Also added a number of new exports.
-		
-		[0.1] Initial version, code taken from @classy-prelude@ with a few minor tweaks.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/basic-prelude</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/bencode/Manifest b/dev-haskell/bencode/Manifest
index 62cb27372d5d..bda421fc24e9 100644
--- a/dev-haskell/bencode/Manifest
+++ b/dev-haskell/bencode/Manifest
@@ -1,3 +1 @@
-DIST bencode-0.5.tar.gz 4678 BLAKE2B 11309fa238926733c2bee5d466678e6ea0307e02f30e168c061553f8a6cf1e518413bf34e9a19043706a41531f31e94ffcad4f68a174850934105212de3113fe SHA512 0829d3224684dc6082cc97db854962591df3f343417a5917cf423f41fdeb2fb2f36e71521ce43b7d41d6e436ff2a325024492eeaa0a26cc04876816f8a283987
-DIST bencode-0.6.0.0.tar.gz 4622 BLAKE2B 597e06b7abeebd6dbdbb8b5afa0d978553bf8d9e61b1f3f2e40bf4c2730599518bbeaffb206cad2a6089ab03be5b225e475e1f54d7babc08dce923e2c06a0efb SHA512 be05a5a086d095e8ed79318c7b0a6e5e29f2483f8c9cbfe768c339353d473f8eb5c3060aaed9d60675bdfd13686e02b2261939ca6d34cc9488318daf2cc664d1
 DIST bencode-0.6.1.1.tar.gz 7008 BLAKE2B 9fe866d2588f9feddaa6691ab09c96bfbdb6b91efb79ab48de35fa40d45397f8940423c18b918a4f1289a94574982a8cb96d0c0770f9f346a43193389eec8d09 SHA512 e2f4c312923412a47cbea62caf6e001e30418946165405f2cd9d77f06c13ff2846b352e28ca6cbbfce3bf236fb42f0b108442b17e2b0e8bac702af6d6a114f09
diff --git a/dev-haskell/bencode/bencode-0.5-r1.ebuild b/dev-haskell/bencode/bencode-0.5-r1.ebuild
deleted file mode 100644
index 48510aab98ad..000000000000
--- a/dev-haskell/bencode/bencode-0.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parser and printer for bencoded data"
-HOMEPAGE="https://hackage.haskell.org/package/bencode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/bencode/bencode-0.6.0.0.ebuild b/dev-haskell/bencode/bencode-0.6.0.0.ebuild
deleted file mode 100644
index b5b827c3817e..000000000000
--- a/dev-haskell/bencode/bencode-0.6.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parser and printer for bencoded data"
-HOMEPAGE="https://hackage.haskell.org/package/bencode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/bencode/bencode-0.6.1.1.ebuild b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
index 1800926a4140..dc4225cff129 100644
--- a/dev-haskell/bencode/bencode-0.6.1.1.ebuild
+++ b/dev-haskell/bencode/bencode-0.6.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Parser and printer for bencoded data"
-HOMEPAGE="http://hackage.haskell.org/package/bencode"
+HOMEPAGE="https://hackage.haskell.org/package/bencode"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/parsec:=[profile?]
diff --git a/dev-haskell/bencode/metadata.xml b/dev-haskell/bencode/metadata.xml
index c521fac08962..937381521944 100644
--- a/dev-haskell/bencode/metadata.xml
+++ b/dev-haskell/bencode/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Parser and printer for bencoded data.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/bifunctors/Manifest b/dev-haskell/bifunctors/Manifest
index 9c5ff060e0f6..7e4744650f17 100644
--- a/dev-haskell/bifunctors/Manifest
+++ b/dev-haskell/bifunctors/Manifest
@@ -1,6 +1,2 @@
-DIST bifunctors-3.2.0.1.tar.gz 7332 BLAKE2B 5b72dbb0f14e87bd967eb4a3699a2d7f27e623c36c4baa304f4b5c2cd99c87277b12457a5b58088e59aa8ed002b7e7b848a3565fec0b83ae537d5680b91bda30 SHA512 bd4612327b4f9bc54468d48608fb85e4da416c844a8f0e67c9df8cafe5b3f1385fec8571d470d7baf2f58518cf80add1589164ae0ec02fde6bc240efe386e6f7
-DIST bifunctors-4.1.1.1.tar.gz 10310 BLAKE2B 0f303a34e219e0245abb5cfedbefd8da8c30f5979ad1cd5f1c831d6c36f4732d35bb3871cce669724eb2aa3c1647c6d2922de0438159acba1f069c47ae9aa745 SHA512 9d572f47bd574e7f740b1c2f12ff2c76439ec3b34657f57efba9f23abb5b42e38fdb77b8bfe20e8896f5a8bb2465fee7c02a1adaf7e02ea822b2660d2e7de278
-DIST bifunctors-4.2.1.tar.gz 11494 BLAKE2B f0cbf4c7338239a3d358e0a551552654525941b8f79df72201a28fde192001475fa3782323f145ad14d23d19790baf22ce0304458892a4ebd1586f4aad008012 SHA512 850bf36f6a575e4f1c937f5d65f499a126b813d231a8cbe77aaab0c5f9462f67b25fcad8ff29629f90f95e201c3408d0290e9db4cfaf010a33bd0e7f336a0a05
-DIST bifunctors-5.4.1.tar.gz 39878 BLAKE2B 2e2c4a027e24fc0324be0fcb93ea0d530313c9d31378b540ae0956e734c0dab17a1cb37367fa90d1eb1bb0078cd67029dfddc6e78ca42961865f6a9a53cd4696 SHA512 2b309a8b37b0993159d383ea07b95ca5bb69bc9fd653d0bd0c502c0598a400e11d4e9c8f25c27adbfb5adff209eaa36c242ca9a2618b962cdd9e843b6fbb1a3b
-DIST bifunctors-5.5.6.tar.gz 44721 BLAKE2B 9f0d588ad514b60ac6ac5fc1f5e1c265b111330e008d57340baee4011e6aadbdaa9a7d24b480cd7d568f57e61214821129ce8785a5731763a08306a2c8151b5a SHA512 d78471bdf9c83c77d49825321984964e165c77ee4f02f8c4232ce272246057b0064b68553f8d70a11a930fc771dc55a2991ff63d6d7af89bb749f23737ba6a5b
-DIST bifunctors-5.tar.gz 10562 BLAKE2B 32323e27e86e6a2ded76a8877a118378f8834f5fd64f7459fb53262ce787034e29ca85035f497a34ec02271f7d5af3017e8f87dca3a9b8f3837c06d6675edfca SHA512 5d25764587e8f358687f0cb3b6b831980d267d43c5a67b16611405c9196094d107e05e369a0de55befb9731f8c561fe80859298511fde4f3cefae4a1a2672184
+DIST bifunctors-5.5.11.tar.gz 46003 BLAKE2B 82572e6c162ab105fdce6c3cd7e44da16db232c2233e4d2e3551001a20a2bff0bb4e41fabebc974290749275621a9b0abe3925156090cb960b95e8cbcf43150d SHA512 09f66d1a086a72a822e804521c2258acb16fd5a4a29c3758b97987f27a271f58e3dd4103518b31b3bdf44465c87fe5573a0bba168ba109287ca3370b8ab491a1
+DIST bifunctors-5.5.15.tar.gz 47395 BLAKE2B 5c9af0cc90689c0482aa07ea0a9c7cddb159a016ae075aa20ea441a4a83348db806313e95ec4c90e890f4686eac4622cb384cfca901d265f98deff045edd66ef SHA512 59977c7eec1d1e66c99becc90c29715f90c309ab1ace8e1021d512bf58cb8781e3b3ee5e7de16735fd3cd844b4d918d5f0f6d5afbf1a4da75fa854915356192f
diff --git a/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild b/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild
deleted file mode 100644
index d9ec996ad5d4..000000000000
--- a/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/semigroupoids-3*:=[profile?]
-		>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-		>=dev-haskell/tagged-0.4.4:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild b/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild
deleted file mode 100644
index e8c2205c4e64..000000000000
--- a/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild b/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
deleted file mode 100644
index 3dfd5d93cee6..000000000000
--- a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild b/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
deleted file mode 100644
index 8459127a001c..000000000000
--- a/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+semigroups +tagged"
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck          >= 2   && < 3,' 'QuickCheck          >= 2   && < 3, template-haskell,'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild b/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild
new file mode 100644
index 000000000000..ebb45b068841
--- /dev/null
+++ b/dev-haskell/bifunctors/bifunctors-5.5.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The Bifunctors package authored by Edward Kmett"
+HOMEPAGE="https://github.com/ekmett/bifunctors/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroups +tagged"
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	tagged? ( >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-1.8
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		dev-haskell/transformers-compat )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag semigroups semigroups) \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/bifunctors/bifunctors-5.5.15.ebuild b/dev-haskell/bifunctors/bifunctors-5.5.15.ebuild
new file mode 100644
index 000000000000..3a05ec6b5ba2
--- /dev/null
+++ b/dev-haskell/bifunctors/bifunctors-5.5.15.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The Bifunctors package authored by Edward Kmett"
+HOMEPAGE="https://github.com/ekmett/bifunctors/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroups +tagged"
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	tagged? ( >=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-1.8
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		dev-haskell/transformers-compat )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag semigroups semigroups) \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/bifunctors/bifunctors-5.5.6.ebuild b/dev-haskell/bifunctors/bifunctors-5.5.6.ebuild
deleted file mode 100644
index 0e03032f6a2e..000000000000
--- a/dev-haskell/bifunctors/bifunctors-5.5.6.ebuild
+++ /dev/null
@@ -1,38 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell98 bifunctors package"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+semigroups +tagged"
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.8
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/bifunctors/bifunctors-5.ebuild b/dev-haskell/bifunctors/bifunctors-5.ebuild
deleted file mode 100644
index 4dd74522332e..000000000000
--- a/dev-haskell/bifunctors/bifunctors-5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
-HOMEPAGE="https://github.com/ekmett/bifunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+semigroups +tagged"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/bifunctors/metadata.xml b/dev-haskell/bifunctors/metadata.xml
index a180f7b756c0..6ba6658569a5 100644
--- a/dev-haskell/bifunctors/metadata.xml
+++ b/dev-haskell/bifunctors/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -20,6 +20,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">bifunctors</remote-id>
 		<remote-id type="github">ekmett/bifunctors</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/binary-instances/Manifest b/dev-haskell/binary-instances/Manifest
deleted file mode 100644
index d4c03f59e1b6..000000000000
--- a/dev-haskell/binary-instances/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST binary-instances-1.0.0.1.tar.gz 5025 BLAKE2B 403f6bc8c55bec745b5284b8ebd1ddb429b277b1acbd9081207a40f07eefdc5533cf612fb74bbd7a741378051e06cb6d1d85413572e8e12a42e244e17a42649e SHA512 8933f2eab4a23460bd9be7547f229416adccb3e82ec452f75567fa5b5cb6babe4b7f243fbf3799099647bc4f890eaa1acc962128caa8caafc3ff724867585e3d
diff --git a/dev-haskell/binary-instances/binary-instances-1.0.0.1.ebuild b/dev-haskell/binary-instances/binary-instances-1.0.0.1.ebuild
deleted file mode 100644
index 8cafa453115c..000000000000
--- a/dev-haskell/binary-instances/binary-instances-1.0.0.1.ebuild
+++ /dev/null
@@ -1,48 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for binary"
-HOMEPAGE="https://github.com/phadej/binary-instances#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?]
-	>=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.2:=[profile?]
-	>=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.7:=[profile?]
-	>=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/text-binary-0.2.1.1:=[profile?] <dev-haskell/text-binary-0.3:=[profile?]
-	>=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?]
-	>=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base                     >=4.6.0.1   && <4.15' 'base                     >=4.6.0.1' && <5 \
-		'binary                   >=0.5.1.1   && <0.8.9' 'binary                   >=0.5.1.1'
-}
diff --git a/dev-haskell/binary-instances/metadata.xml b/dev-haskell/binary-instances/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/binary-instances/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/binary-orphans/Manifest b/dev-haskell/binary-orphans/Manifest
index 98559dfdceab..97a389bfec17 100644
--- a/dev-haskell/binary-orphans/Manifest
+++ b/dev-haskell/binary-orphans/Manifest
@@ -1,2 +1,4 @@
-DIST binary-orphans-0.1.6.0.tar.gz 5320 BLAKE2B 3e8393e64ee737316457ee7f36f740404b0f4adaac2134701c935608ac90714473148d8844c167262a058de607f86a2d8d0b2527e6cb07f50f054b77629df97d SHA512 646410b79d92a20ef7b6d6583fca38da672e7fe072d2d5a7a9d50bacd1fb3da20efd9ab42e74029279dcd5a2c4b80218b860ae8e45bef348a692b23bcc8ea351
-DIST binary-orphans-1.0.1.tar.gz 4425 BLAKE2B 2f94e8e2fa70578b0feaa338ea5148f2f373cabdf4fcfaa3092ff7f92484fc7708da09bba8ea51de626c70c74de3051a6eae6c0a2280d125504d168c730e0f14 SHA512 067df608ec5fee2907c1648c19116a4de7a237c41101e811ba02789fbe22c5726443d4950b03bd156ad8ea336acc6c71da3efe7a6cf1127519ec5eb9778ec11d
+DIST binary-orphans-1.0.2.cabal 2264 BLAKE2B aba78e56c07192df484757aa58fdc79ea201cf4545499b11f3a82cbfd0af57c0db0fd1134255f7697b0276f2e7807ba5a74b9b591d233b99e6fec4c908ecdda8 SHA512 8cb030d9a9dc32a4a3ada6684babc5b45d8a6a786261668eb01ae36f3d496f1ca25b0a31782c3728bfb3ede3883df52015aefd85bbf0911ac7e0222d1a33de6e
+DIST binary-orphans-1.0.2.tar.gz 4566 BLAKE2B bdb19771f2ef1201d55766bb26b461341d23899356379a0fa031cf014dc8dd9341bab1538488fe739c9ccecd51ad686e4781220c962a073866238a443ddac389 SHA512 49b6c758b0e94594e9a5feab7f5c3398fcd6b0498c06fffa5e9eb1d39c753f64c0eafbfdd2826a9581a47f2caa5e4194aef89840ce95ba1455844e74b6d6ad1e
+DIST binary-orphans-1.0.4.1-rev2.cabal 2468 BLAKE2B 3ede254321f8d537fe21d6377e0afbbbe3f1cfcbe3815fbbe76d50fcc8fbf46adcf93e4acb790fb8c4e214f94dd1eb063e50f278339aad3db99f95e9021c05d8 SHA512 3cb06701cbb27547eecd41564ded69812ebfbd516033c74eea09c40c789e6d909de27007b38078f35285651313d5a82e36903f36be4cb4e42cdf88d1b0b4634e
+DIST binary-orphans-1.0.4.1.tar.gz 5327 BLAKE2B 6f0a0c12f9c75aca8d3fe5b902eeedec337d9e7bf2dd282a6c2d80ca7e955f12749aab7794d4ed125a8f7fa77bfc39823e9226ff322f8e36008309decf02d948 SHA512 97b37ecc232ef0117f1b0ce11fcd527dad41c6680ad327b74c51fa10ef3cb672a9e1a6c1e6bd015dc1a7f4a4a657178790aa8af8e8200ca7eebd2f11db131a13
diff --git a/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild b/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild
deleted file mode 100644
index 82e78e5a0499..000000000000
--- a/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for binary"
-HOMEPAGE="https://github.com/phadej/binary-orphans#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
-	>=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.1:=[profile?]
-	>=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16.2.2:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.6:=[profile?]
-	>=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/text-binary-0.1.0:=[profile?] <dev-haskell/text-binary-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?]
-	>=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9.3
-		>=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.3.13
-		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'semigroups               >=0.16.2.2  && <0.18.3' 'semigroups               >=0.16.2.2'
-}
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
deleted file mode 100644
index bd12ad351575..000000000000
--- a/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
+++ /dev/null
@@ -1,42 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for binary"
-HOMEPAGE="http://hackage.haskell.org/package/binary-orphans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?]
-	>=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.8.7
-		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base          >=4.5     && <4.14' 'base          >=4.5' \
-		'binary        >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.7' 'binary        >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.9' \
-		'semigroups >=0.18.5 && <0.19.1' 'semigroups >=0.18.5'
-}
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
new file mode 100644
index 000000000000..e1438badd88e
--- /dev/null
+++ b/dev-haskell/binary-orphans/binary-orphans-1.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Tests fail to build
+
+DESCRIPTION="Compatibility package for binary; provides instances"
+HOMEPAGE="https://hackage.haskell.org/package/binary-orphans"
+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"
+
+RDEPEND=">=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+#	test? ( >=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.15
+#		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4
+#		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.8.7
+#		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.5
+#		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11 )
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.4.1.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.4.1.ebuild
new file mode 100644
index 000000000000..321a9daf32cf
--- /dev/null
+++ b/dev-haskell/binary-orphans/binary-orphans-1.0.4.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility package for binary; provides instances"
+HOMEPAGE="https://hackage.haskell.org/package/binary-orphans"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/data-array-byte-0.1.0.1:=[profile?] <dev-haskell/data-array-byte-0.2:=[profile?]
+	>=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.28 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
+		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.11
+	)
+"
diff --git a/dev-haskell/binary-orphans/metadata.xml b/dev-haskell/binary-orphans/metadata.xml
index 3b512c102ba0..9751c66cf0c8 100644
--- a/dev-haskell/binary-orphans/metadata.xml
+++ b/dev-haskell/binary-orphans/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		`binary-orphans` defines orphan instances for types in some popular packages.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">binary-orphans</remote-id>
+		<remote-id type="github">phadej/binary-orphans</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/binary-tagged/Manifest b/dev-haskell/binary-tagged/Manifest
deleted file mode 100644
index 8f77de916282..000000000000
--- a/dev-haskell/binary-tagged/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST binary-tagged-0.1.4.2.tar.gz 9318 BLAKE2B 19a3878d755a57fbeebed38451c55c5695637ee136491ded830a127dcb4f33106bbaf7efb3d3101dc0c37f752e30e93c2ec1216a33343093431d0144c0dcff48 SHA512 381ac0833c13c9b50174d2c5d3695e4af9955631dbaa20719556084ce013973ea37993cb86ac4880f41044fbf178dabe6f100cc53c2d982037a2ca9826878706
-DIST binary-tagged-0.2.tar.gz 9570 BLAKE2B 06519bc4862da1ad4804c487f5b250600e20dff479d47db88dc0b83030a08078b41d1a6691a7b9dc2de62defb797d30bc8081158e722a6c564e08e1a89287971 SHA512 03bcf80b39d5f8e1256ac45b557904d6750d1786f4b4da0c1b9e5c004503d5375699480f89426145a3eea103555c5f4fc820cb87053a2b6ccf4c7e1d6faf7120
diff --git a/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild b/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
deleted file mode 100644
index 885f31709904..000000000000
--- a/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Tagged binary serialisation"
-HOMEPAGE="https://github.com/phadej/binary-tagged#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/generics-sop-0.1:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/bifunctors
-		>=dev-haskell/binary-orphans-0.1.1
-		dev-haskell/quickcheck-instances
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'generics-sop             >=0.1  && <0.3' 'generics-sop             >=0.1'
-}
diff --git a/dev-haskell/binary-tagged/binary-tagged-0.2.ebuild b/dev-haskell/binary-tagged/binary-tagged-0.2.ebuild
deleted file mode 100644
index f53ead554f72..000000000000
--- a/dev-haskell/binary-tagged/binary-tagged-0.2.ebuild
+++ /dev/null
@@ -1,49 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Tagged binary serialisation"
-HOMEPAGE="https://github.com/phadej/binary-tagged#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/cryptohash-sha1-0.11.100.1:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?]
-	>=dev-haskell/generics-sop-0.3.2.0:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/bifunctors
-		>=dev-haskell/binary-instances-1 <dev-haskell/binary-instances-1.1
-		dev-haskell/quickcheck-instances
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base        >=4.7.0.2  && <4.13' 'base        >=4.7.0.2' \
-		'time        >=1.4.2    && <1.9' 'time        >=1.4.2'
-}
diff --git a/dev-haskell/binary-tagged/metadata.xml b/dev-haskell/binary-tagged/metadata.xml
deleted file mode 100644
index 56b4888b6898..000000000000
--- a/dev-haskell/binary-tagged/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Check &lt;https://github.com/phadej/binary-tagged#readme README on Github&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index d99bd1f1a69c..273a10e52ff5 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1,7 +1,3 @@
-DIST binary-0.5.1.1.tar.gz 34239 BLAKE2B 8c55abeff9c02cadd18c62d9c38e5c344d7105be620f2db73066cb559f7755c72570b6898960377240e5b828a8fb3a4ace3efaa360cd1a8d35da6b1480d6da52 SHA512 a177770f2fc220402d2ab256f47ead219176709ecada9994ad5b70a22d9c613e98b4d3b513f45ec4f684d2458e8971c71b0b30cf2d76a79224a424f56360a334
-DIST binary-0.7.1.0.tar.gz 43647 BLAKE2B 7a2b9ed2ab23425318fcfd095beccb3f2c2870cc3687bc84c3adca24a5614b748c85f0252c2c36d37e95aa95b3ed4fa0f44735c670fce02d4ccff22141534316 SHA512 711d64c51cb6cf8811252fe3cbb0575dade897666566610f8dee51c2965d0e3dc1dc40df72713e9e6abbd0bfe494dd4feee70128d21f1ea16305bde3409557b3
-DIST binary-0.7.2.3.tar.gz 47622 BLAKE2B 8d98846d020af95624208ed841b84378ecfd09994bdacc3de8d67ddcb017cdc1acaa5ec8599ade4033d7c1f247dd930fad819212bfb6ef79356c8d931a20f4ef SHA512 1babe32d1c2c0537091c96a3191285f2f61a9c85ca503c89c57c32e60d8f16ee429dd8fb645563d96714122a06ca6c9f0ab1c04077b4f0ed22d4b0b41ef2c18f
-DIST binary-0.7.5.0.tar.gz 45764 BLAKE2B 824e3bc9c910ddb86d2799101bf8c76ad7e10f81911fed0da3d1ea07c5586a4ad645407b1fa53a853adf5e83bc1b77411e9812ebe7d15923e508e3376110e827 SHA512 232e7c3da1c0055f3e9f211a86e81c76bc44ab1b70cabd23c93634dbaa42eed8bd9314fbedc16b9703d3ca92b0bbf232e6c30bb1384687dad0e6e85c9abb8947
-DIST binary-0.7.6.1.tar.gz 47086 BLAKE2B 7d81b9c254902d5ff2bafbef4c31a6f6f0396202d8585690c1ae3b63ae6ed157db7221d65a62e393ee8f6725ffd5d80e51030c0351e954b06004fcb70e5867cd SHA512 655daa93a52b845a85d440810452933d7bc3398ad1b51e1e955b2d19a0a32679325a0d1751ad50d252531e493528262e14dab32af4b9a515855fe7f64e0730b2
-DIST binary-0.8.3.0.tar.gz 51900 BLAKE2B 47e7db8a79e19bbe8cfde3f0b5d3c1edd441606ec0d70f5f02cdad3856dbb35a451b667c33beaf26d8fb57497bde5f3a03df704c458337e065776bb98b308135 SHA512 9b16143067fc974d2dbb4bd42833454a4516eea7ead7674079911b969c42547ededb87f95cd5767553f2105e2f9bb5b2ba08b9666714aa30e56143e606711d44
-DIST binary-0.8.7.0.tar.gz 57443 BLAKE2B 27d892ff28410e37fa9c8f3b852bf6c420fee8c7241815737c7c488e0e1754685ad4efe6a93eed055638870c0b64dc311e1c6e6bc6bf498420f1640557d4ef27 SHA512 2648ea70b6615c01a0e336b3fc187ecb0ad298c620df056da250fa237a2614d23f2ad11a0b11216d799aabb107f89b89d8e63daa30868bf8829ba358b9586aff
+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
diff --git a/dev-haskell/binary/binary-0.5.1.1.ebuild b/dev-haskell/binary/binary-0.5.1.1.ebuild
deleted file mode 100644
index 22de26737827..000000000000
--- a/dev-haskell/binary/binary-0.5.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.2.19.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="http://code.haskell.org/binary/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-CABAL_CORE_LIB_GHC_PV="7.6.* 7.7.*"
diff --git a/dev-haskell/binary/binary-0.7.1.0.ebuild b/dev-haskell/binary/binary-0.7.1.0.ebuild
deleted file mode 100644
index c8203a4b3c40..000000000000
--- a/dev-haskell/binary/binary-0.7.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			>=dev-haskell/quickcheck-2.5
-			>=dev-haskell/random-1.0.1.0
-			dev-haskell/test-framework
-			>=dev-haskell/test-framework-quickcheck2-0.3
-		)"
-
-CABAL_CORE_LIB_GHC_PV="7.7.2013* 7.8.20140130 7.8.0.20140228 7.8.1 7.8.2 7.8.3 7.8.4"
-
-src_prepare() {
-	if has_version ">=dev-lang/ghc-7.7"; then
-		sed -e '/test-suite read-write-file/,/ghc-options: -Wall/d' \
-			-i "${S}/${PN}.cabal" \
-			|| die "Could not remove test suite for ghc 7.7"
-	fi
-}
diff --git a/dev-haskell/binary/binary-0.7.2.3.ebuild b/dev-haskell/binary/binary-0.7.2.3.ebuild
deleted file mode 100644
index 42da1f184ba2..000000000000
--- a/dev-haskell/binary/binary-0.7.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="7.10.* 7.11.2015*"
diff --git a/dev-haskell/binary/binary-0.7.5.0.ebuild b/dev-haskell/binary/binary-0.7.5.0.ebuild
deleted file mode 100644
index a40297b9f873..000000000000
--- a/dev-haskell/binary/binary-0.7.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with latest ghc-7.10
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1"
diff --git a/dev-haskell/binary/binary-0.7.6.1.ebuild b/dev-haskell/binary/binary-0.7.6.1.ebuild
deleted file mode 100644
index f665bde6b618..000000000000
--- a/dev-haskell/binary/binary-0.7.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Avoid test-suite circular depend
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.3_rc1 PM:7.10.3"
diff --git a/dev-haskell/binary/binary-0.8.3.0.ebuild b/dev-haskell/binary/binary-0.8.3.0.ebuild
deleted file mode 100644
index c356ccffd877..000000000000
--- a/dev-haskell/binary/binary-0.8.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2 PM:9999"
diff --git a/dev-haskell/binary/binary-0.8.7.0.ebuild b/dev-haskell/binary/binary-0.8.7.0.ebuild
deleted file mode 100644
index 47206fbe4a64..000000000000
--- a/dev-haskell/binary/binary-0.8.7.0.ebuild
+++ /dev/null
@@ -1,37 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite has circular depends
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="https://github.com/kolmodin/binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # binary[test]->test-framework->text->xml->binary
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}"
-# 	test? ( >=dev-haskell/base-orphans-0.8.1 <dev-haskell/base-orphans-0.9
-# 		dev-haskell/hunit
-# 		>=dev-haskell/quickcheck-2.9
-# 		>=dev-haskell/random-1.0.1.0
-# 		dev-haskell/test-framework
-# 		>=dev-haskell/test-framework-quickcheck2-0.3 )
-# "
-
-CABAL_CORE_LIB_GHC_PV="PM:8.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"
diff --git a/dev-haskell/binary/binary-0.8.8.0-r1.ebuild b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
new file mode 100644
index 000000000000..a83a9c106765
--- /dev/null
+++ b/dev-haskell/binary/binary-0.8.8.0-r1.ebuild
@@ -0,0 +1,40 @@
+# 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" # Circular depend: test-suite"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
+HOMEPAGE="https://github.com/kolmodin/binary"
+
+LICENSE="BSD"
+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"
+
+RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
+
+RDEPEND="
+	>=dev-lang/ghc-8.10.6:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+"
+#	test? (
+#		>=dev-haskell/base-orphans-0.8.1 <dev-haskell/base-orphans-0.9
+#		dev-haskell/hunit
+#		>=dev-haskell/quickcheck-2.9
+#		>=dev-haskell/random-1.0.1.0
+#		dev-haskell/test-framework
+#		>=dev-haskell/test-framework-quickcheck2-0.3
+#	)
+
+CABAL_CORE_LIB_GHC_PV="8.10.6 9.0.2"
diff --git a/dev-haskell/binary/binary-0.8.9.0-r1.ebuild b/dev-haskell/binary/binary-0.8.9.0-r1.ebuild
new file mode 100644
index 000000000000..c94c8c12207c
--- /dev/null
+++ b/dev-haskell/binary/binary-0.8.9.0-r1.ebuild
@@ -0,0 +1,38 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour" # test-suite circular depends
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
+HOMEPAGE="https://github.com/kolmodin/binary"
+
+LICENSE="BSD"
+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"
+
+RESTRICT=test # circular depend: test-framework->base-orphans->cabal->semigroups->nats->binary
+
+RDEPEND="
+	>=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+"
+#	test? (
+#		>=dev-haskell/base-orphans-0.8.1 <dev-haskell/base-orphans-0.9
+#		dev-haskell/hunit
+#		>=dev-haskell/quickcheck-2.9
+#		>=dev-haskell/random-1.0.1.0
+#		dev-haskell/test-framework
+#		>=dev-haskell/test-framework-quickcheck2-0.3
+#	)
+
+CABAL_CORE_LIB_GHC_PV="9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/binary/metadata.xml b/dev-haskell/binary/metadata.xml
index 550649f59ef4..2c20e36ad6b0 100644
--- a/dev-haskell/binary/metadata.xml
+++ b/dev-haskell/binary/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Efficient, pure binary serialisation using lazy ByteStrings.
-		Haskell values may be encoded to and from binary formats,
-		written to disk as binary, or sent over the network.
-		Serialisation speeds of over 1 G\/sec have been observed,
-		so this library should be suitable for high performance
-		scenarios.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">kolmodin/binary</remote-id>
 	</upstream>
diff --git a/dev-haskell/bio/Manifest b/dev-haskell/bio/Manifest
deleted file mode 100644
index f9f2f698b894..000000000000
--- a/dev-haskell/bio/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bio-0.5.3.tar.gz 103707 BLAKE2B 31c9e354ba33f20d6129a20d6272063498bfd4b4ea2cba9eddab8ede62ee894659eb5e6383ef022f5e003deab8bb3c92a98bcadae44db22e7b0346471cad5e4d SHA512 fbe09240a600abbcac952f52f05f28f9b305a1ae3def8b4144bd73bdb160acfbe5457086ef829057d5a73df1df5061668487b2ca5621df73628c8c4990b6b544
diff --git a/dev-haskell/bio/bio-0.5.3-r2.ebuild b/dev-haskell/bio/bio-0.5.3-r2.ebuild
deleted file mode 100644
index 9d49efd38d86..000000000000
--- a/dev-haskell/bio/bio-0.5.3-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="A bioinformatics library"
-HOMEPAGE="http://biohaskell.org/Libraries/Bio"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/old-time:=[profile?]
-		dev-haskell/parallel:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		>=dev-haskell/quickcheck-2:2=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-haskell/tagsoup-0.8:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	cabal_chdeps \
-		'binary >=0.4 && <0.5' 'binary >=0.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples) \
-		$(cabal_flag test test)
-}
-
-src_test() {
-	dist/build/qc/qc || die
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	use test && rm "${ED}"/usr/bin/qc
-	# many examples collide with dev-haskell/flower
-	if use examples ; then
-		pushd "${ED}"/usr/bin
-		local example
-		for example in *
-		do
-			mv "${example}" "${PN}-example-${example}"
-		done
-		popd
-	fi
-}
diff --git a/dev-haskell/bio/files/bio-0.5.3-ghc-7.10.patch b/dev-haskell/bio/files/bio-0.5.3-ghc-7.10.patch
deleted file mode 100644
index d570d22917a7..000000000000
--- a/dev-haskell/bio/files/bio-0.5.3-ghc-7.10.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/Bio/Alignment/Bowtie.hs b/Bio/Alignment/Bowtie.hs
-index 883b057..3e58f0e 100644
---- a/Bio/Alignment/Bowtie.hs
-+++ b/Bio/Alignment/Bowtie.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- {-| This module provides a data type to represent an alignment
diff --git a/dev-haskell/bio/metadata.xml b/dev-haskell/bio/metadata.xml
deleted file mode 100644
index 8927e5f99073..000000000000
--- a/dev-haskell/bio/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a collection of data structures and algorithms
-		useful for building bioinformatics-related tools
-		and utilities.
-		
-		Current list of features includes: a Sequence data type supporting
-		protein and nucleotide sequences and conversion between them.  As of version
-		0.4, different kinds of sequence have different types.  Support for quality
-		data, reading and writing Fasta formatted files, reading TwoBit and
-		phd formats, and Roche/454 SFF files.  Rudimentary (i.e. unoptimized) support
-		for doing alignments - including dynamic adjustment of scores based on sequence quality.
-		Also Blast output parsing.  Partly implemented single linkage clustering, and
-		multiple alignment.  Reading Gene Ontology (GO) annotations (GOA) and
-		definitions\/hierarchy.
-		
-		The Darcs repository is at: &lt;http://malde.org/~ketil/biohaskell/biolib&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/biocore/Manifest b/dev-haskell/biocore/Manifest
deleted file mode 100644
index 301a0ddeebdc..000000000000
--- a/dev-haskell/biocore/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST biocore-0.3.1.tar.gz 2812 BLAKE2B ff94cbbb37c7f74c7d08e31a626336d4db621c468dd42df43ba20739224378b1ecd358e74111174eea6a30450e50091245490606da39781d92e905cb1e875db6 SHA512 0a9a3690aa0888c688c8429facd0a26ac94f639222568d2e68a0640714098a40fa38d196800900486d12b36ee735576519d98e4d45f0320261d3f5de9ab09311
diff --git a/dev-haskell/biocore/biocore-0.3.1.ebuild b/dev-haskell/biocore/biocore-0.3.1.ebuild
deleted file mode 100644
index a03f1244d73a..000000000000
--- a/dev-haskell/biocore/biocore-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A bioinformatics library"
-HOMEPAGE="https://hackage.haskell.org/package/biocore"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stringable:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/biocore/metadata.xml b/dev-haskell/biocore/metadata.xml
deleted file mode 100644
index 769f8647ae51..000000000000
--- a/dev-haskell/biocore/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A set of core definitions and data structures
-		commonly used in bioinformatics.  The intention is that bioinformatics
-		libraries will use this as a common ground to avoid needless incompatibilities
-		and duplicated work.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/biofasta/Manifest b/dev-haskell/biofasta/Manifest
deleted file mode 100644
index a465fef9be65..000000000000
--- a/dev-haskell/biofasta/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST biofasta-0.0.3.tar.gz 14468 BLAKE2B 5df80e3ad74e1c7d5f5cd6538dcdae880829eb7bcef5eb009171e77a24a7705f91a8a7edc24bba1ecbdc73056bd5e9217a6d87cddac43f2bc470c041cddefaa2 SHA512 de50d2f499fc0ee532b5ca28dff868c3dd0d243eaadeb1a4e3a3ebb913812f3308f581aefbf79806d58535b1f78ae283660b5a2348da1a9535f4d48f96b8678e
diff --git a/dev-haskell/biofasta/biofasta-0.0.3.ebuild b/dev-haskell/biofasta/biofasta-0.0.3.ebuild
deleted file mode 100644
index 8621c089a682..000000000000
--- a/dev-haskell/biofasta/biofasta-0.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for reading fasta sequence files"
-HOMEPAGE="https://patch-tag.com/r/dfornika/biofasta/home"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/biocore-0.3.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/biofasta/metadata.xml b/dev-haskell/biofasta/metadata.xml
deleted file mode 100644
index cb9fee2b4fef..000000000000
--- a/dev-haskell/biofasta/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Library for reading fasta sequence files
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/biosff/Manifest b/dev-haskell/biosff/Manifest
deleted file mode 100644
index 6609aac6d6ee..000000000000
--- a/dev-haskell/biosff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST biosff-0.3.7.1.tar.gz 26705 BLAKE2B abf585342c14c01a8f202b34ec94e67138e345918b43a52dbf535c3690bca2039c977ee36ebef861d5f215174429f41702e84d440cf52316de0ec82722053f72 SHA512 ce075d734864b9a00999d5c37c824ece5ba475b583536eb842835b4a44ff56581f18ba8ddf065f2ea4416ff4f96279f6a46f5e57330a43d40164f4cabab2ab9f
diff --git a/dev-haskell/biosff/biosff-0.3.7.1.ebuild b/dev-haskell/biosff/biosff-0.3.7.1.ebuild
deleted file mode 100644
index 4ca013c51520..000000000000
--- a/dev-haskell/biosff/biosff-0.3.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library and executables for working with SFF files"
-HOMEPAGE="http://biohaskell.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fclip +flower +frecover"
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-haskell/biocore-0.3:=[profile?]
-	dev-haskell/cmdargs:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag fclip fclip) \
-		$(cabal_flag flower flower) \
-		$(cabal_flag frecover frecover)
-}
diff --git a/dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch b/dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch
deleted file mode 100644
index 48c29358ca7c..000000000000
--- a/dev-haskell/biosff/files/biosff-0.3.7.1-ghc-7.10.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/src/Flower/Main.hs b/src/Flower/Main.hs
-index b0cbd1c..3428db5 100644
---- a/src/Flower/Main.hs
-+++ b/src/Flower/Main.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -- FlowEr - FLOWgram ExtractoR
diff --git a/dev-haskell/biosff/metadata.xml b/dev-haskell/biosff/metadata.xml
deleted file mode 100644
index d5fd876231a8..000000000000
--- a/dev-haskell/biosff/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The library contains the functionality for reading and writing
-		SFF files (sequencing data from 454 and Ion Torrent).  It duplicates
-		code from (and is incompatible with) the "bio" library.
-	</longdescription>
-	<use>
-		<flag name="fclip">Build the fclip executable.</flag>
-		<flag name="flower">Build the flower executable.</flag>
-		<flag name="frecover">Build the frecover executable.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/bitarray/Manifest b/dev-haskell/bitarray/Manifest
deleted file mode 100644
index 89f9abf6bfe2..000000000000
--- a/dev-haskell/bitarray/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bitarray-0.0.1.1.tar.gz 3701 BLAKE2B f26a89d1999eaf851ffdb66d6e34c4047169fbf1c253acde0631101039ee6f6a7d0ab8640f25b8a1837df9974ac137c5ca1e7f64d537bdd059aaf3eae7e5c5aa SHA512 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602
diff --git a/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild b/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
deleted file mode 100644
index 368d6961a8f8..000000000000
--- a/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable and immutable bit arrays"
-HOMEPAGE="http://code.haskell.org/~bkomuves/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/bitarray/metadata.xml b/dev-haskell/bitarray/metadata.xml
deleted file mode 100644
index 799ae0c2c099..000000000000
--- a/dev-haskell/bitarray/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Mutable and immutable bit arrays.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bits-atomic/Manifest b/dev-haskell/bits-atomic/Manifest
deleted file mode 100644
index fedb3f2de91d..000000000000
--- a/dev-haskell/bits-atomic/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bits-atomic-0.1.3-gcc-5.patch 30907 BLAKE2B 135d495f914af645de82c4d3cd491460dba6fee5293a591f9e83ad07efd7b47cedf32a841557eca0a852690e9367c6fd7a0d6722d6212193c7188fe70d673d77 SHA512 0a40015f225325db3716ac0a17e33eef3f2042b72f933000a52734b103ea3e316a0242a0b75c90a31d0d4c31d33da8d32b07f7c067d79ade51df66ea75a3b19c
-DIST bits-atomic-0.1.3.tar.gz 7982 BLAKE2B 4ac1e6c808c30fb8ad59509aefb9dcb32f98023b31efb2eabf59ea94cbc681aa94219a8389179c7755dfb8ad944bcab122676aca361502d030c85d04c7a4f113 SHA512 e13c21c81ebc6cce2f85a184a572eb1647439f605985a8344ff219cc685c7d0adcf5d2433ea75fa1560a807e329cab23b548435adc0087e6294417eb7a65fbf1
diff --git a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild b/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
deleted file mode 100644
index 11024cb68c50..000000000000
--- a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Atomic bit operations on memory locations for low-level synchronization"
-HOMEPAGE="https://hackage.haskell.org/package/bits-atomic"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://dev.gentoo.org/~slyfox/patches/${P}-gcc-5.patch"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-gcc-5.patch
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch b/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch
deleted file mode 100644
index eb12edc2d4f3..000000000000
--- a/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-ghc-8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/test/test.hs b/test/test.hs
-index 38238b5..c3a99b0 100644
---- a/test/test.hs
-+++ b/test/test.hs
-@@ -35,3 +35,3 @@ testPattern = 0xdeadbeef
- 
--type PolyTest = (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => a -> Assertion
-+type PolyTest = forall a . (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => a -> Assertion
- 
diff --git a/dev-haskell/bits-atomic/metadata.xml b/dev-haskell/bits-atomic/metadata.xml
deleted file mode 100644
index b15af11b249b..000000000000
--- a/dev-haskell/bits-atomic/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Atomic operations including CAS (compare-and-swap), fetch &amp; add and variants
-		suitable for low-level shared-memory synchronization.
-		
-		The implementation is using GCC's builtin atomic operations (available in GCC &gt;=
-		4) in C wrappers called through the FFI. See these links for background:
-		
-		* GCC manual: &lt;https://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html&gt;
-		
-		* GCC wiki: &lt;https://gcc.gnu.org/wiki/Atomic&gt;
-		
-		/Portability/: This package is primarily developed on a Linux system, but
-		should work wherever GCC &gt;= 4 is available. It has been confirmed as working
-		on OSX. On Windows, it should work with Cygwin but currently fails for
-		vanilla Haskell-Platform 2010.1.0.0 as it still packages GCC 3.x. An
-		installer for updated versions of GCC is available at
-		&lt;http://www.mingw.org/&gt; and should make this package work in connection with
-		Haskell-Platform. Feedback on compatibility would be appreciated.
-		
-		/Testing:/ The following commands can be used to compile and run the test suite:
-		
-		&gt; cabal unpack bits-atomic &amp;&amp; cd bits-atomic-* # if not yet locally available
-		&gt; cabal configure -ftest
-		&gt; cabal build
-		&gt; cabal test
-		
-		/Recent changes/:
-		
-		* 0.1.3: Documentation updates, especially on portability. No functional
-		changes.
-		
-		* 0.1.2: Avoid using System.FilePath in Setup.hs to fix build failure on hackage
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bitvec/Manifest b/dev-haskell/bitvec/Manifest
new file mode 100644
index 000000000000..e39759f70fb9
--- /dev/null
+++ b/dev-haskell/bitvec/Manifest
@@ -0,0 +1 @@
+DIST bitvec-1.1.3.0.tar.gz 35865 BLAKE2B b63dc22574176993f55f0935e1d89f6660ef365189838821c11a04a07ff2a41241a1f0a34b148f36036eba3ea55adda516e355a574ae1e49b658c986fb515254 SHA512 4a54726e0ec0923019329fd2f110011f547761e51a7485f684526ba7f97caac170fde1a4bfe84b57a016ad85c6e440b85f20993c15854e9e79231ecd07d960ca
diff --git a/dev-haskell/bitvec/bitvec-1.1.3.0.ebuild b/dev-haskell/bitvec/bitvec-1.1.3.0.ebuild
new file mode 100644
index 000000000000..25d80a6e03b7
--- /dev/null
+++ b/dev-haskell/bitvec/bitvec-1.1.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Space-efficient bit vectors"
+HOMEPAGE="https://github.com/Bodigrim/bitvec"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+gmp"
+
+RDEPEND="
+	>=dev-haskell/primitive-0.5:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	gmp? (
+		dev-libs/gmp
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/quickcheck-classes-0.6.1
+		dev-haskell/quickcheck-classes-base
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag gmp libgmp)
+}
diff --git a/dev-haskell/bitvec/metadata.xml b/dev-haskell/bitvec/metadata.xml
new file mode 100644
index 000000000000..c0879f2b3fdc
--- /dev/null
+++ b/dev-haskell/bitvec/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+	<use>
+		<flag name="gmp">Link against the GMP library for the ultimate performance of
+`zipBits`, `invertBits` and `countBits`. Users are strongly encouraged
+to enable this flag whenever possible.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">bitvec</remote-id>
+		<remote-id type="github">Bodigrim/bitvec</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/bitwise/Manifest b/dev-haskell/bitwise/Manifest
deleted file mode 100644
index 6760cec93e69..000000000000
--- a/dev-haskell/bitwise/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bitwise-0.1.1.1.tar.gz 17107 BLAKE2B 0e4ef87c50a0505aa04f248eb3356b8c3311a8a85c67d13a50621cef0e77416bd1111fcf8823c0b8d35eccd48db5241571da2f0dac8b912e4a6fd2a8ca87217d SHA512 f599411c6ce68a0ac71045ade891ae9c70a2b94b79285cdbac9e694bf227df5f0e65f115321ac62ac2878232aa91b5a6a376ae43654671fda0de2f9b0b65c70e
-DIST bitwise-1.0.0.1.tar.gz 16473 BLAKE2B e7caa6d1ac864d6c12ff471a7080559da93f3973eeb5949e54ee2a2f205cab4a9c452578c0a22102fe613964af4f9367b037552a30dd711b08cac2dd2c3ccdca SHA512 b8653549ef0d0f4eb608802f6124cd969c16cbeb6f26dd83839bbaab7d56cf0c1b39a7ac3dba40f3fa00f3f67f38bad091ee0f01e7f6aea7f9c0bafa34efb443
diff --git a/dev-haskell/bitwise/bitwise-0.1.1.1.ebuild b/dev-haskell/bitwise/bitwise-0.1.1.1.ebuild
deleted file mode 100644
index 96e667f4d2ed..000000000000
--- a/dev-haskell/bitwise/bitwise-0.1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="fast multi-dimensional unboxed bit packed Bool arrays"
-HOMEPAGE="http://code.mathr.co.uk/bitwise"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.4 && < 2.9' 'QuickCheck >= 2.4'
-}
diff --git a/dev-haskell/bitwise/bitwise-1.0.0.1.ebuild b/dev-haskell/bitwise/bitwise-1.0.0.1.ebuild
deleted file mode 100644
index 7c437a36a1a8..000000000000
--- a/dev-haskell/bitwise/bitwise-1.0.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="fast multi-dimensional unboxed bit packed Bool arrays"
-HOMEPAGE="https://code.mathr.co.uk/bitwise"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.4 && < 2.12' 'QuickCheck >= 2.4' \
-		'base >= 4.7 && < 4.12' 'base >= 4.7'
-}
diff --git a/dev-haskell/bitwise/metadata.xml b/dev-haskell/bitwise/metadata.xml
deleted file mode 100644
index 4f0bc14cf689..000000000000
--- a/dev-haskell/bitwise/metadata.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Unboxed multidimensional bit packed Bool arrays with fast aggregate
-		operations based on lifting Bool operations to bitwise operations.
-		
-		There are many other bit packed structures out there, but none met
-		all of these requirements:
-		
-		(1) unboxed bit packed Bool array,
-		
-		(2) multi-dimensional indexing,
-		
-		(3) fast (de)serialization, or interoperable with foreign code,
-		
-		(4) fast aggregate operations (fold, map, zip).
-		
-		Quick tour of the bitwise library:
-		
-		[Data.Bits.Bitwise] Lift boolean operations on &#39;Bool&#39; to bitwise
-		operations on &#39;Data.Bits.Bits&#39;.
-		
-		[Data.Array.BitArray] Immutable bit arrays.
-		
-		[Data.Array.BitArray.ST] Mutable bit arrays in &#39;Control.Monad.ST.ST&#39;.
-		
-		[Data.Array.BitArray.IO] Mutable bit arrays in &#39;IO&#39;.
-		
-		[Data.Array.BitArray.ByteString] (De)serialization.
-		
-		[Codec.Image.PBM] Portable bitmap monochrome 2D image format.
-		
-		Very rough performance benchmarks:
-		
-		* immutable random access single bit reads:
-		@BitArray ix@ is about 40% slower than @UArray ix Bool@,
-		
-		* &#39;Control.Monad.ST.ST&#39; mutable random access single bit reads:
-		@STBitArray s ix@ is about the same as @STUArray s ix Bool@,
-		
-		* immutable map @Bool -&gt; Bool@:
-		@BitArray ix@ is about 85x faster than @UArray ix Bool@,
-		
-		* immutable zipWith @Bool -&gt; Bool -&gt; Bool@:
-		@BitArray ix@ is about 1300x faster than @UArray ix Bool@.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-builder-conduit/Manifest b/dev-haskell/blaze-builder-conduit/Manifest
deleted file mode 100644
index 4012bd8dc149..000000000000
--- a/dev-haskell/blaze-builder-conduit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST blaze-builder-conduit-1.0.0.tar.gz 3952 BLAKE2B 2dbd150aff77aa7926944203e26bf1f2436f65f823e5df62e988109c66a009b44a50ba4d67aa2b5d1ab6fbff4ca58270545b44255a581d856472b163676efdea SHA512 3facc034c7e09c8b83bed7ca80582d5ca454ef31f0f0fe3847d7150f9f9307fc8fc6bb8c870eadaccabb739069e19aee6c0db202a2429faa8bab4b41d684e7aa
-DIST blaze-builder-conduit-1.1.0.tar.gz 1367 BLAKE2B f62b2a5d8dcabec2d9173eb2cdd0569821735624bc8dd9c14779f9a3e2a2c6222d9c95666daac3884aa2edb8b1f2324a8e097d513e48f8479761597d4be570ab SHA512 99a558801dd0bfec495648dc1a964ddf7a53d363c82ddde794bb98b6c3d12ca74edc7d79257cbf83d8802d0197c75c9e71e637de32e30b76600ce9475b0ad797
diff --git a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild
deleted file mode 100644
index 0ae0b62ba559..000000000000
--- a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Convert streams of builders to streams of bytestrings"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-		<dev-haskell/blaze-builder-0.4:=[profile?]
-		=dev-haskell/conduit-1.0*:=[profile?]
-		>=dev-haskell/text-0.11:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-		)"
diff --git a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
deleted file mode 100644
index cf4d2a9afeeb..000000000000
--- a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Convert streams of builders to streams of bytestrings. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/blaze-builder-conduit/metadata.xml b/dev-haskell/blaze-builder-conduit/metadata.xml
deleted file mode 100644
index 6b756208dfdf..000000000000
--- a/dev-haskell/blaze-builder-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Convert streams of builders to streams of bytestrings.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-builder-enumerator/Manifest b/dev-haskell/blaze-builder-enumerator/Manifest
deleted file mode 100644
index 92d779f5e825..000000000000
--- a/dev-haskell/blaze-builder-enumerator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST blaze-builder-enumerator-0.2.1.0.tar.gz 4248 BLAKE2B 1d20ac8a07a949d9eae5e9180451519dfd48e7c3c8dc7c03d9fd8c2c87fa9965a129b31d76e7fe34b0f40e2a85a54da6cc47e32d115836e65d7754df1f111205 SHA512 e795a9ddf41b81ede30ccd0d698674c743ad3e8ccfb89e70184a7aa07e9437597b3a187a66538b8a865281582f17d1c9111add8f8505204b56c0db0fd05a0e1a
diff --git a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild
deleted file mode 100644
index ce61963948f5..000000000000
--- a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enumeratees for the incremental conversion of builders to bytestrings"
-HOMEPAGE="https://github.com/meiersi/blaze-builder-enumerator"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+newbuilder"
-
-RDEPEND=">=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	newbuilder? ( >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-			>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] )
-	!newbuilder? ( >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers  >= 0.2     && < 0.5' 'transformers  >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag newbuilder newbuilder)
-}
diff --git a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
deleted file mode 100644
index eef49c0e0f54..000000000000
--- a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enumeratees for the incremental conversion of builders to bytestrings"
-HOMEPAGE="https://github.com/meiersi/blaze-builder-enumerator"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+newbuilder"
-
-RDEPEND=">=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	newbuilder? ( >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-			>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] )
-	!newbuilder? ( >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag newbuilder newbuilder)
-}
diff --git a/dev-haskell/blaze-builder-enumerator/metadata.xml b/dev-haskell/blaze-builder-enumerator/metadata.xml
deleted file mode 100644
index 77a9cb2efcc6..000000000000
--- a/dev-haskell/blaze-builder-enumerator/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package integrates the builders from the blaze-builder package with
-		the enumerator package. It provides infrastructure and enumeratees for
-		incrementally executing builders and pass the filled chunks to a bytestring
-		iteratee.
-	</longdescription>
-	<use>
-		<flag name="newbuilder">use bytestring-builder instead of blaze-builder-0.3</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">meiersi/blaze-builder-enumerator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/blaze-builder/Manifest b/dev-haskell/blaze-builder/Manifest
index 649d67a8c3bf..a99be0961582 100644
--- a/dev-haskell/blaze-builder/Manifest
+++ b/dev-haskell/blaze-builder/Manifest
@@ -1,5 +1,3 @@
-DIST blaze-builder-0.3.3.2.tar.gz 67371 BLAKE2B a9982be738d47767f159cd6605d1331bc6a052dd81dac2df4dcfda364a2a7cf5ed888d5bad0de30b0deafda2a18845d83c219148efce57eba64ad17a41278bd4 SHA512 6caecca5f1976938f0536e00cdf305a3c3d1abf1fa4a4bc9c89743857940fc46d0f3b274a49acd1e5c0d4453c2d2b2f6f0f3b1deed87a01f72a61e21bc83787f
-DIST blaze-builder-0.3.3.4.tar.gz 67399 BLAKE2B 302edef237e923623b9a38f994d7aa6d8afbffe130572c53c48fabbe444ead90666e8e674a2ae776d65af17d8b9d0983a88e0896a5391a088bb0f1a31e58c727 SHA512 ed01adaa4fd4a95926d34fa785c9a1a127e1094f1891936256ae593fd492fa3a55ade6ad5d62610f3ecd6662f32facddc5053da63e4ab3e5f3c329ae6950bd23
-DIST blaze-builder-0.4.0.1.tar.gz 57113 BLAKE2B 34e3601e6ae41579ab538800a783964cd98209cdd903052a2d733482348bbaeed8501a7e62ea2a6721d66f7ca619ebc82e4b4a1bca707e4a7712e55798c5981f SHA512 876c12d75ede8876c834999a4a69794fbc1f56e888eea3a976cc85707456bb1439ac72bc41dea1c2400c6fe761d20a6b7b9eda61c10fc390fa5c5c0b22aa3ff0
-DIST blaze-builder-0.4.0.2.tar.gz 58681 BLAKE2B 713e932ccb404dadd9d4f7398ef10e26d7d452d1c56c4a617315d5f50ae1ffe18c3bbeba9ab1bf86442c966e0dbbb1056c7942b4e98fb6d1e42a457dde0af83b SHA512 ca0390d1e31d1fb65f5739a15b4604e67d01aa1ba2f98ac6e741b277e64e79e8d65eca581aba405b65136261654f3e116c21ae4b4018d74a784e481c2ee9d3a0
-DIST blaze-builder-0.4.1.0.tar.gz 61365 BLAKE2B 6c6a1c2f7b97a75bb7489471e34674d0502ec1b2871643dc945ef0574d94cc09c2726d03fcc4f38d43f34baadd8629a0e81d5292998153ee8b907d546153488c SHA512 0962634113a19d39fb19a9df895a4e4e3e0fc5b2c17fd0d5c27e1cd9da128fd3af2f01d7b0ce894d3964b5b3bd874aeae205b126e069a6e5d964ad97c753da39
+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
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild
deleted file mode 100644
index 8671dd34e049..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/meiersi/blaze-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.3.3.4.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.3.3.4.ebuild
deleted file mode 100644
index df8ae453f806..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.3.3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/meiersi/blaze-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
deleted file mode 100644
index 8ebea2208ae3..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/lpsmith/blaze-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2
-		dev-haskell/utf8-string )
-"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.0.2.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.0.2.ebuild
deleted file mode 100644
index 1584a8d62224..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/lpsmith/blaze-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2
-		dev-haskell/utf8-string )
-"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild
deleted file mode 100644
index 21371dc7e524..000000000000
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient buffered output"
-HOMEPAGE="https://github.com/lpsmith/blaze-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2
-		dev-haskell/utf8-string )
-"
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
new file mode 100644
index 000000000000..1081883d2e10
--- /dev/null
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient buffered output"
+HOMEPAGE="https://github.com/lpsmith/blaze-builder"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+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-9.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2
+		dev-haskell/utf8-string )
+"
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.2.2.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.2.2.ebuild
new file mode 100644
index 000000000000..19fdd3527d52
--- /dev/null
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.2.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient buffered output"
+HOMEPAGE="https://github.com/blaze-builder/blaze-builder"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2
+		dev-haskell/utf8-string )
+"
diff --git a/dev-haskell/blaze-builder/metadata.xml b/dev-haskell/blaze-builder/metadata.xml
index be1f9908983d..3bdb9d6eeead 100644
--- a/dev-haskell/blaze-builder/metadata.xml
+++ b/dev-haskell/blaze-builder/metadata.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library provides an abstraction of buffered output of
-		byte streams and several convenience functions to exploit
-		it. For example, it allows to efficiently serialize
-		Haskell values to lazy bytestrings with a large average
-		chunk size. The large average chunk size allows to make
-		good use of cache prefetching in later processing steps
-		(e.g. compression) and reduces the sytem call overhead
-		when writing the resulting lazy bytestring to a file or
-		sending it over the network.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">meiersi/blaze-builder</remote-id>
+		<remote-id type="hackage">blaze-builder</remote-id>
+		<remote-id type="github">blaze-builder/blaze-builder</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/blaze-html/Manifest b/dev-haskell/blaze-html/Manifest
index 43c3169bb90b..4fd175b3a555 100644
--- a/dev-haskell/blaze-html/Manifest
+++ b/dev-haskell/blaze-html/Manifest
@@ -1,6 +1,2 @@
-DIST blaze-html-0.6.1.2.tar.gz 75673 BLAKE2B d272807970ae962247ad2a0c329ca21a88ea6174db2c417f011ae95cb4681709d4a71359805644bde5c5083d27346c14797cc190ad7384a320c97b61acba5413 SHA512 15b655ce35adc8e9a139780788a2b615ed095468bcb0be3074f0d90bcfe4966ea4705d088b9c9426a469e279c2a0da8081298c4f356194d5c8d7c4046d8e7f19
-DIST blaze-html-0.6.1.3.tar.gz 75658 BLAKE2B d75fcec101f424bde94647cdd314ffac2b60e223c07c3961858e19d547c534c891af97fad9a993a0c55745b4f24fe7d874275496f3b42ae78d0b4cbf96c20fd8 SHA512 2edfff6880d860201cc6de57c07ddee7875bdaca4e2a0a7a9373e080b15e2f6ad0dee1abd37eabce0ecc827bb3a0140358630497684760d636600c55bbf935ac
-DIST blaze-html-0.7.1.0.tar.gz 75872 BLAKE2B b118c4b7b4ae04bc2c02d7396478f971a9e0dff5096ac57851f68b1f62fdfd99745a5cd40dd0f2528b65c7a38b5e44c49cacb9d022ae2cb22a80c1de8847b091 SHA512 efc007089172b57493b0640e1484706f7b206ac9803699b0c8f5f6f74e74482dfc555d4a0e828fc2809d47b6015020268805b38109890f063b51c9f91d521896
-DIST blaze-html-0.8.1.1.tar.gz 76157 BLAKE2B 7bd5eb7d051a045e0dc0a3d48577da961deb90bd73e220c0556799018b178761cda13f636d37092d7f2e53b08a25391272b93862467210e92939b78e2e34d33b SHA512 0af9754c5cfd25757c5f1b8514ee37cecdd77a6397f513f6d4b6be301308c11c64d8649d2cc3e9d7ffb85cc9d9fcf18193a8bdf9e19466a6895243c4c338af91
-DIST blaze-html-0.8.1.2.tar.gz 77898 BLAKE2B 34cacaaaf68b81baa77a30e6a208dcb802071313d2d2ed3adecf2c48fff140426566e115984104c31e6a52faee2de1301022b8acca74951f092264c2b33abb62 SHA512 0b786b6fdec9c9e5c458eaf1a2504c0afb32293a8e1750d5e0413041f863a8c364675278d80075d9423387f4cbd50e1476016c1ab3d46a6cd27aec06d6899ea2
+DIST blaze-html-0.9.1.2-rev2.cabal 3062 BLAKE2B d39b3ba6f0e43a82cc30b603748f4c5d73e736d57ef671583785923d8daa6100bed5884a34b2d41a3c72e010e24783ffacc69025a9e83eef7e423311e747f9e9 SHA512 debb09afd6a0a8e8ac63026f2de02ddc6ab396f035067824f158f7604fe43d0d5c0ec8f5df7634323855c4ad2ba5319b4880169d680537dfd94dca3fd88f9f62
 DIST blaze-html-0.9.1.2.tar.gz 81617 BLAKE2B 36e86647db47ee55a32daf2cf2afa51fd58436c7de7e7dac81b298cc1ea7e1ba1fd470d2a19def3bc6aabc51bd046c8c611300fa4ecb5f0e1cee2286a0b461e6 SHA512 26e5294285033fa453ab9914a5bdb37c42f5b7c3a10400be1ff6dd125a70499d556c106cc8128154dc0c455c8b80b489a883265fcb626e2d4afcd8e4d94374bc
diff --git a/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild
deleted file mode 100644
index d4be1d37df14..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck                 >= 2.4 && < 2.7' 'QuickCheck                 >= 2.4' \
-		'text          >= 0.10  && < 1.1' 'text          >= 0.10'
-}
diff --git a/dev-haskell/blaze-html/blaze-html-0.6.1.3.ebuild b/dev-haskell/blaze-html/blaze-html-0.6.1.3.ebuild
deleted file mode 100644
index 2155235dd5b2..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.6.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/blaze-html-0.7.1.0.ebuild b/dev-haskell/blaze-html/blaze-html-0.7.1.0.ebuild
deleted file mode 100644
index 366b46de44f5..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.7.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-markup-0.6.3:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild b/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
deleted file mode 100644
index d107a950834d..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild
deleted file mode 100644
index d0974b28d103..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/blaze-html-0.9.1.2-r2.ebuild b/dev-haskell/blaze-html/blaze-html-0.9.1.2-r2.ebuild
new file mode 100644
index 000000000000..dba23781e701
--- /dev/null
+++ b/dev-haskell/blaze-html/blaze-html-0.9.1.2-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
+HOMEPAGE="https://jaspervdj.be/blaze"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
deleted file mode 100644
index 6949fb57f373..000000000000
--- a/dev-haskell/blaze-html/blaze-html-0.9.1.2.ebuild
+++ /dev/null
@@ -1,32 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast HTML combinator library for Haskell"
-HOMEPAGE="http://jaspervdj.be/blaze"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-html/metadata.xml b/dev-haskell/blaze-html/metadata.xml
index 85640c74809c..937381521944 100644
--- a/dev-haskell/blaze-html/metadata.xml
+++ b/dev-haskell/blaze-html/metadata.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A blazingly fast HTML combinator library for the Haskell
-		programming language. The Text.Blaze module is a good
-		starting point, as well as this tutorial:
-		&lt;http://jaspervdj.be/blaze/tutorial.html&gt;.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/blaze-markup/Manifest b/dev-haskell/blaze-markup/Manifest
index 4817c2361b9e..7f8482735520 100644
--- a/dev-haskell/blaze-markup/Manifest
+++ b/dev-haskell/blaze-markup/Manifest
@@ -1,5 +1,2 @@
-DIST blaze-markup-0.5.2.1.tar.gz 12069 BLAKE2B c67b14c238c20bf96f19387d0f08335c8c1c9d56fe5bf3a16d6650d2614f00415a20c976df5f2f1afa30d61abcf5e64bf4bc6092725e915eb061bfc59b390439 SHA512 ef59c658244ff29ac58a7855fa9e011acc719e0d0cc217c26e4f8bbaa48efeb69defda02761685cf0f93d80269e64afc86047c005b129cb3dfe281e7122927e0
-DIST blaze-markup-0.6.3.0.tar.gz 13348 BLAKE2B 5bac4df7cc3e982f1b79245470aca97f00d84e6bfcc9a3ac2e28d3eebde98148f3880a56d2d6f9b615acd56198b823bb8c821f8d2da522d59593b4064cd0b87b SHA512 01ce41593242ddd6effa4ee2edecf461f434992b85fd79e1df8bd766a5879bda545842ea84d30f0513035fc686aeb624373a1de2377d1f5cad52cc1482acc318
-DIST blaze-markup-0.7.0.3.tar.gz 13447 BLAKE2B 6934ab2c2711ec0dddc0068e5b523291d93b03ba9abe81761b9e39f95c9c45978c0c0347b0b5824251e6db0892590cd261af6dbdcbe6b10714452dd20364c02c SHA512 295188911304f32addd19ae8df5f69502cad65a09778c65fede6eb167842508769dae5a0b7eef7451fbcc767d3a0079484a3ed8d2caaa9a841fecc6d5dc4d482
-DIST blaze-markup-0.7.1.0.tar.gz 13548 BLAKE2B b914629cd9df285e6a552fad789aa0179725dba39ae5d0fb13ae669eeecefdb72bb438f4208f92585841c69d39470517794736fac0d3e0969c68f65f5125675b SHA512 42c3c0db1141b0f67f720795fef8d8cd5e4ae6d12851b6048caecbf57062f8422d3101f80264534d70eab21465c823ff29f037bde948da43478c9d9651feda77
-DIST blaze-markup-0.8.2.4.tar.gz 14518 BLAKE2B 43f07bdfeac60e60b55a7a0f8a1bf3c1386597b09511a6df2139246b05d10bc66899ffad7eefbd97cc1c981e7dcc8f7e345ec41675293599f22e1d3849ecd5d9 SHA512 e75fe4162f165975febced4d54460c64a4a4d1ec1db963fcda7d1c1e2cc2c24f8eb565ba0170524aa28da3b3cc1d8057d036a1ab963052436dd550189d5cd263
+DIST blaze-markup-0.8.2.8-rev4.cabal 2271 BLAKE2B 2e3f4619511693df71d0c13f7b11be0a93ba17ca1a4d8309e28cfce7c51be356f5192be0fb0cd7078cd99d8653032d3fd9fbd3bb9097dfe8fdbfb9190d25bb7f SHA512 a26f0036aedb8fc9261d61be03545cd181c74e70a82c29d799c45c448f7dff5d8c413e4e2ef4a1997b43a1992a60c33e45090e3ca345898f80182016992b37b4
+DIST blaze-markup-0.8.2.8.tar.gz 14519 BLAKE2B 14e411fa06da460f3ef2362179d910562d292190396430c9fe6fae76195d0d6d0a5a2110659f41217515afdbece60618eca6264906a554fc9668f25abaac7119 SHA512 d677b611c751c2dfd4bd12c1b1aa612b08356c90b9962b60d4972a9626ddd0337bcaf40b4595b64c1d3bf506d017f058771d00fa55979b94283095061be18944
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild
deleted file mode 100644
index 5a3ccbdeb3df..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck                 >= 2.4 && < 2.7' 'QuickCheck                 >= 2.4'
-}
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.6.3.0.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.6.3.0.ebuild
deleted file mode 100644
index 717c68269fa9..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.6.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
deleted file mode 100644
index 6b30d1224c2d..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild
deleted file mode 100644
index 23bd4d49d8a3..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="https://jaspervdj.be/blaze"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild
deleted file mode 100644
index 4de88dc0c818..000000000000
--- a/dev-haskell/blaze-markup/blaze-markup-0.8.2.4.ebuild
+++ /dev/null
@@ -1,38 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A blazingly fast markup combinator library for Haskell"
-HOMEPAGE="http://jaspervdj.be/blaze"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
-		>=dev-haskell/tasty-1.0 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base          >= 4    && < 4.14' 'base          >= 4'
-}
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.8.2.8-r1.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.8.2.8-r1.ebuild
new file mode 100644
index 000000000000..03a9ca261bc6
--- /dev/null
+++ b/dev-haskell/blaze-markup/blaze-markup-0.8.2.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A blazingly fast markup combinator library for Haskell"
+HOMEPAGE="https://jaspervdj.be/blaze"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-1.0 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+	)
+"
diff --git a/dev-haskell/blaze-markup/metadata.xml b/dev-haskell/blaze-markup/metadata.xml
index 30c5711bd3a3..d03ec965e673 100644
--- a/dev-haskell/blaze-markup/metadata.xml
+++ b/dev-haskell/blaze-markup/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Core modules of a blazingly fast markup combinator library for the Haskell
-		programming language. The Text.Blaze module is a good
-		starting point, as well as this tutorial:
-		&lt;http://jaspervdj.be/blaze/tutorial.html&gt;.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">blaze-markup</remote-id>
+		<remote-id type="github">jaspervdj/blaze-markup</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/bloomfilter/Manifest b/dev-haskell/bloomfilter/Manifest
index 3ab2760834df..4b77ae077d88 100644
--- a/dev-haskell/bloomfilter/Manifest
+++ b/dev-haskell/bloomfilter/Manifest
@@ -1,2 +1,2 @@
-DIST bloomfilter-1.2.6.10.tar.gz 21533 BLAKE2B fda4bf7f45a1e6a13a6e1e6bdaf76c0a6cd75b7922dedfc9ee62ce5523868ab4b7e9350723a688e0e8489a035586638daef1daf5c7a0eb4d3a7bc937d7bf9c15 SHA512 c3bad38edf59bd59439c24385e300fab90f4ccd1b1faf7bea6c4b25b2bcabdfc806a7274d1cad40a711312b016d6fbb99a0ca9cf8b358ad874bbbabc14e1f454
+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
diff --git a/dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild b/dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild
deleted file mode 100644
index 1552b36d77fa..000000000000
--- a/dev-haskell/bloomfilter/bloomfilter-1.2.6.10-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Pure and impure Bloom Filter implementations"
-HOMEPAGE="https://github.com/bos/bloomfilter"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/quickcheck-2.4:2
-			<dev-haskell/quickcheck-2.8:2
-			dev-haskell/random
-			dev-haskell/test-framework
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck == 2.4.*' 'QuickCheck >= 2.4 && < 2.8'
-
-	if has_version ">=dev-haskell/quickcheck-2.5"; then
-		epatch "${FILESDIR}/${PN}-1.2.6.10-quickcheck-2.6.patch"
-	fi
-	epatch "${FILESDIR}/${PN}-1.2.6.10-ghc-7.7.patch"
-}
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild
new file mode 100644
index 000000000000..89eb41c70f59
--- /dev/null
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure and impure Bloom Filter implementations"
+HOMEPAGE="https://github.com/bos/bloomfilter"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.1.0-ghc-9_2-fix.patch"
+)
+
+CABAL_CHDEPS=(
+	'base       >= 4.4 && < 4.16' 'base >= 4.4'
+	'base >= 4.4 && < 4.16' 'base >= 4.4'
+)
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/quickcheck-2.5
+		dev-haskell/random
+		dev-haskell/test-framework
+		dev-haskell/test-framework-quickcheck2
+	)
+"
diff --git a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
index 341f5c9445dd..bce47d8d507f 100644
--- a/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
+++ b/dev-haskell/bloomfilter/bloomfilter-2.0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,10 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+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/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch
deleted file mode 100644
index 899fb4176aa2..000000000000
--- a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs
-index 69711ef..97a8348 100644
---- a/Data/BloomFilter.hs
-+++ b/Data/BloomFilter.hs
-@@ -93,7 +93,8 @@ import Control.Monad (liftM, forM_)
- import Control.Monad.ST (ST, runST)
- import Control.DeepSeq (NFData(..))
- import Data.Array.Base (unsafeAt, unsafeRead, unsafeWrite)
--import Data.Array.ST (STUArray, thaw, unsafeFreeze)
-+import Data.Array.ST (STUArray, thaw)
-+import qualified Data.Array.Unsafe as U (unsafeFreeze)
- import Data.Array.Unboxed (UArray)
- import Data.Bits ((.&.), (.|.))
- import Data.BloomFilter.Array (newArray)
-@@ -336,7 +337,7 @@ notElemB elt ub = any test (hashesU ub elt)
- -- occur.  For a safer creation interface, use 'createB'.
- unsafeFreezeMB :: MBloom s a -> ST s (Bloom a)
- unsafeFreezeMB mb = B (hashMB mb) (shiftMB mb) (maskMB mb) `liftM`
--                    unsafeFreeze (bitArrayMB mb)
-+                    U.unsafeFreeze (bitArrayMB mb)
- 
- -- | Copy an immutable Bloom filter to create a mutable one.  There is
- -- no non-copying equivalent.
-diff --git a/Data/BloomFilter/Array.hs b/Data/BloomFilter/Array.hs
-index e085bbe..5accde9 100644
---- a/Data/BloomFilter/Array.hs
-+++ b/Data/BloomFilter/Array.hs
-@@ -3,7 +3,8 @@
- 
- module Data.BloomFilter.Array (newArray) where
- 
--import Control.Monad.ST (ST, unsafeIOToST)
-+import Control.Monad.ST (ST)
-+import qualified Control.Monad.ST.Unsafe as U (unsafeIOToST)
- import Data.Array.Base (MArray, STUArray(..), unsafeNewArray_)
- #if __GLASGOW_HASKELL__ >= 704
- import Foreign.C.Types (CInt(..), CSize(..))
-@@ -18,7 +19,7 @@ newArray :: forall e s. (MArray (STUArray s) e (ST s)) =>
- {-# INLINE newArray #-}
- newArray numElems numBytes = do
-   ary@(STUArray _ _ _ marr#) <- unsafeNewArray_ (0, numElems - 1)
--  _ <- unsafeIOToST (memset marr# 0 (fromIntegral numBytes))
-+  _ <- U.unsafeIOToST (memset marr# 0 (fromIntegral numBytes))
-   return ary
- 
- foreign import ccall unsafe "memset"
diff --git a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch
deleted file mode 100644
index 0b27043aed2f..000000000000
--- a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bloomfilter-1.2.6.10-orig/tests/QCSupport.hs	2012-06-16 09:59:56.000000000 +1000
-+++ bloomfilter-1.2.6.10/tests/QCSupport.hs	2012-07-14 19:00:06.035731133 +1000
-@@ -20,9 +20,6 @@
-     arbitrary = choose (epsilon, 1 - epsilon)
-         where epsilon = 1e-6 :: P
- 
--instance Arbitrary Ordering where
--    arbitrary = oneof [return LT, return GT, return EQ]
--
- -- For some reason, MIN_VERSION_random doesn't work here :-(
- #if __GLASGOW_HASKELL__ < 704
- integralRandomR :: (Integral a, RandomGen g) => (a, a) -> g -> (a, g)
diff --git a/dev-haskell/bloomfilter/files/bloomfilter-2.0.1.0-ghc-9_2-fix.patch b/dev-haskell/bloomfilter/files/bloomfilter-2.0.1.0-ghc-9_2-fix.patch
new file mode 100644
index 000000000000..d08788f687b8
--- /dev/null
+++ b/dev-haskell/bloomfilter/files/bloomfilter-2.0.1.0-ghc-9_2-fix.patch
@@ -0,0 +1,289 @@
+From fb79b39c44404fd791a3bed973e9d844fb084f1e Mon Sep 17 00:00:00 2001
+From: Simon Jakobi <simon.jakobi@gmail.com>
+From: <https://github.com/bos/bloomfilter/pull/20>
+Date: Fri, 12 Nov 2021 01:37:36 +0100
+Subject: [PATCH 1/2] Fix build with GHC 9.2
+
+The `FastShift.shift{L,R}` methods are replaced with `unsafeShift{L,R}`
+introduced in base-4.5.
+
+Fixes #19.
+---
+ Data/BloomFilter.hs         | 16 +++++------
+ Data/BloomFilter/Hash.hs    | 15 +++++-----
+ Data/BloomFilter/Mutable.hs | 20 +++++++-------
+ Data/BloomFilter/Util.hs    | 55 ++++++-------------------------------
+ bloomfilter.cabal           |  2 +-
+ 5 files changed, 34 insertions(+), 74 deletions(-)
+
+diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs
+index 2210cef..6b47c21 100644
+--- a/Data/BloomFilter.hs
++++ b/Data/BloomFilter.hs
+@@ -78,8 +78,8 @@ import Control.DeepSeq (NFData(..))
+ import Data.Array.Base (unsafeAt)
+ import qualified Data.Array.Base as ST
+ import Data.Array.Unboxed (UArray)
+-import Data.Bits ((.&.))
+-import Data.BloomFilter.Util (FastShift(..), (:*)(..))
++import Data.Bits ((.&.), unsafeShiftL, unsafeShiftR)
++import Data.BloomFilter.Util ((:*)(..))
+ import qualified Data.BloomFilter.Mutable as MB
+ import qualified Data.BloomFilter.Mutable.Internal as MB
+ import Data.BloomFilter.Mutable.Internal (Hash, MBloom)
+@@ -98,7 +98,7 @@ data Bloom a = B {
+     }
+ 
+ instance Show (Bloom a) where
+-    show ub = "Bloom { " ++ show ((1::Int) `shiftL` shift ub) ++ " bits } "
++    show ub = "Bloom { " ++ show ((1::Int) `unsafeShiftL` shift ub) ++ " bits } "
+ 
+ instance NFData (Bloom a) where
+     rnf !_ = ()
+@@ -172,7 +172,7 @@ singleton hash numBits elt = create hash numBits (\mb -> MB.insert mb elt)
+ -- | Given a filter's mask and a hash value, compute an offset into
+ -- a word array and a bit offset within that word.
+ hashIdx :: Int -> Word32 -> (Int :* Int)
+-hashIdx mask x = (y `shiftR` logBitsInHash) :* (y .&. hashMask)
++hashIdx mask x = (y `unsafeShiftR` logBitsInHash) :* (y .&. hashMask)
+   where hashMask = 31 -- bitsInHash - 1
+         y = fromIntegral x .&. mask
+ 
+@@ -191,7 +191,7 @@ hashesU ub elt = hashIdx (mask ub) `map` hashes ub elt
+ -- /still/ some possibility that @True@ will be returned.
+ elem :: a -> Bloom a -> Bool
+ elem elt ub = all test (hashesU ub elt)
+-  where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `shiftL` bit) /= 0
++  where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `unsafeShiftL` bit) /= 0
+           
+ modify :: (forall s. (MBloom s a -> ST s z))  -- ^ mutation function (result is discarded)
+         -> Bloom a
+@@ -255,11 +255,11 @@ insertList elts = modify $ \mb -> mapM_ (MB.insert mb) elts
+ -- is /still/ some possibility that @True@ will be returned.
+ notElem :: a -> Bloom a -> Bool
+ notElem elt ub = any test (hashesU ub elt)
+-  where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `shiftL` bit) == 0
++  where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `unsafeShiftL` bit) == 0
+ 
+ -- | Return the size of an immutable Bloom filter, in bits.
+ length :: Bloom a -> Int
+-length = shiftL 1 . shift
++length = unsafeShiftL 1 . shift
+ 
+ -- | Build an immutable Bloom filter from a seed value.  The seeding
+ -- function populates the filter as follows.
+@@ -318,7 +318,7 @@ fromList hashes numBits = unfold hashes numBits convert
+ logPower2 :: Int -> Int
+ logPower2 k = go 0 k
+     where go j 1 = j
+-          go j n = go (j+1) (n `shiftR` 1)
++          go j n = go (j+1) (n `unsafeShiftR` 1)
+ 
+ -- $overview
+ --
+diff --git a/Data/BloomFilter/Hash.hs b/Data/BloomFilter/Hash.hs
+index 132a3a4..d071fd4 100644
+--- a/Data/BloomFilter/Hash.hs
++++ b/Data/BloomFilter/Hash.hs
+@@ -38,8 +38,7 @@ module Data.BloomFilter.Hash
+     ) where
+ 
+ import Control.Monad (foldM)
+-import Data.Bits ((.&.), (.|.), xor)
+-import Data.BloomFilter.Util (FastShift(..))
++import Data.Bits ((.&.), (.|.), unsafeShiftL, unsafeShiftR, xor)
+ import Data.List (unfoldr)
+ import Data.Int (Int8, Int16, Int32, Int64)
+ import Data.Word (Word8, Word16, Word32, Word64)
+@@ -91,11 +90,11 @@ class Hashable a where
+              -> Word64           -- ^ salt
+              -> IO Word64
+     hashIO64 v salt = do
+-                   let s1 = fromIntegral (salt `shiftR` 32) .&. maxBound
++                   let s1 = fromIntegral (salt `unsafeShiftR` 32) .&. maxBound
+                        s2 = fromIntegral salt
+                    h1 <- hashIO32 v s1
+                    h2 <- hashIO32 v s2
+-                   return $ (fromIntegral h1 `shiftL` 32) .|. fromIntegral h2
++                   return $ (fromIntegral h1 `unsafeShiftL` 32) .|. fromIntegral h2
+ 
+ -- | Compute a 32-bit hash.
+ hash32 :: Hashable a => a -> Word32
+@@ -149,8 +148,8 @@ cheapHashes :: Hashable a => Int -- ^ number of hashes to compute
+ cheapHashes k v = go 0
+     where go i | i == j = []
+                | otherwise = hash : go (i + 1)
+-               where !hash = h1 + (h2 `shiftR` i)
+-          h1 = fromIntegral (h `shiftR` 32)
++               where !hash = h1 + (h2 `unsafeShiftR` i)
++          h1 = fromIntegral (h `unsafeShiftR` 32)
+           h2 = fromIntegral h
+           h = hashSalt64 0x9150a946c4a8966e v
+           j = fromIntegral k
+@@ -163,7 +162,7 @@ instance Hashable Integer where
+                                    (salt `xor` 0x3ece731e)
+                   | otherwise = hashIO32 (unfoldr go k) salt
+         where go 0 = Nothing
+-              go i = Just (fromIntegral i :: Word32, i `shiftR` 32)
++              go i = Just (fromIntegral i :: Word32, i `unsafeShiftR` 32)
+ 
+ instance Hashable Bool where
+     hashIO32 = hashOne32
+@@ -224,7 +223,7 @@ instance Hashable Word64 where
+ -- | A fast unchecked shift.  Nasty, but otherwise GHC 6.8.2 does a
+ -- test and branch on every shift.
+ div4 :: CSize -> CSize
+-div4 k = fromIntegral ((fromIntegral k :: HTYPE_SIZE_T) `shiftR` 2)
++div4 k = fromIntegral ((fromIntegral k :: HTYPE_SIZE_T) `unsafeShiftR` 2)
+ 
+ alignedHash :: Ptr a -> CSize -> Word32 -> IO Word32
+ alignedHash ptr bytes salt
+diff --git a/Data/BloomFilter/Mutable.hs b/Data/BloomFilter/Mutable.hs
+index edff1fc..0bb5cc9 100644
+--- a/Data/BloomFilter/Mutable.hs
++++ b/Data/BloomFilter/Mutable.hs
+@@ -65,9 +65,9 @@ module Data.BloomFilter.Mutable
+ import Control.Monad (liftM, forM_)
+ import Control.Monad.ST (ST)
+ import Data.Array.Base (unsafeRead, unsafeWrite)
+-import Data.Bits ((.&.), (.|.))
++import Data.Bits ((.&.), (.|.), unsafeShiftL, unsafeShiftR)
+ import Data.BloomFilter.Array (newArray)
+-import Data.BloomFilter.Util (FastShift(..), (:*)(..), nextPowerOfTwo)
++import Data.BloomFilter.Util ((:*)(..), nextPowerOfTwo)
+ import Data.Word (Word32)
+ import Data.BloomFilter.Mutable.Internal
+ 
+@@ -86,9 +86,9 @@ new hash numBits = MB hash shft msk `liftM` newArray numElems numBytes
+                 | numBits > maxHash = maxHash
+                 | isPowerOfTwo numBits = numBits
+                 | otherwise = nextPowerOfTwo numBits
+-        numElems = max 2 (twoBits `shiftR` logBitsInHash)
+-        numBytes = numElems `shiftL` logBytesInHash
+-        trueBits = numElems `shiftL` logBitsInHash
++        numElems = max 2 (twoBits `unsafeShiftR` logBitsInHash)
++        numBytes = numElems `unsafeShiftL` logBytesInHash
++        trueBits = numElems `unsafeShiftL` logBitsInHash
+         shft     = logPower2 trueBits
+         msk      = trueBits - 1
+         isPowerOfTwo n = n .&. (n - 1) == 0
+@@ -109,7 +109,7 @@ logBytesInHash = 2 -- logPower2 (sizeOf (undefined :: Hash))
+ -- | Given a filter's mask and a hash value, compute an offset into
+ -- a word array and a bit offset within that word.
+ hashIdx :: Int -> Word32 -> (Int :* Int)
+-hashIdx msk x = (y `shiftR` logBitsInHash) :* (y .&. hashMask)
++hashIdx msk x = (y `unsafeShiftR` logBitsInHash) :* (y .&. hashMask)
+   where hashMask = 31 -- bitsInHash - 1
+         y = fromIntegral x .&. msk
+ 
+@@ -125,7 +125,7 @@ insert mb elt = do
+   let mu = bitArray mb
+   forM_ (hashesM mb elt) $ \(word :* bit) -> do
+       old <- unsafeRead mu word
+-      unsafeWrite mu word (old .|. (1 `shiftL` bit))
++      unsafeWrite mu word (old .|. (1 `unsafeShiftL` bit))
+ 
+ -- | Query a mutable Bloom filter for membership.  If the value is
+ -- present, return @True@.  If the value is not present, there is
+@@ -135,7 +135,7 @@ elem elt mb = loop (hashesM mb elt)
+   where mu = bitArray mb
+         loop ((word :* bit):wbs) = do
+           i <- unsafeRead mu word
+-          if i .&. (1 `shiftL` bit) == 0
++          if i .&. (1 `unsafeShiftL` bit) == 0
+             then return False
+             else loop wbs
+         loop _ = return True
+@@ -145,7 +145,7 @@ elem elt mb = loop (hashesM mb elt)
+ 
+ -- | Return the size of a mutable Bloom filter, in bits.
+ length :: MBloom s a -> Int
+-length = shiftL 1 . shift
++length = unsafeShiftL 1 . shift
+ 
+ 
+ -- | Slow, crummy way of computing the integer log of an integer known
+@@ -153,7 +153,7 @@ length = shiftL 1 . shift
+ logPower2 :: Int -> Int
+ logPower2 k = go 0 k
+     where go j 1 = j
+-          go j n = go (j+1) (n `shiftR` 1)
++          go j n = go (j+1) (n `unsafeShiftR` 1)
+ 
+ -- $overview
+ --
+diff --git a/Data/BloomFilter/Util.hs b/Data/BloomFilter/Util.hs
+index 7f695dc..6ade6e5 100644
+--- a/Data/BloomFilter/Util.hs
++++ b/Data/BloomFilter/Util.hs
+@@ -2,15 +2,11 @@
+ 
+ module Data.BloomFilter.Util
+     (
+-      FastShift(..)
+-    , nextPowerOfTwo
++      nextPowerOfTwo
+     , (:*)(..)
+     ) where
+ 
+-import Data.Bits ((.|.))
+-import qualified Data.Bits as Bits
+-import GHC.Base
+-import GHC.Word
++import Data.Bits ((.|.), unsafeShiftR)
+ 
+ -- | A strict pair type.
+ data a :* b = !a :* !b
+@@ -22,46 +18,11 @@ nextPowerOfTwo :: Int -> Int
+ {-# INLINE nextPowerOfTwo #-}
+ nextPowerOfTwo n =
+     let a = n - 1
+-        b = a .|. (a `shiftR` 1)
+-        c = b .|. (b `shiftR` 2)
+-        d = c .|. (c `shiftR` 4)
+-        e = d .|. (d `shiftR` 8)
+-        f = e .|. (e `shiftR` 16)
+-        g = f .|. (f `shiftR` 32)  -- in case we're on a 64-bit host
++        b = a .|. (a `unsafeShiftR` 1)
++        c = b .|. (b `unsafeShiftR` 2)
++        d = c .|. (c `unsafeShiftR` 4)
++        e = d .|. (d `unsafeShiftR` 8)
++        f = e .|. (e `unsafeShiftR` 16)
++        g = f .|. (f `unsafeShiftR` 32)  -- in case we're on a 64-bit host
+         !h = g + 1
+     in h
+-
+--- | This is a workaround for poor optimisation in GHC 6.8.2.  It
+--- fails to notice constant-width shifts, and adds a test and branch
+--- to every shift.  This imposes about a 10% performance hit.
+-class FastShift a where
+-    shiftL :: a -> Int -> a
+-    shiftR :: a -> Int -> a
+-
+-instance FastShift Word32 where
+-    {-# INLINE shiftL #-}
+-    shiftL (W32# x#) (I# i#) = W32# (x# `uncheckedShiftL#` i#)
+-
+-    {-# INLINE shiftR #-}
+-    shiftR (W32# x#) (I# i#) = W32# (x# `uncheckedShiftRL#` i#)
+-
+-instance FastShift Word64 where
+-    {-# INLINE shiftL #-}
+-    shiftL (W64# x#) (I# i#) = W64# (x# `uncheckedShiftL64#` i#)
+-
+-    {-# INLINE shiftR #-}
+-    shiftR (W64# x#) (I# i#) = W64# (x# `uncheckedShiftRL64#` i#)
+-
+-instance FastShift Int where
+-    {-# INLINE shiftL #-}
+-    shiftL (I# x#) (I# i#) = I# (x# `iShiftL#` i#)
+-
+-    {-# INLINE shiftR #-}
+-    shiftR (I# x#) (I# i#) = I# (x# `iShiftRA#` i#)
+-
+-instance FastShift Integer where
+-    {-# INLINE shiftL #-}
+-    shiftL = Bits.shiftL
+-
+-    {-# INLINE shiftR #-}
+-    shiftR = Bits.shiftR
diff --git a/dev-haskell/bloomfilter/metadata.xml b/dev-haskell/bloomfilter/metadata.xml
index 6122d1de3db3..d27a73cfe53f 100644
--- a/dev-haskell/bloomfilter/metadata.xml
+++ b/dev-haskell/bloomfilter/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Pure and impure Bloom Filter implementations.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">bloomfilter</remote-id>
 		<remote-id type="github">bos/bloomfilter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/boolean/Manifest b/dev-haskell/boolean/Manifest
deleted file mode 100644
index 5c66ff64407b..000000000000
--- a/dev-haskell/boolean/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Boolean-0.2.3.tar.gz 6608 BLAKE2B ded6dd8214b2228239c93bfc78ba33bd167354578dc97e323da65984a12671a06474089b20986fac53292e74c6fb3288249af8ef1d375140006a66744f15af59 SHA512 803af486e750ba52bc85f8d8599f6a1b36d3d91f2413ac9a7b038d1f091f9a4cee128b24a4de308430b291eb8be781eb100f495106b78f37697a845f8793ad98
-DIST Boolean-0.2.4.tar.gz 6634 BLAKE2B 6964300eb6d4ed8d74a087e7349fc816c4af770af6127fba0285e6afcd22c072b7101c09d907cb794645c3726d0db36b8855a0c1f7b3d6298e49062b68d9944e SHA512 2b92666edbc2b0cf0e0f0d09125b78324229996ea1896b58779daff7f7d10b4dc4d1b8ebbcd63690cb61b68264d797fa40312ca0e934962bbeee4fb6fba1805a
diff --git a/dev-haskell/boolean/boolean-0.2.3.ebuild b/dev-haskell/boolean/boolean-0.2.3.ebuild
deleted file mode 100644
index 4a81c537c950..000000000000
--- a/dev-haskell/boolean/boolean-0.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Boolean"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generalized booleans and numbers"
-HOMEPAGE="https://hackage.haskell.org/package/Boolean"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boolean/boolean-0.2.4.ebuild b/dev-haskell/boolean/boolean-0.2.4.ebuild
deleted file mode 100644
index e048134deee3..000000000000
--- a/dev-haskell/boolean/boolean-0.2.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Boolean"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generalized booleans and numbers"
-HOMEPAGE="https://hackage.haskell.org/package/Boolean"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boolean/metadata.xml b/dev-haskell/boolean/metadata.xml
deleted file mode 100644
index 4f0d65f8f410..000000000000
--- a/dev-haskell/boolean/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Some classes for generalized boolean operations.
-		
-		Copyright 2009 Conal Elliott; BSD3 license.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/boring/Manifest b/dev-haskell/boring/Manifest
new file mode 100644
index 000000000000..af57818f531d
--- /dev/null
+++ b/dev-haskell/boring/Manifest
@@ -0,0 +1 @@
+DIST boring-0.2.1.tar.gz 5668 BLAKE2B 8bc10995f27531cee73b87084b4db08830cbad22a13c5419d84c46b3db53c432e9ee77dc1d0bc0892c2969f643384de83378df8d62701caed60df7881693f55f SHA512 25f3dd8b44f7b35962e9b02304215b2547525b74200d4ee2bc9990c66bd40e9a3383ba7300ab2746e1704684db86788f2cea03163f9a84b62214d9d3691edd80
diff --git a/dev-haskell/boring/boring-0.2.1.ebuild b/dev-haskell/boring/boring-0.2.1.ebuild
new file mode 100644
index 000000000000..9f2c10be3afb
--- /dev/null
+++ b/dev-haskell/boring/boring-0.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Boring and Absurd types"
+HOMEPAGE="https://github.com/phadej/boring"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+tagged"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+	tagged? (
+		>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/boring/metadata.xml b/dev-haskell/boring/metadata.xml
new file mode 100644
index 000000000000..c0a9c4cc8fcb
--- /dev/null
+++ b/dev-haskell/boring/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+	<use>
+		<flag name="tagged">You can disable the use of the `tagged` package using `-f-tagged`.
+
+Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">boring</remote-id>
+		<remote-id type="github">phadej/boring</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/boundedchan/Manifest b/dev-haskell/boundedchan/Manifest
deleted file mode 100644
index 697eb8c05b87..000000000000
--- a/dev-haskell/boundedchan/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BoundedChan-1.0.3.0.tar.gz 3591 BLAKE2B df6f085ea129efccec006dec7133524fc88332fb6451f8ee63702b985e6481c5741aecc0974c203f43b25f63036dbf0935e44e4a9cabf3f1c3574be9580bdf26 SHA512 4d842d2b499dce265329f81a402fbda2e97e00b7e04d55176225f6a1284d5dafae4712df1ab71effd328e65f218c582440d4db3e62e253033da49339cbfb7055
diff --git a/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild b/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
deleted file mode 100644
index 41b72027abd9..000000000000
--- a/dev-haskell/boundedchan/boundedchan-1.0.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="BoundedChan"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implementation of bounded channels"
-HOMEPAGE="http://hackage.haskell.org/package/BoundedChan"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/boundedchan/metadata.xml b/dev-haskell/boundedchan/metadata.xml
deleted file mode 100644
index 44ffdbacb027..000000000000
--- a/dev-haskell/boundedchan/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library introduces BoundedChan. BoundedChans differ from
-		Chans in that they are guaranteed to contain no more than a
-		certain number of elements.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/boxes/Manifest b/dev-haskell/boxes/Manifest
deleted file mode 100644
index 8490ca661be3..000000000000
--- a/dev-haskell/boxes/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST boxes-0.1.4.tar.gz 6481 BLAKE2B f3ecd92e3693aa5e0b93e21b255e57c1d79b05e5acc61810bc7dd8930a124c5afd8163ab7599c7e6e2e5dbe0d1b9215c52d9689cf43b0b6710e0b13a982de97d SHA512 b8afb3216208269883f173f57fc0b53be919e5fd171bf2b7d8d5ed2b0af9c3ca4f9005fc4df43ba8ba4ade694d59a83ff0d419cfbd32e54e80ba6fbe748e9524
-DIST boxes-0.1.5.tar.gz 7598 BLAKE2B e90b94b85d2cc47904df690de2a9bc0ff058230d0134315b02ffc436e172deded72880084542628594968e82e8e81268e95582d39f4cd7d3f499d25e56faac35 SHA512 44527be9a8351aef9e6a98bc90276c0137892e2672ca5ae15968ac21cfc1f0ce92d2c734c26b5493b2f8597ab1a65cb9cf5d050b6b02b0a61d6b6df4143ba4d7
diff --git a/dev-haskell/boxes/boxes-0.1.4.ebuild b/dev-haskell/boxes/boxes-0.1.4.ebuild
deleted file mode 100644
index 5b529094ec12..000000000000
--- a/dev-haskell/boxes/boxes-0.1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="2D text pretty-printing library"
-HOMEPAGE="https://hackage.haskell.org/package/boxes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/boxes/boxes-0.1.5.ebuild b/dev-haskell/boxes/boxes-0.1.5.ebuild
deleted file mode 100644
index cdcad1b49155..000000000000
--- a/dev-haskell/boxes/boxes-0.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="2D text pretty-printing library"
-HOMEPAGE="https://hackage.haskell.org/package/boxes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/boxes/metadata.xml b/dev-haskell/boxes/metadata.xml
deleted file mode 100644
index 8229d6184393..000000000000
--- a/dev-haskell/boxes/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A pretty-printing library for laying out text in
-		two dimensions, using a simple box model.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bsb-http-chunked/Manifest b/dev-haskell/bsb-http-chunked/Manifest
index 1998bde6fdfd..973ca6d7b2b7 100644
--- a/dev-haskell/bsb-http-chunked/Manifest
+++ b/dev-haskell/bsb-http-chunked/Manifest
@@ -1 +1,2 @@
+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
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
new file mode 100644
index 000000000000..6513ce234259
--- /dev/null
+++ b/dev-haskell/bsb-http-chunked/bsb-http-chunked-0.0.0.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+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-http-chunked"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.0.0.4-disable-doctests-ghc-9_2.patch"
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		dev-haskell/attoparsec
+		>=dev-haskell/blaze-builder-0.2.1.4
+		>=dev-haskell/doctest-0.8
+		dev-haskell/hedgehog
+		dev-haskell/tasty
+		dev-haskell/tasty-hedgehog
+		dev-haskell/tasty-hunit
+	)
+"
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 007a3169ed00..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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6.9999
 
@@ -14,11 +14,19 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 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
@@ -30,9 +38,6 @@ DEPEND="${RDEPEND}
 		dev-haskell/tasty-hunit )
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.8 && < 4.13' 'base >= 4.8'
-}
+CABAL_CHDEPS=(
+	'base >= 4.8 && < 4.13' 'base >= 4.8'
+)
diff --git a/dev-haskell/bsb-http-chunked/files/bsb-http-chunked-0.0.0.4-disable-doctests-ghc-9_2.patch b/dev-haskell/bsb-http-chunked/files/bsb-http-chunked-0.0.0.4-disable-doctests-ghc-9_2.patch
new file mode 100644
index 000000000000..649e9cc6368f
--- /dev/null
+++ b/dev-haskell/bsb-http-chunked/files/bsb-http-chunked-0.0.0.4-disable-doctests-ghc-9_2.patch
@@ -0,0 +1,27 @@
+From 11051d3af3d490f30b06a08e5b1f0b14eb648ece Mon Sep 17 00:00:00 2001
+From: Simon Jakobi <simon.jakobi@gmail.com>
+Date: Fri, 17 Dec 2021 14:47:41 +0100
+Subject: [PATCH] Disable doctests for GHC >= 9.2
+
+Closes #38.
+
+Bug: https://github.com/sjakobi/bsb-http-chunked/pull/39
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ bsb-http-chunked.cabal | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/bsb-http-chunked.cabal b/bsb-http-chunked.cabal
+index 95cbd7e..b56651c 100644
+--- a/bsb-http-chunked.cabal
++++ b/bsb-http-chunked.cabal
+@@ -66,6 +66,9 @@ test-suite doctests
+                  , doctest >= 0.8
+   ghc-options: -Wall
+   type: exitcode-stdio-1.0
++  if impl(ghc >= 9.2)
++    -- https://github.com/sjakobi/bsb-http-chunked/issues/38
++    buildable: False
+ 
+ benchmark bench
+   hs-source-dirs: bench
diff --git a/dev-haskell/bsb-http-chunked/metadata.xml b/dev-haskell/bsb-http-chunked/metadata.xml
index 4b1a4e670b6e..526f641c88ff 100644
--- a/dev-haskell/bsb-http-chunked/metadata.xml
+++ b/dev-haskell/bsb-http-chunked/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library contains functions for encoding [bytestring
-		builders](http://hackage.haskell.org/package/bytestring/docs/Data-ByteString-Builder.html#t:Builder)
-		for [chunked HTTP\/1.1 transfer](https://en.wikipedia.org/wiki/Chunked_transfer_encoding).
-		
-		This functionality was extracted from
-		the [blaze-builder](http://hackage.haskell.org/package/blaze-builder)
-		package.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">bsb-http-chunked</remote-id>
+		<remote-id type="github">sjakobi/bsb-http-chunked</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
index 96b40f8d68f1..989a3f7ae3a7 100644
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ b/dev-haskell/byteable/byteable-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,9 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/byteable/metadata.xml b/dev-haskell/byteable/metadata.xml
index 6b0f50e8e8e8..0f4a77f67e72 100644
--- a/dev-haskell/byteable/metadata.xml
+++ b/dev-haskell/byteable/metadata.xml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Abstract class to manipulate sequence of bytes
-		
-		The use case of this class is abstracting manipulation of
-		types that are just wrapping a bytestring with stronger and
-		more meaniful name.
-		
-		Usual definition is of the form: newtype MyType = MyType ByteString
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-byteable</remote-id>
 	</upstream>
diff --git a/dev-haskell/bytedump/Manifest b/dev-haskell/bytedump/Manifest
deleted file mode 100644
index 238b44c673a7..000000000000
--- a/dev-haskell/bytedump/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytedump-1.0.tar.gz 3812 BLAKE2B 37af60e27616c8b30e72e0f3260619ac5f7d76986fe75a2fc1b4f8749dfb636a67800ebe5be19494bb250d60a97316927bd5843a5492a8a6e463ce46c92808a4 SHA512 3bea638bc926fe8dc34d5ac20b5609a8b169562f266ccbaf73a9d95caf49ee368d5c516a0f52937bf6c48bbb585c8ad2819264e4109a57cebed0f836126705fe
diff --git a/dev-haskell/bytedump/bytedump-1.0.ebuild b/dev-haskell/bytedump/bytedump-1.0.ebuild
deleted file mode 100644
index bd407cafcc15..000000000000
--- a/dev-haskell/bytedump/bytedump-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Flexible byte dump helpers for human readers"
-HOMEPAGE="https://github.com/vincenthz/hs-bytedump"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/bytedump/metadata.xml b/dev-haskell/bytedump/metadata.xml
deleted file mode 100644
index 218ff830841b..000000000000
--- a/dev-haskell/bytedump/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A set of helpers to dump bytes with lots of different output formats
-		easy to read for humans eyes.
-	</longdescription>
-	<use>
-		<flag name="executable">build executable file</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/byteorder/byteorder-1.0.4.ebuild b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
index e54facf0fe9b..e4900354daa5 100644
--- a/dev-haskell/byteorder/byteorder-1.0.4.ebuild
+++ b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,9 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/byteorder/metadata.xml b/dev-haskell/byteorder/metadata.xml
index f47918b94f9a..937381521944 100644
--- a/dev-haskell/byteorder/metadata.xml
+++ b/dev-haskell/byteorder/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package is for working with the native byte-ordering of
-		the system.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/bytes/Manifest b/dev-haskell/bytes/Manifest
deleted file mode 100644
index 6d1ef2f6b3e9..000000000000
--- a/dev-haskell/bytes/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bytes-0.15.2.tar.gz 18834 BLAKE2B 18f0e2618a3ed7f4eefaabd0c4b4ca6b99e4493ae0b73dee9a7f0fe1c2e980a4e8714e50198177a657d6ac06c08227350dc342178f5565444ea9f23904d01585 SHA512 339da2fe49a6acd307057bfcc79e7ac09eefb9a93ec60cd52a8d425337e7bf355ca8aa42f304863df773b0ef2c459b53571920611cf1ef8f98e78d112cc6ad29
-DIST bytes-0.15.5.tar.gz 19354 BLAKE2B cd6845be4c541a231d52e985532379c166a84346f57687f6407716ed0c9ea17b0fe10dc2f5cf500898398dea8227ec2277967847a8eec49e49e21236d14a1b62 SHA512 c9c6b2978345e4e8eb3b12e0600e286f73a419db403fb3fe003b637cd045b1d52207f8ab06d8fcb583fd094095e62de81e4066c851b3a419c0731534a645c7f6
diff --git a/dev-haskell/bytes/bytes-0.15.2.ebuild b/dev-haskell/bytes/bytes-0.15.2.ebuild
deleted file mode 100644
index 43080d606bbf..000000000000
--- a/dev-haskell/bytes/bytes-0.15.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Sharing code for serialization between binary and cereal"
-HOMEPAGE="https://github.com/ekmett/bytes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+test-doctests"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/binary-0.5.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/cereal-0.3.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-werror \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/bytes/bytes-0.15.5.ebuild b/dev-haskell/bytes/bytes-0.15.5.ebuild
deleted file mode 100644
index 17287247ee2f..000000000000
--- a/dev-haskell/bytes/bytes-0.15.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Sharing code for serialization between binary and cereal"
-HOMEPAGE="https://github.com/ekmett/bytes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+test-doctests"
-
-RESTRICT=test # USE=doc breaks doctest as:
-# doctests: <command line>: cannot satisfy -package bytes-0.15.5
-#    (use -v for more information)
-
-RDEPEND=">=dev-haskell/cereal-0.3.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/scientific-0.0:=[profile?] <dev-haskell/scientific-1:=[profile?]
-	>=dev-haskell/semigroups-0.5:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-werror \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/bytes/metadata.xml b/dev-haskell/bytes/metadata.xml
deleted file mode 100644
index d66a19bf4f83..000000000000
--- a/dev-haskell/bytes/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="test-doctests">Enable the doctest suite when using the enable-tests option for cabal.</flag>
-	</use>
-	<longdescription>
-		Sharing code for serialization between binary and cereal
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/bytes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/bytestring-builder/Manifest b/dev-haskell/bytestring-builder/Manifest
index 1ad3f0f813ba..9b57f9b8f080 100644
--- a/dev-haskell/bytestring-builder/Manifest
+++ b/dev-haskell/bytestring-builder/Manifest
@@ -1,3 +1 @@
-DIST bytestring-builder-0.10.6.0.0.tar.gz 44593 BLAKE2B 8b3834ae207f527e20d2cb32e125029196b8f7d3ac2bcf65826617ade820fbde3e9a43ee0a322a8632d1ab8a15548856b1e445ffc08bb62db13b8adf5a30f607 SHA512 1281aa8ef2f77fcc5a75a9cbb54506fb207e4fc9f6296213ab6a6389c83a53f6e08a6e929d3c456b7f099e18106e228416ca6d6269215f3e3c72cb29eb39bbe3
-DIST bytestring-builder-0.10.8.1.0.tar.gz 43904 BLAKE2B 220e323b0fc7b56b9cf984d268eb66541eac06202cd699107a9350a5edb6d57a388583c245a06a65c1f68e21a7de21d74388a39f4778ee5288af0eeff7ec1da9 SHA512 f01d440e55426b5f2836cc68087d367156adae7447409dff19ca334a8509c8731ce32539b76dbe33d1c9809c3e196dce9a1f3e00b1eff3bb177953cabd23c9b6
 DIST bytestring-builder-0.10.8.2.0.tar.gz 47366 BLAKE2B 37bb8898f30791b20e30766bc085e729088d446f90fde21228d8241f6a62f6a28316cb191e05a48b51832655f3d989cd1abe47b3e3ea6dddc127cc09ec624e87 SHA512 bb3c5bee6f05d7ce9213f490f65293d3eb2a59f2f7b4d6423a66e7e20e375ec957c8a030fc58296b59d5314a6fd4684e03fe625b8edad89429e503ada73367e0
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild
deleted file mode 100644
index b61885f5344d..000000000000
--- a/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="The new bytestring builder, packaged outside of GHC"
-HOMEPAGE="https://hackage.haskell.org/package/bytestring-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild
deleted file mode 100644
index 0eef8c6e12b6..000000000000
--- a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="The new bytestring builder, packaged outside of GHC"
-HOMEPAGE="https://hackage.haskell.org/package/bytestring-builder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
index 47fc91ec63d2..6ac2cee6e9b5 100644
--- a/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
+++ b/dev-haskell/bytestring-builder/bytestring-builder-0.10.8.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/bytestring-builder/metadata.xml b/dev-haskell/bytestring-builder/metadata.xml
index 018c423e9511..871b153d062c 100644
--- a/dev-haskell/bytestring-builder/metadata.xml
+++ b/dev-haskell/bytestring-builder/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/bytestring-handle/Manifest b/dev-haskell/bytestring-handle/Manifest
deleted file mode 100644
index 7ded61074048..000000000000
--- a/dev-haskell/bytestring-handle/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bytestring-handle-0.1.0.4.tar.gz 6204 BLAKE2B bcda8d126b5e60f1f78be576ec0233f8b0afe80409afd9a796c0a86e83f3b05702eb40ed09af1ebb2d2b8b194924084a0799ca6b498acd654a18d679b1184415 SHA512 17649968ffbebf1a567059ecf3f19e8d8f6a1bb53a0b491e35b62d572cff9f949822953452ee72d193546d8779d6d71dfd82ae5cfd2d3b7564ac73df7283facb
-DIST bytestring-handle-0.1.0.6.tar.gz 6203 BLAKE2B e821b33a97983e124c679c2b9f2316151e695ebf615f739d50b5d4524804878dddb861d2abd7708ad635cd563a007e867232f81f229b368b5ca4afb90d4730cf SHA512 a585488207680a6f1ba6538cf10d03e059010d42994803f9edc6d9c1fff08e479117a6d1449f923a8d5de9884b93438e80b81c75978e5c3145310c21ba14498c
diff --git a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild
deleted file mode 100644
index 7df11c7bd3ac..000000000000
--- a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ByteString-backed Handles"
-HOMEPAGE="https://hub.darcs.net/ganesh/bytestring-handle"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.1.2
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.1.2 && < 2.9' 'QuickCheck >= 2.1.2'
-}
diff --git a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild
deleted file mode 100644
index 4cb46da2c8f6..000000000000
--- a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.6.ebuild
+++ /dev/null
@@ -1,37 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ByteString-backed Handles"
-HOMEPAGE="https://hub.darcs.net/ganesh/bytestring-handle"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.1.2
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.2 && < 4.11' 'base >= 4.2' \
-		'QuickCheck >= 2.1.2 && < 2.11' 'QuickCheck >= 2.1.2'
-}
diff --git a/dev-haskell/bytestring-handle/metadata.xml b/dev-haskell/bytestring-handle/metadata.xml
deleted file mode 100644
index 1b3ffcef03d2..000000000000
--- a/dev-haskell/bytestring-handle/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ByteString-backed Handles
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bytestring-mmap/Manifest b/dev-haskell/bytestring-mmap/Manifest
deleted file mode 100644
index bd72d9ca97c5..000000000000
--- a/dev-haskell/bytestring-mmap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytestring-mmap-0.2.2.tar.gz 7188 BLAKE2B d699e51f8f2416e30013dcf87fcfaa4d0ef129c1ca9951c320a7312a1ce73db14addedf47fc138b485197a4cfb115378a4544428ad974c70d89d7b3b467ace22 SHA512 0cde0bb36808d7086f6b3e3e94813c205a61ec1d0b2156a7fac98c1dc520dcdd1821a7873b7ecb9a77fdcd254b5ac1077da86865ade20a49bba0e0da1befcf46
diff --git a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
deleted file mode 100644
index 5a263f0f5147..000000000000
--- a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="mmap support for strict ByteStrings"
-HOMEPAGE="http://code.haskell.org/~dons/code/bytestring-mmap/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/bytestring-mmap/metadata.xml b/dev-haskell/bytestring-mmap/metadata.xml
deleted file mode 100644
index 2e6580f28d8a..000000000000
--- a/dev-haskell/bytestring-mmap/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		
-		This library provides a wrapper to mmap(2), allowing files or
-		devices to be lazily loaded into memory as strict or lazy
-		ByteStrings, using the virtual memory subsystem to do on-demand
-		loading.
-		
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bytestring-show/Manifest b/dev-haskell/bytestring-show/Manifest
deleted file mode 100644
index 7766b0ae8884..000000000000
--- a/dev-haskell/bytestring-show/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytestring-show-0.3.5.6.tar.gz 8145 BLAKE2B 421a6593e77f200db1f905a5e74071116327dd018fc8117c5c81fe0193891070f3b190b4d7ffd2e056ba4b1adb9e8eae87e2f905036a0f85ab94ab7d03602d05 SHA512 f59a041e30ec3b3eb9f971968606685ba5968dafc44d92ed50c9f7f124b891f48fc6612fdfc1a57f702e76e41f70c647e81c1919ab7fee194db9d97ddd73dd10
diff --git a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild b/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild
deleted file mode 100644
index c9d31c589831..000000000000
--- a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild
+++ /dev/null
@@ -1,35 +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.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into readable byte strings"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_prepare() {
-	default
-
-	# Use default for compatibility with Cabal-3
-	rm Setup.lhs || die
-	cabal_chdeps \
-		'binary < 0.8' 'binary' \
-		'containers < 0.6' 'containers'
-}
diff --git a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6.ebuild b/dev-haskell/bytestring-show/bytestring-show-0.3.5.6.ebuild
deleted file mode 100644
index 43a7a4e7404d..000000000000
--- a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into readable byte strings"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/binary-0.8:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/bytestring-show/metadata.xml b/dev-haskell/bytestring-show/metadata.xml
deleted file mode 100644
index 60a115dcf1b6..000000000000
--- a/dev-haskell/bytestring-show/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Efficient conversion of values into readable byte strings.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/bzlib/Manifest b/dev-haskell/bzlib/Manifest
deleted file mode 100644
index 0cd799382dd5..000000000000
--- a/dev-haskell/bzlib/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bzlib-0.5.0.5.tar.gz 46627 BLAKE2B e229e4c586c45e5ff440a043bf413c2a45a6b38b1a2d3ad529cbaeba5a4811953572a2be54a75cec24599f43c9393c71268c5c2ba0c54100fb6c43b2842169df SHA512 fe4b6e1a4d67573a9ff72808cfd0bf47a127885593e98debcaa505c488c76af364bed31cdb8ee9308295514f154536e958ff5e2a1c3157eeb5b16f8011424819
-DIST bzlib-0.5.1.0.tar.gz 46082 BLAKE2B d17e3832d71ca745da6884f1762aaae8ad22babed44fda9a87d2dae731334b8c1af398c78d2f79e02183ef22a53717e0a9f127fc1837f220eba35ad9397fe22f SHA512 2d4e200abc8ef7f158b4b726e81a389d5018615dd04f5704f50323498f5a1991e217a05abd10f86cab791326bc95802d22a17b55656e5289cb07ca93698a1537
diff --git a/dev-haskell/bzlib/bzlib-0.5.0.5.ebuild b/dev-haskell/bzlib/bzlib-0.5.0.5.ebuild
deleted file mode 100644
index 48fecc39c388..000000000000
--- a/dev-haskell/bzlib/bzlib-0.5.0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the bzip2 format"
-HOMEPAGE="https://hackage.haskell.org/package/bzlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/bzlib/bzlib-0.5.1.0.ebuild b/dev-haskell/bzlib/bzlib-0.5.1.0.ebuild
deleted file mode 100644
index 990fa523d982..000000000000
--- a/dev-haskell/bzlib/bzlib-0.5.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compression and decompression in the bzip2 format"
-HOMEPAGE="http://hackage.haskell.org/package/bzlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/bzlib/metadata.xml b/dev-haskell/bzlib/metadata.xml
deleted file mode 100644
index 7bf3770efebc..000000000000
--- a/dev-haskell/bzlib/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a pure interface for compressing and
-		decompressing streams of data represented as lazy
-		'ByteString's. It uses the bz2 C library so it has high
-		performance.
-		
-		It provides a convenient high level API suitable for most
-		tasks and for the few cases where more control is needed it
-		provides access to the full bzip2 feature set.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest
index 0c08df60b3b9..fdaf481f521d 100644
--- a/dev-haskell/c2hs/Manifest
+++ b/dev-haskell/c2hs/Manifest
@@ -1,8 +1,2 @@
-DIST c2hs-0.16.4.tar.gz 138114 BLAKE2B a8278aafa9ba27ba59b39745b4a2e169d7b32d4a3c139dc1fdcb4445cb0376beb791664c9b4790d7a11589f83c22e0fd3a4e5cb74b79fedbc0216492c8f52be8 SHA512 7dacfab1a469d6613b6acd6ebfb70efa275c4588bcaa6277aa411b90674c11ae031bb9edae6b7e648da6a1232fc6cb702af2fce5a68dd04124bf2f5ba9813329
-DIST c2hs-0.16.5.tar.gz 137294 BLAKE2B 685a8f9c98c5e0877893907cb7af9f8cd93e8559e49427bef757445547aa88c8c6dce0a81e115af5c1555ec7be67c250c088fd704cc4b96dc43c9eda68d72e37 SHA512 4ef187366da3ca33f10eb878b5f31603ebb038b9f02a6d22f284ad8212a0de2ce7f48bc1a9fe0fe94d52588594c9230ebd69cb4c17d0601b4d3326474220636b
-DIST c2hs-0.17.2.tar.gz 167739 BLAKE2B 50604da33333d235639789090798fa152688d77335a2237272bf086a2a75b7fbbc6c612d16428ca94e07da66cab16fd54eec115f88c79789071f9a87e3c8e416 SHA512 19ef7a589a1700af2e2f2426b43b454ab49467a97d85c3731da77a9b163709d09e4e58b31d13c0127b807764cff7c62c2b8675cf36d91198d83a9ea9ed4c402c
-DIST c2hs-0.20.1.tar.gz 184115 BLAKE2B fd55ee28918c41734096cfea50f40e1a5c56d212c4fbddce1a7bff81bead428144c232f4a7fb47dfa9d5914da78d78cb92330fd493b0facfc3f033ee96be347d SHA512 fe22257b6003d9133b7f0264c19070eee10200452f783a5c6f36eda44b96d80e5e728d91bca8349461c69de5ae93af3a9bbd67e67c30a182543ee3c79889c51a
-DIST c2hs-0.25.2.tar.gz 198733 BLAKE2B 853faa19ba91a4536bed691d0eb26969dc96ef6830512441a1d14e193f084e0ae36d846bfdc160abf6d08fda0d7e9706f9c78b9be627e4c2864e3d9d2e098576 SHA512 0f3b2df55277f9f44e39270cdc6a5695dd15e8095874406de5830c2d7d45dd364abcd5eafc9323e2a76eeb6622aa7da39734995be01e7f026d8f2395803c2ef3
-DIST c2hs-0.27.1.tar.gz 205108 BLAKE2B 268ed9f95e77d292626e0fff6e1ac8334204dd1a1b7474e62746f8be444e57b1f3eb22eb2a4e46f0682c687fa01683923f22542d6b7456566f22d8ad7cb0ed81 SHA512 22894e518512a53ed23b2d6e3395918a1fdfb60180a9ec489bb7fcb70d5d870bdb37c66e9a49f07ae5babf3808e57f1d932e13cf80132ab50666c6899d55d62a
-DIST c2hs-0.28.3.tar.gz 253559 BLAKE2B efc0965e955b05456385648750abeda3371cb0417c508bd8590158289d699b019d88454fd17bb7f9e49f450e581ca6367e08d958ccc1ad7ef56f8a354d33deb2 SHA512 17306b6ee41623d1c017581ed7aef6118a66c30a4698fa95d588b30ac625a6571906bb1fffecf7b86296667390d18cfe5ee2ade85098075f2ca982922b358b3a
-DIST c2hs-0.28.6.tar.gz 204988 BLAKE2B 89bc8c588a93728abf3411cd23631b57157721213da3a2bdf96da41aa8ee28451396995f8c7bc1bea94be050e92c81a991256f73b0bf6a8dbdf3156bcf95563e SHA512 848693ddf787244cc0f100f533030889a1efcef283f06ef609574d9cd0005679fab373172a949408ce6d4b9c97d15a56b0ec11fe39b466ad3f84aa527d2ab1c9
+DIST c2hs-0.28.8-rev2.cabal 9397 BLAKE2B fa4f8c6394f9d86d010a2224840483a3cd154223fbd5a993dc56250f1c49629f10a630bb33db047c091fb9ea62188728b8fe71eb044e173cc77dcdce78516706 SHA512 e8db51a51d26ef8df83e0e6a2fa643e2540135f73f1ad6409304dbd1b98e340a9aaaedf858d5fe5f18f19ce4df86568d3ad540be1c257ee352c5c3d838c879ea
+DIST c2hs-0.28.8.tar.gz 207816 BLAKE2B 6d912fd93c6076ccd86ed62e075f1addb7b44378c82acc0cbaf04b6b91a2ed4530cde60a9139316d928a2867474bafde5c14aedb4ab9e78e5faaa99830276a71 SHA512 ff9119acecddd853f2f797385f971c249bcd92d4b141e8e7ea5f5d3e63aa257502c80ded2720a46e3186260026b94c9e518f08f8e452a64c9f888d0183ee1749
diff --git a/dev-haskell/c2hs/c2hs-0.16.4.ebuild b/dev-haskell/c2hs/c2hs-0.16.4.ebuild
deleted file mode 100644
index 39b96a9617aa..000000000000
--- a/dev-haskell/c2hs/c2hs-0.16.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/ghc-6.10.4
-		>=dev-haskell/cabal-1.6
-		>=dev-haskell/language-c-0.3.1.1
-		<dev-haskell/language-c-0.5
-		doc? (  ~app-text/docbook-xml-dtd-4.2
-				app-text/docbook-xsl-stylesheets
-				>=dev-libs/libxslt-1.1.2 )"
-RDEPEND="dev-libs/gmp"
-
-PATCHES=("${FILESDIR}/${PN}"-0.16.3-language-c-0.4.patch
-	"${FILESDIR}/${PN}"-0.16.4-ghc-7.6.patch)
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C doc
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	doman "${S}/doc/man1/c2hs.1"
-
-	if use doc; then
-		dohtml "${S}/doc/users_guide/"*
-	fi
-}
diff --git a/dev-haskell/c2hs/c2hs-0.16.5.ebuild b/dev-haskell/c2hs/c2hs-0.16.5.ebuild
deleted file mode 100644
index b8829777f1fe..000000000000
--- a/dev-haskell/c2hs/c2hs-0.16.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/ghc-6.10.4
-		>=dev-haskell/cabal-1.6
-		>=dev-haskell/language-c-0.3.1.1
-		<dev-haskell/language-c-0.5
-		doc? (  ~app-text/docbook-xml-dtd-4.2
-				app-text/docbook-xsl-stylesheets
-				>=dev-libs/libxslt-1.1.2 )"
-RDEPEND="dev-libs/gmp"
-
-src_compile() {
-	cabal_src_compile
-
-	if use doc; then
-		emake -C doc
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	doman "${S}/doc/man1/c2hs.1"
-
-	if use doc; then
-		dohtml "${S}/doc/users_guide/"*
-	fi
-}
diff --git a/dev-haskell/c2hs/c2hs-0.17.2.ebuild b/dev-haskell/c2hs/c2hs-0.17.2.ebuild
deleted file mode 100644
index e5c87f41c0bc..000000000000
--- a/dev-haskell/c2hs/c2hs-0.17.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/language-c-0.4.2 <dev-haskell/language-c-0.5
-	>=dev-lang/ghc-6.10.4
-	test? ( dev-haskell/hunit
-		>=dev-haskell/shelly-1.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/text
-		>=dev-haskell/yaml-0.8 )
-"
diff --git a/dev-haskell/c2hs/c2hs-0.20.1.ebuild b/dev-haskell/c2hs/c2hs-0.20.1.ebuild
deleted file mode 100644
index 9be053a7c7b2..000000000000
--- a/dev-haskell/c2hs/c2hs-0.20.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/dlist
-	>=dev-haskell/language-c-0.4.7 <dev-haskell/language-c-0.5
-	>=dev-lang/ghc-7.4.1
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/transformers
-		>=dev-haskell/shelly-1.0
-		dev-haskell/text
-		>=dev-haskell/yaml-0.8 )
-"
diff --git a/dev-haskell/c2hs/c2hs-0.25.2.ebuild b/dev-haskell/c2hs/c2hs-0.25.2.ebuild
deleted file mode 100644
index 4992d1706e3a..000000000000
--- a/dev-haskell/c2hs/c2hs-0.25.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RDEPEND="dev-haskell/dlist:=
-	>=dev-haskell/language-c-0.4.7:= <dev-haskell/language-c-0.5:=
-	>=dev-lang/ghc-7.4.1:=
-	regression? ( >=dev-haskell/shelly-1.0:=
-			dev-haskell/text:=
-			>=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/transformers
-		!regression? ( >=dev-haskell/shelly-1.0
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag regression regression)
-}
diff --git a/dev-haskell/c2hs/c2hs-0.27.1.ebuild b/dev-haskell/c2hs/c2hs-0.27.1.ebuild
deleted file mode 100644
index 7f709c6c5e34..000000000000
--- a/dev-haskell/c2hs/c2hs-0.27.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RDEPEND="dev-haskell/dlist:=
-	>=dev-haskell/language-c-0.4.7:= <dev-haskell/language-c-0.5:=
-	>=dev-lang/ghc-7.4.1:=
-	regression? ( >=dev-haskell/shelly-1.0:=
-			dev-haskell/text:=
-			>=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/transformers
-		!regression? ( >=dev-haskell/shelly-1.0
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag regression regression)
-}
diff --git a/dev-haskell/c2hs/c2hs-0.28.3.ebuild b/dev-haskell/c2hs/c2hs-0.28.3.ebuild
deleted file mode 100644
index 9c09b06e13b2..000000000000
--- a/dev-haskell/c2hs/c2hs-0.28.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RDEPEND="dev-haskell/dlist:=
-	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.8:=
-	>=dev-lang/ghc-7.4.1:=
-	regression? ( >=dev-haskell/shelly-1.0:=
-			dev-haskell/text:=
-			>=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/transformers
-		!regression? ( >=dev-haskell/shelly-1.0
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag regression regression)
-}
diff --git a/dev-haskell/c2hs/c2hs-0.28.6.ebuild b/dev-haskell/c2hs/c2hs-0.28.6.ebuild
deleted file mode 100644
index 9f52b7a66514..000000000000
--- a/dev-haskell/c2hs/c2hs-0.28.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="" # test-suite fails to build: https://github.com/haskell/c2hs/issues/245
-inherit haskell-cabal
-
-DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
-HOMEPAGE="https://github.com/haskell/c2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="regression"
-
-RESTRICT=test # broken against shelly-1.9: https://github.com/haskell/c2hs/issues/245
-
-RDEPEND="dev-haskell/dlist:=
-	dev-haskell/fail:=
-	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.9:=
-	>=dev-lang/ghc-7.4.1:=
-	regression? ( >=dev-haskell/shelly-1.0:=
-			dev-haskell/text:=
-			>=dev-haskell/yaml-0.8:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag regression regression)
-}
diff --git a/dev-haskell/c2hs/c2hs-0.28.8-r2.ebuild b/dev-haskell/c2hs/c2hs-0.28.8-r2.ebuild
new file mode 100644
index 000000000000..8e23dfe4647f
--- /dev/null
+++ b/dev-haskell/c2hs/c2hs-0.28.8-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -regression
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
+HOMEPAGE="https://github.com/haskell/c2hs"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # needs unprefixed 'cpp'
+
+RDEPEND="
+	dev-haskell/dlist:=
+	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.10:=
+	>=dev-lang/ghc-9.0.2:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.4.1.0
+	test? (
+		dev-haskell/hunit
+		>=dev-haskell/shelly-1.9.0
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/text
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure --flag=-regression
+}
diff --git a/dev-haskell/c2hs/c2hs-0.28.8.ebuild b/dev-haskell/c2hs/c2hs-0.28.8.ebuild
new file mode 100644
index 000000000000..94da53ad7fe3
--- /dev/null
+++ b/dev-haskell/c2hs/c2hs-0.28.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety"
+HOMEPAGE="https://github.com/haskell/c2hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="regression"
+
+RESTRICT=test # needs unprefixed 'cpp'
+
+RDEPEND="dev-haskell/dlist:=
+	>=dev-haskell/language-c-0.7.1:= <dev-haskell/language-c-0.10:=
+	>=dev-lang/ghc-8.4.3:=
+	regression? ( >=dev-haskell/shelly-1.9.0:= <dev-haskell/shelly-1.10.0:=
+			dev-haskell/text:=
+			>=dev-haskell/yaml-0.8:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		!regression? ( >=dev-haskell/shelly-1.9.0 <dev-haskell/shelly-1.10.0
+				dev-haskell/text ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag regression regression)
+}
diff --git a/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch b/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch
deleted file mode 100644
index cdf0fbe547d6..000000000000
--- a/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/c2hs.cabal b/c2hs.cabal
-index 89f978f..53a96e5 100644
---- a/c2hs.cabal
-+++ b/c2hs.cabal
-@@ -41,7 +41,7 @@ flag base3
- 
- Executable c2hs
-     Build-Depends:  base >= 2 && < 5,
--                    language-c >= 0.3.1.1 && < 0.4.0,
-+                    language-c >= 0.3.1.1 && < 0.5,
-                     filepath
- 
-     if flag(base3)
-diff --git a/src/C2HS/Gen/Bind.hs b/src/C2HS/Gen/Bind.hs
-index 1fd2acc..9c25b42 100644
---- a/src/C2HS/Gen/Bind.hs
-+++ b/src/C2HS/Gen/Bind.hs
-@@ -117,6 +117,7 @@ import Control.Monad (when, unless, liftM, mapAndUnzipM)
- import Language.C.Data.Position
- import Language.C.Data.Ident
- import Language.C.Pretty
-+import Language.C.Syntax.AST
- import Text.PrettyPrint.HughesPJ (render)
- import Data.Errors
- import Data.Attributes (newAttrsOnlyPos)
diff --git a/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch b/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch
deleted file mode 100644
index e6d808bb98a5..000000000000
--- a/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- c2hs-0.16.4-orig/src/C2HS/Config.hs	2012-11-01 08:02:48.000000000 +1100
-+++ c2hs-0.16.4/src/C2HS/Config.hs	2012-11-03 12:12:15.754353409 +1100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- --                                                                -*-haskell-*-
- --  ** @configure_input@ **
- --  ===========================================================================
---- c2hs-0.16.4-orig/src/Control/StateTrans.hs	2012-11-01 08:02:48.000000000 +1100
-+++ c2hs-0.16.4/src/Control/StateTrans.hs	2012-11-03 12:12:15.755353436 +1100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
- --  The HiPar Toolkit: state transformer routines
- --
- --  Author : Manuel M. T. Chakravarty
-@@ -80,6 +81,10 @@
- -- Launchbury/Peyton-Jones' texts before entering. Otherwise,
- -- your mental health my be in danger.  You have been warned!
- 
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-+import Control.Exception (catch, IOException)
- 
- -- state transformer base and its monad operations
- -- -----------------------------------------------
-@@ -298,7 +303,7 @@
-                                   ioError err
-               Right _a         -> return state
-             )
--            `catch` (\err -> let
-+            `catch` (\(err :: IOException) -> let
-                                STB handler' = handler err
-                              in
-                              handler' bs gs)
diff --git a/dev-haskell/c2hs/metadata.xml b/dev-haskell/c2hs/metadata.xml
index 807fa1b6c176..7c8b6c407a28 100644
--- a/dev-haskell/c2hs/metadata.xml
+++ b/dev-haskell/c2hs/metadata.xml
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		C-&gt;Haskell assists in the development of Haskell bindings to C
-		libraries. It extracts interface information from C header
-		files and generates Haskell code with foreign imports and
-		marshaling. Unlike writing foreign imports by hand (or using
-		hsch2s), this ensures that C functions are imported with the
-		correct Haskell types.
-	</longdescription>
 	<use>
-		<flag name="regression">run regression tests</flag>
+		<flag name="regression">Enable regression suite build.</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">c2hs</remote-id>
 		<remote-id type="github">haskell/c2hs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cabal-doctest/Manifest b/dev-haskell/cabal-doctest/Manifest
index cfed113ca8af..f1d0b6f3ed6a 100644
--- a/dev-haskell/cabal-doctest/Manifest
+++ b/dev-haskell/cabal-doctest/Manifest
@@ -1,2 +1,2 @@
-DIST cabal-doctest-1.0.8.tar.gz 10812 BLAKE2B ccfff885efdcb4e2d1233ef6e9a1ae6b2e2101dd0811634dd1be284439e3fe2ffa8f1817d3b1f5106a49365a848b2178c637450a23de7b326c4f476a0e73b3bb SHA512 121827f4f9117673c5c41beeaff2ef74f75ca55fba8460f6289d69b1ebfdebb9568f23b4b7d0ab2f3d436cbcdaa073709a26562b39e5f57a6a705088d0a2ff71
-DIST cabal-doctest-1.tar.gz 5056 BLAKE2B c73c636d4aa6c23a3d12cae969430405ed7ee8a3ebd27498c92712719c0111d64a200e28a8a17fb262d4627179b765757b9d041322fdba2fdc6f6b6f787f90d2 SHA512 2360f44b072123bfc9aeb23352f96777e5e2acbefd38659af26b17e7b8a4d3d332eb4bb3da7c1cb354660bb019c2a30e4323d295dbaf1356e2d6a8ffab51f82e
+DIST cabal-doctest-1.0.9-rev3.cabal 1517 BLAKE2B 8d276a1be0af33c84c45af63c55f96a126d595c73ce95008a558178fb126ea534247d5a9a697af055eb8b551d16a80408fa8484380d68732367754642691a400 SHA512 9890fb6d6b3660056f9b092285e7a0af38c1355c79724438ea7346601c7bfb0b583266065db1f7015317cbd1e5e84d10009d99b3888f413841837c58c84d75a3
+DIST cabal-doctest-1.0.9.tar.gz 10770 BLAKE2B a85afe1e184a8de3f2fc641f442e420202b0b40a4f0368de365c1581648d877efbc9e771b3fec0fafc2dc29f35e9ca0fb5689975e71889286767a53580d7d1fe SHA512 e5946a300a159e9adc8dd56927437c2e1db643d0f23c69325a33075e4da011a7e681814d9ad475ee4029f8f95151b6fa350e9b6912133167baa0bfc79b49da77
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild
deleted file mode 100644
index fc699db32cf3..000000000000
--- a/dev-haskell/cabal-doctest/cabal-doctest-1.0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Setup.hs helper for doctests running"
-HOMEPAGE="https://github.com/phadej/cabal-doctest"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.9-r1.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..d948a92eebe3
--- /dev/null
+++ b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Setup.hs helper for running doctests"
+HOMEPAGE="https://github.com/haskellari/cabal-doctest"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.12:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild
new file mode 100644
index 000000000000..15c773ed0aed
--- /dev/null
+++ b/dev-haskell/cabal-doctest/cabal-doctest-1.0.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 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 Setup.hs helper for running doctests"
+HOMEPAGE="https://github.com/haskellari/cabal-doctest"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-3.8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild
deleted file mode 100644
index af885956ec14..000000000000
--- a/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Setup.hs helper for doctests running"
-HOMEPAGE="https://github.com/phadej/cabal-doctest"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/cabal-doctest/metadata.xml b/dev-haskell/cabal-doctest/metadata.xml
index 90bd0c4b51cc..4ba119032479 100644
--- a/dev-haskell/cabal-doctest/metadata.xml
+++ b/dev-haskell/cabal-doctest/metadata.xml
@@ -1,18 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		Currently (beginning of 2017), there isn't @cabal doctest@
-		command. Yet, to properly work doctest needs plenty of configuration.
-		This library provides the common bits for writing custom Setup.hs
-		See &lt;https://github.com/haskell/cabal/issues/2327 Cabal/2327&gt; for the progress
-		of @cabal doctest@, i.e. whether this library is obsolete.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">phadej/cabal-doctests</remote-id>
+		<remote-id type="hackage">cabal-doctest</remote-id>
+		<remote-id type="github">haskellari/cabal-doctest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cabal-helper/Manifest b/dev-haskell/cabal-helper/Manifest
deleted file mode 100644
index 1d43b615354e..000000000000
--- a/dev-haskell/cabal-helper/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cabal-helper-0.6.1.0.tar.gz 32694 BLAKE2B 6f9aba9e128d2f2f0ba1a18b78b9cef69e866c79d0a38c7a5acb4398377766cfae77babacd5b3fe956761d917045325b4aa17345063f578699c60ef6aaef14c5 SHA512 8c85b5e49f95acb74dc743a57e428ffe3f98555501a9020e4601f28f10bd3e3f98910dc90d8b611162e61cda0eec06a48ab09bd23eaf82093a85427a4c8330f7
-DIST cabal-helper-0.6.3.1.tar.gz 41668 BLAKE2B 8100cbe79b9d1f7f84a937727d820a15be3955093af15abf6543568ac65f65f70810044370d0bdce543300796401d0bfc7b89d6c80323189e527062b00817c93 SHA512 7a0833cee229286904ff1304944100df33d975f1df0df5ab439f28d1ce28ae3fe86cc7d208ff04ba9980aff26f77f260d4f2893c7d528395555faeccf7041cca
-DIST cabal-helper-0.7.3.0.tar.gz 35745 BLAKE2B be54313453564fdcbedf7f7450afa2282af90c47cd6ff6ea9be3e76ccb4fb30f558e20bad73633754c914b4574c82b6d3b35b8d41579c72f1e9c7dbec6587a11 SHA512 612c7589a9f8eb4056ae5cf3365d5ee2d52357554a012c9a4515c2adefd5275153ff24fc80aac7b7f37e397a583f22808e4554fcde8a0f72cc0306ffe811600f
diff --git a/dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild b/dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild
deleted file mode 100644
index 2764887972d5..000000000000
--- a/dev-haskell/cabal-helper/cabal-helper-0.6.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to some of Cabal's configuration state used by ghc-mod"
-HOMEPAGE="https://hackage.haskell.org/package/cabal-helper"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.23:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/extra:2 )
-"
diff --git a/dev-haskell/cabal-helper/cabal-helper-0.6.3.1.ebuild b/dev-haskell/cabal-helper/cabal-helper-0.6.3.1.ebuild
deleted file mode 100644
index 39f355f4069b..000000000000
--- a/dev-haskell/cabal-helper/cabal-helper-0.6.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to some of Cabal's configuration state used by ghc-mod"
-HOMEPAGE="https://hackage.haskell.org/package/cabal-helper"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # runs external cabal and downloads things
-
-RDEPEND=">=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.23:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/extra )
-"
diff --git a/dev-haskell/cabal-helper/cabal-helper-0.7.3.0.ebuild b/dev-haskell/cabal-helper/cabal-helper-0.7.3.0.ebuild
deleted file mode 100644
index 854c03c288de..000000000000
--- a/dev-haskell/cabal-helper/cabal-helper-0.7.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to some of Cabal's configuration state used by ghc-mod"
-HOMEPAGE="https://hackage.haskell.org/package/cabal-helper"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # runs external cabal and downloads things
-
-RDEPEND=">=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.26:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/temporary-1.2.0.4:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/utf8-string-1.0.1.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/extra-1.4.10 <dev-haskell/extra-1.6 )
-"
diff --git a/dev-haskell/cabal-helper/metadata.xml b/dev-haskell/cabal-helper/metadata.xml
deleted file mode 100644
index b6837b40dcda..000000000000
--- a/dev-haskell/cabal-helper/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@cabal-helper@ provides a library which wraps the internal use of executables
-		to lift the restrictions imposed by linking against versions of GHC before
-		@7.10@.
-		
-		@cabal-helper@ uses a wrapper executable to compile the actual cabal-helper
-		executable at runtime while linking against an arbitrary version of
-		Cabal. This runtime-compiled helper executable is then used to extract
-		various bits and peices from Cabal\'s on disk state (dist/setup-config)
-		written by it's configure command.
-		
-		In addition to this the wrapper executable also supports installing any
-		version of Cabal from hackage in case it cannot be found in any available
-		package database. The wrapper installs these instances of the Cabal library
-		into a private package database so as to not interfere with the user's
-		packages.
-		
-		Furthermore the wrapper supports one special case namely reading a state
-		file for Cabal itself. This is needed as Cabal compiles it's Setup.hs using
-		itself and not using any version of Cabal installed in any package database.
-		
-		@cabal-helper@ can compile with @Cabal &gt;= 1.14@ but requires @Cabal &gt;= 1.16@
-		at runtime.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 84a39ddb1b1d..a3528ee38e6c 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,5 +1,4 @@
-DIST cabal-install-1.18.1.0.tar.gz 257577 BLAKE2B ea5d1eb3458657b81f04b2de1bd17b3f006912d0eb9a4d6e1bd23f0ecea5560912409603e8a58154c64f6863165fbc850e1015243b727e4d9bdc4bcb4006d7f0 SHA512 252304480ebde673fba873b9d7f709e47d1acfc7ab936a2b19f663d8e3c8ef7a20abeaac0cf9bbdb4bf0d1c30688e8a9b1cf1f73c27ce8f47845c3431de6752e
-DIST cabal-install-1.20.0.3.tar.gz 274779 BLAKE2B 4b46e3722305566e9671677292a3ef64df9ca018dc54c088759a396b04bbbfbe28a72dc058cc98cf8ec552846d47a07d9d792a02a5834aa7808052183b4a93b0 SHA512 a272c7eb1c87a933b30697afa7bf78f95fb0afa203e791448d5e96d5c62105533347b8b777af7a7e6db5703654c319045e089d46d2263a09ed5ada10144ce12f
-DIST cabal-install-1.22.7.0.tar.gz 302579 BLAKE2B e8a92bc69f0b00e5fc12145277216652fa52fb1de9ce3458b5fc3d9bc6f89cfe3a95d26dd7585566b55c55c2a9b2d021336baa10694aa39ca442bdb58c6997e7 SHA512 a88895ee38bf7451ba6a2e929ff224643ea0a536a9633d463d91a471e41b6aae302af2c3ca4fc914e4b3401fcadb137bb0c68c9fb7d0f768835374aef1b22766
-DIST cabal-install-1.24.0.2.tar.gz 499937 BLAKE2B c2e1ea88e20b1a43064010117e1830b052c339464f3188a931e7ca72220287a2862ea25423e5190e8f3fe6ed6b38dc7b688474796faf3d049626b04cf6c191cc SHA512 bd055a52ff0ac697e6f21a588d53dd811d50ee9410659a242c00a5665b360ef10c024df4872b9070c33aa49f779c8817b883b40087d3f4e0be4096a54b2ad5f0
-DIST cabal-install-3.0.0.0.tar.gz 654045 BLAKE2B 5036948651098b83f073b5ce29e2aaa31e4382f07e8b1e79d206889bd9c74fb88789f4b1cbb3bddc6d03375a6e3a3e164d6bda4ea19e3f944904ab11d7693fce SHA512 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca
+DIST cabal-install-3.4.1.0-rev2.cabal 16912 BLAKE2B 9844dca8c72e39cf6f81267f9eae07d25eea9ba351d4ec70026ad0d9a6fb15423b066f2d998e1b702bd9acc15f9f0f90a3a4fc4b4d359bf2c4f5748a77c352ae SHA512 287f819c47a4c1b85ce35c18a299ba18bb0907662a2a5980ed84aebbee93b558ba1237c07100175e44c6b85bcd4953b39691219afb119a8a7d1b6d8aede96d1b
+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
diff --git a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
deleted file mode 100644
index b03eebc1bce2..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit bash-completion-r1 eutils 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"
-KEYWORDS="~amd64 ~x86"
-IUSE="+noprefs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.0 <dev-haskell/cabal-1.19
-	>=dev-haskell/http-4000.0.8 <dev-haskell/http-4001
-	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
-	>=dev-haskell/network-1 <dev-haskell/network-3
-	dev-haskell/network-uri
-	>=dev-haskell/random-1 <dev-haskell/random-1.1
-	>=dev-haskell/stm-2.0 <dev-haskell/stm-3
-	>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
-	>=dev-lang/ghc-6.12.1
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-src_prepare() {
-	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
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	dobashcomp "${S}/bash-completion/cabal"
-}
diff --git a/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild b/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
deleted file mode 100644
index acfa6f958558..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit bash-completion-r1 eutils 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"
-KEYWORDS="~amd64 ~x86"
-IUSE="+noprefs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.20.0 <dev-haskell/cabal-1.21
-	>=dev-haskell/http-4000.2.5 <dev-haskell/http-4000.3
-	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
-	>=dev-haskell/network-2.0 <dev-haskell/network-2.7
-	dev-haskell/network-uri
-	>=dev-haskell/random-1 <dev-haskell/random-1.2
-	>=dev-haskell/stm-2.0 <dev-haskell/stm-3
-	>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
-	>=dev-lang/ghc-7.4.1
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
-"
-
-src_prepare() {
-	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
-
-	cabal_chdeps \
-		'network    >= 2.0      && < 2.6' 'network    >= 2.0      && < 2.7, network-uri' \
-		'network,' 'network,network-uri,' \
-		'random     >= 1        && < 1.1' 'random     >= 1        && < 1.2'
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	dobashcomp "${S}/bash-completion/cabal"
-}
diff --git a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
deleted file mode 100644
index 81f2a4b03b57..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit bash-completion-r1 eutils 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"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +noprefs"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/cabal-1.22.2:= <dev-haskell/cabal-1.23:=
-	>=dev-haskell/http-4000.2.5:= <dev-haskell/http-4000.3:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:=
-	>=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:=
-	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-3:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=
-			>=dev-haskell/network-uri-2.6:= )
-	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3
-		!network-uri? ( <dev-haskell/network-uri-2.6 ) )
-"
-
-src_prepare() {
-	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
-
-	cabal_chdeps \
-		'QuickCheck >= 2.1.0.1 && < 2.9' 'QuickCheck >= 2.1.0.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-
-	dobashcomp "${S}/bash-completion/cabal"
-}
diff --git a/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild b/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
deleted file mode 100644
index b1c902a33f93..000000000000
--- a/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="test-suite"
-inherit bash-completion-r1 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"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +noprefs"
-
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-3:=
-	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:=
-	>=dev-haskell/bytestring-builder-0.10:= <dev-haskell/bytestring-builder-1:=
-	>=dev-haskell/cabal-1.24.2:= <dev-haskell/cabal-1.25:=
-	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
-	>=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:=
-	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-2:=
-	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:=
-	>=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:=
-	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
-	>=dev-haskell/stm-2.0:= <dev-haskell/stm-3:=
-	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
-	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:= <dev-haskell/network-2.7:=
-			>=dev-haskell/network-uri-2.6:= <dev-haskell/network-uri-2.7:= )
-	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.8.2
-		dev-haskell/regex-posix
-		dev-haskell/tagged
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck
-		!network-uri? ( <dev-haskell/network-uri-2.6 ) )
-"
-
-src_prepare() {
-	default
-	if use noprefs; then
-		epatch "${FILESDIR}/${PN}"-1.24.0.0-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
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	dobashcomp "${S}/bash-completion/cabal"
-
-	# fixup perms in such an an awkward way
-	mv "${ED}/usr/share/man/man1/cabal.1" "${S}/cabal.1" || die
-	doman "${S}/cabal.1"
-}
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 d2d67c73fd0d..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="http://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-install/cabal-install-3.4.1.0-r3.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild
new file mode 100644
index 000000000000..9e2bce608882
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild
@@ -0,0 +1,76 @@
+# 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: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions,-debug-conflict-sets
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES=""
+inherit haskell-cabal ghc-package
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="https://www.haskell.org/cabal/"
+
+LICENSE="BSD"
+SLOT="0"
+# Keep in sync with relevant dev-haskell/cabal versions
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko +native-dns"
+
+CABAL_CHDEPS=(
+	'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'
+)
+
+RDEPEND="
+	>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
+	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:=
+	>=dev-haskell/cabal-3.4.1:= <dev-haskell/cabal-3.4.2:=
+	>=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/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:=
+	>=dev-haskell/hashable-1.0:=
+	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:=
+	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
+	>=dev-haskell/random-1.2:= <dev-haskell/random-1.3:=
+	>=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:=
+	>=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:=
+	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
+	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
+	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+	>=dev-lang/ghc-8.4.3:=
+	lukko? (
+		>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
+	)
+	native-dns? (
+		>=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:=
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_prepare() {
+	# no chance to link to -threaded on ppc64, alpha and others
+	# who use UNREG, not only ARM
+	if ! ghc-supports-threaded-runtime; then
+		export CABAL_CHDEPS+=( '-threaded' ' ' )
+	fi
+	haskell-cabal_src_prepare
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-debug-conflict-sets \
+		--flag=-debug-expensive-assertions \
+		--flag=-debug-tracetree \
+		$(cabal_flag lukko lukko) \
+		--flag=-monolithic \
+		$(cabal_flag native-dns native-dns) \
+		--flag=network-uri
+}
diff --git a/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild b/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild
new file mode 100644
index 000000000000..c39a1ed229dd
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild
@@ -0,0 +1,62 @@
+# 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: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions,-debug-conflict-sets
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="https://www.haskell.org/cabal/"
+
+LICENSE="BSD"
+SLOT="0"
+
+# Keep in sync with relevant dev-haskell/cabal versions
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko +native-dns"
+
+RDEPEND="
+	>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
+	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:=
+	>=dev-haskell/cabal-3.6.1.0:= <dev-haskell/cabal-3.7:=
+	>=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/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:=
+	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.5:=
+	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:=
+	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
+	>=dev-haskell/random-1.2:= <dev-haskell/random-1.3:=
+	>=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:=
+	>=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:=
+	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
+	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
+	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+	>=dev-lang/ghc-8.4.3:=
+	lukko? (
+		>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
+	)
+	native-dns? (
+		>=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:=
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-debug-conflict-sets \
+		--flag=-debug-expensive-assertions \
+		--flag=-debug-tracetree \
+		$(cabal_flag lukko lukko) \
+		--flag=-monolithic \
+		$(cabal_flag native-dns native-dns) \
+		--flag=network-uri
+}
diff --git a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch
deleted file mode 100644
index c36582680a56..000000000000
--- a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs
-index 48d8d49..3a38ee1 100644
---- a/Distribution/Client/IndexUtils.hs
-+++ b/Distribution/Client/IndexUtils.hs
-@@ -312,10 +312,15 @@ extractPkg entry = case Tar.entryContent entry of
- 
- extractPrefs :: Tar.Entry -> Maybe [Dependency]
- extractPrefs entry = case Tar.entryContent entry of
-+{-
-+ -- get rid of hackage's preferred-versions
-+ -- I'd like to have bleeding-edge packages in system and I don't fear of
-+ -- broken packages with improper depends
-   Tar.NormalFile content _
-      | takeFileName (Tar.entryPath entry) == "preferred-versions"
-     -> Just . parsePreferredVersions
-      . BS.Char8.unpack $ content
-+-}
-   _ -> Nothing
- 
- parsePreferredVersions :: String -> [Dependency]
diff --git a/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch
deleted file mode 100644
index 40b281073c0e..000000000000
--- a/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs
-index 95545fc..a9c8417 100644
---- a/Distribution/Client/IndexUtils.hs
-+++ b/Distribution/Client/IndexUtils.hs
-@@ -345,2 +345,6 @@ extractPrefs :: Tar.Entry -> Maybe [Dependency]
- extractPrefs entry = case Tar.entryContent entry of
-+{-
-+ -- get rid of hackage's preferred-versions
-+ -- I'd like to have bleeding-edge packages in system and I don't fear of
-+ -- broken packages with improper depends
-   Tar.NormalFile content _
-@@ -351,2 +355,3 @@ extractPrefs entry = case Tar.entryContent entry of
-       prefs     = parsePreferredVersions content
-+-}
-   _ -> Nothing
diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index 659d87e35f01..9025779d6797 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The 'cabal' command-line program simplifies the process of managing
-		Haskell software by automating the fetching, configuration, compilation
-		and installation of Haskell libraries and programs.
-	</longdescription>
 	<use>
-		<flag name="noprefs">Ignore 'preferred-versions' file from hackage's tarball.</flag>
-		<flag name="native-dns">Enable use of the resolv and windns packages for performing DNS lookups</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="lukko">Use @lukko@ for file-locking</flag>
+		<flag name="native-dns">Enable use of the [resolv](https://hackage.haskell.org/package/resolv) &amp; [windns](https://hackage.haskell.org/package/windns) packages for performing DNS lookups</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">cabal-install</remote-id>
+		<remote-id type="github">haskell/cabal</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index f0f69a366108..fb916d95e040 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,9 +1,3 @@
-DIST Cabal-1.18.1.2.tar.gz 323545 BLAKE2B d9e88f8f512b6bf23f8c57b6719fcf560b24aa2b20a0be3aeaba455dbea79c7320cfec495f31524a098b2d0298fe04cdd29c65f8c527066fcac82ba1f592e761 SHA512 a91abbdb86bcb7a47e871e9b9a2cb4720b41f2cf6998416cc557460ff821e9b711cf8c346bf16c7b07c180815cb901f7b27e5cda3701f3ace554613ceb27e3c6
-DIST Cabal-1.18.1.3.tar.gz 705715 BLAKE2B 46d6c446e9410d7bd3e3f2e68e2e950e180f8fde4332ba3c4657add30dd721d7e2887b830e9c2954d3ce8e521e42d7db90d87150804589ad5fbea5c08b6b3fca SHA512 3c6f2d3be36384140007ca1146edcca5461bf0e93cde8d2b32bd9d69f74df51975bfbc91ec7cce92d9c78929f91f9e7e8b595488bc1c328dbed313a6fcd76708
-DIST Cabal-1.18.1.5.tar.gz 706722 BLAKE2B ff1b301882d39c0388f6ecd39ad73cadebdc9096b0e185fcf1299897e536be23714ba9126033d98b60558272fc28e9d72f638ee94d9f769e61d00c2d2bd1a092 SHA512 a5bb21bcb0a95f22572a1d6d4338415bf00eab9b77c2fb4775c81f7554d282fea9160646687bd903197cb5d429f0fcd28b30b577a8915ec92740a91fa13c68ef
-DIST Cabal-1.20.0.2.tar.gz 717941 BLAKE2B 38aa5742a1f0137b3f81af6543d7810b98f15b6aeb6e83ea169aacab0bcb1d14629df885cc9c02bb64567069e475497cf2ac716731bf84ee89bdf177404cc5e0 SHA512 6dfe30ebe5859ccd934f76fc32bd4757d89e3bcb02a528bebaa0a63f22c0494eb4a941b2fed2e004671875586fed113860e82413bed99f70be565f4f343ac3d3
-DIST Cabal-1.22.8.0.tar.gz 405552 BLAKE2B 9484ba4b485f6119a7b9e27565ac26ea403b407711a8dcfcee127e03f3cce6a0e96165126a996b39a8f29e97e65eff4f5ec308fb3f53c53cb795cb8ba1ab0daf SHA512 3666e8a66751ea8ae93109c1e33c2909c00c65ddcd77458c41303481e06ebd7230215e12c133cc2fca47ba352c61411ff72ca0994b6d45b5987156bce2fbcdf3
-DIST Cabal-1.24.2.0.tar.gz 441440 BLAKE2B b4ce800ab35c0771b9da1947b459bae7cf6236724b6073bff3eb51732b08b71f65596f9f3fb7a09eacea4a1ee88d9bd6350298919f095fb2479770f98539faf5 SHA512 707015930d6bd463290c59ef043a5acea79f22d43920ac249d2391c0b8960a10261a83c8aa1a326b6e95311edb048c9edbdc211dc1b79aee86884061af6c8b36
-DIST Cabal-2.0.0.2.tar.gz 1551128 BLAKE2B bc053a31ddd966577b1c4d5b80bd778fe0b5aadef08d3eee1f8613ab2dd9bc3a0371ad1687033a4489bfced3b46926b0cbdea20d53ada4ed1ab615c7e080de39 SHA512 0eac73132dbee80cce8bf6ce95d531526c983e90dde3348edf6ee583e7fe352393dc6806eb7f35cd38729d979dd418267f1884ec49b4c9e7d858d9b17dff900f
-DIST Cabal-2.4.0.1.tar.gz 4801392 BLAKE2B 489096b7297e217866006f02e7ef41fe362d6495f81ebbb3b3149341bf9ff18d93d102fe836259471ed9ec1c6c591f5564f81a623a7e4106b9e8a4388646d73f SHA512 4b2a1187e1ec011052ab77ef4bc700608eaab3e921554dd9d75bfca058c487a5651ab6cfe2734ee6cc9687d504a008b4912db182166f0f2f52d23fc08230e48c
-DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67 SHA512 29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06
+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
diff --git a/dev-haskell/cabal/cabal-1.18.1.2.ebuild b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
deleted file mode 100644
index ddbea6669cfa..000000000000
--- a/dev-haskell/cabal/cabal-1.18.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bootstrap lib profile test-suite"
-inherit haskell-cabal versionator
-
-MY_PN=Cabal
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
deleted file mode 100644
index b4a410cf4d32..000000000000
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014* 7.8.1 7.8.2 7.8.3 7.8.3.20141119"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
deleted file mode 100644
index 369324fa4712..000000000000
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular depend: cabal[test]->quickcheck[test]->cabal
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-CABAL_CORE_LIB_GHC_PV="7.8.4"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
deleted file mode 100644
index abbfa9df88f6..000000000000
--- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not beed cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.8:2
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-
-	cabal_chdeps \
-		'QuickCheck < 2.7' 'QuickCheck < 2.8' \
-		'QuickCheck >= 2.1.0.1 && < 2.7' 'QuickCheck >= 2.1.0.1 && < 2.8'
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
deleted file mode 100644
index c42d09e543c7..000000000000
--- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" bootstrap" # does not need cabal to build itself
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}
-	test? ( dev-haskell/extensible-exceptions
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.1.0.1:2 <dev-haskell/quickcheck-2.9:2
-		dev-haskell/regex-posix
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.12 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	if [[ -n ${LIVE_EBUILD} ]]; then
-		CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}"
-	fi
-}
-
-src_configure() {
-	cabal-is-dummy-lib && return
-
-	einfo "Bootstrapping Cabal..."
-	$(ghc-getghc) ${HCFLAGS} -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
-		-o setup || die "compiling Setup.hs failed"
-	cabal-configure
-}
-
-src_compile() {
-	cabal-is-dummy-lib && return
-
-	cabal-build
-}
diff --git a/dev-haskell/cabal/cabal-1.24.2.0.ebuild b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
deleted file mode 100644
index 8174b449767e..000000000000
--- a/dev-haskell/cabal/cabal-1.24.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -bundled-binary-generic
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular dependencies
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.2_rc2 PM:8.0.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bundled-binary-generic
-}
diff --git a/dev-haskell/cabal/cabal-2.0.0.2.ebuild b/dev-haskell/cabal/cabal-2.0.0.2.ebuild
deleted file mode 100644
index b88e01493733..000000000000
--- a/dev-haskell/cabal/cabal-2.0.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-#hackport: flags: -parsec-struct-diff
-
-CABAL_FEATURES="lib profile test-suite"
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#not keyworded yet: many packages are broken
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular dependencies
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.2.1"
-
-PATCHES=("${FILESDIR}"/${P}-no-bootstrap.patch)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-parsec-struct-diff
-}
diff --git a/dev-haskell/cabal/cabal-2.4.0.1.ebuild b/dev-haskell/cabal/cabal-2.4.0.1.ebuild
deleted file mode 100644
index 0b868d122cef..000000000000
--- a/dev-haskell/cabal/cabal-2.4.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -bundled-binary-generic
-
-CABAL_FEATURES="lib profile" # Drop test-suite: circular depend
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.6
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${PN}-2.0.0.2-no-bootstrap.patch)
-
-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"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bundled-binary-generic
-}
diff --git a/dev-haskell/cabal/cabal-3.0.1.0.ebuild b/dev-haskell/cabal/cabal-3.0.1.0.ebuild
deleted file mode 100644
index 88d667c8f674..000000000000
--- a/dev-haskell/cabal/cabal-3.0.1.0.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.9999
-#hackport: flags: -parsec-struct-diff
-
-CABAL_FEATURES="lib profile" # Drop test-suite: circular depend
-CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken
-inherit haskell-cabal
-
-MY_PN="Cabal"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A framework for packaging Haskell software"
-HOMEPAGE="http://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/semigroups-0.18.3:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-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"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-parsec-struct-diff
-}
diff --git a/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
new file mode 100644
index 000000000000..c6c1f1ec4d33
--- /dev/null
+++ b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
@@ -0,0 +1,69 @@
+# 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 tests due to circular deps
+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 ~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-9.1:=
+"
+DEPEND="${RDEPEND}
+"
+#	test? (
+#		>=dev-haskell/async-2.2.2 <dev-haskell/async-2.3
+#		>=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/clock-0.8 <dev-haskell/clock-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.17
+#		>=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15
+#		>=dev-haskell/rere-0.1 <dev-haskell/rere-0.3
+#		>=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="9.0.2"
diff --git a/dev-haskell/cabal/cabal-3.6.3.0.ebuild b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
new file mode 100644
index 000000000000..45f63629ee03
--- /dev/null
+++ b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: -parsec-struct-diff
+
+CABAL_PN="Cabal"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+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 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-lang/ghc-9.2.4:= <dev-lang/ghc-9.3:=
+"
+DEPEND="${RDEPEND}
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-parsec-struct-diff
+}
+
+CABAL_CORE_LIB_GHC_PV="9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch b/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch
deleted file mode 100644
index 2eed504b5654..000000000000
--- a/dev-haskell/cabal/files/cabal-2.0.0.2-no-bootstrap.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/Setup.hs b/Setup.hs
-index 42784ab..6bb3f8a 100644
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -1,2 +1,4 @@
--import Distribution.Simple
-+{-# LANGUAGE PackageImports #-}
-+-- forces not to use local files
-+import "Cabal" Distribution.Simple
- main :: IO ()
diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml
index 97bee0727e40..ff65eca11461 100644
--- a/dev-haskell/cabal/metadata.xml
+++ b/dev-haskell/cabal/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The Haskell Common Architecture for Building Applications and
-		Libraries: a framework defining a common interface for authors to more
-		easily build their Haskell applications in a portable way.
-		
-		The Haskell Cabal is part of a larger infrastructure for distributing,
-		organizing, and cataloging Haskell libraries and tools.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">Cabal</remote-id>
+		<remote-id type="github">haskell/cabal</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest
index 6e1381383673..14b05702e273 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -1,4 +1 @@
-DIST cairo-0.12.5.3.tar.gz 53447 BLAKE2B c8087afedec5992f475e5d2d53baf77d315594df22a1e9c487143567604b0a35d0d374138066640e612f63eecf383bb30242e39a3b39d1c65c69f37d0f6406e8 SHA512 1dca628c4052df667130590d963f3b26e1c7df958654dbc18cb76cc471ee60b19fa3fc65a3b9042990943cc95a4af05d8993d853e859f03e457a8a6963113433
-DIST cairo-0.13.1.1.tar.gz 54029 BLAKE2B 055843b909ac6c48ea041e90a7502ca63eae438bd588e6ff07bf507593691222c692beefd0fc75fcde5cd1ae19ab289b61453c87482965a7c2431ac75bfc2387 SHA512 bf621799f2615e93f0151282772fc01f370060e3454810aa3e205eab16804637acbaded0c1feb6f45adbf75384ccade9b11b5ea70cb79397e7815c59ca570e29
-DIST cairo-0.13.3.1.tar.gz 45033 BLAKE2B 528e457d0e631497052431a65f8f712ae2e292ffe1422447b45cd2448a508bc306968a1e609d5f52a4a6293e7efed16b5f55654e56708b2e51b348cdd3ea3b78 SHA512 5878f90e4cfd69452b1819d27c9ae85205c2b75f831b7bedb05d5b8e4964ec90ec16c3611218c3a794d5ae54ccae5a592102b95326be348c59ab14239b60f33b
-DIST cairo-0.13.6.1.tar.gz 53029 BLAKE2B 8363b436271bc1666116819d9ac39297e3a8c61e18ef7758e188e194a1a51fd8a335d61707cecc5f5d240fcf1f4c71add7be945ec8686e80b36de97c88ecfda6 SHA512 e268d27298c2b274eb12555ff67e4abb175a1269ed3087b9a5cf1a128252d8d390e3ef393e76f27b857558451fb0a137f4f44e095053a9ca20159a332b8878ef
+DIST cairo-0.13.10.0.tar.gz 53346 BLAKE2B dd6d4d6b4fcfe0212823bbfc01d1edef7cb0a6e776c74d85419c91d6f48757ce1d9f36855c54fa88a4eb448de3c70a9b22bec99647e5e49988770249f14a950a SHA512 86465f37999144a8330b2921eb7233a6a1e5258ac9debe4c70c515ccc183ed6cc04dca3a3ca91978e0d3d2871e4a601253e147fd5b3e76f4839a37cbf9deabfa
diff --git a/dev-haskell/cairo/cairo-0.12.5.3.ebuild b/dev-haskell/cairo/cairo-0.12.5.3.ebuild
deleted file mode 100644
index aa2419fcb531..000000000000
--- a/dev-haskell/cairo/cairo-0.12.5.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	x11-libs/cairo[svg?]"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -e "s@#include<cairo-features.h>@#define $(usex amd64 __x86_64__ __i386__)\n#include<cairo-features.h>@" \
-		-i "${S}"/Graphics/Rendering/Cairo.hs \
-		|| die "Could not define ABI in Graphics/Rendering/Cairo.hs"
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag pdf cairo_pdf) \
-		$(cabal_flag postscript cairo_ps) \
-		$(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/cairo/cairo-0.13.1.1.ebuild b/dev-haskell/cairo/cairo-0.13.1.1.ebuild
deleted file mode 100644
index 74f3df30f8b8..000000000000
--- a/dev-haskell/cairo/cairo-0.13.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag pdf cairo_pdf) \
-		$(cabal_flag postscript cairo_ps) \
-		$(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/cairo/cairo-0.13.10.0.ebuild b/dev-haskell/cairo/cairo-0.13.10.0.ebuild
new file mode 100644
index 000000000000..84caaa8cda97
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.13.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: +cairo_pdf,+cairo_ps,cairo_svg:svg
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Cairo library"
+HOMEPAGE="https://projects.haskell.org/gtk2hs/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+svg"
+
+RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0 <dev-haskell/cabal-3.11
+"
+BDEPEND=">=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=cairo_pdf \
+		--flag=cairo_ps \
+		$(cabal_flag svg cairo_svg)
+}
+
+GHC_BOOTSTRAP_PACKAGES=( gtk2hs-buildtools )
diff --git a/dev-haskell/cairo/cairo-0.13.3.1.ebuild b/dev-haskell/cairo/cairo-0.13.3.1.ebuild
deleted file mode 100644
index 23e5e429845f..000000000000
--- a/dev-haskell/cairo/cairo-0.13.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag pdf cairo_pdf) \
-		$(cabal_flag postscript cairo_ps) \
-		$(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/cairo/cairo-0.13.6.1.ebuild b/dev-haskell/cairo/cairo-0.13.6.1.ebuild
deleted file mode 100644
index 42eff6558c01..000000000000
--- a/dev-haskell/cairo/cairo-0.13.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Cairo library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pdf +postscript +svg"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag pdf cairo_pdf) \
-		$(cabal_flag postscript cairo_ps) \
-		$(cabal_flag svg cairo_svg)
-}
diff --git a/dev-haskell/cairo/metadata.xml b/dev-haskell/cairo/metadata.xml
index 77b5ad73a8af..3778b9cd1ba8 100644
--- a/dev-haskell/cairo/metadata.xml
+++ b/dev-haskell/cairo/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Cairo is a library to render high quality vector graphics. There
-		exist various backends that allows rendering to Gtk windows, PDF,
-		PS, PNG and SVG documents, amongst others.
-	</longdescription>
+	<use>
+		<flag name="svg">Build the Scalable Vector Graphics (SVG) backend of Cairo.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">cairo</remote-id>
+		<remote-id type="github">gtk2hs/gtk2hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/call-stack/Manifest b/dev-haskell/call-stack/Manifest
index b38eb5d4072d..6d9ed78160c1 100644
--- a/dev-haskell/call-stack/Manifest
+++ b/dev-haskell/call-stack/Manifest
@@ -1,2 +1,2 @@
-DIST call-stack-0.1.0.tar.gz 2473 BLAKE2B 2af9c069e24e0b6b0f876259d391a7a3703bb5154648b9f945f8a40df58d5237b6b150a540e41b661a5efc585296e76cff0092e8776dbae650c793a2abe04503 SHA512 4b8fa206041976948411c7e7babd481b01297c289be72f56dcd56b090bec3b0d3c0a6ef4ce17bb5bd879f08b8059f36ebea664c3c263283457a519e5ce20a0f6
-DIST call-stack-0.2.0.tar.gz 2565 BLAKE2B f9c8440947c5bfad04d57d5865bfc82d9009dfff4b8de11c6281ef8c82a5cdb39c1bf83153f9b3ab58f0dea0b641c348b3096ae08b7368a92bc2ddfa638d2578 SHA512 c22862ca24906b07e258690da8c7f6fadf87f4216023cbe847e8ddf0c87548e5c353b5cd82c4748c6ef09604556884caafe5fdc1996be9d000d2db29aaef1537
+DIST call-stack-0.3.0.tar.gz 2544 BLAKE2B 7a668213daaaae0c2ba9a1670aa0073585ea1e122149b88c2a953b4aa8960ef4221259c2a331f3a32913727373e6f7a9e99ad5cdbf747f9e84071c4da01ca522 SHA512 32d805957dbe8965c22a74f1c9fed950f5c8df599ce5d447b3eae08fbbf65a01286be95444ca9db654a5189b062b4cf121dcd771c6bd981ca9d12e0df206533d
+DIST call-stack-0.4.0.tar.gz 2757 BLAKE2B 1a62fa72f223c301995e5e74cd0797e2a5c8fef0a8a73ec589bb9047e56953f7ab5f4f1d942814e285529a71901784e7fd35e470b512eb42b06edfc01c540ff7 SHA512 ab8ead1f9d6a71a6c70d2c484de4e42f3aecdcadd6d02f447b450e58b8556c7c4c293b8865ff154ea9bc6aca71cf5182034dc46265d364c4389882ab0ee3b937
diff --git a/dev-haskell/call-stack/call-stack-0.1.0.ebuild b/dev-haskell/call-stack/call-stack-0.1.0.ebuild
deleted file mode 100644
index 70c8b8444936..000000000000
--- a/dev-haskell/call-stack/call-stack-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use GHC call-stacks in a backward compatible way"
-HOMEPAGE="https://github.com/sol/call-stack#readme"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/nanospec )
-"
diff --git a/dev-haskell/call-stack/call-stack-0.2.0.ebuild b/dev-haskell/call-stack/call-stack-0.2.0.ebuild
deleted file mode 100644
index b3441e33b82c..000000000000
--- a/dev-haskell/call-stack/call-stack-0.2.0.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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use GHC call-stacks in a backward compatible way"
-HOMEPAGE="https://github.com/sol/call-stack#readme"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( dev-haskell/nanospec )
-"
diff --git a/dev-haskell/call-stack/call-stack-0.3.0.ebuild b/dev-haskell/call-stack/call-stack-0.3.0.ebuild
new file mode 100644
index 000000000000..89addd693abf
--- /dev/null
+++ b/dev-haskell/call-stack/call-stack-0.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use GHC call-stacks in a backward compatible way"
+HOMEPAGE="https://github.com/sol/call-stack#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/nanospec )
+"
diff --git a/dev-haskell/call-stack/call-stack-0.4.0.ebuild b/dev-haskell/call-stack/call-stack-0.4.0.ebuild
new file mode 100644
index 000000000000..d3e0ebf64eed
--- /dev/null
+++ b/dev-haskell/call-stack/call-stack-0.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use GHC call-stacks in a backward compatible way"
+HOMEPAGE="https://github.com/sol/call-stack#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/nanospec )
+"
diff --git a/dev-haskell/call-stack/metadata.xml b/dev-haskell/call-stack/metadata.xml
index b7878815d80d..5cb918438566 100644
--- a/dev-haskell/call-stack/metadata.xml
+++ b/dev-haskell/call-stack/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">call-stack</remote-id>
+		<remote-id type="github">sol/call-stack</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/casa-client/Manifest b/dev-haskell/casa-client/Manifest
deleted file mode 100644
index fc16ce1244cc..000000000000
--- a/dev-haskell/casa-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST casa-client-0.0.1.tar.gz 3676 BLAKE2B d00b8fd2991863190e5fa12d852e2a0a3f3a87af4bf988d337ee703a5a7d827aa1e2681aa9b3066dd77176cf52b3564b3266b1aa9d542fb58cd0694204668031 SHA512 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa
diff --git a/dev-haskell/casa-client/casa-client-0.0.1.ebuild b/dev-haskell/casa-client/casa-client-0.0.1.ebuild
deleted file mode 100644
index 35643269c6df..000000000000
--- a/dev-haskell/casa-client/casa-client-0.0.1.ebuild
+++ /dev/null
@@ -1,41 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Client for Casa"
-HOMEPAGE="http://hackage.haskell.org/package/casa-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/casa-types:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	dev-haskell/http-conduit:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/network-uri:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/th-lift:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/casa-client/metadata.xml b/dev-haskell/casa-client/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/casa-client/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/casa-types/Manifest b/dev-haskell/casa-types/Manifest
deleted file mode 100644
index 784d0c2c9e6a..000000000000
--- a/dev-haskell/casa-types/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST casa-types-0.0.1.tar.gz 2030 BLAKE2B a1787b35cf8254118287a7415ee625dd8815011a3d444f5ef303ba4af989924e5b40e1c1e5abd43e69c299e5c7ef1cbe7b67a0f019c6d2bfd01e2bee4b1661e6 SHA512 6296898e8ffdd20ad7dc5aa52a99078fa71bb2384a8631761255e19b7b670a1d349715241be8cb2ee84fd52ee7ac70b4458adab3a86ebe63b9c976f7bac44f98
diff --git a/dev-haskell/casa-types/casa-types-0.0.1.ebuild b/dev-haskell/casa-types/casa-types-0.0.1.ebuild
deleted file mode 100644
index 310ef469a010..000000000000
--- a/dev-haskell/casa-types/casa-types-0.0.1.ebuild
+++ /dev/null
@@ -1,31 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for Casa"
-HOMEPAGE="http://hackage.haskell.org/package/casa-types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	dev-haskell/path-pieces:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/casa-types/metadata.xml b/dev-haskell/casa-types/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/casa-types/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/case-insensitive/Manifest b/dev-haskell/case-insensitive/Manifest
index 60b1a93753ac..75eb9c7141bd 100644
--- a/dev-haskell/case-insensitive/Manifest
+++ b/dev-haskell/case-insensitive/Manifest
@@ -1,5 +1 @@
-DIST case-insensitive-1.0.0.2.tar.gz 4803 BLAKE2B 53e45eaa6f6381138369601c7f46abcc166d8fbed8f50839b580410242c3d09c6c7f33abb6c0dbcaae07dc6d2caab0a94a86c6d84dcfea94007ab65f6e536464 SHA512 101ab558b4359da40320293c5ffafaf2f69bf9289ea0fde1ea9775847ef7e31959b71c2c86c7d150d1ed6e0c71209c10d7c83bd416e170f233fad31f81ff7e7f
-DIST case-insensitive-1.1.0.3.tar.gz 5188 BLAKE2B 3acc26c4841600aba43d852ff1783323543246c7eb2610a6039df57b33ffab7f4dc039b16befbb6c0dad5cb4483a8e42b4a4b0c5d43b163e5288e23340430914 SHA512 d9b21c31e65224e5ce181fa680ee7f67371ae03248a51a2329e46ba27b22e0f426e02cbc872af7ca42c84d56450ffac2ff62ffaf41e7055abcb43aa97e3c404c
-DIST case-insensitive-1.2.0.5.tar.gz 53404 BLAKE2B 7683f3f985b59ddbcb872a58690dbcf20011191ac26ad8834782cedc83bbdd43ad3192768f71c9e205b8acb13a1cf8f2a7dc155750c6f81ee3d6e6071b9636ad SHA512 8b43fb205cac13f36c4f22ece3672478cac940a23552fc61534beedf12dfaf22107c982513560be154882efd1e4b615f581bd318b3df177a3b1c7477ce4501a5
-DIST case-insensitive-1.2.0.7.tar.gz 53615 BLAKE2B 836e8e100bbde7a39dda408a626b9304b5f3b50302da86f91bd1f18fe42deea5c055dee94c031ceef50dc7f761d7aec7201d4f08f0b5067296bf223fe0a13c36 SHA512 abd46a77981fda54b6542620a48801779e9f782c8575c6dcaedf442c0781720e572f8e7a012ad2787ae65e647311d8f7c91892e0d1b50fa93fd6382c256ccb1e
 DIST case-insensitive-1.2.1.0.tar.gz 53609 BLAKE2B a1c5c7574d0f3678ac0f3e6b53cbe78ae03c7ea7c4579fe0c9314bf4f22c7968701ba8c3e9dd9dbd64781e34c9f32948f121029301132d9dfdaf3d3fdeee0e6b SHA512 8e3bab4d1035d0bf96da24c7a4b79953b855c849cb0197bf65dc66b4394a92fea263fcffca4179005507a35234b7f60d873df41bc01a94fb2dfdbd91092e176b
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild
deleted file mode 100644
index 5e9ca276d36e..000000000000
--- a/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Case insensitive string comparison"
-HOMEPAGE="https://github.com/basvandijk/case-insensitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-		>=dev-haskell/text-0.3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.3
-			>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-			>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4
-		)"
-
-src_prepare() {
-	cabal_chdeps \
-		'text       >= 0.3 && < 0.12' 'text       >= 0.3' \
-		'text                 >= 0.3   && < 0.12' 'text                 >= 0.3'
-}
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.1.0.3.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.1.0.3.ebuild
deleted file mode 100644
index 0a0c0d4fc7cd..000000000000
--- a/dev-haskell/case-insensitive/case-insensitive-1.1.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Case insensitive string comparison"
-HOMEPAGE="https://github.com/basvandijk/case-insensitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
deleted file mode 100644
index 84b545530c04..000000000000
--- a/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Case insensitive string comparison"
-HOMEPAGE="https://github.com/basvandijk/case-insensitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild
deleted file mode 100644
index a4f73f6fc262..000000000000
--- a/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Case insensitive string comparison"
-HOMEPAGE="https://github.com/basvandijk/case-insensitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild
index 7f06b349052d..b98875ed758a 100644
--- a/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild
+++ b/dev-haskell/case-insensitive/case-insensitive-1.2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.1
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.0:=[profile?]
diff --git a/dev-haskell/case-insensitive/metadata.xml b/dev-haskell/case-insensitive/metadata.xml
index c2ca97261beb..05f80e26a12d 100644
--- a/dev-haskell/case-insensitive/metadata.xml
+++ b/dev-haskell/case-insensitive/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest
index 567666013021..dea222dd9578 100644
--- a/dev-haskell/cassava/Manifest
+++ b/dev-haskell/cassava/Manifest
@@ -1,3 +1,4 @@
-DIST cassava-0.4.4.0.tar.gz 32631 BLAKE2B dd7bf6e4b4378ffd0dad3c402465b20f8a830d1dd156826fbb0eedced28598297d0f5056d25acc1e2c8457934f077a4ac34b2caa1852397d9d0fe17b875ac3b9 SHA512 af0954754bbcfe8068ccd029417327770c60a62ecc5503b3cce5a58962940a804e167688760aec7ead42ec99b404295715d2f8fd65e4b4ed2918e1c5e063b36b
-DIST cassava-0.4.5.0.tar.gz 33104 BLAKE2B 0b0726f3060f0857ecb4135bbf71cba7e6a8b108268f948b29d6a0f61d09336097689f24bcbe77e913b5461e3872b07f6ba2d0a9e35738dc125add0a05d2650d SHA512 24f017ac44f48cdf000cab4108023d6f30a67638964831f0d7cd167bcd96ba85337d3aec6855128d370b9b383394042b3adf8dfd7299e616a385fd09125005a5
+DIST cassava-0.5.2.0-rev7.cabal 6051 BLAKE2B 934cf9b067a8c9503f13676e3ee8f4d3a79a7ab030f39f4b652d460d89e3a739b1bb2bc231ad06e63d0cc5155e4119f91d2ea1d5d01c423c7cca2e689f07fd46 SHA512 4f8105a7298ff3a5f4dc8d579571296902d44084dce57c0136bd089de4575d75fa6a839fb568a87c7ae0b07ea3cee40a6e33ffe35ca2c8b05dd45905aa8713ea
 DIST cassava-0.5.2.0.tar.gz 37411 BLAKE2B 64351820bf75bfef0f29e44d1c3f9177ba41474d3419985b9853893aa4cee1485bbb1dfdd4d11b4c8df2673775fdfa211942b13f11124e8077ac25b91c6fc8d4 SHA512 f7f3fc2ebf58491847fb20b21ecf18595933d296bfd4c48249d35c52e72988c4e2758d7a6d2095a9edb3bed8e154a11170920a7c08262270c9f60cb853085383
+DIST cassava-0.5.3.0-rev1.cabal 6121 BLAKE2B 17a993359521f12b5be13eb3ffa8e92d5814ecd2c6df37a97e9bd07aba6fb476ca13f62def0fc50cac2cbc7e9c7408804ab49936868f69ab2b98c06289234910 SHA512 2b97d8eb0d2a478dfacd771ff33d63e8d8ea27b8a2b721353e49a50a378739de10cb67d7e803884192357b394bcc4b9c943fa108ae71725c229f1a5eb9eae6c1
+DIST cassava-0.5.3.0.tar.gz 38224 BLAKE2B 8b82d77e7698bc608be8637894c2a57361145547f63a48d48d76027f8003d3e0c505777bd61b29f00dab117995d846f442d3de2ee56b392302fc6f57639e7f14 SHA512 6afae52a2facc013d746a83afa975a2493174e2c5bda0c0ad8cab76c13c46dd86e8d3142e0676c881a35c3c8bf5618a5c1e4b70c3ab153443b949cb84b70bcb4
diff --git a/dev-haskell/cassava/cassava-0.4.4.0.ebuild b/dev-haskell/cassava/cassava-0.4.4.0.ebuild
deleted file mode 100644
index 9c14c797e44e..000000000000
--- a/dev-haskell/cassava/cassava-0.4.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A CSV parsing and encoding library"
-HOMEPAGE="https://github.com/tibbe/cassava"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	<dev-haskell/blaze-builder-0.5:=[profile?]
-	<dev-haskell/hashable-1.3:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	<dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/cassava/cassava-0.4.5.0.ebuild b/dev-haskell/cassava/cassava-0.4.5.0.ebuild
deleted file mode 100644
index 9e4035f00b02..000000000000
--- a/dev-haskell/cassava/cassava-0.4.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A CSV parsing and encoding library"
-HOMEPAGE="https://github.com/hvr/cassava"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	<dev-haskell/blaze-builder-0.5:=[profile?]
-	<dev-haskell/hashable-1.3:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	<dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
new file mode 100644
index 000000000000..fa7f3d7de5e1
--- /dev/null
+++ b/dev-haskell/cassava/cassava-0.5.2.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 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 test-suite"
+CABAL_HACKAGE_REVISION="7"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="A CSV parsing and encoding library"
+HOMEPAGE="https://github.com/hvr/cassava"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	<dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
+	>=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+	<dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/cassava/cassava-0.5.2.0.ebuild b/dev-haskell/cassava/cassava-0.5.2.0.ebuild
deleted file mode 100644
index 73aa92acc462..000000000000
--- a/dev-haskell/cassava/cassava-0.5.2.0.ebuild
+++ /dev/null
@@ -1,48 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A CSV parsing and encoding library"
-HOMEPAGE="https://github.com/hvr/cassava"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	<dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
-	>=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.5 && < 4.14' 'base >= 4.5'
-}
diff --git a/dev-haskell/cassava/cassava-0.5.3.0.ebuild b/dev-haskell/cassava/cassava-0.5.3.0.ebuild
new file mode 100644
index 000000000000..822b25cc6f0f
--- /dev/null
+++ b/dev-haskell/cassava/cassava-0.5.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION=1
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="A CSV parsing and encoding library"
+HOMEPAGE="https://github.com/haskell-hvr/cassava"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	<dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/only-0.1:=[profile?] <dev-haskell/only-0.1.1:=[profile?]
+	>=dev-haskell/scientific-0.3.4.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	<dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/text-short-0.1:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+	<dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.8:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.12 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/cassava/metadata.xml b/dev-haskell/cassava/metadata.xml
index f74f33a503ee..769713f352ca 100644
--- a/dev-haskell/cassava/metadata.xml
+++ b/dev-haskell/cassava/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A CSV parsing and encoding library optimized for ease of use and high
-		performance.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">tibbe/cassava</remote-id>
+		<remote-id type="hackage">cassava</remote-id>
+		<remote-id type="github">haskell-hvr/cassava</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cereal-vector/Manifest b/dev-haskell/cereal-vector/Manifest
deleted file mode 100644
index 2e523eaf198a..000000000000
--- a/dev-haskell/cereal-vector/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cereal-vector-0.2.0.1.tar.gz 3337 BLAKE2B d1829bf26bc7d54c0dcd45355c3fff957e2ff7b6e779102be021fb1be780104636a87d1e7c2f7a590a4302b9755867224c7d1f49cb26578748438f7e79774a5a SHA512 8e54e349b61e7e8f56e1f2029afd03e5b6677afaf79756771efdeb1b01364befa5a170b5caea445dae7342d71cc51f8fd3bf4300b0707252535e2e4d31213f00
diff --git a/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild b/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
deleted file mode 100644
index c0a1cbad52fc..000000000000
--- a/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Serialize instances for Data.Vector types"
-HOMEPAGE="https://github.com/acfoltzer/cereal-vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/cereal-vector/metadata.xml b/dev-haskell/cereal-vector/metadata.xml
deleted file mode 100644
index 62b7f047cd62..000000000000
--- a/dev-haskell/cereal-vector/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Serialize instances for Data.Vector types.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cereal/Manifest b/dev-haskell/cereal/Manifest
index 10d6c8009851..5f2eabcb8339 100644
--- a/dev-haskell/cereal/Manifest
+++ b/dev-haskell/cereal/Manifest
@@ -1,4 +1,2 @@
-DIST cereal-0.3.5.2.tar.gz 22047 BLAKE2B f20de060898d2c5906e46704989d59557258455358e2370d560ccc4a7b7684481ea9faa64cd32f51782d6ee1ad6b71401e766902174821db3bc7ef00a9951847 SHA512 d77b0362757a6dda60d67e762a1509dd925d6c79d6280d73d34e2ce7f60ff0271975003e0c44cb95a4e4d72aade7833c839dad6774ac81439a703b570547bc11
-DIST cereal-0.4.0.1.tar.gz 22305 BLAKE2B 04867fc50e60684f47b609c3fc01a0c8ce4acbd80b3c7fb055ca29e19d2cc34341c287d9835eab7ea001d7273f825a54f23f49a9494a35c7b65497b29d149526 SHA512 9ea997af2cd84ecbd0660b5799a2d1fd4f6e5715ff5191922b69b98eee0664fbc4e5e6f2d67af808517a3f5e85931fdef093360a1d693bb81ea9cb430be6d21f
-DIST cereal-0.4.1.1.tar.gz 22656 BLAKE2B 72f7ffa9c3cbcff11b62a97eb9df5421f6776c09349fbd762a6896403cf89a5ffee6d0e56cc1c4df4894a8c4fda3aace91cc2db5b6cbbf8b8aedd966ac91b8bc SHA512 dcc0604ff78ea2d9e8c5a163d832879d5fad63f9cbc798ab2a785aa6b04f7a6262f42a478f61351cf9fc18f0eadaa83bc83146b614c286316a824787cd70b8a2
 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
diff --git a/dev-haskell/cereal/cereal-0.3.5.2.ebuild b/dev-haskell/cereal/cereal-0.3.5.2.ebuild
deleted file mode 100644
index bb4d0985ffd2..000000000000
--- a/dev-haskell/cereal/cereal-0.3.5.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A binary serialization library"
-HOMEPAGE="https://hackage.haskell.org/package/cereal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/cereal/cereal-0.4.0.1.ebuild b/dev-haskell/cereal/cereal-0.4.0.1.ebuild
deleted file mode 100644
index b80a4d249217..000000000000
--- a/dev-haskell/cereal/cereal-0.4.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A binary serialization library"
-HOMEPAGE="https://hackage.haskell.org/package/cereal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/cereal/cereal-0.4.1.1.ebuild b/dev-haskell/cereal/cereal-0.4.1.1.ebuild
deleted file mode 100644
index 09b6b7713aca..000000000000
--- a/dev-haskell/cereal/cereal-0.4.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A binary serialization library"
-HOMEPAGE="https://hackage.haskell.org/package/cereal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	test? ( dev-haskell/quickcheck:2=[profile?] )
-"
-
-src_test() {
-	# The test suite isn't integrated with cabal. There's a Makefile
-	# under the "tests" directory that will build and run some
-	# tests.
-	#
-	# In v0.4.1.1, the test suite won't fail if a property does. This
-	# should be fixed in,
-	#
-	#   https://github.com/GaloisInc/cereal/pull/29
-	#
-	emake -C tests
-}
diff --git a/dev-haskell/cereal/cereal-0.5.8.1.ebuild b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
index c39d43d2bc9c..a933409a6fa0 100644
--- a/dev-haskell/cereal/cereal-0.5.8.1.ebuild
+++ b/dev-haskell/cereal/cereal-0.5.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,12 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 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/cereal/cereal-0.5.8.3.ebuild b/dev-haskell/cereal/cereal-0.5.8.3.ebuild
new file mode 100644
index 000000000000..7ff8ce18af37
--- /dev/null
+++ b/dev-haskell/cereal/cereal-0.5.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A binary serialization library"
+HOMEPAGE="https://github.com/GaloisInc/cereal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/cereal/metadata.xml b/dev-haskell/cereal/metadata.xml
index cb146bb1c29d..568c4abecef7 100644
--- a/dev-haskell/cereal/metadata.xml
+++ b/dev-haskell/cereal/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A binary serialization library, similar to binary, that introduces an isolate
-		primitive for parser isolation, and replaces the asynchronous errors with a
-		user-handleable Either type.  Similar to binary in performance, but uses a
-		strict ByteString instead of a lazy ByteString, thus restricting it to
-		operating on finite inputs.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">cereal</remote-id>
+		<remote-id type="github">GaloisInc/cereal</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/certificate/Manifest b/dev-haskell/certificate/Manifest
deleted file mode 100644
index d34efbedd8e5..000000000000
--- a/dev-haskell/certificate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST certificate-1.3.9.tar.gz 15018 BLAKE2B a89c5cf680a752dbc69f7510eae10bfa1e340090b512f1341db0742d44c13c5171cdeb3b8f0352b53ebe5fb018cb957501b01ff9d297b1a67ddeaf8cce52f265 SHA512 85ad7d1f3def68152824d0be4ccc3fb991903867fac68927eac34db366ce6f8201468a3e73c336fef6feae1ce550f614fc3ab89447b4ec7a67ac279902a815f9
diff --git a/dev-haskell/certificate/certificate-1.3.9.ebuild b/dev-haskell/certificate/certificate-1.3.9.ebuild
deleted file mode 100644
index 50aa562eef6f..000000000000
--- a/dev-haskell/certificate/certificate-1.3.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Certificates and Key Reader/Writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable test"
-RESTRICT="test" # due missing tests
-
-RDEPEND=">=dev-haskell/asn1-data-0.7.1:=[profile?] <dev-haskell/asn1-data-0.8.0:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-	executable? ( dev-haskell/cmdargs:=[profile?]
-			dev-haskell/crypto-pubkey:=[profile?]
-			>=dev-haskell/text-0.11:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.9-ghc-7.10.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/certificate/files/certificate-1.3.6/Tests/Unit.hs b/dev-haskell/certificate/files/certificate-1.3.6/Tests/Unit.hs
deleted file mode 100644
index d97947f2b233..000000000000
--- a/dev-haskell/certificate/files/certificate-1.3.6/Tests/Unit.hs
+++ /dev/null
@@ -1,46 +0,0 @@
-module Tests.Unit
-	( runTests
-	) where
-
-import System.Directory
-import Test.HUnit
-import Control.Monad
-import Control.Applicative ((<$>))
-import Control.Exception
-import qualified Data.ByteString as B
-import qualified Data.ByteString.Lazy as L
-import Data.Certificate.X509
-import Data.List (isPrefixOf)
-
--- FIXME : make unit tests portable to run on osX and windows
-import System.Certificate.X509
-import Data.CertificateStore
-
-checkCert (X509 c mraw rawCert sigalg sigbits) = do
-	let errs =
-		(checkSigAlg $ certSignatureAlg c) ++
-		(checkPubKey $ certPubKey c) ++
-		(checkExtensions $ certExtensions c) ++
-		(checkBodyRaw rawCert mraw)
-	when (errs /= []) $ do
-		putStrLn ("error decoding")
-		mapM_ (putStrLn . ("  " ++))  errs
-	where
-		checkExtensions ext = []
-
-		checkSigAlg (SignatureALG_Unknown oid) = ["unknown signature algorithm " ++ show oid]
-		checkSigAlg _                          = []
-
-		checkPubKey (PubKeyUnknown oid _) = ["unknown public key alg " ++ show (certPubKey c)]
-		checkPubKey _                     = []
-
-		checkBodyRaw (Just x) (Just y) = if findsubstring y x then [] else ["cannot find body cert in original raw file"]
-		checkBodyRaw _ _  = []
-
-		findsubstring a b
-			| L.null b        = False
-			| a `L.isPrefixOf` b = True
-			| otherwise          = findsubstring a (L.drop 1 b)
-
-runTests :: IO ()
-runTests = getSystemCertificateStore >>= mapM_ checkCert . listCertificates
diff --git a/dev-haskell/certificate/files/certificate-1.3.9-ghc-7.10.patch b/dev-haskell/certificate/files/certificate-1.3.9-ghc-7.10.patch
deleted file mode 100644
index 07a53256ded8..000000000000
--- a/dev-haskell/certificate/files/certificate-1.3.9-ghc-7.10.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Data/Certificate/X509/Cert.hs b/Data/Certificate/X509/Cert.hs
-index 4abfadf..15e7bf8 100644
---- a/Data/Certificate/X509/Cert.hs
-+++ b/Data/Certificate/X509/Cert.hs
-@@ -1,2 +1,3 @@
-+{-# LANGUAGE FlexibleContexts #-}
- module Data.Certificate.X509.Cert
-         (
-diff --git a/Data/Certificate/X509/Ext.hs b/Data/Certificate/X509/Ext.hs
-index 7595f14..8963a55 100644
---- a/Data/Certificate/X509/Ext.hs
-+++ b/Data/Certificate/X509/Ext.hs
-@@ -1,2 +1,3 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -- |
- -- Module      : Data.Certificate.X509.Ext
diff --git a/dev-haskell/certificate/metadata.xml b/dev-haskell/certificate/metadata.xml
deleted file mode 100644
index 3ba11e2cb4c8..000000000000
--- a/dev-haskell/certificate/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Certificates and Key reader/writer
-		
-		At the moment only X509 certificate and unencrypted private key are supported,
-		but will include PGP certificate and pkcs8 private keys
-	</longdescription>
-	<use>
-		<flag name="executable">Build the executable</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-certificate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cgi/Manifest b/dev-haskell/cgi/Manifest
deleted file mode 100644
index fae4cc465a54..000000000000
--- a/dev-haskell/cgi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cgi-3001.1.8.3.tar.gz 21319 BLAKE2B 68bb0a52f7664830d486f5ca09713944473088372292148d52790973c401a8aae8f56915f683d3d3a483763c11981569dcfb7d41cd05532bb985ce6227490295 SHA512 421ed1a7c7548f1785a693074807fab91cdf4c86b9085a0520b0ffc6127cf53b095dfc07e6f9ed65d475445a28e485ec219d742de369e6271c0c6fe5e7599957
-DIST cgi-3001.1.8.4.tar.gz 21421 BLAKE2B fe94e59621df341d943124d66615304607803a52d4efa032c0474f187f444a919c6da636ef6861dbc65fe3de2c16d4e4e8ee449e762f7fb753cbfb11dbe2f8a7 SHA512 0ccbad2b1393cf4149c84eaf9d5601ce976998554cf9240a61a72348eee917869c7b1e00286b22dcac3280c79c551e2947c1040ddeac3c1ec91483dbe2c18ed0
-DIST cgi-3001.2.2.2.tar.gz 17270 BLAKE2B d9ba0d6bae5e93600b8d7c6f8650f726baa27f3859138a180cbbf6a708fc9c65b3fa7804d97e7b3dc33fde7e2bc84a29237e62ba85230a38d9d0b1c12ed63f70 SHA512 cc59574d6f8711977e2f733c9a58378b6775b20de1ca07fb343f6b989a787e54bbeddb76ab8f6248cf80aebf007d8c31fbfaa03bbbde503d4402a7769957126d
-DIST cgi-3001.5.0.0.tar.gz 19626 BLAKE2B a84ab0e78a7d7a4902f804501e0982bb22491aa04d28db8b10b61c9f298cd2d1383b07dd7d4e3fc35c0d3d42539fc210d0e0d9334254b5dde2cae6c6b9e07c7d SHA512 460f6d1494ac731c785b1cdffec541733639749bb1ad83605acaa52332b6c9e15a25982cdbf2bba5fcd69fa0317da832e6bf60c38642e394873eb5fa87b58881
diff --git a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
deleted file mode 100644
index 4129133a7dad..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-		dev-haskell/monadcatchio-mtl:=[profile?]
-		>=dev-haskell/mtl-1.0:=[profile?]
-		>=dev-haskell/network-2.0:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?]
-		>=dev-haskell/xhtml-3000.0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild b/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
deleted file mode 100644
index 39cfda021131..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+extensible-exceptions-in-base"
-
-RDEPEND="dev-haskell/monadcatchio-mtl:=[profile?]
-		>=dev-haskell/mtl-1.0:=[profile?]
-		>=dev-haskell/network-2.0:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?]
-		>=dev-haskell/xhtml-3000.0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		!extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-PATCHES=("${FILESDIR}"/${P}-mci.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag extensible-exceptions-in-base extensible-exceptions-in-base)
-}
diff --git a/dev-haskell/cgi/cgi-3001.1.8.4.ebuild b/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
deleted file mode 100644
index c240467466b6..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+extensible-exceptions-in-base"
-
-RDEPEND="dev-haskell/monadcatchio-mtl:=[profile?]
-		>=dev-haskell/mtl-1.0:=[profile?]
-		>=dev-haskell/network-2.0:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?]
-		>=dev-haskell/xhtml-3000.0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		!extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag extensible-exceptions-in-base extensible-exceptions-in-base)
-}
diff --git a/dev-haskell/cgi/cgi-3001.2.2.2.ebuild b/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
deleted file mode 100644
index 97ad15b31d97..000000000000
--- a/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -old-mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="<dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/mtl-2.1.3.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/mtl-compat:=
-	>=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.2:=[profile?]
-	<dev-haskell/old-locale-1.1:=[profile?]
-	<dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	local mtl_arg=()
-
-	has_version '<dev-haskell/mtl-2.2' && \
-		mtl_arg+=(--flag=old-mtl)
-
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		${mtl_arg}
-}
diff --git a/dev-haskell/cgi/cgi-3001.5.0.0.ebuild b/dev-haskell/cgi/cgi-3001.5.0.0.ebuild
deleted file mode 100644
index 816add53a854..000000000000
--- a/dev-haskell/cgi/cgi-3001.5.0.0.ebuild
+++ /dev/null
@@ -1,37 +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.1.9999
-#hackport: flags: -old-mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/exceptions-0.10:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>dev-haskell/mtl-2.2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.3:=[profile?]
-	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples install-examples) \
-		--flag=-old-mtl
-}
diff --git a/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch b/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch
deleted file mode 100644
index b672947ab1f9..000000000000
--- a/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=497496
-Gentoo-Haskell-bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/297
-diff --git a/Network/CGI/Monad.hs b/Network/CGI/Monad.hs
-index 758ab03..9c41fc3 100644
---- a/Network/CGI/Monad.hs
-+++ b/Network/CGI/Monad.hs
-@@ -119,7 +119,7 @@ catchCGI = catch
- 
- -- | Catches any exception thrown by an CGI action, and returns either
- --   the exception, or if no exception was raised, the result of the action.
--tryCGI :: (MonadCGI m, MonadCatchIO m) => m a -> m (Either SomeException a)
-+tryCGI :: (MonadCGI m, MonadCatchIO m, Functor m) => m a -> m (Either SomeException a)
- tryCGI = try
- 
- {-# DEPRECATED handleExceptionCGI "Use catchCGI instead." #-}
diff --git a/dev-haskell/cgi/metadata.xml b/dev-haskell/cgi/metadata.xml
deleted file mode 100644
index 4bd303b28a73..000000000000
--- a/dev-haskell/cgi/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a Haskell library for writing CGI programs.
-	</longdescription>
-	<use>
-		<flag name="extensible-exceptions-in-base">Required to be enabled for &gt;=dev-lang/ghc-7.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">cheecheeo/haskell-cgi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/charset/Manifest b/dev-haskell/charset/Manifest
index 501633ffcf1a..8ecabcd0e9a9 100644
--- a/dev-haskell/charset/Manifest
+++ b/dev-haskell/charset/Manifest
@@ -1 +1,2 @@
+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
diff --git a/dev-haskell/charset/charset-0.3.10.ebuild b/dev-haskell/charset/charset-0.3.10.ebuild
new file mode 100644
index 000000000000..c6a79e7e2e98
--- /dev/null
+++ b/dev-haskell/charset/charset-0.3.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Fast unicode character sets based on complemented PATRICIA tries"
+HOMEPAGE="https://github.com/ekmett/charset"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/unordered-containers-0.1.4.6:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
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 59c183ec817b..14c630323343 100644
--- a/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
+++ b/dev-haskell/charset/charset-0.3.7.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.4.5.9999
 
@@ -14,20 +14,17 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 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
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'containers           >= 0.2     && < 0.6' 'containers           >= 0.2'
-}
+CABAL_CHDEPS=(
+	'containers           >= 0.2     && < 0.6' 'containers           >= 0.2'
+)
diff --git a/dev-haskell/charset/metadata.xml b/dev-haskell/charset/metadata.xml
index b7878815d80d..7e737e501fea 100644
--- a/dev-haskell/charset/metadata.xml
+++ b/dev-haskell/charset/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">charset</remote-id>
+		<remote-id type="github">ekmett/charset</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/chaselev-deque/Manifest b/dev-haskell/chaselev-deque/Manifest
deleted file mode 100644
index 47d19abf35f4..000000000000
--- a/dev-haskell/chaselev-deque/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST chaselev-deque-0.4.tar.gz 10323 BLAKE2B b8e47560586b9fbde66be5499e1bb42d44e15c5c2992ef4f6f14653dfc6e51021377d2becace5a7b4079cd50d527c85965f5bb38872433130c65486ddfa79d27 SHA512 40145d86c4664d192eac0c264f6371b8f894b5aa0ab8d3179d6fe3b6d336f8062ebbfb83a39836069d7eb90baf2a5d7d3d75aba73adf67547a29824793084cc7
-DIST chaselev-deque-0.5.0.5.tar.gz 12451 BLAKE2B 79ee460eb84286bbbe0dcd58431d5ab0b7aef1d0d186c2c919b566c6b169ab4069917a61e8bb800af3857c7e3cca09c6f698c6f9a6b5d8efdbdd5902a7042310 SHA512 1561208ec92d7765b126684677cab02ee71bd1f7d2cdc6f2acac065972c241d085a538e14f51c87555f464aadbac2795c64f9063075acdf29217fb2d70a47dfd
diff --git a/dev-haskell/chaselev-deque/chaselev-deque-0.4.ebuild b/dev-haskell/chaselev-deque/chaselev-deque-0.4.ebuild
deleted file mode 100644
index 579684ffc118..000000000000
--- a/dev-haskell/chaselev-deque/chaselev-deque-0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Chase & Lev work-stealing lock-free double-ended queues (deques)"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree-queue/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/abstract-deque-0.2.2:=[profile?] <dev-haskell/abstract-deque-0.3:=[profile?]
-	>=dev-haskell/atomic-primops-0.4:=[profile?] <dev-haskell/atomic-primops-0.5:=[profile?]
-	dev-haskell/bits-atomic:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		--disable-tests
-}
diff --git a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
deleted file mode 100644
index 19f6bb3bb585..000000000000
--- a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Chase & Lev work-stealing lock-free double-ended queues (deques)"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?]
-	>=dev-haskell/atomic-primops-0.5.0.2:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/abstract-deque-tests-0.3
-		dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/chaselev-deque/metadata.xml b/dev-haskell/chaselev-deque/metadata.xml
deleted file mode 100644
index 9f0030f4e5fd..000000000000
--- a/dev-haskell/chaselev-deque/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Chase &amp; Lev work-stealing lock-free double-ended queues (deques).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/chasingbottoms/Manifest b/dev-haskell/chasingbottoms/Manifest
index 62e67f66f976..bb336afe7388 100644
--- a/dev-haskell/chasingbottoms/Manifest
+++ b/dev-haskell/chasingbottoms/Manifest
@@ -1,5 +1 @@
-DIST ChasingBottoms-1.3.0.11.tar.gz 31437 BLAKE2B 9db3ffe3b2c6d896138d826b093678988685a078f29cd4b03365d7860238ff309c9f50a5729a5347eb927005f5be0bc58e109e5435489eb8307d919265675add SHA512 acf939e4060b08a02fd1bd15473911551e834373b8e4e50f36cd832b64ec3798e9a41d3b26fdc9e9b84648862617da8ba859ee453086240f566ce4ae8bc0301e
-DIST ChasingBottoms-1.3.0.13.tar.gz 31474 BLAKE2B dcb059a1501933e477d09ecaba51b08aa30cf9ec97370e6c0d7f01c358b6a2c8c62a3529ccf8d39b6790bfafcc66acd7f1c089cfc5c5e6e176c7572c136da138 SHA512 050d66670a77de274f16d70dfbc231ab469067ce34af962a851c7f041b7e0812bb6480e3b3166e4ceda2509454ff3d1d85fdd977f63471d6f45c1162184aeb7d
-DIST ChasingBottoms-1.3.0.14.tar.gz 31485 BLAKE2B de7f8ec14712d7ae534de4b98d417c6939e837968a0c7575068dd222aeff5b2ea62f9edc5b5f6e31f266beee71dd2916787d687923acbde88f207fa8c47542e3 SHA512 672dbfb236b14cedd7c0039476c7d799b1718843336a60905816faf6f5d80491eaef59bdf4a8b000f0104ab452760964b64c5f09293535d517b3a33e6d382e13
-DIST ChasingBottoms-1.3.1.2.tar.gz 31555 BLAKE2B 106413449aaa4d88e140be3692a4eb37d340e6d73e91166e0da8ce1b9477e8868fa975e57e14642d01fcb2474df6d3d653cc617ab3b387f279d7a2560764680d SHA512 84d05b26916bda14bd0b33ff90154da88b5a8c01cae692a8cc11339aea2259b8d0001f3c3b21199ef59efbfb028dfd877f11f8543b55828ecf563f7c5cd711e0
-DIST ChasingBottoms-1.3.1.9.tar.gz 31942 BLAKE2B b94cb27358a1af57e2617ac5b967826d1f20709817622e9c8619fdc8270eb0fc12ea8630f06f012d657f03bded69231ba86039bb07d2ffd4ed3b52ae95c0bc28 SHA512 15b05c3080e7e5960d9f84d4c3a3941a08a8f15a4c8241f7fee11f24054e09092925093f88bdd7ac38eedc57a02fa76c468e61c5ad08cb0c599a2a01bbe6b88b
+DIST chasingbottoms-1.3.1.12.tar.gz 31960 BLAKE2B 0183ef16bcb79f545c97d0a18972fb5fcf964a1255b83b8f202ae96a3211b2cc07ecbc9c808200bdb887b7db8571acb7619e6ad62f8b8c3be0ef8699b635b699 SHA512 601a577ff45cb5565397fcc428073b7ce2c9a9e033950adb5af67977c719f83ce4fe2be378280108406ad2b9d436bd3e8d15e4b82846ffd8b881151fbe5941ed
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild
deleted file mode 100644
index 072ba8a49080..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="https://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # takes a lot
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.1 && < 2.8' 'QuickCheck >= 2.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.13.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.13.ebuild
deleted file mode 100644
index c966652c1544..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="https://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # takes a lot
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.14.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.14.ebuild
deleted file mode 100644
index ee6938784410..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="https://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild
new file mode 100644
index 000000000000..c85440c46263
--- /dev/null
+++ b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+#hackport: flags: -build-tests
+
+CABAL_PN="ChasingBottoms"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="For testing partial and infinite values"
+HOMEPAGE="https://hackage.haskell.org/package/ChasingBottoms"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-build-tests
+}
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild
deleted file mode 100644
index c396c5d5e4e4..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="https://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.10:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.0 && < 4.10' 'base >= 4.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild
deleted file mode 100644
index 34dd21581270..000000000000
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -build-tests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ChasingBottoms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="For testing partial and infinite values"
-HOMEPAGE="http://hackage.haskell.org/package/ChasingBottoms"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/quickcheck-2.10:2=[profile?] <dev-haskell/quickcheck-2.15:2=[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-7.6.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-build-tests
-}
diff --git a/dev-haskell/chasingbottoms/metadata.xml b/dev-haskell/chasingbottoms/metadata.xml
index ec83e2946e46..f316b3e95e8b 100644
--- a/dev-haskell/chasingbottoms/metadata.xml
+++ b/dev-haskell/chasingbottoms/metadata.xml
@@ -1,102 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Do you ever feel the need to test code involving bottoms (e.g. calls to
-		the @error@ function), or code involving infinite values? Then this
-		library could be useful for you.
-		
-		It is usually easy to get a grip on bottoms by showing a value and
-		waiting to see how much gets printed before the first exception is
-		encountered. However, that quickly gets tiresome and is hard to automate
-		using e.g. QuickCheck
-		(&lt;http://www.cse.chalmers.se/~rjmh/QuickCheck/&gt;). With this library you
-		can do the tests as simply as the following examples show.
-		
-		Testing explicitly for bottoms:
-		
-		[@&gt; isBottom (head [\])@] @True@
-		
-		[@&gt; isBottom bottom@] @True@
-		
-		[@&gt; isBottom (\\_ -&gt; bottom)@] @False@
-		
-		[@&gt; isBottom (bottom, bottom)@] @False@
-		
-		Comparing finite, partial values:
-		
-		[@&gt; ((bottom, 3) :: (Bool, Int)) ==! (bottom, 2+5-4)@] @True@
-		
-		[@&gt; ((bottom, bottom) :: (Bool, Int)) &lt;! (bottom, 8)@] @True@
-		
-		Showing partial and infinite values (@\\\/!@ is join and @\/\\!@ is meet):
-		
-		[@&gt; approxShow 4 $ (True, bottom) \\\/! (bottom, \'b\')@] @\"Just (True, \'b\')\"@
-		
-		[@&gt; approxShow 4 $ (True, bottom) \/\\! (bottom, \'b\')@] @\"(_|_, _|_)\"@
-		
-		[@&gt; approxShow 4 $ ([1..\] :: [Int\])@] @\"[1, 2, 3, _\"@
-		
-		[@&gt; approxShow 4 $ (cycle [bottom\] :: [Bool\])@] @\"[_|_, _|_, _|_, _\"@
-		
-		Approximately comparing infinite, partial values:
-		
-		[@&gt; approx 100 [2,4..\] ==! approx 100 (filter even [1..\] :: [Int\])@] @True@
-		
-		[@&gt; approx 100 [2,4..\] \/=! approx 100 (filter even [bottom..\] :: [Int\])@] @True@
-		
-		The code above relies on the fact that @bottom@, just as @error
-		\"...\"@, @undefined@ and pattern match failures, yield
-		exceptions. Sometimes we are dealing with properly non-terminating
-		computations, such as the following example, and then it can be nice to
-		be able to apply a time-out:
-		
-		[@&gt; timeOut' 1 (reverse [1..5\])@] @Value [5,4,3,2,1]@
-		
-		[@&gt; timeOut' 1 (reverse [1..\])@] @NonTermination@
-		
-		The time-out functionality can be used to treat \"slow\" computations as
-		bottoms:
-		
-		[@&gt; let tweak = Tweak &amp;#x7b; approxDepth = Just 5, timeOutLimit = Just 2 &amp;#x7d;@]
-		
-		[@&gt; semanticEq tweak (reverse [1..\], [1..\]) (bottom :: [Int\], [1..\] :: [Int\])@] @True@
-		
-		[@&gt; let tweak = noTweak &amp;#x7b; timeOutLimit = Just 2 &amp;#x7d;@]
-		
-		[@&gt; semanticJoin tweak (reverse [1..\], True) ([\] :: [Int\], bottom)@] @Just ([],True)@
-		
-		This can of course be dangerous:
-		
-		[@&gt; let tweak = noTweak &amp;#x7b; timeOutLimit = Just 0 &amp;#x7d;@]
-		
-		[@&gt; semanticEq tweak (reverse [1..100000000\]) (bottom :: [Integer\])@] @True@
-		
-		Timeouts can also be applied to @IO@ computations:
-		
-		[@&gt; let primes = unfoldr (\\(x:xs) -&gt; Just (x, filter ((\/= 0) . (\`mod\` x)) xs)) [2..\]@]
-		
-		[@&gt; timeOutMicro 100 (print $ filter ((== 1) . (\`mod\` 83)) primes)@] @[167,499,9NonTermination@
-		
-		[@&gt; timeOutMicro 100 (print $ take 6 $ filter ((== 1) . (\`mod\` 83)) primes)@] @[167,499,997,1163,1993NonTermination@
-		
-		[@&gt; timeOutMicro 100 (print $ take 6 $ filter ((== 1) . (\`mod\` 83)) primes)@] @[167,499,997,1163,1993,2657]@
-		
-		[@ @] @Value ()@
-		
-		For the underlying theory and a larger example involving use of
-		QuickCheck, see the article \"Chasing Bottoms, A Case Study in Program
-		Verification in the Presence of Partial and Infinite Values\"
-		(&lt;http://www.cse.chalmers.se/~nad/publications/danielsson-jansson-mpc2004.html&gt;).
-		
-		The code has been tested using GHC. Most parts can probably be
-		ported to other Haskell compilers, but this would require some work.
-		The @TimeOut@ functions require preemptive scheduling, and most of
-		the rest requires @Data.Generics@; @isBottom@ only requires
-		exceptions, though.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">ChasingBottoms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/chell-quickcheck/Manifest b/dev-haskell/chell-quickcheck/Manifest
deleted file mode 100644
index f630f34459d2..000000000000
--- a/dev-haskell/chell-quickcheck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST chell-quickcheck-0.2.5.tar.gz 2450 BLAKE2B 97620bd1d8411cb1ac612615cdf3eed168c718257ca00e6777086590ce861147a56fc6113040bdaeea5dfbd0856cd66c401e2308af968c85148a6d5607e0f925 SHA512 df2ae72b51c7999fa6febbb9b72637d6fd63f2c31de94de37c51fc1691de6047e1f5b29be60175dd9677fd8190759400c1eeada0602532e2840bce1c36529fd7
diff --git a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild b/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild
deleted file mode 100644
index 4c59cf4c17ca..000000000000
--- a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Chell testing library"
-HOMEPAGE="https://john-millikin.com/software/chell/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-QC-2.9.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.3 && < 2.9' 'QuickCheck >= 2.3'
-}
diff --git a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild b/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild
deleted file mode 100644
index 8d28fac6bd23..000000000000
--- a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Chell testing library"
-HOMEPAGE="https://john-millikin.com/software/chell/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/chell-quickcheck/files/chell-quickcheck-0.2.5-QC-2.9.patch b/dev-haskell/chell-quickcheck/files/chell-quickcheck-0.2.5-QC-2.9.patch
deleted file mode 100644
index 50a2d07f3caa..000000000000
--- a/dev-haskell/chell-quickcheck/files/chell-quickcheck-0.2.5-QC-2.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/lib/Test/Chell/QuickCheck.hs b/lib/Test/Chell/QuickCheck.hs
-index 56cbd04..c630320 100644
---- a/lib/Test/Chell/QuickCheck.hs
-+++ b/lib/Test/Chell/QuickCheck.hs
-@@ -103,5 +103,3 @@ maxDiscardedTests :: QuickCheck.Testable prop => QuickCheck.Args -> prop -> Int
- #if MIN_VERSION_QuickCheck(2,5,0)
--maxDiscardedTests args p = if QuickCheck.exhaustive p
--	then QuickCheck.maxDiscardRatio args
--	else QuickCheck.maxDiscardRatio args * QuickCheck.maxSuccess args
-+maxDiscardedTests args _ = QuickCheck.maxDiscardRatio args * QuickCheck.maxSuccess args
- #else
diff --git a/dev-haskell/chell-quickcheck/metadata.xml b/dev-haskell/chell-quickcheck/metadata.xml
deleted file mode 100644
index 7e621418d8d3..000000000000
--- a/dev-haskell/chell-quickcheck/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		QuickCheck support for the Chell testing library
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/chell/Manifest b/dev-haskell/chell/Manifest
index 42630a128c40..92abca271534 100644
--- a/dev-haskell/chell/Manifest
+++ b/dev-haskell/chell/Manifest
@@ -1,2 +1,2 @@
-DIST chell-0.4.0.1.tar.gz 12441 BLAKE2B 450827af0cfe005b6c6c17e59229d7aceef6b4609b9c81672829d4c4818e5d9ab03752e6b44efc73fd0a614c881e0326faec881613e8f2ce68c75bcbd1e06e69 SHA512 5a11e38fdd6c4f323d077dc3adc35c9626229a49f6ed32a0202031094f2612ec3e26a28f96819366439c1ec97ddfd839050f207d03c90a749890ef2bb345b8c3
 DIST chell-0.4.0.2.tar.gz 12424 BLAKE2B 2e525ecacd0f703a873b89afce7c62937634021e65a54ce901b4b50e535131e1fb831173e4d2b3d52ff351df09eaa386377052b35c7e70c75028b59c87ee21ab SHA512 050c5818ad2cd954ef79b230de2f03fdfb19e99c8624a24bb7845bb20e3b5d5d427a9623491ffc706c5635f545eb99466bde7a851c4344d11df1a70bfb2bbe22
+DIST chell-0.5.0.2.tar.gz 13331 BLAKE2B 3a59f49b5117696290484ece6dad73a3b834a4fdddb62f7ef2f5b27d554a938b47dfc6da616a9d284e15412ca7428aab81371018f559a6c302b1c69e167b3111 SHA512 e2b0cd829882f1c7b18dd2e0ea036b0de27cf859864184ae4b95939d3a5c946e2aa140a49e6596f65326468016de2deb0582428db89893a1b893f25f789c2220
diff --git a/dev-haskell/chell/chell-0.4.0.1.ebuild b/dev-haskell/chell/chell-0.4.0.1.ebuild
deleted file mode 100644
index d01416bb654b..000000000000
--- a/dev-haskell/chell/chell-0.4.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple and intuitive library for automated testing"
-HOMEPAGE="https://john-millikin.com/software/chell/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+color-output"
-
-RDEPEND=">=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?]
-	>=dev-haskell/patience-0.1:=[profile?] <dev-haskell/patience-0.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	color-output? ( >=dev-haskell/ansi-terminal-0.5:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag color-output color-output)
-}
diff --git a/dev-haskell/chell/chell-0.4.0.2.ebuild b/dev-haskell/chell/chell-0.4.0.2.ebuild
index 943fe30556b8..ca08b3a947e4 100644
--- a/dev-haskell/chell/chell-0.4.0.2.ebuild
+++ b/dev-haskell/chell/chell-0.4.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.4.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+color-output"
 
 RDEPEND=">=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?]
@@ -28,11 +28,9 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 "
 
-src_prepare() {
-	cabal_chdeps \
-		'ansi-terminal >= 0.5 && < 0.8' 'ansi-terminal >= 0.5'
-	default
-}
+CABAL_CHDEPS=(
+	'ansi-terminal >= 0.5 && < 0.8' 'ansi-terminal >= 0.5'
+)
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/chell/chell-0.5.0.2.ebuild b/dev-haskell/chell/chell-0.5.0.2.ebuild
new file mode 100644
index 000000000000..985d88859ab1
--- /dev/null
+++ b/dev-haskell/chell/chell-0.5.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A simple and intuitive library for automated testing"
+HOMEPAGE="https://github.com/typeclasses/chell"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+color-output"
+
+CABAL_CHDEPS=(
+	'base ^>= 4.16 || ^>= 4.17 || ^>= 4.18' 'base >= 4.14 && < 5'
+	'bytestring ^>= 0.11.4 || ^>= 0.12' 'bytestring >= 0.10'
+	'template-haskell ^>=2.18 || ^>= 2.19 || ^>= 2.20' 'template-haskell >= 2.16'
+	'text ^>= 1.2.5 || ^>= 2.0' 'text >= 1.2'
+	'transformers ^>= 0.5.6 || ^>= 0.6' 'transformers >= 0.5.6'
+)
+
+RDEPEND="
+	>=dev-haskell/options-1.2.1:=[profile?] <dev-haskell/options-1.3:=[profile?]
+	>=dev-haskell/patience-0.3:=[profile?] <dev-haskell/patience-0.4:=[profile?]
+	>=dev-haskell/random-1.2.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	color-output? (
+		>=dev-haskell/ansi-terminal-1.0:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag color-output color-output)
+}
diff --git a/dev-haskell/chell/metadata.xml b/dev-haskell/chell/metadata.xml
index bc57a63871b2..231ab15f33f1 100644
--- a/dev-haskell/chell/metadata.xml
+++ b/dev-haskell/chell/metadata.xml
@@ -1,48 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Chell is a simple and intuitive library for automated testing. It natively
-		supports assertion-based testing, and can use companion libraries
-		such as @chell-quickcheck@ to support more complex testing strategies.
-		
-		An example test suite, which verifies the behavior of artithmetic operators.
-		
-		@
-		&amp;#x7b;-\# LANGUAGE TemplateHaskell \#-&amp;#x7d;
-		
-		import Test.Chell
-		
-		tests_Math :: Suite
-		tests_Math = suite \"math\"
-		&amp;#x20;   test_Addition
-		&amp;#x20;   test_Subtraction
-		
-		test_Addition :: Test
-		test_Addition = assertions \"addition\" $ do
-		&amp;#x20;   $expect (equal (2 + 1) 3)
-		&amp;#x20;   $expect (equal (1 + 2) 3)
-		
-		test_Subtraction :: Test
-		test_Subtraction = assertions \"subtraction\" $ do
-		&amp;#x20;   $expect (equal (2 - 1) 1)
-		&amp;#x20;   $expect (equal (1 - 2) (-1))
-		
-		main :: IO ()
-		main = defaultMain [tests_Math]
-		@
-		
-		@
-		$ ghc --make chell-example.hs
-		$ ./chell-example
-		PASS: 2 tests run, 2 tests passed
-		@
-	</longdescription>
 	<use>
 		<flag name="color-output">use colors in program output</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">chell</remote-id>
+		<remote-id type="github">typeclasses/chell</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/chunked-data/Manifest b/dev-haskell/chunked-data/Manifest
deleted file mode 100644
index 98c3440b2ffd..000000000000
--- a/dev-haskell/chunked-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST chunked-data-0.1.0.1.tar.gz 4815 BLAKE2B 5446228f7625618cd98b92eedea5218255e599a336d61ab3e716e23321384feca59e626caba4a26a5eadcf1082ff2a1bf3c17be4a8d19c03afbd315f5f7be51b SHA512 c976a73d508f4fe5689e49945a07174a8aa7ac05afdc302b7b6dd6746c8d6158d8092fdd25d42a83a9bd47014326a5d9d322b21f65fe2af5a4684f39714beb3e
-DIST chunked-data-0.3.0.tar.gz 4349 BLAKE2B f2392f2ba4bdc3f3cccd7a2a45be51e70da388be39ff35fc7688c9825c70c058c03f80252ffad388d0f5768bd941aa9d04024bf2b511439fac7d6298b7d1a76a SHA512 cbce790f1898b2aed6309d8eee14c3461bf99e8adbb27bfb563be86ccbcb3f4b3bca55e82b71e87c2b451ccad829cd4cf276c5b1a40934f32b065e176bbb5617
diff --git a/dev-haskell/chunked-data/chunked-data-0.1.0.1.ebuild b/dev-haskell/chunked-data/chunked-data-0.1.0.1.ebuild
deleted file mode 100644
index 91a4050b4d7d..000000000000
--- a/dev-haskell/chunked-data/chunked-data-0.1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses for dealing with various chunked data representations"
-HOMEPAGE="https://github.com/fpco/chunked-data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/mono-traversable-0.2:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/system-filepath:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/chunked-data/chunked-data-0.3.0.ebuild b/dev-haskell/chunked-data/chunked-data-0.3.0.ebuild
deleted file mode 100644
index b92e3e687386..000000000000
--- a/dev-haskell/chunked-data/chunked-data-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses for dealing with various chunked data representations"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/chunked-data/metadata.xml b/dev-haskell/chunked-data/metadata.xml
deleted file mode 100644
index b7a4384c75f4..000000000000
--- a/dev-haskell/chunked-data/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Originally present in classy-prelude.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/chunked-data</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-aes/Manifest b/dev-haskell/cipher-aes/Manifest
index 353a7adeb685..8f2c870d63b3 100644
--- a/dev-haskell/cipher-aes/Manifest
+++ b/dev-haskell/cipher-aes/Manifest
@@ -1,2 +1 @@
 DIST cipher-aes-0.2.11.tar.gz 33939 BLAKE2B 98f065baeea41684fe3a59366dba70ffac2f7539710e67648952820e38affb12588b471070def1b4f2bc0c9a6f9ad1155bd22c6182db384cc0349ddb8945a854 SHA512 d0c9b94e93903d0a3ea5587a4ac4ee5124b5189842070dd11c99182ba7396c982aa8c3eae2f8a1fd5b906f8ab3306e4b49ae9276a837e871278d6fe591bbd816
-DIST cipher-aes-0.2.5.tar.gz 29934 BLAKE2B 7b588a8284335f072dc3be65170f5a8727ea3f7ab08251298d19183b619a2c33158bae3100e77b1e9465cd3ece01dbde8af920e7f540e59ec9b4a58c7043ea30 SHA512 61a3ebcf02c9a6bb2a6ad0386414003922355bc76cdce7df915c2fe98fc1a647cf8a0a950155482564b8310c76b7b0612320e8c586c1dc08be27317dd80537e7
diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
index 24980eb9266e..4b6f18c5f6af 100644
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
+++ b/dev-haskell/cipher-aes/cipher-aes-0.2.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: support_aesni:cpu_flags_x86_aes
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="cpu_flags_x86_aes cpu_flags_x86_ssse3"
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild
deleted file mode 100644
index d36c0eae5d57..000000000000
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast AES cipher implementation with advanced mode of operations"
-HOMEPAGE="https://github.com/vincenthz/hs-cipher-aes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/crypto-cipher-tests
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-aes/metadata.xml b/dev-haskell/cipher-aes/metadata.xml
index f8871dfd2dce..ba307631f883 100644
--- a/dev-haskell/cipher-aes/metadata.xml
+++ b/dev-haskell/cipher-aes/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Fast AES cipher implementation with advanced mode of operations
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-cipher-aes</remote-id>
 	</upstream>
diff --git a/dev-haskell/cipher-aes128/Manifest b/dev-haskell/cipher-aes128/Manifest
deleted file mode 100644
index f4340e1ff714..000000000000
--- a/dev-haskell/cipher-aes128/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cipher-aes128-0.7.0.5.tar.gz 26228 BLAKE2B 8ef1aa343563d7889154b5f0b96b5b457ed21afbcad4f90f82e95a080c19f50d8ad2500ef4b8caa1509ca953aba3ca1941c61656417ed527943858a9d6cfd652 SHA512 8479dec68d6fa35e8d615bcc8c6336459fa537f1962b7af87e63b0c38d544ed26e6d30e980f90bb3585513bd618e01330d3e008e77404dae8d2e27954d7a535a
diff --git a/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild b/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild
deleted file mode 100644
index fea7988f16ec..000000000000
--- a/dev-haskell/cipher-aes128/cipher-aes128-0.7.0.5-r1.ebuild
+++ /dev/null
@@ -1,41 +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
-#hackport: flags: -test,-halvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="AES and common modes using AES-NI when available"
-HOMEPAGE="https://github.com/TomMD/cipher-aes128"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	>=dev-haskell/crypto-api-0.13:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-3.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'Cabal >= 1.10 && < 3.1' 'Cabal >= 1.10 && < 3.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-halvm \
-		--flag=-test
-}
diff --git a/dev-haskell/cipher-aes128/metadata.xml b/dev-haskell/cipher-aes128/metadata.xml
deleted file mode 100644
index 3c77a6d727ea..000000000000
--- a/dev-haskell/cipher-aes128/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cipher-aes128 is an implementation of AES and common modes of operation.  It borrows Hanquez's C AES code (see 'cipher-aes') but
-		is unique due to including compile-time detection of
-		NI compiler support, a slightly more functional interface
-		for GCM operations, exposure of 'Ptr' based operations via the .Internal module, and build-in crypto-api support.
-		Cipher-aes128 was originally developed as "'cipher-aes' plus trampolines", which has since been adopted into cipher-aes.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-blowfish/Manifest b/dev-haskell/cipher-blowfish/Manifest
deleted file mode 100644
index 44b42f24bd37..000000000000
--- a/dev-haskell/cipher-blowfish/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cipher-blowfish-0.0.3.tar.gz 12876 BLAKE2B 56eb4c925055b8ddac187ad36a7f1fb2f28ff337812eef81fadeb5cd519df6fdd8e41b0047d4e15eea5e567c0440ca5c5c9fb65887b3687d85f9a8fae68308fe SHA512 5fcccde71c1324b34e54c01c41d878150ab8db48728d1bfc21406eda58e4a363de8397f395eaa25a6fb26e4d8c95683abafe0c6bf42d7853db07d768ed245cc0
diff --git a/dev-haskell/cipher-blowfish/cipher-blowfish-0.0.3.ebuild b/dev-haskell/cipher-blowfish/cipher-blowfish-0.0.3.ebuild
deleted file mode 100644
index fabcfa72dc54..000000000000
--- a/dev-haskell/cipher-blowfish/cipher-blowfish-0.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Blowfish cipher"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/crypto-cipher-tests
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-blowfish/metadata.xml b/dev-haskell/cipher-blowfish/metadata.xml
deleted file mode 100644
index 61f93ec8edbc..000000000000
--- a/dev-haskell/cipher-blowfish/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Blowfish cipher primitives
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-camellia/Manifest b/dev-haskell/cipher-camellia/Manifest
deleted file mode 100644
index f24cf7f59ce8..000000000000
--- a/dev-haskell/cipher-camellia/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cipher-camellia-0.0.2.tar.gz 6230 BLAKE2B d40fc1cc549d6150a10154fc68e134dbad0c451a60632be081e94c95b75053ff64a26ffca7fc899b3df88294341b4a9f209e10ac91f39de368dd3466cf017717 SHA512 d3094d2b190023b6afbab20f7d1c01826f56b7c99ea0c9613fcb14c8d3f3f3c3e16b57c2643a9df2bcf12cc97596cd32dd717fedf81fd84a9cdb9f46f308e130
diff --git a/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild b/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild
deleted file mode 100644
index 93acb1fa79c1..000000000000
--- a/dev-haskell/cipher-camellia/cipher-camellia-0.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Camellia block cipher primitives"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/crypto-cipher-tests
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-camellia/metadata.xml b/dev-haskell/cipher-camellia/metadata.xml
deleted file mode 100644
index cdc15b1eda25..000000000000
--- a/dev-haskell/cipher-camellia/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Camellia block cipher primitives
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-des/Manifest b/dev-haskell/cipher-des/Manifest
deleted file mode 100644
index d6e5a5d5e294..000000000000
--- a/dev-haskell/cipher-des/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cipher-des-0.0.6.tar.gz 7857 BLAKE2B 333c629ba2e4c9ca80d3caf29400e805abd774a23f9823fbededc74e3997602702b78066034e24d32313a42e7409d430835f918e1c8c5baf62ef404fe9792f91 SHA512 290b72fb9d6da58450e43742b313ff295cf3bf88242de33069e3183df7f726b69174dae35572a3d7d3a356aef4d4067104c41c1bd06fead8fec227ff92ba10c9
diff --git a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild b/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
deleted file mode 100644
index 29d6d770a2e1..000000000000
--- a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DES and 3DES primitives"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/crypto-cipher-tests
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-des/metadata.xml b/dev-haskell/cipher-des/metadata.xml
deleted file mode 100644
index 431c6a3f3e39..000000000000
--- a/dev-haskell/cipher-des/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		DES and 3DES primitives
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-rc4/Manifest b/dev-haskell/cipher-rc4/Manifest
deleted file mode 100644
index 8a0dab908592..000000000000
--- a/dev-haskell/cipher-rc4/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cipher-rc4-0.1.4.tar.gz 4315 BLAKE2B 1af510c3689d578efcd84830a9d0cbebefcb6c78436be384fc73367d62b559ad0bba77b767a106cf97928cccfc282f85b4e8d16fdeb348cad913dccf78a2e735 SHA512 68415b4327371b4ea6fec9064f76c3a3372e223c3c717ee066941823cbbcdc50a7cd02c3fa7268dce4128e7b088e8a88012dd8478126d3f9d6a4e5b99f990d95
diff --git a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild b/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
deleted file mode 100644
index d75de3ee2005..000000000000
--- a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast RC4 cipher implementation"
-HOMEPAGE="https://github.com/vincenthz/hs-cipher-rc4"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.5:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/crypto-cipher-tests-0.0.7
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-rc4/metadata.xml b/dev-haskell/cipher-rc4/metadata.xml
deleted file mode 100644
index 1f72d7ba0f75..000000000000
--- a/dev-haskell/cipher-rc4/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast RC4 cipher implementation
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cipher-rc4</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/citeproc-hs/Manifest b/dev-haskell/citeproc-hs/Manifest
deleted file mode 100644
index eabd7c2b4145..000000000000
--- a/dev-haskell/citeproc-hs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST citeproc-hs-0.3.10.tar.gz 115588 BLAKE2B f4b62c40dfe8abaa2eded4d2440915670cd1903eb326f86f3451764ef249ff1226facd77d2b68f2f875460f3beeabc07dd3c231f47581d57d867c77fafa4d81c SHA512 961c97fb82a0d497946695ef71dcbf0072dd9522a0f3b8e44975348b9ccf3ee703e2923408b3c3f1c58de04665418f54b95773865ed9cb16ad31a548a18b8b6f
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild
deleted file mode 100644
index cdef1f881ffb..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://istitutocolli.org/repos/citeproc-hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode-collation"
-
-RDEPEND="dev-haskell/json:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.8:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	embed-data-files? ( dev-haskell/file-embed:=[profile?] )
-	hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
-	!hexpat? ( dev-haskell/xml:=[profile?] )
-	network? ( >=dev-haskell/http-4000.0.9:=[profile?]
-			>=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	unicode-collation? ( dev-haskell/text:=[profile?]
-				dev-haskell/text-icu:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-	epatch "${FILESDIR}"/${P}-pandoc-1.16.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		$(cabal_flag small-base small_base) \
-		$(cabal_flag unicode-collation unicode_collation)
-}
diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
deleted file mode 100644
index 0ea6ce4e4313..000000000000
--- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval.hs	2015-03-17 21:32:38.000000000 +1100
-+++ citeproc-hs-0.3.10/src/Text/CSL/Eval.hs	2015-04-04 11:18:45.018893632 +1100
-@@ -1,4 +1,5 @@
- {-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval
---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval/Names.hs	2015-03-17 21:32:38.000000000 +1100
-+++ citeproc-hs-0.3.10/src/Text/CSL/Eval/Names.hs	2015-04-04 11:18:28.823909497 +1100
-@@ -1,4 +1,5 @@
- {-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval.Names
---- citeproc-hs-0.3.10-orig/src/Text/CSL/Test.hs	2015-03-17 21:32:38.000000000 +1100
-+++ citeproc-hs-0.3.10/src/Text/CSL/Test.hs	2015-04-04 11:21:42.164719120 +1100
-@@ -29,7 +29,9 @@
- import Data.Maybe (isJust)
- import Data.Time
- import System.Directory
-+#if !MIN_VERSION_time(1,5,0)
- import System.Locale
-+#endif
- 
- import Text.ParserCombinators.Parsec
- 
diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch
deleted file mode 100644
index ab95388748d4..000000000000
--- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/citeproc-hs.cabal b/citeproc-hs.cabal
-index 542f893..606ec05 100644
---- a/citeproc-hs.cabal
-+++ b/citeproc-hs.cabal
-@@ -119,3 +119,3 @@ library
-     build-depends:    containers, directory, mtl, json, utf8-string,
--                      bytestring, filepath, pandoc-types >= 1.8 && < 1.13
-+                      bytestring, filepath, pandoc-types >= 1.8
- 
-diff --git a/src/Text/CSL/Output/Pandoc.hs b/src/Text/CSL/Output/Pandoc.hs
-index 0f2cdfb..74e698f 100644
---- a/src/Text/CSL/Output/Pandoc.hs
-+++ b/src/Text/CSL/Output/Pandoc.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE PatternGuards, DeriveDataTypeable #-}
-+{-# LANGUAGE PatternGuards, DeriveDataTypeable, CPP #-}
- -----------------------------------------------------------------------------
-@@ -78,2 +78,10 @@ tailFO (f:fs)
- 
-+#if MIN_VERSION_pandoc_types(1,16,0)
-+#    define P16_ATTRS nullAttr
-+#    define P16_ATTRS_ _attrs
-+#else
-+#    define P16_ATTRS
-+#    define P16_ATTRS_
-+#endif
-+
- renderFo :: Style -> FormattedOutput -> [Inline]
-@@ -85,3 +93,3 @@ renderFo sty fo
-     | FO     fm xs <- fo = toPandoc fm $ rest xs
--    | FUrl u fm    <- fo = toPandoc fm [Link (toStr $ snd u) u]
-+    | FUrl u fm    <- fo = toPandoc fm [Link P16_ATTRS (toStr $ snd u) u]
-     | otherwise = []
-@@ -109,3 +117,3 @@ renderFo sty fo
-       setCase' f i
--          | Link s r <- i = Link (map (setCase f) s) r
-+          | Link P16_ATTRS_ s r <- i = Link P16_ATTRS_ (map (setCase f) s) r
-           | otherwise     = setCase f i
-@@ -148,3 +156,3 @@ renderFo sty fo
-       rmZeros = dropWhile (== '0')
--      escape s x = Link x (s,s) -- we use a link to store some data
-+      escape s x = Link P16_ATTRS x (s,s) -- we use a link to store some data
- 
-@@ -181,3 +189,4 @@ clean s b (i:is)
-     | Strong      x <- i = split (isLink' "strong"  ) (return . Strong     ) x ++ clean s b is
--    | Link      x t <- i = clean' s b (Link x t : clean s b is)
-+    | Link P16_ATTRS_ x t <- i = clean'
-+                                        s b (Link P16_ATTRS_ x t : clean s b is)
-     | otherwise          = clean' s b (i        : clean s b is)
-@@ -185,10 +194,10 @@ clean s b (i:is)
-       unwrap f ls
--          | Link x _ : _ <- ls = clean' s b x
--          |        _ : _ <- ls = f ls
-+          | Link P16_ATTRS_ x _ : _ <- ls = clean' s b x
-+          |                   _ : _ <- ls = f ls
-           | otherwise          = []
-       isLink l il
--          | Link _ (x,y) <- il = x == l && x == y
-+          | Link P16_ATTRS_ _ (x,y) <- il = x == l && x == y
-           | otherwise          = False
-       isLink' l il
--          | Link _ (x,y) <- il = (x == l || x == "nodecor") && x == y
-+          | Link P16_ATTRS_ _ (x,y) <- il = (x == l || x == "nodecor") && x == y
-           | otherwise          = False
-@@ -201,3 +210,3 @@ clean' _ _   []  = []
- clean' s b (i:is)
--    | Link inls (y,z) <- i, y == "inquote"
-+    | Link P16_ATTRS_ inls (y,z) <- i, y == "inquote"
-     , y == z    = case headInline is of
-@@ -235,7 +244,7 @@ flipFlop (i:is)
-             reverseEmph' e
--                | bo, Emph inls <- e = Link (reverseEmph False inls) ("emph","emph")
-+                | bo, Emph inls <- e = Link P16_ATTRS (reverseEmph False inls) ("emph","emph")
-                 | Emph     inls <- e = Emph (reverseEmph True  inls)
--                | Link ls (x,y) <- e = if x == "nodecor" && x == y
--                                       then Link ls ("emph","emph")
--                                       else e
-+                | Link P16_ATTRS_ ls (x,y) <- e = if x == "nodecor" && x == y
-+                                                  then Link P16_ATTRS_ ls ("emph","emph")
-+                                                  else e
-                 | otherwise          = e
-@@ -244,7 +253,7 @@ flipFlop (i:is)
-             reverseStrong' e
--                | bo, Strong inls <- e = Link   (reverseStrong False inls) ("strong","strong")
-+                | bo, Strong inls <- e = Link P16_ATTRS  (reverseStrong False inls) ("strong","strong")
-                 | Strong     inls <- e = Strong (reverseStrong True  inls)
--                | Link   ls (x,y) <- e = if x == "nodecor" && x == y
--                                         then Link ls ("strong","strong")
--                                         else e
-+                | Link P16_ATTRS_  ls (x,y) <- e = if x == "nodecor" && x == y
-+                                                     then Link P16_ATTRS_ ls ("strong","strong")
-+                                                     else e
-                 | otherwise            = e
-@@ -306,3 +315,3 @@ initInline (i:[])
-     | Strikeout   is <- i = return $ Strikeout   (initInline is)
--    | Link      is t <- i = return $ Link        (initInline is) t
-+    | Link P16_ATTRS_ is t <- i = return $ Link P16_ATTRS_ (initInline is) t
-     | otherwise           = []
-@@ -336,3 +345,3 @@ mapHeadInline f (i:xs)
-     | Strikeout   is <- i = Strikeout   (mapHeadInline f is)   : xs
--    | Link      is t <- i = Link        (mapHeadInline f is) t : xs
-+    | Link P16_ATTRS_ is t <- i = Link P16_ATTRS_ (mapHeadInline f is) t : xs
-     | otherwise           = i : xs
-@@ -348,3 +357,3 @@ getInline i
-     | SmallCaps   is <- i = is
--    | Link      is _ <- i = is
-+    | Link P16_ATTRS_ is _ <- i = is
-     | otherwise           = []
-diff --git a/src/Text/CSL/Test.hs b/src/Text/CSL/Test.hs
-index 1a470cf..2d9befa 100644
---- a/src/Text/CSL/Test.hs
-+++ b/src/Text/CSL/Test.hs
-@@ -166,2 +166,8 @@ pandocBib s
- 
-+#if MIN_VERSION_pandoc_types(1,16,0)
-+#    define P16_ATTRS_ _attrs
-+#else
-+#    define P16_ATTRS_
-+#endif
-+
- pandocToHTML :: [Inline] -> String
-@@ -179,3 +185,3 @@ pandocToHTML (i:xs)
-                               SingleQuote -> "‘" ++ pandocToHTML is ++ "’" ++ pandocToHTML xs
--    | Link     is x  <- i = case snd x of
-+    | Link P16_ATTRS_ is x  <- i = case snd x of
-                               "emph"     -> "<span style=\"font-style:normal;\">" ++
diff --git a/dev-haskell/citeproc-hs/metadata.xml b/dev-haskell/citeproc-hs/metadata.xml
deleted file mode 100644
index 9c951e54db57..000000000000
--- a/dev-haskell/citeproc-hs/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
-		<flag name="embed-data-files">Embed locale files into the library (needed for windows packaging)</flag>
-		<flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag>
-		<flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
-		<flag name="small-base">Choose the new smaller, split-up base package.</flag>
-		<flag name="unicode-collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
-	</use>
-	<longdescription>
-		citeproc-hs is a library for rendering
-		bibliographic reference citations into a variety
-		of styles using a macro language called Citation
-		Style Language (CSL). More details on CSL can be
-		found here:
-		&lt;http://citationstyles.org/&gt;.
-		
-		For the API documentation please see "Text.CSL".
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/citeproc/Manifest b/dev-haskell/citeproc/Manifest
new file mode 100644
index 000000000000..557496d77e0d
--- /dev/null
+++ b/dev-haskell/citeproc/Manifest
@@ -0,0 +1,2 @@
+DIST citeproc-0.7.tar.gz 528208 BLAKE2B 9ad395c2c3ba7bc957554b37af1a514c3deb3247a55a41b35c88b25f25db474043d18de5909e67ac5723fbfb0a5ed8161a16eb851f59c5648cfa3b30149c46fe SHA512 e24675c0d9227bd6ff5f13788c251647df1e61a65a1b0fe94d80c0bf064bd3018285ace6397d0c5f2b5d6e4ee9b91de8b90e6e4251e9914fb8fcbf58ed3c4539
+DIST citeproc-0.8.1.tar.gz 549947 BLAKE2B 055ec6466ec96cd44bf64d3cb9a9f92c5f9e825aaab93147905d3a69c5040807c1bf048196cede7d341608c96b39d9054545987b9de11be622aad6176895805e SHA512 7bce91a19e8db475b7c0c7f1f324e356dfb895fddc575b59d3fcdb8955b1ee17a82d3943edc383669a7bb5cc9fb14b3ff1cea766a2d322157017a97acddeee32
diff --git a/dev-haskell/citeproc/citeproc-0.7.ebuild b/dev-haskell/citeproc/citeproc-0.7.ebuild
new file mode 100644
index 000000000000..343d4f47a2ba
--- /dev/null
+++ b/dev-haskell/citeproc/citeproc-0.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generates citations and bibliography from CSL styles"
+HOMEPAGE="https://hackage.haskell.org/package/citeproc"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable icu"
+
+# Many tests for this package are known to fail and this is acceptable for
+# upstream:
+# <https://github.com/jgm/citeproc#known-bugs-and-limitations>
+# The author seems to know which tests are expected to fail, but I
+# can't find documentation for exactly which ones.
+RESTRICT="test"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	>=dev-haskell/base-compat-0.10:=[profile?]
+	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	dev-haskell/file-embed:=[profile?]
+	>=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	>=dev-haskell/unicode-collation-0.1.3:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+	dev-haskell/uniplate:=[profile?]
+	dev-haskell/vector:=[profile?]
+	dev-haskell/xml-conduit:=[profile?]
+	>=dev-lang/ghc-8.6.5:=
+	executable? ( dev-haskell/aeson-pretty:=[profile?] )
+	icu? ( >=dev-haskell/text-icu-0.7.1.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/diff-0.4
+		dev-haskell/timeit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		$(cabal_flag icu icu)
+}
diff --git a/dev-haskell/citeproc/citeproc-0.8.1.ebuild b/dev-haskell/citeproc/citeproc-0.8.1.ebuild
new file mode 100644
index 000000000000..2aa2e572cfc2
--- /dev/null
+++ b/dev-haskell/citeproc/citeproc-0.8.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generates citations and bibliography from CSL styles"
+HOMEPAGE="https://hackage.haskell.org/package/citeproc"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable icu"
+
+# Many tests for this package are known to fail and this is acceptable for
+# upstream:
+# <https://github.com/jgm/citeproc#known-bugs-and-limitations>
+# The author seems to know which tests are expected to fail, but I
+# can't find documentation for exactly which ones.
+RESTRICT="test"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/data-default-0.5.2:=[profile?]
+	dev-haskell/file-embed:=[profile?]
+	>=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/unicode-collation-0.1.3:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+	dev-haskell/uniplate:=[profile?]
+	dev-haskell/vector:=[profile?]
+	dev-haskell/xml-conduit:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	executable? ( dev-haskell/aeson-pretty:=[profile?] )
+	icu? ( >=dev-haskell/text-icu-0.7.1.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/diff-0.4
+		dev-haskell/timeit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		$(cabal_flag icu icu)
+}
diff --git a/dev-haskell/citeproc/metadata.xml b/dev-haskell/citeproc/metadata.xml
new file mode 100644
index 000000000000..0066044cfb40
--- /dev/null
+++ b/dev-haskell/citeproc/metadata.xml
@@ -0,0 +1,16 @@
+<?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>
+	<use>
+		<flag name="executable">Build citeproc executable</flag>
+		<flag name="icu">Use Haskell bindings to the ICU library</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">citeproc</remote-id>
+		<remote-id type="github">jgm/citeproc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/classy-prelude/Manifest b/dev-haskell/classy-prelude/Manifest
deleted file mode 100644
index 2926eaaf1d4f..000000000000
--- a/dev-haskell/classy-prelude/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST classy-prelude-0.10.2.tar.gz 9730 BLAKE2B bbc5d9d70f0d90b86b9aaeb25234bcf4720f87c95097d0b2a664d1529fa911936d308fdc40b82126c6ab265c40238f8395263f2e816068ffe83bd69d0a2f4878 SHA512 dd75cdc4cfc522c3c86191ef7495bebebb4ac4a33c5100f723d1d8c789167ef670bb789e2fdfe7c3cb412f54cb61c9e53955e0c4f149272cf9a92f7d9095c9ab
-DIST classy-prelude-0.12.0.tar.gz 10148 BLAKE2B d0218386c954adddcbe1e4162bbdd97025ace4a2414715139c88950c4e558c51701a348a5823b13d4866f11fc49bf9b6263f620aec7e35e28b58fb229c5d9f98 SHA512 cbb9cbedbecd15b9c9e179c18a5b53949cfa416bcbe1fef4cfa380a3f785b9696e6c5a8ad1d1373c588a3c1095c625d7d68018e351bba169e368480aafd32888
-DIST classy-prelude-0.12.7.tar.gz 10737 BLAKE2B a46a1e72a741022ca538db0c5a27c4c1220cb30c8a58d9b3fcfb94bfa9fba1534c1ed8dc111fa024f50ed6df4aaceaa73b0742f38acb34f3957d91a03cb435a1 SHA512 39dd412a0b9d1d30eaf08e246ef2a5636e5e16ed0859d61db8ee3fbd119fa07d6955221a77485d02e0358da52048f673ea74b52a470ba204be7e09562193f072
-DIST classy-prelude-0.5.8.tar.gz 16700 BLAKE2B 7e6256901fb1952515d133e9f502a2f51c9aea30e273382fcfb60be909da6231aba3325e92bf545b37e88bf22cfacb6ed8d34fef7e73288eb36f472de3d59827 SHA512 27b23aeae6f53f2bbf4c310c9b6f89a5e150a172f03afbc11aa5f3d4a7d3ff1edaa125e7f191f0fe394f1e01b37337a32304ca8a6c7ef6403c095826556f0996
-DIST classy-prelude-0.5.9.tar.gz 17632 BLAKE2B 358709599c9f561044b7829ef7c6cb797aa085d2b4273141f09db9b59537416def03b6c2266f63a2f4dc852125ef9fa45e62833ad0b0c0ecd9c2642525d0d069 SHA512 4938b83b77923eec8a52a14d253a21800afbf83bf9413e11bebf963beaca11a520a7f9cefeb7827590e65d050df772222cbb004fa70e1b08767c7f4658980ea6
-DIST classy-prelude-0.6.0.tar.gz 9852 BLAKE2B 19e486e95902df93d3e13baf8dff3fafc8871d9681485083b562de1e190c419d6754745a7425e66d416b9bcaf0becb17aa6db6c89962ea7efcf7c0cb55569fa3 SHA512 2903147a27c34c1c72022e61a89b26e8a64a4247af1c1ad0120434766c6a186c8e743794ce954519c5a6d8fabf98dbb02a584cbdf9325666af8c7c45e7eef877
-DIST classy-prelude-0.8.0.1.tar.gz 8750 BLAKE2B 5eae77d218783e634887b71d1dde12ee227a00192b1ee62bf3d5f28f095bae9af530f4ddcb4e649443b9c256be79f9e6cbf6af2ddca1898f38c98c12831e08ca SHA512 2c2cc5e4faac8169f970c001158865b760324ff743c3fcf0f183625bf432db6a22c89002a849e7996c42e6bfcd27d253760a921ded84b4bef537d969bbdfd604
-DIST classy-prelude-0.9.2.tar.gz 9333 BLAKE2B 7156ea43d2f075f54b571116d341a1ead418d38e4115a538b91f5e34d55a7daa66ffcc21c5e6b28aee41e5a23e10843ea8f43d261f236c3484aedcd857247600 SHA512 8cda5453fefde018a1a15f6c42f650a035a734741e83078e1a7a8426aaa6c80342b4b13e389096278fa9df018892bd22aebef924dfa06e0c5a206a9815f56d6e
-DIST classy-prelude-1.0.2.tar.gz 11404 BLAKE2B 46ca086079734c35200021a0efd66962a7c88459cb869c61313766895e29eccf668d03e839b822c8d47cba29493d0f44620d929686c0af501745fe165c34fd73 SHA512 859602dea474c49307041dda9c79eb1fb01178c9f6136c754008392969ca6d09e3a9a4a3177615ffbe39553ea421d0f94fd97474c2b11b4937decbeeab42d444
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.10.2.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.10.2.ebuild
deleted file mode 100644
index f1904f7e4f81..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.3.10:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.6.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
deleted file mode 100644
index 21601f64b8c6..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.5:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	>=dev-haskell/dlist-0.7:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.9.1:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/time-locale-compat:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-mt-0.9.3.patch
-}
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.12.7.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.12.7.ebuild
deleted file mode 100644
index 6b08cef869e8..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.12.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.6:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	>=dev-haskell/dlist-0.7:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.9.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/time-locale-compat:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.5.8.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.5.8.ebuild
deleted file mode 100644
index 440cf6383dd8..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.5.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.3.4:=[profile?]
-		<dev-haskell/basic-prelude-0.4:=[profile?]
-		dev-haskell/hashable:=[profile?]
-		>=dev-haskell/lifted-base-0.2:=[profile?]
-		dev-haskell/monad-control:=[profile?]
-		=dev-haskell/system-filepath-0.4*:=[profile?]
-		dev-haskell/text:=[profile?]
-		dev-haskell/transformers:=[profile?]
-		dev-haskell/unordered-containers:=[profile?]
-		dev-haskell/vector:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-		)"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.5.9.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.5.9.ebuild
deleted file mode 100644
index 8b3bdee861cf..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.5.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0:=[profile?]
-		>=dev-haskell/basic-prelude-0.3.4:=[profile?]
-		<dev-haskell/basic-prelude-0.4:=[profile?]
-		dev-haskell/hashable:=[profile?]
-		>=dev-haskell/lifted-base-0.2:=[profile?]
-		dev-haskell/monad-control:=[profile?]
-		=dev-haskell/system-filepath-0.4*:=[profile?]
-		dev-haskell/text:=[profile?]
-		dev-haskell/transformers:=[profile?]
-		dev-haskell/unordered-containers:=[profile?]
-		dev-haskell/vector:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-		)"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.6.0.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.6.0.ebuild
deleted file mode 100644
index 5fcf3f027f78..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.6.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0:=[profile?]
-	>=dev-haskell/basic-prelude-0.3.6:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mono-traversable:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.8.0.1.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.8.0.1.ebuild
deleted file mode 100644
index 88d3c0b230b5..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.8.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.3.6:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.3:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
-
-src_prepare() {
-	# don't let builds hang
-	[[ $(ghc-version) == 7.6.* ]] && replace-hcflags -O[2-9] -O1
-}
diff --git a/dev-haskell/classy-prelude/classy-prelude-0.9.2.ebuild b/dev-haskell/classy-prelude/classy-prelude-0.9.2.ebuild
deleted file mode 100644
index ccc5cb3f2bd6..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-0.9.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/classy-prelude"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basic-prelude-0.3.8:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?]
-	dev-haskell/chunked-data:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-0.6:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/classy-prelude-1.0.2.ebuild b/dev-haskell/classy-prelude/classy-prelude-1.0.2.ebuild
deleted file mode 100644
index 3bd40ec0f490..000000000000
--- a/dev-haskell/classy-prelude/classy-prelude-1.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass-based Prelude"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/basic-prelude-0.4:=[profile?] <dev-haskell/basic-prelude-0.7:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	>=dev-haskell/chunked-data-0.3:=[profile?]
-	>=dev-haskell/dlist-0.7:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/lifted-async-0.3:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/monad-unlift-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-1.0:=[profile?]
-	dev-haskell/mono-traversable-instances:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/mutable-containers-0.3:=[profile?] <dev-haskell/mutable-containers-0.4:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/safe-exceptions-0.1.1:=[profile?]
-	dev-haskell/say:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/stm-chans-3:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/time-locale-compat:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch b/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
deleted file mode 100644
index 17cddcd3975c..000000000000
--- a/dev-haskell/classy-prelude/files/classy-prelude-0.12.0-mt-0.9.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-https://bugs.gentoo.org/575244
-diff --git a/ClassyPrelude.hs b/ClassyPrelude.hs
-index a6c0db4..27173aa 100644
---- a/ClassyPrelude.hs
-+++ b/ClassyPrelude.hs
-@@ -193,3 +193,3 @@ import Data.ChunkedZip
- import qualified Data.Char as Char
--import Data.Sequences hiding (elem)
-+import Data.Sequences hiding (elem, intercalate)
- import Data.MonoTraversable
diff --git a/dev-haskell/classy-prelude/metadata.xml b/dev-haskell/classy-prelude/metadata.xml
deleted file mode 100644
index d246f7a45985..000000000000
--- a/dev-haskell/classy-prelude/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Focuses on using common typeclasses when possible, and creating new ones to avoid name clashing. Exposes many recommended datastructures (Map, ByteString, etc) directly without requiring long import lists and qualified modules.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/classy-prelude</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/clientsession/Manifest b/dev-haskell/clientsession/Manifest
index 843948494495..20798dab030f 100644
--- a/dev-haskell/clientsession/Manifest
+++ b/dev-haskell/clientsession/Manifest
@@ -1,2 +1 @@
-DIST clientsession-0.9.1.1.tar.gz 7928 BLAKE2B f947dc1945f887fbb20227294b4c264366bfcc0d8ef415a11536f83d41d07186c70dbde616dabff99f1e0b3b06422c1c7810780d01ae4c9ece154b8566eee973 SHA512 dae2c63fe20bfaf3b6521dbfb48d6b79254d5365903766e75406dec94325572c22dbf85cdbf9dc6abe6c6a7dc496436a5d46a16826036de71b2a5f58eec53e62
 DIST clientsession-0.9.1.2.tar.gz 7991 BLAKE2B 368276fbb8356dbb3aefa4705401e1d621bff7c5647be312cff0e6366de0c34478d7a558be1001a5a86d88c0821bb715a414d1bf2c0996426fc3bcedc825c2c5 SHA512 27b44924843363f86b7c27aec1a73e8d74fcf42075cbe45ded4f26d690eb086bac0a4091e66bbdcb431c090aed0ddb64384ca6c555b8ba4c7372f1c42117587a
diff --git a/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild
deleted file mode 100644
index eeee5b2fe72a..000000000000
--- a/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Securely store session data in a client-side cookie"
-HOMEPAGE="https://github.com/yesodweb/clientsession/tree/master"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/cipher-aes-0.1.7:=[profile?]
-	>=dev-haskell/cprng-aes-0.2:=[profile?]
-	>=dev-haskell/crypto-api-0.8:=[profile?]
-	dev-haskell/crypto-random:=[profile?]
-	>=dev-haskell/entropy-0.2.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/transformers )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
index 30215ce18ea1..8fffed17f39f 100644
--- a/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
+++ b/dev-haskell/clientsession/clientsession-0.9.1.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-# ebuild generated by hackport 0.5.9999
+# ebuild generated by hackport 0.7.9999
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Securely store session data in a client-side cookie"
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
@@ -27,14 +27,13 @@ RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
 	dev-haskell/setenv:=[profile?]
 	>=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?]
 	>=dev-haskell/tagged-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/hspec-1.3
 		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/transformers )
+		>=dev-haskell/quickcheck-2 )
 "
 
 src_configure() {
diff --git a/dev-haskell/clientsession/metadata.xml b/dev-haskell/clientsession/metadata.xml
index 32fb1787e3a3..e1556303461f 100644
--- a/dev-haskell/clientsession/metadata.xml
+++ b/dev-haskell/clientsession/metadata.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Achieves security through AES-CTR encryption and
-		Skein-MAC-512-256 authentication.  Uses Base64
-		encoding to avoid any issues with characters.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">yesodweb/clientsession</remote-id>
 	</upstream>
diff --git a/dev-haskell/clock/Manifest b/dev-haskell/clock/Manifest
index 0fefbd0eb92e..c3a4c3b08e76 100644
--- a/dev-haskell/clock/Manifest
+++ b/dev-haskell/clock/Manifest
@@ -1,3 +1,2 @@
-DIST clock-0.4.1.3.tar.gz 5084 BLAKE2B 9e560ec6f62dc968e4482ff253430c35b52bc81e0bd2287907a493d85038a7af6f4a6e7ed42f9bf5b8af2f1c0f12bfb093bb8b57bd2e94c1be39f2dc78570226 SHA512 515b5393e4db132a0cc201031f79d871b3e91d058fc59dd97d96e013d2d9b59cfc75ca76723d2dd90795bb855daf5b09f5b57384a75cfcf9251f41e3434eae35
-DIST clock-0.5.1.tar.gz 6720 BLAKE2B 0516afe7a2e4711d46453792e3fa40dba0eb32db47675e5c18c0adbad26d0369a22ae4b325bbd268d9abd9e9e8ef5a2e722c3eda5c10b793011685bc19e03576 SHA512 767ee279453838af962392a0d9f05e385d20877af79cd95f0444f6adbdec6cf14f7a6f60933df1ccd9e964725b057ecbc869ae270225adf495a87ec4c09a80b2
 DIST clock-0.7.2.tar.gz 7465 BLAKE2B 209e720ba6e856fb5e56cc2d2dd48aa4e7b63ab15f356bcddbd5ee0936495a158ecd2c1cbdf9ce54ed89bcbd047091b3a515bcb04b6a30796bc9d659d610f187 SHA512 cf44dfca6c0825a003018c68266ef0fe503a9b147aaf784435f6297b365c6d18fc71b63b77a23ee2a3298ace638a35de0c6118e361d43b418a45d4fdd24d57cf
+DIST clock-0.8.3.tar.gz 9099 BLAKE2B 4bbe0c68c76339f16af45424a9aa3698ee8c6b743c4e4cc6e38cab2e69ad1e0094e6bdb335a589a9fe496d4c4d4a0dfe49b1d08f66aa13910b474dda319d0bc1 SHA512 86424c9593b9851a3c59ceb23a1665526a0f7e47a18322aa772feff2babb8799c1c2187005639882e4a1553cc327e78a25e85ebe87dec6de17cad050b526ff6f
diff --git a/dev-haskell/clock/clock-0.4.1.3.ebuild b/dev-haskell/clock/clock-0.4.1.3.ebuild
deleted file mode 100644
index b947e1d23d59..000000000000
--- a/dev-haskell/clock/clock-0.4.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
-HOMEPAGE="https://corsis.github.com/clock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-llvm
-}
diff --git a/dev-haskell/clock/clock-0.5.1.ebuild b/dev-haskell/clock/clock-0.5.1.ebuild
deleted file mode 100644
index bc1ebec752a4..000000000000
--- a/dev-haskell/clock/clock-0.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
-HOMEPAGE="https://github.com/corsis/clock"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/tasty-0.10
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-llvm
-}
diff --git a/dev-haskell/clock/clock-0.7.2.ebuild b/dev-haskell/clock/clock-0.7.2.ebuild
index ee39489573f7..b96ef2d8ce38 100644
--- a/dev-haskell/clock/clock-0.7.2.ebuild
+++ b/dev-haskell/clock/clock-0.7.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.4.7.9999
 #hackport: flags: -llvm
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depends
 inherit haskell-cabal
 
 DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT=test # circular depend: tasty->clock[test]->tasty
@@ -24,8 +24,6 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/tasty-0.10
-		dev-haskell/tasty-quickcheck )
 "
 
 src_configure() {
diff --git a/dev-haskell/clock/clock-0.8.3.ebuild b/dev-haskell/clock/clock-0.8.3.ebuild
new file mode 100644
index 000000000000..297b45081c79
--- /dev/null
+++ b/dev-haskell/clock/clock-0.8.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -llvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="High-resolution clock functions: monotonic, realtime, cputime"
+HOMEPAGE="https://github.com/corsis/clock"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/tasty-0.10
+		dev-haskell/tasty-quickcheck
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-llvm
+}
diff --git a/dev-haskell/clock/metadata.xml b/dev-haskell/clock/metadata.xml
index 9ebb335e7125..695bb9d2cd91 100644
--- a/dev-haskell/clock/metadata.xml
+++ b/dev-haskell/clock/metadata.xml
@@ -1,34 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A package for convenient access to high-resolution
-		clock and timer functions of different operating
-		systems.
-		
-		It is planned to consist of two layers. The lower
-		layer will provide direct access to OS-specific
-		clock and timer functions like clock_gettime of
-		Posix or GetTickCount of Windows and its upper
-		layer shall then provide a common API for all
-		supported systems. Currently only the lower level
-		is being developed.
-		
-		
-		POSIX reference: IEEE Std 1003.1-2008
-		&lt;http://www.opengroup.org/onlinepubs/9699919799/&gt;,
-		&lt;http://www.opengroup.org/onlinepubs/9699919799/functions/clock_getres.html#&gt;
-		
-		WINDOWS reference: ...
-		
-		For more information, see:
-		&lt;http://corsis.sourceforge.net/index.php/Haskell/Clock&gt;
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">clock</remote-id>
 		<remote-id type="github">corsis/clock</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cmark-gfm/Manifest b/dev-haskell/cmark-gfm/Manifest
deleted file mode 100644
index 4358152281e7..000000000000
--- a/dev-haskell/cmark-gfm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cmark-gfm-0.2.1.tar.gz 200812 BLAKE2B aab0142db460139392fa1922bbf090b0222c039f3795e28c1b91024ca9c159cc977a5be645f91f94a0d147a8713c770e4608a6504b68c10263dfe46f2605b84f SHA512 46c0847608f741df689e5b213ecd023bedc4c79ee9b91bff55eae11ad600b248e5816b7c259d5c862b3c9742c6f5d08b16d1a6cf1b8724f7831e77788d4df70d
diff --git a/dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild b/dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild
deleted file mode 100644
index ee7ace0f10f7..000000000000
--- a/dev-haskell/cmark-gfm/cmark-gfm-0.2.1.ebuild
+++ /dev/null
@@ -1,32 +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.1.9999
-#hackport: flags: -pkgconfig
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate GitHub Flavored Markdown parser and renderer"
-HOMEPAGE="https://github.com/kivikakk/cmark-gfm-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-pkgconfig
-}
diff --git a/dev-haskell/cmark-gfm/metadata.xml b/dev-haskell/cmark-gfm/metadata.xml
deleted file mode 100644
index 9b006da16c9b..000000000000
--- a/dev-haskell/cmark-gfm/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides Haskell bindings for
-		&lt;https://github.com/github/cmark libcmark-gfm&gt;, the reference
-		parser for &lt;https://github.github.com/gfm/ GitHub Flavored Markdown&gt;, a fully
-		specified variant of Markdown. It includes sources for
-		libcmark-gfm (0.28.0) and does not require prior installation of the
-		C library.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cmark/Manifest b/dev-haskell/cmark/Manifest
deleted file mode 100644
index f20464d0dce6..000000000000
--- a/dev-haskell/cmark/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cmark-0.3.4.tar.gz 148195 BLAKE2B e4fc584ae8d29dc15e68307136d8686104a93f7a5cce41b2c746d3124da419095e0b977186a3c56f73c7bfefb4761933c58d04af89e1fa478277c2e20f691b15 SHA512 1491d671ad98af061beee31f22d4d7e73ce4090342f34713848d26fbabefb8367d8bd2686814659ef36e49b2298967ce06e41ac5d7cbd13dcce27e4fe5ce7895
-DIST cmark-0.4.0.1.tar.gz 175936 BLAKE2B 5a2acd868e4b8ca629fed8423e2faf6ba02e6f9ee2fc6799058a569cf907c741a7ffdaf790900cfa81f9086e7cb13520e423dc645e0669b54e1d66ed18aed443 SHA512 8dee17ab09d377de762579eb75c61fd1cd3e7c928d57f42b636d391b78b9e0b9ddf58e50f84a35a76eecce6763332f58cd1170df041b811f9b6f113daaa1c9be
-DIST cmark-0.5.5.tar.gz 169719 BLAKE2B 42886efdfb30c1efc983d6085ba3cafcab1353148ac96f2970c3d824ea29690ab86b923f61098446de97705e4d79504892decc3b34b259b8e7982cc149ce7102 SHA512 1c1929f78ce669c0eee20693eeec2a21bfdb49850d92db7a71a1e29164c09fc29bac000d921a5186c1662a6eaf168d7d1df0dc2d02f7d7ccb04763de23e6099f
-DIST cmark-0.5.6.tar.gz 170850 BLAKE2B 21ef603e6edd25545f0a51ff534aab8c7762ec1353c1b0349101217e42c09e3c0b33f99119831f09f9db20df9efb0e984420ef431c85a44c68f1580c02e009f3 SHA512 ba9ae5268c1d55123754e7b0c5f73c5134fa1d57a7a624e865c5c9690f073d9db9e6f1b7bc5fea86305d3a72a7af371a22f12fcce4ccbe9fd2942ba1d3677835
-DIST cmark-0.6.tar.gz 169132 BLAKE2B d6c72aa17216f89e90a269d2fcd6639f25ac2e9aa02a0799108a85247b5ccb5211ee02dc078cdbccfbd6295705799d5b49e2af70d50cd6a791fbf4ddcea70a01 SHA512 35d2851bb1d3305000527cfce81253c9492a3e3205e73418fe42fcc9f8e5f8e396a7ecf81ad4a003a2dd4a571c4f7d051bc6812c07a5c79dc30eac1d45fca4f5
diff --git a/dev-haskell/cmark/cmark-0.3.4.ebuild b/dev-haskell/cmark/cmark-0.3.4.ebuild
deleted file mode 100644
index 5ee4921b3acc..000000000000
--- a/dev-haskell/cmark/cmark-0.3.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 )
-"
diff --git a/dev-haskell/cmark/cmark-0.4.0.1.ebuild b/dev-haskell/cmark/cmark-0.4.0.1.ebuild
deleted file mode 100644
index 5ee4921b3acc..000000000000
--- a/dev-haskell/cmark/cmark-0.4.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/commonmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 )
-"
diff --git a/dev-haskell/cmark/cmark-0.5.5.ebuild b/dev-haskell/cmark/cmark-0.5.5.ebuild
deleted file mode 100644
index 331e379a58ad..000000000000
--- a/dev-haskell/cmark/cmark-0.5.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -pkgconfig
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/cmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-pkgconfig
-}
diff --git a/dev-haskell/cmark/cmark-0.5.6.ebuild b/dev-haskell/cmark/cmark-0.5.6.ebuild
deleted file mode 100644
index 746d622583f3..000000000000
--- a/dev-haskell/cmark/cmark-0.5.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-#hackport: flags: pkgconfig:system-cmark
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/cmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-cmark"
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-cmark? ( app-text/cmark )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
-	system-cmark? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag system-cmark pkgconfig)
-}
diff --git a/dev-haskell/cmark/cmark-0.6.ebuild b/dev-haskell/cmark/cmark-0.6.ebuild
deleted file mode 100644
index ebd870a5758e..000000000000
--- a/dev-haskell/cmark/cmark-0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: pkgconfig:system-cmark
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, accurate CommonMark (Markdown) parser and renderer"
-HOMEPAGE="https://github.com/jgm/cmark-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="system-cmark"
-
-RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-cmark? ( app-text/cmark )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
-	system-cmark? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag system-cmark pkgconfig)
-}
diff --git a/dev-haskell/cmark/metadata.xml b/dev-haskell/cmark/metadata.xml
deleted file mode 100644
index 2d92a8edfc92..000000000000
--- a/dev-haskell/cmark/metadata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name='system-cmark'>use <pkg>app-text/cmark</pkg> instead of bundled copy</flag>
-	</use>
-	<longdescription>
-		This package provides Haskell bindings for
-		&lt;https://github.com/jgm/cmark libcmark&gt;, the reference
-		parser for &lt;http://commonmark.org CommonMark&gt;, a fully
-		specified variant of Markdown. It includes sources for
-		libcmark (0.19.0) and does not require prior installation of the
-		C library.
-		
-		cmark provides the following advantages over existing
-		Markdown libraries for Haskell:
-		
-		-   Speed: Conversion speed is on par with the
-		&lt;https://hackage.haskell.org/package/sundown sundown&gt;
-		library. We were unable to measure precisely
-		against
-		&lt;https://hackage.haskell.org/package/sundown sundown&gt;,
-		which raised a malloc error when compiled into our
-		benchmark suite. Relative to other implementations:
-		cmark was 82 times faster than
-		&lt;https://hackage.haskell.org/package/cheapskate cheapskate&gt;,
-		59 times faster than
-		&lt;https://hackage.haskell.org/package/markdown markdown&gt;,
-		105 times faster than
-		&lt;https://hackage.haskell.org/package/pandoc pandoc&gt;,
-		and 2.8 times faster than
-		&lt;https://hackage.haskell.org/package/discount discount&gt;.
-		
-		-   Memory footprint: Memory footprint is on par with
-		&lt;https://hackage.haskell.org/package/sundown sundown&gt;.
-		On one sample, the library uses a fourth the memory that
-		&lt;https://hackage.haskell.org/package/markdown markdown&gt;
-		uses, and less than a tenth the memory that
-		&lt;https://hackage.haskell.org/package/pandoc pandoc&gt;
-		uses.
-		
-		-   Robustness: cmark can handle whatever is thrown
-		at it, without the exponential blowups in parsing
-		time one can sometimes get with other libraries.
-		(The input @bench\/full-sample.md@, for example,
-		causes both
-		&lt;https://hackage.haskell.org/package/pandoc pandoc&gt;
-		and
-		&lt;https://hackage.haskell.org/package/markdown markdown&gt;
-		to grind to a halt.)
-		
-		-   Accuracy: cmark passes the CommonMark spec\'s
-		suite of over 500 conformance tests.
-		
-		-   Standardization: Since there is a spec and a
-		comprehensive suite of tests, we can have a high
-		degree of confidence that any two CommonMark
-		implementations will behave the same. Thus, for
-		example, one could use this library for server-side
-		rendering and
-		&lt;https://github.com/jgm/commonmark.js commonmark.js&gt;
-		for client-side previewing.
-		
-		-   Ease of installation: cmark is portable and has
-		minimal dependencies.
-		
-		cmark does not provide Haskell versions of the whole
-		&lt;https://github.com/jgm/cmark libcmark&gt; API, which is
-		built around mutable @cmark_node@ objects. Instead, it
-		provides functions for converting CommonMark to HTML
-		(and other formats), and a function for converting
-		CommonMark to a @Node@ tree that can be processed
-		further using Haskell.
-		
-		A note on security: This library does not attempt
-		to sanitize HTML output. We recommend using
-		&lt;https://hackage.haskell.org/package/xss-sanitize xss-sanitize&gt;
-		to filter the output.
-		
-		A note on stability: There is a good chance the API
-		will change significantly after this early release.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jgm/commonmark-hs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cmdargs/Manifest b/dev-haskell/cmdargs/Manifest
index b02eb38dfe21..20c948578523 100644
--- a/dev-haskell/cmdargs/Manifest
+++ b/dev-haskell/cmdargs/Manifest
@@ -1,4 +1,2 @@
-DIST cmdargs-0.10.13.tar.gz 64008 BLAKE2B 64108321d1acc028c8fe74deb8674005c25117599c8d960edc8d2717dd63ce0b71f73de26306e247cdcba2d83d03049e8e81cbe6e7c0597cd93dae8d03bf9997 SHA512 d4d0b93ca19b9ecdcea472b38b836c254a5e8a5ffe488c95d98f16395579483993fe0f7266d80771b85f1ed4683e34a6a3b493fe8e23595c1ba4db68a8daa0df
-DIST cmdargs-0.10.14.tar.gz 64056 BLAKE2B f31e52471a3f27e93fdcab68a8fb559e595f3799a8c166d882f343962af99dc453cb9d25923e0fc93c9433cd0f7974ddd72a6e3bb693401c8a9e34844d42573e SHA512 82a53fcecd42c9f1307e3e5bb1a8d490d53dda7243afe92fbda75d00dc6b638f6477591f4ebe98f1d576a623a8f5c111c8ff4d738466467f5579caa80ec6af15
 DIST cmdargs-0.10.20.tar.gz 64550 BLAKE2B 08511df092c2a7010af94bc8d9b54b29c0e76c33be06a9521eccc85092b57a45ae9f9d22b0f8e81266073c81185b66266d1f2321c327ae730c6ccebea7f6d6cf SHA512 b9e270aa5dabd84eaaa47b95a450ef5b5f43cd19646f2a407579f855857d396e5ab9ca0038e1e876849a596ecb8cdc9964c45970825a0a95021d69b23699da79
-DIST cmdargs-0.10.7.tar.gz 61526 BLAKE2B ba9e6d639218576f0c576c93c4932fb9f7a5e15273df388798e582e6b3e3751e8e1d8e03c814114ff614f49fea5c9680a1b7b46ab9d8e1fcd934db8760ed6967 SHA512 b9091e4f708db1e7c8bac367c4faad5c311a3194aefbf2776316b4ecc559314f01ceb0102df007819996b00200c5300e5b56e1035d45561e924bbfc3b38b656a
+DIST cmdargs-0.10.22.tar.gz 65154 BLAKE2B a6f05c4a186dc4dbb9de3c754f9100138d3954b1537b1ecb81e2fec2c6bd293dd381a2a666dae0bcbbc631e9ab95d8a65d85d68d3e2c80bb2d6ad87baf9906b1 SHA512 571d9584769fdb5bb77a57607c2f432b365604a2ca2e9b5c044c319499004f7fcb12f2f6e61091a245f1bf6a5d321d38ade1a54d5bc86831136fa85b9b898faa
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.13.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.13.ebuild
deleted file mode 100644
index 391c694ed9a5..000000000000
--- a/dev-haskell/cmdargs/cmdargs-0.10.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Command line argument processing"
-HOMEPAGE="http://community.haskell.org/~ndm/cmdargs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+quotation testprog"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag quotation quotation) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.14.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.14.ebuild
deleted file mode 100644
index 59be217865c0..000000000000
--- a/dev-haskell/cmdargs/cmdargs-0.10.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Command line argument processing"
-HOMEPAGE="https://github.com/ndmitchell/cmdargs#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+quotation testprog"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag quotation quotation) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
index 15cd81e1e236..082cc75e06aa 100644
--- a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
+++ b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+quotation testprog"
 
 RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?]
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.22.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.22.ebuild
new file mode 100644
index 000000000000..2ce0041ab470
--- /dev/null
+++ b/dev-haskell/cmdargs/cmdargs-0.10.22.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: testprog:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Command line argument processing"
+HOMEPAGE="https://github.com/ndmitchell/cmdargs#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples +quotation"
+REQUIRED_USE="examples? ( quotation )"
+
+CABAL_CHDEPS=(
+	'executable cmdargs' 'executable cmdargs-demo'
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag quotation quotation) \
+		$(cabal_flag examples testprog)
+}
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild
deleted file mode 100644
index e6397b9d5d3f..000000000000
--- a/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Command line argument processing"
-HOMEPAGE="http://community.haskell.org/~ndm/cmdargs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+quotation testprog"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag quotation quotation) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/cmdargs/metadata.xml b/dev-haskell/cmdargs/metadata.xml
index d07cc4fd7c80..4a2ade06e3ba 100644
--- a/dev-haskell/cmdargs/metadata.xml
+++ b/dev-haskell/cmdargs/metadata.xml
@@ -1,35 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		This library provides an easy way to define command line parsers. Most users
-		will want to use the "System.Console.CmdArgs.Implicit" module, whose
-		documentation contains an example.
-		
-		* "System.Console.CmdArgs.Explicit" provides a way to write command line
-		parsers for both single mode programs (most programs) and multiple
-		mode programs (e.g. darcs or cabal). Parsers are defined by constructing
-		a data structure.
-		
-		* "System.Console.CmdArgs.Implicit" provides a way to concisely define
-		command line parsers, up to three times shorter than getopt. These parsers
-		are translated into the Explicit data type.
-		
-		* "System.Console.CmdArgs.GetOpt" provides a wrapper allowing compatiblity
-		with existing getopt parsers, mapping to the Explicit data type.
-		
-		For a general reference on what command line flags are commonly used,
-		see &lt;http://www.faqs.org/docs/artu/ch10s05.html&gt;.
-	</longdescription>
 	<use>
+		<flag name="examples">Build the cmdargs-demo program</flag>
 		<flag name="testprog">Build the test program</flag>
-		<flag name="quotation">Build quote module</flag>
+		<flag name="quotation">Build the Quote module</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">cmdargs</remote-id>
 		<remote-id type="github">ndmitchell/cmdargs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cmdlib/Manifest b/dev-haskell/cmdlib/Manifest
deleted file mode 100644
index 9655b60371a8..000000000000
--- a/dev-haskell/cmdlib/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cmdlib-0.3.5.tar.gz 22881 BLAKE2B 867e15e7b32a76f81b01c69ee60af74c8b5752d680693a154e1005167155b2ac501d4c0d1d476295d95c716dbe49f39d2d4f21c1d3f5a64e930adf6c31869289 SHA512 29ca53ddde33d3154b57d56d80eed1e511476ffeb4e4b3722c003770d85d2c4815dccde9d25bc2c86dacad66af6ce6b924c2e97106945a9d9c8ed33fc2424d67
-DIST cmdlib-0.3.6.tar.gz 22971 BLAKE2B 5feb462ee53cf3d5978fdf9b10cec0cabd3522e473e3c06d458a55de1bbc95ce687b4796b974ce9b26b0febd8ef4578093cb498c6bd40bd5dec82bbcfbc446fa SHA512 9d67e931c9caaaaf833215f2561d8ca6aeddd02c64b79343974d0a4d7f1dc618a7af4327ebf50d4071b871b1fd97edc3b5db5bbc8b3334352a20276733602024
diff --git a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
deleted file mode 100644
index b93de856c5ca..000000000000
--- a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="a library for command line parsing & online help"
-HOMEPAGE="https://hackage.haskell.org/package/cmdlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		dev-haskell/split:=[profile?]
-		dev-haskell/syb:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}/${PN}-0.3.4-ghc-6.12.patch")
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=mtl2 \
-		--flag=-test
-}
diff --git a/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild
deleted file mode 100644
index 8d8239c10598..000000000000
--- a/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -test,+mtl2
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a library for command line parsing & online help"
-HOMEPAGE="https://hackage.haskell.org/package/cmdlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=mtl2 \
-		--flag=-test
-}
diff --git a/dev-haskell/cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch b/dev-haskell/cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch
deleted file mode 100644
index 85a19d9aff02..000000000000
--- a/dev-haskell/cmdlib/files/cmdlib-0.3.4-ghc-6.12.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- cmdlib-0.3.4-orig/System/Console/CmdLib/Command.hs	2011-10-07 07:19:48.000000000 +1100
-+++ cmdlib-0.3.4/System/Console/CmdLib/Command.hs	2012-01-06 20:49:59.668959773 +1100
-@@ -225,6 +225,13 @@
- commandGroup :: (Commands a) => String -> a -> [CommandWrap]
- commandGroup s l = [CommandGroup s (toCommands l)]
- 
-+#if !MIN_VERSION_mtl(2,0,0)
-+instance Monad (Either e) where
-+        return = Right
-+        Left  l >>= _ = Left l
-+        Right r >>= k = k r    
-+#endif
-+
- -- TODO: disambiguation, hidden commands (aliases)
- findCommand :: String -> [CommandWrap] -> [CommandWrap]
- findCommand key list = case accum list of Left x -> [x]
diff --git a/dev-haskell/cmdlib/metadata.xml b/dev-haskell/cmdlib/metadata.xml
deleted file mode 100644
index c97e547df9f1..000000000000
--- a/dev-haskell/cmdlib/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A commandline parsing library, based on getopt. Comes with a
-		powerful attribute system. Supports complex interfaces with many
-		options and commands, with option &amp; command grouping, with simple
-		and convenient API. Even though quite powerful, it strives to keep
-		simple things simple. The library uses "System.Console.GetOpt" as
-		its backend.
-		
-		In comparison to the other commandline handling libraries:
-		
-		Compared to cmdargs, cmdlib has a pure attribute system and is
-		based on GetOpt for help formatting &amp; argument parsing. Cmdlib may
-		also be more extendable due to typeclass design, and can use
-		user-supplied types for option arguments.
-		
-		Cmdargs &gt;= 0.4 can optionally use a pure attribute system,
-		although this is clearly an add-on and the API is a second-class
-		citizen in relation to the impure version.
-		
-		GetOpt and parseargs both require explicit flag representation, so
-		they live a level below cmdlib. GetOpt is in fact used as a
-		backend by cmdlib.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/code-page/Manifest b/dev-haskell/code-page/Manifest
index a24750acf5b0..a1d8003541cf 100644
--- a/dev-haskell/code-page/Manifest
+++ b/dev-haskell/code-page/Manifest
@@ -1,2 +1,2 @@
-DIST code-page-0.1.1.tar.gz 4606 BLAKE2B c8529b737a29539a360a32a03d6a942077c9bbe7732e9eeb201ea65022ffa322f3cb3272a8356aba1a12e7b7a9809a93579a0479c10e899548dd425f5470c057 SHA512 867fb373680e638fcb32501a261b61e708008b9d449d5a28d11336b5961e4a0098c51e90069155ebee7a9229acac288df4598b0f6edd0b4c6b61cdd2711f5ba9
 DIST code-page-0.1.3.tar.gz 4718 BLAKE2B 0062024dd536b23359d84a8f6aa5bb66a241ae41190a59c9c2cdde34f3ee1664ad180a1d7b8332904b761956bbb73bb85f74f818763a37021dfa5fa09d36a040 SHA512 1a8f650051d749840562d4ac8789f9834afa73e64582f2781d542d281d894c420cdb7a5b8a2bf30c983bec99a27bec8b63a32b1cabd3ab26a964e0a9b9b647bc
+DIST code-page-0.2.1.tar.gz 6859 BLAKE2B 0413a5b4fd846d473a3f3151830bac07bf3c73e4068d1d65aeb522d919d9606370fc6cf7887bc5f485147b2959116391b95227b9562ad0530abd9c0124a33902 SHA512 5a1ff550892bb315d2c0645d325e8b8914342d0da9726dd3798eba9655bd79cca7a75927e9312c44d4be1cff8e2c69b8f1734c3662fabb14760036228aedb768
diff --git a/dev-haskell/code-page/code-page-0.1.1.ebuild b/dev-haskell/code-page/code-page-0.1.1.ebuild
deleted file mode 100644
index 889ccfd86514..000000000000
--- a/dev-haskell/code-page/code-page-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Windows code page library for Haskell"
-HOMEPAGE="https://github.com/RyanGlScott/code-page"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/code-page/code-page-0.1.3.ebuild b/dev-haskell/code-page/code-page-0.1.3.ebuild
index c489613c0234..957bc38aecb2 100644
--- a/dev-haskell/code-page/code-page-0.1.3.ebuild
+++ b/dev-haskell/code-page/code-page-0.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.2.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/code-page/code-page-0.2.1.ebuild b/dev-haskell/code-page/code-page-0.2.1.ebuild
new file mode 100644
index 000000000000..3826f3df3906
--- /dev/null
+++ b/dev-haskell/code-page/code-page-0.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Windows code page library for Haskell"
+HOMEPAGE="https://github.com/RyanGlScott/code-page"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/code-page/metadata.xml b/dev-haskell/code-page/metadata.xml
index f316630ab908..0154aaccd7b6 100644
--- a/dev-haskell/code-page/metadata.xml
+++ b/dev-haskell/code-page/metadata.xml
@@ -1,22 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		This library provides two modules:
-		
-		* "System.IO.CodePage": a cross-platform module that exports
-		functions which adjust code pages on Windows, and do nothing
-		on other operating systems.
-		
-		* "System.Win32.CodePage": On Windows, this exports functions
-		for getting, setting, and analyzing code pages. On other
-		operating systems, this module exports nothing.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">code-page</remote-id>
 		<remote-id type="github">RyanGlScott/code-page</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/colour/Manifest b/dev-haskell/colour/Manifest
index d501214923a3..6b9c4080fd43 100644
--- a/dev-haskell/colour/Manifest
+++ b/dev-haskell/colour/Manifest
@@ -1,2 +1,2 @@
-DIST colour-2.3.3.tar.gz 20392 BLAKE2B c0ac11ac27c4ba0e4501f2177e35389bbf297e72678b07cbaa9bc43ee6d1b7f2583228e6de17f98320a266c29d9a9472567be310647a84704fa3dd961f1926f6 SHA512 3498215698c3c4010a2bcb6ef87ad263f5a5425167751730919363a0e6806a5c8c2ba82b403b7898addd74feaa756c9df339a37a2b2f2d727680c14ffc21ccf8
 DIST colour-2.3.5.tar.gz 20485 BLAKE2B 64cc4df8f7b36fa4c7a9b474db566b7623f9c7b0892f379acc866f384aa5e557cab5965869b0ba84167232658375ab568a3f5e90a0a1deba81520717899637c6 SHA512 2232f51b3cfdda1a64436e8395c2441e49db083982a0370d3ec38c304b0a6234666887b3abc886107a9b21c425d3253284cce0186c1a210a302a0a14808364d8
+DIST colour-2.3.6.tar.gz 20675 BLAKE2B 9104d414cf01842cb74e20cb3b9052b109767b3a7e53552ddafd877b4c30d65c5a154e9235a280698e5096d82e523d1c01d54846d7a73ec5de0e62fcb6c04642 SHA512 82f7d92e46f7235706832be9d3a981bc09f729ef4e7f891dae85bf808f342e498aa152bc106f9c011ab0e79e5cc2d57067de596d774ad5010e9845df521ed275
diff --git a/dev-haskell/colour/colour-2.3.3-r1.ebuild b/dev-haskell/colour/colour-2.3.3-r1.ebuild
deleted file mode 100644
index 50717cf33cbd..000000000000
--- a/dev-haskell/colour/colour-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A model for human colour/color perception"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Colour"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	if has_version "<dev-haskell/haddock-2.9.2"; then
-		# Workaround http://hackage.haskell.org/trac/hackage/ticket/626
-		# The haddock --hoogle option does not like unicode characters, which causes
-		# haddock 2.7.2 to fail like:
-		# haddock: internal Haddock or GHC error: dist/doc/html/enumerator/enumerator.txt: commitAndReleaseBuffer: invalid argument (Invalid or incomplete multibyte or wide character)
-		sed -e 's@&#176;@ degrees@g' \
-			-i "${S}/Data/Colour/CIE.hs" \
-			-i "${S}/Data/Colour/CIE/Chromaticity.hs"
-		sed -e 's@&#8220;@"@g' \
-			-e 's@&#8221;@"@g' \
-			-i "${S}/Data/Colour/RGB.hs"
-	fi
-}
diff --git a/dev-haskell/colour/colour-2.3.5.ebuild b/dev-haskell/colour/colour-2.3.5.ebuild
index 69088c21c11a..f339e2c0e280 100644
--- a/dev-haskell/colour/colour-2.3.5.ebuild
+++ b/dev-haskell/colour/colour-2.3.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 # circular dependencies: colour -> ansi-terminal -> test-framework -> colour
 RESTRICT=test
diff --git a/dev-haskell/colour/colour-2.3.6.ebuild b/dev-haskell/colour/colour-2.3.6.ebuild
new file mode 100644
index 000000000000..5095e74b2b59
--- /dev/null
+++ b/dev-haskell/colour/colour-2.3.6.ebuild
@@ -0,0 +1,41 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A model for human colour/color perception"
+HOMEPAGE="https://www.haskell.org/haskellwiki/Colour"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+	'random >= 1.0 && < 1.2' 'random >= 1.0'
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/random-1.0
+		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/colour/metadata.xml b/dev-haskell/colour/metadata.xml
index 874a4514fe7d..6b3d1d04daf5 100644
--- a/dev-haskell/colour/metadata.xml
+++ b/dev-haskell/colour/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a data type for colours and transparency.
-		Colours can be blended and composed.
-		Various colour spaces are supported.
-		A module of colour names ("Data.Colour.Names") is provided.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">colour</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/commonmark-extensions/Manifest b/dev-haskell/commonmark-extensions/Manifest
new file mode 100644
index 000000000000..bf5fc3a74f9f
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/Manifest
@@ -0,0 +1,2 @@
+DIST commonmark-extensions-0.2.3.2.tar.gz 37074 BLAKE2B e3519ad4ec8bdb9db5ab8cbb57ffeccf2512621c7e5fe423dab1c5afb075f55fcf348dabcd770ab84abf1efae24ad73c013ab76d080122e55736e59fca2ea7c6 SHA512 93b6c856f8aa5858e2700e8ffd98dd56a294cae95430b0ec1ea1c6a48f952eb5c1ce8223a10a36f4249933e2efc92d8110ba54463af467535b435c236b03f619
+DIST commonmark-extensions-0.2.3.5.tar.gz 37915 BLAKE2B c0a29517910da9de24e99ac25b2b38e9a894f3bde9bb144be07b5b0c2463e07ff5407bf40748e1ff1489fce82a1f4dbf7a5e2c205c33d7199ef0b7a17ea6ddcc SHA512 c7eff871f9413e5f9b32f979f8d09fae4a0e509439231b8959f56ece7e6083264b58154f9869f0757bc85cbb4f9fc726c9bffad0da0fbe9742a8cd86822c96d6
diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild
new file mode 100644
index 000000000000..a8a6e7ac35e8
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+	dev-haskell/network-uri:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.5.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.5.ebuild
new file mode 100644
index 000000000000..ac5693694b97
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.3.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/commonmark-0.2.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+	dev-haskell/network-uri:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/commonmark-extensions/metadata.xml b/dev-haskell/commonmark-extensions/metadata.xml
new file mode 100644
index 000000000000..78c30d625c50
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">commonmark-extensions</remote-id>
+		<remote-id type="github">jgm/commonmark-hs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/commonmark-pandoc/Manifest b/dev-haskell/commonmark-pandoc/Manifest
new file mode 100644
index 000000000000..e519d86450a1
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/Manifest
@@ -0,0 +1,2 @@
+DIST commonmark-pandoc-0.2.1.2.tar.gz 4937 BLAKE2B 26f46b663051aecc204f2e67f66e62a6943909d496542d31b0238cd6bdecda4e0c8594d8ed3f8147fea5bbab4680c147379feddecb59f93be810bc3a9015d08a SHA512 85c7505b29c99e38bbadf93764e51ec40da3bff0799e99eecd011962f1103b81970cb5ffb7399b48927e0024c07554ee0e7d420a88bd2f37149a4777d8bca032
+DIST commonmark-pandoc-0.2.1.3.tar.gz 4907 BLAKE2B 7b93e6ebf39d9da457cc6dac127f0f440172f738aa59f6484cdc29fc48426e6d84c5deb61cc64b569e7128bc50560980afc6022c64a9e533699a23a98b7a77c0 SHA512 d5d91748501cdb4fcb738f89ee32135eed83ff1a41a3665f86ad36286a346b4751a355cd81d29e43a47500913b94796330df9b35201586d2610dbdb4ef4fa544
diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild
new file mode 100644
index 000000000000..8e9c40e5c4e4
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bridge between commonmark and pandoc AST"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/commonmark-0.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+	>=dev-haskell/commonmark-extensions-0.2.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+	>=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.3.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.3.ebuild
new file mode 100644
index 000000000000..0d0515289bb0
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bridge between commonmark and pandoc AST"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/commonmark-0.2:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+	>=dev-haskell/commonmark-extensions-0.2.1:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+	>=dev-haskell/pandoc-types-1.21:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/commonmark-pandoc/metadata.xml b/dev-haskell/commonmark-pandoc/metadata.xml
new file mode 100644
index 000000000000..f6c8b5febd59
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">commonmark-pandoc</remote-id>
+		<remote-id type="github">jgm/commonmark-hs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/commonmark/Manifest b/dev-haskell/commonmark/Manifest
new file mode 100644
index 000000000000..14827b715c55
--- /dev/null
+++ b/dev-haskell/commonmark/Manifest
@@ -0,0 +1,2 @@
+DIST commonmark-0.2.2.tar.gz 101438 BLAKE2B 1e6183e2a9a3d90fb3347bd03779c77314e51d817de7740ae933f328a144a22d729a5dca90f40e1a35967a335d03aaf8e6836b8fe42d12c8d2f52963378c8f6f SHA512 fb1e9d8774c7a2682af8702b94ea4b255ff9dd38fcaba96048d037b3c75051509332ef80631165670a513280e984abf1fa08dd53e85d13f1b4e46941cceadc96
+DIST commonmark-0.2.3.tar.gz 102342 BLAKE2B 1675cb4f995cd76613c9d6fa6ac8f5884a55258b2c76387e286e2cca581946865f3780046332d0dfa9fcb1bf60ca9bd6dce0882ebc7273073261c1104fdd6b9a SHA512 7e3371f6b1aaf4aca3db4ae91894c1e6bd6ea8736babb32de902fba89c2e1f44369bee836fcb1a229948dd72fab25e930bc0cdc143e94d6b136734b9fff3d3df
diff --git a/dev-haskell/commonmark/commonmark-0.2.2.ebuild b/dev-haskell/commonmark/commonmark-0.2.2.ebuild
new file mode 100644
index 000000000000..c2186a916523
--- /dev/null
+++ b/dev-haskell/commonmark/commonmark-0.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/unicode-data-0.3:=[profile?]
+	dev-haskell/unicode-transforms:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/commonmark/commonmark-0.2.3.ebuild b/dev-haskell/commonmark/commonmark-0.2.3.ebuild
new file mode 100644
index 000000000000..d83dbe85c596
--- /dev/null
+++ b/dev-haskell/commonmark/commonmark-0.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/unicode-data-0.3:=[profile?]
+	dev-haskell/unicode-transforms:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/commonmark/metadata.xml b/dev-haskell/commonmark/metadata.xml
new file mode 100644
index 000000000000..769758cc2ca3
--- /dev/null
+++ b/dev-haskell/commonmark/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">commonmark</remote-id>
+		<remote-id type="github">jgm/commonmark-hs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/comonad-transformers/Manifest b/dev-haskell/comonad-transformers/Manifest
deleted file mode 100644
index b5ea5edef1fa..000000000000
--- a/dev-haskell/comonad-transformers/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST comonad-transformers-3.1.tar.gz 8552 BLAKE2B ca2949ec10e176d419cf9e7f970ac5268c55bbe48a962321e69ff7f85dd3c61fd1ea052eb9c703f2162dd2f9530962d431e210a15cf019c0afbe4b4dd52d75f4 SHA512 37afd48546a445f4baebbeb2da3530641f9768535438104ecbea1aa661f7312fed6a6a697ebea269141f8bf2d299c5aafd28f359b3720fc722196cbea1676404
-DIST comonad-transformers-4.0.tar.gz 2430 BLAKE2B 40de77da2839445abe984293d105fbadede706b32909119d941a49946f941d694a8f0278d1bd4d48560dee382bba75d820e1d49e249f445c5de2ed2285ebbc2b SHA512 5b35e80798691ba7defd030e03030491ffd6b4721b85f88f7596e75442b33c13eb6d2b8a91fdb47b76b05629a9008fde61ed0e1c87324f673a9de84510d2a668
diff --git a/dev-haskell/comonad-transformers/comonad-transformers-3.1.ebuild b/dev-haskell/comonad-transformers/comonad-transformers-3.1.ebuild
deleted file mode 100644
index 085e99dd5086..000000000000
--- a/dev-haskell/comonad-transformers/comonad-transformers-3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Comonad transformers"
-HOMEPAGE="https://github.com/ekmett/comonad-transformers/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0:=[profile?]
-		>=dev-haskell/contravariant-0.2.0.1:=[profile?]
-		>=dev-haskell/distributive-0.2.2:=[profile?]
-		>=dev-haskell/semigroupoids-3.0:=[profile?]
-		>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild b/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild
deleted file mode 100644
index d65d870bb1b4..000000000000
--- a/dev-haskell/comonad-transformers/comonad-transformers-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been merged into comonad 4.0"
-HOMEPAGE="https://github.com/ekmett/comonad-transformers/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/comonad-transformers/metadata.xml b/dev-haskell/comonad-transformers/metadata.xml
deleted file mode 100644
index 1d60aca837c3..000000000000
--- a/dev-haskell/comonad-transformers/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Comonad transformers
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/comonad-transformers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index 50d6d2b0996a..002329448c93 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1,6 +1,2 @@
-DIST comonad-3.1.tar.gz 7769 BLAKE2B c8ca82834b974209d895ec5e84ec45390325ba0e80c2c8a991236f6578d03b0535db18004f03da58b5b1157622ebf01d4097935107db836474b00fb20d3e24a8 SHA512 5e14dec1fc229ac5cc6a69a86277eb22e08fe4035159fc95273dd6addd5e0f8fc54526c98668b2d12242a043c7c67d7f83718c75a9d961e9e1496add8136bd2f
-DIST comonad-4.0.tar.gz 15014 BLAKE2B 37fed519018f1f5a3444faadab791a0c2f3dd3707626ffad94a3ce2a1b938fa51fa0f2d53078b498bf6aff458e5e9b336001c37c7f4ada18eb06fda053ab5e09 SHA512 2311c6db59dcd7a20190f925ded477412fa093d5cc43adaa1a7d2ca8174c919c73f7b78d53616da13dbe272817337826e168873acb37ff0df8e36655fbb2b47a
-DIST comonad-4.2.7.2.tar.gz 16430 BLAKE2B 0d71e5db8e2c3384e52b5254a2038ab3439dd3372e19192fd818724c51ee3173d459e6c1684f381a57a511c119f940a6abaed0760850d8b0b673d86c6278e703 SHA512 c4d31409f5b77c35628a86f25d3cae273079e1f0cfbd5880058ed29d63802e712a199ce900c38eb4aa2130e4e397c4852bb640f92d745cc3edee57ae515fcfe4
-DIST comonad-5.0.5.tar.gz 17911 BLAKE2B bbd1610cf727a73912e4250d419020f8b862bc45de144d3d568a6314e9f4e47ae6325b77587ce87a24bc76f988f336be3c5cc03ec2bb358559319cf85956df19 SHA512 45c1d65768d229ad936dbb9ed75912985c9e2b821befb3863e4095f8af7d54984ef54a4233693497a3295c2da39eff80988f1d4c775230d7a899791ea5fb3e2f
-DIST comonad-5.0.6.tar.gz 18154 BLAKE2B 4654a76ccc51c1cb1f7a96db54dd211148b8afcada19d0153356f203ea93cd0b914f6771f4407f5a81e312a7060cf11d9720a9eb96760b35c38567a34ac1a44a SHA512 0b7fc727a2b972203d1651049a4f4c371a8f134d64d36409d60fbc4d11b7eb9650c79cf917abaa3f66084d7c5e9f32b288862a5e93c3d93c16c11533a446cfa5
-DIST comonad-5.tar.gz 16383 BLAKE2B 110f27389b05817c795144d33282ba6a0b91346c3a52ad7b695027ae290f626caa97be4204eae6987d58381587e7ef91c9a97caedcf60b1adbea639f63db54fa SHA512 1acdee67bc2fd6061228541f417e02ffaa9ac412ac3a84b4b3f5b1e82a5626a63ad01f1a085262293682011b99ee8a3d70f34f75b6ce42bb24b91e167d5f816f
+DIST comonad-5.0.8-rev1.cabal 3631 BLAKE2B fe4a2a4fd61f0dc157004155b0f3e8ab00a0bd653d56d6f92408fdbf8d5a1d15ef7fb6cdd4d7572d9731cb4be1cbc898e6fdda9bb1d4227538a4cd0903010207 SHA512 425f0fadb85e99dc4047fff47dfbae9d4d33a9bb1d3f26493c7b14af03ca26b29f4f57693c5670ddafa9d48c9315ca34072cd76c6e2eaf47d9c5d14e5ebb5d61
+DIST comonad-5.0.8.tar.gz 15227 BLAKE2B 5f316ed68d35fcc2857cb7250f2d181ed77d2e87cc5d7dfb671cdec0c602080a6e3c0ac28541bd4cac43b954f96af0e1077bf2b28c040202bd3e66a820c5ccb1 SHA512 b823ea36826da74c6ec46cb835493224f62da66516841b9660a04c391dee803c31e140b2c523b563fb51f46509d99cce157b456a88fbaf2371da11933d5d787e
diff --git a/dev-haskell/comonad/comonad-3.1.ebuild b/dev-haskell/comonad/comonad-3.1.ebuild
deleted file mode 100644
index 434fe6c0c56c..000000000000
--- a/dev-haskell/comonad/comonad-3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 compatible comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3:=[profile?]
-		<dev-haskell/semigroups-1:=[profile?]
-		>=dev-haskell/tagged-0.1:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		"
diff --git a/dev-haskell/comonad/comonad-4.0.ebuild b/dev-haskell/comonad/comonad-4.0.ebuild
deleted file mode 100644
index 397c594bdd5a..000000000000
--- a/dev-haskell/comonad/comonad-4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 compatible comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+test-doctests"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/comonad/comonad-4.2.7.2.ebuild b/dev-haskell/comonad/comonad-4.2.7.2.ebuild
deleted file mode 100644
index 07a6c22f150f..000000000000
--- a/dev-haskell/comonad/comonad-4.2.7.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 compatible comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+containers +contravariant +distributive +test-doctests"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.10 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/comonad/comonad-5.0.5.ebuild b/dev-haskell/comonad/comonad-5.0.5.ebuild
deleted file mode 100644
index b17c0e77877d..000000000000
--- a/dev-haskell/comonad/comonad-5.0.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 compatible comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+containers +distributive +test-doctests"
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag distributive distributive) \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/comonad/comonad-5.0.6.ebuild b/dev-haskell/comonad/comonad-5.0.6.ebuild
deleted file mode 100644
index 553ea56cb38e..000000000000
--- a/dev-haskell/comonad/comonad-5.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 compatible comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+containers +distributive +test-doctests"
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag distributive distributive) \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/comonad/comonad-5.0.8-r1.ebuild b/dev-haskell/comonad/comonad-5.0.8-r1.ebuild
new file mode 100644
index 000000000000..4f102ae0ede0
--- /dev/null
+++ b/dev-haskell/comonad/comonad-5.0.8-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +distributive,+containers,test-doctests:test
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Comonads package authored by Edward Kmett"
+HOMEPAGE="https://github.com/ekmett/comonad/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+indexed-traversable"
+
+RDEPEND=">=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=containers \
+		--flag=distributive \
+		$(cabal_flag indexed-traversable indexed-traversable)
+}
diff --git a/dev-haskell/comonad/comonad-5.ebuild b/dev-haskell/comonad/comonad-5.ebuild
deleted file mode 100644
index 848465e4775e..000000000000
--- a/dev-haskell/comonad/comonad-5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 compatible comonads"
-HOMEPAGE="https://github.com/ekmett/comonad/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+containers +contravariant +distributive +test-doctests"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.10 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		$(cabal_flag test-doctests test-doctests)
-}
diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
index e94f4818100b..83baf83fe01a 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -1,36 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haskell 98 comonads
-	</longdescription>
 	<use>
-		<flag name="test-doctests">
-			Run the doctests test suite
-		</flag>
-		<flag name="containers">
-			You can disable the use of the `containers` package
-			using `-f-containers`. Disabing this is an unsupported configuration, but it
-			may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="contravariant">
-			You can disable the use of the `contravariant`
-			package using `-f-contravariant`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Contravariant`
-		</flag>
-		<flag name="distributive">
-			You can disable the use of the `distributive`
-			package using `-f-distributive`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Distributive`
-		</flag>
+		<flag name="indexed-traversable">You can disable the use of the `indexed-traversable` package using `-f-indexed-traversable`.  Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.  If disabled we will not supply instances of `FunctorWithIndex`</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">comonad</remote-id>
 		<remote-id type="github">ekmett/comonad</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/comonads-fd/Manifest b/dev-haskell/comonads-fd/Manifest
deleted file mode 100644
index 7f76a5d94c9c..000000000000
--- a/dev-haskell/comonads-fd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST comonads-fd-3.0.3.tar.gz 3572 BLAKE2B 348dadd24fa6653769ba635cfbcb97d53eb7b605fef09c95830c0a4d33f02b30c260ad7f3d924dd9fde6cb04c4930428a6ab0cb837cb1b33d4c8ab9b874a0c68 SHA512 222022cf5b619f11c54891d3c3e4b60907a165e8d69c67b372150d35e1b8770a7cef2f904d4c5a7baa32468c350155f93f58c7f1fbf01362027d1376bb575b05
-DIST comonads-fd-4.0.tar.gz 2605 BLAKE2B 3d498483964cf10f3622aaa4097adabf70c2ef1d82c28025697e775fb4b6d88b33332235772001f6180279876bfd4fa1b3720762c7297c3c9c9d00f031d2cf5c SHA512 290a137c7485c5cbebc7994737a0c2a70ffb2463188cd491bf86b4e02edb5cc3a8c4fd7b7cfcfc999c6dfbed6bb437a63f44959ec34e4addaffd0a81a20125a1
diff --git a/dev-haskell/comonads-fd/comonads-fd-3.0.3.ebuild b/dev-haskell/comonads-fd/comonads-fd-3.0.3.ebuild
deleted file mode 100644
index db6a01402cea..000000000000
--- a/dev-haskell/comonads-fd/comonads-fd-3.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Comonad transformers using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/comonads-fd/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/comonad-3*:=[profile?]
-		=dev-haskell/comonad-transformers-3*:=[profile?]
-		>=dev-haskell/mtl-2.0:=[profile?]
-		<dev-haskell/mtl-2.2:=[profile?]
-		>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-		<dev-haskell/semigroups-1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild b/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
deleted file mode 100644
index 926dccf4217c..000000000000
--- a/dev-haskell/comonads-fd/comonads-fd-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been merged into comonad 4.0"
-HOMEPAGE="https://github.com/ekmett/comonads-fd/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/comonads-fd/metadata.xml b/dev-haskell/comonads-fd/metadata.xml
deleted file mode 100644
index af7f550860b9..000000000000
--- a/dev-haskell/comonads-fd/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Comonad transformers using functional dependencies
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/comonads-fd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/concurrent-extra/Manifest b/dev-haskell/concurrent-extra/Manifest
deleted file mode 100644
index a38e6d6f50e4..000000000000
--- a/dev-haskell/concurrent-extra/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST concurrent-extra-0.7.0.10.tar.gz 16205 BLAKE2B 94fd5aca0a3365c482ae61985372458c269f5a6994b81574f8087c9a4b170a75aba67592671abe33e892af231752e7caf27aa66f9b93807bca1a14eb29de31a0 SHA512 2414fdb493834480f31e13b515233ea7739d46a170da12683b944de8372289cdafebfe8cf242c2edcceafc1fe3e659b0b20a0dcb4826d925cc50f6c1ebe73a58
-DIST concurrent-extra-0.7.0.12.tar.gz 15844 BLAKE2B 1220bdaa6bbc364c4a2e12adc3dd953459d8dcbc251db776e906facc2b80aa4239d35cc29c19fea767e27c0a451b5b29c3010f8a97943db6e73801980888b7c7 SHA512 b02bfa8473faeba15bf26f4c243190dee7820dd961bc86cb7cd1eb856451a9351899eea59b3668f0b811c95f828cd8c36744dfa03144ca0a949e3b663ae84ad2
diff --git a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild
deleted file mode 100644
index f4d13217d944..000000000000
--- a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra concurrency primitives"
-HOMEPAGE="https://github.com/basvandijk/concurrent-extra"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?] <dev-haskell/unbounded-delays-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/async-2.0
-		>=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'async                >= 2.0     && < 2.1' 'async                >= 2.0'
-}
diff --git a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild
deleted file mode 100644
index 802906dbbfbe..000000000000
--- a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.12.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra concurrency primitives"
-HOMEPAGE="https://github.com/basvandijk/concurrent-extra"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test #stresstest fails, all others pass
-
-RDEPEND=">=dev-haskell/stm-2.1.2.1:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/async-2.0
-		>=dev-haskell/hunit-1.2.2
-		>=dev-haskell/random-1.0
-		>=dev-haskell/test-framework-0.2.4
-		>=dev-haskell/test-framework-hunit-0.2.4 )
-"
diff --git a/dev-haskell/concurrent-extra/metadata.xml b/dev-haskell/concurrent-extra/metadata.xml
deleted file mode 100644
index e1584be226f7..000000000000
--- a/dev-haskell/concurrent-extra/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The @concurrent-extra@ package offers among other things the
-		following selection of synchronisation primitives:
-		
-		* @Broadcast@: Wake multiple threads by broadcasting a value.
-		
-		* @Event@: Wake multiple threads by signalling an event.
-		
-		* @Lock@: Enforce exclusive access to a resource. Also known as a
-		binary semaphore or mutex. The package additionally provides an
-		alternative that works in the @STM@ monad.
-		
-		* @RLock@: A lock which can be acquired multiple times by the same
-		thread. Also known as a reentrant mutex.
-		
-		* @ReadWriteLock@: Multiple-reader, single-writer locks. Used to
-		protect shared resources which may be concurrently read, but only
-		sequentially written.
-		
-		* @ReadWriteVar@: Concurrent read, sequential write variables.
-		
-		Please consult the API documentation of the individual modules for
-		more detailed information.
-		
-		This package was inspired by the concurrency libraries of Java and
-		Python.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">basvandijk/concurrent-extra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/concurrent-output/Manifest b/dev-haskell/concurrent-output/Manifest
index 592fe96463b9..5cfffba45e1e 100644
--- a/dev-haskell/concurrent-output/Manifest
+++ b/dev-haskell/concurrent-output/Manifest
@@ -1,5 +1,2 @@
 DIST concurrent-output-1.10.11.tar.gz 22514 BLAKE2B 19b31ed65ac0a553ad8f60d08d9919428e0cb40be151b43e7a91dd2c9d28d61ed79fab75efef43e8a0f44e66ef652ddaff0aa8275bf2884d4db59fa2bfde8e47 SHA512 2ed0415562c37cedc035adac06430e397369bf13ff5375f855c9b3a34c122437b3f92137b593d8fd0384d575822ee5287ca0b2c2b3daab8de95a5c63b991760d
-DIST concurrent-output-1.7.3.tar.gz 21005 BLAKE2B 2d34758f4a2c8e65e84e7fce911b59dd528be41f382f6b3a6801e01ba070e52838a7137c9538ed914df109ae0645dfe1ec91a4e65df83c5d98c390551d9a8bb1 SHA512 0c338d45167bac4d11f760994fa7c5b3d6b3525cc4fbb289e70247affcabec94b44cdc1991519e40ddb71975e5a995f10e116b289de194dd3a91467c6f4df950
-DIST concurrent-output-1.7.6.tar.gz 21143 BLAKE2B 33670c8060eafd6d67d8375515cf8ed6091d3b6205011db2dffe35f5abd33b36fc8aad50564dfdf111ff8f72996ec7bc8f889fa9a5e0ba49b49af492d4ebe780 SHA512 2a5b728ed5017273c89e3dff1b045905071b78eb7cc0dd2a6020170328a593bd7fea12651558598e55e807f197c7177dd6b086081df2a1895a2d172bf558864c
-DIST concurrent-output-1.7.7.tar.gz 21156 BLAKE2B 80c845dfa39bb475fbd6a12fa670d3317c0a333fe46009084333e1481d8c8cac7e2511515888a09f2c33331af7163623c1c9e94380530f01ac640df7cb111794 SHA512 65ddc7917b71e169aa05ad4a16c280e1bd3083c511198ff1a6cf5b6e9bdc0397f842ce7aa99671548c2f97eb6744b54ab097933a508303dfa371ac3cb5bad643
-DIST concurrent-output-1.7.8.tar.gz 21178 BLAKE2B 18b2f8d5a0de656c161487a50cc5c495b2343a7eed15b99ae6d79947717c2f2a00e8100b9384bb8922950c75affcadd5927c0783dede916ef295918cae5f6a69 SHA512 b5f64ff51302a46d1548469fa45b18e10276667bb33994023f6e5f75ed738d63ea666efd7a7e27dfdcde916985c3753141d374f85b43fae3c3cac960567ee01c
+DIST concurrent-output-1.10.19.tar.gz 23835 BLAKE2B d78c91791bb2a668c24863313a5e6af9d35eea5b27bca3fca14eab75f8749c3f037926b6a0f278be32b82f684c785aa0068e19ef49ea1d22ba57dc64c6319b57 SHA512 6d51b364842fe399eff15e2bbec8756ed94bb1090f2125a71186c2c0e597696dd8955efe17e8017beaee260564829ab4f3afb495bbb706423c6b13c61d462b44
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
index 5229eed94690..03a2852512c7 100644
--- a/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
+++ b/dev-haskell/concurrent-output/concurrent-output-1.10.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Ungarble output from several threads or commands"
-HOMEPAGE="http://hackage.haskell.org/package/concurrent-output"
+HOMEPAGE="https://hackage.haskell.org/package/concurrent-output"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.9.1:=[profile?] <dev-haskell/ansi-terminal-0.11.0:=[profile?]
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.10.19.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.10.19.ebuild
new file mode 100644
index 000000000000..8a72b9bbad4c
--- /dev/null
+++ b/dev-haskell/concurrent-output/concurrent-output-1.10.19.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Ungarble output from several threads or commands"
+HOMEPAGE="https://hackage.haskell.org/package/concurrent-output"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?] <dev-haskell/ansi-terminal-1.1.0:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
+	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.7.3.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.7.3.ebuild
deleted file mode 100644
index 5468ebcc39ca..000000000000
--- a/dev-haskell/concurrent-output/concurrent-output-1.7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ungarble output from several threads or commands"
-HOMEPAGE="https://hackage.haskell.org/package/concurrent-output"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?]
-	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
-	>=dev-haskell/transformers-0.3.0:=[profile?] <dev-haskell/transformers-0.5.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.7.6.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.7.6.ebuild
deleted file mode 100644
index 59706b3d542d..000000000000
--- a/dev-haskell/concurrent-output/concurrent-output-1.7.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ungarble output from several threads or commands"
-HOMEPAGE="https://hackage.haskell.org/package/concurrent-output"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?]
-	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
-	>=dev-haskell/transformers-0.3.0:=[profile?] <dev-haskell/transformers-0.6.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.7.7.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.7.7.ebuild
deleted file mode 100644
index 66450bf97b4f..000000000000
--- a/dev-haskell/concurrent-output/concurrent-output-1.7.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ungarble output from several threads or commands"
-HOMEPAGE="https://hackage.haskell.org/package/concurrent-output"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?]
-	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/concurrent-output/concurrent-output-1.7.8.ebuild b/dev-haskell/concurrent-output/concurrent-output-1.7.8.ebuild
deleted file mode 100644
index bc33c584c8d5..000000000000
--- a/dev-haskell/concurrent-output/concurrent-output-1.7.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ungarble output from several threads or commands"
-HOMEPAGE="https://hackage.haskell.org/package/concurrent-output"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.0:=[profile?] <dev-haskell/ansi-terminal-0.7.0:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/exceptions-0.6.0:=[profile?] <dev-haskell/exceptions-0.9.0:=[profile?]
-	>=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/terminal-size-0.3.0:=[profile?] <dev-haskell/terminal-size-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?] <dev-haskell/text-1.3.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/concurrent-output/metadata.xml b/dev-haskell/concurrent-output/metadata.xml
index 954b821ddf0b..a2b732140d20 100644
--- a/dev-haskell/concurrent-output/metadata.xml
+++ b/dev-haskell/concurrent-output/metadata.xml
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides a simple interface for writing concurrent programs that
-		need to output a lot of status messages to the console, or display
-		multiple progress bars for different activities at the same time,
-		or concurrently run external commands that output to the console.
-		
-		Built on top of that is a way of defining multiple output regions,
-		which are automatically laid out on the screen and can be individually
-		updated. Can be used for progress displays etc.
-		
-		&lt;&lt;https://joeyh.name/code/concurrent-output/demo2.gif&gt;&gt;
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">concurrent-output</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
index 631e8007ca5b..828daae11b9e 100644
--- a/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
+++ b/dev-haskell/conduit-combinators/conduit-combinators-1.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.4.9999
 #hackport: flags: +monotrav1
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-8.0.1:=
diff --git a/dev-haskell/conduit-combinators/metadata.xml b/dev-haskell/conduit-combinators/metadata.xml
index b7878815d80d..a1de5e8eb364 100644
--- a/dev-haskell/conduit-combinators/metadata.xml
+++ b/dev-haskell/conduit-combinators/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">snoyberg/mono-traversable</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/conduit-extra/Manifest b/dev-haskell/conduit-extra/Manifest
index 3c20b1200f3c..4c177df3e8e0 100644
--- a/dev-haskell/conduit-extra/Manifest
+++ b/dev-haskell/conduit-extra/Manifest
@@ -1,5 +1,2 @@
-DIST conduit-extra-1.1.13.1.tar.gz 33455 BLAKE2B 3a0dbdd2214f955f54daecf14a0d81bf47f5ee02c20fdd0d9eef3af833881d9fc26aebd97fc970098d5ffea3a709049b499e1925d4f51c11235fee2986fa361c SHA512 c7b7ccf4980a2420116b2e8ee084c76275cbd1a80812bdf006660aa4c48e9adace3b5530e9510c603711c8d2a7d1519ff501bb9cd08dbbb5bbd1b8d79bac8266
-DIST conduit-extra-1.1.15.tar.gz 34666 BLAKE2B ba81aa05990a2f67de1c8d8ff9311a012e0f300f97134e8d48ff64fb22e4d7c14644bb0897f3c7e43c73d7864c5209ac885b9b78ff5f5c0acd3e435f17683e31 SHA512 cdf47414e362950d6361a26cb584dbab9648572fa801e2444c5a76723f5f166c3c9d701282c8da06b2db462aa15e195feaed0bc154689bc93a237c1ec21f6cd5
-DIST conduit-extra-1.1.9.1.tar.gz 29571 BLAKE2B 1113b5bcd419a4f11f061dbbb6b21c985ccd647642a7ababb75bbab953fe1ec569eeabc57a79e310c77360f8eff4d29fce01a2480bfe53af62cdf43f2890bb50 SHA512 3e35c303fb9696f99af99db6ada5e59dcde09e0ce3d3559aed2b3354dab1a96d523b7976643239892316a709289e4943aea37152a2935c6c256b24e5b73dc716
-DIST conduit-extra-1.1.9.2.tar.gz 29576 BLAKE2B d16bde0c19cf14bd190875fd3a43fe18551f3f101e1f1c8546f88ec29c686dbfb0d6c81fdfa919f505555ff86a1fa0a1522ce40a73f6c402b81003054ae24799 SHA512 ddc8e99c3b939704421d464c928d8fc2a591cdb4e44942cebb670d5c3e9a4d96fa03c227a1acfd227560d45d3eead7ff6cadde54ec8e78324eb86a861fbb8576
 DIST conduit-extra-1.3.4.tar.gz 33170 BLAKE2B 27d9adc403be4479e06c47737e9770ffa63fa306278ca20374e7fde8005a70553df28a4959bca0148c4607a0317fddcbde693bd1b0a11c45ea1b58f086a66876 SHA512 cd5d6d754871ba9558f495074066cff0d116d71af71a6260c9cfe53244a03513813f93ed985af25c6eb7849f1d4dbb4f6b9a17140c2bf12236206b9e9925efee
+DIST conduit-extra-1.3.6.tar.gz 33321 BLAKE2B c310fe8c11377e39204fee247fefb0bd7ac49b82395e187c6c0f36f8e5717b293a0a48dfde782562204ae1ca8c6370881ff358414032fd750440d9c7ff85790c SHA512 56f6abf0663734c0e40b3d21fed6d0942fe30acc8960105ac93ddbb15d10c9074213e0ead575cc4422824832beae026376d04a13f6a045efc2a695676cf03546
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.13.1.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.13.1.ebuild
deleted file mode 100644
index 5e4c17ded1bc..000000000000
--- a/dev-haskell/conduit-extra/conduit-extra-1.1.13.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Batteries included conduit: adapters for common libraries"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.5:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.11:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/bytestring-builder
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.15.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.15.ebuild
deleted file mode 100644
index fe58bd342354..000000000000
--- a/dev-haskell/conduit-extra/conduit-extra-1.1.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Batteries included conduit: adapters for common libraries"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.5:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.16:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/bytestring-builder
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild
deleted file mode 100644
index 7509d59784ab..000000000000
--- a/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Batteries included conduit: adapters for common libraries"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.5:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.11:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		dev-haskell/bytestring-builder
-		dev-haskell/exceptions
-		>=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild
deleted file mode 100644
index 1147f035bf7b..000000000000
--- a/dev-haskell/conduit-extra/conduit-extra-1.1.9.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Batteries included conduit: adapters for common libraries"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.5:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.11:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		dev-haskell/bytestring-builder
-		dev-haskell/exceptions
-		>=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
index cc3b589f4212..d0a60c578758 100644
--- a/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
+++ b/dev-haskell/conduit-extra/conduit-extra-1.3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT=test # requires network
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.3.6-r1.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..b2153db91a1b
--- /dev/null
+++ b/dev-haskell/conduit-extra/conduit-extra-1.3.6-r1.ebuild
@@ -0,0 +1,39 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Batteries included conduit: adapters for common libraries"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-haskell/async:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/network-2.3:=[profile?]
+	>=dev-haskell/primitive-0.5:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	dev-haskell/stm:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.16:=[profile?]
+	>=dev-haskell/typed-process-0.2.6:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? (
+		dev-haskell/exceptions
+		>=dev-haskell/hspec-1.3
+		dev-haskell/quickcheck
+		dev-haskell/transformers-base
+	)
+"
diff --git a/dev-haskell/conduit-extra/metadata.xml b/dev-haskell/conduit-extra/metadata.xml
index 838a86b72c70..5077db0ea615 100644
--- a/dev-haskell/conduit-extra/metadata.xml
+++ b/dev-haskell/conduit-extra/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package will soon contain much more functionality. This is a placeholder until the next release is ready.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">conduit-extra</remote-id>
 		<remote-id type="github">snoyberg/conduit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest
index dea3841a0b12..2719a2ea53ea 100644
--- a/dev-haskell/conduit/Manifest
+++ b/dev-haskell/conduit/Manifest
@@ -1,7 +1,2 @@
-DIST conduit-1.0.15.1.tar.gz 40651 BLAKE2B b7efc3779c0a8f28f66a7da20f7619e5bff1e24f516986728ea66ef857492f49a4cda74939490c110b6037a2b9a546fa989bc12c1cc35d529ab37c8d7aeb96b8 SHA512 ccd4b56a8bac306ecaeef3830abe4c7c5482082a5996e176dcef8b1145640f10f3c73e521a438f9080c54fa2c9afe2f460cb90a018e6fe547413a8281b9f7b1c
-DIST conduit-1.1.6.tar.gz 30968 BLAKE2B b6c7af88628eea61675d4432dbd7c76474a8fd689c65880da3c99533678fe3e16bcd1dae120214d18c7de1d954d08d1a347f79e1ff5810140e0c46062655655f SHA512 fb0ca3f9afd61cbd62b2d6bf73117d8521cdc838c1a71567c4c35aaf5ee60d4a9525a6eac1bc8fc4f7762387d67cd5ea999f30f231a8ca9d6622b63d75692ea9
-DIST conduit-1.2.12.1.tar.gz 50539 BLAKE2B e6128dfb3acccd688a046296e99f1cdce594f34c18f8315499756c543d10ce143fcda80083f52acc14d3a0ccbfe10ec231a6daf245b765cf309da347bdae5ebc SHA512 36d957600f5660258fd2357713474e961353f558cb969bc98fbaf6ea9115c0de0bf68218c9f6d7801bf217e9e62d376bf67cbd9f176ec7d3d72ef327784fd3e5
-DIST conduit-1.2.6.1.tar.gz 48531 BLAKE2B a6d5258923ad2777d315f58b552d5d66b0fbc230933eed8e9b7b19095dc57afd3fad96236339694b5bef208f2b6a8ca38721467321ecd300ec103f3131ff30f1 SHA512 fbeb437897a0ae00a5d3f5b12565c0a4f5e3807d8d9fcd6aaeeafa134ed5d0493a2a403dbe86112be9af49f8b7af90c504aafce0505f0a854a05a66a5175a6d2
-DIST conduit-1.2.6.6.tar.gz 48854 BLAKE2B f42a0a78808f29535d058d02a615af5161396096887aa21b87cd0277e8955cf01732e814ec71230f4d0c9dc11b20b93ceb86c081f7f03fbef2db42149951539c SHA512 6b722a70919bff0aa79b6e47c3220f89b019a7a584d31e921e4f7dada3e0b4dba753b65fe61f4da7e6562320dec7d76dc1f487d4e085299c485fdf2f7e0b7efd
-DIST conduit-1.2.8.tar.gz 49406 BLAKE2B ce99d20bc0001b7ebac30a37f7e75e6ec1796b534ed1d1b0595df7b734d8685e8e0d566915a21041e703d8867c35fde380958d3c195c796b0d6fdc02fe3a7712 SHA512 a181bc88291e761921a2be60e21efca47f7cd029fa4026d50131d49be0d91e75ea082e8c009aa621c44707eb61ea6b117af4f588b8e9251a381ba55f26124161
-DIST conduit-1.3.2.tar.gz 87752 BLAKE2B e07ef9dc2d3ae189892ee32ff1a8ff877a93c023309b79ff5af62f971d2a6356c3ebe4bd27122ed4dc510dd5e8222afdccf13d772701f69274cab0c0c1a69bf6 SHA512 d6dcc33156923a1601e9c0c7ae61d1df9dc4ec71c39f4ec0935b13bff502eb66bcdda30901c3c864e44ade9fcc437d3ab2c1af167bac0d89f7f70567d0911f57
+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
diff --git a/dev-haskell/conduit/conduit-1.0.15.1.ebuild b/dev-haskell/conduit/conduit-1.0.15.1.ebuild
deleted file mode 100644
index ad5ab120fa21..000000000000
--- a/dev-haskell/conduit/conduit-1.0.15.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="nohandles"
-
-RDEPEND=">=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-0.4.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/text-stream-decode-0.1.0.4:=[profile?] <dev-haskell/text-stream-decode-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag nohandles nohandles)
-}
diff --git a/dev-haskell/conduit/conduit-1.1.6.ebuild b/dev-haskell/conduit/conduit-1.1.6.ebuild
deleted file mode 100644
index 78b6a2dee8b8..000000000000
--- a/dev-haskell/conduit/conduit-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/exceptions-0.6
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/conduit/conduit-1.2.12.1.ebuild b/dev-haskell/conduit/conduit-1.2.12.1.ebuild
deleted file mode 100644
index 69eaf4e61fab..000000000000
--- a/dev-haskell/conduit/conduit-1.2.12.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe
-		>=dev-haskell/split-0.2.0.0 )
-"
diff --git a/dev-haskell/conduit/conduit-1.2.6.1.ebuild b/dev-haskell/conduit/conduit-1.2.6.1.ebuild
deleted file mode 100644
index 1e2397a59c33..000000000000
--- a/dev-haskell/conduit/conduit-1.2.6.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/conduit/conduit-1.2.6.6.ebuild b/dev-haskell/conduit/conduit-1.2.6.6.ebuild
deleted file mode 100644
index 6bb09aa4c011..000000000000
--- a/dev-haskell/conduit/conduit-1.2.6.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/conduit/conduit-1.2.8.ebuild b/dev-haskell/conduit/conduit-1.2.8.ebuild
deleted file mode 100644
index 2c64cffd4bfd..000000000000
--- a/dev-haskell/conduit/conduit-1.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/conduit/conduit-1.3.2.ebuild b/dev-haskell/conduit/conduit-1.3.2.ebuild
deleted file mode 100644
index 416c047448c8..000000000000
--- a/dev-haskell/conduit/conduit-1.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming data processing library"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/mono-traversable-1.0.7:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/exceptions-0.6
-		>=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/safe
-		dev-haskell/silently
-		>=dev-haskell/split-0.2.0.0
-		>=dev-haskell/unliftio-0.2.4.0 )
-"
diff --git a/dev-haskell/conduit/conduit-1.3.4.2.ebuild b/dev-haskell/conduit/conduit-1.3.4.2.ebuild
new file mode 100644
index 000000000000..eada6d7aee07
--- /dev/null
+++ b/dev-haskell/conduit/conduit-1.3.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Streaming data processing library"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/exceptions:=[profile?]
+	>=dev-haskell/mono-traversable-1.0.7:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.6.3:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/exceptions-0.6
+		>=dev-haskell/hspec-1.3
+		>=dev-haskell/quickcheck-2.7
+		dev-haskell/safe
+		dev-haskell/silently
+		>=dev-haskell/split-0.2.0.0
+		>=dev-haskell/unliftio-0.2.4.0 )
+"
diff --git a/dev-haskell/conduit/conduit-1.3.4.3.ebuild b/dev-haskell/conduit/conduit-1.3.4.3.ebuild
new file mode 100644
index 000000000000..be625410fa1d
--- /dev/null
+++ b/dev-haskell/conduit/conduit-1.3.4.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Streaming data processing library"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/mono-traversable-1.0.7:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/hspec-1.3
+		>=dev-haskell/quickcheck-2.7
+		dev-haskell/safe
+		dev-haskell/silently
+		>=dev-haskell/split-0.2.0.0
+		>=dev-haskell/unliftio-0.2.4.0 )
+"
diff --git a/dev-haskell/conduit/metadata.xml b/dev-haskell/conduit/metadata.xml
index 3af8d9d07e99..9d00781cb34b 100644
--- a/dev-haskell/conduit/metadata.xml
+++ b/dev-haskell/conduit/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Conduits are an approach to the streaming data problem. It is meant as an alternative to enumerators\/iterators, hoping to address the same issues with different trade-offs based on real-world experience with enumerators. For more information, see &lt;http://www.yesodweb.com/blog/2011/12/conduits&gt;.
-	</longdescription>
-	<use>
-		<flag name="nohandles">experimental code to use raw system calls in place of handles. Not recommended for general use</flag>
-	</use>
 	<upstream>
+		<remote-id type="hackage">conduit</remote-id>
 		<remote-id type="github">snoyberg/conduit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/configfile/Manifest b/dev-haskell/configfile/Manifest
deleted file mode 100644
index ccd0b3c145f4..000000000000
--- a/dev-haskell/configfile/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ConfigFile-1.1.4.tar.gz 28969 BLAKE2B 8cd70d207a26fabab3d7b124d17857ee8004a38388bba921fb658b9f09df4d082ea73149ee1d8fc7f5737f521f4f81727f60034b507265e7bd5ec89683d88965 SHA512 4455110c95172461b2d82ae88ba4f386d5e49ddd7f7def83714d2f6198090f0d121166eece3efa735341da9bbc0029e704be00d3e671d24ad27e838dfe913776
diff --git a/dev-haskell/configfile/configfile-1.1.4.ebuild b/dev-haskell/configfile/configfile-1.1.4.ebuild
deleted file mode 100644
index 27a4c529df83..000000000000
--- a/dev-haskell/configfile/configfile-1.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ConfigFile"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Configuration file reading & writing"
-HOMEPAGE="http://software.complete.org/configfile"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildtests"
-
-RDEPEND=">=dev-haskell/missingh-1.0.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	buildtests? ( dev-haskell/hunit:=[profile?]
-			dev-haskell/testpack:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildtests buildtests)
-}
diff --git a/dev-haskell/configfile/metadata.xml b/dev-haskell/configfile/metadata.xml
deleted file mode 100644
index c430e789391c..000000000000
--- a/dev-haskell/configfile/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Parser and writer for handling sectioned config files in
-		Haskell.
-
-		The ConfigFile module works with configuration files in a standard
-		format that is easy for the user to edit, easy for the programmer
-		to work with, yet remains powerful and flexible.  It is inspired by,
-		and compatible with, Python's ConfigParser module.  It uses files
-		that resemble Windows .INI-style files, but with numerous
-		improvements.
-
-		ConfigFile provides simple calls to both read and write config files.
-		It's possible to make a config file parsable by this module,
-		the Unix shell, and make.
-	</longdescription>
-	<use>
-		<flag name="buildtests">Build the executable to run unit tests.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild b/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
index 39237de7fef4..e181e674aea9 100644
--- a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
+++ b/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.4.2.9999
 #hackport: flags: -developer
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10.0.2:=[profile?]
diff --git a/dev-haskell/configurator/metadata.xml b/dev-haskell/configurator/metadata.xml
index 2005cc7f0e0c..b9f12b0e789b 100644
--- a/dev-haskell/configurator/metadata.xml
+++ b/dev-haskell/configurator/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
diff --git a/dev-haskell/connection/Manifest b/dev-haskell/connection/Manifest
index 6ef541dc951d..b7021fbaa7cd 100644
--- a/dev-haskell/connection/Manifest
+++ b/dev-haskell/connection/Manifest
@@ -1,3 +1,2 @@
-DIST connection-0.2.4.tar.gz 11067 BLAKE2B a99a7430093f3bf279ffcc709dd3b52050e1534b50683289f68ae00a86cff9269ff5bafdfd1b2a46fd6b55b32f6b4ca2805083cedaf0e7d86c44943dab827deb SHA512 7a55f5bf8b35a8a03553051b38a01e3791e9c51db3222f5c91e77310cc9d61307e9d934d59e31f82be38804f1b9c60cd8856351b03e007e3b7a3c883abaabb48
-DIST connection-0.2.5.tar.gz 7576 BLAKE2B 312e65c9f25b97d7ba0325baae93ebbcd6b8a212d5fd3f48361982dcc3dccc3ccaeb273a8b74b95482bcdb68269b1f3177037ac4951871d25a97fbe501f2e94b SHA512 02f02bfe48aa2f667986433d11fc7723aed8e87deb38082a6eacf009901334db2acb95c254a2cebd0b6c035bcdb6536f51af6c5dfdcc1ee51a13c1b7383460c4
+DIST connection-0.3.1-rev2.cabal 1563 BLAKE2B c7d4bc435cd85e2c7a45eddecf0ab0b9ab94b924e5a4af88d154b177d78ac6194d255a75b2a6707b3b4e12b924654affce38ee4523920fb84b2e419b0ae8d051 SHA512 ca1adba80ffd3437151b76eccc978008b0adb590f37cd2399e0b7b53e2873ff61615d206f15a4901e44b766ac6936f1e705f335a3d926f9dde7175e4a24cc91b
 DIST connection-0.3.1.tar.gz 9051 BLAKE2B 8758906a266180c9c81969c13b7a5e19bcb01757222ba21e1cd258a50180c52288a1a1e1e2486a3fea6fc3c6fd516ebcf4ade984dde822609ac962edfec4d610 SHA512 06da91d39e0d9a556a78da77a7ca31d520d5e7e8fd65509f82be926ad2c34282ef1f4d03aa6065c5834bc89417cf51b573f3cf4529fe3ead72eb1e80cc6d7a98
diff --git a/dev-haskell/connection/connection-0.2.4.ebuild b/dev-haskell/connection/connection-0.2.4.ebuild
deleted file mode 100644
index a629a9446d49..000000000000
--- a/dev-haskell/connection/connection-0.2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple and easy network connections API"
-HOMEPAGE="https://github.com/vincenthz/hs-connection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	dev-haskell/crypto-random:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/securemem:=[profile?]
-	>=dev-haskell/socks-0.4:=[profile?]
-	>=dev-haskell/tls-1.2:=[profile?]
-	>=dev-haskell/x509-1.4:=[profile?]
-	>=dev-haskell/x509-store-1.4:=[profile?]
-	>=dev-haskell/x509-system-1.4:=[profile?]
-	>=dev-haskell/x509-validation-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/connection/connection-0.2.5.ebuild b/dev-haskell/connection/connection-0.2.5.ebuild
deleted file mode 100644
index a02ba400399f..000000000000
--- a/dev-haskell/connection/connection-0.2.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple and easy network connections API"
-HOMEPAGE="https://github.com/vincenthz/hs-connection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/socks-0.4:=[profile?]
-	>=dev-haskell/tls-1.3:=[profile?]
-	>=dev-haskell/x509-1.5:=[profile?]
-	>=dev-haskell/x509-store-1.5:=[profile?]
-	>=dev-haskell/x509-system-1.5:=[profile?]
-	>=dev-haskell/x509-validation-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/connection/connection-0.3.1-r1.ebuild b/dev-haskell/connection/connection-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..260b23c45e13
--- /dev/null
+++ b/dev-haskell/connection/connection-0.3.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple and easy network connections API"
+HOMEPAGE="https://github.com/vincenthz/hs-connection"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/basement:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/network-2.6.3:=[profile?]
+	>=dev-haskell/socks-0.6:=[profile?]
+	>=dev-haskell/tls-1.4:=[profile?] <dev-haskell/tls-1.7:=[profile?]
+	>=dev-haskell/x509-1.5:=[profile?]
+	>=dev-haskell/x509-store-1.5:=[profile?]
+	>=dev-haskell/x509-system-1.5:=[profile?]
+	>=dev-haskell/x509-validation-1.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/connection/connection-0.3.1.ebuild b/dev-haskell/connection/connection-0.3.1.ebuild
deleted file mode 100644
index e5e1fa480a86..000000000000
--- a/dev-haskell/connection/connection-0.3.1.ebuild
+++ /dev/null
@@ -1,33 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple and easy network connections API"
-HOMEPAGE="https://github.com/vincenthz/hs-connection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/basement:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/network-2.6.3:=[profile?]
-	>=dev-haskell/socks-0.6:=[profile?]
-	>=dev-haskell/tls-1.4:=[profile?]
-	>=dev-haskell/x509-1.5:=[profile?]
-	>=dev-haskell/x509-store-1.5:=[profile?]
-	>=dev-haskell/x509-system-1.5:=[profile?]
-	>=dev-haskell/x509-validation-1.5:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
diff --git a/dev-haskell/connection/metadata.xml b/dev-haskell/connection/metadata.xml
index e0146f287c42..bb7ee867c16c 100644
--- a/dev-haskell/connection/metadata.xml
+++ b/dev-haskell/connection/metadata.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Simple network library for all your connection need.
-		
-		Features: Really simple to use, SSL/TLS, SOCKS.
-		
-		This library provides a very simple api to create sockets
-		to a destination with the choice of SSL/TLS, and SOCKS.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">connection</remote-id>
 		<remote-id type="github">vincenthz/hs-connection</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/constraints/Manifest b/dev-haskell/constraints/Manifest
index 6615726c1a47..f734ae9ca59f 100644
--- a/dev-haskell/constraints/Manifest
+++ b/dev-haskell/constraints/Manifest
@@ -1,3 +1,2 @@
-DIST constraints-0.11.2.tar.gz 20611 BLAKE2B f87bd7dc91162e4fda24f6676c1ebf9d152364a2b547a8edc968413e0e986ce3c0d392f0794d7fe7d54cad05e3dad68b3eae1764556b0d3cc5c67700008b2ad0 SHA512 ebca93d8ded8ea6ef75ad17906cc4d1bd8629c2b38691caf6bfc01f5d041db2b8ebe1436ad97ddfc7f3fd1b0067e0b3530125d58a5aeb3e395c5acf8f5741fed
-DIST constraints-0.4.1.3.tar.gz 7311 BLAKE2B 27d2265324dfbb60da85cc7016c90e1b38ef5d906a0506b35b18e4b4b06050f9ae1f30e9e621466614a1d643949ccdf23cce183b44e52dc5fcfe3acc41226cac SHA512 0478c69be6a719b83d536aef7733d7383f5400a234829f49146597f89339d3aee46455f3f5001dfc213e07c116276699bf970a657051f3dddb8ab2d9f9593836
-DIST constraints-0.8.tar.gz 12348 BLAKE2B 63ddba733601898c8e8a7712c406e34417141f1da0adc7ab6ce4d271b2356eb1ad6e9ee5ab0b77c1c7efdaf6e0ba6c5e639c6c55032cd75cd6850719323a61a6 SHA512 8cd6f16e70657f95f6d9b0824f85e5991d7da85852a1664abf8b99f95ab85456ecda09f3e59577019284358c09b198d298d01ff152acb3086121521ee302e665
+DIST constraints-0.13.3.tar.gz 21574 BLAKE2B 444015cbf61b6e017b08339558c2c0a0ed26157b15d64621deec0e564fb97cff5e246acafc8e75917d21c0865805c96adc5c4f8f8aea3978cd6f6707a3fda62c SHA512 c592d1b60c5606c6dbd883b8acc9e2b68addfc71d28a6df184fb3739791759fdf1d8f0ed243acd694d54a6d9bfac8271ddac2e72e4dbfcb9a8622c2178999472
+DIST constraints-0.13.4.tar.gz 21673 BLAKE2B 47d1d824b85883980202d88699b114a8ecd9256c02b3cf2375bc251b9a4e3065ed334225781c1a74895d409d46f7d431c03f48774529ecacb341589e46d80b71 SHA512 3e4cf62ee897cc103332ae1823552c52568fe090968ee763b83a0cc95c978c6766db02a4cbc4e2c9d6f83d04bb731a91421d5078904847d204e5cc8d8ee59d5f
diff --git a/dev-haskell/constraints/constraints-0.11.2.ebuild b/dev-haskell/constraints/constraints-0.11.2.ebuild
deleted file mode 100644
index 3f327d93f4a9..000000000000
--- a/dev-haskell/constraints/constraints-0.11.2.ebuild
+++ /dev/null
@@ -1,30 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Constraint manipulation"
-HOMEPAGE="https://github.com/ekmett/constraints/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2 )
-"
diff --git a/dev-haskell/constraints/constraints-0.13.3.ebuild b/dev-haskell/constraints/constraints-0.13.3.ebuild
new file mode 100644
index 000000000000..91fa470eea45
--- /dev/null
+++ b/dev-haskell/constraints/constraints-0.13.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Constraint manipulation"
+HOMEPAGE="https://github.com/ekmett/constraints/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2 )
+"
diff --git a/dev-haskell/constraints/constraints-0.13.4.ebuild b/dev-haskell/constraints/constraints-0.13.4.ebuild
new file mode 100644
index 000000000000..8be2959872f7
--- /dev/null
+++ b/dev-haskell/constraints/constraints-0.13.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Constraint manipulation"
+HOMEPAGE="https://github.com/ekmett/constraints/"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/type-equality-1:=[profile?] <dev-haskell/type-equality-2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2 )
+"
diff --git a/dev-haskell/constraints/constraints-0.4.1.3.ebuild b/dev-haskell/constraints/constraints-0.4.1.3.ebuild
deleted file mode 100644
index e7cfd357418a..000000000000
--- a/dev-haskell/constraints/constraints-0.4.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Constraint manipulation"
-HOMEPAGE="https://github.com/ekmett/constraints/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/newtype-0.2:=[profile?] <dev-haskell/newtype-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/constraints/constraints-0.8.ebuild b/dev-haskell/constraints/constraints-0.8.ebuild
deleted file mode 100644
index 53ebe69ee4bb..000000000000
--- a/dev-haskell/constraints/constraints-0.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Constraint manipulation"
-HOMEPAGE="https://github.com/ekmett/constraints/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.7.3:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/constraints/files/constraints-0.4.1.3-ghc-8.patch b/dev-haskell/constraints/files/constraints-0.4.1.3-ghc-8.patch
deleted file mode 100644
index 1b2f8169c45d..000000000000
--- a/dev-haskell/constraints/files/constraints-0.4.1.3-ghc-8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Data/Constraint.hs b/Data/Constraint.hs
-index 84d67c0..a104f51 100644
---- a/Data/Constraint.hs
-+++ b/Data/Constraint.hs
-@@ -79,3 +79,7 @@ import Data.Data
- #endif
-+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 707
-+import GHC.Exts (Constraint)
-+#else
- import GHC.Prim (Constraint)
-+#endif
- 
-@@ -375,3 +379,3 @@ instance Class () (b :=> a) where cls = Sub Dict
- instance Class b a => () :=> Class b a where ins = Sub Dict
--instance (b :=> a) => () :=> b :=> a where ins = Sub Dict
-+instance (b :=> a) => () :=> (b :=> a) where ins = Sub Dict
- 
diff --git a/dev-haskell/constraints/metadata.xml b/dev-haskell/constraints/metadata.xml
index 4b4bd0c95bf6..ec6cf5d8dc58 100644
--- a/dev-haskell/constraints/metadata.xml
+++ b/dev-haskell/constraints/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Constraint manipulation
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">constraints</remote-id>
 		<remote-id type="github">ekmett/constraints</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/contravariant-extras/Manifest b/dev-haskell/contravariant-extras/Manifest
deleted file mode 100644
index d1f95201cdf9..000000000000
--- a/dev-haskell/contravariant-extras/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST contravariant-extras-0.3.5.1.tar.gz 5324 BLAKE2B ea5554629785efe557a9b708a4487aa9096c963f0ef2d60480a4f155a7f6fb7c696d3a763792af209d9af7a3e77107ac7115ff1fe6f1e043119f4ce575f0933d SHA512 871e9545f8e288e6bd89a5fa5ddc93154092f713505e30120db30750bdacea40f55ed52bf9d59984fc8ee936f4e9148c3d1125b8e59fb4ed0c68044158de7917
diff --git a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.1.ebuild b/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.1.ebuild
deleted file mode 100644
index 3fe3c978d3fc..000000000000
--- a/dev-haskell/contravariant-extras/contravariant-extras-0.3.5.1.ebuild
+++ /dev/null
@@ -1,26 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Extras for the \\\\"
-HOMEPAGE="https://github.com/nikita-volkov/contravariant-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/template-haskell-compat-v0208-0.1.2:=[profile?] <dev-haskell/template-haskell-compat-v0208-2:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/contravariant-extras/metadata.xml b/dev-haskell/contravariant-extras/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/contravariant-extras/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/contravariant/Manifest b/dev-haskell/contravariant/Manifest
index 0957a89aa0c2..e50bb6ca92bf 100644
--- a/dev-haskell/contravariant/Manifest
+++ b/dev-haskell/contravariant/Manifest
@@ -1,6 +1,2 @@
-DIST contravariant-0.4.4.tar.gz 4901 BLAKE2B 478e50e6f8b8a06a2d392da13a7edafd3eb602f0c0fd4a7489eef569b360c65af8a603b63acc66609d743b9cf8417edde2647d63efdf23125098bd4f54c5c28d SHA512 a54c37a371ce5347ae1df789e15a853e0da9e4e9a4006fe77f00f50cda5e92e72da7daf664be8a0a14422dbeb3e3849aae237b5dcd54904e4eee90086a81eaba
-DIST contravariant-0.6.tar.gz 5489 BLAKE2B edf506ef34205042a12c325f7d0982afaf7a8582cac685044fd873c45e6524a01ac77d0b1acc1b48eeedf7996c603d1b32c2ca0a588ea9c7787fa0d88eca2c0d SHA512 f10e93fc69ef26dfde15ae39fe3ff7e466c2b67161604f134b9bede7d18f5032efc3df57c4e78bae3a444bdd19cc4518a987d108fc6a318e934939e15176a7aa
-DIST contravariant-1.2.0.1.tar.gz 6640 BLAKE2B ab253ca2051b455650f8a177204c34f584bb2cb5aec0a4f7bf5f33496dd1a51abed08e7331eed2496a037f448ec85b96be66abc3d39e2c7e67098f7c9e53897f SHA512 c5c76c07931bea8381a412ec02e57f9c17d7e44f8eb5dd982a5083b9bbefd1364c9ed264105ef92615dc79b98fc700178f0dc2f03a3069ca542bdb62d7ca3f5a
-DIST contravariant-1.3.3.tar.gz 9923 BLAKE2B 489684ff698e788c2ce3f1b677a8f05970ff369317cb2ad8b0da0bd87d87cce3820d7bf6d91249b946ece5dfba9ac671540496bdccb1a4b9170a76cbcd2ce250 SHA512 38b9db8035a42c9d8bb1572f63b7fce0f94a93d78cde43f1ce9da5284323b51d71e5432d3aecd128946d7b918b264a1e103e04976ebc9feb01c782e1ea2c683f
-DIST contravariant-1.4.tar.gz 11652 BLAKE2B 7a5fb1d8793b13a2e51180ab92900d01f379f235f185ff591086c3329a2397ea7342100700a1dbea15b4775a5bc0b1ceda6cb491b195258b82e85c3098a7d82e SHA512 6d99a8ed4694ad8494e1a705e911f16ade01f31c92cc8fc21cf49f5b03beafd25597781abc304c4ee360a3ba9473470a4c96069604ab563fb8ae194e09cdf56a
-DIST contravariant-1.5.2.tar.gz 16006 BLAKE2B 251d3f8e0d30176eef224000e2c9185d6161ca6de38c7f8737864d72921e75d715ccf286028c4079781ff25f0e2f2de9c01038f13f3052532eae7d7c9fa23836 SHA512 f59cfbb2c7b1dec7532c3ffb260b5788fc3fe160ad730c1b49ff85d57cc46c4af24e37ecc8cd46df112ff1e92b5b03f2064b81f8ccda88465e1fe695331f5410
+DIST contravariant-1.5.3.tar.gz 13726 BLAKE2B 89dd8d2265c50a848a52ae21022b9a63781e2ff8945d767349f3d14c0b9dd9fe221c564014ae516bc074c2ac6eabbfc4d114378ac81c107a403e15f78655c5bc SHA512 f84e534ea208ebb949e6e1114233e56f284b94ceb756bddeb5786d2c1ed7ed7ec93defcabfa285887316cf880e7b6d2575a76c72bdd9ad73530b4397f5466c87
+DIST contravariant-1.5.5.tar.gz 13815 BLAKE2B 10509c6d5e747a0c2569ec3372b49defa994f6f24a407579604155d2dc6538fece1bce827b56dddf76460e8d0ad867a14f9b4c1b02609f731104b384a4c839ff SHA512 c5e14525cb44fe24ddaa8b1b2b5eb983e602513887119a9fb9eaed3ec1d5af28b9e858a6e461caa8d3793d52ded135459bf95a15b43b2e07e15aea33d3634bc3
diff --git a/dev-haskell/contravariant/contravariant-0.4.4.ebuild b/dev-haskell/contravariant/contravariant-0.4.4.ebuild
deleted file mode 100644
index 877ecb0adcb1..000000000000
--- a/dev-haskell/contravariant/contravariant-0.4.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-haskell/transformers-compat-0.1:=[profile?]
-		<dev-haskell/transformers-compat-1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/contravariant/contravariant-0.6.ebuild b/dev-haskell/contravariant/contravariant-0.6.ebuild
deleted file mode 100644
index 290f2f95e911..000000000000
--- a/dev-haskell/contravariant/contravariant-0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/contravariant/contravariant-1.2.0.1.ebuild b/dev-haskell/contravariant/contravariant-1.2.0.1.ebuild
deleted file mode 100644
index 694c6cee21c1..000000000000
--- a/dev-haskell/contravariant/contravariant-1.2.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tagged"
-
-RDEPEND=">=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/contravariant/contravariant-1.3.3.ebuild b/dev-haskell/contravariant/contravariant-1.3.3.ebuild
deleted file mode 100644
index db84075bdfb7..000000000000
--- a/dev-haskell/contravariant/contravariant-1.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+semigroups +statevar +tagged"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.7.1:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag statevar statevar) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/contravariant/contravariant-1.4.ebuild b/dev-haskell/contravariant/contravariant-1.4.ebuild
deleted file mode 100644
index babb8565a2bf..000000000000
--- a/dev-haskell/contravariant/contravariant-1.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="safe +semigroups +statevar +tagged"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag safe safe) \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag statevar statevar) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/contravariant/contravariant-1.5.2.ebuild b/dev-haskell/contravariant/contravariant-1.5.2.ebuild
deleted file mode 100644
index 4406606f91bd..000000000000
--- a/dev-haskell/contravariant/contravariant-1.5.2.ebuild
+++ /dev/null
@@ -1,35 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Contravariant functors"
-HOMEPAGE="https://github.com/ekmett/contravariant/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+semigroups +statevar +tagged"
-
-RDEPEND=">=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	statevar? ( >=dev-haskell/statevar-1.1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag statevar statevar) \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/contravariant/contravariant-1.5.3.ebuild b/dev-haskell/contravariant/contravariant-1.5.3.ebuild
new file mode 100644
index 000000000000..34880e35f6cd
--- /dev/null
+++ b/dev-haskell/contravariant/contravariant-1.5.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Contravariant functors"
+HOMEPAGE="https://github.com/ekmett/contravariant/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroups +statevar +tagged"
+
+RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/void-0.6.1:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	semigroups? ( >=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
+	statevar? ( >=dev-haskell/statevar-1.2.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag semigroups semigroups) \
+		$(cabal_flag statevar statevar) \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/contravariant/contravariant-1.5.5.ebuild b/dev-haskell/contravariant/contravariant-1.5.5.ebuild
new file mode 100644
index 000000000000..803057b12ecc
--- /dev/null
+++ b/dev-haskell/contravariant/contravariant-1.5.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Contravariant functors"
+HOMEPAGE="https://github.com/ekmett/contravariant/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroups +statevar +tagged"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+	statevar? ( >=dev-haskell/statevar-1.2.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag semigroups semigroups) \
+		$(cabal_flag statevar statevar) \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/contravariant/metadata.xml b/dev-haskell/contravariant/metadata.xml
index 7707171c83b0..dee8e98b653e 100644
--- a/dev-haskell/contravariant/metadata.xml
+++ b/dev-haskell/contravariant/metadata.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haskell 98 contravariant functors
-	</longdescription>
 	<use>
-		<flag name="safe">
-			Get Safe guarantees rather than merely
-			Trustworthy, but with worse constant factors.
-		</flag>
 		<flag name="semigroups">
 			You can disable the use of the `semigroups`
 			package using `-f-semigroups`. Disabling this is an unsupported
@@ -33,6 +26,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">contravariant</remote-id>
 		<remote-id type="github">ekmett/contravariant</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/control-monad-loop/Manifest b/dev-haskell/control-monad-loop/Manifest
deleted file mode 100644
index afda9924b588..000000000000
--- a/dev-haskell/control-monad-loop/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST control-monad-loop-0.1.tar.gz 5081 BLAKE2B 8e9b755a7b37d90f8422794cc590cfc826665aac267bf28565d475adffd167ef29c806b644c87e9834eefa6d24ff7e554aa727a2a4069120d52a80112d57f8ec SHA512 a3eb80b06762ecf442b23fd39a35393a5754a7d71f4ba21e8a3a2457d8ee34a9b5d4b6c8f20d5c5fa19a42beb863bc2a7602bffd06db6ddc99f9b94ae2ec74dd
diff --git a/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild b/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild
deleted file mode 100644
index fb9cb7cfe5be..000000000000
--- a/dev-haskell/control-monad-loop/control-monad-loop-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monad transformer for imperative-style loops"
-HOMEPAGE="https://github.com/joeyadams/haskell-control-monad-loop"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-		dev-haskell/transformers-base:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/control-monad-loop/metadata.xml b/dev-haskell/control-monad-loop/metadata.xml
deleted file mode 100644
index ad72d40303ea..000000000000
--- a/dev-haskell/control-monad-loop/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library of looping constructs with @continue@ and @exit@ control flow
-		statements.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">joeyadams/haskell-control-monad-loop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/convertible/Manifest b/dev-haskell/convertible/Manifest
index 23a85372b4bb..c9bd4d4dc659 100644
--- a/dev-haskell/convertible/Manifest
+++ b/dev-haskell/convertible/Manifest
@@ -1,2 +1,2 @@
-DIST convertible-1.0.11.1.tar.gz 14478 BLAKE2B 43b5bb35572870af30f7163834d5fba5680202f55995723b3540aa3b3b7b91d74f0762c982eca81dc4424b8db3a8d9ef053c6a3c5bd25b2e6b60287cb7b2fc59 SHA512 50082727409c450657bef534af94e8a58e8a3f97fa59d8f24f34d5b72e8335a41c3678036eafd8831f4748c6f1158cef96950d24c53e8402a4b9a7778640a9b1
 DIST convertible-1.1.1.0.tar.gz 14354 BLAKE2B 8d60f3ed29732dddf68d9b0221aae12300533c79d2d2763fe09af143296bfda93bc1781b7d21034b4747b5bc18894db033ce16a7c4a3967f8c7c4f4429cb1f52 SHA512 cd36107b686c56a5d374efbb9be4fa8a0ec3504f0cd807870d34f279707b36721ce5639e22939d11d1795354e453fabe4f1b6130b06ec20ad597287f62959dba
+DIST convertible-1.1.1.1.tar.gz 14071 BLAKE2B ff5fa7a667b5a65eca95f888c6d1abcebe5a28a53c542a24b7618295cbbd73c0e76a32e274f6cd59a699e9df860ac20d787359556fcab4dfea6623da37ded7b6 SHA512 c0af12974022dfdd539c12e80cecd20682452e2e33018456c531ad50117ef7d961412bb049335c362763355e6ddef25cbaed8560490712a48d8c54bfb30a978a
diff --git a/dev-haskell/convertible/convertible-1.0.11.1.ebuild b/dev-haskell/convertible/convertible-1.0.11.1.ebuild
deleted file mode 100644
index 1e532b32db03..000000000000
--- a/dev-haskell/convertible/convertible-1.0.11.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses and instances for converting between types"
-HOMEPAGE="https://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-haskell/mtl[profile?]
-		>=dev-haskell/text-0.7[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck:2
-			dev-haskell/testpack
-		)
-	"
-
-src_configure() {
-	cabal_src_configure $(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/convertible/convertible-1.1.1.0.ebuild b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
index 254bbddd4a82..0396aeb5a84b 100644
--- a/dev-haskell/convertible/convertible-1.1.1.0.ebuild
+++ b/dev-haskell/convertible/convertible-1.1.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: -buildtests
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Typeclasses and instances for converting between types"
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/convertible/convertible-1.1.1.1.ebuild b/dev-haskell/convertible/convertible-1.1.1.1.ebuild
new file mode 100644
index 000000000000..f6b261a6a13e
--- /dev/null
+++ b/dev-haskell/convertible/convertible-1.1.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -buildtests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Typeclasses and instances for converting between types"
+HOMEPAGE="https://hackage.haskell.org/package/convertible"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/old-time:=[profile?]
+	>=dev-haskell/text-0.8:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/quickcheck-2.8 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-buildtests
+}
diff --git a/dev-haskell/convertible/metadata.xml b/dev-haskell/convertible/metadata.xml
index 3c57bb78ce53..c0287d64a1e5 100644
--- a/dev-haskell/convertible/metadata.xml
+++ b/dev-haskell/convertible/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Convertible provides a typeclass with a single function
-		that is designed to help convert between different types: numeric
-		values, dates and times, and the like. The conversions perform bounds
-		checking and return a pure 'Either' value. This means that you need
-		not remember which specific function performs the conversion you
-		desire.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">convertible</remote-id>
+		<remote-id type="github">hdbc/convertible</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cookie/Manifest b/dev-haskell/cookie/Manifest
index 9b46878db62a..b4a2924cf783 100644
--- a/dev-haskell/cookie/Manifest
+++ b/dev-haskell/cookie/Manifest
@@ -1,3 +1,2 @@
-DIST cookie-0.4.2.1.tar.gz 5774 BLAKE2B a3c7b156f27fdeec2d19a73c61c0a0c502160446bf4be9959e8d461bfb1a9bc46dfd1c81cb9ca831c1f6bb25b089cc13bfc0fe6934fd9e6a1945790c15bbd92f SHA512 32d712b121e2cf9a9bf913d546769fa8fd8dbd6c77b7bd15fb334b8fda22e498e793ceaef6dc142f2f69813f91d555261cd624d5af6b90f5cd8072967a2eddc2
-DIST cookie-0.4.2.tar.gz 5849 BLAKE2B db5ddb7f57af343c84fda3efca955235db3e379ffdc2d52df73211a2b506f7559e5fe3402ddbb875fc68e0993afcf14b87ca9e9b9ac51e46318ead6f567ea6c1 SHA512 fb220c6d58ca36385d5f21025f821d634944ba05e4b60b962b9b10f50db22f34425fa663590c8d95d80cf3598456982ac0da55e63a487847967498b7d85667c1
 DIST cookie-0.4.4.tar.gz 5996 BLAKE2B 11ba2d50e004ae498525948c4eb68c470659e306e7a59794fefa8a0441960d2c956f356ef7eb9089866d336f856b30ee208589690767ccfdb886d2920f44b9c2 SHA512 3e17c7c3190602154a196c13b9e65eb139adfe5258441e48ebe5bd9e880af66a7c206f0eca441eeb9ab1700fa49c639adb9414d93f36147c11a1fe3f9fb4a775
+DIST cookie-0.4.5.tar.gz 6048 BLAKE2B 3955c3ebb7e451e2cce7d447dfddc9ba66e97c128ef7cadafd26ad1b490b35e852c07eb17fc64f4f39e1468af19318cde6620fc14d6b0d4c2f91cbd798375ba3 SHA512 b3d4c12b4683f4f02e4d59b47ec3867554dee2fcb106fe59a073b8ead63a220458b91e8b5a2321e46a91666ba61e88798361448a7bc86e496a47d6731b8c0b93
diff --git a/dev-haskell/cookie/cookie-0.4.2.1.ebuild b/dev-haskell/cookie/cookie-0.4.2.1.ebuild
deleted file mode 100644
index 88c30bcf04a5..000000000000
--- a/dev-haskell/cookie/cookie-0.4.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP cookie parsing and rendering"
-HOMEPAGE="https://github.com/snoyberg/cookie"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/cookie/cookie-0.4.2.ebuild b/dev-haskell/cookie/cookie-0.4.2.ebuild
deleted file mode 100644
index 4fed26489fcb..000000000000
--- a/dev-haskell/cookie/cookie-0.4.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP cookie parsing and rendering"
-HOMEPAGE="https://github.com/snoyberg/cookie"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/cookie/cookie-0.4.4.ebuild b/dev-haskell/cookie/cookie-0.4.4.ebuild
index ddbacaffbeb5..d3b351a304ca 100644
--- a/dev-haskell/cookie/cookie-0.4.4.ebuild
+++ b/dev-haskell/cookie/cookie-0.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/cookie/cookie-0.4.5.ebuild b/dev-haskell/cookie/cookie-0.4.5.ebuild
new file mode 100644
index 000000000000..f3f9dd104892
--- /dev/null
+++ b/dev-haskell/cookie/cookie-0.4.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP cookie parsing and rendering"
+HOMEPAGE="https://github.com/snoyberg/cookie"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/text-1.1:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/cookie/metadata.xml b/dev-haskell/cookie/metadata.xml
index 4dd0bf8f601d..43110484d2d9 100644
--- a/dev-haskell/cookie/metadata.xml
+++ b/dev-haskell/cookie/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		HTTP cookie parsing and rendering
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">cookie</remote-id>
 		<remote-id type="github">snoyberg/cookie</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
deleted file mode 100644
index d483f346a039..000000000000
--- a/dev-haskell/cpphs/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST cpphs-1.15.tar.gz 71444 BLAKE2B 77af7bfc036b5410cf3c977ba3b980d792ee9061deb3d4c73a61c54a442562af38ac7e0175d3dfe02d99d5bc51e1b93de9a2e4076e101fc071e53c3824fa07ff SHA512 5845a52924c60d81910c12b09c141d31e4f9ec01c6af8e1f92007d80fd83344334b7f4afc27d6f46a0dcfa2fe51f048afdc05e93f7f5d7feed80f95bb63932ac
-DIST cpphs-1.16.tar.gz 71105 BLAKE2B 8b1a1db2a4b69f4278d7ce2d1f50631c7af6076e9ba87f11194061faee4e4088606d3015becc676e481edc4654cf9364e560d9b5fc6108070717b89fee0dba74 SHA512 f643bde885b4f30873a8c19d23d8910ffea5a0c98ad08c3940a6e66c26a30612d881d61491133b3799773147684ff8ee3ee06a5d004e36aa644a06ff805e370a
-DIST cpphs-1.17.1.tar.gz 72200 BLAKE2B 4c88456ae4b35954e3615437e8959e9a4ce1c6b437845fc20792258124c85a9fc568ec413ed57f91767c318c2514a79409c3101030c93ca30a8daabd1b743a4b SHA512 1db359ba98ed9d6f75c2c35e7bb3f554329b76d7708e9ddf71892b2505d18c7334b30ad3734941d72a832bb7f661f9d346297e8f56980c01564a4f6a4a9cc5dd
-DIST cpphs-1.18.8.tar.gz 43861 BLAKE2B c9c2b994d22eb69ecc650bb2e4516f1e57615cfa270141e5899c62eb2ff7d0fd99f2061ad4be05c123e19d5227ec93416681fb82e495e6515afb2a4524effd8f SHA512 ed6041e6e5c358656685d5a62f5e2cf78a8d714feb6844cfcbd6c852543e02410f78e3ed60f23ef52aaccd999a83b27d3d83950724c07c1441e0648ae31a622a
-DIST cpphs-1.19.3.tar.gz 44306 BLAKE2B 01533340416dc2a36e8fcbf3831d1291478676966c059edce7d92100cc6e10c95c5c3803da88b71e06c15a5197cb550ef532b3bd7dce4ab7a3c7120c72fb53b4 SHA512 30e647b55a7cd86a21ba2346adc2f932c2557e52e59437f523e3300b285c0de51fca43aa29ce9306bc5e3919ed02a51e72056531c33dc52efc1a320ea84746b7
-DIST cpphs-1.20.2.tar.gz 44732 BLAKE2B 948603fdfd80937ea7ea032c15a2f0bc0a2d1b553215b0fa72eb84d71917a29abd3251f667b2dcbe4395c554f35bea13488ba99dc3263fe2d6459727c0efaa20 SHA512 0315684ff884f805d281ab2538558d59614e68de47db2e2b02cea05f0b913a20259cff6e2823b88910a3eb1993b25a26e5cc8d3b902b602d14f35bb54c49f5b6
-DIST cpphs-1.20.8.tar.gz 45108 BLAKE2B 8e373db64d0d2a21e123eb136aadfd45cb373411e0684c445e25eb6062ecf4c29ccce3214986680ab886a71bccade3ac381f8f82916002388af3103bc38e797d SHA512 ec9323f9e1cb6de450d8af6b6b98005bf46427c2926694e1cba942fd54a03d9d36a7e8f2541eb095949110ddaf6317597699b7c4472942a509d496cb9b4da747
diff --git a/dev-haskell/cpphs/cpphs-1.15.ebuild b/dev-haskell/cpphs/cpphs-1.15.ebuild
deleted file mode 100644
index dced04e3b401..000000000000
--- a/dev-haskell/cpphs/cpphs-1.15.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://haskell.org/cpphs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/cpphs/cpphs-1.16.ebuild b/dev-haskell/cpphs/cpphs-1.16.ebuild
deleted file mode 100644
index 3dc3f41af7e3..000000000000
--- a/dev-haskell/cpphs/cpphs-1.16.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://haskell.org/cpphs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/cpphs/cpphs-1.17.1.ebuild b/dev-haskell/cpphs/cpphs-1.17.1.ebuild
deleted file mode 100644
index cb1d4734e9b4..000000000000
--- a/dev-haskell/cpphs/cpphs-1.17.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://haskell.org/cpphs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/cpphs/cpphs-1.18.8.ebuild b/dev-haskell/cpphs/cpphs-1.18.8.ebuild
deleted file mode 100644
index 7e0ce4c79916..000000000000
--- a/dev-haskell/cpphs/cpphs-1.18.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://projects.haskell.org/cpphs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cpphs/cpphs-1.19.3.ebuild b/dev-haskell/cpphs/cpphs-1.19.3.ebuild
deleted file mode 100644
index e0104de74d9f..000000000000
--- a/dev-haskell/cpphs/cpphs-1.19.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://projects.haskell.org/cpphs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	# https://ghc.haskell.org/trac/ghc/ticket/10667
-	[[ $(ghc-version) == 7.10.1.20150630 ]] && replace-hcflags -g ''
-	[[ $(ghc-version) == 7.10.2 ]] && replace-hcflags -g ''
-}
diff --git a/dev-haskell/cpphs/cpphs-1.20.2.ebuild b/dev-haskell/cpphs/cpphs-1.20.2.ebuild
deleted file mode 100644
index e726ce6ac004..000000000000
--- a/dev-haskell/cpphs/cpphs-1.20.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://projects.haskell.org/cpphs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cpphs/cpphs-1.20.8.ebuild b/dev-haskell/cpphs/cpphs-1.20.8.ebuild
deleted file mode 100644
index 95b8effa927d..000000000000
--- a/dev-haskell/cpphs/cpphs-1.20.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
-HOMEPAGE="http://projects.haskell.org/cpphs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cpphs/metadata.xml b/dev-haskell/cpphs/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/cpphs/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/cprng-aes/Manifest b/dev-haskell/cprng-aes/Manifest
index 481d137e1485..7a75c06c97d4 100644
--- a/dev-haskell/cprng-aes/Manifest
+++ b/dev-haskell/cprng-aes/Manifest
@@ -1,2 +1 @@
-DIST cprng-aes-0.5.2.tar.gz 4903 BLAKE2B 963963df710e929872874cc5c85a19361629f0e3c22867ce93d9e057b193380ae9aa529d2fea36c94087386a001cee0f1d5d29aad0254a2d652a7de982db0193 SHA512 bcc658c5ecac7b856ae128938c467cc4762089128a49716d8b16de1649a15206a12d6b624e82ec1564fca46df9b03ee4d277a2c641af787a1f758a11262bbcca
 DIST cprng-aes-0.6.1.tar.gz 4396 BLAKE2B 813773cb6185974e6c3250ce744abbe4ea5dbfa4725320736563fdea6446f246b704e2825e2f8612d35dddb01424cea93ad24a05764713d09d25cfe5afcaeaa7 SHA512 839a3a449edf996b0061a989058ed59625d8a849e852217c047b9d9b59b58504c0efaca699f75beea3ebcad8284f55c1f53b523dbebb10f56e705506bfccb5f5
diff --git a/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild
deleted file mode 100644
index f6586c2f63ec..000000000000
--- a/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Crypto Pseudo Random Number Generator using AES in counter mode"
-HOMEPAGE="https://github.com/vincenthz/hs-cprng-aes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	>=dev-haskell/crypto-random-0.0.7:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
index 3f7cfe98d917..aeae8e048e01 100644
--- a/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
+++ b/dev-haskell/cprng-aes/cprng-aes-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/cprng-aes/metadata.xml b/dev-haskell/cprng-aes/metadata.xml
index 9a0185abd6dc..ecbbc91b7874 100644
--- a/dev-haskell/cprng-aes/metadata.xml
+++ b/dev-haskell/cprng-aes/metadata.xml
@@ -1,27 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Simple crypto pseudo-random-number-generator with really good randomness property.
-		
-		Using ent, a randomness property maker on one 1Mb sample:
-		Entropy = 7.999837 bits per byte.
-		Optimum compression would reduce the size of this 1048576 byte file by 0 percent.
-		Chi square distribution for 1048576 samples is 237.02
-		Arithmetic mean value of data bytes is 127.3422 (127.5 = random)
-		Monte Carlo value for Pi is 3.143589568 (error 0.06 percent)
-		
-		Compared to urandom with the same sampling:
-		Entropy = 7.999831 bits per byte.
-		Optimum compression would reduce the size of this 1048576 byte file by 0 percent.
-		Chi square distribution for 1048576 samples is 246.63
-		Arithmetic mean value of data bytes is 127.6347 (127.5 = random).
-		Monte Carlo value for Pi is 3.132465868 (error 0.29 percent).
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-cprng-aes</remote-id>
 	</upstream>
diff --git a/dev-haskell/cpu/Manifest b/dev-haskell/cpu/Manifest
deleted file mode 100644
index 473c37bae1e5..000000000000
--- a/dev-haskell/cpu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cpu-0.1.2.tar.gz 4317 BLAKE2B 17d34e81432a2487e74ff0297b8126c815d0034809290d28557bcbb5180b161fc474703de29f4bbd1fcf18887a291bbd2608f362752028f910a9c61d51847517 SHA512 2dab5b956619cad1a6a99f16a6156d5f2539ef4882204e3cb1ec3e86bc00cd4d948e3a5eba4948fd0cc37dd98a27eeebc77957f87af6e51f86a65a84db1d25d3
diff --git a/dev-haskell/cpu/cpu-0.1.2.ebuild b/dev-haskell/cpu/cpu-0.1.2.ebuild
deleted file mode 100644
index 9ade107d6e37..000000000000
--- a/dev-haskell/cpu/cpu-0.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Cpu information and properties helpers"
-HOMEPAGE="https://github.com/vincenthz/hs-cpu"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/cpu/metadata.xml b/dev-haskell/cpu/metadata.xml
deleted file mode 100644
index aa5b10119e39..000000000000
--- a/dev-haskell/cpu/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="executable">build 'cpuid' tool</flag>
-	</use>
-	<longdescription>
-		Lowlevel cpu routines to get basic properties of the cpu platform, like endianness and architecture.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cpu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/criterion-measurement/Manifest b/dev-haskell/criterion-measurement/Manifest
new file mode 100644
index 000000000000..e9459b44d706
--- /dev/null
+++ b/dev-haskell/criterion-measurement/Manifest
@@ -0,0 +1,2 @@
+DIST criterion-measurement-0.1.2.0.tar.gz 16650 BLAKE2B ec4379e6ea016d23e5ee4b0c61404421bf3ba207ecc29063e426f136e1a56ef93a5c5e6f404f17796088e773ab9c4a0e971a587977c57d8ecd3edf33ba72b23d SHA512 d82196d0b4a501795e8f3498b17db89c5febf6cfd2131da262aacc7b268248bb21c7d4e6530789a40a47c4e74e28e34ab5ff3477b2e28f54ddafd01e7cd5993a
+DIST criterion-measurement-0.2.0.0.tar.gz 17593 BLAKE2B 96219613c24a9d41c6a4fd2ba0aa90da6b7d8e521761e6e912201832c86e335c43dde1320f248c0e0a767d6735c9ba8d4edfdd618239fe4b362463586cefdbe9 SHA512 a5d4e5e7d1c6313067faac38d64230c5647c9e61a572c20cada6db29f478279599b6f0f81f000ef4754e5cc02a34ee674ea08c8b9606ce60b90791f8b33445fe
diff --git a/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
new file mode 100644
index 000000000000..44bcf757e5bb
--- /dev/null
+++ b/dev-haskell/criterion-measurement/criterion-measurement-0.1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Criterion measurement functionality and associated types"
+HOMEPAGE="https://github.com/bos/criterion"
+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/aeson-0.8:=[profile?]
+	>=dev-haskell/base-compat-0.9:=[profile?]
+	>=dev-haskell/vector-0.7.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-fast
+}
diff --git a/dev-haskell/criterion-measurement/criterion-measurement-0.2.0.0.ebuild b/dev-haskell/criterion-measurement/criterion-measurement-0.2.0.0.ebuild
new file mode 100644
index 000000000000..84869923f789
--- /dev/null
+++ b/dev-haskell/criterion-measurement/criterion-measurement-0.2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: -fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Criterion measurement functionality and associated types"
+HOMEPAGE="https://github.com/haskell/criterion"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+	>=dev-haskell/base-compat-0.9:=[profile?]
+	>=dev-haskell/vector-0.7.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-fast
+}
diff --git a/dev-haskell/criterion-measurement/metadata.xml b/dev-haskell/criterion-measurement/metadata.xml
new file mode 100644
index 000000000000..54d806209f58
--- /dev/null
+++ b/dev-haskell/criterion-measurement/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">criterion-measurement</remote-id>
+		<remote-id type="github">haskell/criterion</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/criterion/Manifest b/dev-haskell/criterion/Manifest
index 3374d7b6fbac..eb5cd2de63ef 100644
--- a/dev-haskell/criterion/Manifest
+++ b/dev-haskell/criterion/Manifest
@@ -1,5 +1,2 @@
-DIST criterion-0.8.1.0.tar.gz 155095 BLAKE2B a5bd4a6c0cb7b3866199ae2f7fdb9d7e3e501af628c71873f23504ae5b4d9cb39f7e14c5b45c6310ea1c2dd2751aba44db9e5b26509a55d8d3fb350c170775fb SHA512 96dd101dfcbb4cfea446235137d163e9bb806b8dbc6ca7cdb19f380dc8c6ad0169f22b08acb638c0e731be659b1f761cc4f3d33154c5cda3f44bf6f854b1b485
-DIST criterion-1.0.2.0.tar.gz 1003368 BLAKE2B 7281cc53a3e9ef0d91bc8730bf6d43b864fb164a5b2e556c9809414a89db880d15eb20c759a9925228b5fdd0df368025a4287efd094b4a500b86e42e9ee5f602 SHA512 35063822e12bca0b8ad41d2e6fd2c6ddfd58432467d9fee7ca537e03fb0100dcf6c11565abd21c11c0736bc0e2c9977f248a559eec7c8b049c27ff54ea58f01a
-DIST criterion-1.1.0.0.tar.gz 1004534 BLAKE2B ad6697171457e20b6ce52cfeb36d472977adf7cb931a2bb192e66557265a31658a0b90dda59a0fbf264f8d2d0581b14b963797140166aabdbf32f443abd4a537 SHA512 959635b49fbe9aeaffb8eb072e9998934732028311031debf5dc3bcbe7ea89ea3a330fe6656272888896ee9ee5e324d1ea72b25fbc0b5c466eb060d654ca61b6
-DIST criterion-1.1.1.0.tar.gz 866254 BLAKE2B e750fdc50c7b6629761bbdf3642ccd64ebc08c2bff5798225a53fab26a72c441be7481d9372cedc6cfa39fae2a2ce8da4855a806318b9a1b52bb5926762b4210 SHA512 964b81cc160c7c402ece1de57fddbd8ae454934fe4d3ca30da9f0d8f036019a14e462a0b4a63a4c38992e295002e3fb2dd082960c4934a19b36463157ef3594a
-DIST criterion-1.1.4.0.tar.gz 119945 BLAKE2B 0064eb86a9d6b9298cb17cc7a4e45374e0e8ef2a7b4c2f5dbadc38ca7a75da940152479bd64ff15768f76db6c02c20833dd9fd5faac33196208e6f352b2a7485 SHA512 b503bd50cfeccfe6222ac1af91ad6d10b600cc9609a107d3b46c9e470ec39f2ce24d6debc730045b178b2c599575710c29940dc5c595ffb28e9243e02f624f0c
+DIST criterion-1.5.11.0.tar.gz 46082 BLAKE2B 8cca7ce2d7257cbf471efc1a5c00dcacfb26fe1ff1d5badf1544b2018a33aca43585f7c3afd3e661b67ee443ee424a897a5aa9ac0f653ae37ed2682eb784e558 SHA512 6efc1c59ebe2ca1c03e83174aa6cb742d8070c3c69d4a071187ff6a3abe09b42ba329dba09283fd483b75a6b4e61840af3596d0ab14648f86887cdd44e1480ce
+DIST criterion-1.6.3.0.tar.gz 47217 BLAKE2B d54d1271e870f8d0d976e90812943d6d62185c2ba66b176434c28bbca81a197df93f57c3bf02bf5bc11bff8d799ccdef4275490e142845b02824fc59bf895e6a SHA512 e753562678073c7686958f3649d959fae7946e02958ee9f8b0803aa6fe5fc64c66fda2524fd79777e976836f2c9b465675f3be2eca813e6b14986317543a8b46
diff --git a/dev-haskell/criterion/criterion-0.8.1.0.ebuild b/dev-haskell/criterion/criterion-0.8.1.0.ebuild
deleted file mode 100644
index bdb1e5227df0..000000000000
--- a/dev-haskell/criterion/criterion-0.8.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="https://github.com/bos/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.3.2.12:=[profile?]
-	>=dev-haskell/binary-0.6.3.0:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.11:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/criterion/criterion-1.0.2.0.ebuild b/dev-haskell/criterion/criterion-1.0.2.0.ebuild
deleted file mode 100644
index 67bd2a16b403..000000000000
--- a/dev-haskell/criterion/criterion-1.0.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	dev-haskell/ansi-wl-pprint:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	>=dev-haskell/cassava-0.3.0.0:=[profile?]
-	dev-haskell/either:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.13.2.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/criterion/criterion-1.1.0.0.ebuild b/dev-haskell/criterion/criterion-1.1.0.0.ebuild
deleted file mode 100644
index 189ff62eb5fb..000000000000
--- a/dev-haskell/criterion/criterion-1.1.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	>=dev-haskell/cassava-0.3.0.0:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.13.2.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/criterion/criterion-1.1.1.0.ebuild b/dev-haskell/criterion/criterion-1.1.1.0.ebuild
deleted file mode 100644
index 717002631465..000000000000
--- a/dev-haskell/criterion/criterion-1.1.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	>=dev-haskell/cassava-0.3.0.0:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.13.2.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/criterion/criterion-1.1.4.0.ebuild b/dev-haskell/criterion/criterion-1.1.4.0.ebuild
deleted file mode 100644
index 0b9207692521..000000000000
--- a/dev-haskell/criterion/criterion-1.1.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -fast
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Robust, reliable performance measurement and analysis"
-HOMEPAGE="http://www.serpentine.com/criterion"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
-	>=dev-haskell/cassava-0.3.0.0:=[profile?]
-	dev-haskell/code-page:=[profile?]
-	>=dev-haskell/glob-0.7.2:=[profile?]
-	>=dev-haskell/hastache-0.6.0:=[profile?]
-	dev-haskell/js-flot:=[profile?]
-	dev-haskell/js-jquery:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.13:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/statistics-0.13.2.1:=[profile?] <dev-haskell/statistics-0.14:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-fast
-}
diff --git a/dev-haskell/criterion/criterion-1.5.11.0.ebuild b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
new file mode 100644
index 000000000000..56d3b23f8959
--- /dev/null
+++ b/dev-haskell/criterion/criterion-1.5.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Robust, reliable performance measurement and analysis"
+HOMEPAGE="https://www.serpentine.com/criterion"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="embed-data-files"
+
+RDEPEND=">=dev-haskell/aeson-1:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/ansi-wl-pprint-0.6.7.2:=[profile?]
+	>=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?]
+	>=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?]
+	>=dev-haskell/cassava-0.3.0.0:=[profile?]
+	dev-haskell/code-page:=[profile?]
+	>=dev-haskell/criterion-measurement-0.1.1.0:=[profile?] <dev-haskell/criterion-measurement-0.2:=[profile?]
+	>=dev-haskell/exceptions-0.8.2:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/glob-0.7.2:=[profile?]
+	>=dev-haskell/js-chart-2.9.4:=[profile?] <dev-haskell/js-chart-3:=[profile?]
+	>=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?]
+	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
+	>=dev-haskell/optparse-applicative-0.13:=[profile?]
+	>=dev-haskell/parsec-3.1.0:=[profile?]
+	>=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.16:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/transformers-compat-0.6.4:=[profile?]
+	>=dev-haskell/vector-0.7.1:=[profile?]
+	>=dev-haskell/vector-algorithms-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/base-compat
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.4
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed-data-files embed-data-files) \
+		--flag=-fast
+}
diff --git a/dev-haskell/criterion/criterion-1.6.3.0.ebuild b/dev-haskell/criterion/criterion-1.6.3.0.ebuild
new file mode 100644
index 000000000000..fdbe7d1c0daa
--- /dev/null
+++ b/dev-haskell/criterion/criterion-1.6.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -fast
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Robust, reliable performance measurement and analysis"
+HOMEPAGE="https://www.serpentine.com/criterion"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="embed-data-files"
+
+RDEPEND="
+	>=dev-haskell/aeson-1:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+	>=dev-haskell/base-compat-batteries-0.10:=[profile?] <dev-haskell/base-compat-batteries-0.14:=[profile?]
+	>=dev-haskell/binary-orphans-1.0.1:=[profile?] <dev-haskell/binary-orphans-1.1:=[profile?]
+	>=dev-haskell/cassava-0.3.0.0:=[profile?]
+	dev-haskell/code-page:=[profile?]
+	>=dev-haskell/criterion-measurement-0.2:=[profile?] <dev-haskell/criterion-measurement-0.3:=[profile?]
+	>=dev-haskell/glob-0.7.2:=[profile?]
+	>=dev-haskell/js-chart-2.9.4:=[profile?] <dev-haskell/js-chart-3:=[profile?]
+	>=dev-haskell/microstache-1.0.1:=[profile?] <dev-haskell/microstache-1.1:=[profile?]
+	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
+	>=dev-haskell/optparse-applicative-0.18:=[profile?] <dev-haskell/optparse-applicative-0.19:=[profile?]
+	>=dev-haskell/parsec-3.1.0:=[profile?]
+	>=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-1.8:=[profile?]
+	>=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-1.2:=[profile?]
+	>=dev-haskell/statistics-0.14:=[profile?] <dev-haskell/statistics-0.17:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/transformers-compat-0.6.4:=[profile?]
+	>=dev-haskell/vector-0.7.1:=[profile?]
+	>=dev-haskell/vector-algorithms-0.4:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	embed-data-files? ( <dev-haskell/file-embed-0.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		dev-haskell/base-compat
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.4
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed-data-files embed-data-files) \
+		--flag=-fast
+}
diff --git a/dev-haskell/criterion/metadata.xml b/dev-haskell/criterion/metadata.xml
index 46e84190a145..9356cfed7c07 100644
--- a/dev-haskell/criterion/metadata.xml
+++ b/dev-haskell/criterion/metadata.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library provides a powerful but simple way to measure the
-		performance of Haskell code.  It provides both a framework for
-		executing and analysing benchmarks and a set of driver functions
-		that makes it easy to build and run benchmarks, and to analyse their
-		results.
-		
-		The fastest way to get started is to read the documentation and
-		examples in the Criterion.Main module.
-	</longdescription>
+	<use>
+		<flag name="embed-data-files">
+			Embed the data files in the binary for a relocatable
+			executable. (Warning: This will increase the executabl
+			size significantly.)
+		</flag>
+	</use>
 	<upstream>
-		<remote-id type="github">bos/criterion</remote-id>
+		<remote-id type="hackage">criterion</remote-id>
+		<remote-id type="github">haskell/criterion</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild b/dev-haskell/crypto-api-tests/crypto-api-tests-0.3-r1.ebuild
index 4246b77e8b5c..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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,18 +14,18 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 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?]
-	>=dev-lang/ghc-6.12.1:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/crypto-api-tests/metadata.xml b/dev-haskell/crypto-api-tests/metadata.xml
index d327429f980e..937381521944 100644
--- a/dev-haskell/crypto-api-tests/metadata.xml
+++ b/dev-haskell/crypto-api-tests/metadata.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A test framework for hash and cipher operations using
-		the crypto-api interface.  Known answer tests (KATs)
-		for common cryptographic algorithms are included.
-		Patches welcome (both adding KATs for more algorithms
-		or property tests for classes of algorithms).
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-api/Manifest b/dev-haskell/crypto-api/Manifest
index d972be96689a..1ac92cf400d4 100644
--- a/dev-haskell/crypto-api/Manifest
+++ b/dev-haskell/crypto-api/Manifest
@@ -1,2 +1 @@
-DIST crypto-api-0.12.2.2.tar.gz 45271 BLAKE2B e5290eabe5ee7c70c3fc7e957853477a343716192cbbc39a30cc8b7515e12f3fcfa904cc01ef4262663ead64dd5c2fe34097576cd2e9aa89fac2f888651464e6 SHA512 340aefd9f8b24d99866fce26bd3eaba8484be6e15648a2ff1a0a051f8974514a50f809f8d2539c7fe747dbe1b6946a1ecfa8a2966548391e71b498d19e79cc86
-DIST crypto-api-0.13.2.tar.gz 47877 BLAKE2B e9a10cdc7ab66ce4155856feb4ce4df93e7f49785fb9571f326377f9b5faf5a939aa625d9ad75bf31835b2a764bacb2a2a762b4d25c20faaaeedcfb205d20cb8 SHA512 2803862a714c3f448aa63469171fc68835ea9648a94d69ec76a32d20c1ed480aa3ecacedc3bf1e674797430c5d2966ceea4a83e38e827a68d2fab78fb4c8567c
+DIST crypto-api-0.13.3.tar.gz 48346 BLAKE2B eeec2644fe43218c8e647bd84e3fad31079cb560cb25a078853ae40cb8be617a05fcc55ca844811f1356d8f5a8088583497d79e38f808d12af4695bc05bba7d0 SHA512 1228fe857e235a0d5692916507a42e622f9769325ae9a6a7828270dcb64fe38cc094eec3fc8cad2f28b01bd8de98b1dc637a17aab1db1568a82cb91ebc65c382
diff --git a/dev-haskell/crypto-api/crypto-api-0.12.2.2.ebuild b/dev-haskell/crypto-api/crypto-api-0.12.2.2.ebuild
deleted file mode 100644
index d991bf058e10..000000000000
--- a/dev-haskell/crypto-api/crypto-api-0.12.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A generic interface for cryptographic operations"
-HOMEPAGE="https://github.com/TomMD/crypto-api"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="all-cpolys"
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-		dev-haskell/entropy:=[profile?]
-		>=dev-haskell/tagged-0.1:=[profile?]
-		dev-haskell/transformers:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag all-cpolys all_cpolys)
-}
diff --git a/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild b/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild
deleted file mode 100644
index 982a547b9ab4..000000000000
--- a/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A generic interface for cryptographic operations"
-HOMEPAGE="https://github.com/TomMD/crypto-api"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="all-cpolys"
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-	dev-haskell/entropy:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag all-cpolys all_cpolys)
-}
diff --git a/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
new file mode 100644
index 000000000000..11b8ea52c64a
--- /dev/null
+++ b/dev-haskell/crypto-api/crypto-api-0.13.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A generic interface for cryptographic operations"
+HOMEPAGE="https://github.com/TomMD/crypto-api"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="all-cpolys"
+
+RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
+	dev-haskell/entropy:=[profile?]
+	>=dev-haskell/tagged-0.1:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag all-cpolys all_cpolys)
+}
diff --git a/dev-haskell/crypto-api/metadata.xml b/dev-haskell/crypto-api/metadata.xml
index 210ea2464604..1d7d6bf55284 100644
--- a/dev-haskell/crypto-api/metadata.xml
+++ b/dev-haskell/crypto-api/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="all-cpolys">Build all the CMAC polynomes up to 10000 bits instead of just the usual ones</flag>
+	</use>
 	<longdescription>
 		A generic interface for cryptographic operations (hashes, ciphers, randomness).
 		Maintainers of hash and cipher implementations are
@@ -16,10 +19,7 @@
 		one cryptographic algorithm (ex: padding) is within
 		scope of this package.
 	</longdescription>
-	<use>
-		<flag name="all-cpolys">Build all the CMAC polynomes up to 10000 bits instead of just the usual ones</flag>
-	</use>
 	<upstream>
-		<remote-id type="github">TomMD/crypto-api</remote-id>
+		<remote-id type="github">haskell-github-trust/crypto-api</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
index a7ccdd905aea..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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,19 +14,19 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
 	>=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?]
 	dev-haskell/test-framework-quickcheck2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/crypto-cipher-tests/metadata.xml b/dev-haskell/crypto-cipher-tests/metadata.xml
index 8c2fb2ea1e16..2485d8951fed 100644
--- a/dev-haskell/crypto-cipher-tests/metadata.xml
+++ b/dev-haskell/crypto-cipher-tests/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Generic cryptography cipher tests
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
 	</upstream>
diff --git a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
index ffa134fe1227..d1ab368b7d9e 100644
--- a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
+++ b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,12 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
 	>=dev-haskell/securemem-0.1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/crypto-cipher-types/metadata.xml b/dev-haskell/crypto-cipher-types/metadata.xml
index 28daedbd609f..2485d8951fed 100644
--- a/dev-haskell/crypto-cipher-types/metadata.xml
+++ b/dev-haskell/crypto-cipher-types/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Generic cryptography cipher types
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
 	</upstream>
diff --git a/dev-haskell/crypto-conduit/Manifest b/dev-haskell/crypto-conduit/Manifest
deleted file mode 100644
index 9dce629e7d67..000000000000
--- a/dev-haskell/crypto-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crypto-conduit-0.5.5.tar.gz 6883 BLAKE2B e0bc6eae04d0da1d0b04135a4d2321a2fc07189010dddfe8d03b161b62d97c631eda0f7f6318b7827a4b6f7fd23d491a13718bddde33d51d8c87baf8f971ba78 SHA512 4fb9df7a5434af1c3bf48e5649b4dc56ee07d03f4f00647adfc61eaf1a0c54326f7374e27717b92106f34435c5ba38eeb7b23082e9095dfbaf131598a8791887
diff --git a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r1.ebuild b/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r1.ebuild
deleted file mode 100644
index d483a856c2b5..000000000000
--- a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -old-crypto-api
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conduit interface for cryptographic operations (from crypto-api)"
-HOMEPAGE="https://github.com/prowdsponsor/crypto-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+conduit11"
-
-RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/crypto-api-0.13
-		>=dev-haskell/cryptocipher-0.4
-		>=dev-haskell/cryptohash-cryptoapi-0.1
-		>=dev-haskell/hspec-1.3
-		>=dev-haskell/skein-0.1 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'cereal       >= 0.3 && < 0.5' 'cereal       >= 0.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit11 conduit11) \
-		--flag=-old-crypto-api
-}
diff --git a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r2.ebuild b/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r2.ebuild
deleted file mode 100644
index 840e5f2b47f7..000000000000
--- a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -old-crypto-api
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conduit interface for cryptographic operations (from crypto-api)"
-HOMEPAGE="https://github.com/prowdsponsor/crypto-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+conduit11"
-
-RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/crypto-api-0.13
-		>=dev-haskell/cryptocipher-0.4
-		>=dev-haskell/cryptohash-cryptoapi-0.1
-		>=dev-haskell/hspec-1.3
-		>=dev-haskell/skein-0.1 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'cereal       >= 0.3 && < 0.5' 'cereal       >= 0.3' \
-		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit11 conduit11) \
-		--flag=-old-crypto-api
-}
diff --git a/dev-haskell/crypto-conduit/metadata.xml b/dev-haskell/crypto-conduit/metadata.xml
deleted file mode 100644
index 0b8019ffa1d2..000000000000
--- a/dev-haskell/crypto-conduit/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains everything that you need to use a
-		cryptographic package that supports the @crypto-api@ package
-		using conduits from the @conduit@ package.
-	</longdescription>
-	<use>
-		<flag name="conduit11">Use conduit &gt;= 1.1.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">prowdsponsor/crypto-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-numbers/Manifest b/dev-haskell/crypto-numbers/Manifest
deleted file mode 100644
index 158f87744699..000000000000
--- a/dev-haskell/crypto-numbers/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST crypto-numbers-0.2.3.tar.gz 15714 BLAKE2B d8b27bbbcc64a8c7cf3e64d2ee1f04c76bae264815f7a9c0a1ab098f915f448708496b9a0dc2cce655cba5e55ccbcbea65e2b3070bb773fc7190841a2b33261d SHA512 5ab8fdbcfb89f448148886fa7b31994452278da7d2ff8891702dddc861b6e3bdad432756fd639ba85534e1b6846b86a666f388bbae43d11a60a35d151cf1fa7e
-DIST crypto-numbers-0.2.7.tar.gz 16064 BLAKE2B 52e7373d56f87d46f585e36019e2fc1ba3f1710ec2530a14069a839b348859e1f9ba784ea91c7241d767d488a15433f0381e5249775f9501197ecbcd051f8aeb SHA512 4fac18f6d76d5cc9ae82d177a45c155847264494dd112db80a76c955faee4917b4b3c563bb76eb3a08923bb020138307a7115d78fe0caa20fd3fb2b12d679947
diff --git a/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild b/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild
deleted file mode 100644
index ca0c64b465e3..000000000000
--- a/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptographic numbers: functions and algorithms"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-numbers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/byteable
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild b/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
deleted file mode 100644
index 7f5489f6fd4d..000000000000
--- a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: integer-gmp:gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptographic numbers: functions and algorithms"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-numbers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gmp"
-
-RDEPEND=">=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/byteable
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag gmp integer-gmp)
-}
diff --git a/dev-haskell/crypto-numbers/metadata.xml b/dev-haskell/crypto-numbers/metadata.xml
deleted file mode 100644
index 72aff463b419..000000000000
--- a/dev-haskell/crypto-numbers/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cryptographic numbers: functions and algorithms
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-numbers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-pubkey-types/Manifest b/dev-haskell/crypto-pubkey-types/Manifest
deleted file mode 100644
index fc71d2eaa116..000000000000
--- a/dev-haskell/crypto-pubkey-types/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crypto-pubkey-types-0.4.3.tar.gz 11234 BLAKE2B 8b2b0fc64c6b4355264826d01de7457fddf82003748a29d636d52368874dbbd53f303e3bbad5316e9c5ac9fec3cb9021f60e0b749bc2147c15a6ffc9afc11ff8 SHA512 08e6b74ded0decaaf87b4b9ec15af2e8bbeb7095701b5e2062b570af1ecb3d25eb706d6bd91795acfaaf7d09d0e9040359736a0a06a1bc593ef0d8aaf3e374d6
diff --git a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild b/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
deleted file mode 100644
index 4b4635f40e7c..000000000000
--- a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generic cryptography Public keys algorithm types"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-pubkey-types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
-	>=dev-haskell/asn1-types-0.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/crypto-pubkey-types/metadata.xml b/dev-haskell/crypto-pubkey-types/metadata.xml
deleted file mode 100644
index ee02a3ff8488..000000000000
--- a/dev-haskell/crypto-pubkey-types/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generic cryptography public keys algorithm types
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-pubkey-types</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-pubkey/Manifest b/dev-haskell/crypto-pubkey/Manifest
deleted file mode 100644
index 9cc3b9c05285..000000000000
--- a/dev-haskell/crypto-pubkey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crypto-pubkey-0.2.8.tar.gz 46405 BLAKE2B ee04b805204899ec6fdc1cfcda7a1ac83010805396308f9be7b2e885d52245f7ac77ad9caa7028afc2a3deaa594126a36ab4b93631227cf274e40dacb252b56a SHA512 9e7d54421fdb3c53964688831a2ca5f5379e141e7924af76916d868300833c0dbde22392e1452f80aaf2ec7a9a52de6b429a6f8f78b8fbef6c32f2f31202ed06
diff --git a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild b/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
deleted file mode 100644
index eb419ccd7dc9..000000000000
--- a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Public Key cryptography"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-pubkey"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-numbers-0.2.2:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	>=dev-haskell/cryptohash-0.9.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-kat
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/crypto-pubkey/metadata.xml b/dev-haskell/crypto-pubkey/metadata.xml
deleted file mode 100644
index 07093d50668a..000000000000
--- a/dev-haskell/crypto-pubkey/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Public Key cryptography
-		
-		Supports RSA PKCS15, RSA OAEP, RSA PSS, DSA, ElGamal signature.
-		
-		Also have primitive support for Diffie Hellman, and ElGamal encryption
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-pubkey</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-random-api/Manifest b/dev-haskell/crypto-random-api/Manifest
deleted file mode 100644
index 4ae8f0ab8972..000000000000
--- a/dev-haskell/crypto-random-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crypto-random-api-0.2.0.tar.gz 3397 BLAKE2B b0a895186bf6c4f9487777eb7a86404d5972fa5af6002f2692a234ff608fe6c4f28f2d6cd69f2fe4c60953f2fdf67aad5293ffc7396b729e478bb59fa060c416 SHA512 8f7df05e54e053456e3ebe9394b19beb2a37dfed30cfb5fb673f591415dc6fabe105af51e838fbe73ef078906d94562080ca465b0c6b4e1537bd4a6e066244f7
diff --git a/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild b/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild
deleted file mode 100644
index 0702d0576abf..000000000000
--- a/dev-haskell/crypto-random-api/crypto-random-api-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple random generators API for cryptography related code"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-random-api"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/entropy:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/crypto-random-api/metadata.xml b/dev-haskell/crypto-random-api/metadata.xml
deleted file mode 100644
index a2c58a20bef1..000000000000
--- a/dev-haskell/crypto-random-api/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple random generators API for cryptography related code
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-random-api</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypto-random/Manifest b/dev-haskell/crypto-random/Manifest
index b27225ca77c6..559a3d8e5314 100644
--- a/dev-haskell/crypto-random/Manifest
+++ b/dev-haskell/crypto-random/Manifest
@@ -1,2 +1 @@
-DIST crypto-random-0.0.7.tar.gz 8999 BLAKE2B 121268501910f7d507c2d1c92d8807a9d17e1dd65e9af2d2a760a5f763d686c1b085c47dcf4f584e533fac83fe023ce02bbee5c55c5e8714d9f35e6a5f195563 SHA512 7e96f602c2cd194601f7feeb4589ab4606542c81bc27b566edb90030c010da3998b235cd2b229ca781ea147defe4677077897343b4ef561e0858ad71a4a7a409
 DIST crypto-random-0.0.9.tar.gz 9256 BLAKE2B f9433a75c7285e92feda4f5d3db165c0f530d59ab95f733755c138bfaa162b0948b84ca912dbf26fc80b06d5cee7670361defa308d1ea5926a0e1cd385d39976 SHA512 07e298e2e3846b48330af92a46ab8550982ad74f6154c59a531762d9282f6712c1e867a48ed6cf4d967f463f52c1af4287a74552aeff0635480ea21cd54a7a24
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild
deleted file mode 100644
index 19c69379f71f..000000000000
--- a/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple cryptographic random related types"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-random"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/securemem:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
index 075a5fa7ad44..50fbd85a0783 100644
--- a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
+++ b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,11 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/securemem:=[profile?]
-	dev-haskell/vector:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-haskell/crypto-random/metadata.xml b/dev-haskell/crypto-random/metadata.xml
index 5b827aacddd8..44cc6c6dcf10 100644
--- a/dev-haskell/crypto-random/metadata.xml
+++ b/dev-haskell/crypto-random/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Simple cryptographic random related types
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-crypto-random</remote-id>
 	</upstream>
diff --git a/dev-haskell/crypto/Manifest b/dev-haskell/crypto/Manifest
deleted file mode 100644
index f95b01db2e49..000000000000
--- a/dev-haskell/crypto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Crypto-4.2.5.1.tar.gz 56474 BLAKE2B a5e86c4e161b1e89c37b3feff1fc3a30911cf6401a7bb6c3cb1d605fb2ebb5bb145ff2a398fa6fab59e194e1b5f235eb8212f3ac70b21c32202173d0d15dff65 SHA512 3b965f6a06784d3e8996aaae2622fa5b8e4a645a324618ff497f565230a8db525a0a5305d5cc5166283b2a24242df4554b29eb015326d416dc705f252ef456ac
diff --git a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild b/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
deleted file mode 100644
index 221307abdb08..000000000000
--- a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Crypto"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collects together existing Haskell cryptographic functions into a package"
-HOMEPAGE="https://hackage.haskell.org/package/Crypto"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.4.0.1:2=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_test() {
-	TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest"
-
-	for t in $TESTS; do
-		einfo "Running test $t..."
-		# the quickcheck tests doesn't fail when the test fails...
-		"${S}/dist/build/$t/$t" || die "Test $t failed"
-	done
-}
-
-src_install() {
-	cabal_src_install
-
-	rm -rf "${D}/usr/bin" 2>/dev/null
-}
diff --git a/dev-haskell/crypto/metadata.xml b/dev-haskell/crypto/metadata.xml
deleted file mode 100644
index 2dbebd8cd714..000000000000
--- a/dev-haskell/crypto/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		DES, Blowfish, AES, TEA, SHA1, MD5, RSA, BubbleBabble,
-		Hexdump, Support for Word128, Word192 and Word256 and Beyond, PKCS5
-		Padding, Various Encryption Modes e.g. Cipher Block Chaining all in one package,
-		with HUnit and QuickCheck tests, and examples.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cryptocipher/Manifest b/dev-haskell/cryptocipher/Manifest
deleted file mode 100644
index 2939c5ccb50f..000000000000
--- a/dev-haskell/cryptocipher/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cryptocipher-0.5.2.tar.gz 22384 BLAKE2B 7133784c97498bbd0c5b39c9bea0e76534c7b3bec26683227277e9ef8474b5cc2cc6e67de46c609b5545a074bae8a3a8401de826b4bb45a30d48df29bf1da4b3 SHA512 f9e76805b27b7002f5393893d9cac30998c82f3d5759be48a25907c95ab0d8250c2e54dea252c1881bca5117fb2fe3fcc59b304265b6db286e1f1a2d733a631d
-DIST cryptocipher-0.6.2.tar.gz 2027 BLAKE2B 617f3c184baa3acb6a248b60dc928fc4696d4818b31a55fe111838154a1f1a6e3fd42c96cb4d8ecceb21ae0145550fe2b097635524207b5d9e63f41e29047d67 SHA512 d63984d26e355ff613a4176c11634f1012f8b9ec43180ffed236f37aa7a1b1dafee1871799eec53774544518c886c27ae19bb0b058288da6bd8f2b45eaa5e5ab
diff --git a/dev-haskell/cryptocipher/cryptocipher-0.5.2.ebuild b/dev-haskell/cryptocipher/cryptocipher-0.5.2.ebuild
deleted file mode 100644
index c049ccc5cc4c..000000000000
--- a/dev-haskell/cryptocipher/cryptocipher-0.5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Symmetrical block and stream ciphers"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-		dev-haskell/cipher-aes:=[profile?]
-		dev-haskell/cipher-rc4:=[profile?]
-		=dev-haskell/cpu-0.1*:=[profile?]
-		>=dev-haskell/crypto-api-0.5:=[profile?]
-		dev-haskell/primitive:=[profile?]
-		>=dev-haskell/vector-0.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/cryptohash
-			dev-haskell/entropy
-			>=dev-haskell/quickcheck-2
-			>=dev-haskell/test-framework-0.3.3
-			>=dev-haskell/test-framework-quickcheck2-0.2.9
-		)"
diff --git a/dev-haskell/cryptocipher/cryptocipher-0.6.2.ebuild b/dev-haskell/cryptocipher/cryptocipher-0.6.2.ebuild
deleted file mode 100644
index 7e4abba23154..000000000000
--- a/dev-haskell/cryptocipher/cryptocipher-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Symmetrical block and stream ciphers"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cipher-aes-0.2.3:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	>=dev-haskell/cipher-blowfish-0.0:=[profile?] <dev-haskell/cipher-blowfish-0.1:=[profile?]
-	>=dev-haskell/cipher-camellia-0.0:=[profile?] <dev-haskell/cipher-camellia-0.1:=[profile?]
-	>=dev-haskell/cipher-des-0.0:=[profile?] <dev-haskell/cipher-des-0.1:=[profile?]
-	>=dev-haskell/cipher-rc4-0.1.3:=[profile?] <dev-haskell/cipher-rc4-0.2:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/cryptocipher/metadata.xml b/dev-haskell/cryptocipher/metadata.xml
deleted file mode 100644
index 927dcf71828b..000000000000
--- a/dev-haskell/cryptocipher/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Symmetrical Block, Stream and PubKey Ciphers
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash-conduit/Manifest b/dev-haskell/cryptohash-conduit/Manifest
deleted file mode 100644
index b645fc50207a..000000000000
--- a/dev-haskell/cryptohash-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cryptohash-conduit-0.1.1.tar.gz 2318 BLAKE2B 3bc4d926d020b899c34169211b4b74394260e222e098d5afbc886898a45205b13cb89661699ae169f20a8ac092439463e74b5dffeb65131b891126ece5e80c6e SHA512 6382a05b35bae34b53fd1ad6d897c25ca149ed852360c8f775587efcd3c29e45ff854f96ddbc9b446e04a4dd5698b1f5e2af754345f7d5af8f587b73b57fdec0
diff --git a/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild b/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild
deleted file mode 100644
index 60b957aa809c..000000000000
--- a/dev-haskell/cryptohash-conduit/cryptohash-conduit-0.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="cryptohash conduit"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/cryptohash-conduit/metadata.xml b/dev-haskell/cryptohash-conduit/metadata.xml
deleted file mode 100644
index 877d639f87fb..000000000000
--- a/dev-haskell/cryptohash-conduit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Support all the @cryptohash@ package using conduits from
-		the @conduit@ package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cryptohash-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash-cryptoapi/Manifest b/dev-haskell/cryptohash-cryptoapi/Manifest
deleted file mode 100644
index dc021a7f5ced..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cryptohash-cryptoapi-0.1.3.tar.gz 2922 BLAKE2B bce61995eafdcf5c839cd3f035245cccaf59a676f515836a0afe2862fcc946f1cd143bcb67fd1ceb660d8bcbdecb2791a8190a226dc4c3e9bfc90b936becba6b SHA512 c33af37d4d1d8f3b13ad1ed93db4ec138ea3bef315006ee8117ccacb5c36e2afeb92ae903d46de537f0fbea2a262c5c487eb32d3e1d7099de27b53cc4f17889a
-DIST cryptohash-cryptoapi-0.1.4.tar.gz 3094 BLAKE2B afd5169c172965eadacf9113a03a58cfff9350b63c339170788585437777deb41998322ea3d33f5d9c2c77b4f927e4457bfcaf8f4f92c6f77e85bffc51c02a47 SHA512 f5add1c8922e682d5d08073d0a3d03c6d5545f38edd90821bad7a92f354203ca380ca7e302b4b259bb9e2ce6ae09b1a2428e981e2d745a4a1b1a5cff696621e2
diff --git a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.3.ebuild b/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.3.ebuild
deleted file mode 100644
index 8c67129a3e48..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Crypto-api interfaces for cryptohash"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash-cryptoapi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-	>=dev-haskell/crypto-api-0.11:=[profile?]
-	>=dev-haskell/cryptohash-0.8.0:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild b/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
deleted file mode 100644
index 80f54c1e6f27..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Crypto-api interfaces for cryptohash"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash-cryptoapi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-	>=dev-haskell/crypto-api-0.11:=[profile?]
-	>=dev-haskell/cryptonite-0.13:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/tagged-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/cryptohash-cryptoapi/metadata.xml b/dev-haskell/cryptohash-cryptoapi/metadata.xml
deleted file mode 100644
index 3c253aeae484..000000000000
--- a/dev-haskell/cryptohash-cryptoapi/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Crypto-api interfaces for cryptohash
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cryptohash-cryptoapi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/cryptohash-md5/Manifest b/dev-haskell/cryptohash-md5/Manifest
index 125b0c8915bf..238f8eb82871 100644
--- a/dev-haskell/cryptohash-md5/Manifest
+++ b/dev-haskell/cryptohash-md5/Manifest
@@ -1 +1,4 @@
+DIST cryptohash-md5-0.11.100.1-rev6.cabal 3964 BLAKE2B 377323b2129dc35c1345226cffce3de90e1b584681c2c500d42767364057aafcc27825e1b524b7c65b27cb623c3fc4f9a0ec6bdd0cb65c36ce7e0768849511a6 SHA512 6b7be0bd0b5e663fd6cce73de16b6396818762a892cf30f6cf9cd08425f06c8c078cc4ee5634d843ffe4014c55c207535589a323dae1c5ff3f76883805e55b54
 DIST cryptohash-md5-0.11.100.1.tar.gz 10472 BLAKE2B cc7c99922b05c8df11a7253e6c0dd3ab1399ff739548280fa762b01c507e6d620ab51ccf6c6e791572ae432448118356d1b8879767f4ca245ae59e0daaed2058 SHA512 f2efb197005ed5f12a7c2be490a64a83186cacb34eaedec6cbd76e52c30221733da1d31201c5209538226508db760fd9eed0afc8d72643e1509b32c7287cb12e
+DIST cryptohash-md5-0.11.101.0-rev2.cabal 3104 BLAKE2B 7ee2a97bd67c9d39adb4dac059b142083ce807b1bf9e2bec8012dca3a223cce23f28ffd1f2c8587dd1c3215a2387c2d6b3f13cd3d30838183dd0bd31d233ecf1 SHA512 f1cc76e5e00197085ba8cc10eb7a771ac8a55117b51f4eac992f40f65237c70b5e4ab9b25b9312b667d4efdaea289e3f5cdc33b493ff96c9c3819efa60e67a26
+DIST cryptohash-md5-0.11.101.0.tar.gz 11872 BLAKE2B b2aafbfef1ecc51a7a21262210df478ea0d0c33539b940d71ffcb4cf28b31ff801f6fde5fb27c70a99f7ea9a1682cbbb4cf13ebbe015ee3712dda76318563643 SHA512 6116b384e76927aed06748fac6088280d1ecc7eb5886692c287e971761b98960657b106ba8a700bd0c5b2e552797079e143836af3463acd75bbac207633867a4
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 0da3dff2e031..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
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+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 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
@@ -28,11 +28,10 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/tasty-quickcheck-0.8 )
 "
 
-src_prepare() {
-	cabal_chdeps \
-		'base             >= 4.5   && < 4.10' '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'
-	default
-}
+CABAL_CHDEPS=(
+	'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/cryptohash-md5-0.11.101.0.ebuild b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.101.0.ebuild
new file mode 100644
index 000000000000..f23597a5d998
--- /dev/null
+++ b/dev-haskell/cryptohash-md5/cryptohash-md5-0.11.101.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Fast, pure and practical MD5 implementation"
+HOMEPAGE="https://github.com/haskell-hvr/cryptohash-md5"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/base16-bytestring-1.0.1.0 <dev-haskell/base16-bytestring-1.1
+		>=dev-haskell/puremd5-2.1.3 <dev-haskell/puremd5-2.2
+		=dev-haskell/tasty-1.4*
+		=dev-haskell/tasty-hunit-0.10*
+		=dev-haskell/tasty-quickcheck-0.10*
+	)
+"
diff --git a/dev-haskell/cryptohash-md5/metadata.xml b/dev-haskell/cryptohash-md5/metadata.xml
index fc0f69d6e24b..ce013d3a56a1 100644
--- a/dev-haskell/cryptohash-md5/metadata.xml
+++ b/dev-haskell/cryptohash-md5/metadata.xml
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A practical incremental and one-pass, pure API to the
-		&lt;https://en.wikipedia.org/wiki/MD5 MD5 hash algorithm&gt;
-		(including &lt;https://en.wikipedia.org/wiki/HMAC HMAC&gt; support)
-		with performance close to the fastest implementations available in other languages.
-		
-		The implementation is made in C with a haskell FFI wrapper that hides the C implementation.
-		
-		NOTE: This package has been forked off @cryptohash-0.11.7@ because the @cryptohash@ package
-		has been deprecated and so this package continues to satisfy the need for a lightweight package
-		providing the MD5 hash algorithm without any dependencies on packages other than
-		@base@ and @bytestring@.
-		
-		Consequently, this package can be used as a drop-in replacement for @cryptohash@&#39;s
-		&quot;Crypto.Hash.MD5&quot; module, though with a clearly smaller footprint.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">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 763430616331..8691986056e1 100644
--- a/dev-haskell/cryptohash-sha1/Manifest
+++ b/dev-haskell/cryptohash-sha1/Manifest
@@ -1 +1,4 @@
+DIST cryptohash-sha1-0.11.100.1-rev6.cabal 4354 BLAKE2B f89a3045c1ea145f3ac2af440eeea2d213a69c5abaa0f9eb1407a2da34a08aabb7df966f014a9b903eff5ae9ee3262703097e6b5f5df0b13252d3889c8a2776c SHA512 3077375cbff05b415168152eeb213a9ec1c0d0d48f63b394f65399f7ae1421adc8f0e760e1ec7f7a5f83c78377151209c77d23ab01cf0ceb36e899aa000310f3
 DIST cryptohash-sha1-0.11.100.1.tar.gz 10198 BLAKE2B 5d9835feeb43a80c83de0e390d59efc908fd538ed4146ace4eb0cd67392503cf414a2324968e8249f2b506978348caa6e92c70e82c52eaa7ac14e3956388f05e SHA512 e3528c70501ffaf4649adc0fe120a0b333329761fa66505083269afa67828c16695fd91567035adef0b77915df47a6bcc99d2d90f0ecb26eda583829261cb1bc
+DIST cryptohash-sha1-0.11.101.0-rev2.cabal 3094 BLAKE2B fc048a5eaefca1df4b1748f46f48f69e7571f90fdfdb3524b7556a8b6a9b3f7b58d363209ec20d9f4892b1b3e69dc1394287e7e70e7009f06dd75bc02e267910 SHA512 1dbf660ca81c2d8633dd6255602fa6b5f2999f55400bd75391be0049ca8bcf221d14b5d294999427ed193aa0514d68e05509b85fc5a2fe9c8be574b0a0542f9a
+DIST cryptohash-sha1-0.11.101.0.tar.gz 11563 BLAKE2B 4da99b2b4943e3909d3af24f62fb0ecf4c87370075f280a7e9ea44956cd58df9f49076a0d90b60bec9a7dcb3d24df032f6b5ef07644a4b63bdf1099458996163 SHA512 4384fc2f63750400561b5dbea0a343510306d755131121346d6a52cb9420cb12fc7d20247f044beb0ea55ae254ce666edc982d76e999c0762894f405e9b6441e
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 c53c2bcf8aa6..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
@@ -1,21 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+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 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
@@ -28,11 +28,10 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/tasty-quickcheck-0.8 )
 "
 
-src_prepare() {
-	cabal_chdeps \
-		'base             >= 4.5   && < 4.10' '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'
-	default
-}
+CABAL_CHDEPS=(
+	'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/cryptohash-sha1-0.11.101.0.ebuild b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.101.0.ebuild
new file mode 100644
index 000000000000..5c3d3f9e7023
--- /dev/null
+++ b/dev-haskell/cryptohash-sha1/cryptohash-sha1-0.11.101.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Fast, pure and practical SHA-1 implementation"
+HOMEPAGE="https://github.com/haskell-hvr/cryptohash-sha1"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/base16-bytestring-1.0.1.0 <dev-haskell/base16-bytestring-1.1
+		>=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7
+		>=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/cryptohash-sha1/metadata.xml b/dev-haskell/cryptohash-sha1/metadata.xml
index 6967df1105e8..fede62a037d9 100644
--- a/dev-haskell/cryptohash-sha1/metadata.xml
+++ b/dev-haskell/cryptohash-sha1/metadata.xml
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A practical incremental and one-pass, pure API to the
-		&lt;https://en.wikipedia.org/wiki/SHA-1 SHA-1 hash algorithm&gt;
-		(including &lt;https://en.wikipedia.org/wiki/HMAC HMAC&gt; support)
-		with performance close to the fastest implementations available in other languages.
-		
-		The implementation is made in C with a haskell FFI wrapper that hides the C implementation.
-		
-		NOTE: This package has been forked off @cryptohash-0.11.7@ because the @cryptohash@ package has been
-		deprecated and so this package continues to satisfy the need for a lightweight package
-		providing the SHA1 hash algorithm without any dependencies on packages other than
-		@base@ and @bytestring@.
-		
-		Consequently, this package can be used as a drop-in replacement for @cryptohash@&#39;s
-		&quot;Crypto.Hash.SHA1&quot; module, though with a clearly smaller footprint.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">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 dbc621d43275..0f862c30cc24 100644
--- a/dev-haskell/cryptohash-sha256/Manifest
+++ b/dev-haskell/cryptohash-sha256/Manifest
@@ -1,2 +1,3 @@
-DIST cryptohash-sha256-0.11.100.1.tar.gz 10885 BLAKE2B 09f33b351b72bb9b8892409b5b140bd446f98cb7fdc349f483a3b719753c0a0ca08c0557ccff2bc4bfedb4336b3c5d046d15548cc8e3a404d69efcf2a5c744c2 SHA512 df6a8c7a4796f3b94faf0c1073b552eccf7dfbe6ab1489fef391e6342f34b3cb29991d1313aa5da11a90cb37bcd43c23eea12073ad4c7190926005de952c39e2
 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
diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild
deleted file mode 100644
index b182becb5348..000000000000
--- a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, pure and practical SHA-256 implementation"
-HOMEPAGE="https://github.com/hvr/cryptohash-sha256"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2
-		>=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7
-		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
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 7dea0e17ebb0..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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.4.9999
 #hackport: flags: -exe
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -29,14 +29,13 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/tasty-quickcheck-0.8 )
 "
 
-src_prepare() {
-	cabal_chdeps \
-		'base             >= 4.5   && < 4.11' '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'
-	default
-}
+CABAL_CHDEPS=(
+	'base             >= 4.5   && < 4.11' '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'
+)
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.102.1.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.102.1.ebuild
new file mode 100644
index 000000000000..0e9b0ff14db7
--- /dev/null
+++ b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.102.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: exe:executable,+use-cbits
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, pure and practical SHA-256 implementation"
+HOMEPAGE="https://github.com/hvr/cryptohash-sha256"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+CABAL_CHBINS=(
+	'sha256sum' 'cryptohash-sha256sum'
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.10.6:=
+	executable? (
+		|| (
+			( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2 )
+			=dev-haskell/base16-bytestring-1.0*
+		)
+		dev-haskell/base16-bytestring:=[profile?]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/sha-1.6.4 <dev-haskell/sha-1.7
+		>=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.6
+		=dev-haskell/tasty-hunit-0.10*
+		=dev-haskell/tasty-quickcheck-0.10*
+		|| (
+			( >=dev-haskell/base16-bytestring-0.1.1 <dev-haskell/base16-bytestring-0.2 )
+			=dev-haskell/base16-bytestring-1.0*
+		)
+	)
+"
+
+src_configure() {
+	local conf_flags=(
+		$(cabal_flag executable exe)
+		--flag=use-cbits
+	)
+
+	haskell-cabal_src_configure "${conf_flags[@]}"
+}
diff --git a/dev-haskell/cryptohash-sha256/metadata.xml b/dev-haskell/cryptohash-sha256/metadata.xml
index 095ef6762db6..0abeaaf769d6 100644
--- a/dev-haskell/cryptohash-sha256/metadata.xml
+++ b/dev-haskell/cryptohash-sha256/metadata.xml
@@ -1,26 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		A practical incremental and one-pass, pure API to the
-		&lt;https://en.wikipedia.org/wiki/SHA-2 SHA-256 hash algorithm&gt;
-		with performance close to the fastest implementations available in other languages.
-		
-		The implementation is made in C with a haskell FFI wrapper that hides the C implementation.
-		
-		NOTE: This package has been forked off @cryptohash-0.11.7@ because the @cryptohash@ has been
-		deprecated and so this package continues to satisfy the need for a lightweight package
-		providing the SHA256 hash algorithm without any dependencies on packages other than
-		@base@ and @bytestring@.
-		
-		Consequently, this package can be used as a drop-in replacement for @cryptohash@'s
-		"Crypto.Hash.SHA256" module, though with a clearly smaller footprint.
-	</longdescription>
+	<use>
+		<flag name="executable">Build the cryptohash-sha256sum executable</flag>
+	</use>
 	<upstream>
+		<remote-id type="hackage">cryptohash-sha256</remote-id>
 		<remote-id type="github">hvr/cryptohash-sha256</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cryptohash/Manifest b/dev-haskell/cryptohash/Manifest
deleted file mode 100644
index 0a03707417b3..000000000000
--- a/dev-haskell/cryptohash/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cryptohash-0.10.0.tar.gz 63901 BLAKE2B 525338416b5ec73a7c8c261d9de4d5016e585fa32997ab75470dae43681ede364c1285a27a1bd1ac2883014d3e0cd73832c8bb7404ad8349933073b3879c3e78 SHA512 14a58c7d35feea846fc14821e532bd26046844a5d34274a46fcfd9cbc5100d414f980c95b64ef7ed5431993fb558962d6f7e262adc7297a54987dfa32cc4da2a
-DIST cryptohash-0.11.1.tar.gz 64985 BLAKE2B 2d67794751198575e6301f7f3f4c60416f89a9492aad1871e234a9a93ebf30ca79cbf84c3f1c5cdd2a56ae44575a84e927095fd9fa163eac39dae5b7438d5e19 SHA512 eb2da3e2c8a523354b81200b7ab3f36d29690d5f3311008ac24a5abaefe288551b67d7637b662f5a2b2b46bc5ef548ff6eae4f59ed9f1231ab9d8b0e6d039551
-DIST cryptohash-0.11.6.tar.gz 65798 BLAKE2B b7868955a8d5f2469dfff3d784c5c80cecfd498bad1c36feb12c53c6644a9bc0415c45bcb7641d515dd80c25d0052440e30f641b8ca2ca26d6a9dc0df96a9a56 SHA512 a6d3bd33104eb3b71d836323b330636cdce84165daa7e3b908296980468828c624a96db58cf9f953581986e090e53b78b10e15e361d354a00c9e9b49843a6956
-DIST cryptohash-0.11.9.tar.gz 25762 BLAKE2B a97de6b08f58ead9d51ae2042a52237d3cbea4eeb5d0138f4a90b1d65d545990297fd55ebb53d8458582790289b5a00eb3a82d1d08288e8ab100afa910a488e9 SHA512 d0eb07f59ae893df1a92a4dc45a98142e507ba3da25057ae4acf781b1b6200a2fb68dd2a19f1ba5f9395217bc81e7be1311a479dc3dcb4ec5338518a2f5239af
-DIST cryptohash-0.9.1.tar.gz 64991 BLAKE2B 86c26a40d1c5b77da226bc3a58a8bc19dd1c6214d40aeb802cfb87dfe6f1a398917c8f9a71b124a843bc7ae299b8392b1a121cf51b0522fd8afeb64caeeb0adf SHA512 773a16c1e16f8d2b48f4c107d22f14d439a15ffe9e92e43886538ee15e9349fdf53d1e15d20f888eaeac4fcaa07eb907b92de6f436b6655925a617f5139ac298
diff --git a/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild b/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild
deleted file mode 100644
index b7a44a1a548c..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild
deleted file mode 100644
index 502143ad01c4..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.6.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.6.ebuild
deleted file mode 100644
index a6ae43672881..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.11.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
deleted file mode 100644
index 96f3a8860c4b..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptonite-0.13:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/cryptohash/cryptohash-0.9.1.ebuild b/dev-haskell/cryptohash/cryptohash-0.9.1.ebuild
deleted file mode 100644
index 708b5bbf8d17..000000000000
--- a/dev-haskell/cryptohash/cryptohash-0.9.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="collection of crypto hashes, fast, pure and practical"
-HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cryptoapi"
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		cryptoapi? ( >=dev-haskell/cereal-0.2:=[profile?]
-			>=dev-haskell/crypto-api-0.5:=[profile?]
-			>=dev-haskell/tagged-0.1:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			>=dev-haskell/quickcheck-2
-			>=dev-haskell/test-framework-0.3.3
-			dev-haskell/test-framework-hunit
-			>=dev-haskell/test-framework-quickcheck2-0.2.9
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cryptoapi cryptoapi)
-}
diff --git a/dev-haskell/cryptohash/metadata.xml b/dev-haskell/cryptohash/metadata.xml
deleted file mode 100644
index 30d94fedcc23..000000000000
--- a/dev-haskell/cryptohash/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A collection of crypto hashes, with a practical incremental and one-pass, pure APIs,
-		with performance close to the fastest implementations available in others languages.
-		
-		The implementations are made in C with a haskell FFI wrapper that hide the C implementation.
-	</longdescription>
-	<use>
-		<flag name="cryptoapi">Defines crypto-api instances</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-cryptohash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/crypton-connection/Manifest b/dev-haskell/crypton-connection/Manifest
new file mode 100644
index 000000000000..8086567443ba
--- /dev/null
+++ b/dev-haskell/crypton-connection/Manifest
@@ -0,0 +1 @@
+DIST crypton-connection-0.3.1.tar.gz 9112 BLAKE2B c8915815d2ae6b7e1c24010d44851a13323cc4211d8e35bcbaa71cb7f07af5ca2b041d90586b243af45a20d56753f361231015bffb2f82c42abe73c6caa13717 SHA512 5ec88d45be285398493aff416be1e40f7a1fff989d472f860ffe05671c2cc2261e244a15a30f79851a4c2a38509a2ecb2959af1e8ae2cf66aee5958c817245a0
diff --git a/dev-haskell/crypton-connection/crypton-connection-0.3.1.ebuild b/dev-haskell/crypton-connection/crypton-connection-0.3.1.ebuild
new file mode 100644
index 000000000000..dedf37569ad2
--- /dev/null
+++ b/dev-haskell/crypton-connection/crypton-connection-0.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple and easy network connections API"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-connection"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/basement:=[profile?]
+	>=dev-haskell/crypton-x509-1.5:=[profile?]
+	>=dev-haskell/crypton-x509-store-1.5:=[profile?]
+	>=dev-haskell/crypton-x509-system-1.5:=[profile?]
+	>=dev-haskell/crypton-x509-validation-1.5:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/network-2.6.3:=[profile?]
+	>=dev-haskell/socks-0.6:=[profile?]
+	>=dev-haskell/tls-1.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/crypton-connection/metadata.xml b/dev-haskell/crypton-connection/metadata.xml
new file mode 100644
index 000000000000..fca43110a14d
--- /dev/null
+++ b/dev-haskell/crypton-connection/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">crypton-connection</remote-id>
+		<remote-id type="github">kazu-yamamoto/crypton-connection</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton-x509-store/Manifest b/dev-haskell/crypton-x509-store/Manifest
new file mode 100644
index 000000000000..f5618d107dc3
--- /dev/null
+++ b/dev-haskell/crypton-x509-store/Manifest
@@ -0,0 +1 @@
+DIST crypton-x509-store-1.6.9.tar.gz 12735 BLAKE2B 2c609676ff1fbb6e25a9d1794ac067cac4fc34ac8b7a6339ef73e5f8d52671be87b6f68a8ff8398bc6084353a084f6dddbf8669f3114604ee5dd732235a847f4 SHA512 3aefa6d204868b7adbe34608575ad782b28f4e6d1431d61e794c1923e0fd933d87a10791b1727ec49eb15e376ffa8e4540404bce581a90e3164239cf8760295e
diff --git a/dev-haskell/crypton-x509-store/crypton-x509-store-1.6.9.ebuild b/dev-haskell/crypton-x509-store/crypton-x509-store-1.6.9.ebuild
new file mode 100644
index 000000000000..cdcc01989183
--- /dev/null
+++ b/dev-haskell/crypton-x509-store/crypton-x509-store-1.6.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 collection accessing and storing methods"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	dev-haskell/crypton:=[profile?]
+	>=dev-haskell/crypton-x509-1.7.2:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/crypton-x509-store/metadata.xml b/dev-haskell/crypton-x509-store/metadata.xml
new file mode 100644
index 000000000000..d41f77abf931
--- /dev/null
+++ b/dev-haskell/crypton-x509-store/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">crypton-x509-store</remote-id>
+		<remote-id type="github">vincenthz/hs-certificate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton-x509-system/Manifest b/dev-haskell/crypton-x509-system/Manifest
new file mode 100644
index 000000000000..87083e58fe58
--- /dev/null
+++ b/dev-haskell/crypton-x509-system/Manifest
@@ -0,0 +1 @@
+DIST crypton-x509-system-1.6.7.tar.gz 3496 BLAKE2B 340d45433de35f292112ffd27ec54042895d24143f6f92e037c902c09c69ed0ff7bb6e8b26d389d9818baf8733aa8578d7bb3132080738831b3fce554d121e2b SHA512 fc6edbea995df5d56228413452157fac2349cafdb5cb85a38625cb3e43f46aa519d5a0fe47c1b25a9eb6fbba7b498538e173d276224dab331a8a19193df80f75
diff --git a/dev-haskell/crypton-x509-system/crypton-x509-system-1.6.7.ebuild b/dev-haskell/crypton-x509-system/crypton-x509-system-1.6.7.ebuild
new file mode 100644
index 000000000000..9881ca5e14df
--- /dev/null
+++ b/dev-haskell/crypton-x509-system/crypton-x509-system-1.6.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/crypton-x509-1.6:=[profile?]
+	>=dev-haskell/crypton-x509-store-1.6.2:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/crypton-x509-system/metadata.xml b/dev-haskell/crypton-x509-system/metadata.xml
new file mode 100644
index 000000000000..ff9b461d97bb
--- /dev/null
+++ b/dev-haskell/crypton-x509-system/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">crypton-x509-system</remote-id>
+		<remote-id type="github">kazu-yamamoto/crypton-certificate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton-x509-validation/Manifest b/dev-haskell/crypton-x509-validation/Manifest
new file mode 100644
index 000000000000..74fa76870bcc
--- /dev/null
+++ b/dev-haskell/crypton-x509-validation/Manifest
@@ -0,0 +1 @@
+DIST crypton-x509-validation-1.6.12.tar.gz 19573 BLAKE2B 1eb5ebc9405e865e49f94aa7d44ed3d0d6773fccd60808f57e1e79e14c36edeb8dfd5d2261b97b956cd528467e4c4c1c8a53d9ce2ec2f8a36d7c1fdc7393726d SHA512 3f6e24f4c3c0ebe2a6dd6371d3abf6739fbb571a47d6918a380fe18f68fb33aec4503f826fd1b1a8bda484d91fe5c8cef2ec3d21fbbf3394eb6f77059a7094c2
diff --git a/dev-haskell/crypton-x509-validation/crypton-x509-validation-1.6.12.ebuild b/dev-haskell/crypton-x509-validation/crypton-x509-validation-1.6.12.ebuild
new file mode 100644
index 000000000000..9e005ad7c92b
--- /dev/null
+++ b/dev-haskell/crypton-x509-validation/crypton-x509-validation-1.6.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 Certificate and CRL validation"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-haskell/crypton-0.24:=[profile?]
+	>=dev-haskell/crypton-x509-1.7.5:=[profile?]
+	>=dev-haskell/crypton-x509-store-1.6:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	dev-haskell/hourglass:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/crypton-x509-validation/metadata.xml b/dev-haskell/crypton-x509-validation/metadata.xml
new file mode 100644
index 000000000000..264c7cf3bf35
--- /dev/null
+++ b/dev-haskell/crypton-x509-validation/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">crypton-x509-validation</remote-id>
+		<remote-id type="github">kazu-yamamoto/crypton-certificate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton-x509/Manifest b/dev-haskell/crypton-x509/Manifest
new file mode 100644
index 000000000000..6350cd400a87
--- /dev/null
+++ b/dev-haskell/crypton-x509/Manifest
@@ -0,0 +1,2 @@
+DIST crypton-x509-1.7.6-rev1.cabal 2339 BLAKE2B 9b8a6a13fb5cd16b3ceed37fa0ada3ba1045fcc92a87e7ec6719f89b6f7a9e098e696119a9249f67b279a789e29b4b87d35c996092f58fdb7f279e0504d66f28 SHA512 fd876eb88fd54107ddb3c1836e24af92a1e3d321a5c114826e308b537fe65be54c01742e373202e3dfa7317945ad2393f89c5562956331cba9624aa43f0e7f1a
+DIST crypton-x509-1.7.6.tar.gz 21557 BLAKE2B 856fbf08b7eaff32f4562def1511f74d30f5f6a92fcb7d07c0049efff956787d840774a0d1fe66c14eed9702885b2be3ab58a49c2c071c31701534606e8f0276 SHA512 add965b5c85355f0081597a48430661c8e8a9922dd597a1bf7270f2ed38e855bda9bf5028065e0becf09fbb7a36dbf7fddd4f1e4d747777f26f4b1f8b2c87476
diff --git a/dev-haskell/crypton-x509/crypton-x509-1.7.6.ebuild b/dev-haskell/crypton-x509/crypton-x509-1.7.6.ebuild
new file mode 100644
index 000000000000..17df09e6ff4d
--- /dev/null
+++ b/dev-haskell/crypton-x509/crypton-x509-1.7.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite fails to build
+inherit haskell-cabal
+
+DESCRIPTION="X509 reader and writer"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # fails to build
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+	>=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
+	>=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-haskell/crypton-0.24:=[profile?]
+	dev-haskell/hourglass:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+# 	test? ( dev-haskell/tasty
+# 		dev-haskell/tasty-quickcheck
+# 		dev-haskell/x509 )
+# "
diff --git a/dev-haskell/crypton-x509/metadata.xml b/dev-haskell/crypton-x509/metadata.xml
new file mode 100644
index 000000000000..1f52a557a49c
--- /dev/null
+++ b/dev-haskell/crypton-x509/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">crypton-x509</remote-id>
+		<remote-id type="github">kazu-yamamoto/crypton-certificate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/crypton/Manifest b/dev-haskell/crypton/Manifest
new file mode 100644
index 000000000000..45032e8a403e
--- /dev/null
+++ b/dev-haskell/crypton/Manifest
@@ -0,0 +1 @@
+DIST crypton-0.32.tar.gz 618042 BLAKE2B 685f8db1be7b7ffffa79e3eea6b66a6ffe573c70268a15c0b34717c369ff15a17c24b6edd275f6e21a64eb9bcf5646f18e77599eec6796191ae9126d50b466ce SHA512 0c544f8213c607c9d063569b45491bced3bd9b1d6aaf59c414a80b6a9f887e75c2da00c539d2ef8abd770f52e03122640fe5219361d1fad0c0b3fb52dc636590
diff --git a/dev-haskell/crypton/crypton-0.32.ebuild b/dev-haskell/crypton/crypton-0.32.ebuild
new file mode 100644
index 000000000000..baf8e2b05f65
--- /dev/null
+++ b/dev-haskell/crypton/crypton-0.32.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Cryptography Primitives sink"
+HOMEPAGE="https://github.com/kazu-yamamoto/crypton"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="check-alignment +integer-gmp old-toolchain-inliner +support-aesni +support-deepseq +support-pclmuldq +support-rdrand support-sse +target-attributes"
+
+RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?]
+	>=dev-haskell/memory-0.14.18:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	virtual/libc
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-kat
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag check-alignment check_alignment) \
+		$(cabal_flag integer-gmp integer-gmp) \
+		$(cabal_flag old-toolchain-inliner old_toolchain_inliner) \
+		$(cabal_flag support-aesni support_aesni) \
+		$(cabal_flag support-deepseq support_deepseq) \
+		$(cabal_flag support-pclmuldq support_pclmuldq) \
+		$(cabal_flag support-rdrand support_rdrand) \
+		$(cabal_flag support-sse support_sse) \
+		$(cabal_flag target-attributes use_target_attributes)
+}
diff --git a/dev-haskell/crypton/metadata.xml b/dev-haskell/crypton/metadata.xml
new file mode 100644
index 000000000000..79ded3fd0fa2
--- /dev/null
+++ b/dev-haskell/crypton/metadata.xml
@@ -0,0 +1,23 @@
+<?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>
+	<use>
+		<flag name="check-alignment">extra check on alignment in C layers, which cause lowlevel assert errors. for debugging only.</flag>
+		<flag name="integer-gmp">Whether or not to use GMP for some functions</flag>
+		<flag name="old-toolchain-inliner">use -fgnu89-inline to workaround an old compiler / linker / glibc issue.</flag>
+		<flag name="support-aesni">allow compilation with AESNI on system and architecture that supports it</flag>
+		<flag name="support-deepseq">add deepseq instances for cryptographic types</flag>
+		<flag name="support-pclmuldq">Allow compilation with pclmuldq on architecture that supports it</flag>
+		<flag name="support-rdrand">allow compilation with RDRAND on system and architecture that supports it</flag>
+		<flag name="support-sse">Use SSE optimized version of (BLAKE2, ARGON2)</flag>
+		<flag name="target-attributes">use GCC / clang function attributes instead of global target options.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">crypton</remote-id>
+		<remote-id type="github">kazu-yamamoto/crypton</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
index c0d2408916c8..e2ac23533e13 100644
--- a/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
+++ b/dev-haskell/cryptonite-conduit/cryptonite-conduit-0.2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.4
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT=test # test suite fails to build
diff --git a/dev-haskell/cryptonite-conduit/metadata.xml b/dev-haskell/cryptonite-conduit/metadata.xml
index 1120fdb5ecaa..f1f67cdd6f23 100644
--- a/dev-haskell/cryptonite-conduit/metadata.xml
+++ b/dev-haskell/cryptonite-conduit/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -12,4 +12,7 @@
 		with contribution, this could provide cipher conduits too,
 		and probably other things.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">haskell-crypto/cryptonite-conduit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/cryptonite/Manifest b/dev-haskell/cryptonite/Manifest
index 1a2a293a5d46..ac7bee5184c5 100644
--- a/dev-haskell/cryptonite/Manifest
+++ b/dev-haskell/cryptonite/Manifest
@@ -1,2 +1,3 @@
-DIST cryptonite-0.21.tar.gz 615850 BLAKE2B df5f0273fa40b5401e4bb5df7c4cd5839ab87fdff3d2cef6be80c977433a1adbcdbf1c9d42f79987e4a7a590f8179fd998f93017af396116e10554108566b028 SHA512 7f04ad5f7411bf90f343c13b71438fdd0e1e40cc5c9a5f1553c1f396a278f81cbe3a548ee8bc03b3b63bc66485ce36dc9a93c3dc3e5884f601bbae49efa98cc3
-DIST cryptonite-0.26.tar.gz 581153 BLAKE2B 2becdd3d0c6f1e037fd4d38143a2a8644e38e9826faa271c971d4feff8a4ab1e4c0a04df338c99a8454cff626f79f3334a0a37b19cc136f33e7c8f53e66bd33a SHA512 4236d411542fd104e5cace61fbdeda615f7d13e442594d7fa12acc682d917b0494b10b242a88fef19e91e93489797206fee07497bff92e43d3849ebac8ee11b0
+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
diff --git a/dev-haskell/cryptonite/cryptonite-0.21.ebuild b/dev-haskell/cryptonite/cryptonite-0.21.ebuild
deleted file mode 100644
index 3198705f21b4..000000000000
--- a/dev-haskell/cryptonite/cryptonite-0.21.ebuild
+++ /dev/null
@@ -1,47 +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.9999
-#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_rdrand:cpu_flags_x86_rdrand,support_blake2_sse:cpu_flags_x86_sse2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptography Primitives sink"
-HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 +integer-gmp"
-
-RDEPEND=">=dev-haskell/memory-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/byteable
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-kat
-		dev-haskell/tasty-quickcheck )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sse2.patch
-)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check_alignment \
-		$(cabal_flag integer-gmp integer-gmp) \
-		--flag=-old_toolchain_inliner \
-		$(cabal_flag cpu_flags_x86_aes support_aesni) \
-		$(cabal_flag cpu_flags_x86_sse2 support_blake2_sse) \
-		--flag=support_deepseq \
-		$(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
-		$(cabal_flag cpu_flags_x86_rdrand support_rdrand)
-}
diff --git a/dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild b/dev-haskell/cryptonite/cryptonite-0.26-r1.ebuild
deleted file mode 100644
index da6a90056ed2..000000000000
--- a/dev-haskell/cryptonite/cryptonite-0.26-r1.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.1.9999
-#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_sse:cpu_flags_x86_sse,support_rdrand:cpu_flags_x86_rdrand
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cryptography Primitives sink"
-HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cpu_flags_x86_rdrand +cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp"
-
-RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?]
-	>=dev-haskell/memory-0.14.18:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( dev-haskell/memory
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-kat
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check_alignment \
-		$(cabal_flag integer-gmp integer-gmp) \
-		--flag=-old_toolchain_inliner \
-		$(cabal_flag cpu_flags_x86_aes support_aesni) \
-		--flag=support_deepseq \
-		$(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
-		$(cabal_flag cpu_flags_x86_rdrand support_rdrand) \
-		$(cabal_flag cpu_flags_x86_sse support_sse)
-}
diff --git a/dev-haskell/cryptonite/cryptonite-0.28.ebuild b/dev-haskell/cryptonite/cryptonite-0.28.ebuild
new file mode 100644
index 000000000000..618c5f1e6b33
--- /dev/null
+++ b/dev-haskell/cryptonite/cryptonite-0.28.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_sse:cpu_flags_x86_sse,support_rdrand:cpu_flags_x86_rdrand
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit flag-o-matic haskell-cabal
+
+DESCRIPTION="Cryptography Primitives sink"
+HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://github.com/haskell-crypto/cryptonite/pull/338.patch -> ${PN}-338.patch"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cpu_flags_x86_rdrand cpu_flags_x86_aes cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp +target-attributes"
+
+RDEPEND=">=dev-haskell/basement-0.0.6:=[profile?]
+	>=dev-haskell/memory-0.14.18:=[profile?]
+	>=dev-lang/ghc-8.4.3:= <dev-lang/ghc-9.1
+	virtual/libc
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-kat
+		dev-haskell/tasty-quickcheck )
+"
+
+PATCHES=( "${DISTDIR}"/${PN}-338.patch )
+
+src_prepare() {
+	default
+
+	# On AVX2 cryptonite's own test suite crashes on unaligned access:
+	# https://github.com/haskell-crypto/cryptonite/issues/347
+	# Disable extensions that might require extra alignment.
+	use amd64 && append-flags -mno-avx2
+	use x86 && append-flags -mno-avx2
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-check_alignment \
+		$(cabal_flag integer-gmp integer-gmp) \
+		--flag=-old_toolchain_inliner \
+		$(cabal_flag cpu_flags_x86_aes support_aesni) \
+		--flag=support_deepseq \
+		$(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
+		$(cabal_flag cpu_flags_x86_rdrand support_rdrand) \
+		$(cabal_flag cpu_flags_x86_sse support_sse) \
+		$(cabal_flag target-attributes use_target_attributes)
+}
diff --git a/dev-haskell/cryptonite/cryptonite-0.30.ebuild b/dev-haskell/cryptonite/cryptonite-0.30.ebuild
new file mode 100644
index 000000000000..e32cfe9178c8
--- /dev/null
+++ b/dev-haskell/cryptonite/cryptonite-0.30.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: -check_alignment,-old_toolchain_inliner,+support_deepseq,support_aesni:cpu_flags_x86_aes,support_pclmuldq:cpu_flags_x86_sse4_1,support_sse:cpu_flags_x86_sse,support_rdrand:cpu_flags_x86_rdrand
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit flag-o-matic haskell-cabal
+
+DESCRIPTION="Cryptography Primitives sink"
+HOMEPAGE="https://github.com/haskell-crypto/cryptonite"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_rdrand cpu_flags_x86_sse cpu_flags_x86_sse4_1 +integer-gmp +target-attributes"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/memory-0.14.18:=[profile?]
+	>=dev-haskell/basement-0.0.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+			dev-haskell/tasty-hunit
+			dev-haskell/tasty-kat
+			dev-haskell/tasty-quickcheck )
+"
+
+src_prepare() {
+	default
+
+	# On AVX2 cryptonite's own test suite crashes on unaligned access:
+	# https://github.com/haskell-crypto/cryptonite/issues/347
+	# Disable extensions that might require extra alignment.
+	use amd64 && append-flags -mno-avx2
+	use x86 && append-flags -mno-avx2
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-check_alignment \
+		$(cabal_flag integer-gmp integer-gmp) \
+		--flag=-old_toolchain_inliner \
+		$(cabal_flag cpu_flags_x86_aes support_aesni) \
+		--flag=support_deepseq \
+		$(cabal_flag cpu_flags_x86_sse4_1 support_pclmuldq) \
+		$(cabal_flag cpu_flags_x86_rdrand support_rdrand) \
+		$(cabal_flag cpu_flags_x86_sse support_sse) \
+		$(cabal_flag target-attributes use_target_attributes)
+}
diff --git a/dev-haskell/cryptonite/files/cryptonite-0.21-sse2.patch b/dev-haskell/cryptonite/files/cryptonite-0.21-sse2.patch
deleted file mode 100644
index 02d2069cfd20..000000000000
--- a/dev-haskell/cryptonite/files/cryptonite-0.21-sse2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/696220
---- a/cryptonite.cabal
-+++ b/cryptonite.cabal
-@@ -276,6 +276,7 @@ Library
-                    , cbits/cryptonite_aes.c
- 
-   if arch(x86_64) || flag(support_blake2_sse)
-+    CC-options:     -msse2
-     C-sources:      cbits/blake2/sse/blake2s.c
-                   , cbits/blake2/sse/blake2sp.c
-                   , cbits/blake2/sse/blake2b.c
diff --git a/dev-haskell/cryptonite/metadata.xml b/dev-haskell/cryptonite/metadata.xml
index 8e02ebe625c7..d75d89255758 100644
--- a/dev-haskell/cryptonite/metadata.xml
+++ b/dev-haskell/cryptonite/metadata.xml
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A repository of cryptographic primitives.
-		
-		* Symmetric ciphers: AES, DES, 3DES, Blowfish, Camellia, RC4, Salsa, ChaCha.
-		
-		* Hash: SHA1, SHA2, SHA3, MD2, MD4, MD5, Kekkak, Skein, Ripemd, Tiger, Whirlpool
-		
-		* MAC: HMAC, Poly1305
-		
-		* Assymmetric crypto: DSA, RSA, DH, ECDH, ECDSA, ECC, Curve25519, Ed25519
-		
-		* Key Derivation Function: PBKDF2, Scrypt
-		
-		* Cryptographic Random generation: System Entropy, Deterministic Random Generator
-		
-		* Data related: Anti-Forensic Information Splitter (AFIS)
-		
-		If anything cryptographic related is missing from here, submit
-		a pull request to have it added. This package strive to be a
-		cryptographic kitchen sink that provides cryptography for everyone.
-		
-		Evaluate the security related to your requirements before using.
-	</longdescription>
 	<use>
 		<flag name="integer-gmp">Whether or not to use GMP for some functions</flag>
+		<flag name="target-attributes">use GCC / clang function attributes instead of global target options.</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">cryptonite</remote-id>
 		<remote-id type="github">haskell-crypto/cryptonite</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/css-text/Manifest b/dev-haskell/css-text/Manifest
index 32b548909763..a639c029bc3b 100644
--- a/dev-haskell/css-text/Manifest
+++ b/dev-haskell/css-text/Manifest
@@ -1,2 +1 @@
-DIST css-text-0.1.2.1.tar.gz 3947 BLAKE2B 815ff937c708e211c53524fcb89777da56591f4f0f5050d812b43ad292c1bf5653b3383af0cf7478a428236d7f92f3668de57ff8fa3e1f0ebb041db7a961c3c6 SHA512 837b5e45ea87e4656a1a33b9a1ab098c03fa90a150ca6626dd4eaa75b4d35332703d2de6182d61dc1a144402366c6e74c3a85b60ff864aa080f8c8ef7b670bbc
 DIST css-text-0.1.3.0.tar.gz 4594 BLAKE2B 0ea86030b7e2a8f015bcc1a122e325948570baa3f72b961ca13d731c8a464ab06360eb451ca826175c73288d2eb4b51715c674151f2f3aaf1750ac2155e451ee SHA512 2f7b4fc758e3e6da7dadbaf48c9174770de8230ef4578d9fda610ca9b7a4ad497284623e382bf55111ddc852550275415f58311a2e726721f050d9f704050628
diff --git a/dev-haskell/css-text/css-text-0.1.2.1.ebuild b/dev-haskell/css-text/css-text-0.1.2.1.ebuild
deleted file mode 100644
index 65a1bd502c19..000000000000
--- a/dev-haskell/css-text/css-text-0.1.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="CSS parser and renderer"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.2.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/css-text/css-text-0.1.3.0.ebuild b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
index e3de5421b4e7..9d80b51c0c37 100644
--- a/dev-haskell/css-text/css-text-0.1.3.0.ebuild
+++ b/dev-haskell/css-text/css-text-0.1.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT=test # fails test, not sure if it's severe
diff --git a/dev-haskell/css-text/metadata.xml b/dev-haskell/css-text/metadata.xml
index 70f8bc93197d..6df1c65f3dd9 100644
--- a/dev-haskell/css-text/metadata.xml
+++ b/dev-haskell/css-text/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		CSS parser and renderer.
-	</longdescription>
+	<upstream>
+		<remote-id type="github">yesodweb/css-text</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/curl/Manifest b/dev-haskell/curl/Manifest
deleted file mode 100644
index e4985a98feb3..000000000000
--- a/dev-haskell/curl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST curl-1.3.8.tar.gz 47704 BLAKE2B da95451318561b9d8ab478479f8f6c147c36f86c4a89b112eb597202e2ff6305597ab200ba1e89b953dbde77cd043a3299614d5c19b83242059bd6e89906eddb SHA512 00012fc9b0a80b0d306f688bfb9cfbde8aa72045e6a139c0d8a0cdd7832b5e86ab06c6ea95803665f4bb8ec4e9af3dbc6e405f100985c2cfbaead8527ba7a382
diff --git a/dev-haskell/curl/curl-1.3.8.ebuild b/dev-haskell/curl/curl-1.3.8.ebuild
deleted file mode 100644
index 769be0b85aed..000000000000
--- a/dev-haskell/curl/curl-1.3.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell binding to libcurl"
-HOMEPAGE="https://hackage.haskell.org/package/curl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-		net-misc/curl"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/curl/metadata.xml b/dev-haskell/curl/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/curl/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/data-accessor/Manifest b/dev-haskell/data-accessor/Manifest
deleted file mode 100644
index 3546edb6c433..000000000000
--- a/dev-haskell/data-accessor/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST data-accessor-0.2.2.7.tar.gz 9670 BLAKE2B ac672adce3fe9dcf4bd01b47a05c089fef14e485835271627b9dc3f4a85aa39b98e2cc36213988516d2eb45bd9acb03e9ba2f822d215bfc322a35e7a9a0cf73b SHA512 42f78d5be738e83e2bc64a2f38bc70748ecb741433916c4e527355f5e808a844e43b14607cfff149a5951f557c73a947469c878340738244e3778f475ccd021d
-DIST data-accessor-0.2.3.tar.gz 10324 BLAKE2B 1db06e59b36c882310d3cf597a3642c3fb7b1b30df41d4fc0eb7f21087fd1f55ce70c8d7b460cd64384034395ab98ebc9ddf1059060f9dbfbf70012a11da0ee3 SHA512 7e875010f9835e3706d9d760e9490e567d14498cb86d485a6b29793d95172e1c5d767aee181eef7e0f160966b93144164cd5b6dc474fb44c1367b4a90d1490b4
diff --git a/dev-haskell/data-accessor/data-accessor-0.2.2.7.ebuild b/dev-haskell/data-accessor/data-accessor-0.2.2.7.ebuild
deleted file mode 100644
index 04a5ac7304fe..000000000000
--- a/dev-haskell/data-accessor/data-accessor-0.2.2.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities for accessing and manipulating fields of records"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Record_access"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/data-accessor/data-accessor-0.2.3.ebuild b/dev-haskell/data-accessor/data-accessor-0.2.3.ebuild
deleted file mode 100644
index 6f1e60db11b7..000000000000
--- a/dev-haskell/data-accessor/data-accessor-0.2.3.ebuild
+++ /dev/null
@@ -1,24 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities for accessing and manipulating fields of records"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Record_access"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/data-accessor/metadata.xml b/dev-haskell/data-accessor/metadata.xml
deleted file mode 100644
index 1962ea1d1e20..000000000000
--- a/dev-haskell/data-accessor/metadata.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		In Haskell 98 the name of a record field
-		is automatically also the name of a function which gets the value
-		of the according field.
-		E.g. if we have
-		
-		data Pair a b = Pair
-		first :: a, second :: b
-		
-		then
-		
-		&gt; first  :: Pair a b -&gt; a
-		&gt; second :: Pair a b -&gt; b
-		
-		However for setting or modifying a field value
-		we need to use some syntactic sugar, which is often clumsy.
-		
-		modifyFirst :: (a -&gt; a) -&gt; (Pair a b -&gt; Pair a b)
-		modifyFirst f r\@(Pair
-		first=a
-		) = r
-		first = f a
-		
-		With this package you can define record field accessors
-		which allow setting, getting and modifying values easily.
-		The package clearly demonstrates the power of the functional approach:
-		You can combine accessors of a record and sub-records,
-		to make the access look like the fields of the sub-record belong to the main record.
-		
-		Example:
-		
-		&gt; *Data.Accessor.Example&gt; (first^:second^=10) (('b',7),"hallo")
-		&gt; (('b',10),"hallo")
-		
-		You can easily manipulate record fields in a 'Control.Monad.State.State' monad,
-		you can easily code 'Show' instances that use the Accessor syntax
-		and you can parse binary streams into records.
-		See @Data.Accessor.Example@ for demonstration of all features.
-		
-		It would be great if in revised Haskell versions the names of record fields
-		are automatically 'Data.Accessor.Accessor's
-		rather than plain @get@ functions.
-		For now, the package @data-accessor-template@ provides Template Haskell functions
-		for automated generation of 'Data.Acesssor.Accessor's.
-		See also the other @data-accessor@ packages
-		that provide an Accessor interface to other data types.
-		The package @enumset@ provides accessors to bit-packed records.
-		
-		For similar packages see @lenses@ and @fclabel@.
-		A related concept are editors
-		&lt;http://conal.net/blog/posts/semantic-editor-combinators/&gt;.
-		Editors only consist of a modify method
-		(and @modify@ applied to a 'const' function is a @set@ function).
-		This way, they can modify all function values of a function at once,
-		whereas an accessor can only change a single function value,
-		say, it can change @f 0 = 1@ to @f 0 = 2@.
-		This way, editors can even change the type of a record or a function.
-		An Arrow instance can be defined for editors,
-		but for accessors only a Category instance is possible ('(.)' method).
-		The reason is the @arr@ method of the @Arrow@ class,
-		that conflicts with the two-way nature (set and get) of accessors.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-array-byte/Manifest b/dev-haskell/data-array-byte/Manifest
new file mode 100644
index 000000000000..f4d26ec1a3d4
--- /dev/null
+++ b/dev-haskell/data-array-byte/Manifest
@@ -0,0 +1,2 @@
+DIST data-array-byte-0.1.0.1-rev1.cabal 1989 BLAKE2B 4cc949daa674be3691072d87b1bc158dbda8e03edb1cdc8d839fe88761b3758a285150a3ed6c297343b93cdf49123584aa8d54cc6bce585d6f7ef008c94afdea SHA512 dda81cb1f8e04a762bad70af5f5cc566c2228322ac277296e1492db57757eedebc39133a35f2daca499593bb4f855e2548c0c400eac3d7ab0ebf7d646dfa06e7
+DIST data-array-byte-0.1.0.1.tar.gz 6784 BLAKE2B 5b53eeee371b4463c4c140b153fd5b806db0385c4fba647c158cecd3168f739f97c292ef70bee03b74e4d34f9ef5c58d9cfa6d20e0b11f2f38399b04657d3c12 SHA512 f06e369803fadca57c0782b45c97f914e0e28c512bb3f36be35a06686ac1c3ab45da150143a1be3b0b5633c3d4105570acc4c0482e9692a4ef35568922a303e7
diff --git a/dev-haskell/data-array-byte/data-array-byte-0.1.0.1.ebuild b/dev-haskell/data-array-byte/data-array-byte-0.1.0.1.ebuild
new file mode 100644
index 000000000000..322e73d7a889
--- /dev/null
+++ b/dev-haskell/data-array-byte/data-array-byte-0.1.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Compatibility layer for Data.Array.Byte"
+HOMEPAGE="https://github.com/Bodigrim/data-array-byte"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/quickcheck-classes-base-0.6 <dev-haskell/quickcheck-classes-base-0.7
+		>=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/data-array-byte/metadata.xml b/dev-haskell/data-array-byte/metadata.xml
new file mode 100644
index 000000000000..b095f14949bd
--- /dev/null
+++ b/dev-haskell/data-array-byte/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">data-array-byte</remote-id>
+		<remote-id type="github">Bodigrim/data-array-byte</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/data-binary-ieee754/Manifest b/dev-haskell/data-binary-ieee754/Manifest
deleted file mode 100644
index 05236542d114..000000000000
--- a/dev-haskell/data-binary-ieee754/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST data-binary-ieee754-0.4.4.tar.gz 4117 BLAKE2B 012ccb5cb3bd94b15a8326011563b1a2e3c28699d3819675822cd27372e6b81d527ad84fc20a054a2a4e8d14ba821bdce25393ab12042eedc64cb88064076d0c SHA512 af280e164b4b4a21d5d3cd489d8b2ff43e86fbf1d3896aabe9a8e3558b15549f4efc4497d99d6877b7d9547bf26a4a8ed422cbe00abbea73b2e936b30a71009f
diff --git a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild
deleted file mode 100644
index bf869183a40e..000000000000
--- a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parser/Serialiser for IEEE-754 floating-point values"
-HOMEPAGE="https://john-millikin.com/software/data-binary-ieee754/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-binary-ieee754/metadata.xml b/dev-haskell/data-binary-ieee754/metadata.xml
deleted file mode 100644
index b171e0d3dfa4..000000000000
--- a/dev-haskell/data-binary-ieee754/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Convert Float and Decimal values to/from raw octets.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-default-class/Manifest b/dev-haskell/data-default-class/Manifest
index bbee7a67b4e1..cf355a370b58 100644
--- a/dev-haskell/data-default-class/Manifest
+++ b/dev-haskell/data-default-class/Manifest
@@ -1 +1 @@
-DIST data-default-class-0.0.1.tar.gz 1461 BLAKE2B 59bdb47ee92796b1ec6b46eccd93da9928b7208ed47cb4f1f97dbc8374f4bdd89a30c28ac23bde0d084d2eecfe6c58301a64b73223a7667c722b3dad8da0ea98 SHA512 f9960deb48938bf0364273762662e56ad0dba3d5db005bf0a00b8eff11cfa2e94c5b5c1d2b2af2622a680dad4495cb31445a17074cfe752cbcf3de7b91e0e313
+DIST data-default-class-0.1.2.0.tar.gz 2522 BLAKE2B b6449a9bfbd9fa352a7cc453540f3b8eb69c0f144635d573d6073ed950b7289f3e71aecada5f8d85faed7293b1203133a9239dbeb9e5e6b286404b0b6948a67c SHA512 293c899cb2b5cded58baa086251110e4c5e7a15477f1864c33be30be8d16d6fadb55e1b5fa8117f4c47ac5c86ac09abb2f7f8b3b4fb658d1492eadd099f6f7b2
diff --git a/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild b/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild
deleted file mode 100644
index be277bd6547e..000000000000
--- a/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types with a default value"
-HOMEPAGE="https://hackage.haskell.org/package/data-default-class"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
new file mode 100644
index 000000000000..8ce1a10e8a4d
--- /dev/null
+++ b/dev-haskell/data-default-class/data-default-class-0.1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A class for types with a default value"
+HOMEPAGE="https://hackage.haskell.org/package/data-default-class"
+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-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-default-class/metadata.xml b/dev-haskell/data-default-class/metadata.xml
index ec0be8b04080..937381521944 100644
--- a/dev-haskell/data-default-class/metadata.xml
+++ b/dev-haskell/data-default-class/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A class for types with a default value
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/data-default-instances-base/Manifest b/dev-haskell/data-default-instances-base/Manifest
deleted file mode 100644
index e390dba1636f..000000000000
--- a/dev-haskell/data-default-instances-base/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST data-default-instances-base-0.0.1.tar.gz 1930 BLAKE2B 61faf28f84aeb2fccf07845072a7480ec14f30744fa310bec74cc1e26d2fba1c55872380c417b8b7697656e81bb0b90ee9b6da60af8395b19dfc13eb45520ee5 SHA512 e5598ef3d940b9512b0e18bcc526d41ca08df3d8b0a640717914ff7c510de68b6a8aa1299d0681062f510b31be3f62f6f318dc305e2797879739e19a8c871728
diff --git a/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild b/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild
deleted file mode 100644
index e1db5f656cc5..000000000000
--- a/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Default instances for types in base"
-HOMEPAGE="https://hackage.haskell.org/package/data-default-instances-base"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-default-instances-base/metadata.xml b/dev-haskell/data-default-instances-base/metadata.xml
deleted file mode 100644
index 4e780c1aed96..000000000000
--- a/dev-haskell/data-default-instances-base/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Default instances for types in base
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
index e4a2f8f9a1f0..1c3681cd29d3 100644
--- a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,10 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-default-instances-containers/metadata.xml b/dev-haskell/data-default-instances-containers/metadata.xml
index b54530493eef..937381521944 100644
--- a/dev-haskell/data-default-instances-containers/metadata.xml
+++ b/dev-haskell/data-default-instances-containers/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Default instances for types in containers
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
index d22380bc7c60..b30a9d18b555 100644
--- a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,11 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
-		dev-haskell/dlist:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+	dev-haskell/dlist:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-default-instances-dlist/metadata.xml b/dev-haskell/data-default-instances-dlist/metadata.xml
index 54d1a9cbcd47..937381521944 100644
--- a/dev-haskell/data-default-instances-dlist/metadata.xml
+++ b/dev-haskell/data-default-instances-dlist/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Default instances for types in dlist
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
index f07bbb601702..f675c7df4418 100644
--- a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default-instances-old-locale/metadata.xml b/dev-haskell/data-default-instances-old-locale/metadata.xml
index 50cce3688992..937381521944 100644
--- a/dev-haskell/data-default-instances-old-locale/metadata.xml
+++ b/dev-haskell/data-default-instances-old-locale/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Default instances for types in old-locale
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/data-default/Manifest b/dev-haskell/data-default/Manifest
index 431e11d74cd2..d3907f2f17a0 100644
--- a/dev-haskell/data-default/Manifest
+++ b/dev-haskell/data-default/Manifest
@@ -1 +1 @@
-DIST data-default-0.5.3.tar.gz 1623 BLAKE2B 365de6448edfdaec1b852e89eb31faa323f0ab5f6fc101247f0a16d76680f98fea751c524fa3fe5b697c927eac3cf4c778a37eb5ff0fbcf0daf8bb3ab27f4220 SHA512 57cb632ccc6c9b0973594c7c5944574f4e7e78f980194d4205bb14a6e5aa1bd3e92723f3b80cfeac301ae663b2a22925503a03ecb5311ebc08077fe06022817e
+DIST data-default-0.7.1.1.tar.gz 1627 BLAKE2B 3d711bbc04c00c1918377d15fefaf394bf69ae877d828f00a17c20b08fa635a6be40582222a5973d2c56b96c81d89175af9f05f66ef3c12bddab29859bb09f88 SHA512 a31260c71178641e41f16fc504620f19ad04a44d2d095c96225b6027184c01ec0bf47effab5344816e438d7c37e34189255a9d3a5d643219b37054dde679d1bd
diff --git a/dev-haskell/data-default/data-default-0.5.3.ebuild b/dev-haskell/data-default/data-default-0.5.3.ebuild
deleted file mode 100644
index 56020670cb80..000000000000
--- a/dev-haskell/data-default/data-default-0.5.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types with a default value"
-HOMEPAGE="https://hackage.haskell.org/package/data-default"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-		dev-haskell/data-default-instances-base:=[profile?]
-		dev-haskell/data-default-instances-containers:=[profile?]
-		dev-haskell/data-default-instances-dlist:=[profile?]
-		dev-haskell/data-default-instances-old-locale:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/data-default/data-default-0.7.1.1.ebuild b/dev-haskell/data-default/data-default-0.7.1.1.ebuild
new file mode 100644
index 000000000000..16b73301ebd2
--- /dev/null
+++ b/dev-haskell/data-default/data-default-0.7.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A class for types with a default value"
+HOMEPAGE="https://hackage.haskell.org/package/data-default"
+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/data-default-class-0.1.2.0:=[profile?]
+	dev-haskell/data-default-instances-containers:=[profile?]
+	dev-haskell/data-default-instances-dlist:=[profile?]
+	dev-haskell/data-default-instances-old-locale:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/data-default/metadata.xml b/dev-haskell/data-default/metadata.xml
index ec0be8b04080..937381521944 100644
--- a/dev-haskell/data-default/metadata.xml
+++ b/dev-haskell/data-default/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A class for types with a default value
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/data-endian/Manifest b/dev-haskell/data-endian/Manifest
deleted file mode 100644
index cdf007498628..000000000000
--- a/dev-haskell/data-endian/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST data-endian-0.0.1.tar.gz 2454 BLAKE2B ca75c2c9546a48030a8a7236490a4e4a404d1fb8faa69d0460b36420d56b35e78ed00d8fff7fb6839594012260ac878767527ebb581256693a41e7c3e5cd2cb5 SHA512 1f6d096c574fe9d09104c884a67a44cdde2e436fa27e9614d077122ef6f5e8f28eaa81f48dbf09f7dcdf95065c9971d1342c31b887280a51334c38a29031bbf0
-DIST data-endian-0.1.1.tar.gz 2788 BLAKE2B 6f2bcf0f1074a07953027f7d29b99db995f0cbce0cee59aa81556fee0b69419ddf5727f6c27c4548c7c6f3b62a7e3b85c23983505c77c539cbcce395492a63ea SHA512 a8e94f996a0b1c929cd01b8f38c52149cf3bac0f50449d327ba66ac4a378ba5c3826860abe4d1592aa83ed9ca81dba6083c63a66e6ee0655c27521cb87977a90
-DIST data-endian-0.1.tar.gz 2733 BLAKE2B f24ccd728da923a435720d6b295af7e00661132f2b0574329b875e29bdbdb37198865d7f5905bcdd3fad646f9b7ea569f2442e5e630259d6fe3ae5ee25e5626e SHA512 ded4df9eed2ccee18d537b223f0039afc7fbe10329b525d9793a639c3f4a01f0e5e8f5ddd1c2e7c5477a63067bd3135417a1bd935076b104dc2aead5390d82cf
diff --git a/dev-haskell/data-endian/data-endian-0.0.1.ebuild b/dev-haskell/data-endian/data-endian-0.0.1.ebuild
deleted file mode 100644
index a2ad531fef5f..000000000000
--- a/dev-haskell/data-endian/data-endian-0.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Endian-sensitive data"
-HOMEPAGE="https://github.com/mvv/data-endian"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6.0"
diff --git a/dev-haskell/data-endian/data-endian-0.1.1.ebuild b/dev-haskell/data-endian/data-endian-0.1.1.ebuild
deleted file mode 100644
index dd4fdcf8a3fe..000000000000
--- a/dev-haskell/data-endian/data-endian-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Endian-sensitive data"
-HOMEPAGE="https://github.com/mvv/data-endian"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/data-endian/data-endian-0.1.ebuild b/dev-haskell/data-endian/data-endian-0.1.ebuild
deleted file mode 100644
index 2522c895cf34..000000000000
--- a/dev-haskell/data-endian/data-endian-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Endian-sensitive data"
-HOMEPAGE="https://github.com/mvv/data-endian"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/data-endian/metadata.xml b/dev-haskell/data-endian/metadata.xml
deleted file mode 100644
index 920ff23d60c3..000000000000
--- a/dev-haskell/data-endian/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides helpers for converting endian-sensitive data.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mvv/data-endian</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/data-fix/Manifest b/dev-haskell/data-fix/Manifest
new file mode 100644
index 000000000000..844a1504279d
--- /dev/null
+++ b/dev-haskell/data-fix/Manifest
@@ -0,0 +1,2 @@
+DIST data-fix-0.3.2-rev4.cabal 1720 BLAKE2B 804bae8c1788c3ad572e128274b24e62cd8c53cd44d3079acec348f5d3f0a663b258c040b9d3b8fa1463b1b292a30c954121e5f4aea697115f416557a1b5fa59 SHA512 6577a28f2451c9fe88fe5dbabdcfccabad8e5654491f00cace75df8273ec3c0e2fd2dc3fbc9347051a67214499ff56b077c29f020753e5fee647e52f2083b4d0
+DIST data-fix-0.3.2.tar.gz 5842 BLAKE2B b59f0e2abd572945219355206f24f689835026d4adb6ce4d85073f11a8742701463dfe6029376d5a65959c61115483cfb00f557213c222b18a28e9336a4f3879 SHA512 70b0c15522ea1fa623397bd399d83cc0921736012e6daaad21a9940ec9f447373f7e0e3915369127c7c54def7cb1d066c4641e676fa5f444f3d5dd761c258b63
diff --git a/dev-haskell/data-fix/data-fix-0.3.2-r1.ebuild b/dev-haskell/data-fix/data-fix-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..9bf501127acd
--- /dev/null
+++ b/dev-haskell/data-fix/data-fix-0.3.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Fixpoint data types"
+HOMEPAGE="https://github.com/spell-music/data-fix"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/data-fix/metadata.xml b/dev-haskell/data-fix/metadata.xml
new file mode 100644
index 000000000000..29898652b264
--- /dev/null
+++ b/dev-haskell/data-fix/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">data-fix</remote-id>
+		<remote-id type="github">spell-music/data-fix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/data-hash/Manifest b/dev-haskell/data-hash/Manifest
deleted file mode 100644
index b7722a4aa12c..000000000000
--- a/dev-haskell/data-hash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST data-hash-0.2.0.1.tar.gz 8504 BLAKE2B e48e6be1e7074c415df85e1ff65311ad5cbd6e73b74bcea095e3d407f035b18c73370ea264cc4f617150f2c0aeb4a82619ac18e169ea2d4909f14570852b5bbb SHA512 daea098b9c808396606d90ae70e5156c492463db929b563a6195ee648ad72fc2949ab231ad67758fe0c68991826ea2292109a5d1f46d0cfc27c16e2e2b0666fa
diff --git a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild b/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
deleted file mode 100644
index cb9557f7a1e5..000000000000
--- a/dev-haskell/data-hash/data-hash-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinators for building fast hashing functions"
-HOMEPAGE="https://hackage.haskell.org/package/data-hash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/data-hash/metadata.xml b/dev-haskell/data-hash/metadata.xml
deleted file mode 100644
index 386d47c94f2f..000000000000
--- a/dev-haskell/data-hash/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Combinators for building fast hashing functions. Includes
-		hashing functions for all basic Haskell98 types.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
index 5f08f8c4b4fb..6af9d9b4718b 100644
--- a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
+++ b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/data-ordlist/metadata.xml b/dev-haskell/data-ordlist/metadata.xml
index 3b461e48b9fe..937381521944 100644
--- a/dev-haskell/data-ordlist/metadata.xml
+++ b/dev-haskell/data-ordlist/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This module provides set and multiset operations on ordered lists.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/dataenc/Manifest b/dev-haskell/dataenc/Manifest
deleted file mode 100644
index fdcb3b1b04af..000000000000
--- a/dev-haskell/dataenc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dataenc-0.14.0.5.tar.gz 12902 BLAKE2B bdff7050d04565877d9940967dad288e72060bbd8a7ed4cf28effa97a4683e61fef88b9036e15f234f3bfded0dfbcab60c87446f6b1479fa50a4549c80f4bd74 SHA512 b73e5060a3b9c00fbcdadb6dd8ca890c4a6f8ef862822e7d71bde1c0a99de1199cfa384cd8c219f41218f8eef4e9017ecc2c1c186516d7a809aadb599530bf88
-DIST dataenc-0.14.0.7.tar.gz 12813 BLAKE2B 3f213d73121c7973c706ad0d81d2e0153d7ac9cb242aa8d5b3bcd093dd8611d9476263a4893c43ce95aa642893d8b1b2ac2baf26d0f33c0fa3d64d7d0bb0722d SHA512 82f34ad51b64b66726e45c0c2ef52c9c2be201f42c5718763158a13eb2e8f82cb0298c1580dd52788e8d7b3f1eb0e7ade4e6e69f7ba4b2f8804eb2178e719e20
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild
deleted file mode 100644
index 16a4cfd60fe8..000000000000
--- a/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Data encoding library"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Library/Data_encoding"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	cabal_chdeps \
-		'array >= 0.1.0 && < 0.5' 'array >= 0.1.0 && < 0.6' \
-		'base >= 3.0.0 && < 4.7' 'base >= 3.0.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-tests
-}
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
deleted file mode 100644
index 7bc5f390a18b..000000000000
--- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Data encoding library"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Library/Data_encoding"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	test? ( dev-haskell/hunit:=[profile?]
-			>=dev-haskell/quickcheck-2.5:2=[profile?]
-			dev-haskell/test-framework:=[profile?]
-			dev-haskell/test-framework-hunit:=[profile?]
-			dev-haskell/test-framework-quickcheck2:=[profile?]
-			dev-haskell/test-framework-th:=[profile?] )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 3.0.0 && < 4.8' 'base >= 3.0.0' \
-		'QuickCheck ==2.5.*' 'QuickCheck >=2.5' \
-		'executable tests' 'executable dataenc-tests'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test tests)
-}
diff --git a/dev-haskell/dataenc/metadata.xml b/dev-haskell/dataenc/metadata.xml
deleted file mode 100644
index c20526f18ddb..000000000000
--- a/dev-haskell/dataenc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Data encoding library currently providing Base16, Base32,
-		Base32Hex, Base64, Base64Url, Base85, Python string escaping,
-		Quoted-Printable, URL encoding, uuencode, xxencode, and yEncoding.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/date-cache/Manifest b/dev-haskell/date-cache/Manifest
deleted file mode 100644
index 67c3506e77d2..000000000000
--- a/dev-haskell/date-cache/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST date-cache-0.3.0.tar.gz 2126 BLAKE2B 51f0686bee8a72a0286c7ab03cc39346e4f4998ab0069a69586ae183fa8e9d9f4a707a5932bd3895d5fb7b895f206a643f097882a40a8127eb2a38bb49bbbefc SHA512 12e048dbd163929acf1b2e51eb81f83382dfbaee00f506a89c5477c0acccbcc29ec24c6d5d85340ea540430c2c1c4c62ad00d1f36196ae8a6fd3f9ae826f39be
diff --git a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild b/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
deleted file mode 100644
index e0236bc18c74..000000000000
--- a/dev-haskell/date-cache/date-cache-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Date cacher"
-HOMEPAGE="https://hackage.haskell.org/package/date-cache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/date-cache/metadata.xml b/dev-haskell/date-cache/metadata.xml
deleted file mode 100644
index 2fcf6e4da1d0..000000000000
--- a/dev-haskell/date-cache/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Formatting time is slow. This package provides
-		mechanisms to cache formatted date
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/dav/Manifest b/dev-haskell/dav/Manifest
index 645d0fedb3e0..c9afd1273e4f 100644
--- a/dev-haskell/dav/Manifest
+++ b/dev-haskell/dav/Manifest
@@ -1,7 +1 @@
-DIST DAV-0.4.1.tar.gz 18631 BLAKE2B 503b2746100668e9fa230029b34c8659bdaf504a3b966a6abaddc909ace2686d876c53808d038aeff4061d128643bc10e782b6295f9e0c5a52c90146784b1980 SHA512 280aef7ab401df1a8b724a6ba610257085fa1829b38860dfc676c4764a95ea3a9e53d6c18007a66bad0caff931891138c9512361d2d21107582a44e534cc98ff
-DIST DAV-0.5.1.tar.gz 18657 BLAKE2B 0638bd6f1b860163f0261035d638f78af557d9998917fdea152e8d38c0e9e6c45f8031154081d9ab4ff70cd6dfab313153b3c1c8a8fb2481b3ad73517fb4176b SHA512 b72d757c2dc94d328b144fd3b9d2601d3adf3795bff6b49b436684306abc0f147aaedf1e782303bfdfe1803d6821cf19215caa5faaf5184822f6887a008f91ff
-DIST DAV-0.6.2.tar.gz 19039 BLAKE2B d00443cdf7e4305ea0b424f292e44b2cbefe5b388b70ede36a29fc28d97bad9ac25df2995772d2190357e6ff6c4bb1c07391f14be1c91db5e8db93b96a09a747 SHA512 2342bd0d1bca3e0fcbe459ad1dda74265e728d2524781989165895ae49b610c5ce96576968555b5d9d049157553684539fc4cbfcf4527dd231bef13855d47ad3
-DIST DAV-1.0.7.tar.gz 19768 BLAKE2B 923f1c20db5325527798bfc6c0b02f02aa051e3e7969e90c43bdf6bbc804918e88c0c5784295060afccf29d095e67a73d76a8a3cd3c610af5172caec7c81ca52 SHA512 3f4cdd5c708793a3c9542cb89845cc8de6a456ba55bc564bf7227ca2c3243807e3e85d6995581ad7662c994d65a0a9cde6f3c0d0a7fbe8ac7c8a07e338b039a8
-DIST DAV-1.3.1.tar.gz 20003 BLAKE2B ae4227b845761092a7435dc2c5a82640c3abf547587bc3b0a0ed3af2a2dd3b96498f45ab299abf7e85711b55ef233efc3be0e4e311f9204aa2196048281eb953 SHA512 d9f502e52c6d6de774b6b25426f1231c02e1a522ea2b991266ddb56778fd34c3a2dcafc81fdf55332895df4b9ca717e3df30cdf39b707589224b646f1895a621
-DIST DAV-1.3.3.tar.gz 20524 BLAKE2B 23eeaddac4e9bbc5e969caa978f2b806c025fa8cda7337c81956950644d564d20e37a6ee468baf07ac2ffcffcbc7be8f7165360548753ecede6b876f1d6d012c SHA512 bbc9a4d685e25ac763c05dd8dc72d7db39196dbbb0cd898b66f644abc8333cd82950439fd446770c5aae737fd863afe881129ce551dadf9d0f75ef52df738fae
 DIST DAV-1.3.4.tar.gz 19884 BLAKE2B 84993b24cb4db897c76c964e8600bb3f882523792545e8d22468a7e435d53a2a2f05716595d73df3ec3f05f3e30a9d56c31bb446fc28e00126b5a853486c9206 SHA512 95bb567488bed2fef3813597ea9c080781bbc25117995901ff7264c0f04bf4db1bad6c9c94c4d1fbea968245041752b2b720d4c42b4c23191eda5e3dc0c292b6
diff --git a/dev-haskell/dav/dav-0.4.1.ebuild b/dev-haskell/dav/dav-0.4.1.ebuild
deleted file mode 100644
index 333bdbb7c291..000000000000
--- a/dev-haskell/dav/dav-0.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-		>=dev-haskell/http-conduit-1.9.0:=[profile?]
-		>=dev-haskell/http-types-0.7:=[profile?]
-		>=dev-haskell/lens-3.0:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/mtl-2.1:=[profile?]
-		>=dev-haskell/network-2.3:=[profile?]
-		dev-haskell/optparse-applicative:=[profile?]
-		>=dev-haskell/resourcet-0.3:=[profile?]
-		>=dev-haskell/transformers-0.3:=[profile?]
-		>=dev-haskell/xml-conduit-1.0:=[profile?]
-		<=dev-haskell/xml-conduit-1.2:=[profile?]
-		>=dev-haskell/xml-hamlet-0.4:=[profile?]
-		<=dev-haskell/xml-hamlet-0.5:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-0.5.1.ebuild b/dev-haskell/dav/dav-0.5.1.ebuild
deleted file mode 100644
index 491ff6061a00..000000000000
--- a/dev-haskell/dav/dav-0.5.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-0.6.2.ebuild b/dev-haskell/dav/dav-0.6.2.ebuild
deleted file mode 100644
index d647c38710c2..000000000000
--- a/dev-haskell/dav/dav-0.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/either-4.1:=[profile?]
-	dev-haskell/errors:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.5.0:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-1.0.7.ebuild b/dev-haskell/dav/dav-1.0.7.ebuild
deleted file mode 100644
index 4d7f151c2314..000000000000
--- a/dev-haskell/dav/dav-1.0.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/either-4.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/dav-1.3.1.ebuild b/dev-haskell/dav/dav-1.3.1.ebuild
deleted file mode 100644
index 6ed19403d7f4..000000000000
--- a/dev-haskell/dav/dav-1.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -mtl-compat
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/exceptions-0.7:=[profile?]
-	dev-haskell/haskeline:=[profile?]
-	>=dev-haskell/http-client-0.4:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mtl-compat \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/dav-1.3.3.ebuild b/dev-haskell/dav/dav-1.3.3.ebuild
deleted file mode 100644
index 4bb444abb2b3..000000000000
--- a/dev-haskell/dav/dav-1.3.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -mtl-compat
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/exceptions-0.7:=[profile?]
-	dev-haskell/haskeline:=[profile?]
-	>=dev-haskell/http-client-0.4:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mtl-compat \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/dav-1.3.4.ebuild b/dev-haskell/dav/dav-1.3.4.ebuild
index 9faf65b3f594..07cbde20cad9 100644
--- a/dev-haskell/dav/dav-1.3.4.ebuild
+++ b/dev-haskell/dav/dav-1.3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.3
 #hackport: flags: -mtl-compat
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
diff --git a/dev-haskell/dav/metadata.xml b/dev-haskell/dav/metadata.xml
index 8dcb4ff8ac22..639d13a2d3dd 100644
--- a/dev-haskell/dav/metadata.xml
+++ b/dev-haskell/dav/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -13,7 +13,4 @@
 		In addition, there is an executable, hdav, which can be used for
 		command-line operation.
 	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-haskell/dbus-core/Manifest b/dev-haskell/dbus-core/Manifest
deleted file mode 100644
index 9394f30f6b21..000000000000
--- a/dev-haskell/dbus-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dbus-core-0.9.3.tar.gz 216896 BLAKE2B affa443c08cfcc978aeb57a9b73be9afd4f0650e1fa363821688ad7c42439e6446f687f666acef793b95ba65b134bfd7c35968337dbd4c3878c8a8be9b8abe01 SHA512 4eee88958a49a0e0280744b490b9bc71e27f7f7fb32cc8ce34487439a124ba5fe72cb6b006781a03a41e87bdaeb2975fd19374fc19f699f7ad011a9b821ed32d
diff --git a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild b/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
deleted file mode 100644
index c5a98d4f8a8a..000000000000
--- a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level D-Bus protocol implementation"
-HOMEPAGE="https://john-millikin.com/software/dbus-core/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		>=dev-haskell/data-binary-ieee754-0.3:=[profile?] <dev-haskell/data-binary-ieee754-0.5:=[profile?]
-		=dev-haskell/libxml-sax-0.7*:=[profile?]
-		>=dev-haskell/network-2.2:=[profile?]
-		>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-		>=dev-haskell/text-0.11.1.5:=[profile?]
-		>=dev-haskell/vector-0.7:=[profile?]
-		=dev-haskell/xml-types-0.3*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	if has_version "<dev-haskell/haddock-2.9.2"; then
-		# Workaround http://hackage.haskell.org/trac/hackage/ticket/626
-		# The haddock --hoogle option does not like unicode characters, which causes
-		# haddock 2.7.2 to fail like:
-		# haddock: internal Haddock or GHC error: dist/doc/html/enumerator/enumerator.txt: commitAndReleaseBuffer: invalid argument (Invalid or incomplete multibyte or wide character)
-		sed -e 's@&#8208;@-@g' \
-			-e "s@&#8217;@'@g" \
-			-i "${S}/hs/DBus/Connection.hs" \
-			-i "${S}/hs/DBus/Client/Internal.hs" \
-			-i "${S}/hs/DBus/Client/Simple.hs" \
-			-i "${S}/hs/DBus/Message/Internal.hs" \
-			-i "${S}/hs/DBus/Types/Internal.hs" \
-			-i "${S}/hs/DBus/Wire/Internal.hs"
-	fi
-	cabal_chdeps \
-		'binary >= 0.4 && < 0.6' 'binary >= 0.4' \
-		'bytestring >= 0.9 && < 0.10' 'bytestring >= 0.9' \
-		'containers >= 0.1 && < 0.5' 'containers >= 0.1' \
-		'network >= 2.2 && < 2.4' 'network >= 2.2' \
-		'text >= 0.11.1.5 && < 0.12' 'text >= 0.11.1.5' \
-		'unix >= 2.2 && < 2.6' 'unix >= 2.2' \
-		'vector >= 0.7 && < 0.10' 'vector >= 0.7'
-}
diff --git a/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch b/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch
deleted file mode 100644
index 402df007e7df..000000000000
--- a/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/hs/DBus/Connection/Authentication.hs b/hs/DBus/Connection/Authentication.hs
-index b909a38..c33d311 100644
---- a/hs/DBus/Connection/Authentication.hs
-+++ b/hs/DBus/Connection/Authentication.hs
-@@ -25,3 +25,4 @@ module DBus.Connection.Authentication
- import           Prelude hiding (getLine, head)
--import           Control.Monad (liftM)
-+import           Control.Applicative
-+import           Control.Monad
- import qualified Data.ByteString
-@@ -58,2 +59,9 @@ data Auth a = Auth
- 
-+instance Functor Auth where
-+    fmap  = liftM
-+
-+instance Applicative Auth where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Auth where
-diff --git a/hs/DBus/Introspection.hs b/hs/DBus/Introspection.hs
-index 96ff4a3..da82812 100644
---- a/hs/DBus/Introspection.hs
-+++ b/hs/DBus/Introspection.hs
-@@ -29,3 +29,4 @@ module DBus.Introspection
- 	) where
--import           Control.Monad ((>=>))
-+import           Control.Applicative
-+import           Control.Monad
- import           Control.Monad.ST (runST)
-@@ -176,2 +177,9 @@ newtype XmlWriter a = XmlWriter { runXmlWriter :: Maybe (a, Text) }
- 
-+instance Functor XmlWriter where
-+    fmap  = liftM
-+
-+instance Applicative XmlWriter where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad XmlWriter where
-diff --git a/hs/DBus/Types/Internal.hs b/hs/DBus/Types/Internal.hs
-index 7f5d9c5..7c73afe 100644
---- a/hs/DBus/Types/Internal.hs
-+++ b/hs/DBus/Types/Internal.hs
-@@ -5,2 +5,3 @@
- {-# LANGUAGE IncoherentInstances #-}
-+{-# LANGUAGE FlexibleContexts #-}
- 
-diff --git a/hs/DBus/Util/MonadError.hs b/hs/DBus/Util/MonadError.hs
-index 33b51ed..ef01df2 100644
---- a/hs/DBus/Util/MonadError.hs
-+++ b/hs/DBus/Util/MonadError.hs
-@@ -23,2 +23,6 @@ module DBus.Util.MonadError
- 	) where
-+
-+import Control.Applicative
-+import Control.Monad
-+
- newtype ErrorM e a = ErrorM { runErrorM :: Either e a }
-@@ -30,2 +34,6 @@ instance Functor (ErrorM e) where
- 
-+instance Applicative (ErrorM e) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad (ErrorM e) where
-@@ -41,2 +49,9 @@ newtype ErrorT e m a = ErrorT { runErrorT :: m (Either e a) }
- 
-+instance Monad m => Functor (ErrorT e m) where
-+    fmap  = liftM
-+
-+instance Monad m => Applicative (ErrorT e m) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad m => Monad (ErrorT e m) where
-diff --git a/hs/DBus/Wire/Internal.hs b/hs/DBus/Wire/Internal.hs
-index b386eec..512ff1a 100644
---- a/hs/DBus/Wire/Internal.hs
-+++ b/hs/DBus/Wire/Internal.hs
-@@ -19,3 +19,4 @@
- module DBus.Wire.Internal where
--import Control.Monad (liftM, when, unless)
-+import Control.Applicative
-+import Control.Monad hiding (void)
- 
-@@ -96,2 +97,9 @@ newtype Wire s a = Wire
- 
-+instance Functor (Wire s) where
-+    fmap  = liftM
-+
-+instance Applicative (Wire s) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad (Wire s) where
diff --git a/dev-haskell/dbus-core/metadata.xml b/dev-haskell/dbus-core/metadata.xml
deleted file mode 100644
index 54fe8f8c3fff..000000000000
--- a/dev-haskell/dbus-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Low-level D-Bus protocol implementation
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/dbus/Manifest b/dev-haskell/dbus/Manifest
index f5a1b24969fb..37e66badbff1 100644
--- a/dev-haskell/dbus/Manifest
+++ b/dev-haskell/dbus/Manifest
@@ -1,5 +1,2 @@
-DIST dbus-0.10.10.tar.gz 73707 BLAKE2B 90903a39d6962fcd3864988215fc74a3f85571509f021a3507f392dd14f2b358d75558dc25269a49426bfcef18eccc53e76c468559b3329367db7ab5904e9879 SHA512 c2faa76c32abb19ab903c015f6fc133beb605bbb4459d018fa544ffe4e04110cc63fc45815d862e8311f5b99de9c180c8eeb8e135fd6c7eb388ff579529a8ead
-DIST dbus-0.10.11.tar.gz 74853 BLAKE2B e72838c14906106b2114d9be9d8580295617c33fd322a3139c8c8245849dd77837cc26587c0289982de32442265b477754196f1b600f630d2f05f1c5312941f1 SHA512 290c1e9b142b920d56c59f3b250da88e114d850c8d846c37b400b21e92fae2d58983b4821497b61d0ff96f54179aedb70a5eb3ca40e1fbb6bbe59dee2f9256ff
-DIST dbus-0.10.12.tar.gz 74960 BLAKE2B b0bf015a761e3bcff8b5b40165f475c0ce00320f95a3f21cad65fed2db6955d982c2c4dbee2e9697f9a67f44b680f12e00c892a1dfa5fd45f745167d39307e66 SHA512 e725adc1b9dbbef4e2f47fd96ae60894f6553a15d5524071f7d6a48ab60cd6c25cda9be3cf84c5f4090f9769810abab7939a7333dcf77f31d1a71690bb6852d9
-DIST dbus-0.10.13.tar.gz 75603 BLAKE2B b1acb541505f0f9afe63fd8d9441114fcee3574e109686b16cd5c506aa940674352d32c14e155d2a2ddbc4bab3485ed70f747f59240b572559d6e649aff3a8da SHA512 e3cbb4153cd9df9308d89662b83659e13f07881f4d652c6f02dc6b6768ac1009552a7cfa9c610ededc9b630d26290eec153a9b08b7a3d70b44a6946af3d030ec
-DIST dbus-1.2.16.tar.gz 78086 BLAKE2B b0909a8679f746e9f7ab4f949f44d44246271441e23c9baac41514a478d7cf2a6e58a2c697b2e7f005341b544d4533efb6f0065eec40f178303aaea7b1f5014d SHA512 fbcddba41d5a6ea3c93841f56b80c43e968758eb8979412cd15a3e6f384bb042a025dc4850dc2e584b459b0c7b99db791d1a9b17090108c004f657f7e125e441
+DIST dbus-1.2.27.tar.gz 78017 BLAKE2B 396739e7e6af0fe1921c9d3857c0650db9532d00a3fd2eda18042d42ce8336631d93d0c0ce75681b695f9e90c7205e38aea7c4f984544460ecab19c7d5090478 SHA512 2c6b87b4a793b555ef617e3f3f89695116180f0e1df2f84ee3da62c819c05c10a78d328644b84c8c9796354ee6dd1c6ad6b0430a1b9a2d7fe112b251d4606e8d
+DIST dbus-1.3.0.tar.gz 82155 BLAKE2B 46b5500294e93b2614e66fa99962917e3a27030e178f0b3734a764089d5ba2a72afd203d2b1afcc2227c7b0953e1f324af62b6d537148e32a7527677ae017a8b SHA512 e59b11910a4e4288c89955dbbd2a135cb81dc263aacb331477e4f70403f53d70340af3a280eee9be8b2ee70eef8c06813381ab1dcb36927d059c90a726992cc7
diff --git a/dev-haskell/dbus/dbus-0.10.10.ebuild b/dev-haskell/dbus/dbus-0.10.10.ebuild
deleted file mode 100644
index eb0ec15878c8..000000000000
--- a/dev-haskell/dbus/dbus-0.10.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.5:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[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
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/dbus/dbus-0.10.11-r1.ebuild b/dev-haskell/dbus/dbus-0.10.11-r1.ebuild
deleted file mode 100644
index 394878470e02..000000000000
--- a/dev-haskell/dbus/dbus-0.10.11-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[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
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cereal-0.5.patch
-
-	cabal_chdeps \
-		'cereal >= 0.3.4 && < 0.5' 'cereal >= 0.3.4'
-}
diff --git a/dev-haskell/dbus/dbus-0.10.12.ebuild b/dev-haskell/dbus/dbus-0.10.12.ebuild
deleted file mode 100644
index 6473e10b62e4..000000000000
--- a/dev-haskell/dbus/dbus-0.10.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://john-millikin.com/software/haskell-dbus/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/network-2.2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
-}
diff --git a/dev-haskell/dbus/dbus-0.10.13.ebuild b/dev-haskell/dbus/dbus-0.10.13.ebuild
deleted file mode 100644
index 7a5756839d15..000000000000
--- a/dev-haskell/dbus/dbus-0.10.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # don't allow access to running dbus
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	dev-haskell/libxml-sax:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/xml-types:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/chell
-		dev-haskell/chell-quickcheck
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/dbus/dbus-1.2.16.ebuild b/dev-haskell/dbus/dbus-1.2.16.ebuild
deleted file mode 100644
index 978131cedba6..000000000000
--- a/dev-haskell/dbus/dbus-1.2.16.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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A client library for the D-Bus IPC system"
-HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires access to dbus
-
-RDEPEND="<dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
-	<dev-haskell/exceptions-0.11:=[profile?]
-	<dev-haskell/lens-4.20:=[profile?]
-	>=dev-haskell/network-3.0.1.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	<dev-haskell/parsec-3.2:=[profile?]
-	<dev-haskell/random-1.3:=[profile?]
-	<dev-haskell/split-0.3:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/th-lift-0.9:=[profile?]
-	<dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?]
-	<dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( <dev-haskell/extra-1.8
-		<dev-haskell/quickcheck-2.15
-		<dev-haskell/resourcet-1.3
-		<dev-haskell/tasty-1.4
-		<dev-haskell/tasty-hunit-0.11
-		<dev-haskell/tasty-quickcheck-0.11 )
-"
diff --git a/dev-haskell/dbus/dbus-1.2.27.ebuild b/dev-haskell/dbus/dbus-1.2.27.ebuild
new file mode 100644
index 000000000000..414024615fea
--- /dev/null
+++ b/dev-haskell/dbus/dbus-1.2.27.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A client library for the D-Bus IPC system"
+HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.22-disable-integration-tests.patch"
+	"${FILESDIR}/${PN}-1.2.27-template-haskell.patch"
+)
+
+RDEPEND="<dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	<dev-haskell/lens-5.3:=[profile?]
+	>=dev-haskell/network-3.1.2.1:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	<dev-haskell/random-1.3:=[profile?]
+	<dev-haskell/split-0.3:=[profile?]
+	<dev-haskell/th-lift-0.9:=[profile?]
+	<dev-haskell/vector-0.14:=[profile?]
+	>=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?]
+	<dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( <dev-haskell/extra-1.8
+		<dev-haskell/quickcheck-2.15
+		<dev-haskell/resourcet-1.3
+		<dev-haskell/tasty-1.5
+		<dev-haskell/tasty-hunit-0.11
+		<dev-haskell/tasty-quickcheck-0.11 )
+"
+
+CABAL_CHDEPS=(
+	"base >=4.16 && <5" "base >=4 && <5"
+	"template-haskell >= 2.18 && < 2.20" "template-haskell"
+)
diff --git a/dev-haskell/dbus/dbus-1.3.0.ebuild b/dev-haskell/dbus/dbus-1.3.0.ebuild
new file mode 100644
index 000000000000..ce2a08ef691d
--- /dev/null
+++ b/dev-haskell/dbus/dbus-1.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A client library for the D-Bus IPC system"
+HOMEPAGE="https://github.com/rblaze/haskell-dbus#readme"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+# exotic keywords require ghc bump to 9.2 series
+#KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="<dev-haskell/cereal-0.6:=[profile?]
+	>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	<dev-haskell/lens-5.3:=[profile?]
+	>=dev-haskell/network-3.1.2.1:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	<dev-haskell/parsec-3.2:=[profile?]
+	<dev-haskell/random-1.3:=[profile?]
+	<dev-haskell/split-0.3:=[profile?]
+	<dev-haskell/text-2.1:=[profile?]
+	<dev-haskell/th-lift-0.9:=[profile?]
+	<dev-haskell/vector-0.14:=[profile?]
+	>=dev-haskell/xml-conduit-1.9.0.0:=[profile?] <dev-haskell/xml-conduit-1.10.0.0:=[profile?]
+	<dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.6.3.0
+	test? ( <dev-haskell/extra-1.8
+		<dev-haskell/quickcheck-2.15
+		<dev-haskell/resourcet-1.4
+		<dev-haskell/tasty-1.5
+		<dev-haskell/tasty-hunit-0.11
+		<dev-haskell/tasty-quickcheck-0.11
+		>=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4 )
+"
diff --git a/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch b/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch
deleted file mode 100644
index 5c2c4c57cbb0..000000000000
--- a/dev-haskell/dbus/files/dbus-0.10.11-cereal-0.5.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/lib/DBus/Transport.hs b/lib/DBus/Transport.hs
-index 8c50ab9..9517212 100644
---- a/lib/DBus/Transport.hs
-+++ b/lib/DBus/Transport.hs
-@@ -42,3 +42,5 @@ import qualified Data.ByteString
- import           Data.ByteString (ByteString)
-+import qualified Data.ByteString.Lazy as BL
- import qualified Data.Map as Map
-+import qualified Data.Monoid as M
- import           Data.Typeable (Typeable)
-@@ -49,3 +51,3 @@ import qualified System.Info
- 
--import qualified Data.Serialize.Builder as Builder
-+import qualified Data.ByteString.Builder as Builder
- 
-@@ -151,3 +153,3 @@ instance Transport SocketTransport where
- recvLoop :: Socket -> Int -> IO ByteString
--recvLoop s = loop Builder.empty where
-+recvLoop s = loop M.mempty where
- 	chunkSize = 4096
-@@ -156,3 +158,3 @@ recvLoop s = loop Builder.empty where
- 			chunk <- recv s chunkSize
--			let builder = Builder.append acc (Builder.fromByteString chunk)
-+			let builder = M.mappend acc (Builder.byteString chunk)
- 			loop builder (n - Data.ByteString.length chunk)
-@@ -163,8 +165,8 @@ recvLoop s = loop Builder.empty where
- 				-- Return what we've got so far.
--				0 -> return (Builder.toByteString acc)
-+				0 -> return (BL.toStrict $ Builder.toLazyByteString acc)
- 				
- 				len -> do
--					let builder = Builder.append acc (Builder.fromByteString chunk)
-+					let builder = M.mappend acc (Builder.byteString chunk)
- 					if len == n
--						then return (Builder.toByteString builder)
-+						then return (BL.toStrict $ Builder.toLazyByteString builder)
- 						else loop builder (n - Data.ByteString.length chunk)
-diff --git a/lib/DBus/Wire.hs b/lib/DBus/Wire.hs
-index 43ae315..09bf8bd 100644
---- a/lib/DBus/Wire.hs
-+++ b/lib/DBus/Wire.hs
-@@ -34,2 +34,3 @@ import qualified Data.ByteString.Char8
- import           Data.Int (Int16, Int32, Int64)
-+import qualified Data.ByteString.Lazy as BL
- import qualified Data.Map
-@@ -37,2 +38,3 @@ import           Data.Map (Map)
- import           Data.Maybe (fromJust, listToMaybe, fromMaybe)
-+import qualified Data.Monoid as M
- import           Data.Text (Text)
-@@ -45,3 +47,3 @@ import           System.Posix.Types (Fd(..))
- 
--import qualified Data.Serialize.Builder as Builder
-+import qualified Data.ByteString.Builder as Builder
- import qualified Data.Serialize.Get as Get
-@@ -180,3 +182,3 @@ appendB :: Word64 -> Builder.Builder -> Marshal ()
- appendB size bytes = Wire (\_ (MarshalState builder count) -> let
--	builder' = Builder.append builder bytes
-+	builder' = M.mappend builder bytes
- 	count' = count + size
-@@ -187,3 +189,3 @@ appendS bytes = appendB
- 	(fromIntegral (Data.ByteString.length bytes))
--	(Builder.fromByteString bytes)
-+	(Builder.byteString bytes)
- 
-@@ -275,3 +277,3 @@ unmarshalGet count be le = do
- marshalWord8 :: Word8 -> Marshal ()
--marshalWord8 x = appendB 1 (Builder.singleton x)
-+marshalWord8 x = appendB 1 (Builder.word8 x)
- 
-@@ -282,4 +284,4 @@ marshalWord16 :: Word16 -> Marshal ()
- marshalWord16 = marshalBuilder 2
--	Builder.putWord16be
--	Builder.putWord16le
-+	Builder.word16BE
-+	Builder.word16LE
- 
-@@ -287,4 +289,4 @@ marshalWord32 :: Word32 -> Marshal ()
- marshalWord32 = marshalBuilder 4
--	Builder.putWord32be
--	Builder.putWord32le
-+	Builder.word32BE
-+	Builder.word32LE
- 
-@@ -292,4 +294,4 @@ marshalWord64 :: Word64 -> Marshal ()
- marshalWord64 = marshalBuilder 8
--	Builder.putWord64be
--	Builder.putWord64le
-+	Builder.word64BE
-+	Builder.word64LE
- 
-@@ -441,6 +443,6 @@ getArrayBytes itemType vs = do
- 	
--	putState (MarshalState Builder.empty afterPadding)
-+	putState (MarshalState M.mempty afterPadding)
- 	(MarshalState itemBuilder _) <- Data.Vector.mapM_ marshal vs >> getState
- 	
--	let itemBytes = Builder.toByteString itemBuilder
-+	let itemBytes = BL.toStrict $ Builder.toLazyByteString itemBuilder
- 	    paddingSize = fromIntegral (afterPadding - afterLength)
-@@ -568,3 +570,3 @@ marshalMessage e serial msg = runMarshal where
- 		marshal (toValue (encodeEndianness e))
--		let bodyBytes = Builder.toByteString bodyBytesB
-+		let bodyBytes = BL.toStrict $ Builder.toLazyByteString bodyBytesB
- 		marshalHeader msg serial sig (fromIntegral (Data.ByteString.length bodyBytes))
-@@ -573,6 +575,6 @@ marshalMessage e serial msg = runMarshal where
- 		checkMaximumSize
--	emptyState = MarshalState Builder.empty 0
-+	emptyState = MarshalState M.mempty 0
- 	runMarshal = case unWire marshaler e emptyState of
- 		WireRL err -> Left (MarshalError err)
--		WireRR _ (MarshalState builder _) -> Right (Builder.toByteString builder)
-+		WireRR _ (MarshalState builder _) -> Right (BL.toStrict $ Builder.toLazyByteString builder)
- 
diff --git a/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch b/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch
deleted file mode 100644
index 5fbfa1f61981..000000000000
--- a/dev-haskell/dbus/files/dbus-0.10.12-QC-2.8.2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/tests/DBusTests/Util.hs b/tests/DBusTests/Util.hs
-index cc83cef..972afb1 100644
---- a/tests/DBusTests/Util.hs
-+++ b/tests/DBusTests/Util.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE TemplateHaskell #-}
-+{-# LANGUAGE TemplateHaskell, CPP #-}
- 
-@@ -194,4 +194,6 @@ countFileDescriptors = liftIO io where
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary a, Ord a) => Arbitrary (Data.Set.Set a) where
- 	arbitrary = fmap Data.Set.fromList arbitrary
-+#endif
- 
diff --git a/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch b/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch
new file mode 100644
index 000000000000..d5c509ca58e3
--- /dev/null
+++ b/dev-haskell/dbus/files/dbus-1.2.22-disable-integration-tests.patch
@@ -0,0 +1,28 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+dev-haskell/dbus: Disable integration tests
+
+These tests try to spin up an instance of dbus-daemon
+
+diff -urN dbus-1.2.22/tests/DBusTests.hs dbus-1.2.22-r1/tests/DBusTests.hs
+--- dbus-1.2.22/tests/DBusTests.hs	2021-12-16 12:34:16.000000000 -0700
++++ dbus-1.2.22-r1/tests/DBusTests.hs	2022-08-05 12:51:12.447871229 -0600
+@@ -23,7 +23,7 @@
+ import DBusTests.BusName
+ import DBusTests.Client
+ import DBusTests.ErrorName
+-import DBusTests.Integration
++--import DBusTests.Integration
+ import DBusTests.InterfaceName
+ import DBusTests.Introspection
+ import DBusTests.MemberName
+@@ -55,7 +55,7 @@
+     , test_BusName
+     , test_Client
+     , test_ErrorName
+-    , test_Integration
++--    , test_Integration
+     , test_InterfaceName
+     , test_Introspection
+     , test_MemberName
diff --git a/dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch b/dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch
new file mode 100644
index 000000000000..dab7aaff6aef
--- /dev/null
+++ b/dev-haskell/dbus/files/dbus-1.2.27-template-haskell.patch
@@ -0,0 +1,14 @@
+--- dbus-1.2.27-orig/lib/DBus/Generation.hs	2022-07-13 00:32:15.000000000 +1000
++++ dbus-1.2.27/lib/DBus/Generation.hs	2022-11-15 11:11:32.291154128 +1100
+@@ -148,7 +148,11 @@
+ makeFromVariantApp name = AppE (VarE 'T.fromVariant) $ VarE name
+ 
+ makeJustPattern :: Name -> Pat
++#if MIN_VERSION_template_haskell(2,18,0)
+ makeJustPattern name = ConP 'Just [] [VarP name]
++#else
++makeJustPattern name = ConP 'Just [VarP name]
++#endif
+ 
+ mapOrHead ::
+   (Num a, Eq a) => a -> (t -> b) -> [t] -> ([b] -> b) -> b
diff --git a/dev-haskell/dbus/metadata.xml b/dev-haskell/dbus/metadata.xml
index ffab7be7b225..b6c5efc4fb09 100644
--- a/dev-haskell/dbus/metadata.xml
+++ b/dev-haskell/dbus/metadata.xml
@@ -1,59 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		D-Bus is a simple, message-based protocol for inter-process
-		communication, which allows applications to interact with other parts of
-		the machine and the user's session using remote procedure calls.
-		
-		D-Bus is a essential part of the modern Linux desktop, where it replaces
-		earlier protocols such as CORBA and DCOP.
-		
-		This library is an implementation of the D-Bus protocol in Haskell. It
-		can be used to add D-Bus support to Haskell applications, without the
-		awkward interfaces common to foreign bindings.
-		
-		Example: connect to the session bus, and get a list of active names.
-		
-		@
-		&amp;#x7b;-\# LANGUAGE OverloadedStrings \#-&amp;#x7d;
-		
-		import Data.List (sort)
-		import DBus
-		import DBus.Client
-		
-		main = do
-		&amp;#x20;   client &lt;- connectSession
-		&amp;#x20;   //
-		&amp;#x20;   \-- Request a list of connected clients from the bus
-		&amp;#x20;   reply &lt;- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\")
-		&amp;#x20;       &amp;#x7b; methodCallDestination = Just \"org.freedesktop.DBus\"
-		&amp;#x20;       &amp;#x7d;
-		&amp;#x20;   //
-		&amp;#x20;   \-- org.freedesktop.DBus.ListNames() returns a single value, which is
-		&amp;#x20;   \-- a list of names (here represented as [String])
-		&amp;#x20;   let Just names = fromVariant (methodReturnBody reply !! 0)
-		&amp;#x20;   //
-		&amp;#x20;   \-- Print each name on a line, sorted so reserved names are below
-		&amp;#x20;   \-- temporary names.
-		&amp;#x20;   mapM_ putStrLn (sort names)
-		@
-		
-		&gt;$ ghc --make list-names.hs
-		&gt;$ ./list-names
-		&gt;:1.0
-		&gt;:1.1
-		&gt;:1.10
-		&gt;:1.106
-		&gt;:1.109
-		&gt;:1.110
-		&gt;ca.desrt.dconf
-		&gt;org.freedesktop.DBus
-		&gt;org.freedesktop.Notifications
-		&gt;org.freedesktop.secrets
-		&gt;org.gnome.ScreenSaver
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">dbus</remote-id>
+		<remote-id type="github">rblaze/haskell-dbus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/dec/Manifest b/dev-haskell/dec/Manifest
index 6dd83586955d..e05e17968b7e 100644
--- a/dev-haskell/dec/Manifest
+++ b/dev-haskell/dec/Manifest
@@ -1 +1,3 @@
 DIST dec-0.0.3.tar.gz 2629 BLAKE2B 558b559cf5d92afad637f61ae82549e200a6042740d78ef25be5bf32212dac5027e4f1b3cb9104c65d589927e1ff8b65e62b7f46d6fd5ff707f175cf920bb206 SHA512 446911a59287b48d8b98acf588671e6ed19fc12ed8adeabdab8f21c1fefb80cac7b59b9fea52a4671b997aa63d2eadda5181490e6901e99e9882de572abdc595
+DIST dec-0.0.5-rev1.cabal 1468 BLAKE2B df9584455ad01170b770c2342d8a5ac9f43383ebad9f87ac6f0abe7ee65e4165048b2ff1c5b401fa8af25dcc3532f04812a383fb50eb0a4f8b9e1c5bb9bd7089 SHA512 eb8b36f86b7266f1afdb57da4c7eb1b440cb347b9540d15acf217c3dcc432486154bc388adb98f720640fe765bd8acb80d09db7ea2cc27d5b2fa53f5210757e7
+DIST dec-0.0.5.tar.gz 3224 BLAKE2B b6d744a118f895e403d777cbc68b4913e8cd01e9f9e230b693b9d6dc2c6a6896f97e05e0bece5a22ff393da8b0cb9d29f78a8314af4d3799505ffd56d4591b22 SHA512 895085bb95bd8cec482f771d37f75221c12b50326bfeadeb6466d365c69756fef2faffcb557e0fee3861ec5318d8d27ad140ef6296217a80dda9a121f1be931a
diff --git a/dev-haskell/dec/dec-0.0.3.ebuild b/dev-haskell/dec/dec-0.0.3.ebuild
index 8a3cebbc9cf5..e5527d33dfb6 100644
--- a/dev-haskell/dec/dec-0.0.3.ebuild
+++ b/dev-haskell/dec/dec-0.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
@@ -24,8 +24,6 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 "
 
-src_prepare() {
-	default
-	cabal_chdeps \
-		'base >=4.7 && <4.13' 'base >=4.7'
-}
+CABAL_CHDEPS=(
+	'base >=4.7 && <4.13' 'base >=4.7'
+)
diff --git a/dev-haskell/dec/dec-0.0.5.ebuild b/dev-haskell/dec/dec-0.0.5.ebuild
new file mode 100644
index 000000000000..01a3511200b8
--- /dev/null
+++ b/dev-haskell/dec/dec-0.0.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Decidable propositions"
+HOMEPAGE="https://github.com/phadej/dec"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/boring-0.2:=[profile?] <dev-haskell/boring-0.3:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/dec/metadata.xml b/dev-haskell/dec/metadata.xml
index b7878815d80d..a0f6ba3a9a33 100644
--- a/dev-haskell/dec/metadata.xml
+++ b/dev-haskell/dec/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">dec</remote-id>
+		<remote-id type="github">phadej/dec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/deepseq-generics/Manifest b/dev-haskell/deepseq-generics/Manifest
deleted file mode 100644
index ce845c60bef1..000000000000
--- a/dev-haskell/deepseq-generics/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST deepseq-generics-0.1.1.2.tar.gz 5304 BLAKE2B 6a22f0eeb2f1d9d85de2ae83f7a98d54e6e5e647164d0b5729345250dbcdbae0327a475e775ef6caab139987e6d0c172a235245407c00fe51293999b6a22882a SHA512 79937e658395f10210c6cce96dabb22418fc01eafa50743394403e6a34b8f70a3eba79782fb193089fd7569686066891aa3edd4e5c14df896e8da2dc1e186077
-DIST deepseq-generics-0.2.0.0.tar.gz 5192 BLAKE2B c1711c69267a92749803f71cdb0738bf465d63a1cd91c0f26afefa52a7806711c7de75b52a1fa0421ec84a8f9165743fb7f2c5371dc3e4bd5e340ae0bfc4f532 SHA512 403d5fd9d8bee827ec2434841d06e78520f6ff5709e4b8e1223d926e819cb99727162d7004f98bff795beaff1dc7d42d07534300c11d453ac559a743a4d70e7e
diff --git a/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild b/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild
deleted file mode 100644
index d8b760e1e108..000000000000
--- a/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="GHC.Generics-based Control.DeepSeq.rnf implementation"
-HOMEPAGE="https://github.com/hvr/deepseq-generics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'ghc-prim >= 0.2 && < 0.4' 'ghc-prim >= 0.2 && < 0.5'
-}
diff --git a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild b/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
deleted file mode 100644
index 72295880e3a5..000000000000
--- a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
+++ /dev/null
@@ -1,35 +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.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="GHC.Generics-based Control.DeepSeq.rnf implementation"
-HOMEPAGE="https://github.com/hvr/deepseq-generics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.5 && < 4.10' 'base >= 4.5' \
-		'ghc-prim >= 0.2 && < 0.6' 'ghc-prim >= 0.2'
-}
diff --git a/dev-haskell/deepseq-generics/metadata.xml b/dev-haskell/deepseq-generics/metadata.xml
deleted file mode 100644
index de3594300240..000000000000
--- a/dev-haskell/deepseq-generics/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a "GHC.Generics"-based
-		'Control.DeepSeq.Generics.genericRnf' function which can be used
-		for providing a 'rnf' implementation. See the documentation for
-		the 'genericRnf' function in the "Control.DeepSeq.Generics" module
-		to get started.
-		
-		The original idea was pioneered in the @generic-deepseq@ package
-		(see &lt;http://www.haskell.org/pipermail/haskell-cafe/2012-February/099551.html&gt;
-		for more information).
-		
-		This package differs from the @generic-deepseq@ package by working
-		in combination with the existing @deepseq@ package as opposed to defining a
-		conflicting drop-in replacement for @deepseq@'s @Control.Deepseq@ module.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">hvr/deepseq-generics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/dense-linear-algebra/Manifest b/dev-haskell/dense-linear-algebra/Manifest
new file mode 100644
index 000000000000..d04c8d15c69d
--- /dev/null
+++ b/dev-haskell/dense-linear-algebra/Manifest
@@ -0,0 +1 @@
+DIST dense-linear-algebra-0.1.0.0.tar.gz 6285 BLAKE2B 22cfbc68a2511ae4ed946c7b3c99dc171b515f0fa929ee5b4a8b01a6c6a707b3a66e0168104b37a49882880658119ea0d9fc5c1bc9d562eecd2f9349eadd90b0 SHA512 bcc70b42c3ea59aa3a739e2b189b9a1018d3dc27e65f5016502a2068005f480c296960ba7758a810cb22bfde53b5a597a66a3e1dd7bb732e54fe5daa1be08aa0
diff --git a/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
new file mode 100644
index 000000000000..d6408e85fdc2
--- /dev/null
+++ b/dev-haskell/dense-linear-algebra/dense-linear-algebra-0.1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Simple and incomplete pure haskell implementation of linear algebra"
+HOMEPAGE="https://hackage.haskell.org/package/dense-linear-algebra"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/math-functions-0.1.7:=[profile?]
+	>=dev-haskell/primitive-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-haskell/vector-algorithms-0.4:=[profile?]
+	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
+	dev-haskell/vector-th-unbox:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/dense-linear-algebra/metadata.xml b/dev-haskell/dense-linear-algebra/metadata.xml
new file mode 100644
index 000000000000..937381521944
--- /dev/null
+++ b/dev-haskell/dense-linear-algebra/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/derive/Manifest b/dev-haskell/derive/Manifest
deleted file mode 100644
index b475590ca8af..000000000000
--- a/dev-haskell/derive/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST derive-2.5.26.tar.gz 58346 BLAKE2B abf62a7a948cc06f9f19b314f6ff670a6721c5bc1ebaf0d2dcfd068cbe23932b7cf3548e1e2fc574d7fd4ff6afecab380c16cc091aa95d8cef143ceb4af71b41 SHA512 06297c8d5ebe48dabe3a392a60c1fdec8f81c9a443952c361dfe39d7cf61171162c0e766d26f0f79253ed6540fac756a928543374e0741a334af4ff536e6a6c6
diff --git a/dev-haskell/derive/derive-2.5.26.ebuild b/dev-haskell/derive/derive-2.5.26.ebuild
deleted file mode 100644
index 15da4368df2e..000000000000
--- a/dev-haskell/derive/derive-2.5.26.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A program and library to derive instances for data types"
-HOMEPAGE="https://github.com/ndmitchell/derive#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/derive/metadata.xml b/dev-haskell/derive/metadata.xml
deleted file mode 100644
index 4b41d4a95355..000000000000
--- a/dev-haskell/derive/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Data.Derive is a library and a tool for deriving instances for Haskell programs.
-		It is designed to work with custom derivations, SYB and Template Haskell mechanisms.
-		The tool requires GHC, but the generated code is portable to all compilers.
-		We see this tool as a competitor to DrIFT.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ndmitchell/derive</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/deriving-compat/Manifest b/dev-haskell/deriving-compat/Manifest
index c78a6c818113..a8ed78fa35a1 100644
--- a/dev-haskell/deriving-compat/Manifest
+++ b/dev-haskell/deriving-compat/Manifest
@@ -1,2 +1,2 @@
-DIST deriving-compat-0.3.5.tar.gz 60418 BLAKE2B c3b56d5bbb0054b5bcfea50c38a742df35030d723e4051f5f441b0e341bfaa88aab7691a0cc77ba8b2df623e7e7c0e2b272ca63a11e27827d9b8e67e68cc4803 SHA512 73facb605f26edb05ce299cf40443a12d4508abc28a7a08bcb88e60edd12bd4c015023004abfc78794239f38e622e0b4309df63e40f8a5dd621fcd15cf1ede7a
-DIST deriving-compat-0.5.8.tar.gz 67468 BLAKE2B 0d5ea2e882e598590b69e8682d6a751fadd8cc78cbadc97d884db74730972e93b4045276aa86369d744d4edd9db4942acbdde4abae18002c599d7b0728112be1 SHA512 e0a807142bc324a0205bd3b98fc9c68292100808d448edaf800ed41c073ec0745329458dbbb6c1fe33cc86872a9d2555d76f57c6b9d8a1dcd891dda1a9fcf158
+DIST deriving-compat-0.6.5.tar.gz 74588 BLAKE2B a20c58f97e02d5b17aab2c561e09d6e7b147dbe3c2321fd0d8125ad2c12e0040a380a4b7f9150fe44905c802326017080a6bfcd0c79ad28816d01632d5af766e SHA512 7e4d20eac97c6deb95067163fef0f2032eaa642dc3ef3044046a5a2b3de4acd8deb8f4d07365c57b831fbada8fd4dd5752a0570d04b97533f07a870d9e728e69
+DIST deriving-compat-0.6.tar.gz 73015 BLAKE2B d0694fad9873617eff1581a239a6470248cfd2ed0372590cf5757b1f569dfcfcfb52e44f7096998f98c762735c5c54acd86ef3338271d9dec88d52fede1d698e SHA512 631a9eea6a2546f6f10b1365f8f2acf77611af41c1823583b3365d9def3d355b8596dbfe552d88feae2aa4e3d2aa5b30417e57191ace3c53b05f26890528f51c
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.3.5.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.3.5.ebuild
deleted file mode 100644
index d277fb6109a4..000000000000
--- a/dev-haskell/deriving-compat/deriving-compat-0.3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backports of GHC deriving extensions"
-HOMEPAGE="https://github.com/haskell-compat/deriving-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1
-		>=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1
-		>=dev-haskell/hspec-1.8
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tagged-0.7 <dev-haskell/tagged-1 )
-"
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild
deleted file mode 100644
index 8b27d4f7f63f..000000000000
--- a/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild
+++ /dev/null
@@ -1,31 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backports of GHC deriving extensions"
-HOMEPAGE="https://github.com/haskell-compat/deriving-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1
-		>=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1
-		>=dev-haskell/hspec-1.8
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tagged-0.7 <dev-haskell/tagged-1 )
-"
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.6.5.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.6.5.ebuild
new file mode 100644
index 000000000000..420bda40c27e
--- /dev/null
+++ b/dev-haskell/deriving-compat/deriving-compat-0.6.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backports of GHC deriving extensions"
+HOMEPAGE="https://github.com/haskell-compat/deriving-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1
+		>=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1
+		>=dev-haskell/hspec-1.8
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		>=dev-haskell/tagged-0.7 <dev-haskell/tagged-1
+		>=dev-haskell/void-0.5.10 <dev-haskell/void-1 )
+"
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild
new file mode 100644
index 000000000000..f3fcf6e2a46b
--- /dev/null
+++ b/dev-haskell/deriving-compat/deriving-compat-0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backports of GHC deriving extensions"
+HOMEPAGE="https://github.com/haskell-compat/deriving-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/base-compat-0.8.1 <dev-haskell/base-compat-1
+		>=dev-haskell/base-orphans-0.5 <dev-haskell/base-orphans-1
+		>=dev-haskell/hspec-1.8
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		>=dev-haskell/tagged-0.7 <dev-haskell/tagged-1
+		>=dev-haskell/void-0.5.10 <dev-haskell/void-1 )
+"
diff --git a/dev-haskell/deriving-compat/metadata.xml b/dev-haskell/deriving-compat/metadata.xml
index 047211a1b6d5..ed9245f629c2 100644
--- a/dev-haskell/deriving-compat/metadata.xml
+++ b/dev-haskell/deriving-compat/metadata.xml
@@ -1,54 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		Provides Template Haskell functions that mimic deriving
-		extensions that were introduced or modified in recent versions
-		of GHC. Currently, the following extensions are covered:
-		
-		* @DeriveFoldable@
-		
-		* @DeriveFunctor@
-		
-		* @DeriveTraversable@
-		
-		The following changes have been backported:
-		
-		* In GHC 8.0, @DeriveFoldable@ was changed to allow folding
-		over data types with existential constraints.
-		
-		* In GHC 8.0, @DeriveFoldable@ and @DeriveTraversable@ were
-		changed so as not to generate superfluous @mempty@ or @pure@
-		expressions in generated code. As a result, this allows
-		deriving @Traversable@ instances for datatypes with unlifted
-		argument types.
-		
-		* In GHC 8.0, deriving @Show@ was changed so that constructor fields
-		with unlifted types are no longer shown with parentheses, and
-		the output of showing an unlifted type is suffixed with the same
-		number of hash signs as the corresponding primitive literals.
-		
-		* In GHC 8.2, deriving `Ord` was changed so that it generates concrete
-		@if@-expressions that are not subject to @RebindableSyntax@.
-		
-		Note that some recent GHC extensions are not covered by this package:
-		
-		* @DeriveGeneric@, which was introducted in GHC 7.2 for deriving
-		@Generic@ instances, and modified in GHC 7.6 to allow derivation
-		of @Generic1@ instances. Use @Generics.Deriving.TH@ from
-		@&lt;http://hackage.haskell.org/package/generic-deriving generic-deriving&gt;@
-		to derive @Generic(1)@ using Template Haskell.
-		
-		* @DeriveLift@, which was introduced in GHC 8.0 for deriving
-		@Lift@ instances. Use @Language.Haskell.TH.Lift@ from
-		@&lt;http://hackage.haskell.org/package/th-lift th-lift&gt;@
-		to derive @Lift@ using Template Haskell.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">deriving-compat</remote-id>
 		<remote-id type="github">haskell-compat/deriving-compat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/diff/Manifest b/dev-haskell/diff/Manifest
index f29e85178ecb..167b1a5437f7 100644
--- a/dev-haskell/diff/Manifest
+++ b/dev-haskell/diff/Manifest
@@ -1,4 +1,2 @@
-DIST Diff-0.3.0.tar.gz 4128 BLAKE2B 94855d33247d1cf44642ad3bc395dd6944442e48405d2987dce1550acb34e3a8408c139b160f0d26aa1e4c76dfe3680750d96662b197e4633cc891563b65a19a SHA512 6920802ba715a97f7650e8edbcc8469c1479d8be2c7fb61703fccaf77f4adc23ced7d26794e6210318afd98f350bc5cb08fd70c1b2797fde9f95546e55a85198
-DIST Diff-0.3.2.tar.gz 5024 BLAKE2B fbbccebe6627853649367e016487b0d01e671a1a6a495996413ed2f4f4d7bc63245ea915f9de2465aa8ebe92db1893c34812306afe18aaf466eafcdfd21911ae SHA512 b41c8482b1bcd4e332f85015f7ea99dc3c76d106327bf6b3a8676bb31ffbbdc80f09386f8044aae234a1be6a6304ec4860bb9c0ced95f8910db19d3e2cefe297
-DIST Diff-0.3.4.tar.gz 7979 BLAKE2B 937b90294b9e48a741577c7d240a1b02feaadd2aca8afc439e19b36a98c0e3bc319ee67307b77a2410bf2139a580166cbedbc964d5c9b9fc15dc7422ec2350db SHA512 7b8af9a668429d8de141b840e4b22abafb7ccafa9cdbe4c5ee21efe58802ac5889f1575fd6b3c83755b1128ecec68f3aa0213e99b65161f1e7b5681dc6978ad7
 DIST Diff-0.4.0.tar.gz 8065 BLAKE2B ab29983e8f1322d45a0e2e2551d4f762328bfb3ae92b0bf0cc14c8126f8e6fae87eb3a591c4e9667b6f5a4f6a149630471e64a1da0f1b306f6b6d0e002583320 SHA512 6a48a234d3140bc8c641cdf649a1f0daa39ab4de4064435dcbb15a9ea52994c967aadc8584f70aab89ef78e17ecc66b8ce3d8dd2157eb5b85277dfff80fd608c
+DIST diff-0.4.1.tar.gz 8759 BLAKE2B 0f3ec0afd0643ebb2f1a4580b087af01fa2dadce12aa9503b7daef1191427f95f567a1d69a250a7415f58b6d246f6e55016b9fc4e3a672eb84a86a4d347c7b37 SHA512 54a3743635812be22747a50db44a1519f6aabd695bb586a406fb917cf328b7036d379fddd93d361f93b4e29cca817cc551a0329367bf6847ae54f91f87c8895f
diff --git a/dev-haskell/diff/diff-0.3.0.ebuild b/dev-haskell/diff/diff-0.3.0.ebuild
deleted file mode 100644
index a3115e10dcb9..000000000000
--- a/dev-haskell/diff/diff-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Diff"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="https://hackage.haskell.org/package/Diff"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/diff/diff-0.3.2.ebuild b/dev-haskell/diff/diff-0.3.2.ebuild
deleted file mode 100644
index 107588e43fb5..000000000000
--- a/dev-haskell/diff/diff-0.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Diff"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="https://hackage.haskell.org/package/Diff"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/diff/diff-0.3.4.ebuild b/dev-haskell/diff/diff-0.3.4.ebuild
deleted file mode 100644
index de095aa87eff..000000000000
--- a/dev-haskell/diff/diff-0.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="Diff"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="https://hackage.haskell.org/package/Diff"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/diff/diff-0.4.0.ebuild b/dev-haskell/diff/diff-0.4.0.ebuild
index 609ea0601bb9..b639bf14c398 100644
--- a/dev-haskell/diff/diff-0.4.0.ebuild
+++ b/dev-haskell/diff/diff-0.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4.9999
 
@@ -12,12 +12,12 @@ MY_PN="Diff"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="O(ND) diff algorithm in haskell"
-HOMEPAGE="http://hackage.haskell.org/package/Diff"
+HOMEPAGE="https://hackage.haskell.org/package/Diff"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/diff/diff-0.4.1.ebuild b/dev-haskell/diff/diff-0.4.1.ebuild
new file mode 100644
index 000000000000..6d276a997ec7
--- /dev/null
+++ b/dev-haskell/diff/diff-0.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_PN="Diff"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="O(ND) diff algorithm in haskell"
+HOMEPAGE="https://hackage.haskell.org/package/Diff"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-quickcheck2
+	)
+"
diff --git a/dev-haskell/diff/metadata.xml b/dev-haskell/diff/metadata.xml
index dfc8017acd0a..ccaabb918e1b 100644
--- a/dev-haskell/diff/metadata.xml
+++ b/dev-haskell/diff/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Basic implementation of the standard diff algorithm.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">Diff</remote-id>
+		<remote-id type="github">seereason/Diff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/digest/Manifest b/dev-haskell/digest/Manifest
index f9b70b4005ac..b839e549f7d6 100644
--- a/dev-haskell/digest/Manifest
+++ b/dev-haskell/digest/Manifest
@@ -1 +1,2 @@
 DIST digest-0.0.1.2.tar.gz 3790 BLAKE2B 6fa19f1967dc6c8597d0ce2a1b29d3fecc8e47b0f652ca1319e4a7a10d3e9f8a299869ef43df2307f822568e04e109d946abe481aebd2decf8f72cafce4d6446 SHA512 f7961c098677c0e75561e3706446b073f60c6a8646aca6d139d6559952b2cba189221ac8af59f2dc6e4da65ee4a789f703e2ebbcf1e9c3df3f98167409bdf7c9
+DIST digest-0.0.1.3.tar.gz 3792 BLAKE2B 4506977e388a0ccc5d244e4af915c3393c963e06d3899706fd1abbb737b576795d46b53907edc3142980ac470852faa16ca7e4db5c64cf4d2bcbc7f7c61462ea SHA512 2b4a6f58dc70ea18e359ddaa93088bfbefa96c6c37f256cf0c75bdd61087a874584d8a1d47176adb114a4399400b866d7911c12a2c8c1ebafee3398ca58caba2
diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild
index b4c7d1999a00..9eb6dfc796e9 100644
--- a/dev-haskell/digest/digest-0.0.1.2.ebuild
+++ b/dev-haskell/digest/digest-0.0.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,10 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-		sys-libs/zlib"
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	sys-libs/zlib
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/digest/digest-0.0.1.3.ebuild b/dev-haskell/digest/digest-0.0.1.3.ebuild
new file mode 100644
index 000000000000..a0b9dd81d18f
--- /dev/null
+++ b/dev-haskell/digest/digest-0.0.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 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="Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"
+HOMEPAGE="https://hackage.haskell.org/package/digest"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/digest/metadata.xml b/dev-haskell/digest/metadata.xml
index 06e7bab845b7..937381521944 100644
--- a/dev-haskell/digest/metadata.xml
+++ b/dev-haskell/digest/metadata.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides efficient cryptographic hash implementations for
-		strict and lazy bytestrings. For now, CRC32 and Adler32 are supported;
-		they are implemented as FFI bindings to efficient code from zlib.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/digits/Manifest b/dev-haskell/digits/Manifest
new file mode 100644
index 000000000000..e866ac3cdab8
--- /dev/null
+++ b/dev-haskell/digits/Manifest
@@ -0,0 +1 @@
+DIST digits-0.3.1.tar.gz 2480 BLAKE2B 92fee6671d5dade7a37b7faa4ea363c42b3ad810ec6cd486000148b9f6972a1b33122d5cf0ac8507cf097b1b1394d12d20414abf52ca1ed418c1a77553bf29ca SHA512 73dea874513585b1ccd5af1aa31fca2dbbbc7916ce1dce5a89fa0c842e86c0ae5f742ac345b77aed843591eec2f1408619ea44c876030d4dd626730d5c999099
diff --git a/dev-haskell/digits/digits-0.3.1.ebuild b/dev-haskell/digits/digits-0.3.1.ebuild
new file mode 100644
index 000000000000..b8587eb01530
--- /dev/null
+++ b/dev-haskell/digits/digits-0.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Converts integers to lists of digits and back"
+HOMEPAGE="https://hackage.haskell.org/package/digits"
+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/quickcheck:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+src_prepare() {
+	default
+	# not compatible to Cabal-3
+	rm Setup.lhs || die
+}
diff --git a/dev-haskell/digits/metadata.xml b/dev-haskell/digits/metadata.xml
new file mode 100644
index 000000000000..937381521944
--- /dev/null
+++ b/dev-haskell/digits/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/disk-free-space/disk-free-space-0.1.0.1.ebuild b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
index 9ec58982482f..efaf8e259764 100644
--- a/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
+++ b/dev-haskell/disk-free-space/disk-free-space-0.1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.7.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/disk-free-space/metadata.xml b/dev-haskell/disk-free-space/metadata.xml
index 345ccd01aa8d..448f34530acb 100644
--- a/dev-haskell/disk-free-space/metadata.xml
+++ b/dev-haskell/disk-free-space/metadata.xml
@@ -1,13 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		A cross-platform library for retrieving information about disk space usage.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">redneb/disk-free-space</remote-id>
 	</upstream>
diff --git a/dev-haskell/distributive/Manifest b/dev-haskell/distributive/Manifest
index 6f4c2bcc213c..e8d845fc10a6 100644
--- a/dev-haskell/distributive/Manifest
+++ b/dev-haskell/distributive/Manifest
@@ -1,4 +1 @@
-DIST distributive-0.3.2.tar.gz 5997 BLAKE2B dc92e2dae4ea335f7e1ca22432ee277c71b542cc26f6777d3a416d8de29acefe675f255b81c38d530b52965087902b115ac88fcb6d96c970417bb6cb0aa59201 SHA512 7b9d499c68a0e689c961ff6a1e33abad8d42fa714e6c45303559e58c962cb7fa1857a9dfa8514478a2c0abf464d0123ac12b8f86cee2d1c2c01a0875ad59bc1b
-DIST distributive-0.4.4.tar.gz 6686 BLAKE2B b408d3f7a95d11eabf7b59f5fced0373be66eb9ca96d22ceb3bad5ec77047d7e17b3cdf691bf9e214be52945d84511a77df01ce98b523ee35fbd35d6d8f308e1 SHA512 35f73d575f31b7ddc7ee5f58e4e2e871c3ea607c7147b96467937b5ffb80bcaeec6da616bfb596ffe1bc28bd7f4062d56496eb5b5cc9e45249865c216139dd4f
-DIST distributive-0.5.2.tar.gz 11824 BLAKE2B 7dd2bc3e4463ad44fba94a165f257343c171f185a8d8263d92db2dc3494b8ae5e2fb4a3174ac33c4864c009748ed5f30d1a2834ebf8c7e92b28b189391a6bb75 SHA512 1d16950598c25a9ce30ccd2711e085a5dba639dc0841af4fa0de1f1866fbea83142accf67fc95f230c466a5d17a5c9f2c577d6c3a72a913f7dbde77c8845175b
-DIST distributive-0.6.1.tar.gz 11256 BLAKE2B b8c964137613b828f2908b210964be06a39bcd360727edf816c9921d6f7c16c245fcc6cec702ff8f98e0f63c90396796af0bfc7964f25d589ca5616aa30eb934 SHA512 6f14660e14ff5dfe90eb44386ed111829d4a621f77908049197ce1802b4d5ddd67ec66dadb92f8726c03f455e077ea6a5b8503e24bd5d205883d53f13cceb630
+DIST distributive-0.6.2.1.tar.gz 8140 BLAKE2B 34cdca12089cc097619469e8f559e978ac6d96c7dd8156cd92ea3ef7a3219afb11af6dd78dd30f7aa72405ae90cd37860d845d7f0b5c7ce6055316d8c3f429bc SHA512 387c7b6e0b2f917fd68d52ffbc79b9db21e488629309bfaf0dc77450bfd37c0f7f8a29458532616b5395552f84f3727b462cb2876e5aca79101e2c752b26e0a7
diff --git a/dev-haskell/distributive/distributive-0.3.2.ebuild b/dev-haskell/distributive/distributive-0.3.2.ebuild
deleted file mode 100644
index 86c707c436dc..000000000000
--- a/dev-haskell/distributive/distributive-0.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Distributive functors -- Dual to Traversable"
-HOMEPAGE="https://github.com/ekmett/distributive/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lib-werror"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-0.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lib-werror lib-werror)
-}
diff --git a/dev-haskell/distributive/distributive-0.4.4.ebuild b/dev-haskell/distributive/distributive-0.4.4.ebuild
deleted file mode 100644
index 9521e8f2c566..000000000000
--- a/dev-haskell/distributive/distributive-0.4.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Distributive functors -- Dual to Traversable"
-HOMEPAGE="https://github.com/ekmett/distributive/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-werror
-}
diff --git a/dev-haskell/distributive/distributive-0.5.2.ebuild b/dev-haskell/distributive/distributive-0.5.2.ebuild
deleted file mode 100644
index e8562fa8646f..000000000000
--- a/dev-haskell/distributive/distributive-0.5.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +tagged,+semigroups
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Distributive functors -- Dual to Traversable"
-HOMEPAGE="https://github.com/ekmett/distributive/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.12
-		>=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=semigroups \
-		--flag=tagged
-}
diff --git a/dev-haskell/distributive/distributive-0.6.1.ebuild b/dev-haskell/distributive/distributive-0.6.1.ebuild
deleted file mode 100644
index 2389f0d37e23..000000000000
--- a/dev-haskell/distributive/distributive-0.6.1.ebuild
+++ /dev/null
@@ -1,40 +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.9999
-#hackport: flags: +tagged,+semigroups
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Distributive functors -- Dual to Traversable"
-HOMEPAGE="https://github.com/ekmett/distributive/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails on USE=doc
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/semigroups-0.13:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
-		>=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=semigroups \
-		--flag=tagged
-}
diff --git a/dev-haskell/distributive/distributive-0.6.2.1.ebuild b/dev-haskell/distributive/distributive-0.6.2.1.ebuild
new file mode 100644
index 000000000000..8c9907e5a2d3
--- /dev/null
+++ b/dev-haskell/distributive/distributive-0.6.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +tagged,+semigroups
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Distributive functors -- Dual to Traversable"
+HOMEPAGE="https://github.com/ekmett/distributive/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/generic-deriving-1.11 <dev-haskell/generic-deriving-2
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=semigroups \
+		--flag=tagged
+}
diff --git a/dev-haskell/distributive/metadata.xml b/dev-haskell/distributive/metadata.xml
index 00b25aaa934c..e1452845fd84 100644
--- a/dev-haskell/distributive/metadata.xml
+++ b/dev-haskell/distributive/metadata.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haskell 98 Distributive functors -- Dual to Traversable
-	</longdescription>
-	<use>
-		<flag name="lib-werror">Compile with the ghc -Werror option</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ekmett/distributive</remote-id>
 	</upstream>
diff --git a/dev-haskell/djinn-ghc/Manifest b/dev-haskell/djinn-ghc/Manifest
deleted file mode 100644
index 59fada36b2e3..000000000000
--- a/dev-haskell/djinn-ghc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST djinn-ghc-0.0.2.3.tar.gz 3330 BLAKE2B 87a8b2671805b84eca1e67cace7fe2bdb9e18886a873ccbb25bb1e64aae716dc00ab4e1235c5e81b60b41e52ea8f4988691cbc91893aa1054382f0d690b998f6 SHA512 441b6ce7f5d7e4672394bcc6654db9405406540e68855c41b7db33ef9e267178aa56f20209c4a91ffda59a7e44847c7bfebfa3f0c3df3d0868600f34912d9ae8
diff --git a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild b/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
deleted file mode 100644
index e31f460a78d0..000000000000
--- a/dev-haskell/djinn-ghc/djinn-ghc-0.0.2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate Haskell code from a type. Bridge from Djinn to GHC API"
-HOMEPAGE="https://hackage.haskell.org/package/djinn-ghc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/djinn-lib-0.0.1.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/djinn-ghc/metadata.xml b/dev-haskell/djinn-ghc/metadata.xml
deleted file mode 100644
index 927e4b37372f..000000000000
--- a/dev-haskell/djinn-ghc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Djinn uses an theorem prover for intuitionistic propositional logic
-		to generate a Haskell expression when given a type.
-		This is the bridge from djinn-lib to GHC API.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/djinn-lib/Manifest b/dev-haskell/djinn-lib/Manifest
deleted file mode 100644
index 8939a6507dbc..000000000000
--- a/dev-haskell/djinn-lib/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST djinn-lib-0.0.1.2.tar.gz 14608 BLAKE2B adc6fae2191fc1d1160bc1ce0b6f87ca9803f4431fb3cb2abb94357b7ed8867169e9eeba88e7e379361a5923ebea4237156e6bbf38b3ddfcc2b8905ad37fa850 SHA512 403878b72540362a6b6d545a65ded9f10d05c623180adf8a03e732fac30dd00a42b090b9e4f9da16baa5dc1fdbd6f29a97158174917f3c0527a37b6ecbcfbe8e
-DIST djinn-lib-0.0.1.3.tar.gz 14791 BLAKE2B 2c690f8224fd6e00839f2047893238a6801d44bef6e3b66874ca33d4cf2539fdd65a2846277affc8ea568991e380666eab62e425bb77c97c0079ebf0f28ea199 SHA512 9e531055f499a160fc1c32adeba26ef1c90aa92419140ee5659ea70100d51a1e376b2c2e87dc3816928362778dfb20362371aebdd53ad557a1bf09467d33b190
diff --git a/dev-haskell/djinn-lib/djinn-lib-0.0.1.2.ebuild b/dev-haskell/djinn-lib/djinn-lib-0.0.1.2.ebuild
deleted file mode 100644
index 7d202d370eda..000000000000
--- a/dev-haskell/djinn-lib/djinn-lib-0.0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate Haskell code from a type. Library extracted from djinn package"
-HOMEPAGE="http://www.augustsson.net/Darcs/Djinn/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild b/dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild
deleted file mode 100644
index e975bcaadc1f..000000000000
--- a/dev-haskell/djinn-lib/djinn-lib-0.0.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate Haskell code from a type. Library extracted from djinn package"
-HOMEPAGE="http://www.augustsson.net/Darcs/Djinn/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/djinn-lib/metadata.xml b/dev-haskell/djinn-lib/metadata.xml
deleted file mode 100644
index bfe47b825574..000000000000
--- a/dev-haskell/djinn-lib/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Djinn uses an theorem prover for intuitionistic propositional logic
-		to generate a Haskell expression when given a type.
-		This is a library extracted from Djinn sources.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/dlist-instances/Manifest b/dev-haskell/dlist-instances/Manifest
deleted file mode 100644
index c70ce19b46e1..000000000000
--- a/dev-haskell/dlist-instances/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST dlist-instances-0.1.1.1.tar.gz 1749 BLAKE2B a7a5f04fc3ee2586d5e51d9ef31a1d3429f403c9d119a643156f798501d39c63e284fe6be172cac5a7d37f1457eaded77541007c286c5469aa600c241eb83f6d SHA512 9a66f9f3d73466731c1b1a3f208c564f0fd8fe990e81dd274a86441e94b48c40d778535a9d346e9ff8160b23c19efa73cc836b4dcb3a6cb0e81817348bc5041a
-DIST dlist-instances-0.1.tar.gz 1676 BLAKE2B ecfd291f90ebfdd7351a68d9fa73a658154f1301a1fb5b98d36ce22a4e64b208af544e650e9019ce6f01b80cc960d986412e92c2edcce60d64a2c1099a28ec37 SHA512 8cc7d28a2db30008006df96e1bab090f43fd71ae80f6461e6f17581da661710b468afa5b0387de7f9296c41b01abe3fb42c659221479ed8d2c70b8621dbdb5ee
diff --git a/dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild b/dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild
deleted file mode 100644
index f17cf676b897..000000000000
--- a/dev-haskell/dlist-instances/dlist-instances-0.1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists instances"
-HOMEPAGE="https://github.com/gregwebs/dlist-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/dlist:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/dlist-instances/dlist-instances-0.1.ebuild b/dev-haskell/dlist-instances/dlist-instances-0.1.ebuild
deleted file mode 100644
index f2187ed691a8..000000000000
--- a/dev-haskell/dlist-instances/dlist-instances-0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists instances"
-HOMEPAGE="https://github.com/gregwebs/dlist-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/dlist:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/dlist-instances/metadata.xml b/dev-haskell/dlist-instances/metadata.xml
deleted file mode 100644
index a457afb41e46..000000000000
--- a/dev-haskell/dlist-instances/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		See the dlist packages.
-		This package is the canonical source for some orphan instances.
-		Orphan instances are placed here to avoid dependencies elsewhere.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gregwebs/dlist-instances</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/dlist/Manifest b/dev-haskell/dlist/Manifest
index 278fd522a11f..4ea719a988f7 100644
--- a/dev-haskell/dlist/Manifest
+++ b/dev-haskell/dlist/Manifest
@@ -1,6 +1 @@
-DIST dlist-0.5.tar.gz 5962 BLAKE2B 1828c068ac5ef72860e4a425840f927305cbf12db3930bde7086ef2172eff22a9b9ee014026d16303f311f13ba21eaf5a4607c1bd52ac313bba7e8cd3cd90353 SHA512 79de39c7e13b8423290c7afd5fd0218dbd8b12e6d37722084bca68074dd0940cf5aa6c3e757eecad5aff769d70aef2c3ce70a5e3c986387e0fd14d26be15634d
-DIST dlist-0.6.0.1.tar.gz 5655 BLAKE2B 20cec7c6db2299efb8e67872168ad0108183b52a2c2c4943371193ccb7c0ba033c7919c2304d72ab0ecc3aadb73b83156483e946b67cb8bdd639d9e6b4cf523a SHA512 31f692e14f0bdddbbdec985e6e5b0262ac74f0d03cd97c77427bf5552e58f2f79c20d8f4ba03479b45dd3f54a1d141a275928878d1b2a9eb71c667745f8bd5e4
-DIST dlist-0.7.1.2.tar.gz 6301 BLAKE2B 372f26f3583647945b54eeca9cdd6bdd93b361d6891da35089748d439387ebe2cddbc590dd331c249c58f79504ec1ec2cb837346c61ebf0da5426a14414083b9 SHA512 471059e0a4702eca3c5c9457ea1179bf032ff48813776a283a0993abfb713e25fc12a0171b44535729f2c241dcb69496273abe9dbac181af5ef4404be95d5780
-DIST dlist-0.7.1.tar.gz 6137 BLAKE2B a08d9caa3bc985909938a0676648b05b5d63cf4bb94fb26aeb0649bdbfc046ab416cf83aebdc2c35b4a9280b9c233a536575dd0d6e5f355e1890502f8dbc22fd SHA512 0cb9408c0e7e30baa0489439858e4998d17d16c8c120ff3f84c8e256262110770131a96337020456ed4c4e224cc4a80f567b3f4afb0d0452a622940c4dac635a
-DIST dlist-0.8.0.2.tar.gz 8291 BLAKE2B 738ceabf3dc90a96190968a5f7727510842d1f326eff5009d5e1e6ae3c1543647f531318051f4c0d21522165240ddea3b8fd0b6ec5cd11a2edb42e0edc2d500e SHA512 49806edc04810fdd288c63c0b6f44e4c093844e9d47c57b059064d6b2426e1b75a9665e3209fcbd3e3781293cace79bf7532b195364fb259a5e24ea8774623ac
-DIST dlist-0.8.0.7.tar.gz 9228 BLAKE2B 11d32271f9a4254eef04cf2b4de2cb68471a3194add8bd8ba87995c7098a5c80e54a62e2637ec6482ce671e7674b33ed2339a7bb2b52b4f302a41aab89b86c6b SHA512 e98ce96819bc8c7a86f1eb402ba7c6aea95fc87502afbb40a4b61ac6dc9a9793ca6f6042f633733c9e0e7c7f3f77711809767ecd213639bfa3b77e71bd6bd806
+DIST dlist-1.0.tar.gz 18667 BLAKE2B 7ed951b866463c55b7f59d8224096528ee7a1c6a055a6b31e9d2a095409dc68bb3fb9e683922479c7cffe687796ebaf029f51a2da4469beec68b29b2c98ad2f0 SHA512 8985b9e775e8d99c3d8cf59eabfb7ed13c395482186b086831a79afea9b980ee59e386856df82dcc030f430be55cc95fa057e962776fe37a371e8be5ae19abef
diff --git a/dev-haskell/dlist/dlist-0.5-r1.ebuild b/dev-haskell/dlist/dlist-0.5-r1.ebuild
deleted file mode 100644
index a7630fafdcdb..000000000000
--- a/dev-haskell/dlist/dlist-0.5-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Differences lists"
-HOMEPAGE="http://code.haskell.org/~dons/code/dlist/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=applicative-in-base
-}
diff --git a/dev-haskell/dlist/dlist-0.6.0.1.ebuild b/dev-haskell/dlist/dlist-0.6.0.1.ebuild
deleted file mode 100644
index b04dde808c42..000000000000
--- a/dev-haskell/dlist/dlist-0.6.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.7 )
-"
diff --git a/dev-haskell/dlist/dlist-0.7.1.2.ebuild b/dev-haskell/dlist/dlist-0.7.1.2.ebuild
deleted file mode 100644
index 9ebbde0b8f9e..000000000000
--- a/dev-haskell/dlist/dlist-0.7.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9 )
-"
diff --git a/dev-haskell/dlist/dlist-0.7.1.ebuild b/dev-haskell/dlist/dlist-0.7.1.ebuild
deleted file mode 100644
index 2de95b361e8e..000000000000
--- a/dev-haskell/dlist/dlist-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.8 )
-"
diff --git a/dev-haskell/dlist/dlist-0.8.0.2.ebuild b/dev-haskell/dlist/dlist-0.8.0.2.ebuild
deleted file mode 100644
index c8feebbe7f2c..000000000000
--- a/dev-haskell/dlist/dlist-0.8.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10 )
-"
diff --git a/dev-haskell/dlist/dlist-0.8.0.7.ebuild b/dev-haskell/dlist/dlist-0.8.0.7.ebuild
deleted file mode 100644
index e66be00e58cb..000000000000
--- a/dev-haskell/dlist/dlist-0.8.0.7.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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Difference lists"
-HOMEPAGE="https://github.com/spl/dlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.14 )
-"
diff --git a/dev-haskell/dlist/dlist-1.0.ebuild b/dev-haskell/dlist/dlist-1.0.ebuild
new file mode 100644
index 000000000000..82ddb700de2f
--- /dev/null
+++ b/dev-haskell/dlist/dlist-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Difference lists"
+HOMEPAGE="https://github.com/spl/dlist"
+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="werror"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.10 <dev-haskell/quickcheck-2.15 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag werror werror)
+}
diff --git a/dev-haskell/dlist/metadata.xml b/dev-haskell/dlist/metadata.xml
index d551ad50b800..a7236f4e18f7 100644
--- a/dev-haskell/dlist/metadata.xml
+++ b/dev-haskell/dlist/metadata.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Differences lists: a list-like type supporting O(1) append.
-		This is particularly useful for efficient logging and pretty
-		printing, (e.g. with the Writer monad), where list append
-		quickly becomes too expensive.
-	</longdescription>
+	<use>
+		<flag name="werror">Enable -Werror</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">spl/dlist</remote-id>
 	</upstream>
diff --git a/dev-haskell/dns/Manifest b/dev-haskell/dns/Manifest
index d80f48f2e1e5..8f2ea142c50e 100644
--- a/dev-haskell/dns/Manifest
+++ b/dev-haskell/dns/Manifest
@@ -1,6 +1 @@
-DIST dns-0.3.8.tar.gz 11313 BLAKE2B 175b85129ac505414a31794c1150eefb9d8e92d36cc5348272268c32825a442f7bc68e684fd635d42471e568a60acc5a05cf5b320d85ac9453de167609c3adf3 SHA512 dbd6d042866e1861a47660c7daba1f29ee445a48eae3c25e05306878a74f9758587430296222e3f67062a3c173d96dab833a6d43b5d3237d614cfd2bad92be9d
-DIST dns-1.4.5.tar.gz 20071 BLAKE2B ec116289a4b252a504a24b9ce79dce739b8b3008d69aa00a64d6abe04e930280494767af49e5d78f28aefad3ed9c0f5431a6892c5a81b711b448a69b3c6b8545 SHA512 a5b434fa868a3254234b4ffef579e007ff7a9e41867f1d81d554573d026d4de86967dc0e313c86d603287581020163365c9f2f795084a15efca3f05ad9daf538
-DIST dns-2.0.0.tar.gz 20570 BLAKE2B 7b15a58a8b2e6c6170db4bd5886c31e111a5237c1d6c5a1297cd34f7da26248d6d51b725d5d8e631f70767db28a75ad2583817cf3d87066ce862f018e1057743 SHA512 b681b3a6eed46a98b466df0e367b44cfc964d5b0a7d22912ece0a469e79b3176a2a3674fa1cd0d458037d413f5890362c47112c7f35a5f491c67b4ec6773405c
-DIST dns-2.0.2.tar.gz 20951 BLAKE2B de4785384bbfb626dd1a315b6df3768b20091d232c8ee6626e73d87197970282a5a1a3c98d03094fceddc81ae4df3ca5ada7b2a5d9fc738cbca49d78f1ba9387 SHA512 14f444e0c1074359e84ef854d7b3d5db0d70c93412db609263f9f5897cfe7269ee2a78154614007204732a81ca09610d445ae35520b07d7e0e46895089d0d0d9
-DIST dns-2.0.6.tar.gz 21907 BLAKE2B 08e426c26fe98d034973624ff75d164b2e6334cdec9fbe08a1e2b140eb76e01665c2ff8c10d93f354cc473afe483a41aee297f9bc56253b7f3c8c5e2cc311c44 SHA512 2bc3974ac128bc4da9ae19ff3edf40dbc9b1ce42353dab40819c3ff42b3ef27204e09b552b4a885c558d5cd6af65495ac305e6ada3eb3e6291e7b32dbd929ae8
 DIST dns-4.0.1.tar.gz 65645 BLAKE2B 1332522ea57fb5df7e97ebe5caaa29580e8fc9edf77064b03d1dd6f5935975e37e21cbb4f95a92c4dce53b222b51a7b46008cd6a05fed9cf3d95bd4c3b359f73 SHA512 5c3d86c95aeb61ffdf951472a18ce2878b9dad1069efdf02fd7aff4065cf88c93c13d197488af65811440c674a75601b0c3336a6de6a9bff98cca018254b6e9c
diff --git a/dev-haskell/dns/dns-0.3.8.ebuild b/dev-haskell/dns/dns-0.3.8.ebuild
deleted file mode 100644
index a4dacac1bac0..000000000000
--- a/dev-haskell/dns/dns-0.3.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/dns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # relies on external network #502534
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-		dev-haskell/attoparsec-conduit:=[profile?]
-		dev-haskell/binary:=[profile?]
-		dev-haskell/blaze-builder:=[profile?]
-		dev-haskell/conduit:=[profile?]
-		>=dev-haskell/iproute-1.2.4:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/network:=[profile?]
-		dev-haskell/network-bytestring:=[profile?]
-		dev-haskell/network-conduit:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/dns/dns-1.4.5.ebuild b/dev-haskell/dns/dns-1.4.5.ebuild
deleted file mode 100644
index 73e003e048ae..000000000000
--- a/dev-haskell/dns/dns-1.4.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/dns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ambiguous modules
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-2.0.0.ebuild b/dev-haskell/dns/dns-2.0.0.ebuild
deleted file mode 100644
index 73e003e048ae..000000000000
--- a/dev-haskell/dns/dns-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/dns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ambiguous modules
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-2.0.2.ebuild b/dev-haskell/dns/dns-2.0.2.ebuild
deleted file mode 100644
index aec8b7d91e55..000000000000
--- a/dev-haskell/dns/dns-2.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/dns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ambiguous modules: ip-route / network-data
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-2.0.6.ebuild b/dev-haskell/dns/dns-2.0.6.ebuild
deleted file mode 100644
index 874527cfd7b8..000000000000
--- a/dev-haskell/dns/dns-2.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/dns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # uses internet to test resolver
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/iproute-1.3.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest
-		dev-haskell/hspec
-		dev-haskell/word8 )
-"
diff --git a/dev-haskell/dns/dns-4.0.1.ebuild b/dev-haskell/dns/dns-4.0.1.ebuild
index 44f5922d7b3b..e4cd602c43f9 100644
--- a/dev-haskell/dns/dns-4.0.1.ebuild
+++ b/dev-haskell/dns/dns-4.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="DNS library in Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/dns"
+HOMEPAGE="https://hackage.haskell.org/package/dns"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT=test # uses internet to test resolver
diff --git a/dev-haskell/dns/metadata.xml b/dev-haskell/dns/metadata.xml
index b0f91c19bb9f..937381521944 100644
--- a/dev-haskell/dns/metadata.xml
+++ b/dev-haskell/dns/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		DNS library for clients and servers.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/doclayout/Manifest b/dev-haskell/doclayout/Manifest
index 48f3fb56eebc..c73f3bce0de6 100644
--- a/dev-haskell/doclayout/Manifest
+++ b/dev-haskell/doclayout/Manifest
@@ -1 +1,2 @@
-DIST doclayout-0.3.tar.gz 11968 BLAKE2B 60c9b1a0f8e6cbd18f130c392b19362754b0622def92e6404ac37cc3aa304712cf947fad0dd162f7919c93524f4cb87d8c9c240d22351087f629f5fb58321ad5 SHA512 ccb8c41977c5cea47294157c812a31b3be5bddc872915d8baf0d9063d597429606d83e4f7cf9e4aea9b1e1416cbcf732fbbcd71b6659de6510c661f9225d33d0
+DIST doclayout-0.4.tar.gz 38804 BLAKE2B fab7c7090c0416a0d6a377673892ffdd684703f773416fd08ff95e418637caf7a61242931a492f321c09374c020374630e6223d2838650c5078408a041fc9bfb SHA512 78d3f64d72c2991bdc9b7ace27ed93e977d3e5fc3afa511857234f1c756fbdb77ccc74ba11af0aabfb09f31a4a906324abc1945160f435c83a07ebd3ae1a44c4
+DIST doclayout-0.4.0.1.tar.gz 38465 BLAKE2B dc21503946cbfca5dee1db1aaccd2ed07517ae7390fbcca58f6181abd5e53604a125ff6272c0779cb716e7e71651fe6808a20d02a38a9361d2dd717ac69dd07d SHA512 7af503194e513b4586442e850959a247cada1a375964e458cdf8f1df7ecb35f0c350eba3bf55c904107c89f7cc584ea957f218930f41229df62a9528ace4aab2
diff --git a/dev-haskell/doclayout/doclayout-0.3.ebuild b/dev-haskell/doclayout/doclayout-0.3.ebuild
deleted file mode 100644
index 9fc2a512278c..000000000000
--- a/dev-haskell/doclayout/doclayout-0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A prettyprinting library for laying out text documents"
-HOMEPAGE="https://github.com/jgm/doclayout"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/doclayout/doclayout-0.4.0.1.ebuild b/dev-haskell/doclayout/doclayout-0.4.0.1.ebuild
new file mode 100644
index 000000000000..6fadf9384c49
--- /dev/null
+++ b/dev-haskell/doclayout/doclayout-0.4.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A prettyprinting library for laying out text documents"
+HOMEPAGE="https://github.com/jgm/doclayout"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/emojis-0.1.2:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/doclayout/doclayout-0.4.ebuild b/dev-haskell/doclayout/doclayout-0.4.ebuild
new file mode 100644
index 000000000000..0b7e7f9b5531
--- /dev/null
+++ b/dev-haskell/doclayout/doclayout-0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A prettyprinting library for laying out text documents"
+HOMEPAGE="https://github.com/jgm/doclayout"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/emojis-0.1.2:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/doclayout/metadata.xml b/dev-haskell/doclayout/metadata.xml
index a9ba080b188f..eae51fcd09cc 100644
--- a/dev-haskell/doclayout/metadata.xml
+++ b/dev-haskell/doclayout/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		doclayout is a prettyprinting library for laying out
-		text documents, with several features not present
-		in prettyprinting libraries designed for code.  It
-		was designed for use in pandoc.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">doclayout</remote-id>
+		<remote-id type="github">jgm/doclayout</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest
index 2d350626b360..bc3b509ad5e5 100644
--- a/dev-haskell/doctemplates/Manifest
+++ b/dev-haskell/doctemplates/Manifest
@@ -1,3 +1,2 @@
-DIST doctemplates-0.1.0.2.tar.gz 5924 BLAKE2B 80c20a0dd097770d2e6fda2f38435393c65b9fa91bc521a6c52e91a7ac11a637787aa740be1cfaa051fa077d8dc20cb8b7949b930317e426d203d60458865471 SHA512 043cc1ff32c7b1b9ac2d528d647c08769ec6ffbf3cbf080422b6f435737030ed4085735ab9c1974bbae87099a31614b66ae800fefab7120e9add5ab03815c430
-DIST doctemplates-0.2.2.1.tar.gz 6139 BLAKE2B 5667ed03cec2605c131246625dcdffc06aed3d9237e09490509bfbe69a80483fb58bb248706076ac2c4fde2bf178b3695f14d93615bcd788ddbeca841088855e SHA512 e1ad0d61dc97a69febf55ad76ee05e6696b76b0df5ee925072e934b977d1ca4c8d9ce0bc9acb311ec1992ce783e86fcaec93a93fc47fecffbd0071f002013485
-DIST doctemplates-0.8.2.tar.gz 26780 BLAKE2B 32554545d451a382a490dc6d64b9f8ff0465b1e345daec457196cebf61f0d6975fda8eebc0e7115089622c15e7a96cbe490ae78d63b7b06ebded9c9b79f82a3a SHA512 1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad
+DIST doctemplates-0.10.0.2.tar.gz 27788 BLAKE2B b4c2d505dde62123177c87b7302095a02a6e27cc3f4e311e9a4464fe4eddb43e520146fdf6758cacdb8a9b348ae0b8a46b0485bc105366776e6bfa60b31209cc SHA512 47bca3c29cb306ce0dd8cb91c255f2ed1988136380ddbfd3220ca5a14527650b44d2d4f5c7fef3245c5c11e5287dcf2523eb1b0ab861436e7f950fc8188af36a
+DIST doctemplates-0.11.tar.gz 25255 BLAKE2B bcdda272b1cd3e745b87029b9802fe225a86405237713fb263eb315ab4dcba1a3c128d5fb77f0623c64638d024b7bc1bbaeeeff54fdb8f4ac0d897dd19791c31 SHA512 f6e99c7fdc1c2ce4bdac3ff7bd92ad032d9d545f45300bdea46ca09518942adf6ba9b23b002f145d7f4841e119248dc51f61a99949816f7093fb15dddf441433
diff --git a/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild
deleted file mode 100644
index 9e235a135cb5..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/blaze-html:=[profile?]
-	dev-haskell/blaze-markup:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild
new file mode 100644
index 000000000000..739450ddb5cd
--- /dev/null
+++ b/dev-haskell/doctemplates/doctemplates-0.10.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pandoc-style document templates"
+HOMEPAGE="https://github.com/jgm/doctemplates#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+	>=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text-conversions:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/glob
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/temporary )
+"
diff --git a/dev-haskell/doctemplates/doctemplates-0.11.ebuild b/dev-haskell/doctemplates/doctemplates-0.11.ebuild
new file mode 100644
index 000000000000..725a61ce5eea
--- /dev/null
+++ b/dev-haskell/doctemplates/doctemplates-0.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pandoc-style document templates"
+HOMEPAGE="https://github.com/jgm/doctemplates#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/text-conversions:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/glob
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/temporary )
+"
diff --git a/dev-haskell/doctemplates/doctemplates-0.2.2.1.ebuild b/dev-haskell/doctemplates/doctemplates-0.2.2.1.ebuild
deleted file mode 100644
index f56f72680195..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.2.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/blaze-html:=[profile?]
-	dev-haskell/blaze-markup:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
deleted file mode 100644
index 5fc32b279a83..000000000000
--- a/dev-haskell/doctemplates/doctemplates-0.8.2.ebuild
+++ /dev/null
@@ -1,40 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pandoc-style document templates"
-HOMEPAGE="https://github.com/jgm/doctemplates#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/doclayout-0.3:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
-	dev-haskell/hsyaml:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/text-conversions:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/glob
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/doctemplates/metadata.xml b/dev-haskell/doctemplates/metadata.xml
index 2caddd34f3d7..36be86b11bb1 100644
--- a/dev-haskell/doctemplates/metadata.xml
+++ b/dev-haskell/doctemplates/metadata.xml
@@ -1,14 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		Please see README.md
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">doctemplates</remote-id>
 		<remote-id type="github">jgm/doctemplates</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/doctest-driver-gen/Manifest b/dev-haskell/doctest-driver-gen/Manifest
new file mode 100644
index 000000000000..23203e5c86d1
--- /dev/null
+++ b/dev-haskell/doctest-driver-gen/Manifest
@@ -0,0 +1 @@
+DIST doctest-driver-gen-0.3.0.7.tar.gz 3299 BLAKE2B 74012e950328df902b6021496f554c418df797b2b08c01cc93f2b4bd182cb6f7dbc0afaf2c906fcbe2dbec5ee47210bc790e9be43a2835d3bc034d6f7f8209ce SHA512 892a713d7a3d22e1bc25b6722d74ae37be3db90c439f70a19baf2ef6f5dc6acd60359e101c222c1b736614a53fef0928399c6fa4e6e35deecf4994c6973954ca
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
new file mode 100644
index 000000000000..eca005fa90d4
--- /dev/null
+++ b/dev-haskell/doctest-driver-gen/doctest-driver-gen-0.3.0.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generate driver file for doctest's cabal integration"
+HOMEPAGE="https://github.com/Hexirp/doctest-driver-gen#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+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:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		dev-haskell/doctest
+	)
+"
+
+src_configure() {
+	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}"
+}
+
+src_install() {
+	local components=( "lib:${PN}" )
+	use executable && components+=( "exe:${PN}" )
+	haskell-cabal_src_install "${components[@]}"
+}
diff --git a/dev-haskell/doctest-driver-gen/files/doctest-driver-gen-0.3.0.7-add-executable-flag.patch b/dev-haskell/doctest-driver-gen/files/doctest-driver-gen-0.3.0.7-add-executable-flag.patch
new file mode 100644
index 000000000000..b71afe410d91
--- /dev/null
+++ b/dev-haskell/doctest-driver-gen/files/doctest-driver-gen-0.3.0.7-add-executable-flag.patch
@@ -0,0 +1,31 @@
+From c1d00ee310adf30211150ad9a9444afb3b957889 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@protonmail.com>
+Date: Thu, 5 Oct 2023 22:47:26 -0600
+Subject: [PATCH 1/1] Add executable flag
+
+Toggled on by default
+
+Signed-off-by: hololeap <hololeap@protonmail.com>
+---
+ doctest-driver-gen.cabal | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/doctest-driver-gen.cabal b/doctest-driver-gen.cabal
+index cbe5aff..d86d001 100644
+--- a/doctest-driver-gen.cabal
++++ b/doctest-driver-gen.cabal
+@@ -43,6 +43,11 @@ library
+   ghc-options:         -Wall
+   default-language:    Haskell2010
+ 
++flag executable
++  description:         Build the doctest-driver-gen executable
++  default:             True
++  manual:              True
++
+ executable doctest-driver-gen
+   hs-source-dirs:      app
+   main-is:             Main.hs
+-- 
+2.41.0
+
diff --git a/dev-haskell/doctest-driver-gen/metadata.xml b/dev-haskell/doctest-driver-gen/metadata.xml
new file mode 100644
index 000000000000..8adc887f2bfb
--- /dev/null
+++ b/dev-haskell/doctest-driver-gen/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<use>
+		<flag name="executable">Build the doctest-driver-gen executable</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">doctest-driver-gen</remote-id>
+		<remote-id type="github">Hexirp/doctest-driver-gen</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest
index 38aa6cd4536c..a99680e4fb23 100644
--- a/dev-haskell/doctest/Manifest
+++ b/dev-haskell/doctest/Manifest
@@ -1,4 +1,3 @@
-DIST doctest-0.10.1.tar.gz 18046 BLAKE2B b91529c81d8c23838933e5e46107e6249e9cc16a4fc2435de1bbc0f6ffa95ca6c9b8e7a5cf98d41409ae7765b5ab357ce080ea61cc2906726bb8aedbcb197384 SHA512 f12d3f30c6dcdd9e088362039b4d99d6b9fb499d0a78016e1e6e7b54968950490a1418dd5a7d94d5f509a08f3cf3111276ac15e84775278a77737099ac9bfd67
-DIST doctest-0.11.1.tar.gz 18086 BLAKE2B 577a86638aa67205df198444b5b8fd307e7bdce12b4a77ce2102cc95ef7f967c2e612a10ed2cef9ea35cf9455bf2f4e3a01920be1553bc35472ad442fd88f3d6 SHA512 ca95e0b5f09514e8236507856ae610016bd549b9e685b4a94cf1c0682d1cf7bffb344b471aab22ae3fd47c29ada0dcc0ba52b8f012800e9199c340b764971894
-DIST doctest-0.16.3.tar.gz 43261 BLAKE2B 981779f93d014b8340318b931f06449914a6d44bb935ced021cdf40e96ac6741369899b25a8d6bf5f2087ed81b7a5f539c14a0d68fb24a0a500354b019930530 SHA512 c5fa7c5c49bdc1bda86a259177538fa573627772dcfa18dcb19a5c905eceeb4a086705bf40ea6f330df5273584068ba154ed664a124f8ec704c9926b86564ba1
-DIST doctest-0.9.12.tar.gz 15806 BLAKE2B 20b63bc3451c81c646acc09dbde4fa77b3b7b82e2b8c4e5edf0940f33e71a8b3ed296e5337b673b5a1342ecf9bb1ed4ae82358c615abb7be420aa32dbf966ef6 SHA512 9d0d24ddba3f4ddaa386dc4ea7f15483f4d756dd48f62bcc8cad6e375c57a5660d8c7a12ff5bbc803bde04d65d8a28d3940cc390cd0d2ced2c5cc9895eba7916
+DIST doctest-0.20.0.cabal 7121 BLAKE2B c9f87ca2f1a2250d042004ece7d6957683f487e2e87dca74e564792839019ce017ebdc19afa3742163cc1006177524ef130bc4ec701c3ac49e5a5918880af102 SHA512 08a3fcb4572b6c07266ae93505bc4a5ca0b52b03f1268dffcac291c5603babb9072503c7103a6b1f591235d26a52cdc66b86b2932f56b52d2beb06595510469a
+DIST doctest-0.20.0.tar.gz 43796 BLAKE2B 7fe8b54ea9be6983cc3ce8d4c340528df533e48eafcd4c36d1cc38813b1b17469f4702064205a05e356e41d3dcefa3ba8ad556596851970edf639a5e50104d4d SHA512 037866d709fdd371941132aea31d15c65cbfcad7832cec4fa98ed580b939930cc2ef87eb77e8bdbf77bee40088b673afe66d9021d6e227416ede25159f8d93fa
+DIST doctest-0.22.0.tar.gz 45053 BLAKE2B c0f04a2d0b00790e1057cefdab4953e58b651551f3d03b4b211b9901f43f4b7dc4cc3bb51fcc01f96ef28d4a64fe84a2351a2f5123a6c0ce1380027b71f3dbdf SHA512 9da37402421243367ca307517c63abe93e93cdd10564c56d510e6a43345b4934a52c3201d0bfb3a2459d7c000d0ff5776a0cbd8e5db67f7e3a87bbac0172cd14
diff --git a/dev-haskell/doctest/doctest-0.10.1.ebuild b/dev-haskell/doctest/doctest-0.10.1.ebuild
deleted file mode 100644
index ba5800049912..000000000000
--- a/dev-haskell/doctest/doctest-0.10.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
-	>=dev-haskell/syb-0.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/base-compat-0.4.2
-		>=dev-haskell/hspec-1.5.1
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/setenv
-		>=dev-haskell/silently-1.2.4
-		>=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/doctest/doctest-0.11.1.ebuild b/dev-haskell/doctest/doctest-0.11.1.ebuild
deleted file mode 100644
index bb34ec51fa5a..000000000000
--- a/dev-haskell/doctest/doctest-0.11.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
-	>=dev-haskell/code-page-0.1:=[profile?]
-	>=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
-	>=dev-haskell/syb-0.3:=[profile?]
-	>=dev-lang/ghc-7.0:=[profile?] <dev-lang/ghc-8.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.5.1
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8.2
-		dev-haskell/setenv
-		>=dev-haskell/silently-1.2.4
-		>=dev-haskell/stringbuilder-0.4
-		dev-haskell/with-location )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-unamb.patch
-	"${FILESDIR}"/${PN}-0.11.0-unamb-2.patch
-)
diff --git a/dev-haskell/doctest/doctest-0.16.3.ebuild b/dev-haskell/doctest/doctest-0.16.3.ebuild
deleted file mode 100644
index 012b822c494f..000000000000
--- a/dev-haskell/doctest/doctest-0.16.3.ebuild
+++ /dev/null
@@ -1,38 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Upstream has no intention of fixing it:
-# https://github.com/sol/doctest/pull/135
-RESTRICT=test # module conflicts
-
-RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
-	>=dev-haskell/code-page-0.1:=[profile?]
-	>=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
-	>=dev-haskell/syb-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.3.0
-		>=dev-haskell/hspec-core-2.3.0
-		dev-haskell/hunit
-		dev-haskell/mockery
-		>=dev-haskell/quickcheck-2.13.1
-		dev-haskell/setenv
-		>=dev-haskell/silently-1.2.4
-		>=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/doctest/doctest-0.20.0.ebuild b/dev-haskell/doctest/doctest-0.20.0.ebuild
new file mode 100644
index 000000000000..04772720fc13
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.20.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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" # test-suite
+inherit haskell-cabal
+
+# Buggy tests
+# May be related: <https://github.com/sol/doctest/pull/135>
+RESTRICT="test"
+
+DESCRIPTION="Test interactive Haskell examples"
+HOMEPAGE="https://github.com/sol/doctest#readme"
+HACKAGE_REV="5"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
+	>=dev-haskell/code-page-0.1:=[profile?]
+	>=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
+	>=dev-haskell/syb-0.3:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0"
+#	test? ( >=dev-haskell/hspec-2.3.0
+#		>=dev-haskell/hspec-core-2.3.0
+#		dev-haskell/hunit
+#		dev-haskell/mockery
+#		>=dev-haskell/quickcheck-2.13.1
+#		dev-haskell/setenv
+#		>=dev-haskell/silently-1.2.4
+#		>=dev-haskell/stringbuilder-0.4 )
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/doctest/doctest-0.22.0.ebuild b/dev-haskell/doctest/doctest-0.22.0.ebuild
new file mode 100644
index 000000000000..dc7c9f3630e0
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.22.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Test interactive Haskell examples"
+HOMEPAGE="https://github.com/sol/doctest#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
+	>=dev-haskell/code-page-0.1:=[profile?]
+	>=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
+	>=dev-haskell/syb-0.3:=[profile?]
+	>=dev-lang/ghc-8.0:=[profile?] <dev-lang/ghc-9.7:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/hspec-2.3.0
+		>=dev-haskell/hspec-core-2.3.0
+		dev-haskell/hunit
+		dev-haskell/mockery
+		>=dev-haskell/quickcheck-2.13.1
+		dev-haskell/setenv
+		>=dev-haskell/silently-1.2.4
+		>=dev-haskell/stringbuilder-0.4 )
+"
diff --git a/dev-haskell/doctest/doctest-0.9.12.ebuild b/dev-haskell/doctest/doctest-0.9.12.ebuild
deleted file mode 100644
index ef03eee3ce9c..000000000000
--- a/dev-haskell/doctest/doctest-0.9.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
-	>=dev-haskell/syb-0.3:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/base-compat-0.4.2
-		>=dev-haskell/hspec-1.5.1
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/setenv
-		>=dev-haskell/silently-1.2.4
-		>=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch b/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch
deleted file mode 100644
index 9e8de3fe994a..000000000000
--- a/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/GhcUtil.hs b/src/GhcUtil.hs
-index baa9193..1792227 100644
---- a/src/GhcUtil.hs
-+++ b/src/GhcUtil.hs
-@@ -1,2 +1,3 @@
- {-# LANGUAGE CPP #-}
-+{-# LANGUAGE PackageImports #-}
- module GhcUtil (withGhc) where
-@@ -12,3 +13,3 @@ import           DynFlags (gopt_set)
- #endif
--import           Panic (throwGhcException)
-+import "ghc"     Panic (throwGhcException)
- 
-diff --git a/src/Run.hs b/src/Run.hs
-index fa9096f..dca590a 100644
---- a/src/Run.hs
-+++ b/src/Run.hs
-@@ -1,2 +1,3 @@
- {-# LANGUAGE CPP #-}
-+{-# LANGUAGE PackageImports #-}
- module Run (
-@@ -23,3 +24,3 @@ import           System.IO
- import qualified Control.Exception as E
--import           Panic
-+import "ghc"     Panic
- 
diff --git a/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch b/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch
deleted file mode 100644
index 88c5f89fb9b0..000000000000
--- a/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit c3194e5e874bf7da4d9d1db3f435e902eeb60993
-Author: Sergei Trofimovich <siarheit@google.com>
-Date:   Wed Apr 13 09:35:29 2016 +0100
-
-    fix tests when config-value is present in system
-    
-    ghci fails to disambiguate 'Config' in this case as:
-    
-      src/Help.hs:8:18:
-        Ambiguous module name ‘Config’:
-          it was found in multiple packages:
-          config-value-0.4.0.1@confi_JzUyuyr9gPE2bcxdUwNhUS ghc-7.10.3
-    
-    Fixed by explicitly importing moduls from 'ghc' package.
-    
-    Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-
-diff --git a/src/Help.hs b/src/Help.hs
-index b8e76cf..4c11f85 100644
---- a/src/Help.hs
-+++ b/src/Help.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE PackageImports #-}
- module Help (
-   usage
- , printVersion
-@@ -5,7 +6,7 @@ module Help (
- 
- import           Paths_doctest (version)
- import           Data.Version (showVersion)
--import           Config as GHC
-+import "ghc"     Config as GHC
- import           Interpreter (ghc)
- 
- usage :: String
diff --git a/dev-haskell/doctest/metadata.xml b/dev-haskell/doctest/metadata.xml
index e92269d61b9e..eba755763568 100644
--- a/dev-haskell/doctest/metadata.xml
+++ b/dev-haskell/doctest/metadata.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The doctest program checks examples in source code comments.
-		It is modeled after doctest for Python
-		(&lt;http://docs.python.org/library/doctest.html&gt;).
-		
-		Documentation is at
-		&lt;https://github.com/sol/doctest-haskell#readme&gt;.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">sol/doctest-haskell#readme</remote-id>
+		<remote-id type="hackage">doctest</remote-id>
+		<remote-id type="github">sol/doctest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/drbg/Manifest b/dev-haskell/drbg/Manifest
deleted file mode 100644
index 95c74888284a..000000000000
--- a/dev-haskell/drbg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DRBG-0.5.5.tar.gz 1547022 BLAKE2B ca70a605334a60a0c4fcb1bf55c5e2f30065e55387372bfe0068b4ffa69e79607432b5eeef395126c00801e45a39a34b94c96e526357c8bec6fce077484c1c15 SHA512 e71fc158a7961729ce10d2ca795a935d6a103f31e864f0446cc4faf2b0edb3a5938a4cc79135cf043a375e63f9be4401ce092951b4e8f47c1c3b1c2070c118be
diff --git a/dev-haskell/drbg/drbg-0.5.5.ebuild b/dev-haskell/drbg/drbg-0.5.5.ebuild
deleted file mode 100644
index 110377610514..000000000000
--- a/dev-haskell/drbg/drbg-0.5.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="DRBG"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Deterministic random bit generator (aka PRNG) based HMACs, Hashes, and Ciphers"
-HOMEPAGE="http://hackage.haskell.org/package/DRBG"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT=test # fails own tests
-
-RDEPEND=">=dev-haskell/cereal-0.5:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/cipher-aes128-0.6:=[profile?]
-	>=dev-haskell/crypto-api-0.13:=[profile?]
-	>=dev-haskell/cryptohash-cryptoapi-0.1:=[profile?]
-	dev-haskell/entropy:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/parallel:=[profile?]
-	dev-haskell/prettyclass:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/binary
-		dev-haskell/crypto-api-tests
-		dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/drbg/metadata.xml b/dev-haskell/drbg/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/drbg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/drift/Manifest b/dev-haskell/drift/Manifest
deleted file mode 100644
index 175c64fd6b36..000000000000
--- a/dev-haskell/drift/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DrIFT-2.4.2.tar.gz 69676 BLAKE2B 8b072b88e52f9106eeddd62c391805b17bab0cea59e6ac8eedb1c88d22dce91ba697174b2380ee2d2fd41036116fa41778d119bfa5b673444ee466815e49c7f0 SHA512 c6f36e9efad171c165ea8028b7d251e66d5b410aaa51a74e4b8745cf76b77fcfdf6f641fd375f15663b559ae6b8939622a175ba321537afdbb2a114a1550f7db
diff --git a/dev-haskell/drift/drift-2.4.2.ebuild b/dev-haskell/drift/drift-2.4.2.ebuild
deleted file mode 100644
index 3ac6bb595f28..000000000000
--- a/dev-haskell/drift/drift-2.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-MY_PN="DrIFT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Program to derive type class instances"
-HOMEPAGE="http://repetae.net/computer/haskell/DrIFT/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch b/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch
deleted file mode 100644
index c45a2945fd2a..000000000000
--- a/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/ParseLib2.hs b/src/ParseLib2.hs
-index 730e4be..a7406fa 100644
---- a/src/ParseLib2.hs
-+++ b/src/ParseLib2.hs
-@@ -34,2 +34,3 @@ module ParseLib2
- import Data.Char
-+import Control.Applicative hiding ( many )
- import Control.Monad
-@@ -49,2 +50,6 @@ instance Functor Parser where
- 
-+instance Applicative Parser where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Parser where
-@@ -58,2 +63,6 @@ instance Monad Parser where
- 
-+instance Alternative Parser where
-+    (<|>) = mplus
-+    empty = mzero
-+
- instance MonadPlus Parser where
diff --git a/dev-haskell/drift/metadata.xml b/dev-haskell/drift/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/drift/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/easy-file/Manifest b/dev-haskell/easy-file/Manifest
index 6259d045e784..20b857d45578 100644
--- a/dev-haskell/easy-file/Manifest
+++ b/dev-haskell/easy-file/Manifest
@@ -1 +1 @@
-DIST easy-file-0.2.1.tar.gz 12610 BLAKE2B c2b1420563fb4070d927631f51119849d48f6e680506f2df3b84572729819311f3ba8eca3d25110a30f245a61da93edfc53de508411baeeccaf9eae94165bdc1 SHA512 48249b2662384cd766d8a7f66242c1d4c68b5b56a87583fd0363cd075c7fc0d8f013edb45fcab15ceaa8325e4f2fbb6ed920ca873e231c44934d6dae12e6102f
+DIST easy-file-0.2.2.tar.gz 12667 BLAKE2B 4f018144e10abe237e03bcf73189dfc0fcdb39afe62ca269c398baf9a4d9e10c2f1409307f331b99ca3c51f3b23bfccef6bca823016de01c9a1731bbd295a48f SHA512 12a11afe54175b21382786b9d7aae59ba068a27857a3ceb934023da7d14a5e9a69e4b4210a97b5e64fbcd6a41251a6a8b5608feb8a3bb212077b08148468576e
diff --git a/dev-haskell/easy-file/easy-file-0.2.1.ebuild b/dev-haskell/easy-file/easy-file-0.2.1.ebuild
deleted file mode 100644
index 63d0588abd8b..000000000000
--- a/dev-haskell/easy-file/easy-file-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Cross-platform File handling"
-HOMEPAGE="https://github.com/kazu-yamamoto/easy-file"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/easy-file/easy-file-0.2.2.ebuild b/dev-haskell/easy-file/easy-file-0.2.2.ebuild
new file mode 100644
index 000000000000..6e7c1d70c461
--- /dev/null
+++ b/dev-haskell/easy-file/easy-file-0.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Cross-platform File handling"
+HOMEPAGE="https://github.com/kazu-yamamoto/easy-file"
+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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/easy-file/metadata.xml b/dev-haskell/easy-file/metadata.xml
index 1400ac761de5..fcbe62e67545 100644
--- a/dev-haskell/easy-file/metadata.xml
+++ b/dev-haskell/easy-file/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Cross-platform File handling for Unix/Mac/Windows
-	</longdescription>
 	<upstream>
 		<remote-id type="github">kazu-yamamoto/easy-file</remote-id>
 	</upstream>
diff --git a/dev-haskell/echo/Manifest b/dev-haskell/echo/Manifest
index 6baae75f099a..f8fc2b0513fb 100644
--- a/dev-haskell/echo/Manifest
+++ b/dev-haskell/echo/Manifest
@@ -1 +1,2 @@
 DIST echo-0.1.3.tar.gz 5373 BLAKE2B 3710de35b42e39f7ff9d2e5c2e32ae4c1e863f9ae844ada25dbb653aafd6ed261357c3b5046e9e0cabb03dd4de4f6252272a2b643087a61d1df5f26de329e588 SHA512 26a2398af231a8805b6b0a866348f848b8b8f21fe95a2fa3c781aaeae150df978335df573d46d5b07d7e4df19d6377d997f85c77049abaf0c5cb3e9998439c6f
+DIST echo-0.1.4.tar.gz 5501 BLAKE2B 948f5894bc67ab80423ac725c3202fcfb8e032ca73440f16c658486219ab63bd8181f1120a4bbd92834bb3a8695222cb5e3491d5dbd26045d012a90370b1a80a SHA512 25fa868be5cbbc96adb4457b0e6a2fb7060b889e0dead9acef21038fd438d1ca1ee3c57ee03d91f75271e97cfea71b1d3589f800af70e15cb8cee6a60e041477
diff --git a/dev-haskell/echo/echo-0.1.3.ebuild b/dev-haskell/echo/echo-0.1.3.ebuild
index 628da37e9f37..6a5b274cefc7 100644
--- a/dev-haskell/echo/echo-0.1.3.ebuild
+++ b/dev-haskell/echo/echo-0.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.3.9999
 #hackport: flags: example:examples
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="examples"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -24,12 +24,9 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'process >= 1.0.1.1 && < 1.5' 'process >= 1.0.1.1'
-}
+CABAL_CHDEPS=(
+	'process >= 1.0.1.1 && < 1.5' 'process >= 1.0.1.1'
+)
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/echo/echo-0.1.4-r1.ebuild b/dev-haskell/echo/echo-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..e79965cb0d4c
--- /dev/null
+++ b/dev-haskell/echo/echo-0.1.4-r1.ebuild
@@ -0,0 +1,35 @@
+# 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: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A cross-platform, cross-console way to handle echoing terminal input"
+HOMEPAGE="https://github.com/RyanGlScott/echo"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+# Change example name to avoid name collisions
+CABAL_CHDEPS=(
+	'executable password' 'executable haskell-echo-example'
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples example)
+}
diff --git a/dev-haskell/echo/metadata.xml b/dev-haskell/echo/metadata.xml
index 1ccd56c6a779..db0e8f939661 100644
--- a/dev-haskell/echo/metadata.xml
+++ b/dev-haskell/echo/metadata.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The @base@ library exposes the @hGetEcho@ and @hSetEcho@ functions
-		for querying and setting echo status, but unfortunately, neither
-		function works with MinTTY consoles on Windows. This is a serious
-		issue, since @hGetEcho@ and @hSetEcho@ are often used to disable
-		input echoing when a program prompts for a password, so many
-		programs will reveal your password as you type it on MinTTY!
-		
-		This library provides an alternative interface which works
-		with both MinTTY and other consoles. An example is included
-		which demonstrates how one might prompt for a password using
-		this library. To build it, make sure to configure with the
-		@-fexample@ flag.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">echo</remote-id>
+		<remote-id type="github">RyanGlScott/echo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/ed25519/Manifest b/dev-haskell/ed25519/Manifest
index 26abe3c2205e..a6bc774fb60f 100644
--- a/dev-haskell/ed25519/Manifest
+++ b/dev-haskell/ed25519/Manifest
@@ -1 +1,2 @@
+DIST ed25519-0.0.5.0-rev7.cabal 4166 BLAKE2B 8e86fedbb2731e1065786dd0e09ed1a0abb92ebc2f4f290dc5b2d59ad3cfa046d275d9cdc1c36c4d9006e4884c35f823c5a9de3881545f85d1fabf4ebc5a0bf4 SHA512 470430ef4a5a44c842f79cff8d0a632dfd43de500027e511fc17920262d881e310331e30d29c02bda9e2f84c1565fc00d795a7c1bf19a4bedf408366e6df8c7c
 DIST ed25519-0.0.5.0.tar.gz 80034 BLAKE2B 4de73a76576bc63a7c5e4e8c0d195d48c65901ad417a306ca0001856a3a37975cfbb527dd466c2a737006e44e8d440e9831c360c8c3063b45a704af79c165cbb SHA512 cd2bb28de905c6d659f80f15e82970a9634c959432c73b6fd3b10ebca42a1ce734429e7ac861d0ab328904d99651a6d2fcaaf4d74ab75a3c0be68607e8f54ce9
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0-r1.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0-r1.ebuild
new file mode 100644
index 000000000000..bd2c7ce0b63e
--- /dev/null
+++ b/dev-haskell/ed25519/ed25519-0.0.5.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +no-donna,+test-doctests,+test-properties,-test-hlint
+
+CABAL_HACKAGE_REVISION=7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Ed25519 cryptographic signatures"
+HOMEPAGE="https://thoughtpolice.github.com/hs-ed25519"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # bitrotten test suite
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+#	test? (
+#		>=dev-haskell/doctest-0.10 <dev-haskell/doctest-0.12
+#		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
+#	)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=no-donna \
+		--flag=test-doctests \
+		--flag=-test-hlint \
+		--flag=test-properties
+}
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
deleted file mode 100644
index db4d98440236..000000000000
--- a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +no-donna,+test-doctests,+test-properties,-test-hlint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: needs update
-inherit haskell-cabal
-
-DESCRIPTION="Ed25519 cryptographic signatures"
-HOMEPAGE="http://thoughtpolice.github.com/hs-ed25519"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails on QC-2.10 as: The constructor ‘Failure’ should have 11 arguments, but has been given 10
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'ghc-prim    >= 0.1 && < 0.5' 'ghc-prim    >= 0.1' \
-		'doctest   >= 0.10 && < 0.11' 'doctest   >= 0.10' \
-		'QuickCheck  >= 2.4 && < 2.9' 'QuickCheck  >= 2.4' \
-		'directory >= 1.0  && < 1.3' 'directory >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=no-donna \
-		--flag=test-doctests \
-		--flag=-test-hlint \
-		--flag=test-properties
-}
diff --git a/dev-haskell/ed25519/metadata.xml b/dev-haskell/ed25519/metadata.xml
index af24f088297d..1b178c5d2d4d 100644
--- a/dev-haskell/ed25519/metadata.xml
+++ b/dev-haskell/ed25519/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a simple, fast, self-contained copy of the
-		Ed25519 public-key signature system with a clean interface. It also
-		includes support for detached signatures, and thorough documentation
-		on the design and implementation, including usage guidelines.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">ed25519</remote-id>
+		<remote-id type="github">thoughtpolice/hs-ed25519</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/edisonapi/Manifest b/dev-haskell/edisonapi/Manifest
deleted file mode 100644
index 85d68596a11e..000000000000
--- a/dev-haskell/edisonapi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST EdisonAPI-1.3.1.tar.gz 30512 BLAKE2B 7ed05eccc78814672538e3be05fa3d265cd883f080b3e0b10ef57a73473e26597c7c01673d842a9c16306ef67f17a5fed78b7a5060dfe73bbd68a5cdd4d9ea41 SHA512 677161da64856421c834856ee2f5ef7f59880883433d5c5c4061f0ab2faa0cb39c4eb83061820b77dab852acc4cce5dc75740fe454b15dbc2e67e6e84510ce42
diff --git a/dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild b/dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild
deleted file mode 100644
index 6469f7fa5423..000000000000
--- a/dev-haskell/edisonapi/edisonapi-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="EdisonAPI"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficient, purely-functional data structures (API)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.1-ghc-8.8.patch" )
diff --git a/dev-haskell/edisonapi/edisonapi-1.3.1.ebuild b/dev-haskell/edisonapi/edisonapi-1.3.1.ebuild
deleted file mode 100644
index a7f37562bafe..000000000000
--- a/dev-haskell/edisonapi/edisonapi-1.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="EdisonAPI"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficient, purely-functional data structures (API)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch b/dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch
deleted file mode 100644
index 81035f311357..000000000000
--- a/dev-haskell/edisonapi/files/edisonapi-1.3.1-ghc-8.8.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-commit 8da6c0f7d8666766e2f0693425c347c0adb492dc
-Author: Andrés Sicard-Ramírez <asr@eafit.edu.co>
-Date:   Thu Jul 4 18:15:17 2019 -0500
-
-    Supported GHC 8.8.1.
-    
-    All changes were required by the MonadFail proposal.
-
-diff --git a/EdisonAPI.cabal b/EdisonAPI.cabal
-index 0f8f161..072cbd2 100644
---- a/EdisonAPI.cabal
-+++ b/EdisonAPI.cabal
-@@ -40,6 +40,8 @@ Library
-   Build-Depends:
-      base == 4.*,
-      mtl >= 1.0
-+  if impl(ghc < 8.0)
-+    build-depends: fail
-   Default-Language: Haskell2010
-   Default-Extensions:
-      MultiParamTypeClasses
-diff --git a/src/Data/Edison/Assoc.hs b/src/Data/Edison/Assoc.hs
-index fac1c59..3993dce 100644
---- a/src/Data/Edison/Assoc.hs
-+++ b/src/Data/Edison/Assoc.hs
-@@ -71,6 +71,8 @@ module Data.Edison.Assoc (
- 
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- 
-+import qualified Control.Monad.Fail as Fail
-+
- import Data.Edison.Prelude
- 
- import Data.Edison.Seq(Sequence)
-@@ -212,7 +214,7 @@ class (Eq k,Functor m) => AssocX m k | m -> k where
-   --
-   --   This function is /ambiguous/ at finite relation types if the key appears
-   --   more than once in the finite relation.  Otherwise, it is /unambiguous/.
--  lookupM        :: (Monad rm) => k -> m a -> rm a
-+  lookupM        :: (Fail.MonadFail rm) => k -> m a -> rm a
- 
-   -- | Return all elements bound by the given key in an unspecified order.
-   --
-@@ -236,7 +238,7 @@ class (Eq k,Functor m) => AssocX m k | m -> k where
-   --
-   --   This function is /ambiguous/ at finite relation types if the key appears
-   --   more than once in the finite relation.  Otherwise, it is /unambiguous/.
--  lookupAndDeleteM :: (Monad rm) => k -> m a -> rm (a, m a)
-+  lookupAndDeleteM :: (Fail.MonadFail rm) => k -> m a -> rm (a, m a)
- 
-   -- | Find all elements bound by the given key; return a sequence containing
-   --   all such bound elements in an unspecified order and the collection
-@@ -395,7 +397,7 @@ class (AssocX m k, Ord k) => OrdAssocX m k | m -> k where
-   --
-   --   This function is /ambiguous/ at finite relation types if the finite relation
-   --   contains more than one minimum key.  Otherwise it is /unambiguous/.
--  minView            :: (Monad rm) => m a -> rm (a, m a)
-+  minView            :: (Fail.MonadFail rm) => m a -> rm (a, m a)
- 
-   -- | Find the binding with the minimum key and return its element. Signals
-   --   an error if the associative collection is empty.  Which element is chosen
-@@ -426,7 +428,7 @@ class (AssocX m k, Ord k) => OrdAssocX m k | m -> k where
-   --
-   --   This function is /ambiguous/ at finite relation types if the finite relation
-   --   contains more than one minimum key.  Otherwise it is /unambiguous/.
--  maxView            :: (Monad rm) => m a -> rm (a, m a)
-+  maxView            :: (Fail.MonadFail rm) => m a -> rm (a, m a)
- 
-   -- | Find the binding with the maximum key and return its element.  Signals
-   --   an error if the associative collection is empty.  Which element is chosen
-@@ -777,7 +779,7 @@ class (Assoc m k, OrdAssocX m k) => OrdAssoc m k | m -> k where
-   --   minimum key exists in the relation.  Furthermore, it is /ambiguous/
-   --   with respect to the actual key observed unless the @Eq@ instance on
-   --   keys corresponds to indistinguisability.
--  minViewWithKey  :: (Monad rm) => m a -> rm ((k, a), m a)
-+  minViewWithKey  :: (Fail.MonadFail rm) => m a -> rm ((k, a), m a)
- 
-   -- | Find the binding with the minimum key in an associative collection and
-   --   return the key and the element.  Signals an error if the associative
-@@ -800,7 +802,7 @@ class (Assoc m k, OrdAssocX m k) => OrdAssoc m k | m -> k where
-   --   maximum key exists in the relation.  Furthermore, it is /ambiguous/
-   --   with respect to the actual key observed unless the @Eq@ instance on
-   --   keys corresponds to indistinguisability.
--  maxViewWithKey  :: (Monad rm) => m a -> rm ((k, a), m a)
-+  maxViewWithKey  :: (Fail.MonadFail rm) => m a -> rm ((k, a), m a)
- 
-   -- | Find the binding with the maximum key in an associative collection and
-   --   return the key and the element.  Signals an error if the associative
-diff --git a/src/Data/Edison/Coll.hs b/src/Data/Edison/Coll.hs
-index 88ae755..be4df08 100644
---- a/src/Data/Edison/Coll.hs
-+++ b/src/Data/Edison/Coll.hs
-@@ -97,6 +97,7 @@ module Data.Edison.Coll (
- ) where
- 
- import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
- 
- import Data.Edison.Prelude
-@@ -421,7 +422,7 @@ class CollX c a => Coll c a | c -> a where
-   --   This function is /ambiguous/ at bag types, when more than one
-   --   element equivalent to the given item is in the bag.  Otherwise
-   --   it is /unambiguous/.
--  lookupM    :: (Monad m) => a -> c -> m a
-+  lookupM    :: (Fail.MonadFail m) => a -> c -> m a
- 
-   -- | Return a sequence containing all elements in the collection equal to
-   --   the given element in an unspecified order.
-@@ -504,7 +505,7 @@ class (Coll c a, OrdCollX c a) => OrdColl c a | c -> a where
-   --
-   --   This function is /ambiguous/ at bag types, if more than one minimum
-   --   element exists in the bag.  Otherwise, it is /unambiguous/.
--  minView    :: (Monad m) => c -> m (a, c)
-+  minView    :: (Fail.MonadFail m) => c -> m (a, c)
- 
-   -- | Return the minimum element in the collection.  If there are multiple
-   --   copies of the minimum element, it is unspecified which is chosen.
-@@ -523,7 +524,7 @@ class (Coll c a, OrdCollX c a) => OrdColl c a | c -> a where
-   --
-   --   This function is /ambiguous/ at bag types, if more than one maximum
-   --   element exists in the bag.  Otherwise, it is /unambiguous/.
--  maxView    :: (Monad m) => c -> m (a, c)
-+  maxView    :: (Fail.MonadFail m) => c -> m (a, c)
- 
-   -- | Return the maximum element in the collection.  If there are multiple
-   --   copies of the maximum element, it is unspecified which is chosen.
-diff --git a/src/Data/Edison/Prelude.hs b/src/Data/Edison/Prelude.hs
-index 2ac6968..8281f46 100644
---- a/src/Data/Edison/Prelude.hs
-+++ b/src/Data/Edison/Prelude.hs
-@@ -10,14 +10,19 @@
- --   This module is a central depository of common definitions
- --   used throughout Edison.
- 
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+
- module Data.Edison.Prelude (
- -- * Hashing classes
-   Hash (..)
- , UniqueHash
- , ReversibleHash (..)
- , Measured (..)
-+-- * Pure MonadFail
-+,  runFail_
- ) where
- 
-+import Control.Monad.Fail
- import Data.Monoid
- 
- -- | This class represents hashable objects. If obeys the 
-@@ -62,3 +67,14 @@ class UniqueHash a => ReversibleHash a where
- --   the computation.
- class (Monoid v) => Measured v a | a -> v where
-   measure :: a -> v
-+
-+-- From Agda source code: src/full/Agda/Utils/Fail.hs
-+-- | A pure MonadFail.
-+newtype Fail a = Fail { runFail :: Either String a }
-+  deriving (Functor, Applicative, Monad)
-+
-+instance MonadFail Fail where
-+  fail = Fail . Left
-+
-+runFail_ :: Fail a -> a
-+runFail_ = either error id . runFail
-diff --git a/src/Data/Edison/Seq.hs b/src/Data/Edison/Seq.hs
-index 78ca245..0394d58 100644
---- a/src/Data/Edison/Seq.hs
-+++ b/src/Data/Edison/Seq.hs
-@@ -58,6 +58,7 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
- 
- import Data.Edison.Prelude
-@@ -221,7 +222,7 @@ class (Functor s, MonadPlus s) => Sequence s where
-   --   This function is always /unambiguous/.
-   --
-   --   Default running time: @O( 1 )@
--  lview     :: (Monad m) => s a -> m (a, s a)
-+  lview     :: (Fail.MonadFail m) => s a -> m (a, s a)
- 
-   -- | Return the first element of a sequence.
-   --   Signals an error if the sequence is empty.
-@@ -249,7 +250,7 @@ class (Functor s, MonadPlus s) => Sequence s where
-   --   This function is always /unambiguous/.
-   --
-   --   Default running time: @O( 1 )@
--  lheadM    :: (Monad m) => s a -> m a 
-+  lheadM    :: (Fail.MonadFail m) => s a -> m a 
- 
-   -- | Delete the first element of the sequence.
-   --   Signals error if sequence is empty.
-@@ -277,7 +278,7 @@ class (Functor s, MonadPlus s) => Sequence s where
-   --   This function is always /unambiguous/.
-   --
-   --   Default running time: @O( 1 )@
--  ltailM    :: (Monad m) => s a -> m (s a)
-+  ltailM    :: (Fail.MonadFail m) => s a -> m (s a)
- 
-   -- | Separate a sequence into its last (rightmost) element and the
-   --   remaining sequence.  Calls 'fail' if the sequence is empty.
-@@ -291,7 +292,7 @@ class (Functor s, MonadPlus s) => Sequence s where
-   --   This function is always /unambiguous/.
-   --
-   --   Default running time: @O( n )@
--  rview     :: (Monad m) => s a -> m (a, s a)
-+  rview     :: (Fail.MonadFail m) => s a -> m (a, s a)
- 
-   -- | Return the last (rightmost) element of the sequence.
-   --   Signals error if sequence is empty.
-@@ -319,7 +320,7 @@ class (Functor s, MonadPlus s) => Sequence s where
-   --   This function is always /unambiguous/.
-   --
-   --   Default running time: @O( n )@
--  rheadM    :: (Monad m) => s a -> m a
-+  rheadM    :: (Fail.MonadFail m) => s a -> m a
- 
-   -- | Delete the last (rightmost) element of the sequence.
-   --   Signals an error if the sequence is empty.
-@@ -347,7 +348,7 @@ class (Functor s, MonadPlus s) => Sequence s where
-   --   This function is always /unambiguous/.
-   --
-   --   Default running time: @O( n )@
--  rtailM    :: (Monad m) => s a -> m (s a)
-+  rtailM    :: (Fail.MonadFail m) => s a -> m (s a)
- 
-   -- | Returns 'True' if the sequence is empty and 'False' otherwise.
-   -- 
-@@ -948,7 +949,7 @@ class (Functor s, MonadPlus s) => Sequence s where
-   --   This function is always /unambiguous/.
-   --
-   --   Default running time: @O( i )@
--  lookupM   :: (Monad m) => Int -> s a -> m a
-+  lookupM   :: (Fail.MonadFail m) => Int -> s a -> m a
- 
-   -- | Return the element at the given index, or the
-   --   default argument if the index is out of bounds.  All indexes are
-diff --git a/src/Data/Edison/Seq/ListSeq.hs b/src/Data/Edison/Seq/ListSeq.hs
-index 1ad677f..890b66f 100644
---- a/src/Data/Edison/Seq/ListSeq.hs
-+++ b/src/Data/Edison/Seq/ListSeq.hs
-@@ -40,9 +40,9 @@ module Data.Edison.Seq.ListSeq (
- import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        filter,takeWhile,dropWhile,lookup,take,drop,splitAt,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
--import qualified Control.Monad.Identity as ID
-+import qualified Control.Monad.Fail as Fail
- import qualified Prelude
--import Data.Edison.Prelude
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.List
- import Data.Monoid
- import qualified Data.Edison.Seq as S ( Sequence(..) ) 
-@@ -54,16 +54,16 @@ singleton      :: a -> [a]
- lcons          :: a -> [a] -> [a]
- rcons          :: a -> [a] -> [a]
- append         :: [a] -> [a] -> [a]
--lview          :: (Monad rm) => [a] -> rm (a, [a])
-+lview          :: (Fail.MonadFail rm) => [a] -> rm (a, [a])
- lhead          :: [a] -> a
--lheadM         :: (Monad rm) => [a] -> rm a
-+lheadM         :: (Fail.MonadFail rm) => [a] -> rm a
- ltail          :: [a] -> [a]
--ltailM         :: (Monad rm) => [a] -> rm [a]
--rview          :: (Monad rm) => [a] -> rm (a, [a])
-+ltailM         :: (Fail.MonadFail rm) => [a] -> rm [a]
-+rview          :: (Fail.MonadFail rm) => [a] -> rm (a, [a])
- rhead          :: [a] -> a
--rheadM         :: (Monad rm) => [a] -> rm a
-+rheadM         :: (Fail.MonadFail rm) => [a] -> rm a
- rtail          :: [a] -> [a]
--rtailM         :: (Monad rm) => [a] -> rm [a]
-+rtailM         :: (Fail.MonadFail rm) => [a] -> rm [a]
- null           :: [a] -> Bool
- size           :: [a] -> Int
- concat         :: [[a]] -> [a]
-@@ -92,7 +92,7 @@ reduce1'       :: (a -> a -> a) -> [a] -> a
- copy           :: Int -> a -> [a]
- inBounds       :: Int -> [a] -> Bool
- lookup         :: Int -> [a] -> a
--lookupM        :: (Monad m) => Int -> [a] -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> [a] -> m a
- lookupWithDefault :: a -> Int -> [a] -> a
- update         :: Int -> a -> [a] -> [a]
- adjust         :: (a -> a) -> Int -> [a] -> [a]
-@@ -252,7 +252,7 @@ inBounds i xs
-   | i >= 0    = not (null (drop i xs))
-   | otherwise = False
- 
--lookup i xs = ID.runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
- 
- lookupM i xs
-   | i < 0 = fail "ListSeq.lookup: not found"
diff --git a/dev-haskell/edisonapi/metadata.xml b/dev-haskell/edisonapi/metadata.xml
deleted file mode 100644
index dac5f3d4c343..000000000000
--- a/dev-haskell/edisonapi/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Edison is a library of purely functional data structures written by
-		Chris Okasaki.  It is named after Thomas Alva Edison and for the
-		mnemonic value EDiSon (Efficent Data Structures).
-		Edison provides several families of abstractions, each with
-		multiple implementations.  The main abstractions provided by Edison are:
-		Sequences such as stacks, queues, and dequeues;
-		Collections such as sets, bags and heaps; and
-		Associative Collections such as finite maps and priority queues
-		where the priority and element are distinct.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/edisoncore/Manifest b/dev-haskell/edisoncore/Manifest
deleted file mode 100644
index fb21ededf4d1..000000000000
--- a/dev-haskell/edisoncore/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST EdisonCore-1.3.1.1.tar.gz 80699 BLAKE2B e92848bb282d478c84817e0c0c2515b0fcb227b8224b020e8e50df4deb53915ccb7aa172a86eef787aa985efaaffbb42deab0fbb5b8669adf9635129b017fee8 SHA512 2e290a5c792a136931387936f457a45913edeedb9eda8006649b974d9aea294b9f1b7e5b2aa020c3ed151934cef8b2bd228e2cb56f7db37f35d59dcb23f7bcb8
-DIST EdisonCore-1.3.2.1.tar.gz 82522 BLAKE2B 758e02e462d4f86b95a66792ce26dda6d1a00506a8071f3716f9a7484fc992af9e1709a9bbb958ee71175b2c51c4574493a35b6eaa7a1bfab415ed4ce7e2a8b4 SHA512 6812b04edb1abdfc2486d66bb86d6370b76667de1603ab421d92a6ecc17a25014e0ab97f53dd4f1e75cacf32c31611e8f2dd6c740c840e349c3c762ae00df65f
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild
deleted file mode 100644
index 7f38c6d65f14..000000000000
--- a/dev-haskell/edisoncore/edisoncore-1.3.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="EdisonCore"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficent, purely-functional data structures (Core Implementations)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild b/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
deleted file mode 100644
index 87a59c476f7a..000000000000
--- a/dev-haskell/edisoncore/edisoncore-1.3.2.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="EdisonCore"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library of efficent, purely-functional data structures (Core Implementations)"
-HOMEPAGE="http://rwd.rdockins.name/edison/home/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/edisonapi-1.3:=[profile?] <dev-haskell/edisonapi-1.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/quickcheck-2.8.2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-ghc-8.8.patch" )
diff --git a/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch b/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch
deleted file mode 100644
index 5589433edc69..000000000000
--- a/dev-haskell/edisoncore/files/edisoncore-1.3.2.1-ghc-8.8.patch
+++ /dev/null
@@ -1,1268 +0,0 @@
-diff --git a/EdisonCore.cabal b/EdisonCore.cabal
-index 901cd83..ad1af00 100644
---- a/EdisonCore.cabal
-+++ b/EdisonCore.cabal
-@@ -62,8 +62,10 @@ Library
-      array
- 
-   if impl(ghc < 8.0)
--    -- Provide/emulate Data.Semigroups` API for pre-GHC-8
--    Build-Depends: semigroups == 0.18.*
-+    Build-Depends:
-+      fail,
-+      -- Provide/emulate Data.Semigroups` API for pre-GHC-8
-+      semigroups == 0.18.*
- 
-   Default-Language: Haskell2010
-   Default-Extensions:
-diff --git a/src/Data/Edison/Assoc/AssocList.hs b/src/Data/Edison/Assoc/AssocList.hs
-index c577492..15d9884 100644
---- a/src/Data/Edison/Assoc/AssocList.hs
-+++ b/src/Data/Edison/Assoc/AssocList.hs
-@@ -58,8 +58,9 @@ import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- import qualified Prelude
- import Data.Monoid
- import Data.Semigroup as SG
--import Control.Monad.Identity
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.Edison.Assoc as A
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.BinaryRandList as RL
- import Data.Edison.Assoc.Defaults
-@@ -82,10 +83,10 @@ size          :: Eq k => FM k a -> Int
- member        :: Eq k => k -> FM k a -> Bool
- count         :: Eq k => k -> FM k a -> Int
- lookup        :: Eq k => k -> FM k a -> a
--lookupM       :: (Eq k, Monad rm) => k -> FM k a -> rm a
-+lookupM       :: (Eq k, Fail.MonadFail rm) => k -> FM k a -> rm a
- lookupAll     :: (Eq k,S.Sequence seq) => k -> FM k a -> seq a
- lookupAndDelete    :: Eq k => k -> FM k a -> (a,FM k a)
--lookupAndDeleteM   :: (Eq k,Monad rm)   => k -> FM k a -> rm (a,FM k a)
-+lookupAndDeleteM   :: (Eq k, Fail.MonadFail rm)   => k -> FM k a -> rm (a,FM k a)
- lookupAndDeleteAll :: (Eq k,S.Sequence seq) => k -> FM k a -> (seq a,FM k a)
- lookupWithDefault  :: Eq k => a -> k -> FM k a -> a
- adjust             :: Eq k => (a -> a) -> k -> FM k a -> FM k a
-@@ -143,11 +144,11 @@ unionSeqWithKey  :: (Eq k,S.Sequence seq) =>
-                         (k -> a -> a -> a) -> seq (FM k a) -> FM k a
- intersectionWithKey :: Eq k => (k -> a -> b -> c) -> FM k a -> FM k b -> FM k c
- 
--minView          :: (Ord k,Monad m) => FM k a -> m (a,FM k a)
-+minView          :: (Ord k, Fail.MonadFail m) => FM k a -> m (a,FM k a)
- minElem          :: Ord k => FM k a -> a
- deleteMin        :: Ord k => FM k a -> FM k a
- unsafeInsertMin  :: Ord k => k -> a -> FM k a -> FM k a
--maxView          :: (Ord k,Monad m) => FM k a -> m (a,FM k a)
-+maxView          :: (Ord k, Fail.MonadFail m) => FM k a -> m (a,FM k a)
- maxElem          :: Ord k => FM k a -> a
- deleteMax        :: Ord k => FM k a -> FM k a
- unsafeInsertMax  :: Ord k => k -> a -> FM k a -> FM k a
-@@ -169,9 +170,9 @@ partitionLT_GE   :: Ord k => k -> FM k a -> (FM k a,FM k a)
- partitionLE_GT   :: Ord k => k -> FM k a -> (FM k a,FM k a)
- partitionLT_GT   :: Ord k => k -> FM k a -> (FM k a,FM k a)
- 
--minViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
-+minViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
- minElemWithKey    :: Ord k => FM k a -> (k,a)
--maxViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
-+maxViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
- maxElemWithKey    :: Ord k => FM k a -> (k,a)
- foldrWithKey      :: Ord k => (k -> a -> b -> b) -> b -> FM k a -> b
- foldlWithKey      :: Ord k => (b -> k -> a -> b) -> b -> FM k a -> b
-@@ -309,7 +310,7 @@ count _ E = 0
- count key (I k _ m) | key == k  = 1
-                     | otherwise = count key m
- 
--lookup key m = runIdentity (lookupM key m)
-+lookup key m = runFail_ (lookupM key m)
- 
- lookupM _ E = fail "AssocList.lookup: lookup failed"
- lookupM key (I k x m) | key == k  = return x
-@@ -319,7 +320,7 @@ lookupAll _ E = S.empty
- lookupAll key (I k x m) | key == k  = S.singleton x
-                         | otherwise = lookupAll key m
- 
--lookupAndDelete key m = runIdentity (lookupAndDeleteM key m)
-+lookupAndDelete key m = runFail_ (lookupAndDeleteM key m)
- 
- lookupAndDeleteM _ E = fail "AssocList.lookupAndDeleteM: lookup failed"
- lookupAndDeleteM key (I k x m)
-diff --git a/src/Data/Edison/Assoc/Defaults.hs b/src/Data/Edison/Assoc/Defaults.hs
-index a9ef520..8e2b37d 100644
---- a/src/Data/Edison/Assoc/Defaults.hs
-+++ b/src/Data/Edison/Assoc/Defaults.hs
-@@ -15,6 +15,8 @@ module Data.Edison.Assoc.Defaults where
- 
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- 
-+import qualified Control.Monad.Fail as Fail
-+
- import Data.Edison.Assoc
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
-@@ -190,7 +192,7 @@ lookupAndDeleteDefault k m =
-      Nothing -> error (instanceName m ++ ".lookupAndDelete: lookup failed")
-      Just x  -> (x, delete k m)
- 
--lookupAndDeleteMDefault :: (Monad rm, AssocX m k) => k -> m a -> rm (a, m a)
-+lookupAndDeleteMDefault :: (Fail.MonadFail rm, AssocX m k) => k -> m a -> rm (a, m a)
- lookupAndDeleteMDefault k m =
-   case lookupM k m of
-      Nothing -> fail (instanceName m ++ ".lookupAndDelete: lookup failed")
-diff --git a/src/Data/Edison/Assoc/PatriciaLoMap.hs b/src/Data/Edison/Assoc/PatriciaLoMap.hs
-index 3073f83..43c2d85 100644
---- a/src/Data/Edison/Assoc/PatriciaLoMap.hs
-+++ b/src/Data/Edison/Assoc/PatriciaLoMap.hs
-@@ -55,10 +55,11 @@ module Data.Edison.Assoc.PatriciaLoMap (
- 
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- import qualified Prelude
--import Control.Monad.Identity (runIdentity)
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
- import Data.Semigroup as SG
- import qualified Data.Edison.Assoc as A
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
- import Data.Edison.Assoc.Defaults
-@@ -210,9 +211,9 @@ member k (L j _) = (j == k)
- member k (B _ m t0 t1) = if zeroBit k m then member k t0 else member k t1
- 
- lookup :: Int -> FM a -> a
--lookup k m = runIdentity (lookupM k m)
-+lookup k m = runFail_ (lookupM k m)
- 
--lookupM :: (Monad rm) => Int -> FM a -> rm a
-+lookupM :: (Fail.MonadFail rm) => Int -> FM a -> rm a
- lookupM _ E = fail "PatriciaLoMap.lookup: lookup failed"
- lookupM k (L j x)
-   | j == k    = return x
-@@ -233,7 +234,7 @@ lookupAndDelete        = doLookupAndDelete
-                            (error "PatriciaLoMap.lookupAndDelete: lookup failed")
-                            (,)
- 
--lookupAndDeleteM :: Monad m => Int -> FM a -> m (a, FM a)
-+lookupAndDeleteM :: Fail.MonadFail m => Int -> FM a -> m (a, FM a)
- lookupAndDeleteM       = doLookupAndDelete
-                            (fail "PatriciaLoMap.lookupAndDelete: lookup failed")
-                            (\x m -> return (x,m))
-@@ -583,25 +584,25 @@ ordListFM_rev (B _ _ t0 t1) = merge (ordListFM_rev t0) (ordListFM_rev t1)
-             GT -> x : merge xs (y:ys)
-             EQ -> error "PatriciaLoMap: bug in ordListFM_rev"
- 
--minView :: Monad m => FM a -> m (a, FM a)
-+minView :: Fail.MonadFail m => FM a -> m (a, FM a)
- minView fm =
-    case ordListFM fm of
-      [] -> fail $ moduleName++".minView: empty map"
-      ((k,x):_) -> return (x,delete k fm)
- 
--minViewWithKey :: Monad m => FM a -> m ((Int, a), FM a)
-+minViewWithKey :: Fail.MonadFail m => FM a -> m ((Int, a), FM a)
- minViewWithKey fm =
-    case ordListFM fm of
-      [] -> fail $ moduleName++".minViewWithKey: empty map"
-      ((k,x):_) -> return ((k,x),delete k fm)
- 
--maxView :: Monad m => FM a -> m (a, FM a)
-+maxView :: Fail.MonadFail m => FM a -> m (a, FM a)
- maxView fm =
-   case ordListFM_rev fm of
-      [] -> fail $ moduleName++".maxView: empty map"
-      ((k,x):_) -> return (x,delete k fm)
- 
--maxViewWithKey :: Monad m => FM a -> m ((Int, a), FM a)
-+maxViewWithKey :: Fail.MonadFail m => FM a -> m ((Int, a), FM a)
- maxViewWithKey fm =
-    case ordListFM_rev fm of
-      [] -> fail $ moduleName++".maxViewWithKey: empty map"
-diff --git a/src/Data/Edison/Assoc/StandardMap.hs b/src/Data/Edison/Assoc/StandardMap.hs
-index 5ca48c5..e7b6a0e 100644
---- a/src/Data/Edison/Assoc/StandardMap.hs
-+++ b/src/Data/Edison/Assoc/StandardMap.hs
-@@ -51,6 +51,7 @@ module Data.Edison.Assoc.StandardMap (
- 
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- import qualified Prelude
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.Edison.Assoc as A
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
-@@ -81,10 +82,10 @@ member            :: Ord k => k -> FM k a -> Bool
- count             :: Ord k => k -> FM k a -> Int
- lookup            :: Ord k => k -> FM k a -> a
- lookupAll         :: (Ord k,S.Sequence seq) => k -> FM k a -> seq a
--lookupM           :: (Ord k,Monad m) => k -> FM k a -> m a
-+lookupM           :: (Ord k, Fail.MonadFail m) => k -> FM k a -> m a
- lookupWithDefault :: Ord k => a -> k -> FM k a -> a
- lookupAndDelete   :: Ord k => k -> FM k a -> (a, FM k a)
--lookupAndDeleteM  :: (Ord k,Monad m) => k -> FM k a -> m (a, FM k a)
-+lookupAndDeleteM  :: (Ord k, Fail.MonadFail m) => k -> FM k a -> m (a, FM k a)
- lookupAndDeleteAll :: (Ord k,S.Sequence seq) => k -> FM k a -> (seq a,FM k a)
- adjust            :: Ord k => (a->a) -> k -> FM k a -> FM k a
- adjustAll         :: Ord k => (a->a) -> k -> FM k a -> FM k a
-@@ -103,11 +104,11 @@ filter            :: Ord k => (a -> Bool) -> FM k a -> FM k a
- partition         :: Ord k => (a -> Bool) -> FM k a -> (FM k a,FM k a)
- elements          :: (Ord k,S.Sequence seq) => FM k a -> seq a
- 
--minView           :: (Ord k,Monad m) => FM k a -> m (a, FM k a)
-+minView           :: (Ord k, Fail.MonadFail m) => FM k a -> m (a, FM k a)
- minElem           :: Ord k => FM k a -> a
- deleteMin         :: Ord k => FM k a -> FM k a
- unsafeInsertMin   :: Ord k => k -> a -> FM k a -> FM k a
--maxView           :: (Ord k,Monad m) => FM k a -> m (a, FM k a)
-+maxView           :: (Ord k, Fail.MonadFail m) => FM k a -> m (a, FM k a)
- maxElem           :: Ord k => FM k a -> a
- deleteMax         :: Ord k => FM k a -> FM k a
- unsafeInsertMax   :: Ord k => k -> a -> FM k a -> FM k a
-@@ -165,9 +166,9 @@ foldWithKey'      :: Ord k => (k -> a -> b -> b) -> b -> FM k a -> b
- filterWithKey     :: Ord k => (k -> a -> Bool) -> FM k a -> FM k a
- partitionWithKey  :: Ord k => (k -> a -> Bool) -> FM k a -> (FM k a,FM k a)
- 
--minViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
-+minViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
- minElemWithKey    :: Ord k => FM k a -> (k,a)
--maxViewWithKey    :: (Ord k,Monad m) => FM k a -> m ((k, a), FM k a)
-+maxViewWithKey    :: (Ord k, Fail.MonadFail m) => FM k a -> m ((k, a), FM k a)
- maxElemWithKey    :: Ord k => FM k a -> (k,a)
- foldrWithKey      :: (k -> a -> b -> b) -> b -> FM k a -> b
- foldlWithKey      :: (b -> k -> a -> b) -> b -> FM k a -> b
-diff --git a/src/Data/Edison/Assoc/TernaryTrie.hs b/src/Data/Edison/Assoc/TernaryTrie.hs
-index 8b2dd57..431b348 100644
---- a/src/Data/Edison/Assoc/TernaryTrie.hs
-+++ b/src/Data/Edison/Assoc/TernaryTrie.hs
-@@ -55,8 +55,10 @@ module Data.Edison.Assoc.TernaryTrie (
- import Prelude hiding (null,map,lookup,foldr,foldl,foldr1,foldl1,filter)
- import qualified Prelude
- import qualified Data.Edison.Assoc as A
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S
- import qualified Data.List as L
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Monoid
- import Data.Semigroup as SG
-@@ -83,10 +85,10 @@ size          :: Ord k => FM k a -> Int
- member        :: Ord k => [k] -> FM k a -> Bool
- count         :: Ord k => [k] -> FM k a -> Int
- lookup        :: Ord k => [k] -> FM k a -> a
--lookupM       :: (Ord k, Monad rm) => [k] -> FM k a -> rm a
-+lookupM       :: (Ord k, Fail.MonadFail rm) => [k] -> FM k a -> rm a
- lookupAll     :: (Ord k,S.Sequence seq) => [k] -> FM k a -> seq a
- lookupAndDelete    :: Ord k => [k] -> FM k a -> (a, FM k a)
--lookupAndDeleteM   :: (Ord k, Monad rm) => [k] -> FM k a -> rm (a, FM k a)
-+lookupAndDeleteM   :: (Ord k, Fail.MonadFail rm) => [k] -> FM k a -> rm (a, FM k a)
- lookupAndDeleteAll :: (Ord k, S.Sequence seq) => [k] -> FM k a -> (seq a,FM k a)
- lookupWithDefault  :: Ord k => a -> [k] -> FM k a -> a
- adjust        :: Ord k => (a -> a) -> [k] -> FM k a -> FM k a
-@@ -527,7 +529,7 @@ member = memberUsingLookupM
- 
- count = countUsingMember
- 
--lookup m k = runIdentity (lookupM m k)
-+lookup m k = runFail_ (lookupM m k)
- 
- lookupM [] (FM Nothing _)
-   = fail "TernaryTrie.lookup: lookup failed"
-@@ -854,18 +856,18 @@ intersectionWithKey f
- 
- -- OrdAssocX
- 
--minViewFMB :: Monad m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
-+minViewFMB :: Fail.MonadFail m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
- minViewFMB E _ = fail $ moduleName++".minView: empty map"
- minViewFMB (I i k (Just v) E m r)        f = return (v, f (I i k Nothing E m r))
- minViewFMB (I _ _ Nothing  E (FMB' E) _) _ = error $ moduleName++".minView: bug!"
- minViewFMB (I _ k Nothing  E (FMB' m) r) f = minViewFMB m (\m' -> f (mkVBalancedFMB k Nothing E (FMB' m') r))
- minViewFMB (I _ k mv l m r)              f = minViewFMB l (\l' -> f (mkVBalancedFMB k mv l' m r))
- 
--minView :: Monad m => FM k a -> m (a,FM k a)
-+minView :: Fail.MonadFail m => FM k a -> m (a,FM k a)
- minView (FM (Just v) fmb) = return (v, FM Nothing fmb)
- minView (FM Nothing fmb)  = minViewFMB fmb (FM Nothing)
- 
--minViewWithKeyFMB :: Monad m => FMB k a -> ([k] -> [k]) -> (FMB k a -> FM k a) -> m (([k],a),FM k a)
-+minViewWithKeyFMB :: Fail.MonadFail m => FMB k a -> ([k] -> [k]) -> (FMB k a -> FM k a) -> m (([k],a),FM k a)
- minViewWithKeyFMB E _ _ = fail $ moduleName++".minView: empty map"
- minViewWithKeyFMB (I i k (Just v) E m r)        kf f = return ((kf [k],v),f (I i k Nothing E m r))
- minViewWithKeyFMB (I _ _ Nothing  E (FMB' E) _) _ _ = error $ moduleName++".minViewWithKey: bug!"
-@@ -874,7 +876,7 @@ minViewWithKeyFMB (I _ k Nothing  E (FMB' m) r) kf f = minViewWithKeyFMB m (kf .
- minViewWithKeyFMB (I _ k mv l m r)              kf f = minViewWithKeyFMB l kf
-                                                         (\l' -> f (mkVBalancedFMB k mv l' m r))
- 
--minViewWithKey :: Monad m => FM k a -> m (([k],a),FM k a)
-+minViewWithKey :: Fail.MonadFail m => FM k a -> m (([k],a),FM k a)
- minViewWithKey (FM (Just v) fmb) = return (([],v),FM Nothing fmb)
- minViewWithKey (FM Nothing fmb)  = minViewWithKeyFMB fmb id (FM Nothing)
- 
-@@ -906,7 +908,7 @@ deleteMin = deleteMinUsingMinView
- unsafeInsertMin :: Ord k => [k] -> a -> FM k a -> FM k a
- unsafeInsertMin = insert
- 
--maxViewFMB :: Monad m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
-+maxViewFMB :: Fail.MonadFail m => FMB k a -> (FMB k a -> FM k a) -> m (a, FM k a)
- maxViewFMB (I _ _ (Just v) l (FMB' E) E) f = return (v, f l)
- --maxViewFMB (I i k (Just v) l (FMB' E) E) f = return (v, f (I i k Nothing l (FMB' E) E))
- maxViewFMB (I _ _ Nothing  _ (FMB' E) E) _ = error $ moduleName++".maxView: bug!"
-@@ -914,7 +916,7 @@ maxViewFMB (I i k mv l (FMB' m) E)       f = maxViewFMB m (\m' -> f (I i k mv l
- maxViewFMB (I _ k mv l m r)              f = maxViewFMB r (\r' -> f (mkVBalancedFMB k mv l m r'))
- maxViewFMB E                             _ = error $ moduleName++".maxView: bug!"
- 
--maxView :: Monad m => FM k a -> m (a, FM k a)
-+maxView :: Fail.MonadFail m => FM k a -> m (a, FM k a)
- maxView (FM Nothing E)  = fail $ moduleName++".maxView: empty map"
- maxView (FM (Just v) E) = return (v,FM Nothing E)
- maxView (FM mv fmb)     = maxViewFMB fmb (FM mv)
-@@ -930,7 +932,7 @@ maxViewWithKeyFMB (I _ k mv l m r)              kf f = maxViewWithKeyFMB r kf
- maxViewWithKeyFMB E                             _ _ = error $ moduleName++".maxViewWithKey: bug!"
- 
- 
--maxViewWithKey :: Monad m => FM k a -> m (([k],a), FM k a)
-+maxViewWithKey :: Fail.MonadFail m => FM k a -> m (([k],a), FM k a)
- maxViewWithKey (FM Nothing E)  = fail $ moduleName++".maxViewWithKey: empty map"
- maxViewWithKey (FM (Just v) E) = return (([],v),FM Nothing E)
- maxViewWithKey (FM mv fmb)     = maxViewWithKeyFMB fmb id (FM mv)
-diff --git a/src/Data/Edison/Coll/Defaults.hs b/src/Data/Edison/Coll/Defaults.hs
-index 213ed36..d927f38 100644
---- a/src/Data/Edison/Coll/Defaults.hs
-+++ b/src/Data/Edison/Coll/Defaults.hs
-@@ -14,8 +14,9 @@
- module Data.Edison.Coll.Defaults where
- 
- import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
--import Control.Monad.Identity
-+import qualified Control.Monad.Fail as Fail
- 
-+import Data.Edison.Prelude ( runFail_ )
- import Data.Edison.Coll
- import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
-@@ -81,7 +82,7 @@ disjointUsingToOrdList xs ys = disj (toOrdList xs) (toOrdList ys)
-         disj _ _ = True
- 
- intersectWitnessUsingToOrdList ::
--        (OrdColl c a, Monad m) => c -> c -> m (a,a)
-+        (OrdColl c a, Fail.MonadFail m) => c -> c -> m (a,a)
- intersectWitnessUsingToOrdList as bs = witness (toOrdList as) (toOrdList bs)
-   where witness a@(x:xs) b@(y:ys) =
-           case compare x y of
-@@ -92,7 +93,7 @@ intersectWitnessUsingToOrdList as bs = witness (toOrdList as) (toOrdList bs)
-         witness _ _ = fail $ instanceName as ++ ".intersect: failed"
- 
- lookupUsingLookupM :: Coll c a => a -> c -> a
--lookupUsingLookupM x ys = runIdentity (lookupM x ys)
-+lookupUsingLookupM x ys = runFail_ (lookupM x ys)
- 
- lookupUsingLookupAll :: Coll c a => a -> c -> a
- lookupUsingLookupAll x ys =
-@@ -100,7 +101,7 @@ lookupUsingLookupAll x ys =
-     (y:_) -> y
-     [] -> error $ instanceName ys ++ ".lookup: lookup failed"
- 
--lookupMUsingLookupAll :: (Coll c a, Monad m) => a -> c -> m a
-+lookupMUsingLookupAll :: (Coll c a, Fail.MonadFail m) => a -> c -> m a
- lookupMUsingLookupAll x ys =
-   case lookupAll x ys of
-     (y:_) -> return y
-diff --git a/src/Data/Edison/Coll/EnumSet.hs b/src/Data/Edison/Coll/EnumSet.hs
-index c93ab07..cce68e6 100644
---- a/src/Data/Edison/Coll/EnumSet.hs
-+++ b/src/Data/Edison/Coll/EnumSet.hs
-@@ -157,6 +157,7 @@ module Data.Edison.Coll.EnumSet (
- 
- import qualified Prelude
- import Prelude hiding (filter,foldl,foldr,null,map,lookup,foldl1,foldr1)
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.Bits as Bits
- import Data.Bits hiding (complement)
- import Data.Word
-@@ -251,7 +252,7 @@ count = countUsingMember
- lookup :: (Eq a, Enum a) => a -> Set a -> a
- lookup = lookupUsingLookupAll
- 
--lookupM :: (Eq a, Enum a, Monad m) => a -> Set a -> m a
-+lookupM :: (Eq a, Enum a, Fail.MonadFail m) => a -> Set a -> m a
- lookupM x s
-    | member x s = return x
-    | otherwise  = fail (moduleName++".lookupM: lookup failed")
-@@ -340,12 +341,12 @@ deleteMax (Set w)
-    | w == 0    = empty
-    | otherwise = Set $ clearBit w $ msb w
- 
--minView :: (Enum a, Monad m) => Set a -> m (a, Set a)
-+minView :: (Enum a, Fail.MonadFail m) => Set a -> m (a, Set a)
- minView (Set w)
-    | w == 0    = fail (moduleName++".minView: empty set")
-    | otherwise = let i = lsb w in return (toEnum i,Set $ clearBit w i)
- 
--maxView :: (Enum a, Monad m) => Set a -> m (a, Set a)
-+maxView :: (Enum a, Fail.MonadFail m) => Set a -> m (a, Set a)
- maxView (Set w)
-    | w == 0    = fail (moduleName++".maxView: empty set")
-    | otherwise = let i = msb w in return (toEnum i, Set $ clearBit w i)
-diff --git a/src/Data/Edison/Coll/LazyPairingHeap.hs b/src/Data/Edison/Coll/LazyPairingHeap.hs
-index e41ce2e..3dcebe4 100644
---- a/src/Data/Edison/Coll/LazyPairingHeap.hs
-+++ b/src/Data/Edison/Coll/LazyPairingHeap.hs
-@@ -49,6 +49,7 @@ import Data.List (sort)
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- moduleName :: String
-@@ -359,7 +360,7 @@ lookupAll y h = look h S.empty
-             EQ -> S.lcons x $ look i $ look xs rest
-             GT -> rest
- 
--minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- minView E = fail "LazyPairingHeap.minView: empty heap"
- minView (H1 x xs) = return (x,xs)
- minView (H2 x h xs) = return (x,union h xs)
-@@ -369,7 +370,7 @@ minElem E = error "LazyPairingHeap.minElem: empty heap"
- minElem (H1 x _) = x
- minElem (H2 x _ _) = x
- 
--maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- maxView E = fail "LazyPairingHeap.maxView: empty heap"
- maxView xs = return (y,xs')
-   where (xs', y) = maxView' xs
-@@ -474,7 +475,7 @@ deleteMax = deleteMaxUsingMaxView
- lookup :: Ord a => a -> Heap a -> a
- lookup = lookupUsingLookupAll
- 
--lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
-+lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
- lookupM = lookupMUsingLookupAll
- 
- lookupWithDefault :: Ord a => a -> a -> Heap a -> a
-diff --git a/src/Data/Edison/Coll/LeftistHeap.hs b/src/Data/Edison/Coll/LeftistHeap.hs
-index 751394b..10ccf5a 100644
---- a/src/Data/Edison/Coll/LeftistHeap.hs
-+++ b/src/Data/Edison/Coll/LeftistHeap.hs
-@@ -47,6 +47,7 @@ import Data.Edison.Coll.Defaults
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- moduleName :: String
-@@ -173,7 +174,7 @@ toSeq h = tol h S.empty
-   where tol E rest = rest
-         tol (L _ x a b) rest = S.lcons x (tol b (tol a rest))
- 
--lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
-+lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
- lookupM _ E = fail "LeftistHeap.lookupM: XXX"
- lookupM x (L _ y a b) =
-   case compare x y of
-@@ -299,7 +300,7 @@ partitionLT_GT y h = (h', C.unionList hs)
-                       (b', hs'') = collect b hs'
-                   in (node x a' b', hs'')
- 
--minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- minView E = fail "LeftistHeap.minView: empty collection"
- minView (L _ x a b) = return (x, union a b)
- 
-@@ -307,7 +308,7 @@ minElem :: Ord a => Heap a -> a
- minElem E = error "LeftistHeap.minElem: empty collection"
- minElem (L _ x _ _) = x
- 
--maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- maxView E = fail "LeftistHeap.maxView: empty collection"
- maxView (L _ x E _) = return (x, E)
- maxView (L _ x a E) = return (y, L 1 x a' E)
-diff --git a/src/Data/Edison/Coll/MinHeap.hs b/src/Data/Edison/Coll/MinHeap.hs
-index ba38960..94e2f1b 100644
---- a/src/Data/Edison/Coll/MinHeap.hs
-+++ b/src/Data/Edison/Coll/MinHeap.hs
-@@ -46,6 +46,7 @@ import Data.Edison.Seq.Defaults (tokenMatch,maybeParens)
- import Data.Monoid
- import qualified Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- data Min h a = E | M a h  deriving (Eq)
-@@ -75,7 +76,7 @@ strict    :: (C.CollX h a,Ord a) => Min h a -> Min h a
- 
- toSeq     :: (C.Coll h a,S.Sequence s) => Min h a -> s a
- lookup    :: (C.Coll h a,Ord a) => a -> Min h a -> a
--lookupM   :: (C.Coll h a,Ord a,Monad m) => a -> Min h a -> m a
-+lookupM   :: (C.Coll h a, Ord a, Fail.MonadFail m) => a -> Min h a -> m a
- lookupAll :: (C.Coll h a,Ord a,S.Sequence s) => a -> Min h a -> s a
- lookupWithDefault :: (C.Coll h a,Ord a) => a -> a -> Min h a -> a
- fold      :: (C.Coll h a) => (a -> b -> b) -> b -> Min h a -> b
-@@ -100,9 +101,9 @@ partitionLT_GE :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
- partitionLE_GT :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
- partitionLT_GT :: (C.OrdColl h a,Ord a) => a -> Min h a -> (Min h a, Min h a)
- 
--minView :: (C.OrdColl h a,Ord a,Monad m) => Min h a -> m (a, Min h a)
-+minView :: (C.OrdColl h a, Ord a, Fail.MonadFail m) => Min h a -> m (a, Min h a)
- minElem :: (C.OrdColl h a,Ord a) => Min h a -> a
--maxView :: (C.OrdColl h a,Ord a,Monad m) => Min h a -> m (a, Min h a)
-+maxView :: (C.OrdColl h a, Ord a, Fail.MonadFail m) => Min h a -> m (a, Min h a)
- maxElem :: (C.OrdColl h a,Ord a) => Min h a -> a
- foldr :: (C.OrdColl h a,Ord a) => (a -> b -> b) -> b -> Min h a -> b
- foldl :: (C.OrdColl h a,Ord a) => (b -> a -> b) -> b -> Min h a -> b
-diff --git a/src/Data/Edison/Coll/SkewHeap.hs b/src/Data/Edison/Coll/SkewHeap.hs
-index 1a05ebe..e55ba58 100644
---- a/src/Data/Edison/Coll/SkewHeap.hs
-+++ b/src/Data/Edison/Coll/SkewHeap.hs
-@@ -47,6 +47,7 @@ import Data.Edison.Coll.Defaults
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- 
- import Test.QuickCheck
- 
-@@ -142,7 +143,7 @@ toSeq h = tol h S.empty
-   where tol E rest = rest
-         tol (T x a b) rest = S.lcons x (tol b (tol a rest))
- 
--lookupM :: (Ord a, Monad m) => a -> Heap a -> m a
-+lookupM :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
- lookupM _ E = fail "SkewHeap.lookupM: XXX"
- lookupM x (T y a b) =
-   case compare x y of
-@@ -267,7 +268,7 @@ partitionLT_GT y h = (h', C.unionList hs)
-                       (b', hs'') = collect b hs'
-                   in (T x a' b', hs'')
- 
--minView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+minView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- minView E = fail "SkewHeap.minView: empty heap"
- minView (T x a b) = return (x, union a b)
- 
-@@ -275,7 +276,7 @@ minElem :: Ord a => Heap a -> a
- minElem E = error "SkewHeap.minElem: empty collection"
- minElem (T x _ _) = x
- 
--maxView :: (Ord a, Monad m) => Heap a -> m (a, Heap a)
-+maxView :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- maxView E = fail "SkewHeap.maxView: empty heap"
- maxView (T x E E) = return (x, E)
- maxView (T x a E) = return (y, T x a' E)
-diff --git a/src/Data/Edison/Coll/SplayHeap.hs b/src/Data/Edison/Coll/SplayHeap.hs
-index 4e3b061..6c950b7 100644
---- a/src/Data/Edison/Coll/SplayHeap.hs
-+++ b/src/Data/Edison/Coll/SplayHeap.hs
-@@ -50,6 +50,7 @@ import Data.Edison.Coll.Defaults
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- moduleName :: String
-@@ -93,7 +94,7 @@ strict    :: Heap a -> Heap a
- 
- toSeq     :: (Ord a, S.Sequence s) => Heap a -> s a
- lookup    :: Ord a => a -> Heap a -> a
--lookupM   :: (Ord a,Monad m) => a -> Heap a -> m a
-+lookupM   :: (Ord a, Fail.MonadFail m) => a -> Heap a -> m a
- lookupAll :: (Ord a,S.Sequence s) => a -> Heap a -> s a
- lookupWithDefault :: Ord a => a -> a -> Heap a -> a
- fold      :: Ord a => (a -> b -> b) -> b -> Heap a -> b
-@@ -118,9 +119,9 @@ partitionLT_GE   :: Ord a => a -> Heap a -> (Heap a, Heap a)
- partitionLE_GT   :: Ord a => a -> Heap a -> (Heap a, Heap a)
- partitionLT_GT   :: Ord a => a -> Heap a -> (Heap a, Heap a)
- 
--minView  :: (Ord a,Monad m) => Heap a -> m (a, Heap a)
-+minView  :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- minElem  :: Ord a => Heap a -> a
--maxView  :: (Ord a,Monad m) => Heap a -> m (a, Heap a)
-+maxView  :: (Ord a, Fail.MonadFail m) => Heap a -> m (a, Heap a)
- maxElem  :: Ord a => Heap a -> a
- foldr    :: Ord a => (a -> b -> b) -> b -> Heap a -> b
- foldl    :: Ord a => (b -> a -> b) -> b -> Heap a -> b
-diff --git a/src/Data/Edison/Coll/StandardSet.hs b/src/Data/Edison/Coll/StandardSet.hs
-index fcaf715..56df4bf 100644
---- a/src/Data/Edison/Coll/StandardSet.hs
-+++ b/src/Data/Edison/Coll/StandardSet.hs
-@@ -43,6 +43,7 @@ module Data.Edison.Coll.StandardSet (
- 
- import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
- import qualified Prelude
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.List
- 
- import qualified Data.Edison.Coll as C
-@@ -73,7 +74,7 @@ strict     :: Ord a => Set a -> Set a
- 
- toSeq      :: (Ord a,S.Sequence seq) => Set a -> seq a
- lookup     :: Ord a => a -> Set a -> a
--lookupM    :: (Ord a,Monad m) => a -> Set a -> m a
-+lookupM    :: (Ord a, Monad m, Fail.MonadFail m) => a -> Set a -> m a
- lookupAll  :: (Ord a,S.Sequence seq) => a -> Set a -> seq a
- lookupWithDefault :: Ord a => a -> a -> Set a  -> a
- fold       :: (a -> b -> b) -> b -> Set a -> b
-@@ -98,9 +99,9 @@ partitionLT_GE   :: Ord a => a -> Set a -> (Set a, Set a)
- partitionLE_GT   :: Ord a => a -> Set a -> (Set a, Set a)
- partitionLT_GT   :: Ord a => a -> Set a -> (Set a, Set a)
- 
--minView       :: (Ord a,Monad m) => Set a -> m (a, Set a)
-+minView       :: (Ord a, Monad m, Fail.MonadFail m) => Set a -> m (a, Set a)
- minElem       :: Set a -> a
--maxView       :: (Ord a,Monad m) => Set a -> m (a, Set a)
-+maxView       :: (Ord a, Monad m, Fail.MonadFail m) => Set a -> m (a, Set a)
- maxElem       :: Set a -> a
- foldr         :: (a -> b -> b) -> b -> Set a -> b
- foldl         :: (b -> a -> b) -> b -> Set a -> b
-diff --git a/src/Data/Edison/Coll/UnbalancedSet.hs b/src/Data/Edison/Coll/UnbalancedSet.hs
-index 03cb856..d7975d0 100644
---- a/src/Data/Edison/Coll/UnbalancedSet.hs
-+++ b/src/Data/Edison/Coll/UnbalancedSet.hs
-@@ -43,6 +43,7 @@ module Data.Edison.Coll.UnbalancedSet (
- 
- import Prelude hiding (null,foldr,foldl,foldr1,foldl1,lookup,filter)
- import qualified Prelude
-+import qualified Control.Monad.Fail as Fail
- import qualified Data.Edison.Coll as C
- import qualified Data.Edison.Seq as S
- import Data.Edison.Coll.Defaults
-@@ -70,7 +71,7 @@ strict     :: Set a -> Set a
- 
- toSeq      :: (Ord a,S.Sequence seq) => Set a -> seq a
- lookup     :: Ord a => a -> Set a -> a
--lookupM    :: (Ord a,Monad m) => a -> Set a -> m a
-+lookupM    :: (Ord a, Fail.MonadFail m) => a -> Set a -> m a
- lookupAll  :: (Ord a,S.Sequence seq) => a -> Set a -> seq a
- lookupWithDefault :: Ord a => a -> a -> Set a -> a
- fold       :: (a -> b -> b) -> b -> Set a -> b
-@@ -95,9 +96,9 @@ partitionLT_GE   :: Ord a => a -> Set a -> (Set a, Set a)
- partitionLE_GT   :: Ord a => a -> Set a -> (Set a, Set a)
- partitionLT_GT   :: Ord a => a -> Set a -> (Set a, Set a)
- 
--minView       :: (Monad m) => Set a -> m (a, Set a)
-+minView       :: (Fail.MonadFail m) => Set a -> m (a, Set a)
- minElem       :: Set a -> a
--maxView       :: (Monad m) => Set a -> m (a, Set a)
-+maxView       :: (Fail.MonadFail m) => Set a -> m (a, Set a)
- maxElem       :: Set a -> a
- foldr         :: (a -> b -> b) -> b -> Set a -> b
- foldl         :: (b -> a -> b) -> b -> Set a -> b
-diff --git a/src/Data/Edison/Concrete/FingerTree.hs b/src/Data/Edison/Concrete/FingerTree.hs
-index 47f766c..c6a2ac0 100644
---- a/src/Data/Edison/Concrete/FingerTree.hs
-+++ b/src/Data/Edison/Concrete/FingerTree.hs
-@@ -81,6 +81,7 @@ import Test.QuickCheck
- import Data.Edison.Prelude
- 
- import Control.Monad (liftM2, liftM3, liftM4)
-+import qualified Control.Monad.Fail as Fail
- 
- 
- infixr 5 `lcons`
-@@ -334,7 +335,7 @@ null Empty = True
- null _ = False
- 
- -- | /O(1)/. Analyse the left end of a sequence.
--lview :: (Measured v a, Monad m) => FingerTree v a -> m (a,FingerTree v a)
-+lview :: (Measured v a, Fail.MonadFail m) => FingerTree v a -> m (a,FingerTree v a)
- lview Empty                 =  fail "FingerTree.lview: empty tree"
- lview (Single x)            =  return (x, Empty)
- lview (Deep _ (One x) m sf) =  return . (,) x $
-@@ -357,7 +358,7 @@ ltailDigit (Four _ b c d) = Three b c d
- ltailDigit _ = error "FingerTree.ltailDigit: bug!"
- 
- -- | /O(1)/. Analyse the right end of a sequence.
--rview :: (Measured v a, Monad m) => FingerTree v a -> m (a, FingerTree v a)
-+rview :: (Measured v a, Fail.MonadFail m) => FingerTree v a -> m (a, FingerTree v a)
- rview Empty                  = fail "FingerTree.rview: empty tree"
- rview (Single x)             = return (x, Empty)
- rview (Deep _ pr m (One x))  = return . (,) x $
-diff --git a/src/Data/Edison/Seq/BankersQueue.hs b/src/Data/Edison/Seq/BankersQueue.hs
-index 6dac746..0ab24c9 100644
---- a/src/Data/Edison/Seq/BankersQueue.hs
-+++ b/src/Data/Edison/Seq/BankersQueue.hs
-@@ -51,11 +51,13 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
- 
- import qualified Control.Applicative as App
- 
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S ( Sequence(..) )
- import Data.Edison.Seq.Defaults
- import qualified Data.Edison.Seq.ListSeq as L
- import Data.Monoid
- import Data.Semigroup as SG
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Test.QuickCheck
- 
-@@ -66,16 +68,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -106,7 +108,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -263,7 +265,7 @@ copy n x
- 
- -- reduce1: given sizes could do more effective job of dividing evenly!
- 
--lookup idx q = runIdentity (lookupM idx q)
-+lookup idx q = runFail_ (lookupM idx q)
- 
- lookupM idx (Q i xs ys j)
-   | idx < i   = L.lookupM idx xs
-diff --git a/src/Data/Edison/Seq/BinaryRandList.hs b/src/Data/Edison/Seq/BinaryRandList.hs
-index b01b9b8..e772b65 100644
---- a/src/Data/Edison/Seq/BinaryRandList.hs
-+++ b/src/Data/Edison/Seq/BinaryRandList.hs
-@@ -55,14 +55,15 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
- import qualified Control.Applicative as App
--import Control.Monad.Identity
- import Data.Maybe
- 
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S ( Sequence(..) )
- import Data.Edison.Seq.Defaults
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- -- signatures for exported functions
-@@ -72,16 +73,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -112,7 +113,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -267,7 +268,7 @@ inBounds i xs = (i >= 0) && inb xs i
-         inb (Even ps) i = inb ps (half i)
-         inb (Odd _ ps) i = (i == 0) || inb ps (half (i-1))
- 
--lookup i xs = runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
- 
- lookupM i xs
-     | i < 0     = fail "BinaryRandList.lookup: bad subscript"
-diff --git a/src/Data/Edison/Seq/BraunSeq.hs b/src/Data/Edison/Seq/BraunSeq.hs
-index 7f6f33b..11236e3 100644
---- a/src/Data/Edison/Seq/BraunSeq.hs
-+++ b/src/Data/Edison/Seq/BraunSeq.hs
-@@ -72,6 +72,7 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
- import qualified Control.Applicative as App
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Maybe
- import Data.Monoid
-@@ -79,6 +80,7 @@ import Data.Semigroup as SG
- import Test.QuickCheck
- 
- 
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S ( Sequence(..) )
- import Data.Edison.Seq.Defaults
- import qualified Data.Edison.Seq.ListSeq as L
-@@ -91,16 +93,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -131,7 +133,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -344,7 +346,7 @@ inBounds i xs = (i >= 0) && inb xs i
-           | i == 0    = True
-           | otherwise = inb b (half i - 1)
- 
--lookup i xs = runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
- 
- lookupM i xs
-   | i < 0     = fail "BraunSeq.lookupM: bad subscript"
-diff --git a/src/Data/Edison/Seq/Defaults.hs b/src/Data/Edison/Seq/Defaults.hs
-index ed593dc..eae6a09 100644
---- a/src/Data/Edison/Seq/Defaults.hs
-+++ b/src/Data/Edison/Seq/Defaults.hs
-@@ -17,9 +17,11 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        filter,takeWhile,dropWhile,lookup,take,drop,splitAt,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Char (isSpace)
- 
-+import Data.Edison.Prelude ( runFail_ )
- import Data.Edison.Seq
- import qualified Data.Edison.Seq.ListSeq as L
- 
-@@ -33,7 +35,7 @@ appendUsingFoldr :: Sequence s => s a -> s a -> s a
- appendUsingFoldr s t | null t = s
-                             | otherwise = foldr lcons t s
- 
--rviewDefault :: (Monad m, Sequence s) => s a -> m (a, s a)
-+rviewDefault :: (Fail.MonadFail m, Sequence s) => s a -> m (a, s a)
- rviewDefault xs
-   | null xs   = fail $ instanceName xs ++ ".rview: empty sequence"
-   | otherwise = return (rhead xs, rtail xs)
-@@ -49,7 +51,7 @@ rtailUsingLview xs =
-             Nothing      -> empty
-             Just (y, ys) -> lcons x (rt y ys)
- 
--rtailMUsingLview :: (Monad m,Sequence s) => s a -> m (s a)
-+rtailMUsingLview :: (Fail.MonadFail m, Sequence s) => s a -> m (s a)
- rtailMUsingLview xs =
-     case lview xs of
-       Nothing      -> fail $ instanceName xs ++ ".rtailM: empty sequence"
-@@ -200,7 +202,7 @@ inBoundsUsingSize :: Sequence s => Int -> s a -> Bool
- inBoundsUsingSize i s = i >= 0 && i < size s
- 
- lookupUsingLookupM :: Sequence s => Int -> s a -> a
--lookupUsingLookupM i s = runIdentity (lookupM i s)
-+lookupUsingLookupM i s = runFail_ (lookupM i s)
- 
- lookupUsingDrop :: Sequence s => Int -> s a -> a
- lookupUsingDrop i s
-@@ -220,7 +222,7 @@ lookupWithDefaultUsingDrop d i s
-   | otherwise = lhead s'
-   where s' = drop i s
- 
--lookupMUsingDrop :: (Monad m, Sequence s) => Int -> s a -> m a
-+lookupMUsingDrop :: (Fail.MonadFail m, Sequence s) => Int -> s a -> m a
- lookupMUsingDrop i s
-   -- XXX better error message!
-   | i < 0 || null s' = fail $ instanceName s
-diff --git a/src/Data/Edison/Seq/FingerSeq.hs b/src/Data/Edison/Seq/FingerSeq.hs
-index c74c70b..a34254c 100644
---- a/src/Data/Edison/Seq/FingerSeq.hs
-+++ b/src/Data/Edison/Seq/FingerSeq.hs
-@@ -37,9 +37,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
- import qualified Control.Applicative as App
--import Data.Edison.Prelude (measure, Measured())
-+import Data.Edison.Prelude (measure, Measured(), runFail_)
- import qualified Data.Edison.Seq as S
- import Data.Edison.Seq.Defaults
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Monoid
- import Data.Semigroup as SG
-@@ -87,16 +88,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -127,7 +128,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -206,10 +207,10 @@ lheadM xs = lview xs >>= return . fst
- ltailM xs = lview xs >>= return . snd
- rheadM xs = rview xs >>= return . fst
- rtailM xs = rview xs >>= return . snd
--lhead = runIdentity . lheadM
--ltail = runIdentity . ltailM
--rhead = runIdentity . rheadM
--rtail = runIdentity . rtailM
-+lhead = runFail_ . lheadM
-+ltail = runFail_ . ltailM
-+rhead = runFail_ . rheadM
-+rtail = runFail_ . rtailM
- 
- fold     = foldr
- fold'    = foldr'
-diff --git a/src/Data/Edison/Seq/JoinList.hs b/src/Data/Edison/Seq/JoinList.hs
-index 6922023..05855ba 100644
---- a/src/Data/Edison/Seq/JoinList.hs
-+++ b/src/Data/Edison/Seq/JoinList.hs
-@@ -57,6 +57,7 @@ import qualified Control.Applicative as App
- 
- import Data.Edison.Seq.Defaults
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
- import Data.Semigroup as SG
- import Test.QuickCheck
-@@ -68,16 +69,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -108,7 +109,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-diff --git a/src/Data/Edison/Seq/MyersStack.hs b/src/Data/Edison/Seq/MyersStack.hs
-index 30eb197..eca46a5 100644
---- a/src/Data/Edison/Seq/MyersStack.hs
-+++ b/src/Data/Edison/Seq/MyersStack.hs
-@@ -49,8 +49,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
-                        zip,zip3,zipWith,zipWith3,unzip,unzip3,null)
- 
- import qualified Control.Applicative as App
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S ( Sequence(..) )
- import Data.Edison.Seq.Defaults
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Monoid
- import Data.Semigroup as SG
-@@ -63,16 +65,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -103,7 +105,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -246,7 +248,7 @@ inBounds i xs = inb xs i
-           | i < j     = (i >= 0)
-           | otherwise = inb xs' (i - j)
- 
--lookup i xs = runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
- 
- lookupM i xs = look xs i
-   where look E _ = fail "MyersStack.lookup: bad subscript"
-diff --git a/src/Data/Edison/Seq/RandList.hs b/src/Data/Edison/Seq/RandList.hs
-index 8fe97bd..8d2d38b 100644
---- a/src/Data/Edison/Seq/RandList.hs
-+++ b/src/Data/Edison/Seq/RandList.hs
-@@ -55,8 +55,10 @@ import Prelude hiding (concat,reverse,map,concatMap,foldr,foldl,foldr1,foldl1,
- 
- import qualified Control.Applicative as App
- 
-+import Data.Edison.Prelude ( runFail_ )
- import qualified Data.Edison.Seq as S( Sequence(..) )
- import Data.Edison.Seq.Defaults
-+import qualified Control.Monad.Fail as Fail
- import Control.Monad.Identity
- import Data.Monoid
- import Data.Semigroup as SG
-@@ -69,16 +71,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -109,7 +111,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-@@ -269,7 +271,7 @@ inBounds i xs = inb xs i
-           | i < j     = (i >= 0)
-           | otherwise = inb xs (i - j)
- 
--lookup i xs = runIdentity (lookupM i xs)
-+lookup i xs = runFail_ (lookupM i xs)
- 
- lookupM i xs = look xs i
-   where look E _ = fail "RandList.lookup bad subscript"
-diff --git a/src/Data/Edison/Seq/RevSeq.hs b/src/Data/Edison/Seq/RevSeq.hs
-index 3652c7b..87deea6 100644
---- a/src/Data/Edison/Seq/RevSeq.hs
-+++ b/src/Data/Edison/Seq/RevSeq.hs
-@@ -62,6 +62,7 @@ import qualified Data.Edison.Seq as S
- import qualified Data.Edison.Seq.ListSeq as L
- import Data.Edison.Seq.Defaults -- only used by concatMap
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Data.Monoid
- import Data.Semigroup as SG
- import Test.QuickCheck
-@@ -75,16 +76,16 @@ singleton      :: S.Sequence s => a -> Rev s a
- lcons          :: S.Sequence s => a -> Rev s a -> Rev s a
- rcons          :: S.Sequence s => a -> Rev s a -> Rev s a
- append         :: S.Sequence s => Rev s a -> Rev s a -> Rev s a
--lview          :: (S.Sequence s, Monad m) => Rev s a -> m (a, Rev s a)
-+lview          :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (a, Rev s a)
- lhead          :: S.Sequence s => Rev s a -> a
--lheadM         :: (S.Sequence s, Monad m) => Rev s a -> m a
-+lheadM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m a
- ltail          :: S.Sequence s => Rev s a -> Rev s a
--ltailM         :: (S.Sequence s, Monad m) => Rev s a -> m (Rev s a)
--rview          :: (S.Sequence s, Monad m) => Rev s a -> m (a, Rev s a)
-+ltailM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (Rev s a)
-+rview          :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (a, Rev s a)
- rhead          :: S.Sequence s => Rev s a -> a
--rheadM         :: (S.Sequence s, Monad m) => Rev s a -> m a
-+rheadM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m a
- rtail          :: S.Sequence s => Rev s a -> Rev s a
--rtailM         :: (S.Sequence s, Monad m) => Rev s a -> m (Rev s a)
-+rtailM         :: (S.Sequence s, Fail.MonadFail m) => Rev s a -> m (Rev s a)
- null           :: S.Sequence s => Rev s a -> Bool
- size           :: S.Sequence s => Rev s a -> Int
- concat         :: S.Sequence s => Rev s (Rev s a) -> Rev s a
-@@ -115,7 +116,7 @@ reduce1'       :: S.Sequence s => (a -> a -> a) -> Rev s a -> a
- copy           :: S.Sequence s => Int -> a -> Rev s a
- inBounds       :: S.Sequence s => Int -> Rev s a -> Bool
- lookup         :: S.Sequence s => Int -> Rev s a -> a
--lookupM        :: (S.Sequence s, Monad m) => Int -> Rev s a -> m a
-+lookupM        :: (S.Sequence s, Fail.MonadFail m) => Int -> Rev s a -> m a
- lookupWithDefault :: S.Sequence s => a -> Int -> Rev s a -> a
- update         :: S.Sequence s => Int -> a -> Rev s a -> Rev s a
- adjust         :: S.Sequence s => (a -> a) -> Int -> Rev s a -> Rev s a
-diff --git a/src/Data/Edison/Seq/SimpleQueue.hs b/src/Data/Edison/Seq/SimpleQueue.hs
-index 64592b6..754108f 100644
---- a/src/Data/Edison/Seq/SimpleQueue.hs
-+++ b/src/Data/Edison/Seq/SimpleQueue.hs
-@@ -59,6 +59,7 @@ import qualified Data.Edison.Seq.ListSeq as L
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- -- signatures for exported functions
-@@ -68,16 +69,16 @@ singleton      :: a -> Seq a
- lcons          :: a -> Seq a -> Seq a
- rcons          :: a -> Seq a -> Seq a
- append         :: Seq a -> Seq a -> Seq a
--lview          :: (Monad m) => Seq a -> m (a, Seq a)
-+lview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- lhead          :: Seq a -> a
--lheadM         :: (Monad m) => Seq a -> m a
-+lheadM         :: (Fail.MonadFail m) => Seq a -> m a
- ltail          :: Seq a -> Seq a
--ltailM         :: (Monad m) => Seq a -> m (Seq a)
--rview          :: (Monad m) => Seq a -> m (a, Seq a)
-+ltailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
-+rview          :: (Fail.MonadFail m) => Seq a -> m (a, Seq a)
- rhead          :: Seq a -> a
--rheadM         :: (Monad m) => Seq a -> m a
-+rheadM         :: (Fail.MonadFail m) => Seq a -> m a
- rtail          :: Seq a -> Seq a
--rtailM         :: (Monad m) => Seq a -> m (Seq a)
-+rtailM         :: (Fail.MonadFail m) => Seq a -> m (Seq a)
- null           :: Seq a -> Bool
- size           :: Seq a -> Int
- concat         :: Seq (Seq a) -> Seq a
-@@ -108,7 +109,7 @@ reduce1'       :: (a -> a -> a) -> Seq a -> a
- copy           :: Int -> a -> Seq a
- inBounds       :: Int -> Seq a -> Bool
- lookup         :: Int -> Seq a -> a
--lookupM        :: (Monad m) => Int -> Seq a -> m a
-+lookupM        :: (Fail.MonadFail m) => Int -> Seq a -> m a
- lookupWithDefault :: a -> Int -> Seq a -> a
- update         :: Int -> a -> Seq a -> Seq a
- adjust         :: (a -> a) -> Int -> Seq a -> Seq a
-diff --git a/src/Data/Edison/Seq/SizedSeq.hs b/src/Data/Edison/Seq/SizedSeq.hs
-index a50b800..65c0ee9 100644
---- a/src/Data/Edison/Seq/SizedSeq.hs
-+++ b/src/Data/Edison/Seq/SizedSeq.hs
-@@ -54,6 +54,7 @@ import Data.Edison.Seq.Defaults -- only used by concatMap
- import Data.Monoid
- import Data.Semigroup as SG
- import Control.Monad
-+import qualified Control.Monad.Fail as Fail
- import Test.QuickCheck
- 
- 
-@@ -65,16 +66,16 @@ singleton      :: S.Sequence s => a -> Sized s a
- lcons          :: S.Sequence s => a -> Sized s a -> Sized s a
- rcons          :: S.Sequence s => a -> Sized s a -> Sized s a
- append         :: S.Sequence s => Sized s a -> Sized s a -> Sized s a
--lview          :: (S.Sequence s, Monad m) => Sized s a -> m (a, Sized s a)
-+lview          :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (a, Sized s a)
- lhead          :: S.Sequence s => Sized s a -> a
--lheadM         :: (S.Sequence s, Monad m) => Sized s a -> m a
-+lheadM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m a
- ltail          :: S.Sequence s => Sized s a -> Sized s a
--ltailM         :: (S.Sequence s, Monad m) => Sized s a -> m (Sized s a)
--rview          :: (S.Sequence s, Monad m) => Sized s a -> m (a, Sized s a)
-+ltailM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (Sized s a)
-+rview          :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (a, Sized s a)
- rhead          :: S.Sequence s => Sized s a -> a
--rheadM         :: (S.Sequence s, Monad m) => Sized s a -> m a
-+rheadM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m a
- rtail          :: S.Sequence s => Sized s a -> Sized s a
--rtailM         :: (S.Sequence s, Monad m) => Sized s a -> m (Sized s a)
-+rtailM         :: (S.Sequence s, Fail.MonadFail m) => Sized s a -> m (Sized s a)
- null           :: S.Sequence s => Sized s a -> Bool
- size           :: S.Sequence s => Sized s a -> Int
- concat         :: S.Sequence s => Sized s (Sized s a) -> Sized s a
-@@ -105,7 +106,7 @@ reduce1'       :: S.Sequence s => (a -> a -> a) -> Sized s a -> a
- copy           :: S.Sequence s => Int -> a -> Sized s a
- inBounds       :: S.Sequence s => Int -> Sized s a -> Bool
- lookup         :: S.Sequence s => Int -> Sized s a -> a
--lookupM        :: (S.Sequence s, Monad m) => Int -> Sized s a -> m a
-+lookupM        :: (S.Sequence s, Fail.MonadFail m) => Int -> Sized s a -> m a
- lookupWithDefault :: S.Sequence s => a -> Int -> Sized s a -> a
- update         :: S.Sequence s => Int -> a -> Sized s a -> Sized s a
- adjust         :: S.Sequence s => (a -> a) -> Int -> Sized s a -> Sized s a
-
diff --git a/dev-haskell/edisoncore/metadata.xml b/dev-haskell/edisoncore/metadata.xml
deleted file mode 100644
index c483b30e0580..000000000000
--- a/dev-haskell/edisoncore/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides the core Edison data structure implementations,
-		including multiple sequence, set, bag, and finite map concrete
-		implementations with various performance characteristics. The
-		implementations in this package have no dependencies other than those
-		commonly bundled with Haskell compilers.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/edit-distance-vector/Manifest b/dev-haskell/edit-distance-vector/Manifest
deleted file mode 100644
index aaa317c3b3af..000000000000
--- a/dev-haskell/edit-distance-vector/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST edit-distance-vector-1.0.0.4.tar.gz 5819 BLAKE2B 8658c52e64e704dd5c52bae0e63ae0b4d84c88d6cb1e3ecdafb05191dc70e3dfdec34001b2c287ec62703eb7ecdbac9b127b3dd084bc4e484e70cd778d31913f SHA512 8d7ef7c6ca971aec5efc2e90adff2584c1e4f996df3ad4f6111f790fd88fcce1814111eb3a3bbe07d8455b03ade98f11e6343c4746e895be2ba9b82a86a33e6d
diff --git a/dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild b/dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild
deleted file mode 100644
index e61c98b7c569..000000000000
--- a/dev-haskell/edit-distance-vector/edit-distance-vector-1.0.0.4.ebuild
+++ /dev/null
@@ -1,27 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Calculate edit distances and edit scripts between vectors"
-HOMEPAGE="https://github.com/thsutton/edit-distance-vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/vector-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances )
-"
diff --git a/dev-haskell/edit-distance-vector/metadata.xml b/dev-haskell/edit-distance-vector/metadata.xml
deleted file mode 100644
index c2c7c2767205..000000000000
--- a/dev-haskell/edit-distance-vector/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		An implementation of the Wagner-Fischer dynamic programming algorithm to
-		find the optimal edit script and cost between two sequences.
-		
-		The implementation in this package is specialised to sequences represented
-		with &quot;Data.Vector&quot; but is otherwise agnostic to:
-		
-		* The type of values in the vectors;
-		
-		* The type representing edit operations; and
-		
-		* The type representing the cost of operations.
-		
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
index 568102a4434a..a1a1bdefc150 100644
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
+++ b/dev-haskell/edit-distance/edit-distance-0.2.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/random-1.0:=[profile?]
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 		dev-haskell/test-framework-quickcheck2 )
 "
 
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.4 && <2.9' 'QuickCheck >= 2.4'
-}
+CABAL_CHDEPS=(
+	'QuickCheck >= 2.4 && <2.9' 'QuickCheck >= 2.4'
+)
diff --git a/dev-haskell/edit-distance/edit-distance-0.2.2.1.ebuild b/dev-haskell/edit-distance/edit-distance-0.2.2.1.ebuild
deleted file mode 100644
index e7d0f8260dcc..000000000000
--- a/dev-haskell/edit-distance/edit-distance-0.2.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Levenshtein and restricted Damerau-Levenshtein edit distances"
-HOMEPAGE="https://github.com/phadej/edit-distance"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/random-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.1.1
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/edit-distance/metadata.xml b/dev-haskell/edit-distance/metadata.xml
index a2d0a723f92f..aeaa481635c7 100644
--- a/dev-haskell/edit-distance/metadata.xml
+++ b/dev-haskell/edit-distance/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">batterseapower/edit-distance</remote-id>
+		<remote-id type="github">haskellari/edit-distance</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/editline/Manifest b/dev-haskell/editline/Manifest
deleted file mode 100644
index dcdf19288b00..000000000000
--- a/dev-haskell/editline/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST editline-0.2.1.1.tar.gz 47240 BLAKE2B 7bd9d4d894856653e14a3ebde954ad17bb8b8e3ec03151edf8107c0ad5095e9bd467fa737d8b6af00fbe50da3fef54521e2ec32c214a6362df27e3f0137c0f6c SHA512 c4fa4438ecf318637ff42292411024f9df86d3edab5ac2107fe3978a9778ce03f62348fc4cf9c5a2f06e74e1abf0c8963f5a6d686113ba31a5c59fd7a75295d6
diff --git a/dev-haskell/editline/editline-0.2.1.1-r1.ebuild b/dev-haskell/editline/editline-0.2.1.1-r1.ebuild
deleted file mode 100644
index c1a38cc5b45a..000000000000
--- a/dev-haskell/editline/editline-0.2.1.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit autotools eutils haskell-cabal
-
-DESCRIPTION="Bindings to the editline library (libedit)"
-HOMEPAGE="http://code.haskell.org/editline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-	dev-libs/libedit"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ghc-7.8.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoconf
-
-	# default file, not compatible to cabal-3
-	rm Setup.lhs || die
-
-	cabal_chdeps \
-		'base < 4.7' 'base'
-}
diff --git a/dev-haskell/editline/editline-0.2.1.1.ebuild b/dev-haskell/editline/editline-0.2.1.1.ebuild
deleted file mode 100644
index 31a3b5a5d8d6..000000000000
--- a/dev-haskell/editline/editline-0.2.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Bindings to the editline library (libedit)"
-HOMEPAGE="http://code.haskell.org/editline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-	dev-libs/libedit"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.8.patch
-
-	cabal_chdeps \
-		'base < 4.7' 'base'
-}
diff --git a/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch b/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch
deleted file mode 100644
index 4a55ecd5626b..000000000000
--- a/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/System/Console/Editline/Readline.hsc b/System/Console/Editline/Readline.hsc
-index 1ea9d6c..3b95b59 100644
---- a/System/Console/Editline/Readline.hsc
-+++ b/System/Console/Editline/Readline.hsc
-@@ -173,7 +173,7 @@ import Foreign.Marshal.Array ( mallocArray, peekArray0, pokeArray0 )
- import Foreign.C.Types	( CInt(..), CChar, CFile )
- import Foreign.C.String	( newCString, peekCString, withCString,
- 			  castCharToCChar, castCCharToChar )
--import GHC.Handle	( fdToHandle )
-+import GHC.IO.Handle.FD	( fdToHandle )
- 
- {-# CFILES HsReadline_cbits.c #-}
- 
diff --git a/dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch b/dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch
deleted file mode 100644
index 2f073b6a2c72..000000000000
--- a/dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/689988
---- a/configure.ac
-+++ b/configure.ac
-@@ -31,7 +31,8 @@ dnl does it.
- AC_CHECK_LIB(curses, tgetent, HaveLibTermcap=YES; LibTermcap=curses,
-   [AC_CHECK_LIB(ncurses, tgetent, HaveLibTermcap=YES; LibTermcap=ncurses,
-     [AC_CHECK_LIB(termcap, tgetent, HaveLibTermcap=YES; LibTermcap=termcap,
--      HaveLibTermcap=NO; LibTermcap=not-installed)])])
-+      [AC_CHECK_LIB(tinfo, tgetent, HaveLibTermcap=YES; LibTermcap=tinfo,
-+        HaveLibTermcap=NO; LibTermcap=not-installed)])])])
- 
- if test "x$HaveLibTermcap" = xYES ; then
-   HaveLibEdit=YES
diff --git a/dev-haskell/editline/metadata.xml b/dev-haskell/editline/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/editline/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/either/Manifest b/dev-haskell/either/Manifest
deleted file mode 100644
index 69b78ddff180..000000000000
--- a/dev-haskell/either/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST either-4.3.3.2.tar.gz 8665 BLAKE2B f9308b05458add4afca329c9fd292265096f13d5a09cb9a783c8754b8c1ec3f71c4214aace38ca09bd7a11245ff9a896473981cbfc1e5a9075709de6ec35912d SHA512 35b0825cb34fef8cb673b808110c856d3be4b02a28c52ac59d5b31e34083095e7e72d1ea437e70a43500064f7fdd2baf90ca078729907b975192401c240b19e5
-DIST either-4.4.1.1.tar.gz 9376 BLAKE2B 5fecb832b018349360c62c3a6af2673bd8687ea6c1a652e60dedc392f31a5fa9e16ca1b1414501848eed23b884665ee69a32cdc6e6ab01110d3d6865cf1cdc50 SHA512 ebc61b0f83812c7479a4fe5422ae4b73f219f0d57938e8c43e0f1e8932374c874709453773b7577f98b07ab17c884e8f4f77a28d457291b5d3f988da71fb6195
-DIST either-4.4.1.tar.gz 9243 BLAKE2B c6917248fd2b53ba69ea18669fa1f29c41c202a474b0d86ecf1c0114987d88f28f238b4678405e2c5e84d62b43974abd1481356dd96c756b652c80093c8f9141 SHA512 d61a37fa5cbe9f4ff46ee6b0690405c41b503c30dcf2b06d15961539ee9c4f7e5414dfd7b377b984c4d710f148f43388d60cbdb5b86450f9a97f9b1fb8820bfc
-DIST either-5.0.1.1.tar.gz 10162 BLAKE2B c3489b2957a8c0081cfeecbf5ed247417c0e1f52fdaeaedcc4eb757d31574f17cdcb02a2c1808aa4aeea7a2f8b177f959f58b799039cbcef0b6ec875a620ee06 SHA512 96b23a9d5f1d2d4dd256251c488e06fa0e8642d849cf61c9de2a4089d2cbe86763062e69f83344eba2f75b30992f3e90ec195bd054f8de386c4c6b477a025c01
diff --git a/dev-haskell/either/either-4.3.3.2.ebuild b/dev-haskell/either/either-4.3.3.2.ebuild
deleted file mode 100644
index e535e487d22b..000000000000
--- a/dev-haskell/either/either-4.3.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An either monad transformer"
-HOMEPAGE="https://github.com/ekmett/either/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/either/either-4.4.1.1.ebuild b/dev-haskell/either/either-4.4.1.1.ebuild
deleted file mode 100644
index c0cf3f52b695..000000000000
--- a/dev-haskell/either/either-4.4.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An either monad transformer"
-HOMEPAGE="https://github.com/ekmett/either/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.5:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/either/either-4.4.1.ebuild b/dev-haskell/either/either-4.4.1.ebuild
deleted file mode 100644
index 5ae7e5193300..000000000000
--- a/dev-haskell/either/either-4.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An either monad transformer"
-HOMEPAGE="https://github.com/ekmett/either/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/free-4.9:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monadrandom-0.1:=[profile?] <dev-haskell/monadrandom-0.5:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/either/either-5.0.1.1.ebuild b/dev-haskell/either/either-5.0.1.1.ebuild
deleted file mode 100644
index 0918386df358..000000000000
--- a/dev-haskell/either/either-5.0.1.1.ebuild
+++ /dev/null
@@ -1,32 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An either monad transformer"
-HOMEPAGE="https://github.com/ekmett/either/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/either/metadata.xml b/dev-haskell/either/metadata.xml
deleted file mode 100644
index 8af902c7dab7..000000000000
--- a/dev-haskell/either/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 either monad transformer
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/either</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ekg-core/Manifest b/dev-haskell/ekg-core/Manifest
deleted file mode 100644
index e370373b946f..000000000000
--- a/dev-haskell/ekg-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ekg-core-0.1.1.0.tar.gz 12376 BLAKE2B 1b0b2ed3b7fc5b044058d5fa01db14db71657ad4398f9557583c4e78b6bc69220dd0bb4070dda50ca1cc89e8a873ccb93e215e2e0fd1ebc07250e611a32d1b9e SHA512 a383154b87e5de0995d57f368f04c725dc406c3cb7d824b0b4dc5c4b6620ff11df6547e2e64d123a35d0725155687e2600eb4c8b651cd9177c4ae73dcd409145
-DIST ekg-core-0.1.1.1.tar.gz 12426 BLAKE2B d05845f0a79974b9c1731eda8407049262330bca7d47b4dea090c31cfcf2ef8ea416d237e8e701865a43c41886410a12101798e669e2055fb179ab6361b5d5a1 SHA512 cdf27886a17679a396da9e85c55760ddb339080a3363c85321de11384b180db951bf95cb3c8e653d80683b942bfd363fcc1f465d114f914c2795269feedb3395
-DIST ekg-core-0.1.1.6.tar.gz 13454 BLAKE2B 994e8e6395a9a298dcd6b48a4a122e449fc23fb6944f0565632308d3445825beb1f5177ea2debc4ca409e0d957b1cbfa3190347ed2e973e306a7c1637703f789 SHA512 5a654b6a036300234fc2a65acfee05703772581e0cb646f5462196ce8f30695f7838c34f01b6d840aa1999babe4d9d9b01c3d9b7cc199a1a9112b1792b08927d
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.0.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.0.ebuild
deleted file mode 100644
index 4b90f7280a5b..000000000000
--- a/dev-haskell/ekg-core/ekg-core-0.1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tracking of system metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.1.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.1.ebuild
deleted file mode 100644
index 5a9e07c0ab18..000000000000
--- a/dev-haskell/ekg-core/ekg-core-0.1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tracking of system metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild b/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
deleted file mode 100644
index f81499b6f803..000000000000
--- a/dev-haskell/ekg-core/ekg-core-0.1.1.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tracking of system metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.6 && < 4.13' 'base >= 4.6'
-}
diff --git a/dev-haskell/ekg-core/metadata.xml b/dev-haskell/ekg-core/metadata.xml
deleted file mode 100644
index 4be2b274026f..000000000000
--- a/dev-haskell/ekg-core/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library lets you defined and track system metrics.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/ekg-core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ekg-json/Manifest b/dev-haskell/ekg-json/Manifest
deleted file mode 100644
index a32cdebc4918..000000000000
--- a/dev-haskell/ekg-json/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ekg-json-0.1.0.0.tar.gz 2969 BLAKE2B d16870858a80ae7a95bfce3e948dfc2e7b8f1501e3246a448486087a38fced0f36cac3f732c5b4f73a0a3102955685f0d9902b01a82c40c377e3e3a515dad871 SHA512 6d9d2a5f7d8893cc9076b6817bf433fa3e525fe08e2686c7e21f0a58d8c0699f4a16859f3042e4d3aa0e79416301d43cac21fe80b767934ab9f0309f02558c51
-DIST ekg-json-0.1.0.1.tar.gz 2966 BLAKE2B 3656c910ce6fdd84e13027314c4334a641808fc4b0e42007ce9cd1b1954198395845161f09076207269b2270b955a4849b3b1a654742ba914cda98ab4df86f6d SHA512 c1ec9c0feedffdc7ff50997b5a851237507e0f9d2e841fa9cae5785dc26318abe1a3a0de9c433e3554a686869fa26a756a85d1cdae4bce6af198cfc641c1d508
-DIST ekg-json-0.1.0.3.tar.gz 3069 BLAKE2B 6683dba514dd62608cdbf3e5291a0216ec4aaec89d2e652721b8fa06819138dfa409d05ed364a18c3113bf2a04c7ed7f24e0e019e29b3eb62505fc01b59c026b SHA512 52f03c9758396a627a4b5c9a92aacb84e5f082ff5ecbfba2a5f870c0abe9d7c81d65a7a8f0ce16558634a3cc6fdd4834efed8dc95c73fed9a1b2aea049660ff9
-DIST ekg-json-0.1.0.6.tar.gz 3094 BLAKE2B ea5755f2cabb8c898a6632fdf0cebca99a8eccc4a9ba2e3f844781d029b5c11d618c67bbcadbece93a69e092c03cfedef7e435fbed2998497ab44ab034a82a34 SHA512 c1996214f3d41202dd51a3bf335fa6c67488a3b3625acba196839bef36eff1443907c010b6887845cf759addc769b45d1bcc648554bb2a7942a13337cf40c60e
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.0.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.0.ebuild
deleted file mode 100644
index 81a5f5ce0c2d..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/aeson-0.11:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.1.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.1.ebuild
deleted file mode 100644
index dc557c5b9b99..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/aeson-0.12:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.3.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.3.ebuild
deleted file mode 100644
index f55f77a14905..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild b/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild
deleted file mode 100644
index 058d32387d91..000000000000
--- a/dev-haskell/ekg-json/ekg-json-0.1.0.6-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="JSON encoding of ekg metrics"
-HOMEPAGE="https://github.com/tibbe/ekg-json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.4:=[profile?]
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.5 && < 4.11' 'base >= 4.5' \
-		'aeson >=0.4 && < 1.3' 'aeson >=0.4'
-}
diff --git a/dev-haskell/ekg-json/metadata.xml b/dev-haskell/ekg-json/metadata.xml
deleted file mode 100644
index 478b13fd3805..000000000000
--- a/dev-haskell/ekg-json/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Encodes ekg metrics as JSON, using the same encoding as used by the
-		ekg package, thus allowing ekg metrics to be served by other HTTP
-		servers than the one used by the ekg package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/ekg-json</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/ekg/Manifest b/dev-haskell/ekg/Manifest
deleted file mode 100644
index b612ac18b39e..000000000000
--- a/dev-haskell/ekg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ekg-0.4.0.15.tar.gz 171305 BLAKE2B 41184045d138f0dc8a925c81d1c15b09b0af10e5dfe80600206bbb4b4cb460521fa71fb09ca2cc32fe4abad28e38183a2f8a168c4ea22c22e3ffdf4668693fc3 SHA512 da7f776e8eedcf0d038495535ca2953d0d813a8a90c2bdb18898932d59ce1b2181e66f06188afea95c14e8b9910b5d6a07930952b2172f67e1bf5b94dbb4967f
diff --git a/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild b/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild
deleted file mode 100644
index b392e081104e..000000000000
--- a/dev-haskell/ekg/ekg-0.4.0.15-r7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Remote monitoring of processes"
-HOMEPAGE="https://github.com/tibbe/ekg"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.4:=[profile?] <dev-haskell/aeson-1.6:=
-	>=dev-haskell/ekg-core-0.1:=[profile?] <dev-haskell/ekg-core-0.2:=[profile?]
-	>=dev-haskell/ekg-json-0.1:=[profile?] <dev-haskell/ekg-json-0.2:=[profile?]
-	<dev-haskell/network-3.2:=[profile?]
-	<dev-haskell/snap-core-1.1:=[profile?]
-	<dev-haskell/snap-server-1.2:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-src_prepare() {
-	default
-
-	# As per http://hackage.haskell.org/package/ekg-0.4.0.15/revisions/
-	cabal_chdeps \
-		'base >= 4.5 && < 4.12'	'base >=4.5' \
-		'aeson >= 0.4 && < 1.3'	'aeson >= 0.4' \
-		'network < 2.7'			'network' \
-		'time < 1.9'            'time'
-}
diff --git a/dev-haskell/ekg/metadata.xml b/dev-haskell/ekg/metadata.xml
deleted file mode 100644
index 97b6668da8aa..000000000000
--- a/dev-haskell/ekg/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library lets you remotely monitor a running process over HTTP.
-		It provides a simple way to integrate a monitoring server into any
-		application.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/ekg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/email-validate/Manifest b/dev-haskell/email-validate/Manifest
index c6e651e41ebc..ed0e6d7a6534 100644
--- a/dev-haskell/email-validate/Manifest
+++ b/dev-haskell/email-validate/Manifest
@@ -1,2 +1,2 @@
-DIST email-validate-1.0.0.tar.gz 7205 BLAKE2B 11d5b70fa2a90a150f66a317c4ee7a990098201d96c4f47e3e6024b9c058fda6bea667e1191a8753ec8a19791a9785b55784e13ad2d6a23436145dff09350602 SHA512 e76ea41e7d2dbc5085e3afbd4cdddecf106dd9a308d14bd377d70392163d695cb2d1c538de81c510565b309846376864fc1977c520860c9b3ff9162854601f4b
-DIST email-validate-2.0.1.tar.gz 7462 BLAKE2B f385a0e585191a1810270397077f5f2b675dacc8ed89eb256e4e1848e40dafe79d037516c2ab0b7f7d5aae42a7d04399b9e9c9a5b12fc1b2eda753a3580de810 SHA512 d5eb0d48c81fa61c5bdecbb1cc35e370afbcb49277091b7358a01518711dfda94ec4074c7462f1efa088cc964408db083481da976d64283868baa130abf7089e
+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
diff --git a/dev-haskell/email-validate/email-validate-1.0.0.ebuild b/dev-haskell/email-validate/email-validate-1.0.0.ebuild
deleted file mode 100644
index c9b02ab5da5a..000000000000
--- a/dev-haskell/email-validate/email-validate-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Validating an email address string against RFC 5322"
-HOMEPAGE="http://porg.es/blog/email-address-validation-simpler-faster-more-correct"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hunit-1.2
-			<dev-haskell/hunit-2
-			>=dev-haskell/quickcheck-2.4
-			>=dev-haskell/test-framework-0.4.1
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/email-validate/email-validate-2.0.1.ebuild b/dev-haskell/email-validate/email-validate-2.0.1.ebuild
deleted file mode 100644
index f50409f9a818..000000000000
--- a/dev-haskell/email-validate/email-validate-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Validating an email address string against RFC 5322"
-HOMEPAGE="http://porg.es/blog/email-address-validation-simpler-faster-more-correct"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.4.1
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
new file mode 100644
index 000000000000..728adbf91c85
--- /dev/null
+++ b/dev-haskell/email-validate/email-validate-2.3.2.15.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Email address validation"
+HOMEPAGE="https://github.com/Porges/email-validate-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.2.15-fix-doctest.patch" )
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/doctest-0.8
+		>=dev-haskell/hspec-2.2.3
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15 )
+"
+
+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/email-validate/email-validate-2.3.2.19.ebuild b/dev-haskell/email-validate/email-validate-2.3.2.19.ebuild
new file mode 100644
index 000000000000..32b9164dfe5a
--- /dev/null
+++ b/dev-haskell/email-validate/email-validate-2.3.2.19.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Email address validation"
+HOMEPAGE="https://github.com/Porges/email-validate-hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/attoparsec-0.10.0:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/hspec-2.2.3 <dev-haskell/hspec-2.12
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
+	)
+"
diff --git a/dev-haskell/email-validate/files/email-validate-2.3.2.15-fix-doctest.patch b/dev-haskell/email-validate/files/email-validate-2.3.2.15-fix-doctest.patch
new file mode 100644
index 000000000000..d60b0c6a7844
--- /dev/null
+++ b/dev-haskell/email-validate/files/email-validate-2.3.2.15-fix-doctest.patch
@@ -0,0 +1,26 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/1231
+
+Small fix to get doctest working
+
+diff -urN email-validate-2.3.2.15/src/Text/Email/QuasiQuotation.hs email-validate-2.3.2.15-r1/src/Text/Email/QuasiQuotation.hs
+--- email-validate-2.3.2.15/src/Text/Email/QuasiQuotation.hs	2021-07-04 14:50:48.000000000 -0600
++++ email-validate-2.3.2.15-r1/src/Text/Email/QuasiQuotation.hs	2022-03-17 17:33:15.666925125 -0600
+@@ -4,6 +4,7 @@
+ #else
+ {-# LANGUAGE TemplateHaskell #-}
+ #endif
++{-# LANGUAGE PackageImports #-}
+ 
+ module Text.Email.QuasiQuotation
+     ( email
+@@ -11,7 +12,7 @@
+ 
+ import qualified Data.ByteString.Char8 as BS8
+ 
+-import Language.Haskell.TH.Quote (QuasiQuoter(..))
++import "template-haskell" Language.Haskell.TH.Quote (QuasiQuoter(..))
+ 
+ import Text.Email.Validate (validate, localPart, domainPart, unsafeEmailAddress)
+ 
diff --git a/dev-haskell/email-validate/metadata.xml b/dev-haskell/email-validate/metadata.xml
index f18d6cef5b45..eee47cac0b27 100644
--- a/dev-haskell/email-validate/metadata.xml
+++ b/dev-haskell/email-validate/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Validating an email address string against RFC 5322
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">email-validate</remote-id>
+		<remote-id type="github">Porges/email-validate-hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/emojis/Manifest b/dev-haskell/emojis/Manifest
index 95fd69c11692..7dd795025b3f 100644
--- a/dev-haskell/emojis/Manifest
+++ b/dev-haskell/emojis/Manifest
@@ -1 +1,2 @@
-DIST emojis-0.1.tar.gz 36219 BLAKE2B d77008408436a37400f5a325bd3e80721226c5bf127266c96a5919dd0249d94827140285a02ecabeb6ceca273eec37e06aac86636da899b2806c7b8b825bd445 SHA512 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2
+DIST emojis-0.1.2.tar.gz 49333 BLAKE2B c67e578cd356c2e7edc4f7880dc3235eff33dd98f773a24c4791442c4d0243b59cd775d8fb2bf4c53c6943434f340104183a99544d16a6d6c8f56c7d0d402dd3 SHA512 e34d1c1797f37e3cbe37f5f617496aa70310ca654c98069d393c10c5fcf56e336f35d06e018c859354ea54ae1c5fbbe4a24d484a5f59cceb5a9e3c25caf2a52d
+DIST emojis-0.1.3.tar.gz 50494 BLAKE2B 98130715f21c11fd463952ef8a2e4e4d85ddde4b0380351b83821c8ed62649793d4adb0c0a45e99d288ee954cdd3247fa4fdf22f82d016e9fbf6baf87854b59a SHA512 b9552e8be60a84282d7ce160ecdedb0fdc7549b01ea207d4bb1fd5327163c3cb75762ed6b16f2832841e3258a9b85718ea5a0ec6801c53c395f5ff070a31fe07
diff --git a/dev-haskell/emojis/emojis-0.1.2.ebuild b/dev-haskell/emojis/emojis-0.1.2.ebuild
new file mode 100644
index 000000000000..e900ffa0a34c
--- /dev/null
+++ b/dev-haskell/emojis/emojis-0.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between emoji characters and their names"
+HOMEPAGE="https://github.com/jgm/emojis#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit )
+"
diff --git a/dev-haskell/emojis/emojis-0.1.3.ebuild b/dev-haskell/emojis/emojis-0.1.3.ebuild
new file mode 100644
index 000000000000..705dc0dcb102
--- /dev/null
+++ b/dev-haskell/emojis/emojis-0.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between emoji characters and their names"
+HOMEPAGE="https://github.com/jgm/emojis#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/hunit )
+"
diff --git a/dev-haskell/emojis/emojis-0.1.ebuild b/dev-haskell/emojis/emojis-0.1.ebuild
deleted file mode 100644
index c070a220f9cc..000000000000
--- a/dev-haskell/emojis/emojis-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between emoji characters and their names."
-HOMEPAGE="https://github.com/jgm/emojis#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7 )
-"
diff --git a/dev-haskell/emojis/metadata.xml b/dev-haskell/emojis/metadata.xml
index 9b9c355c0ab3..7a08a8701db1 100644
--- a/dev-haskell/emojis/metadata.xml
+++ b/dev-haskell/emojis/metadata.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides functions for converting
-		emoji names to emoji characters and vice versa.
-		
-		How does it differ from the @emoji@ package?
-		
-		-   It supports a fuller range of emojis, including all those
-		supported by GitHub
-		-   It supports lookup of emoji aliases from emoji
-		-   It uses Text rather than String
-		-   It has a lighter dependency footprint: in particular, it
-		does not require aeson
-		-   It does not require TemplateHaskell
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">emojis</remote-id>
+		<remote-id type="github">jgm/emojis</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/enclosed-exceptions/Manifest b/dev-haskell/enclosed-exceptions/Manifest
index 31418d88da8d..972746bd375f 100644
--- a/dev-haskell/enclosed-exceptions/Manifest
+++ b/dev-haskell/enclosed-exceptions/Manifest
@@ -1,3 +1 @@
-DIST enclosed-exceptions-1.0.1.1.tar.gz 4566 BLAKE2B 10a109ae1313040eaf97096940c0faf209508bb63700060f18ea8082e637d8756d8e3567ef0801867224e6be8b9e6b222b085b1c25bd46cabe9abbc5fb58382f SHA512 69297633a1b55c22a2fa1cbfcd0f450f063997c5e088167f94b37e7bc92528047aa8d36072e7fc0be1550297cd5fb7d771c637627b3aa15eab9ffe4b19ff0c62
-DIST enclosed-exceptions-1.0.2.tar.gz 5266 BLAKE2B 0e6060c350ff64dda3de669f36d8bb24a3f5196fc160c8dd2f9d3a4c5b8d447df44862c0bccd59fd63a6ac1ebae37fb82a821562e5a485d80b5299738b37db67 SHA512 73b0196b0ec18acaf8a1c215abf7e4c8665c9df1ac07543796fadd7da1aa0b633167e10e1c923c609aa40e6af6f540574436825440da96918cd8066908781f40
 DIST enclosed-exceptions-1.0.3.tar.gz 5748 BLAKE2B d36913444a944da19b3da2e88c9aea6832998bfb9ff33a5b14b1cdce08c13b250182bd542522f5bccea693f206da3a9377c6f5a7d204adbe5e86dd6a665b5d32 SHA512 68edb501f42f01d8b4bbce374e49295e045650a8b19fdbf527a54458728e61f53c6c6bcfd1613a7169b013a34bd51cbd2ab2c457cf616fbc8c052b98533bde6c
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
deleted file mode 100644
index 3d72eec60cce..000000000000
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catching all exceptions from within an enclosed computation"
-HOMEPAGE="https://github.com/jcristovao/enclosed-exceptions"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.2.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.2.ebuild
deleted file mode 100644
index ee2d6ccbefba..000000000000
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catching all exceptions from within an enclosed computation"
-HOMEPAGE="https://github.com/jcristovao/enclosed-exceptions"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lifted-base-0.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/async-2.0
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck
-		dev-haskell/stm )
-"
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
index fccc544f7eea..23dc546eb2f4 100644
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
+++ b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/lifted-base-0.2:=[profile?]
diff --git a/dev-haskell/enclosed-exceptions/metadata.xml b/dev-haskell/enclosed-exceptions/metadata.xml
index d6b71a606fdc..3af35bd3cd67 100644
--- a/dev-haskell/enclosed-exceptions/metadata.xml
+++ b/dev-haskell/enclosed-exceptions/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/encoding/Manifest b/dev-haskell/encoding/Manifest
deleted file mode 100644
index cc09d809b16e..000000000000
--- a/dev-haskell/encoding/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST encoding-0.6.7.2.tar.gz 832564 BLAKE2B b61a113be8ac4d26c85343d5e459c35a4cdf35ceea734370b12816e3c16b748b7c47d4720db2263f74952006802be2d735a15a9e8cd8709a925d58ad6ea87945 SHA512 2a258cb20d49ddc3f1c78f7392e4440d503774680f0da0d297ce27466bace8303b1364e9b4fc5937ca6b1753d0648a6ff8cfc99dd77d52d851dfe9e0481a3cb2
-DIST encoding-0.7.0.2.tar.gz 320988 BLAKE2B f1fdef3e4b9d247c03f9669b7506cbd9082acdd85bd2d96e988c8731b3e9c774bb498717e49089cf4030d50a94e24bc461d65ef3923a14a0212d4e8741547c91 SHA512 60ede0397d68bcea292ed9fb09fe2bafcbc0afdd7d374b098049afe9a7146cc4be5615a83dbfb13c1a44db2e52a77f231fbac3ab2249398d3fb9921041aadd04
-DIST encoding-0.8.1.tar.gz 1034198 BLAKE2B 67bcc5c36698e21eeb827d19585bafe4a8ce599703863295097c83b1c6908bec82bcf98c2d9b9c4ea492bfd79435d064330a7d1d1e57f7d7ea27f587145bcbbb SHA512 f77088138888673f0802b57cba3f14cf84a1bee15ad013a1335d8a9e8d7206d716078c3b2ab299545f49174d9de9db4c67089f1b01664c86337c31ec91c5cf46
-DIST encoding-0.8.2.tar.gz 412630 BLAKE2B 2e6fd3599d4c1062c85389a1d12d332e982beecfb4f98b92ee8b1618e50ed1f91ec65b94273a325995bcbaa8fc6f41878870069c6400365e899b946592b740da SHA512 e8cbb1b64f3555945c185485688bfb7e73ca7104cbbbf5bec8ec55937656df1e3b99bae24aa1513c0c690d3521bca9c111f0258f2245637c7c8d706709cdcd62
-DIST encoding-0.8.tar.gz 321410 BLAKE2B ee87c14457c3474c571ebe25b5f98d50713b85666aeb5e099767d787bfaa9b10d03feb0e596c6c93ddf68bfc583285971f30d8e526cdc12d7570ae63b9b80f77 SHA512 c1f05333fa34eb0dc9ed1e1c82bc4d84e9fb3d0252a45519998a199ef1eafd49e9dea7ad60e8ae855b4efdaf4977f8a9aa6324d7b73bfd122bdef60341dea1e0
diff --git a/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild b/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild
deleted file mode 100644
index 2eac3715b8aa..000000000000
--- a/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-		dev-haskell/extensible-exceptions:=[profile?]
-		>=dev-haskell/haxml-1.22:=[profile?]
-		<dev-haskell/haxml-1.25:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/regex-compat:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	cabal_chdeps \
-		'binary < 0.6' 'binary' \
-		'HaXml >= 1.22 && < 1.24' 'HaXml >= 1.22 && < 1.25'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=systemencoding \
-		--flag=newghc \
-		--flag=splitbase
-}
diff --git a/dev-haskell/encoding/encoding-0.7.0.2-r1.ebuild b/dev-haskell/encoding/encoding-0.7.0.2-r1.ebuild
deleted file mode 100644
index 739b6194a23f..000000000000
--- a/dev-haskell/encoding/encoding-0.7.0.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+systemencoding"
-
-RDEPEND="<dev-haskell/binary-0.8:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/haxml-1.22:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HaXml >= 1.22 && < 1.25' 'HaXml >= 1.22'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag systemencoding systemencoding)
-}
diff --git a/dev-haskell/encoding/encoding-0.8.1.ebuild b/dev-haskell/encoding/encoding-0.8.1.ebuild
deleted file mode 100644
index 47147df81f34..000000000000
--- a/dev-haskell/encoding/encoding-0.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+systemencoding"
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.26:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'binary < 0.8' 'binary'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag systemencoding systemencoding)
-}
diff --git a/dev-haskell/encoding/encoding-0.8.2.ebuild b/dev-haskell/encoding/encoding-0.8.2.ebuild
deleted file mode 100644
index 695bd93c4395..000000000000
--- a/dev-haskell/encoding/encoding-0.8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+systemencoding"
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/regex-compat-0.71:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	>=dev-haskell/haxml-1.22 <dev-haskell/haxml-1.26
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cabal22.patch
-)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'regex-compat >=0.71 && <0.95' 'regex-compat >=0.71' \
-		'containers >=0.4 && <0.6' 'containers >=0.4 && <0.7'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag systemencoding systemencoding)
-}
diff --git a/dev-haskell/encoding/encoding-0.8.ebuild b/dev-haskell/encoding/encoding-0.8.ebuild
deleted file mode 100644
index 62e277644a9d..000000000000
--- a/dev-haskell/encoding/encoding-0.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for various character encodings"
-HOMEPAGE="http://code.haskell.org/encoding/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+systemencoding"
-
-RDEPEND="<dev-haskell/binary-0.8:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/haxml-1.22:=[profile?] <dev-haskell/haxml-1.26:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag systemencoding systemencoding)
-}
diff --git a/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch b/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
deleted file mode 100644
index bc1614deb71e..000000000000
--- a/dev-haskell/encoding/files/encoding-0.8.2-cabal22.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Setup.hs b/Setup.hs
-index de719e6..e58a316 100644
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- module Main where
-@@ -6,2 +7,11 @@ import Data.Encoding.Preprocessor.XMLMappingBuilder
- 
-+#if MIN_VERSION_Cabal(2,2,0)
-+main = defaultMainWithHooks (simpleUserHooks
-+                             {hookedPreProcessors = (("mapping",\_ _ _ -> mappingPreprocessor)
-+                                                     :("mapping2",\_ _ _ -> mappingPreprocessor)
-+                                                     :("xml",\_ _ _ -> xmlPreprocessor)
-+                                                     :(hookedPreProcessors simpleUserHooks)
-+                                                    )
-+                             })
-+#else
- main = defaultMainWithHooks (simpleUserHooks
-@@ -13 +23,2 @@ main = defaultMainWithHooks (simpleUserHooks
-                              })
-+#endif
diff --git a/dev-haskell/encoding/metadata.xml b/dev-haskell/encoding/metadata.xml
deleted file mode 100644
index 91bcaa50b9b3..000000000000
--- a/dev-haskell/encoding/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunatly, there's no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
-	</longdescription>
-	<use>
-		<flag name="systemencoding">Provide the getSystemEncoding action to query the locale.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/entropy/Manifest b/dev-haskell/entropy/Manifest
index 4b09ef3db145..da4dd15454f2 100644
--- a/dev-haskell/entropy/Manifest
+++ b/dev-haskell/entropy/Manifest
@@ -1,3 +1,3 @@
-DIST entropy-0.2.2.4.tar.gz 5107 BLAKE2B 646367fe9c067dae74a132488152ec04f8c3d1e6b58ea900be25c31ca860349a84bd0207723410125e28a84348a5350d986d4c0d3207377a49a09e17797614cb SHA512 257289daadb414ba82d7e18cadfc4e8a654297746984d22a7f202054271f4e19c29d4194cf21b3dadfd06f10d96bc6a29f909d4bd36a98eb18bdae4a13e56b49
-DIST entropy-0.3.7.tar.gz 6498 BLAKE2B 07e73ab051f55b2eebc0b5f3071615869ac447955984dbb8eab45d0fe05401204f4ae7803866ef1952a5bac363c349edb1133fb730557784807978cefee00731 SHA512 920521a35cba9c627ee97daa9675ad1764ac91762800371cc9e491320afeae7994a431ea6938cb7464a0e6affc274a24148c405d7eca2d401d925cc2e2a84f85
+DIST entropy-0.4.1.10-rev1.cabal 2952 BLAKE2B f47134454269b5fbb554feec81ff6eccd66290fedd2615ea424ffe4dbaa955930310c575c64b006e6827586724bdc9358fadaf1f54ecfa0d872b3852556f07d6 SHA512 d384d2aeb12d2484455b4be8ee68f9a29dcdd949e62aa0f9baf81d9326cd189d6938b7baf35b0db0e70e2a954a9677611a6193607ede3366d26351c7ee74efc6
+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
diff --git a/dev-haskell/entropy/entropy-0.2.2.4.ebuild b/dev-haskell/entropy/entropy-0.2.2.4.ebuild
deleted file mode 100644
index 82201d017652..000000000000
--- a/dev-haskell/entropy/entropy-0.2.2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A platform independent entropy source"
-HOMEPAGE="https://github.com/TomMD/entropy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/entropy/entropy-0.3.7.ebuild b/dev-haskell/entropy/entropy-0.3.7.ebuild
deleted file mode 100644
index 11ee6bfa07e5..000000000000
--- a/dev-haskell/entropy/entropy-0.3.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A platform independent entropy source"
-HOMEPAGE="https://github.com/TomMD/entropy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="halvm"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag halvm halvm)
-}
diff --git a/dev-haskell/entropy/entropy-0.4.1.10.ebuild b/dev-haskell/entropy/entropy-0.4.1.10.ebuild
new file mode 100644
index 000000000000..ac64d0821c9e
--- /dev/null
+++ b/dev-haskell/entropy/entropy-0.4.1.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A platform independent entropy source"
+HOMEPAGE="https://github.com/TomMD/entropy"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="donotgetentropy"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0 <dev-haskell/cabal-3.11
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag donotgetentropy donotgetentropy)
+}
diff --git a/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
new file mode 100644
index 000000000000..997952325dbb
--- /dev/null
+++ b/dev-haskell/entropy/entropy-0.4.1.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A platform independent entropy source"
+HOMEPAGE="https://github.com/TomMD/entropy"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="halvm"
+
+RDEPEND=">=dev-lang/ghc-7.10.1:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+CABAL_CHDEPS=(
+	'Cabal >= 1.10 && < 3.3' 'Cabal >= 1.10'
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag halvm halvm)
+}
diff --git a/dev-haskell/entropy/entropy-0.4.1.6.ebuild b/dev-haskell/entropy/entropy-0.4.1.6.ebuild
deleted file mode 100644
index f7b946c45c95..000000000000
--- a/dev-haskell/entropy/entropy-0.4.1.6.ebuild
+++ /dev/null
@@ -1,29 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A platform independent entropy source"
-HOMEPAGE="https://github.com/TomMD/entropy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="halvm"
-
-RDEPEND=">=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0 <dev-haskell/cabal-3.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag halvm halvm)
-}
diff --git a/dev-haskell/entropy/metadata.xml b/dev-haskell/entropy/metadata.xml
index 8df01852a805..9cfa8f15bfcb 100644
--- a/dev-haskell/entropy/metadata.xml
+++ b/dev-haskell/entropy/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A platform independent method to obtain cryptographically strong entropy
-		(RDRAND when available anywhere, urandom on nix, CryptAPI on Windows, patches welcome).
-		Users looking for cryptographically strong (number-theoretically
-		sound) PRNGs should see the 'DRBG' package too.
-	</longdescription>
 	<use>
+		<flag name="donotgetentropy">
+			Avoid use of the getentropy() *nix function. By default
+			getentropy will be used if detected during compilation
+			(this plays poorly with cross compilation).
+		</flag>
 		<flag name="halvm">Build for the HaLVM.</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">entropy</remote-id>
 		<remote-id type="github">TomMD/entropy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/enumerator/Manifest b/dev-haskell/enumerator/Manifest
deleted file mode 100644
index 012687f5d414..000000000000
--- a/dev-haskell/enumerator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST enumerator-0.4.20.tar.gz 53986 BLAKE2B dcb98c31e862194f712c2fe23193557c837d5ba658b89ea50005c2e62d2080d06740793fd4e4629d8dab5000062ef2e3908fea7071ca499e8a2e3f7ca0c1d085 SHA512 90711142b61cee2184420f4d5c9de9563afe6198cccbf5d9d8a75253b307c3df9fee388dc7770e8151f8d7b5570afdb30d8e4e597ce462302dda8430e64050ad
diff --git a/dev-haskell/enumerator/enumerator-0.4.20.ebuild b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
deleted file mode 100644
index c8d35ee60ce3..000000000000
--- a/dev-haskell/enumerator/enumerator-0.4.20.ebuild
+++ /dev/null
@@ -1,30 +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.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reliable, high-performance processing with left-fold enumerators"
-HOMEPAGE="https://john-millikin.com/software/enumerator/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ghc84.patch
-)
diff --git a/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch b/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch
deleted file mode 100644
index d992228d2e5c..000000000000
--- a/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/enumerator.cabal
-+++ b/enumerator.cabal
-@@ -152,2 +152,5 @@ library
- 
-+  if !impl(ghc >= 8.0)
-+    build-depends: semigroups == 0.18.*
-+
-   exposed-modules:
---- a/lib/Data/Enumerator/Internal.hs
-+++ b/lib/Data/Enumerator/Internal.hs
-@@ -50,2 +50,3 @@ import           Data.Function (fix)
- import           Data.Monoid (Monoid, mempty, mappend, mconcat)
-+import qualified Data.Semigroup as S
- 
-@@ -73,2 +74,6 @@ instance Monad Stream where
- 
-+instance S.Semigroup (Stream a) where
-+	(<>) (Chunks xs) (Chunks ys) = Chunks (xs ++ ys)
-+	(<>) _ _ = EOF
-+
- instance Monoid (Stream a) where
diff --git a/dev-haskell/enumerator/metadata.xml b/dev-haskell/enumerator/metadata.xml
deleted file mode 100644
index 53f0dd6438fd..000000000000
--- a/dev-haskell/enumerator/metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Typical buffer&amp;#x2013;based incremental I/O is based around a single loop,
-		which reads data from some source (such as a socket or file), transforms
-		it, and generates one or more outputs (such as a line count, HTTP
-		responses, or modified file). Although efficient and safe, these loops are
-		all single&amp;#x2013;purpose; it is difficult or impossible to compose
-		buffer&amp;#x2013;based processing loops.
-		
-		Haskell&amp;#x2019;s concept of &amp;#x201C;lazy I/O&amp;#x201D; allows pure code to
-		operate on data from an external source. However, lazy I/O has several
-		shortcomings. Most notably, resources such as memory and file handles can
-		be retained for arbitrarily long periods of time, causing unpredictable
-		performance and error conditions.
-		
-		Enumerators are an efficient, predictable, and safe alternative to lazy
-		I/O. Discovered by Oleg Kiselyov, they allow large datasets to be processed
-		in near&amp;#x2013;constant space by pure code. Although somewhat more complex
-		to write, using enumerators instead of lazy I/O produces more correct
-		programs.
-		
-		This library contains an enumerator implementation for Haskell, designed to
-		be both simple and efficient. Three core types are defined, along with
-		numerous helper functions:
-		
-		* /Iteratee/: Data sinks, analogous to left folds. Iteratees consume
-		a sequence of /input/ values, and generate a single /output/ value.
-		Many iteratees are designed to perform side effects (such as printing to
-		@stdout@), so they can also be used as monad transformers.
-		
-		* /Enumerator/: Data sources, which generate input sequences. Typical
-		enumerators read from a file handle, socket, random number generator, or
-		other external stream. To operate, enumerators are passed an iteratee, and
-		provide that iteratee with input until either the iteratee has completed its
-		computation, or EOF.
-		
-		* /Enumeratee/: Data transformers, which operate as both enumerators and
-		iteratees. Enumeratees read from an /outer/ enumerator, and provide the
-		transformed data to an /inner/ iteratee.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/equivalence/Manifest b/dev-haskell/equivalence/Manifest
deleted file mode 100644
index f2815da4205f..000000000000
--- a/dev-haskell/equivalence/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST equivalence-0.2.5.tar.gz 8013 BLAKE2B c5485fd7a8d4dd047b743c2821cd71fb8b5b278c10f47cd27d23b96286a6edb1675568b721f93d8ff06ba6aaee3f268db177eff7cd01ed825392cd9805f58600 SHA512 6417a8698826458b172fc5556b472f5ae06b29a8d2b54e7ea10d6665eb7a1691dc9d92d56a1b93b43d4ef3f71188b8878f8a43a123c9b6ad3641e4848a20d676
-DIST equivalence-0.3.1.tar.gz 8350 BLAKE2B 2c2b929f6abe9b38d834d854f3144a60e7173d7f4fdc30aab39050d7f054165da4f457b3aeba213e9d5508422dd4ba9d3b0311767bcd15e3bd9570f024979f6d SHA512 5d6f6adc2d31c48520c2120503b4a21e18044dbe75f3dddd5af188213887c714370b09c776c44c2eaabf41226719f6eb6f6bbc04eab558879d61157a67b2549e
-DIST equivalence-0.3.5.tar.gz 8313 BLAKE2B 779fb3c57f7a9f06f18349b94d6afbcca8aa442af1426a513f47718bbf76e9202f10fb6f76cff693f8e9fe72b68bd04a1198d9ef52643dce6049e010384b3ac2 SHA512 f8a073c9ddc49a8c1d60a280b84f97947a23ed6a021b92d4028100ed308cf1dfcd0b26889a6cbbde0e77f00b777b2d1af0fa2410422641e0a03395692a9ebefc
diff --git a/dev-haskell/equivalence/equivalence-0.2.5.ebuild b/dev-haskell/equivalence/equivalence-0.2.5.ebuild
deleted file mode 100644
index b2771673c6e7..000000000000
--- a/dev-haskell/equivalence/equivalence-0.2.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Maintaining an equivalence relation implemented as union-find using STT"
-HOMEPAGE="https://bitbucket.org/paba/equivalence/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/stmonadtrans:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/equivalence/equivalence-0.3.1.ebuild b/dev-haskell/equivalence/equivalence-0.3.1.ebuild
deleted file mode 100644
index dfd7af2d5e21..000000000000
--- a/dev-haskell/equivalence/equivalence-0.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Maintaining an equivalence relation implemented as union-find using STT"
-HOMEPAGE="https://bitbucket.org/paba/equivalence/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0.1:=[profile?]
-	dev-haskell/stmonadtrans:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/equivalence/equivalence-0.3.5.ebuild b/dev-haskell/equivalence/equivalence-0.3.5.ebuild
deleted file mode 100644
index a0f7e03b7d52..000000000000
--- a/dev-haskell/equivalence/equivalence-0.3.5.ebuild
+++ /dev/null
@@ -1,29 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Maintaining an equivalence relation implemented as union-find using STT"
-HOMEPAGE="https://github.com/pa-ba/equivalence"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?]
-	>=dev-haskell/stmonadtrans-0.4.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2 )
-"
diff --git a/dev-haskell/equivalence/metadata.xml b/dev-haskell/equivalence/metadata.xml
deleted file mode 100644
index b9608bc6a2af..000000000000
--- a/dev-haskell/equivalence/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is an implementation of Tarjan's Union-Find algorithm (Robert
-		E. Tarjan. "Efficiency of a Good But Not Linear Set Union
-		Algorithm", JACM 22(2), 1975) in order to maintain an equivalence
-		relation.
-		This implementation is a port of the /union-find/ package using the
-		ST monad transformer (instead of the IO monad).
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">paba/equivalence</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/erf/erf-2.0.0.0-r1.ebuild b/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
index 46a80b266a37..2366ffe04800 100644
--- a/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
+++ b/dev-haskell/erf/erf-2.0.0.0-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-# ebuild generated by hackport 0.4.7.9999
+# ebuild generated by hackport 0.8.4.0.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="The error function, erf, and related functions"
 HOMEPAGE="https://hackage.haskell.org/package/erf"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
 "
 DEPEND="${RDEPEND}
-	dev-haskell/cabal
+	>=dev-haskell/cabal-3.0.0.0
 "
diff --git a/dev-haskell/erf/metadata.xml b/dev-haskell/erf/metadata.xml
index e039fc167968..48d1cb487e62 100644
--- a/dev-haskell/erf/metadata.xml
+++ b/dev-haskell/erf/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A type class for the error function, erf, and related functions.
-		Instances for Float and Double.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">erf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/errorcall-eq-instance/Manifest b/dev-haskell/errorcall-eq-instance/Manifest
index 1d433232f833..293974833dd2 100644
--- a/dev-haskell/errorcall-eq-instance/Manifest
+++ b/dev-haskell/errorcall-eq-instance/Manifest
@@ -1,2 +1 @@
-DIST errorcall-eq-instance-0.1.0.tar.gz 1629 BLAKE2B 052a614678a72d1bc5c5b5b71e07a9a51a80247f91256bd247981dda3fb162b7b948104222b4ae43f923feb6ec21035bc73dc0b8405409a3f46e12bcc6648ae5 SHA512 313f3537a927c606aaf9df1078c1da23ea8173f2a06d5c0a834ab6826fd8aea86469ac866bd292d2864afbd228d5b5365929d1c7a09defd3b7f21ac685a4d082
 DIST errorcall-eq-instance-0.3.0.tar.gz 1534 BLAKE2B 6b137de15395742d5c73e1e9f1b06f88109675da701d7d65e40879b844b4ebbe4d8400fec44a12388af3a4ab1dddec30a8365e63eb8f042805ad020a575de325 SHA512 934ee3b3f00d7d32b9aa384a568cfc9c99a3947cb39cdc23495dda21acd0672d6de753b4243f417397738473d091fd14776c21da0dbaa0b40c2b465cde5910a6
diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild
deleted file mode 100644
index f22bdec290c6..000000000000
--- a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An orphan Eq instance for ErrorCall"
-HOMEPAGE="https://hackage.haskell.org/package/errorcall-eq-instance"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.5
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
index ee0328421c71..df97563f60b1 100644
--- a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
+++ b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.3.0.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="An orphan Eq instance for ErrorCall"
-HOMEPAGE="http://hackage.haskell.org/package/errorcall-eq-instance"
+HOMEPAGE="https://hackage.haskell.org/package/errorcall-eq-instance"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/base-orphans:=[profile?]
diff --git a/dev-haskell/errorcall-eq-instance/metadata.xml b/dev-haskell/errorcall-eq-instance/metadata.xml
index 0dc85cfde05d..937381521944 100644
--- a/dev-haskell/errorcall-eq-instance/metadata.xml
+++ b/dev-haskell/errorcall-eq-instance/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Prior to @base-4.7.0.0@ there was no @Eq@ instance for
-		@ErrorCall@.  This package provides an orphan instance.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/errors/Manifest b/dev-haskell/errors/Manifest
index 41f2662adc42..922370452f67 100644
--- a/dev-haskell/errors/Manifest
+++ b/dev-haskell/errors/Manifest
@@ -1,3 +1,2 @@
-DIST errors-1.4.7.tar.gz 7922 BLAKE2B 40bd2019f87df2fae5af82fad574375fed6717787fad84c5da74696c827a954e88059db771a06f07de3ab1b99757d26e4b345f030e3b5f9a5814eb531a0cdb42 SHA512 14873d32c744758000c6c8eb954aa659a57d78a32519d88e80e0f5b34a3f528e64293703da950475d89db2f79a7f2c80bc46a8824fee91cf3fe5668bda22a77c
-DIST errors-2.1.3.tar.gz 8559 BLAKE2B cd350d74d7836432dd5a204a4a3f5fe915a050979fe9053be6282f59f2f77c63159544221541b64aea806fcaeabe5f81ea2196347bb9e422c6c1458f13ff9ed3 SHA512 8950d043b883395a69ccab6b655219d035ff3b4a22911a23d54834642cc5c98b5044b7aee170dd004f86b3b8c7e991ceddfeae87ed592e7d5e1cd6e44c4e0144
+DIST errors-2.3.0-rev4.cabal 1443 BLAKE2B 0aa39605b9138ba7becdbf36a78f761484a4dd11b4674c195f212d35132e2ce7933e197df7b3fdc3c1dbf5e798bca8758af63a1d6b4b1a43a6ff0e9e4ba9f9a3 SHA512 b6253614337376750f886e37e1663097b2a5f434784bf42f42c32eb857f87740f88930e36d34badcb320abf11b71bddcba42570c7222808ecf4ad377d20452c0
 DIST errors-2.3.0.tar.gz 9184 BLAKE2B 7a44adaa0dfb5ba623df16b79db469804def23ea8d00ed2b6cbc5995c75b79ef72de095e333428525a1ac5e24cf7bcc81346eb319ad7d343e5d58af2a8449e2c SHA512 dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4
diff --git a/dev-haskell/errors/errors-1.4.7.ebuild b/dev-haskell/errors/errors-1.4.7.ebuild
deleted file mode 100644
index 53a0223b77cd..000000000000
--- a/dev-haskell/errors/errors-1.4.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simplified error-handling"
-HOMEPAGE="https://hackage.haskell.org/package/errors"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/either-3.1:=[profile?] <dev-haskell/either-5:=[profile?]
-	>=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/errors/errors-2.1.3.ebuild b/dev-haskell/errors/errors-2.1.3.ebuild
deleted file mode 100644
index 923c1fc29908..000000000000
--- a/dev-haskell/errors/errors-2.1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simplified error-handling"
-HOMEPAGE="https://hackage.haskell.org/package/errors"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-haskell/unexceptionalio-0.3:=[profile?] <dev-haskell/unexceptionalio-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/errors/errors-2.3.0-r1.ebuild b/dev-haskell/errors/errors-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..0a31bf09b5d3
--- /dev/null
+++ b/dev-haskell/errors/errors-2.3.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simplified error-handling"
+HOMEPAGE="https://hackage.haskell.org/package/errors"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/safe-0.3.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+"
diff --git a/dev-haskell/errors/errors-2.3.0.ebuild b/dev-haskell/errors/errors-2.3.0.ebuild
index dcf1a2441b49..00e0e7924135 100644
--- a/dev-haskell/errors/errors-2.3.0.ebuild
+++ b/dev-haskell/errors/errors-2.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Simplified error-handling"
-HOMEPAGE="http://hackage.haskell.org/package/errors"
+HOMEPAGE="https://hackage.haskell.org/package/errors"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
diff --git a/dev-haskell/errors/metadata.xml b/dev-haskell/errors/metadata.xml
index 05963a52954f..c409a0d89779 100644
--- a/dev-haskell/errors/metadata.xml
+++ b/dev-haskell/errors/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The one-stop shop for all your error-handling needs!  Just import
-		"Control.Error".
-		
-		This library encourages an error-handling style that directly uses the type
-		system, rather than out-of-band exceptions.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">errors</remote-id>
+		<remote-id type="github">Gabriella439/Haskell-Errors-Library</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/esqueleto/Manifest b/dev-haskell/esqueleto/Manifest
deleted file mode 100644
index 40ce3f71c14b..000000000000
--- a/dev-haskell/esqueleto/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST esqueleto-2.1.3.tar.gz 33024 BLAKE2B 3d028c495f44ba3757ee5b9df463d35c4fad382ad4cb980877cd6589981dd0e2fb219944830e0a3d1f5426e9773416178b3781b1aaee340cb8b491549689af15 SHA512 b0508daec0f248458581155c731d307f039d04fae7e76697d2a8bb8498a5072b31499d1d3b041314b34b4034e4357e10323483d04f7ce3218da7489a00683fbc
-DIST esqueleto-2.4.3.tar.gz 39664 BLAKE2B 03f56caca53815bf751503eaba55d0c6c225d9bcd2751371aeadaa1244c90649babf7cc2f05f8dcc2206fc5a7e235de14c11cde3f246c1fb78967defe566cc88 SHA512 50ad774bbd83c587775887320e24b329b575c9b3dad5aed920d83da7b8e5fa259624c38a40c457a3c12258e2b34cce39042c1b33002a06dcd3020bf370a06cbb
diff --git a/dev-haskell/esqueleto/esqueleto-2.1.3.ebuild b/dev-haskell/esqueleto/esqueleto-2.1.3.ebuild
deleted file mode 100644
index 42e87d5e7c41..000000000000
--- a/dev-haskell/esqueleto/esqueleto-2.1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -mysql,-postgresql
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe EDSL for SQL queries on persistent backends"
-HOMEPAGE="https://github.com/prowdsponsor/esqueleto"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests hang
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	>=dev-haskell/persistent-2.1.1.7:=[profile?] <dev-haskell/persistent-2.2:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/tagged-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/hunit
-		dev-haskell/monad-control
-		>=dev-haskell/monad-logger-0.3
-		>=dev-haskell/persistent-sqlite-2.1 <dev-haskell/persistent-sqlite-2.2
-		>=dev-haskell/persistent-template-2.1 <dev-haskell/persistent-template-2.2
-		dev-haskell/quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mysql \
-		--flag=-postgresql
-}
diff --git a/dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild b/dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild
deleted file mode 100644
index 7fc3760619cc..000000000000
--- a/dev-haskell/esqueleto/esqueleto-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -mysql,-postgresql
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe EDSL for SQL queries on persistent backends"
-HOMEPAGE="https://github.com/prowdsponsor/esqueleto"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-html:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	>=dev-haskell/persistent-2.1.1.7:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/tagged-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/hunit
-		dev-haskell/monad-control
-		>=dev-haskell/monad-logger-0.3
-		>=dev-haskell/persistent-sqlite-2.1
-		>=dev-haskell/persistent-template-2.1
-		dev-haskell/quickcheck )
-"
-
-PATCHES=("${FILESDIR}"/${P}-persistent-2.5.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mysql \
-		--flag=-postgresql
-}
diff --git a/dev-haskell/esqueleto/files/esqueleto-2.4.3-persistent-2.5.patch b/dev-haskell/esqueleto/files/esqueleto-2.4.3-persistent-2.5.patch
deleted file mode 100644
index ebff5cb0bd9a..000000000000
--- a/dev-haskell/esqueleto/files/esqueleto-2.4.3-persistent-2.5.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 675018c54227ce5db4a91a153092d5f4d06f9af0 Mon Sep 17 00:00:00 2001
-From: Paul Rouse <pgr@doynton.org>
-Date: Thu, 9 Jun 2016 20:25:34 +0100
-Subject: [PATCH 1/3] Changes for persistent-2.5
-
----
- esqueleto.cabal                                     |  2 +-
- src/Database/Esqueleto.hs                           |  8 ++++----
- src/Database/Esqueleto/Internal/Language.hs         | 15 +++++----------
- src/Database/Esqueleto/Internal/PersistentImport.hs | 12 +++++++++++-
- test/Test.hs                                        |  8 ++++----
- 5 files changed, 25 insertions(+), 20 deletions(-)
-
-diff --git a/esqueleto.cabal b/esqueleto.cabal
-index 65aa237..1768d2d 100644
---- a/esqueleto.cabal
-+++ b/esqueleto.cabal
-@@ -66,7 +66,7 @@ library
-       base                 >= 4.5     && < 4.9
-     , bytestring
-     , text                 >= 0.11    && < 1.3
--    , persistent           >= 2.1.1.7 && < 2.3
-+    , persistent           >= 2.1.1.7
-     , transformers         >= 0.2
-     , unordered-containers >= 0.2
-     , tagged               >= 0.2
-diff --git a/src/Database/Esqueleto.hs b/src/Database/Esqueleto.hs
-index eb135c2..97e3211 100644
---- a/src/Database/Esqueleto.hs
-+++ b/src/Database/Esqueleto.hs
-@@ -430,8 +430,8 @@ valJ = val . unValue
- 
- -- | Synonym for 'Database.Persist.Store.delete' that does not
- -- clash with @esqueleto@'s 'delete'.
--deleteKey :: ( PersistStore (PersistEntityBackend val)
--             , MonadIO m
--             , PersistEntity val )
--          => Key val -> ReaderT (PersistEntityBackend val) m ()
-+deleteKey :: ( PersistStore backend
-+             , PersistRecordBackend val backend
-+             , MonadIO m )
-+          => Key val -> ReaderT backend m ()
- deleteKey = Database.Persist.delete
-diff --git a/src/Database/Esqueleto/Internal/Language.hs b/src/Database/Esqueleto/Internal/Language.hs
-index fbe88e2..ab18999 100644
---- a/src/Database/Esqueleto/Internal/Language.hs
-+++ b/src/Database/Esqueleto/Internal/Language.hs
-@@ -74,13 +74,11 @@ class (Functor query, Applicative query, Monad query) =>
-   --   In the end, 'fromFinish' is called to materialize the
-   --   @JOIN@.
-   fromStart
--    :: ( PersistEntity a
--       , PersistEntityBackend a ~ backend )
-+    :: PersistRecordBackend a backend
-     => query (expr (PreprocessedFrom (expr (Entity a))))
-   -- | (Internal) Same as 'fromStart', but entity may be missing.
-   fromStartMaybe
--    :: ( PersistEntity a
--       , PersistEntityBackend a ~ backend )
-+    :: PersistRecordBackend a backend
-     => query (expr (PreprocessedFrom (expr (Maybe (Entity a)))))
-   -- | (Internal) Do a @JOIN@.
-   fromJoin
-@@ -926,8 +924,7 @@ class ToBaseId ent where
- -- @
- -- person
- --   :: ( Esqueleto query expr backend
----      , PersistEntity Person
----      , PersistEntityBackend Person ~ backend
-+--      , PersistRecordBackend Person backend
- --      ) => expr (Entity Person)
- -- (person, blogPost)
- --   :: (...) => (expr (Entity Person), expr (Entity BlogPost))
-@@ -1054,14 +1051,12 @@ class Esqueleto query expr backend => FromPreprocess query expr backend a where
-   fromPreprocess :: query (expr (PreprocessedFrom a))
- 
- instance ( Esqueleto query expr backend
--         , PersistEntity val
--         , PersistEntityBackend val ~ backend
-+         , PersistRecordBackend val backend
-          ) => FromPreprocess query expr backend (expr (Entity val)) where
-   fromPreprocess = fromStart
- 
- instance ( Esqueleto query expr backend
--         , PersistEntity val
--         , PersistEntityBackend val ~ backend
-+         , PersistRecordBackend val backend
-          ) => FromPreprocess query expr backend (expr (Maybe (Entity val))) where
-   fromPreprocess = fromStartMaybe
- 
-diff --git a/src/Database/Esqueleto/Internal/PersistentImport.hs b/src/Database/Esqueleto/Internal/PersistentImport.hs
-index ad193e0..02fbd20 100644
---- a/src/Database/Esqueleto/Internal/PersistentImport.hs
-+++ b/src/Database/Esqueleto/Internal/PersistentImport.hs
-@@ -1,7 +1,13 @@
-+{-# LANGUAGE CPP                        #-}
-+{-# LANGUAGE ConstraintKinds            #-}
-+{-# LANGUAGE TypeFamilies               #-}
- -- | Re-export "Database.Persist.Sql" without any clashes with
- -- @esqueleto@.
- module Database.Esqueleto.Internal.PersistentImport
-   ( module Database.Persist.Sql
-+#if ! MIN_VERSION_persistent(2,5,0)
-+    , PersistRecordBackend
-+#endif
-   ) where
- 
- import Database.Persist.Sql hiding
-@@ -10,4 +16,8 @@ import Database.Persist.Sql hiding
-   , selectKeysList, deleteCascadeWhere, (=.), (+=.), (-=.), (*=.), (/=.)
-   , (==.), (!=.), (<.), (>.), (<=.), (>=.), (<-.), (/<-.), (||.)
-   , listToJSON, mapToJSON, getPersistMap, limitOffsetOrder, selectSource
--  , update )
-+  , update, count )
-+
-+#if ! MIN_VERSION_persistent(2,5,0)
-+type PersistRecordBackend record backend = (PersistEntity record, PersistEntityBackend record ~ backend)
-+#endif
-diff --git a/test/Test.hs b/test/Test.hs
-index 80c6784..524bd7c 100644
---- a/test/Test.hs
-+++ b/test/Test.hs
-@@ -1396,10 +1396,10 @@ main = do
- 
- 
- insert' :: ( Functor m
--           , PersistStore (PersistEntityBackend val)
--           , MonadIO m
--           , PersistEntity val )
--        => val -> ReaderT (PersistEntityBackend val) m (Entity val)
-+           , PersistStore backend
-+           , PersistRecordBackend val backend
-+           , MonadIO m )
-+        => val -> ReaderT backend m (Entity val)
- insert' v = flip Entity v <$> insert v
- 
- 
--- 
-2.9.0
-
-From 4c9ecd94f2748be52c50c85ca8ed7314e21b9e82 Mon Sep 17 00:00:00 2001
-From: Paul Rouse <pgr@doynton.org>
-Date: Thu, 9 Jun 2016 20:29:45 +0100
-Subject: [PATCH 2/3] Allow base-4.9 for GHC 8
-
----
- esqueleto.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/esqueleto.cabal b/esqueleto.cabal
-index 1768d2d..3b9efb9 100644
---- a/esqueleto.cabal
-+++ b/esqueleto.cabal
-@@ -63,7 +63,7 @@ library
-   other-modules:
-     Database.Esqueleto.Internal.PersistentImport
-   build-depends:
--      base                 >= 4.5     && < 4.9
-+      base                 >= 4.5     && < 5
-     , bytestring
-     , text                 >= 0.11    && < 1.3
-     , persistent           >= 2.1.1.7 && < 2.6
--- 
-2.9.0
-
diff --git a/dev-haskell/esqueleto/metadata.xml b/dev-haskell/esqueleto/metadata.xml
deleted file mode 100644
index 05174613075d..000000000000
--- a/dev-haskell/esqueleto/metadata.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@persistent@ is a library for type-safe data serialization.  It
-		has many kinds of backends, such as SQL backends
-		(@persistent-mysql@, @persistent-postgresql@,
-		@persistent-sqlite@) and NoSQL backends (@persistent-mongoDB@).
-		
-		While @persistent@ is a nice library for storing and retrieving
-		records, currently it has a poor interface for SQL backends
-		compared to SQL itself.  For example, it's extremely hard to do
-		a type-safe @JOIN@ on a many-to-one relation, and simply
-		impossible to do any other kinds of @JOIN@s (including for the
-		very common many-to-many relations).  Users have the option of
-		writing raw SQL, but that's error prone and not type-checked.
-		
-		@esqueleto@ is a bare bones, type-safe EDSL for SQL queries
-		that works with unmodified @persistent@ SQL backends.  Its
-		language closely resembles SQL, so (a) you don't have to learn
-		new concepts, just new syntax, and (b) it's fairly easy to
-		predict the generated SQL and optimize it for your backend.
-		Most kinds of errors committed when writing SQL are caught as
-		compile-time errors---although it is possible to write
-		type-checked @esqueleto@ queries that fail at runtime.
-		
-		Currently only @SELECT@s are supported.  Not all SQL features
-		are available, but most of them can be easily added (especially
-		functions), so please open an issue or send a pull request if
-		you need anything that is not covered by @esqueleto@ on
-		&lt;https://github.com/meteficha/esqueleto/&gt;.
-		
-		The name of this library means \"skeleton\" in Portuguese and
-		contains all three SQL letters in the correct order =).  It was
-		inspired by Scala's Squeryl but created from scratch.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">prowdsponsor/esqueleto</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/exceptions/Manifest b/dev-haskell/exceptions/Manifest
index 99babdb0d462..d1987ad1ac87 100644
--- a/dev-haskell/exceptions/Manifest
+++ b/dev-haskell/exceptions/Manifest
@@ -1,6 +1,2 @@
+DIST exceptions-0.10.4-rev3.cabal 2796 BLAKE2B c6c3acf942b522666d88467a0b90940d5272568a1eea114c2ac7711b5ebea832e8e5ad3bf220b5270e2898230a890fe598878314e543b2c5d7d59c5abbf1206e SHA512 b49eb865b4f3f12afe0b8b4fb41f50d2f03b47f6a704f026cf34bbe513e7b31510aeec7948e224cef37a2f5261cc27973b920e58201a4a2de8e62ea137828f30
 DIST exceptions-0.10.4.tar.gz 20819 BLAKE2B 16873edfeb540ddf5b950f81772c7d162e3fc37d286dcf6608c4c3017516a4255fb7cad247025aa9b0970508613038a3d0b42eccf22e74a0c4efffdfa22be5d3 SHA512 3df1edb4abab8e2e2dbd7387809d9768efca36c6840225ce33bee8679a4efdcf86d28beafb54a9a40e512163e4d088f94e788341bf614869bbdbd9d701bca4a2
-DIST exceptions-0.3.3.tar.gz 13036 BLAKE2B 021e8c3f40f9ef9a734f8cf0f8491767d4d2c5c1f1b659a089525a346cea7ecb67058f7405d6659361c6d83b76603527dd956e6244843ceeb5b7bd8c6fb0efdd SHA512 3264f78b950a3ea737f577e5ee406bddc1916bf93271ff6e78a477b1575bb105ce0c47324c4f56288a7ef6e7cba398dfb66ea66ee07baf5aaa17012cd6cc4da4
-DIST exceptions-0.6.1.tar.gz 11392 BLAKE2B 6ec2c1b2603da2a33c663996f13b522fad3fd6b8c3683c13c58b07459e03ae67c2cb21cac3114bdc089ba563c9ef8754a187bdbc8a805fa5a041989c7498fde5 SHA512 92413cfa9fccd877303ec4f100c4ac94d3e30df0563600733a940c3a3ee9d4e1e934bd6d09774faed684c8ea9821b8c44cf501cc44fe8c834dd19e2efbed5070
-DIST exceptions-0.8.0.2.tar.gz 12241 BLAKE2B b84c642451fa957cbe23d63b86cee0fdef7977d09dd9bc28f2ba87e81a2e4803dd016951c85ac139b81c584d73893cbdae249504cb6a7457810f3e11f41058ac SHA512 8ed232f97f9d705f694aa9e0261c7920666cb0052d00370883b08fa6f61a97f8b17643512bdda5189760a51b42a9340e153521abafec20d42ffa193f3b0369b3
-DIST exceptions-0.8.2.1.tar.gz 12354 BLAKE2B edff8b7dd4488d4a01fd7d7416106dd130dcd06f86d0a849eda06ab381491c9ba49928d952f46d3af2f77dad14203ed3f401cc258638510b62725186a0ce4380 SHA512 0de9862ea3e71b7511b059c90363856b0ed445bdd6aa24ba39630d31a2cde601ef29f6a8c9f39ef80be7682c6f58a5d74d17552a8f64d544fa67aef6017f254f
-DIST exceptions-0.8.3.tar.gz 12986 BLAKE2B 31ae066b5bc71a01c3542495d5ba1efe379c9d8ea170b5175c94a822c90f859fe5519e1c4747327bea19ebe4fa2e16953546b7208f3ea21e231849ae44ed676d SHA512 1b650d979e27c3307a7b58ea09fe19bfd97a35fb75aa526237cfe4fe68c99560794dc8985b601da1fc6cefb8358c76f60df822b709c621172785343233cee89a
diff --git a/dev-haskell/exceptions/exceptions-0.10.4-r3.ebuild b/dev-haskell/exceptions/exceptions-0.10.4-r3.ebuild
new file mode 100644
index 000000000000..a86f8a666f65
--- /dev/null
+++ b/dev-haskell/exceptions/exceptions-0.10.4-r3.ebuild
@@ -0,0 +1,37 @@
+# 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=3
+
+# Disable test suite on bundled packages (haskell-cabal.eclass won't allow them
+# to be rebuilt because of CABAL_CORE_LIB_GHC_PV)
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test"
+
+DESCRIPTION="Extensible optionally-pure exceptions"
+HOMEPAGE="https://github.com/ekmett/exceptions/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+#	test? (
+#		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.15
+#		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+#		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+#		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4
+#	)
+
+CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7 9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/exceptions/exceptions-0.10.4.ebuild b/dev-haskell/exceptions/exceptions-0.10.4.ebuild
deleted file mode 100644
index 073b42171f4b..000000000000
--- a/dev-haskell/exceptions/exceptions-0.10.4.ebuild
+++ /dev/null
@@ -1,41 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.15
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.10.1"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck                 >= 2.5      && < 2.14' 'QuickCheck                 >= 2.5'
-}
diff --git a/dev-haskell/exceptions/exceptions-0.3.3.ebuild b/dev-haskell/exceptions/exceptions-0.3.3.ebuild
deleted file mode 100644
index 7530900570d1..000000000000
--- a/dev-haskell/exceptions/exceptions-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.7
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/exceptions/exceptions-0.6.1.ebuild b/dev-haskell/exceptions/exceptions-0.6.1.ebuild
deleted file mode 100644
index e1b21da7e1ea..000000000000
--- a/dev-haskell/exceptions/exceptions-0.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/exceptions/exceptions-0.8.0.2.ebuild b/dev-haskell/exceptions/exceptions-0.8.0.2.ebuild
deleted file mode 100644
index 01cccef4e727..000000000000
--- a/dev-haskell/exceptions/exceptions-0.8.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.5:2
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck                 >= 2.5      && < 2.8' 'QuickCheck                 >= 2.5'
-}
diff --git a/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild b/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild
deleted file mode 100644
index 58c336f452fb..000000000000
--- a/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/exceptions/exceptions-0.8.3.ebuild b/dev-haskell/exceptions/exceptions-0.8.3.ebuild
deleted file mode 100644
index a0948f27c3c9..000000000000
--- a/dev-haskell/exceptions/exceptions-0.8.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extensible optionally-pure exceptions"
-HOMEPAGE="https://github.com/ekmett/exceptions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/exceptions/metadata.xml b/dev-haskell/exceptions/metadata.xml
index 11d542dedfa3..ae412adc8134 100644
--- a/dev-haskell/exceptions/metadata.xml
+++ b/dev-haskell/exceptions/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Extensible optionally-pure exceptions
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">exceptions</remote-id>
 		<remote-id type="github">ekmett/exceptions</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/executable-path/Manifest b/dev-haskell/executable-path/Manifest
deleted file mode 100644
index 411b31d625d3..000000000000
--- a/dev-haskell/executable-path/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST executable-path-0.0.3.1.tar.gz 6658 BLAKE2B 2671aa3b98c019785501ad853ed883e8f8a9572b6c5d847a5f0684d5203e07807562c6feb97085ccaec17ab5ff54d320b430e8c4e55bd99d55916653be2d6328 SHA512 e11e3a1fcc8a987c8720b80e6bc61eb9f61a6319d9d0cc88c841ef293aa9e51f7fbcbad2aa4beb52d50fed5148545591dc0627cc82c9b78b9990e038c9c3d020
-DIST executable-path-0.0.3.tar.gz 6619 BLAKE2B 2b452d57c6b9aa64b8ebfd98e19c816afd377ba8a7bda5a23f9e346395bed326775682922d1fcfdf2350cad73cd6ac1f2c21df515d912138985768e1f00d2fb9 SHA512 96be7d997648226d549f80bac2bf49ffb2cf4043cf6ed9a9b175520df9d851599ec1b5f5c60a6ff8d12dadc1037193cebb2d5e0c956433e90cb3d023a46fa987
diff --git a/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild b/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild
deleted file mode 100644
index 213280bd2df8..000000000000
--- a/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Finding out the full path of the executable"
-HOMEPAGE="http://code.haskell.org/~bkomuves/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild b/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
deleted file mode 100644
index 316dc45be5f7..000000000000
--- a/dev-haskell/executable-path/executable-path-0.0.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Finding out the full path of the executable"
-HOMEPAGE="http://code.haskell.org/~bkomuves/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/executable-path/metadata.xml b/dev-haskell/executable-path/metadata.xml
deleted file mode 100644
index 4401a3b26987..000000000000
--- a/dev-haskell/executable-path/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The documentation of "System.Environment.getProgName" says that
-		\"However, this is hard-to-impossible to implement on some non-Unix OSes,
-		so instead, for maximum portability, we just return the leafname
-		of the program as invoked.\"
-		This library tries to provide the missing path.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
index b92a92af0dba..2441d247fe37 100644
--- a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
+++ b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,11 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3"
+	>=dev-haskell/cabal-1.2
+"
 
 CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1 7.4.2"
diff --git a/dev-haskell/extensible-exceptions/metadata.xml b/dev-haskell/extensible-exceptions/metadata.xml
index 75ba039e9bde..937381521944 100644
--- a/dev-haskell/extensible-exceptions/metadata.xml
+++ b/dev-haskell/extensible-exceptions/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides extensible exceptions for both new and
-		old versions of GHC (i.e., &lt; 6.10).
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest
index 0951e4828d9d..dceeec947cee 100644
--- a/dev-haskell/extra/Manifest
+++ b/dev-haskell/extra/Manifest
@@ -1,5 +1,2 @@
-DIST extra-1.3.1.tar.gz 30439 BLAKE2B d1a550e8e09376490c25497ace158418679a971e3d0113f727b3815f80b20b20a85ed87349302d6065d5af7c930adaba2f26fb939952ff06b01cfa2355025ad7 SHA512 d6e736a021ee39139855516647b91a328e8ff075b94bdcc84c1296586d9f58a20819fcf78a45bd0fc9b3e9516780c68fb27ec0dc406964b6d9d5c93e26bfc9c5
-DIST extra-1.4.10.tar.gz 34981 BLAKE2B e1601f3d6f782a3b0138fa47929afb2bd2fef74305c4e6f8d41aea9eb12c00975da9a3edb200f4ff4e613c049f08239c993ebc11eca600992d831ed54a59058d SHA512 16b7bbe3944d7013a54dfe629f997bb46a24c9b933a6be9570cd86f6b1bace9c001acb0b5b8d92ddf50aa21ca67d5694d3705029116644012345d20f1e3386fd
-DIST extra-1.4.2.tar.gz 31311 BLAKE2B 4039e3c0ca573d782a4bc6db2d892d22ffcc5e012e752f065c9f98d6e580a5b43e772e49345681bb9a31ef9679295d459aceadbca9bf79b4f496b8a1a7b08e8e SHA512 5d0c5ee70d51fa4d132b5e7813908a65badbf339cfcae4182932933b70cb7b8faf659d22c624086757c38973aeff769b5175bf533bbb51c3ec419ba09bb28409
-DIST extra-1.5.1.tar.gz 35989 BLAKE2B 637533fd0b175892c58b341d5dc8c3d97a28291a638f2cc185a7338077d2f6ced21a1efe0859ee8f4e9fa1636c3f8ef4423c83a0a683a9accd25efd70cafdac9 SHA512 c3a0d7abc589e4a175c5c090b4a850751b0f231a3934db3bb87f4a11044acfcb161aa366789b3c6b5415778578ca126c3469f648fa326fa5ebec0889c59005e8
-DIST extra-1.7.4.tar.gz 42476 BLAKE2B e27eb047546b5fa378916d6c65daea2e40c313a49afb7c78d935b27dc693fbba1e7b82c54d2cc6387eb6808dfef0de51b6b6768e2e91b93d590409a32d308569 SHA512 3161834ea25d3b485432dcab9f4a385a2552fa8d69b5ec198152b3dca08f6ac0ffd42a467e69210c2a1ac5bef7f1c6ff15c61459cb447c125ee240563a748d15
+DIST extra-1.7.10.tar.gz 44872 BLAKE2B cdab5f08bf7f2de216aeacacf994b6008aee91900244101c0a0c1bc78f2fe5fc595d03dcab1a13196b885b639320e00fdb2117f93f85ca037b970a8d6a71f480 SHA512 02ce08f7f22defd1db81bfb407361e18b6d98295f561652880d3ee6e91477a7cd89126cb507e7362fe90ed7b46e57b55400ae0ad94f40de39749926efe3018cd
+DIST extra-1.7.14.tar.gz 45971 BLAKE2B 4ee978204771ad3198fa3b3abf8bc6b63d4be86d7a6b917e8a40a8524c6f947c6ae2298a469c2a4d844e4b0e43ce0cf8a02eb24458dff1b012006331b4d62da7 SHA512 9505a6b2b6aecdb0400a4bdf79e1888a2f5db30242903c50f0653df90960f53b8484ea782cde1e7aa5339bcc6e5b3417aa3494efeafebfa49fe318b57878b00b
diff --git a/dev-haskell/extra/extra-1.3.1.ebuild b/dev-haskell/extra/extra-1.3.1.ebuild
deleted file mode 100644
index f22664d3679f..000000000000
--- a/dev-haskell/extra/extra-1.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-# this package has nothing to do with extra:0 (aka Extra on hackage)
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/extra/extra-1.4.10.ebuild b/dev-haskell/extra/extra-1.4.10.ebuild
deleted file mode 100644
index ada0019eb1b3..000000000000
--- a/dev-haskell/extra/extra-1.4.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/quickcheck )
-"
-
-PATCHES=("${FILESDIR}"/${P}-QC-2.9.patch)
diff --git a/dev-haskell/extra/extra-1.4.2.ebuild b/dev-haskell/extra/extra-1.4.2.ebuild
deleted file mode 100644
index 5b0daf5218d5..000000000000
--- a/dev-haskell/extra/extra-1.4.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-# this package has nothing to do with extra:0 (aka Extra on hackage)
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/extra/extra-1.5.1.ebuild b/dev-haskell/extra/extra-1.5.1.ebuild
deleted file mode 100644
index 9e12544fa3f4..000000000000
--- a/dev-haskell/extra/extra-1.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( >=dev-haskell/quickcheck-2.9 )
-"
diff --git a/dev-haskell/extra/extra-1.7.10.ebuild b/dev-haskell/extra/extra-1.7.10.ebuild
new file mode 100644
index 000000000000..ca17f8702594
--- /dev/null
+++ b/dev-haskell/extra/extra-1.7.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra functions I use"
+HOMEPAGE="https://github.com/ndmitchell/extra#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+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
+		>=dev-haskell/quickcheck-instances-0.3.17 )
+"
diff --git a/dev-haskell/extra/extra-1.7.14.ebuild b/dev-haskell/extra/extra-1.7.14.ebuild
new file mode 100644
index 000000000000..ad8d56eb55b3
--- /dev/null
+++ b/dev-haskell/extra/extra-1.7.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra functions I use"
+HOMEPAGE="https://github.com/ndmitchell/extra#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/quickcheck-2.10
+		>=dev-haskell/quickcheck-instances-0.3.17 )
+"
diff --git a/dev-haskell/extra/extra-1.7.4.ebuild b/dev-haskell/extra/extra-1.7.4.ebuild
deleted file mode 100644
index fdfa34438d33..000000000000
--- a/dev-haskell/extra/extra-1.7.4.ebuild
+++ /dev/null
@@ -1,27 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extra functions I use"
-HOMEPAGE="https://github.com/ndmitchell/extra#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/quickcheck-2.10
-		>=dev-haskell/quickcheck-instances-0.3.17 )
-"
diff --git a/dev-haskell/extra/files/extra-1.4.10-QC-2.9.patch b/dev-haskell/extra/files/extra-1.4.10-QC-2.9.patch
deleted file mode 100644
index 14b861060b18..000000000000
--- a/dev-haskell/extra/files/extra-1.4.10-QC-2.9.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/test/TestUtil.hs b/test/TestUtil.hs
-index 87f3417..cda262f 100644
---- a/test/TestUtil.hs
-+++ b/test/TestUtil.hs
-@@ -72,3 +72,5 @@ instance Testable () where
-     property = property . (`seq` True)
-+#if ! MIN_VERSION_QuickCheck(2,9,0)
-     exhaustive _ = True
-+#endif
- 
-@@ -76,3 +78,6 @@ instance Testable a => Testable (IO a) where
-     property = property . unsafePerformIO
-+#if ! MIN_VERSION_QuickCheck(2,9,0)
-     exhaustive = exhaustive . unsafePerformIO
-+#endif
-+
- 
-@@ -107,3 +112,5 @@ instance Arbitrary DiffTime where
- 
-+#if ! MIN_VERSION_QuickCheck(2,9,2)
- instance Arbitrary Version where
-     arbitrary = makeVersion . map abs <$> listOf1 arbitrary
-+#endif
diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml
index 7bcf2b68f1eb..32e763f92ad8 100644
--- a/dev-haskell/extra/metadata.xml
+++ b/dev-haskell/extra/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="hackage">extra</remote-id>
 		<remote-id type="github">ndmitchell/extra</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild
index f5bb54330f1d..c09d8ed3be50 100644
--- a/dev-haskell/fail/fail-4.9.0.0.ebuild
+++ b/dev-haskell/fail/fail-4.9.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.4.7.9999
 
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/fail/metadata.xml b/dev-haskell/fail/metadata.xml
index 498e6ece3d08..6ffb84f3d466 100644
--- a/dev-haskell/fail/metadata.xml
+++ b/dev-haskell/fail/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		This package contains the &quot;Control.Monad.Fail&quot; module providing the
+		This package contains the "Control.Monad.Fail" module providing the
 		&lt;https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail MonadFail&gt;
 		class that became available in
 		&lt;https://hackage.haskell.org/package/base-4.9.0.0 base-4.9.0.0&gt;
 		for older @base@ package versions.
 		
 		This package turns into an empty package when used with GHC versions
-		which already provide the &quot;Control.Monad.Fail&quot; module to make way for
-		GHC&#39;s own &quot;Control.Monad.Fail&quot; module.
+		which already provide the "Control.Monad.Fail" module to make way for
+		GHC's own "Control.Monad.Fail" module.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/failure/Manifest b/dev-haskell/failure/Manifest
deleted file mode 100644
index d23c530c55a2..000000000000
--- a/dev-haskell/failure/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST failure-0.2.0.3.tar.gz 1797 BLAKE2B a25a3276cdd8c5f68be61effb2f65a94fe1ebe612e1aecc3d6dd697e998fb60f81d9e07dfe1e5b57c79da7111a442ac648af4bf55128340350eb1acf3e7088be SHA512 ef8c9904d899381a281ee79235054af6bd156d2b2819e70bcd2a122c1c505c10311189f9280c39bd836c0f3ba35bc7536ce83b58a42978616ebd89c64d692c96
diff --git a/dev-haskell/failure/failure-0.2.0.3.ebuild b/dev-haskell/failure/failure-0.2.0.3.ebuild
deleted file mode 100644
index 93077d2a61c2..000000000000
--- a/dev-haskell/failure/failure-0.2.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple type class for success/failure computations. (deprecated)"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Failure"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/failure/metadata.xml b/dev-haskell/failure/metadata.xml
deleted file mode 100644
index 644669fb8ae7..000000000000
--- a/dev-haskell/failure/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A simple type class for success/failure computations.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/fast-logger/Manifest b/dev-haskell/fast-logger/Manifest
index 6f209e57359f..33f4ba94a9e6 100644
--- a/dev-haskell/fast-logger/Manifest
+++ b/dev-haskell/fast-logger/Manifest
@@ -1,3 +1,2 @@
-DIST fast-logger-2.4.6.tar.gz 9039 BLAKE2B 47923e51c30074bb35194a26c03d2f013f8c5b5b83c0424075dce6575064d0f705f6d71c691b3fd7d7c91d67bf4ea38f6e4056f5f60894c153bd6daff36e0a70 SHA512 724498a0ec9c0774f1be31f36819594e8393eac6667d922a92157ef4725381420095d9fed7bdb1791e0959e800710aa877055847312013249399ccbb9778e283
-DIST fast-logger-2.4.7.tar.gz 9321 BLAKE2B b2f2bb94df6dbed2d9642f15208a46496eb4c6c1a1f82ad27079d8c89768ea5ae4138e8e6727e730efecabb85818dab5907f76c02394fe27118ac1291fd9a144 SHA512 9f9154fb1c9e941ac43bf3064aeebc3b2a845a1eca3d1a62b77f02fd0a9327a459e3a870803c0f1a292294f7e4d7f77b8a9b5a3182873e77e169bd517025dfc4
 DIST fast-logger-3.0.1.tar.gz 11700 BLAKE2B 8544f6c131822b39c2583c02554de4ca5cd08865e8f963406d035257eb59bbc27867b70282d5c3cef385873a7b6e7bf88d4baeb1edf77055752704fdf422cc44 SHA512 e646840b50496e86c24753267e0c0c7b0ff3a619032f69881d63e19c17394d2c5b248cb6b7f752100b253f58d7f493aac9ac77a754736474fbd83fe95ab9f6fd
+DIST fast-logger-3.2.2.tar.gz 14570 BLAKE2B 95eddb0117bfa564781c0d821569d71a86bc4ebfee2a23fdffbd5246164fd5da099d53222f307ce7506001bc169e80da6b3cd9bba77115d377294aee850393db SHA512 2a132b3c6eea08a127ad32d376ea749e1efc9fb7a9dc08272dd21945e3c6c5a966a73afb3ed13a1f427d5a63d5c6846cd3a025f9e7eb2c1a347c0c57d916bd3e
diff --git a/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild b/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
deleted file mode 100644
index 9c82e0333464..000000000000
--- a/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast logging system"
-HOMEPAGE="https://hackage.haskell.org/package/fast-logger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/easy-file-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unix-time-0.2.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/fast-logger/fast-logger-2.4.7.ebuild b/dev-haskell/fast-logger/fast-logger-2.4.7.ebuild
deleted file mode 100644
index 6fb88899cb1d..000000000000
--- a/dev-haskell/fast-logger/fast-logger-2.4.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast logging system"
-HOMEPAGE="https://github.com/kazu-yamamoto/logger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/easy-file-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unix-time-0.2.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild b/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
index 511958b15561..3e5c4a811bed 100644
--- a/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
+++ b/dev-haskell/fast-logger/fast-logger-3.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
diff --git a/dev-haskell/fast-logger/fast-logger-3.2.2.ebuild b/dev-haskell/fast-logger/fast-logger-3.2.2.ebuild
new file mode 100644
index 000000000000..4e863134563a
--- /dev/null
+++ b/dev-haskell/fast-logger/fast-logger-3.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast logging system"
+HOMEPAGE="https://github.com/kazu-yamamoto/logger"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
+	>=dev-haskell/easy-file-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-haskell/unix-time-0.4.4:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/async
+		dev-haskell/hspec )
+"
diff --git a/dev-haskell/fast-logger/metadata.xml b/dev-haskell/fast-logger/metadata.xml
index 7835967339fe..841e5340ab1d 100644
--- a/dev-haskell/fast-logger/metadata.xml
+++ b/dev-haskell/fast-logger/metadata.xml
@@ -1,14 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		A fast logging system
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">fast-logger</remote-id>
 		<remote-id type="github">kazu-yamamoto/logger</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/fclabels/Manifest b/dev-haskell/fclabels/Manifest
deleted file mode 100644
index 4c0e6417c89d..000000000000
--- a/dev-haskell/fclabels/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fclabels-2.0.2.3.tar.gz 22787 BLAKE2B f07d4c04e92b5a127e578fe6bb81581c51b0c1856ded72fd5f34f6662ec792324e19ba62a7ebaaaf3bb80e80548af6328149212b9bb2d528a074b31e24710b4e SHA512 54e6391ec9fa3c3032c9609a1df0f2082947342a6ea48f3378686eec5bf14bc29ca2f7243ab74fa69b2b18a0749ab40417f59e7338cb5fdc1c4404fb00b6dd7d
-DIST fclabels-2.0.3.1.tar.gz 24536 BLAKE2B f917c7c382979f5fac26c4637f8c0ea979acf9814abf3ba4751c77af68c6bbf2a8f68744478e8d734ce2c1dc105ce6678c45bc49abe5fb81ea921bc3c13a3f52 SHA512 031e86184c363188ff638f51fa4fa0b7a8fcfc2ffd76013694a56488e938c7bd7dcfe1b3cdd7fec95c69ccc4eedf9a1d0fba11318ac3022358d16d201fe3d98d
-DIST fclabels-2.0.3.3.tar.gz 24714 BLAKE2B 2bba8892bdacd87fda89106b60752714edd8d2bf15abffe0f1e8cd0b6d17f18f4313e1adbb8c1307de71927936208e65225f9a49b73389f15f1ea9cfccbe82a4 SHA512 0c0f7ed886b65a80aea4e19b5763d7b91ce948b63f86d507ecf0b6874716a190752e0806957c71e0ed0ed97422ba3d09a2be0c82588c8dabfd647474c1a33cff
-DIST fclabels-2.0.3.tar.gz 24475 BLAKE2B cb7455c9d3a55e0d3902b176d4b156fb34e40516d853591d2da1538675c7b6a99245da82ebc83692d40fc38e13e62cf7fa2b2605d3bcebe90a16b79e0f79ef44 SHA512 efc203a90eae0e3ff23b977c642009281fc46724735c646638a312788df5edd1adc9f62d1199fe5b4260cf4dce2e55b6eb3999d8f31aec8b2e952e8fbfea1b90
diff --git a/dev-haskell/fclabels/fclabels-2.0.2.3.ebuild b/dev-haskell/fclabels/fclabels-2.0.2.3.ebuild
deleted file mode 100644
index d77af38119dc..000000000000
--- a/dev-haskell/fclabels/fclabels-2.0.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="First class accessor labels implemented as lenses"
-HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 )
-"
diff --git a/dev-haskell/fclabels/fclabels-2.0.3.1.ebuild b/dev-haskell/fclabels/fclabels-2.0.3.1.ebuild
deleted file mode 100644
index d02f415cca90..000000000000
--- a/dev-haskell/fclabels/fclabels-2.0.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="First class accessor labels implemented as lenses"
-HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.5 )
-"
diff --git a/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild b/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
deleted file mode 100644
index f9cd7dee05f4..000000000000
--- a/dev-haskell/fclabels/fclabels-2.0.3.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="First class accessor labels implemented as lenses"
-HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base             >= 4.5 && < 4.12' 'base             >= 4.5' \
-		'HUnit            >= 1.2 && < 1.7' 'HUnit            >= 1.2' \
-		'template-haskell >= 2.2 && < 2.14' 'template-haskell >= 2.2'
-}
diff --git a/dev-haskell/fclabels/fclabels-2.0.3.ebuild b/dev-haskell/fclabels/fclabels-2.0.3.ebuild
deleted file mode 100644
index fb83969bc950..000000000000
--- a/dev-haskell/fclabels/fclabels-2.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="First class accessor labels implemented as lenses"
-HOMEPAGE="https://github.com/sebastiaanvisser/fclabels"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 )
-"
diff --git a/dev-haskell/fclabels/metadata.xml b/dev-haskell/fclabels/metadata.xml
deleted file mode 100644
index 84d3d0c77894..000000000000
--- a/dev-haskell/fclabels/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides first class labels that can act as
-		bidirectional record fields. The labels can be derived
-		automatically using Template Haskell which means you don't have
-		to write any boilerplate yourself. The labels are implemented as
-		lenses and are fully composable. Labels can be used to /get/,
-		/set/ and /modify/ parts of a datatype in a consistent way.
-		
-		See "Data.Label" for an introductory explanation.
-		
-		Internally lenses are not tied to Haskell functions directly,
-		but are implemented as arrows. Arrows allow the lenses to be run
-		in custom computational contexts. This approach allows us to
-		make partial lenses that point to fields of multi-constructor
-		datatypes in an elegant way.
-		
-		See the "Data.Label.Maybe" module for the use of partial labels.
-		
-		&gt; 1.0.3 -&gt; 1.0.4
-		&gt;   - Bugfix to compile on GHC 6.12 again.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sebastiaanvisser/fclabels</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
index 5c61b57a2dcb..f7426ecf651d 100644
--- a/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
+++ b/dev-haskell/fdo-notify/fdo-notify-0.3.1.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Desktop Notifications client"
-HOMEPAGE="https://bitbucket.org/taejo/fdo-notify/"
+HOMEPAGE="https://hackage.haskell.org/package/fdo-notify"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/dbus-0.10.7:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.1
+	>=dev-haskell/cabal-1.2
 "
diff --git a/dev-haskell/fdo-notify/metadata.xml b/dev-haskell/fdo-notify/metadata.xml
index 55d3ac445104..937381521944 100644
--- a/dev-haskell/fdo-notify/metadata.xml
+++ b/dev-haskell/fdo-notify/metadata.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A library for issuing notifications using FreeDesktop.org's Desktop
-		Notifications protcol. This protocol is supported by services such
-		as Ubuntu's NotifyOSD.
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">taejo/fdo-notify</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/feed/Manifest b/dev-haskell/feed/Manifest
index 5c4615250304..566241aa016a 100644
--- a/dev-haskell/feed/Manifest
+++ b/dev-haskell/feed/Manifest
@@ -1,2 +1,2 @@
-DIST feed-0.3.11.1.tar.gz 101392 BLAKE2B 3a208015edf06255359d7ed2c05191fd01383f35c2d1611176b4ac3c180cb0f9843c0494259d3bc338421cb437028d2fc73a3e1d283486931eb0edbcf381a18c SHA512 29c310c4d206c4a6088c3fcc242faccfa57f8337ecd54b5eee30f892acacadd519d65c66e490b55bd91d0e9a39540ae77a2ed10e8e260e6de750a44ed9132ffc
-DIST feed-1.3.0.1.tar.gz 107230 BLAKE2B 5ed36f28c63e2af4669a37cac0715891b96d37570dfa99404df5764ad1e5b4e512d3d1a54e263c838875cc4a29ce00b3a022b3a2647983cbda4011ba5accd855 SHA512 73662018affac036bcd3c48a8a5b6fcd4e752231d805c12e977c6097a47691c2eca07eb8d6e6840a592bf35892b4b4ec44fb1f73f8a14ecb47fc6904b406f767
+DIST feed-1.3.2.1-rev2.cabal 4607 BLAKE2B fb55afd490af9997dbb17b9b38ef7cdd6d375b62cafd96800af593b6157cc39c7e585ef8c5543151608d22a4332e7c4530e223fc745b60863276990a508c83f2 SHA512 76a02c57cbbbf9bbd4bedef063eb636a029ba32dbff4c580561f6472d6d54d3caf1afe7b98fb2d4423ac9352160cd25b7b1ad965c51f5280ab786b9fc9a4bddb
+DIST feed-1.3.2.1.tar.gz 107015 BLAKE2B 4a40441b17f50b9e7d43aee629fa0bc44f5b5cd1ca6281f3f5a8930b9cc5c2acdbdff05e9db4cc96c0e40681ecb15896655d8bbc708dc0bc4e3734b6e9f563bd SHA512 2175201ff9eaab5732e1c4e8dda6a35e8fa0dea5c58cd379348c97cd61a5eaf76e88f8d58d22df0a4b16681017e7ad01657ad60a63d90dab88df3b644ccb1ea0
diff --git a/dev-haskell/feed/feed-0.3.11.1.ebuild b/dev-haskell/feed/feed-0.3.11.1.ebuild
deleted file mode 100644
index b57be0c960e2..000000000000
--- a/dev-haskell/feed/feed-0.3.11.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
-HOMEPAGE="https://github.com/bergmark/feed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	<dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.2.6:=[profile?] <dev-haskell/xml-1.3.15:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4 && < 4.9' 'base >= 4' \
-		'time < 1.6' 'time'
-}
diff --git a/dev-haskell/feed/feed-1.3.0.1.ebuild b/dev-haskell/feed/feed-1.3.0.1.ebuild
deleted file mode 100644
index 909b96ff32b8..000000000000
--- a/dev-haskell/feed/feed-1.3.0.1.ebuild
+++ /dev/null
@@ -1,42 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # markdown-unlit fals to generate a test: "test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
-HOMEPAGE="https://github.com/bergmark/feed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # ghc: could not execute: markdown-unlit
-
-RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
-	<dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	<dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
-	>=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4 && < 4.14' 'base >= 4'
-}
diff --git a/dev-haskell/feed/feed-1.3.2.1-r2.ebuild b/dev-haskell/feed/feed-1.3.2.1-r2.ebuild
new file mode 100644
index 000000000000..35f9c5f9796d
--- /dev/null
+++ b/dev-haskell/feed/feed-1.3.2.1-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
+HOMEPAGE="https://github.com/haskell-party/feed"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-disable-doctest.patch" )
+
+RDEPEND="
+	>=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.14
+	=dev-haskell/old-locale-1.0*:=[profile?]
+	>=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2
+	=dev-haskell/safe-0.3*:=[profile?]
+	=dev-haskell/time-locale-compat-0.1*:=[profile?]
+	<dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10
+	>=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4
+	|| (
+		<dev-haskell/text-1.3
+		=dev-haskell/text-2.0*
+	)
+	dev-haskell/text:=[profile?]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		dev-haskell/text
+		dev-haskell/doctest
+		dev-haskell/doctest-driver-gen
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		dev-haskell/syb
+		=dev-haskell/test-framework-0.8*
+		=dev-haskell/test-framework-hunit-0.3*
+	)
+"
+BDEPEND="test? (
+	dev-haskell/doctest-driver-gen[executable(+)]
+	dev-haskell/markdown-unlit[executable(+)]
+)"
diff --git a/dev-haskell/feed/feed-1.3.2.1.ebuild b/dev-haskell/feed/feed-1.3.2.1.ebuild
new file mode 100644
index 000000000000..f4ae6cc810f3
--- /dev/null
+++ b/dev-haskell/feed/feed-1.3.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds"
+HOMEPAGE="https://github.com/haskell-party/feed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.2.1-disable-doctest.patch" )
+
+RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
+	<dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-haskell/xml-types-0.3.6:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/doctest
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/markdown-unlit-0.4 <dev-haskell/markdown-unlit-0.6
+		dev-haskell/syb
+		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
+"
diff --git a/dev-haskell/feed/files/feed-1.3.2.1-disable-doctest.patch b/dev-haskell/feed/files/feed-1.3.2.1-disable-doctest.patch
new file mode 100644
index 000000000000..01ebc6537499
--- /dev/null
+++ b/dev-haskell/feed/files/feed-1.3.2.1-disable-doctest.patch
@@ -0,0 +1,18 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+These doctests are difficult to run successfully and aren't worth the effort.
+
+diff -urN feed-1.3.2.1/feed.cabal feed-1.3.2.1-r1/feed.cabal
+--- feed-1.3.2.1/feed.cabal	2022-03-28 20:36:31.561223247 -0600
++++ feed-1.3.2.1-r1/feed.cabal	2022-03-28 21:05:49.501202376 -0600
+@@ -153,8 +153,7 @@
+   main-is: doctest-driver.hs
+   type: exitcode-stdio-1.0
+   default-language: Haskell2010
+-  if impl(ghc < 8)
+-     buildable: False
++  buildable: False
+   build-depends:
+       base >= 4.6
+     , doctest
diff --git a/dev-haskell/feed/metadata.xml b/dev-haskell/feed/metadata.xml
index f227a9b7de42..ef8599691279 100644
--- a/dev-haskell/feed/metadata.xml
+++ b/dev-haskell/feed/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">sof/feed</remote-id>
+		<remote-id type="hackage">feed</remote-id>
+		<remote-id type="github">haskell-party/feed</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/fgl-arbitrary/Manifest b/dev-haskell/fgl-arbitrary/Manifest
deleted file mode 100644
index 3eebf648c9fd..000000000000
--- a/dev-haskell/fgl-arbitrary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fgl-arbitrary-0.2.0.1.tar.gz 6080 BLAKE2B 0bdc70e420aa4989d636b984274ec35806a721fda38501aa5a1cab5c1a6806bb81446fb9918c278752d07d817f18fe202f72604689d862a3538252453b065889 SHA512 841aac5e72c840180a25a3f8132c801c216c25a1cc1e66a91e4a3dd81b4b684ff29aed7bd6780d18c62e200db83eed1bdec6d34abec3e2b77bb5767a4f43915e
-DIST fgl-arbitrary-0.2.0.2.tar.gz 6068 BLAKE2B 8034e36d5f98ec6f00619bcf1885315ce4f95354f22a8763914a748f0652df818ec665da26835b2d1579dfd749e25d39d10c543f56f5ce49975e653cbf0d736a SHA512 294850708d511ed52e6973820e44dffb3c183e64d1c10b1324ee46e0fd3966abf0bce7bca1c5831e67b88965e715f2e2e85a5abdd201fd584a10f720b419b57e
-DIST fgl-arbitrary-0.2.0.3.tar.gz 6079 BLAKE2B 13fadb149568115d8a31138d9c92c039a369e8e4cbce68156434ecc5ed6ed1ed86cd1ada17567103b57073ff402a5f768bd54779593bfda6d776853a7cc94349 SHA512 d944f9c6ec7e116cec9df84d7b0ef2750e3aa255bed74f6450d9d6fa9786c50de20cf37b4f8725e1303b465583a7a6c3f3d4fd48517ddbb2b7354f01d728d830
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
deleted file mode 100644
index 11a30e09c9f7..000000000000
--- a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for fgl"
-HOMEPAGE="https://hackage.haskell.org/package/fgl-arbitrary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 )
-"
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild
deleted file mode 100644
index 0ca16fe165f4..000000000000
--- a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for fgl"
-HOMEPAGE="https://hackage.haskell.org/package/fgl-arbitrary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.10:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 )
-"
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
deleted file mode 100644
index 37f4be6d6925..000000000000
--- a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for fgl"
-HOMEPAGE="https://hackage.haskell.org/package/fgl-arbitrary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.3 && < 2.10' 'QuickCheck >= 2.3' \
-		'hspec >= 2.1 && < 2.5' 'hspec >= 2.1'
-}
diff --git a/dev-haskell/fgl-arbitrary/metadata.xml b/dev-haskell/fgl-arbitrary/metadata.xml
deleted file mode 100644
index 44e7a3677e37..000000000000
--- a/dev-haskell/fgl-arbitrary/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides Arbitrary instances for fgl graphs (to avoid adding a
-		QuickCheck dependency for fgl whilst still making the instances
-		available to others).
-		
-		Also available are non-fgl-specific functions for generating
-		graph-like data structures.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/fgl/Manifest b/dev-haskell/fgl/Manifest
index 368225bee716..51c59fb399d9 100644
--- a/dev-haskell/fgl/Manifest
+++ b/dev-haskell/fgl/Manifest
@@ -1,5 +1,2 @@
-DIST fgl-5.4.2.4.tar.gz 36574 BLAKE2B 16d12bd889198e54f0950706351873f4f2a47fd5be30f9f69a4ad88162cc932789f41bba681a710a843cc29926bd001e450070576cffff1650b831642eaa5493 SHA512 9c0c145f43d1b5671af99e9d62d485c5af1336779463f3e9519e6db98fb3c3dacadecb5241aca2e9326ad795d143efd1b3b04a5cb21077dce28579f430fd8d11
-DIST fgl-5.5.0.1.tar.gz 35963 BLAKE2B bcc8864184d7020405d918c626734bee636a01713b1471bfe01737d5fb991bc26d8c1be04ce969ec53814f00ae25fddae0fb4d71dfe2613e6a51623d38ae5d51 SHA512 0f2b5224e36291ca044bce512b04e1a87e30f8d79ae76bf4f4725d15b26079521c012085125c92ea3133da5d6318595245d4b321669e772f88cabbc90b4a468a
-DIST fgl-5.5.2.3.tar.gz 52223 BLAKE2B 63c5eecab0f8748516c182721f97c8b3cda3387c387f55331807a02345d19e637a39e538ca865122e54e5fe00b713d0e446e16d388481195900e4c36df97cb51 SHA512 4e092048256704e852f13f59046313df83cd00f37c5c32daf69ef13d1ab680296cdcd2b793cbf7383225ecb3caa5c5a1e6110c467d67276eaea6041942856a33
-DIST fgl-5.5.3.0.tar.gz 52923 BLAKE2B 7d35433acdbb967ed7504f3f69ada0fa6913655335e55d8cbf53866e318de2e07dffbec61c20007d7223560f212038b0cc55d8012a44c164f1da7e8890984b6e SHA512 a7f5e4cb9d9cbd6f3063780fb03cf8abbb3311c22848a8eb377238113e55ebf92ddd283326128baabce38faca311ceb270bc1d55dbaf708a935c5e96ceb2df9e
-DIST fgl-5.7.0.2.tar.gz 56399 BLAKE2B 0972a1db67f1e1e4910afc6d2cdd974715647ca0e3e0d8bbb1d2ac4bcf36afe9a4d36033c0bc2246d8bc87c5795494776173878e9c17f479f702722fc0fdf9f7 SHA512 a259cd9abe236cfec892d520b27e293293071ce1b435055cd009087d7d1fc2a87b71306e362020d3e8f6460c538da4e686c6b08b13361fc07c1e978b49a775fd
+DIST fgl-5.7.0.3.tar.gz 56415 BLAKE2B 6b7f5d3d2fd93494f3c2f9fbf69dd38c0358ced8a4f488f31d4904a375e21b4d12b974fe78868be8184a989b43fa6f345ca84ed74ea8c5970416c2903dd7a024 SHA512 f77ee1a66fe02b0a01e70b6fcb16baaba67be5433e4310bfb0862cec66855fc0413de586ca111e2e1569898b890fe93faf7c9f079dc569ca2d32b6c087762bbd
+DIST fgl-5.8.1.1.tar.gz 56829 BLAKE2B ad698d62e0961ebc19800225128053eae5d559a952504025f76c783392e699605abf009eccb7a69b8084009309a9252a29d3efb2b022941de895f7ce2064c610 SHA512 c1d82f2cbce89bb8088dda0e57a6787de0f83834b44f3b7e88393fa79f706dc7b5bff254ee4f2479a90c35a99cedc12c1691770c7c78c48362322b48b02b4873
diff --git a/dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild b/dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild
deleted file mode 100644
index 31bfa52c8a5a..000000000000
--- a/dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="http://web.engr.oregonstate.edu/~erwig/fgl/haskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/fgl/fgl-5.5.0.1.ebuild b/dev-haskell/fgl/fgl-5.5.0.1.ebuild
deleted file mode 100644
index b303dfaae5cb..000000000000
--- a/dev-haskell/fgl/fgl-5.5.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="http://web.engr.oregonstate.edu/~erwig/fgl/haskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/fgl/fgl-5.5.2.3.ebuild b/dev-haskell/fgl/fgl-5.5.2.3.ebuild
deleted file mode 100644
index 1658893bb502..000000000000
--- a/dev-haskell/fgl/fgl-5.5.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="https://hackage.haskell.org/package/fgl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9 )
-"
diff --git a/dev-haskell/fgl/fgl-5.5.3.0.ebuild b/dev-haskell/fgl/fgl-5.5.3.0.ebuild
deleted file mode 100644
index b8ad0263504f..000000000000
--- a/dev-haskell/fgl/fgl-5.5.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="https://hackage.haskell.org/package/fgl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.10 )
-"
diff --git a/dev-haskell/fgl/fgl-5.7.0.2.ebuild b/dev-haskell/fgl/fgl-5.7.0.2.ebuild
deleted file mode 100644
index c257fc18b490..000000000000
--- a/dev-haskell/fgl/fgl-5.7.0.2.ebuild
+++ /dev/null
@@ -1,26 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Martin Erwig's Functional Graph Library"
-HOMEPAGE="http://hackage.haskell.org/package/fgl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 )
-"
diff --git a/dev-haskell/fgl/fgl-5.7.0.3.ebuild b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
new file mode 100644
index 000000000000..dbf509ee6bbd
--- /dev/null
+++ b/dev-haskell/fgl/fgl-5.7.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Martin Erwig's Functional Graph Library"
+HOMEPAGE="https://hackage.haskell.org/package/fgl"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2.1
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
+"
+
+CABAL_CHDEPS=(
+	'hspec >= 2.1 && < 2.8' 'hspec >= 2.1'
+)
diff --git a/dev-haskell/fgl/fgl-5.8.1.1.ebuild b/dev-haskell/fgl/fgl-5.8.1.1.ebuild
new file mode 100644
index 000000000000..c65b125d96d3
--- /dev/null
+++ b/dev-haskell/fgl/fgl-5.8.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Martin Erwig's Functional Graph Library"
+HOMEPAGE="https://hackage.haskell.org/package/fgl"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.11
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
+"
diff --git a/dev-haskell/fgl/metadata.xml b/dev-haskell/fgl/metadata.xml
index 8c89ced67086..e5868c189376 100644
--- a/dev-haskell/fgl/metadata.xml
+++ b/dev-haskell/fgl/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Martin Erwig's Functional Graph Library
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">fgl</remote-id>
+		<remote-id type="github">haskell/fgl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/file-embed/Manifest b/dev-haskell/file-embed/Manifest
index 4717044648c9..60bb9f425f19 100644
--- a/dev-haskell/file-embed/Manifest
+++ b/dev-haskell/file-embed/Manifest
@@ -1,5 +1,2 @@
-DIST file-embed-0.0.10.tar.gz 6247 BLAKE2B b8ab7590d0ac8ad9539b07732b589053a98b4ef87feaf2fc816ea81a2b87a9a41bcac9ef44d7180dcec52ea3a266eca7ba01236b3c5699c77685a9119582ba00 SHA512 aa0ef37987b9f84685e064411de080d608d5b9a8c839a332fc163eb218c1a8fcb1fb9dc6bfba0033717f10252e07bb5f72183c3b64bb83488553e9b97bdf3111
 DIST file-embed-0.0.11.2.tar.gz 6493 BLAKE2B 5e24d8a46fc40619943086fc9f5b211b35c19862a9346cffda4d4afd7c63f273127ca5dc652d40169438ccbef38f45abd77a394575f13aba023f18adc7746620 SHA512 48ea61d41d1f0ac855a446c64830b15904f2a696c16a0abec4407d6f74b61d333ed4854d3c75c2402c7a834704c063793a6660ef4e4fdd0ce9195492a34f8361
-DIST file-embed-0.0.11.tar.gz 6469 BLAKE2B c1d8071b765c8709435f86b9985feccf2e46f3bfefb25a73cb7032e2a059a0a3fd0b405a0a552de89923b9f8331a045476fb472da9504c24d5f27310a7fd23c3 SHA512 2c6ac6bdf951706a6d2cfe317bb6c50e3fb166acd746ff9af0420212bfc8f298cf4dea08b2e38cb4615b98cbc15954e1b7d46918970234e4ab91012e34bf7b41
-DIST file-embed-0.0.7.tar.gz 4283 BLAKE2B 54b6eb380f2894838e05b0c08a29f9092077d73284632c8b1daa211b08dc8a183fae329c0f5bb66741a6018a9b87f65efd6fcf3868afab5616a230f3024f9e8b SHA512 ae87b0df303261d7a36d1388c7d92f021e36e58feece5f9a12d55fbc16a74aa0553fda2bbaaf34e819108d39655997a44d8b473b48de1b410b00a993de439b26
-DIST file-embed-0.0.9.tar.gz 5624 BLAKE2B a67eec3f43e6c89ec97a4b68295e5da376536fc0565fa55a6db47ab4b6534f0a95bef31b26873fea9bd62dd85891b0409f4588ac5dc1bee066c9f132f6ba96e9 SHA512 897ebcf06eaf6e5ba0c08763adf5f5c47321599cac884e856bac21c178b9116bb3117bab89bb5a1ed2369711a8998c37c2daaf6f7555c403c55c09c5204ce1f7
+DIST file-embed-0.0.15.0.tar.gz 7119 BLAKE2B 22c64efd1b4edd029c7e76aaa4b53f8f6233930f2e487cb7e3618436794287d90c0919a2d86074782412743ae389dea23f330d3b4a5ec8009be062056879d659 SHA512 49020f4f7d28ad57d72d0a91853cb85bf905baa86df4f48f3992114a30d97edecb889fb21eb95de3bc3edab206379aad783b79fabde2e06fbe9d0984f92a83ce
diff --git a/dev-haskell/file-embed/file-embed-0.0.10.ebuild b/dev-haskell/file-embed/file-embed-0.0.10.ebuild
deleted file mode 100644
index a3afd67899f2..000000000000
--- a/dev-haskell/file-embed/file-embed-0.0.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to embed file contents directly"
-HOMEPAGE="https://github.com/snoyberg/file-embed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild b/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
index f225d60cb20a..25e42f1f6258 100644
--- a/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
+++ b/dev-haskell/file-embed/file-embed-0.0.11.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-8.0.2:=
diff --git a/dev-haskell/file-embed/file-embed-0.0.11.ebuild b/dev-haskell/file-embed/file-embed-0.0.11.ebuild
deleted file mode 100644
index 5b824b772182..000000000000
--- a/dev-haskell/file-embed/file-embed-0.0.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to embed file contents directly"
-HOMEPAGE="https://github.com/snoyberg/file-embed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/file-embed/file-embed-0.0.15.0.ebuild b/dev-haskell/file-embed/file-embed-0.0.15.0.ebuild
new file mode 100644
index 000000000000..80d706194212
--- /dev/null
+++ b/dev-haskell/file-embed/file-embed-0.0.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use Template Haskell to embed file contents directly"
+HOMEPAGE="https://github.com/snoyberg/file-embed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/file-embed/file-embed-0.0.7.ebuild b/dev-haskell/file-embed/file-embed-0.0.7.ebuild
deleted file mode 100644
index 2f1d4a196b31..000000000000
--- a/dev-haskell/file-embed/file-embed-0.0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to embed file contents directly"
-HOMEPAGE="https://github.com/snoyberg/file-embed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/file-embed/file-embed-0.0.9.ebuild b/dev-haskell/file-embed/file-embed-0.0.9.ebuild
deleted file mode 100644
index ed8969effcfc..000000000000
--- a/dev-haskell/file-embed/file-embed-0.0.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to embed file contents directly"
-HOMEPAGE="https://github.com/snoyberg/file-embed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/file-embed/metadata.xml b/dev-haskell/file-embed/metadata.xml
index bdb8b9de6129..0424cddf616a 100644
--- a/dev-haskell/file-embed/metadata.xml
+++ b/dev-haskell/file-embed/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Use Template Haskell to embed file contents directly.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">file-embed</remote-id>
 		<remote-id type="github">snoyberg/file-embed</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/file-location/Manifest b/dev-haskell/file-location/Manifest
deleted file mode 100644
index fa247cb49238..000000000000
--- a/dev-haskell/file-location/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST file-location-0.4.9.1.tar.gz 6961 BLAKE2B 5b3248db2a03ad699ba1354a88b6d0aa4e124e607be6692e7be7a9cec403d42dcb2e304a60c85e879855a9e5e3e49309d8aa112edaa12986f79b8408fa49b781 SHA512 a84a6ed3ff1a786331e202ae505df3981e81b3ce085e588632868357626b82a559dc649aa1623a09462741c5133ee0e5d5deb10713d94cc8286b82aa2e706d94
-DIST file-location-0.4.9.tar.gz 6959 BLAKE2B 1cc083a9fb71fb80a11b56e27d8fc468f806d1417efbaf618ea07a4f68df5addf7c479bf5490d50bf07b34ff6babdaefc11536068c15bff274b07bbf4189be74 SHA512 cbea7ef5a6797efd242219a32c7d46b5a0fe2b20d4c93e7ab758cf27519b021c2e2c34ab91d4eedfba8a61a51f81312346d575f8c83296b87b1f7bea8985d40f
diff --git a/dev-haskell/file-location/file-location-0.4.9-r1.ebuild b/dev-haskell/file-location/file-location-0.4.9-r1.ebuild
deleted file mode 100644
index c2fa6cd7e4da..000000000000
--- a/dev-haskell/file-location/file-location-0.4.9-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="common functions that show file location information"
-HOMEPAGE="https://github.com/gregwebs/FileLocation.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # error stack changed from ghc-7.10
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/th-orphans-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers     >= 0.2 && < 0.5' 'transformers     >= 0.2'
-}
diff --git a/dev-haskell/file-location/file-location-0.4.9.1.ebuild b/dev-haskell/file-location/file-location-0.4.9.1.ebuild
deleted file mode 100644
index f284847d7468..000000000000
--- a/dev-haskell/file-location/file-location-0.4.9.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="common functions that show file location information"
-HOMEPAGE="https://github.com/gregwebs/FileLocation.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # error stack changed from ghc-7.10
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/th-orphans-0.9:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/file-location/file-location-0.4.9.ebuild b/dev-haskell/file-location/file-location-0.4.9.ebuild
deleted file mode 100644
index 67a8b4e51a9c..000000000000
--- a/dev-haskell/file-location/file-location-0.4.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="common functions that show file location information"
-HOMEPAGE="https://github.com/gregwebs/FileLocation.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	>=dev-haskell/th-orphans-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/file-location/metadata.xml b/dev-haskell/file-location/metadata.xml
deleted file mode 100644
index fd1840e49f39..000000000000
--- a/dev-haskell/file-location/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Common debugging/error/exception functions that give file location information
-		
-		&gt; $(err "OH NO!")
-		&gt;
-		&gt; main:Main main.hs:16:1 OH NO!
-		
-		Notice how it displays package:module file:line:character
-		It exposes the functions err (error), undef (undefined), and trc (Debug.Trace.trace). All of these behave the same as their normal counterpart but also spit out a location.
-		
-		Here is my favorite helper, debug, which is like trace but just show the value.
-		
-		&gt; debug [1,2,3]
-		&gt;
-		&gt; DEBUG: [1,2,3]
-		&gt; [1,2,3]
-		
-		And The Template Haskell version.
-		
-		&gt; $(dbg) [1,2,3]
-		&gt;
-		&gt; DEBUG main:Main main.hs:1:3 [1,2,3]
-		&gt; [1,2,3]
-		
-		Also there is a version of thrwIO that gives location information
-		&gt; ($(thrwIO) $ AException) `catch` \e -&gt; putStrLn ("Caught " ++ show (e :: AException))
-		&gt;
-		&gt; Caught AException "main:Main test/main.hs:25:6"
-		
-		See module for a listing of all the functions with short descriptions, and the homepage for some more examples https://github.com/gregwebs/ErrorLocation.hs
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gregwebs/FileLocation.hs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/filelock/Manifest b/dev-haskell/filelock/Manifest
deleted file mode 100644
index 96a798f4e552..000000000000
--- a/dev-haskell/filelock/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST filelock-0.1.1.5.tar.gz 7839 BLAKE2B 2ac99711315fe11ddf49d680a851b147ee8f2d55c3b5a3fdb1b57edf6e7e6fec1cb5232cf1e2b1eccfe497a50756994cf1c5bf2ef624f5777c55fde9de9f6a30 SHA512 6ccd0b671cec8d1c2daa3115a5b2d8cd10a31db0a1dc1c15e6cb80d679bd2e09208be8bebc0f4bb64d7cdd0fad2e7e170e8283b6be61edd5017b788f94a41048
diff --git a/dev-haskell/filelock/filelock-0.1.1.5.ebuild b/dev-haskell/filelock/filelock-0.1.1.5.ebuild
deleted file mode 100644
index 5297c74c1da5..000000000000
--- a/dev-haskell/filelock/filelock-0.1.1.5.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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Portable interface to file locking (flock / LockFileEx)"
-HOMEPAGE="https://github.com/takano-akio/filelock"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/async )
-"
diff --git a/dev-haskell/filelock/metadata.xml b/dev-haskell/filelock/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/filelock/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
index 5a2a2c084f9f..814058ba3aee 100644
--- a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
+++ b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.3
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/filemanip/metadata.xml b/dev-haskell/filemanip/metadata.xml
index 445e6f97d517..2e2ee1d112c6 100644
--- a/dev-haskell/filemanip/metadata.xml
+++ b/dev-haskell/filemanip/metadata.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A Haskell library for working with files and directories.
-		Includes code for pattern matching, finding files,
-		modifying file contents, and more.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">bos/filemanip</remote-id>
 	</upstream>
diff --git a/dev-haskell/filepath-bytestring/Manifest b/dev-haskell/filepath-bytestring/Manifest
index bf733c9e0061..26f295beb4ed 100644
--- a/dev-haskell/filepath-bytestring/Manifest
+++ b/dev-haskell/filepath-bytestring/Manifest
@@ -1 +1 @@
-DIST filepath-bytestring-1.4.2.1.6.tar.gz 25418 BLAKE2B 3b1eaa89f68f6bea1ab1cf003cb53032eeea81f36b2de046054310b17c60d951791499afbd1e92a3d264515cfa3d3b60c87527f3579401a92b92efcc265c4c3f SHA512 f101d718681373faead2e916dbdb7fda7b12091067d070f5d0e8ceab48c8081ca7f46bdc2fcfc0b535d65d51a3835fed05a50acf36f1a01c22c8d01c4c98e106
+DIST filepath-bytestring-1.4.2.1.9.tar.gz 25901 BLAKE2B f8cc6b01daa2a89ba9c4cfc448675ba00a203ba7eee7f966380e84daa56cf83899ea471d4b0b17f2d10b4fe8efccdca8dd188f4bdc842eee85a1f81e31a59b6a SHA512 814ca8e733afb85187055bf8fdf7381cba4de8587141eff678ec78aca76cd3042a40c3046d5fe4adaaa3575701c2a4172202ef9580ad66d87c92ee4a4e66fe87
diff --git a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.ebuild
deleted file mode 100644
index 10c2718e0edf..000000000000
--- a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.6.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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library for manipulating RawFilePaths in a cross platform way"
-HOMEPAGE="http://hackage.haskell.org/package/filepath-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14 )
-"
diff --git a/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
new file mode 100644
index 000000000000..b70db22f9b9c
--- /dev/null
+++ b/dev-haskell/filepath-bytestring/filepath-bytestring-1.4.2.1.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library for manipulating RawFilePaths in a cross platform way"
+HOMEPAGE="https://hackage.haskell.org/package/filepath-bytestring"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+	'filepath >= 1.4.2 && <= 1.4.2.1' 'filepath >= 1.4.2'
+)
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15 )
+"
diff --git a/dev-haskell/filepath-bytestring/metadata.xml b/dev-haskell/filepath-bytestring/metadata.xml
index 89c5eda9bf27..2701978d8784 100644
--- a/dev-haskell/filepath-bytestring/metadata.xml
+++ b/dev-haskell/filepath-bytestring/metadata.xml
@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides functionality for manipulating @RawFilePath@
-		values. It can be used as a drop in replacement for the filepath library
-		to get the benefits of using ByteStrings. It provides three modules:
-		
-		* &quot;System.FilePath.Posix.ByteString&quot; manipulates POSIX\/Linux style @RawFilePath@ values (with @\/@ as the path separator).
-		
-		* &quot;System.FilePath.Windows.ByteString&quot; manipulates Windows style @RawFilePath@ values (with either @\\@ or @\/@ as the path separator, and deals with drives).
-		
-		* &quot;System.FilePath.ByteString&quot; is an alias for the module appropriate to your platform.
-		
-		All three modules provide the same API, and the same documentation (calling out differences in the different variants).
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">filepath-bytestring</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/filestore/Manifest b/dev-haskell/filestore/Manifest
deleted file mode 100644
index 87733e6a4da3..000000000000
--- a/dev-haskell/filestore/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST filestore-0.6.1.tar.gz 31837 BLAKE2B 8aa628da69bb84fbc0654c8d82bad208f0cecb4749f7ec82e8e4261a48464e008f2a7690e504e442cec368afef5d977073cb1544a346d1e915adc0dc3f2c35ee SHA512 48d307b928c7a79974e057b604cde80cb4394f6840300aae637f82884f7741553a7edc791f5b0d7c002eec2a025f4ae015a326453525c351368050fe5cf255b4
-DIST filestore-0.6.2.tar.gz 31096 BLAKE2B 2477879d7cb361e96bc030dfdf1bd6e00b865d5a77133d428b358c8aac514f64c957d8500f5ca96ea2f905bdcc0c98b5138da212faba83589117feb5491f86b5 SHA512 3cc3ab2e46cbd6210dc507a6411db347c626219cc9bdfc39fcdc63f10f813b6066c069b3f614a2a4e2f5522608be11f64a11742570270f2d06da4b330ea97b44
-DIST filestore-0.6.3.4.tar.gz 32070 BLAKE2B a4096d31aa1382eab3c41eb55c58c19171de67caea3078f5383dea61fb13b51adb71bbdae0b8d670c61b72be9394494d776c0dc797c4d2b71d3d49a13851f8c8 SHA512 d5a7cf4ca3bc3fbc8d8f066fad5e3913d8fef4c13d894f3df604fab91ad2c4e1bb585c5c067220055e9356dc99a860b03b281e46c3b16517bce130a8bc57eda7
-DIST filestore-0.6.4.tar.gz 32225 BLAKE2B 49fd010ddabb0b940d228b7adae61908fb98d81bd8aa74f8d910e7ec0f1086a6d9741e9894d0c96d61cbf489814574d08375dd32c60c8c6c2e6ae03dac4eab06 SHA512 07a8ce976b354139ae4894c3e6751b9ef02957191a15e18b2eccc8cfbc97344eca2ad44b6cca863ccf7c43b444ed999355c33d99cd20b87c126f04d8f248cabb
diff --git a/dev-haskell/filestore/files/filestore-0.6.1-ghc-8.patch b/dev-haskell/filestore/files/filestore-0.6.1-ghc-8.patch
deleted file mode 100644
index 126a0564b4db..000000000000
--- a/dev-haskell/filestore/files/filestore-0.6.1-ghc-8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Data/FileStore/Types.hs b/Data/FileStore/Types.hs
-index e950c7a..e116761 100644
---- a/Data/FileStore/Types.hs
-+++ b/Data/FileStore/Types.hs
-@@ -152,3 +152,3 @@ data FileStore = FileStore {
-     -- | Save contents in the filestore.
--  , save           :: Contents a
-+  , save           :: forall a . Contents a
-                    => FilePath          -- Resource to save.
-@@ -160,3 +160,3 @@ data FileStore = FileStore {
-     -- | Retrieve the contents of the named resource.
--  , retrieve       :: Contents a
-+  , retrieve       :: forall a . Contents a
-                    => FilePath          -- Resource to retrieve.
diff --git a/dev-haskell/filestore/filestore-0.6.1.ebuild b/dev-haskell/filestore/filestore-0.6.1.ebuild
deleted file mode 100644
index 014a6b37f9e9..000000000000
--- a/dev-haskell/filestore/filestore-0.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface for versioning file stores"
-HOMEPAGE="https://hackage.haskell.org/package/filestore"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+maxcount"
-
-RESTRICT=test # one darcs test fails
-
-RDEPEND=">=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		dev-haskell/mtl )
-"
-DEPEND+="
-	test? ( dev-vcs/darcs
-		dev-vcs/git
-		dev-vcs/mercurial
-	)
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-
-	cabal_chdeps \
-		'time >= 1.1 && < 1.6' 'time >= 1.1' \
-		'process >= 1.0 && < 1.3' 'process >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag maxcount maxcount)
-}
-
-src_test() {
-	export HOME=${T}/
-	git config --global user.email "git@src_test"
-	git config --global user.name "Mr. ${P} The Test"
-
-	haskell-cabal_src_test
-}
diff --git a/dev-haskell/filestore/filestore-0.6.2.ebuild b/dev-haskell/filestore/filestore-0.6.2.ebuild
deleted file mode 100644
index 7fb7dc8e97ad..000000000000
--- a/dev-haskell/filestore/filestore-0.6.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface for versioning file stores"
-HOMEPAGE="https://hackage.haskell.org/package/filestore"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+maxcount"
-
-RESTRICT=test # one darcs test fails
-
-RDEPEND=">=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		dev-haskell/mtl )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory >= 1.1 && < 1.3' 'directory >= 1.1' \
-		'directory >= 1.0 && < 1.3' 'directory >= 1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag maxcount maxcount)
-}
diff --git a/dev-haskell/filestore/filestore-0.6.3.4.ebuild b/dev-haskell/filestore/filestore-0.6.3.4.ebuild
deleted file mode 100644
index 1082ff53bba2..000000000000
--- a/dev-haskell/filestore/filestore-0.6.3.4.ebuild
+++ /dev/null
@@ -1,37 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface for versioning file stores"
-HOMEPAGE="https://hackage.haskell.org/package/filestore"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+maxcount"
-
-RDEPEND=">=dev-haskell/diff-0.2:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		dev-haskell/mtl )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag maxcount maxcount)
-}
diff --git a/dev-haskell/filestore/filestore-0.6.4.ebuild b/dev-haskell/filestore/filestore-0.6.4.ebuild
deleted file mode 100644
index 045963f9258e..000000000000
--- a/dev-haskell/filestore/filestore-0.6.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface for versioning file stores"
-HOMEPAGE="http://hackage.haskell.org/package/filestore"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+maxcount"
-
-RESTRICT=test # requires mercurial
-
-RDEPEND=">=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/xml-1.3:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		dev-haskell/mtl )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag maxcount maxcount)
-}
diff --git a/dev-haskell/filestore/metadata.xml b/dev-haskell/filestore/metadata.xml
deleted file mode 100644
index 4bc0a50f8610..000000000000
--- a/dev-haskell/filestore/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The filestore library provides an abstract interface for a versioning
-		file store, and modules that instantiate this interface.  Currently
-		Git, Darcs, and Mercurial modules are provided, and other VCSs
-		or databases could be added.
-	</longdescription>
-	<use>
-		<flag name="maxcount">Make use of a recent (&gt;= 2.3.0) Darcs feature which vastly improves the performance
-		of 'latest'.  You should disable this flag if you plan to use gitit with an
-		older version of Darcs, or 'latest' will raise an error.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
index b946e0abd6f1..24ade6c11dec 100644
--- a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
+++ b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,11 +17,13 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
+	>=dev-haskell/cabal-1.0
+"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/findbin/metadata.xml b/dev-haskell/findbin/metadata.xml
index 10897c810b1a..0675fb9d0bb8 100644
--- a/dev-haskell/findbin/metadata.xml
+++ b/dev-haskell/findbin/metadata.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This module locates the full directory to the running program,
-		to allow the use of paths relative to it.
-		FindBin supports invocation of Haskell programs via "ghci",
-		via "runhaskell/runghc", as well as compiled as an executable.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">audreyt/findbin</remote-id>
 	</upstream>
diff --git a/dev-haskell/fingertree/Manifest b/dev-haskell/fingertree/Manifest
index 8af4cda6e438..7d6ff2a1588c 100644
--- a/dev-haskell/fingertree/Manifest
+++ b/dev-haskell/fingertree/Manifest
@@ -1,2 +1,2 @@
-DIST fingertree-0.1.1.0.tar.gz 14415 BLAKE2B b05ce26d0275ac9910607927914759008ed1c7e8ceeeeebbe6200ec5a96e39efc10372a69edc71cde01bbd8f5ba8600e7dd7ec7e31e676225127a133607e5edb SHA512 47d7387e11cf05a2df323c6af76a12e6cf02a857f7131203400cbc6ba9ee4c3c9e2c721a8423e6456a385f5ea0c4aedd0e9a2600d2d33609c0457cd259337016
 DIST fingertree-0.1.4.2.tar.gz 18978 BLAKE2B 25eafe2e25ac00121c29bf6e54d6dd754e3672bb321451dcbc89594123b4f71b263fa8584bfeaaa63362d9901af7263c8028ea2f75684e2f2f960f31feecbb9a SHA512 016a772830c0bb27ec15fa99c9dff280c210f288a1f2dc15828224a6a8cdad87ade816191320aa59c876eba6b33cdb47a778572e66a8f3c989984cea2f4970ac
+DIST fingertree-0.1.5.0.tar.gz 20656 BLAKE2B b6c34b90932f8427586bf5901a2ace8c3e556c5997035edf5116f996b4b093b4b58c441ec05c115866ee38800eb2726d07431de094ca054aaebf58241a7eea9a SHA512 c5a580c64dfe374fe818f1388e4a8870ebfc27bd09137a58fb72afee18d73b8217afe722cbe5f0017990ab28ff630cda512ca4c3c3f28e8f24622d3d15b59325
diff --git a/dev-haskell/fingertree/fingertree-0.1.1.0.ebuild b/dev-haskell/fingertree/fingertree-0.1.1.0.ebuild
deleted file mode 100644
index 7f0c4c2b42a9..000000000000
--- a/dev-haskell/fingertree/fingertree-0.1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic finger-tree structure, with example instances"
-HOMEPAGE="https://hackage.haskell.org/package/fingertree"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
index 7da5f5314315..ab1247d9cfa8 100644
--- a/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
+++ b/dev-haskell/fingertree/fingertree-0.1.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/fingertree/fingertree-0.1.5.0.ebuild b/dev-haskell/fingertree/fingertree-0.1.5.0.ebuild
new file mode 100644
index 000000000000..4d398e4dd11c
--- /dev/null
+++ b/dev-haskell/fingertree/fingertree-0.1.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic finger-tree structure, with example instances"
+HOMEPAGE="https://hackage.haskell.org/package/fingertree"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/fingertree/metadata.xml b/dev-haskell/fingertree/metadata.xml
index e1edfac92e74..cc7fb249a61a 100644
--- a/dev-haskell/fingertree/metadata.xml
+++ b/dev-haskell/fingertree/metadata.xml
@@ -1,23 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A general sequence representation with arbitrary
-		annotations, for use as a base for implementations of
-		various collection types, with examples, as described
-		in section 4 of
-		
-		* Ralf Hinze and Ross Paterson,
-		\"Finger trees: a simple general-purpose data structure\",
-		/Journal of Functional Programming/ 16:2 (2006) pp 197-217.
-		&lt;http://www.soi.city.ac.uk/~ross/papers/FingerTree.html&gt;
-		
-		For a tuned sequence type, see @Data.Sequence@ in the
-		@containers@ package, which is a specialization of
-		this structure.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">fingertree</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/fixed/Manifest b/dev-haskell/fixed/Manifest
deleted file mode 100644
index 03355d378a65..000000000000
--- a/dev-haskell/fixed/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fixed-0.2.1.1.tar.gz 4346 BLAKE2B 9821b0a7a14b338f964cce55699fbd31c1802334f6d9b8d0717e1d673d284a503e01b91328bdf307f1429ddbdd8c7a6ec3395bfbe465d6af531bfa5e27daf20b SHA512 99f0410deffbecaf4ffb15543e3fd060cc679b238644490cbb0a608dda9957fc4c0020bce667f6ca25fc02c52fced7e9ca40dabe899ec8649b522fdec75eb9c0
diff --git a/dev-haskell/fixed/fixed-0.2.1.1.ebuild b/dev-haskell/fixed/fixed-0.2.1.1.ebuild
deleted file mode 100644
index 6276f3ccc33a..000000000000
--- a/dev-haskell/fixed/fixed-0.2.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Signed 15.16 precision fixed point arithmetic"
-HOMEPAGE="https://github.com/ekmett/fixed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/fixed/metadata.xml b/dev-haskell/fixed/metadata.xml
deleted file mode 100644
index 86b35f9b7118..000000000000
--- a/dev-haskell/fixed/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Signed 15.16 precision fixed point arithmetic
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/fixed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/fmlist/Manifest b/dev-haskell/fmlist/Manifest
deleted file mode 100644
index 777c4bf70177..000000000000
--- a/dev-haskell/fmlist/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST fmlist-0.9.3.tar.gz 4428 BLAKE2B 818911f2e670e7b371e0dd58bb9ee661a7f0fd4130e611606d393aeea7b5c4d0eddb8ce04babb2d85cac54a4d3511457c2291eeb5b548967a4409291e18990a9 SHA512 1dba120af3c06d22b41269b22aad7950dd1d567daee213eeaa316f8dcd9e97a2f4499372b310561bb3a25909c38060c0aefacfe640d85ec3c90c5f5503db8915
-DIST fmlist-0.9.tar.gz 4256 BLAKE2B b6dff5a18f3e13c16c7aed41eb4b22d6fa01ee0a8fe8250fab706a0d07b38cf50bf09b40f0b794aae304c6c4e93fd30ede2ab1765cbbdede2a08e9b12b5d07ea SHA512 ddead2f2742e91365381ac9c003f59ea57441c4e9a32b01f3d1aa989120d954b01bb6b19f148a4d89c0cb7332093c39f17567d8c479d47133a0568b8abc757d4
diff --git a/dev-haskell/fmlist/fmlist-0.9.3.ebuild b/dev-haskell/fmlist/fmlist-0.9.3.ebuild
deleted file mode 100644
index 0ff4a019eb12..000000000000
--- a/dev-haskell/fmlist/fmlist-0.9.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FoldMap lists"
-HOMEPAGE="https://github.com/sjoerdvisscher/fmlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/fmlist/fmlist-0.9.ebuild b/dev-haskell/fmlist/fmlist-0.9.ebuild
deleted file mode 100644
index 833a043e98e1..000000000000
--- a/dev-haskell/fmlist/fmlist-0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="FoldMap lists"
-HOMEPAGE="https://github.com/sjoerdvisscher/fmlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/fmlist/metadata.xml b/dev-haskell/fmlist/metadata.xml
deleted file mode 100644
index d3d264a012cf..000000000000
--- a/dev-haskell/fmlist/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		FoldMap lists are lists represented by their foldMap function.
-		FoldMap lists have O(1) cons, snoc and append, just like DLists,
-		but other operations might have favorable performance
-		characteristics as well. These wild claims are still completely
-		unverified though.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sjoerdvisscher/fmlist</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/foldable1-classes-compat/Manifest b/dev-haskell/foldable1-classes-compat/Manifest
new file mode 100644
index 000000000000..4e951639fe2b
--- /dev/null
+++ b/dev-haskell/foldable1-classes-compat/Manifest
@@ -0,0 +1,2 @@
+DIST foldable1-classes-compat-0.1-rev2.cabal 3782 BLAKE2B 9c65f54ba9b286ced95c21736fed729262b0d2fb8e20b48c09f73ca3816b5aea4cfcf17b1736f89ec688d5822610f6f720c86746977ea5433bb450ad1e904456 SHA512 32b425c491c4e7085d3e0579c889c800ebc8263305d76984356fa8148d899ec9380e2c528f237d9544af2d89384511ded0c39d8255a2193f06350343fdda7668
+DIST foldable1-classes-compat-0.1.tar.gz 10484 BLAKE2B 66931399cb468536bca797d62a65afeaa936dcddafbaea39cadda9c1b3e47ac132ad3928339e76c9870228426df0eae2eea0333068c2f6d67e35d662e2abb3cd SHA512 680404e62d2d5bfec75c76c53b7178b548e4471fc6125ce86f404ddc1626e45ab448a3ff9e8fe902186c424b07d92635406f90c44586ed937d934e8c68ab0b8c
diff --git a/dev-haskell/foldable1-classes-compat/foldable1-classes-compat-0.1.ebuild b/dev-haskell/foldable1-classes-compat/foldable1-classes-compat-0.1.ebuild
new file mode 100644
index 000000000000..c11814e12bc9
--- /dev/null
+++ b/dev-haskell/foldable1-classes-compat/foldable1-classes-compat-0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility package for the Foldable1 and Bifoldable1 type classes"
+HOMEPAGE="https://github.com/haskell-compat/foldable1-classes-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+tagged"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+	tagged? (
+		>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.27 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/test-framework-0.8.2.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-quickcheck2-0.3.0.5 <dev-haskell/test-framework-quickcheck2-0.4
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/foldable1-classes-compat/metadata.xml b/dev-haskell/foldable1-classes-compat/metadata.xml
new file mode 100644
index 000000000000..d8751542cc3b
--- /dev/null
+++ b/dev-haskell/foldable1-classes-compat/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+	<use>
+		<flag name="tagged">You can disable the use of the `tagged` package using `-f-tagged`.
+
+Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">foldable1-classes-compat</remote-id>
+		<remote-id type="github">haskell-compat/foldable1-classes-compat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/foldl/Manifest b/dev-haskell/foldl/Manifest
index 15431501561b..342d69e7b402 100644
--- a/dev-haskell/foldl/Manifest
+++ b/dev-haskell/foldl/Manifest
@@ -1,4 +1,3 @@
-DIST foldl-1.0.7.tar.gz 8533 BLAKE2B 2467457cc4d54e5f4061b902ce2a8ee766038278b17b9d10b2c1d0c647e5bbc366ba409e8593267084580bed51651de5c5bf1e288c49b4ce43b37e41a51ac878 SHA512 b2dd75560b48430be67ba11503b7f639739ba83e340a93df37a04f729d42e4fb06c46bb7fc878855737848de67e40988a184d78ff4500ac8d21890ccc112b033
-DIST foldl-1.1.3.tar.gz 10640 BLAKE2B b805d112d34bb1cbc18f530c7ea5f080eb139137e819b981bcd8078de4708838d506bb156fafa6789ea4d8722ea96ff1fbf51e514f190e76f9662631f3670ce6 SHA512 a833e9a81f154337ef17dd746dc46175dc8d4862ca4e945dd994004e3891497787df6b6e74a48372e43ca59c1c69b1d2d32a91e2d3ae27673975dc0fcd86da8b
-DIST foldl-1.2.3.tar.gz 14782 BLAKE2B d9c394711e3ef8f72cd4d2aa5d9a3d58a4d7494b5a912efcb984019ccfc4b795ff8dae5b648e1b091fb885e64a58d8c29e6d5fe310d0e69b1eda169d00fbbf2b SHA512 30ba640561eafee690333e4741a7065e91bc5da5e5dc62a158d9f1fd21e723e0a0c2df9a29c783699fb746277ebb3ecd66bfbbeebf34d3db952e2ce0e4aba475
-DIST foldl-1.4.7.tar.gz 21602 BLAKE2B 617f16b0b5ce18c12d5807daf973beb7e5fcd01591ff057d6ec66e8c6fae3cec140949ac87bd5c7d23bbd5ac86cd4355f5c96b8f4d703fa26f291975ff6bac8c SHA512 e1c8569214ee58d1d5333018a50832e8be53fa2751c18b5d93c7c8d393f722248050fc56c6a5243a0f9f8ff94a0cd2f475c03107e70d601bf6bf3a81c509b58d
+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
diff --git a/dev-haskell/foldl/files/foldl-1.4.12-cabal-doctest.patch b/dev-haskell/foldl/files/foldl-1.4.12-cabal-doctest.patch
new file mode 100644
index 000000000000..648b8f77cbc3
--- /dev/null
+++ b/dev-haskell/foldl/files/foldl-1.4.12-cabal-doctest.patch
@@ -0,0 +1,83 @@
+diff -urN foldl-1.4.12/Setup.hs foldl-1.4.12-r1/Setup.hs
+--- foldl-1.4.12/Setup.hs	2001-09-08 19:46:40.000000000 -0600
++++ foldl-1.4.12-r1/Setup.hs	2022-03-23 03:20:48.427151688 -0600
+@@ -1,2 +1,6 @@
+-import Distribution.Simple
+-main = defaultMain
++module Main (main) where
++
++import Distribution.Extra.Doctest ( defaultMainWithDoctests )
++
++main :: IO ()
++main = defaultMainWithDoctests "doctest"
+diff -urN foldl-1.4.12/foldl.cabal foldl-1.4.12-r1/foldl.cabal
+--- foldl-1.4.12/foldl.cabal	2022-03-23 03:17:07.317151581 -0600
++++ foldl-1.4.12-r1/foldl.cabal	2022-03-23 03:20:10.187151669 -0600
+@@ -2,7 +2,7 @@
+ Version: 1.4.12
+ x-revision: 2
+ Cabal-Version: >=1.10
+-Build-Type: Simple
++Build-Type: Custom
+ License: BSD3
+ License-File: LICENSE
+ Copyright: 2013 Gabriel Gonzalez
+@@ -22,6 +22,12 @@
+     Type: git
+     Location: https://github.com/Gabriel439/Haskell-Foldl-Library
+ 
++custom-setup
++    setup-depends:
++        base
++      , Cabal
++      , cabal-doctest
++
+ Library
+     HS-Source-Dirs: src
+     Build-Depends:
+@@ -83,6 +89,9 @@
+     Main-Is: doctest.hs
+     Build-Depends:
+         base,
+-        doctest >= 0.16
++        doctest >= 0.16,
++        directory,
++        filepath,
++        base-compat
+     GHC-Options: -threaded
+     Default-Language: Haskell2010
+diff -urN foldl-1.4.12/test/doctest.hs foldl-1.4.12-r1/test/doctest.hs
+--- foldl-1.4.12/test/doctest.hs	2001-09-08 19:46:40.000000000 -0600
++++ foldl-1.4.12-r1/test/doctest.hs	2022-03-23 03:22:41.077151743 -0600
+@@ -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
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..a5fad758b449
--- /dev/null
+++ b/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch
@@ -0,0 +1,120 @@
+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,23 @@
++{-# LANGUAGE CPP #-}
++
++module Main (main) where
++
++#ifndef MIN_VERSION_cabal_doctest
++#define MIN_VERSION_cabal_doctest(x,y,z) 0
++#endif
++
++#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.0.7.ebuild b/dev-haskell/foldl/foldl-1.0.7.ebuild
deleted file mode 100644
index 1fba0b9b605e..000000000000
--- a/dev-haskell/foldl/foldl-1.0.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Composable, streaming, and efficient left folds"
-HOMEPAGE="https://hackage.haskell.org/package/foldl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/foldl/foldl-1.1.3.ebuild b/dev-haskell/foldl/foldl-1.1.3.ebuild
deleted file mode 100644
index b00d4528fa53..000000000000
--- a/dev-haskell/foldl/foldl-1.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Composable, streaming, and efficient left folds"
-HOMEPAGE="https://hackage.haskell.org/package/foldl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.14:=[profile?]
-	<dev-haskell/primitive-0.7:=[profile?]
-	<dev-haskell/profunctors-5.3:=[profile?]
-	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/foldl/foldl-1.2.3.ebuild b/dev-haskell/foldl/foldl-1.2.3.ebuild
deleted file mode 100644
index 32b13a86b727..000000000000
--- a/dev-haskell/foldl/foldl-1.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Composable, streaming, and efficient left folds"
-HOMEPAGE="https://hackage.haskell.org/package/foldl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	<dev-haskell/contravariant-1.5:=[profile?]
-	>=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.14:=[profile?]
-	<dev-haskell/primitive-0.7:=[profile?]
-	<dev-haskell/profunctors-5.3:=[profile?]
-	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/foldl/foldl-1.4.12-r1.ebuild b/dev-haskell/foldl/foldl-1.4.12-r1.ebuild
new file mode 100644
index 000000000000..d8eb59428ef9
--- /dev/null
+++ b/dev-haskell/foldl/foldl-1.4.12-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Composable, streaming, and efficient left folds"
+HOMEPAGE="https://hackage.haskell.org/package/foldl"
+
+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
+)
+
+RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	<dev-haskell/contravariant-1.6:=[profile?]
+	<dev-haskell/hashable-1.5:=[profile?]
+	<dev-haskell/primitive-0.8:=[profile?]
+	<dev-haskell/profunctors-5.7:=[profile?]
+	>=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
+	<dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	dev-haskell/cabal-doctest
+	test? (
+		>=dev-haskell/doctest-0.16
+		dev-haskell/base-compat
+	)
+"
diff --git a/dev-haskell/foldl/foldl-1.4.15.ebuild b/dev-haskell/foldl/foldl-1.4.15.ebuild
new file mode 100644
index 000000000000..b18f0c7da8e3
--- /dev/null
+++ b/dev-haskell/foldl/foldl-1.4.15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Composable, streaming, and efficient left folds"
+HOMEPAGE="https://hackage.haskell.org/package/foldl"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.15-cabal-doctest.patch"
+)
+
+RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	<dev-haskell/contravariant-1.6:=[profile?]
+	<dev-haskell/hashable-1.5:=[profile?]
+	<dev-haskell/primitive-0.9:=[profile?]
+	>=dev-haskell/profunctors-4.3.2:=[profile?] <dev-haskell/profunctors-5.7:=[profile?]
+	>=dev-haskell/random-1.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-6.1:=[profile?]
+	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	<dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	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/foldl/foldl-1.4.7.ebuild b/dev-haskell/foldl/foldl-1.4.7.ebuild
deleted file mode 100644
index 423090d68ca3..000000000000
--- a/dev-haskell/foldl/foldl-1.4.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Composable, streaming, and efficient left folds"
-HOMEPAGE="http://hackage.haskell.org/package/foldl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # it was found in multiple packages: hashmap-1.3.3 unordered-containers-0.2.10.0
-
-RDEPEND=">=dev-haskell/comonad-4.0:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	<dev-haskell/contravariant-1.6:=[profile?]
-	<dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.1.0:=[profile?] <dev-haskell/mwc-random-0.15:=[profile?]
-	<dev-haskell/primitive-0.8:=[profile?]
-	<dev-haskell/profunctors-5.6:=[profile?]
-	>=dev-haskell/semigroupoids-1.0:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1.20:=[profile?]
-	>=dev-haskell/text-0.11.2.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	<dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	<dev-haskell/vector-builder-0.4:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/doctest-0.16 )
-"
diff --git a/dev-haskell/foldl/metadata.xml b/dev-haskell/foldl/metadata.xml
index b5335a58f258..1582dd67b890 100644
--- a/dev-haskell/foldl/metadata.xml
+++ b/dev-haskell/foldl/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library provides strict left folds that stream in constant
-		memory, and you can combine folds using @Applicative@ style to derive new
-		folds.  Derived folds still traverse the container just once and are often as
-		efficient as hand-written folds.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">foldl</remote-id>
+		<remote-id type="github">Gabriella439/Haskell-Foldl-Library</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/foundation/Manifest b/dev-haskell/foundation/Manifest
index a0dae253bcc2..f2b9f641976b 100644
--- a/dev-haskell/foundation/Manifest
+++ b/dev-haskell/foundation/Manifest
@@ -1 +1,2 @@
-DIST foundation-0.0.25.tar.gz 120472 BLAKE2B 2cff11363840b0b338b57d38438a13211e41a8e9bc6c359552dfb1854c9277c3228aac88b4a7930031fab75f78574cbe1cac6d5c87936f9b179e5c2277c00ff5 SHA512 7335795a1cdf2975d6e9471c5b469d99cc6d224d2da66838d830593a5abda73675920acb2dc823a6b92f2141dc2364c8fd5ad53d7e8aecd8df00e6998683be60
+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
diff --git a/dev-haskell/foundation/foundation-0.0.25.ebuild b/dev-haskell/foundation/foundation-0.0.25.ebuild
deleted file mode 100644
index 1f75b31ea271..000000000000
--- a/dev-haskell/foundation/foundation-0.0.25.ebuild
+++ /dev/null
@@ -1,40 +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.1.9999
-#hackport: flags: +doctest,-minimal-deps,-bench-all,-bounds-check,-linktest
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Alternative prelude with batteries and no dependencies"
-HOMEPAGE="https://github.com/haskell-foundation/foundation"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-RESTRICT="test" # fails to doctest
-
-RDEPEND="~dev-haskell/basement-0.0.11:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/basement
-		>=dev-haskell/doctest-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bench-all \
-		--flag=-bounds-check \
-		--flag=doctest \
-		$(cabal_flag experimental experimental) \
-		--flag=-linktest \
-		--flag=-minimal-deps
-}
diff --git a/dev-haskell/foundation/foundation-0.0.26.1.ebuild b/dev-haskell/foundation/foundation-0.0.26.1.ebuild
new file mode 100644
index 000000000000..e5dc055fb793
--- /dev/null
+++ b/dev-haskell/foundation/foundation-0.0.26.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +doctest,-minimal-deps,-bench-all,-bounds-check,-linktest
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Alternative prelude with batteries and no dependencies"
+HOMEPAGE="https://github.com/haskell-foundation/foundation"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="experimental"
+
+RESTRICT=test # hangs indefinitely
+
+RDEPEND="~dev-haskell/basement-0.0.12:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/basement
+		>=dev-haskell/doctest-0.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bench-all \
+		--flag=-bounds-check \
+		--flag=doctest \
+		$(cabal_flag experimental experimental) \
+		--flag=-linktest \
+		--flag=-minimal-deps
+}
diff --git a/dev-haskell/foundation/foundation-0.0.30.ebuild b/dev-haskell/foundation/foundation-0.0.30.ebuild
new file mode 100644
index 000000000000..34c119a9149c
--- /dev/null
+++ b/dev-haskell/foundation/foundation-0.0.30.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -doctest,-minimal-deps,-bench-all,-bounds-check,-linktest
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Alternative prelude with batteries and no dependencies"
+HOMEPAGE="https://github.com/haskell-foundation/foundation"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bench-all \
+		--flag=-bounds-check \
+		--flag=-doctest \
+		$(cabal_flag experimental experimental) \
+		--flag=-linktest \
+		--flag=-minimal-deps
+}
diff --git a/dev-haskell/foundation/metadata.xml b/dev-haskell/foundation/metadata.xml
index f3416f8ccd59..78fbc1c25ade 100644
--- a/dev-haskell/foundation/metadata.xml
+++ b/dev-haskell/foundation/metadata.xml
@@ -1,30 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name='experimental'>enable building experimental features, known as highly unstable or without good support cross-platform</flag>
+		<flag name="experimental">Enable building experimental features, known as highly unstable or without good support cross-platform</flag>
 	</use>
-	<longdescription>
-		A custom prelude with no dependencies apart from base.
-		
-		This package has the following goals:
-		
-		* provide a base like sets of modules that provide a consistent set of features and bugfixes across multiple versions of GHC (unlike base).
-		
-		* provide a better and more efficient prelude than base&#39;s prelude.
-		
-		* be self-sufficient: no external dependencies apart from base.
-		
-		* provide better data-types: packed unicode string by default, arrays.
-		
-		* Better numerical classes that better represent mathematical thing (No more all-in-one Num).
-		
-		* Better I/O system with less Lazy IO
-		
-		* Usual partial functions distinguished through type system
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">foundation</remote-id>
+		<remote-id type="github">haskell-foundation/foundation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/free/Manifest b/dev-haskell/free/Manifest
index a367bcfcef48..90e7d97c6b0a 100644
--- a/dev-haskell/free/Manifest
+++ b/dev-haskell/free/Manifest
@@ -1,7 +1,3 @@
-DIST free-4.10.0.1.tar.gz 46324 BLAKE2B db97bb05a8b03317b117208f50e2aaf6ea620074c2c04e089f0e44fd5fda7c6a6d41ee772f7e11d2d1767f949f9f378239d936f4649945f0eb6ade3cad792462 SHA512 bde1fc1b7ef1d3b51eba55b5122df5a6a694fc079d536e427ae9bdfc18ba6c4224d126d55b66b62d6f77911561201622c4f24434db8c1897a8e6713dc83b3531
-DIST free-4.11.tar.gz 47937 BLAKE2B bf1408322559d09c0ce0cbf40eec8d529db0477698d7dab091371821c04903e793f79ce0333cbe8ff692e17ea3f135f84ab1ac217462c111350e546331dc13a4 SHA512 693fdf0d639b9446b4081159d768aa89b42fae351458ef007dd479a1de58a6d84f2e58cb9f0a4393617bcf8078484cf00abd78479c9add5beb20b072c7cd8298
-DIST free-4.12.4.tar.gz 50601 BLAKE2B 9216251304335fc75090d97e97e6bf93532aa23286267fef1aff0429eac93527fdce966dd3a1f788c8b2a427e7cda5601fd909fdff5bf2b6c0b3b1b51a900e76 SHA512 208175008782349b7c9f94f9b2a818f59020ab7ef62421881127847428f28819f5d3f2f0a2ee9ac9be8a08f9f4d4f3349e666cac13098035fcbef14136043a60
-DIST free-4.2.tar.gz 17972 BLAKE2B f54f98f0bb277eae28f3b8487a2c2c2e4f786c7a6e7ed5c7a78109c8c141c20f097d5d0647b101102ca9e85e82b07de856d172fe8bf57c61562312aaab62ee22 SHA512 9f5d124c783bc43399d787c5f233f873800e121e7c9e0629b528dcb4e063e37b12b44e5ba74ac3731cc77949de72d76641a47070e0237c9e02f16137a80ef96f
-DIST free-4.5.tar.gz 22856 BLAKE2B 9d9e7e382c199a9ddf02f6d13830e53b40a2a5b48bd91ceefa69310a646e2cf304d4831197969ab31f6c4f65b95e7441a01097db787d6eb11a8e44db8324d874 SHA512 a7ddaf84dcf2dca584e487f8c9fe633a18b14201217142192784cce516497bd338abfdcc861c9578937b0b123ab737288062ad32fb1981c2eb97e88b0942238b
-DIST free-4.9.tar.gz 43414 BLAKE2B 9122aafff9c676378085a08f7779230cf3d82919d172e130bdfd3ca51de522d89abe77a90dca228b42883ff42b2ac07125192f0cd38294ec353f598053ba9489 SHA512 1e5c49b7e3e61a8348520522f6bcbfd04e5187c31c391eea30793baac023c9c939ebe6f44cdad0a71f099f137fbe3dae73a31652dc8cef3cac5ce9b42d461b67
-DIST free-5.1.3.tar.gz 64257 BLAKE2B 6e2b462c55e425622eb70d3013bb7194e6b126d0f176991cedd96d23f8d533448953273a979c7cb73036d84ab1f20a843fa7ce4b1d0f43548d052b2b57658a0f SHA512 09e18a487715872ac62ba434b71035f7de305078568e761a6c3c65c6c742c1850d110fbc8c7b462d49aba82ac4e841bd9a1011242a4ff27307c527434bc97d91
+DIST free-5.1.9.tar.gz 61606 BLAKE2B 0cf1e666f281c1610411a4f34a94cf1b887522db64d9957db36761ee596cc2d97c5bb7ebfa7c8ed40f42a5ab561d1fa8e2309843bf024e95cbef27a077ec02aa SHA512 925d9271adf5d16a48efaeebd65d54a9c5b4e042f1733382ee2269eee1f62d4b184e54209b384bdd145b76b093d7866f0115a56156c73f85bacb04cb7b265ec0
+DIST free-5.2-rev1.cabal 4176 BLAKE2B 5e4ff25305dcd903805a63be8704159f76f7c3e7208f4ecd6c0a4ef8f6d7a9827e1eaaaa7d35788202447e78af665a73973a51d7a2734fd44a07804305d64bd3 SHA512 670f2bc0bc7cbc4bb1bc6a5bbb823ba3507430a3b732e1d2346326e763cdffd8740ffd9228c455ba28a4ac285594cccbcf588434f0c6b55d36d3aefaa0d36ec9
+DIST free-5.2.tar.gz 58781 BLAKE2B b2813e74b6dfaac376d7221b75c73315cb9c1fd1bfb7bb281429668bea6cba20d6316bdc722f91425d950962ee3687a6bff491e44ff77e5f56cf07a2c564e443 SHA512 f27a9cd9d2f29c442a8ae036be53cd22cd28279e15f394212713ad12be05e9a35dce72ae53647cad415833ff356228e5707b6ed85c1195f94cb57493f9341175
diff --git a/dev-haskell/free/free-4.10.0.1.ebuild b/dev-haskell/free/free-4.10.0.1.ebuild
deleted file mode 100644
index b50b1ca6c57c..000000000000
--- a/dev-haskell/free/free-4.10.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.11.ebuild b/dev-haskell/free/free-4.11.ebuild
deleted file mode 100644
index b50b1ca6c57c..000000000000
--- a/dev-haskell/free/free-4.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.12.4.ebuild b/dev-haskell/free/free-4.12.4.ebuild
deleted file mode 100644
index edeaea73155e..000000000000
--- a/dev-haskell/free/free-4.12.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.2.ebuild b/dev-haskell/free/free-4.2.ebuild
deleted file mode 100644
index 09c01a3df24c..000000000000
--- a/dev-haskell/free/free-4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.5.ebuild b/dev-haskell/free/free-4.5.ebuild
deleted file mode 100644
index f53e9c2d0f7d..000000000000
--- a/dev-haskell/free/free-4.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-4.9.ebuild b/dev-haskell/free/free-4.9.ebuild
deleted file mode 100644
index 7d3053fcc72d..000000000000
--- a/dev-haskell/free/free-4.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/prelude-extras-0.4:=[profile?] <dev-haskell/prelude-extras-1:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/free/free-5.1.3.ebuild b/dev-haskell/free/free-5.1.3.ebuild
deleted file mode 100644
index 3bc8d782882f..000000000000
--- a/dev-haskell/free/free-5.1.3.ebuild
+++ /dev/null
@@ -1,35 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monads for free"
-HOMEPAGE="https://github.com/ekmett/free/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/distributive-0.2.1:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.5.1.0:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/free/free-5.1.9.ebuild b/dev-haskell/free/free-5.1.9.ebuild
new file mode 100644
index 000000000000..1b69c1f1e04c
--- /dev/null
+++ b/dev-haskell/free/free-5.1.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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="Monads for free"
+HOMEPAGE="https://github.com/ekmett/free/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/profunctors-5.6.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-5.3.5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+"
diff --git a/dev-haskell/free/free-5.2.ebuild b/dev-haskell/free/free-5.2.ebuild
new file mode 100644
index 000000000000..772fb5f0beb5
--- /dev/null
+++ b/dev-haskell/free/free-5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monads for free"
+HOMEPAGE="https://github.com/ekmett/free/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/profunctors-5.6.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-5.3.5:=[profile?] <dev-haskell/semigroupoids-7:=[profile?]
+	>=dev-haskell/th-abstraction-0.4.2.0:=[profile?] <dev-haskell/th-abstraction-0.6:=[profile?]
+	>=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+"
diff --git a/dev-haskell/free/metadata.xml b/dev-haskell/free/metadata.xml
index 3c2ac2f762d5..6b6998bdca9a 100644
--- a/dev-haskell/free/metadata.xml
+++ b/dev-haskell/free/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Monads for free
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">free</remote-id>
 		<remote-id type="github">ekmett/free</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/frown/Manifest b/dev-haskell/frown/Manifest
deleted file mode 100644
index 6bd6b94d0d5b..000000000000
--- a/dev-haskell/frown/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST frown-0.6.2.3.tar.gz 1269219 BLAKE2B 131e3291460019e171f436569237a4ab00ebd15b77a37bd308f257bdef25083dd5be87fd58d54f59a586c7376a0454a2db14ecd271d0490672099aeec7c1a8aa SHA512 a9166dd723db2836214704f1837b9629af03bc1aa5bdeed8a58eedca7a91140ba21db8d7be2884bc13b9f35346704329980bec44d253fa53c33f71e68160a963
diff --git a/dev-haskell/frown/frown-0.6.2.3.ebuild b/dev-haskell/frown/frown-0.6.2.3.ebuild
deleted file mode 100644
index e134baa7d54b..000000000000
--- a/dev-haskell/frown/frown-0.6.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="LALR(k) parser generator"
-HOMEPAGE="https://hackage.haskell.org/package/frown"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_install() {
-	haskell-cabal_src_install
-	dohtml -r Manual/html
-	dodoc Manual/Manual.ps
-}
diff --git a/dev-haskell/frown/metadata.xml b/dev-haskell/frown/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/frown/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/fsnotify/Manifest b/dev-haskell/fsnotify/Manifest
deleted file mode 100644
index 203395035859..000000000000
--- a/dev-haskell/fsnotify/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fsnotify-0.0.11.tar.gz 14530 BLAKE2B 983357e6f119a0b5cf1c43d5cf2355b11f49141c933110698f5e07a1d4509e6d6909969d3e902a3b07c5c6df89e9114ef3a688e105527e551bff5a2c47aff558 SHA512 e992864b349a134c3dac7a5a9da3452ba6c17c61b3a27a322f03eed3dd078923516604899a1d028fc6563a2677b86e6cf2f1eb1f92e2b3b33887e0df2a14573e
-DIST fsnotify-0.1.0.3.tar.gz 14116 BLAKE2B 4697f755028a876409d34138c00a084b1986990cfff9fcdb1f638be5d4be1d91a25f2d4077300582f7340f61fd874de3c5b463b9d8a06b288d59ea53a650ead4 SHA512 6835670a27bd0607c8dae7bfb4c197f78217eaa46d9a03d84ca53f5ade3fba78e85bbb0c1cc9621d9b17a2d415012a34eefb3ee2f63d518a9d7e354e07ce91ec
-DIST fsnotify-0.2.1.tar.gz 14689 BLAKE2B 06e8d05232b16c49045d4e737a587fb9c0a5e0f2706981949a579fa9ed3abb0795d5ecf60abddefb4eca86cd7a76313b8280e2badefe487ce2cdc9132039474b SHA512 b9c6505d27f7010b60dbd4cb2fdfe65efacd33398fda9f95526dd0d828b82b1afd029e6457aa1ece3421cffcb1a6189badc34b644faf8386e2631967380f1372
-DIST fsnotify-0.3.0.1.tar.gz 20638 BLAKE2B 8b897ed716e17ff4e22da274eacf03770ddf69661ea74a3ce2c284c21668a429ef92fd1f437fd104a82e02608a13fbc7e1a1bd5a5e8cc524fe2c70fbc3697ac6 SHA512 d5c96a54c1b4788e1d50f259d11d4e2d6eb7224552b50cb359a1f4cdcc2a9b7270f9b5ccdfe9738a163b54ab7ab5a0114de9cabc56660a7324cdfc4b16179e1a
diff --git a/dev-haskell/fsnotify/fsnotify-0.0.11.ebuild b/dev-haskell/fsnotify/fsnotify-0.0.11.ebuild
deleted file mode 100644
index 9e90d326620e..000000000000
--- a/dev-haskell/fsnotify/fsnotify-0.0.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for file change notification"
-HOMEPAGE="https://hackage.haskell.org/package/fsnotify"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hinotify-0.3.5:=[profile?]
-		<dev-haskell/hinotify-0.4:=[profile?]
-		>=dev-haskell/system-fileio-0.3.8:=[profile?]
-		<dev-haskell/system-fileio-0.4:=[profile?]
-		>=dev-haskell/system-filepath-0.4.6:=[profile?]
-		<dev-haskell/system-filepath-0.5:=[profile?]
-		>=dev-haskell/text-0.11.0:=[profile?]
-		>=dev-lang/ghc-7.0.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/glob-0.7.1
-			>=dev-haskell/hspec-1.3.0
-			>=dev-haskell/quickcheck-2.4.2
-			>=dev-haskell/random-1.0.1.1
-			>=dev-haskell/uniqueid-0.1.1
-		)"
diff --git a/dev-haskell/fsnotify/fsnotify-0.1.0.3.ebuild b/dev-haskell/fsnotify/fsnotify-0.1.0.3.ebuild
deleted file mode 100644
index 5c0b0afe9971..000000000000
--- a/dev-haskell/fsnotify/fsnotify-0.1.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for file change notification"
-HOMEPAGE="https://hackage.haskell.org/package/fsnotify"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
-	>=dev-haskell/hinotify-0.3.7:=[profile?]
-	>=dev-haskell/system-fileio-0.3.8:=[profile?]
-	>=dev-haskell/system-filepath-0.4.6:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/system-fileio-0.3.11
-		>=dev-haskell/system-filepath-0.4.7
-		>=dev-haskell/tasty-0.5
-		dev-haskell/tasty-hunit
-		dev-haskell/temporary-rc )
-"
diff --git a/dev-haskell/fsnotify/fsnotify-0.2.1.ebuild b/dev-haskell/fsnotify/fsnotify-0.2.1.ebuild
deleted file mode 100644
index a8325ed40d49..000000000000
--- a/dev-haskell/fsnotify/fsnotify-0.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for file change notification"
-HOMEPAGE="https://github.com/haskell-fswatch/hfsnotify"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
-	>=dev-haskell/hinotify-0.3.7:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/tasty-0.5
-		dev-haskell/tasty-hunit
-		dev-haskell/temporary-rc )
-"
diff --git a/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild b/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild
deleted file mode 100644
index 376479a62aa3..000000000000
--- a/dev-haskell/fsnotify/fsnotify-0.3.0.1.ebuild
+++ /dev/null
@@ -1,33 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for file change notification"
-HOMEPAGE="https://github.com/haskell-fswatch/hfsnotify"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
-	>=dev-haskell/hinotify-0.3.0:=[profile?]
-	>=dev-haskell/shelly-1.6.5:=[profile?]
-	>=dev-haskell/text-0.11.0:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/random
-		>=dev-haskell/tasty-0.5
-		dev-haskell/tasty-hunit
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/fsnotify/metadata.xml b/dev-haskell/fsnotify/metadata.xml
deleted file mode 100644
index a4beea52ea8b..000000000000
--- a/dev-haskell/fsnotify/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cross platform library for file creation, modification,
-		and deletion notification. This library builds upon
-		existing libraries for platform-specific Window, Mac,
-		and Linux filesystem event notification.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell-fswatch/hfsnotify</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/generic-deriving/Manifest b/dev-haskell/generic-deriving/Manifest
index 643960e663de..0c6159c7f8e3 100644
--- a/dev-haskell/generic-deriving/Manifest
+++ b/dev-haskell/generic-deriving/Manifest
@@ -1,4 +1,2 @@
-DIST generic-deriving-1.11.1.tar.gz 65456 BLAKE2B 6c93c737ac312a90af03d64f3abc9aea23d10218212e1933d2f995da080df260d47a0f6383c31db214e42878371a9fb5f043c524aef2ec8c5e8d959611773ebb SHA512 c0f8a1fb4a705eec43b71b6b578968beff889bb43551086fa520a311fbcbfceb49fb49844e68698842ebbb50ed57d75263b6a6a79e3b8a080240da07ecd8f61d
-DIST generic-deriving-1.13.1.tar.gz 68256 BLAKE2B 419e50b07d72066a13016c9c0d2cb7f7ad995956ea07763c3345d2e6057e7b428cffa5ba7b58df0230195a05f97f58360640a28a020c41bc3f78dc6f3bb8f924 SHA512 946e3a4da31141fb1156690e0fb51cd3ef0a4f62c0e5b68d0e0d31953d8999885011acb743edd5d0bf88985422c9c74a727dd7f775316911da57ff49716103e2
-DIST generic-deriving-1.6.3.tar.gz 25268 BLAKE2B 57e82a46e072370a1c0027032427740f1ac9f243c1573c5e6318e3c86f13a64019c52b4e514ff3ad4822d67b8563971d6e39cfb0031241b83997190cb2cc8983 SHA512 0730c792b96d21c9a078032d4446f1d994b5bc8e0a7fe4a22256de77e13ce3c01838ce4f962f2a9a3f18a4143b6deee167cc6cac648714f100f129b81ed2cf16
-DIST generic-deriving-1.7.0.tar.gz 25341 BLAKE2B 1250ccdf00c8a73f8f5e61e757f7ec178cd3fadc46d5a71f91f2e8aa9b856e0278125cfd124c7cf898201a9cd8e8af0e397e39ac823143c5d9a5563cd6545782 SHA512 d773eb0463a7814071fb05512c211fdf6efcb3245d6cb6046e0c3bb8d0634fd397636e3f8f2e37833878e3452ac2b0fab35542fa336ad1e36270b0e876b395dd
+DIST generic-deriving-1.14.1.tar.gz 74474 BLAKE2B 9d43cf67c50eb06c73ee50441700752ec757082312dfd660b48ca6f4e722f581ef43b62e0d20e80c3eca6f0844712ad28c9dee621e46475449d55e7980a436b8 SHA512 b7a0dd63ee59d9d8df64bd622aede65943cd83875df6bc4eb3775822ff3c5b476c6179da4fa8fcbc029f4b5e93244e12d5af3d7f7499ebc11488d59f72f6e322
+DIST generic-deriving-1.14.5.tar.gz 76918 BLAKE2B 9e6b5abb27860743e9aa65d703df3ca89c6b78cb5b7240f29871e699e64b45faee7710a1f4ef31fa011aca8195c1ebd505b62f14a20e02fb21510c99d3651605 SHA512 d3fc4e77a9c81ee570b20db6666f1c8bf32d1362cd045731401ff43db65b96c741752deec9f6239e8478d480e7d22e9bbc195fb473498cc380d7f94339563e3c
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild
deleted file mode 100644
index 7f5870494908..000000000000
--- a/dev-haskell/generic-deriving/generic-deriving-1.11.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=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic programming library for generalised deriving"
-HOMEPAGE="https://github.com/dreixel/generic-deriving"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild
deleted file mode 100644
index 100fd00432eb..000000000000
--- a/dev-haskell/generic-deriving/generic-deriving-1.13.1.ebuild
+++ /dev/null
@@ -1,26 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic programming library for generalised deriving"
-HOMEPAGE="https://github.com/dreixel/generic-deriving"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild
new file mode 100644
index 000000000000..7345ea5611b0
--- /dev/null
+++ b/dev-haskell/generic-deriving/generic-deriving-1.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic programming library for generalised deriving"
+HOMEPAGE="https://github.com/dreixel/generic-deriving"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.14.5.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.14.5.ebuild
new file mode 100644
index 000000000000..c6d1bc1aa821
--- /dev/null
+++ b/dev-haskell/generic-deriving/generic-deriving-1.14.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic programming library for generalised deriving"
+HOMEPAGE="https://github.com/dreixel/generic-deriving"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.6.3.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.6.3.ebuild
deleted file mode 100644
index b036c1afc266..000000000000
--- a/dev-haskell/generic-deriving/generic-deriving-1.6.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generic programming library for generalised deriving"
-HOMEPAGE="https://hackage.haskell.org/package/generic-deriving"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild
deleted file mode 100644
index 35142994c113..000000000000
--- a/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generic programming library for generalised deriving"
-HOMEPAGE="https://hackage.haskell.org/package/generic-deriving"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/generic-deriving/metadata.xml b/dev-haskell/generic-deriving/metadata.xml
index 9ea87ee12d69..d5157eeb0a9e 100644
--- a/dev-haskell/generic-deriving/metadata.xml
+++ b/dev-haskell/generic-deriving/metadata.xml
@@ -1,23 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		This package provides functionality for generalizing the deriving mechanism
-		in Haskell to arbitrary classes. It was first described in the paper:
-		
-		*  /A generic deriving mechanism for Haskell/.
-		Jose Pedro Magalhaes, Atze Dijkstra, Johan Jeuring, and Andres Loeh.
-		Haskell'10.
-		
-		The current implementation integrates with the new GHC Generics. See
-		&lt;http://www.haskell.org/haskellwiki/Generics&gt; for more information.
-		Template Haskell code is provided for supporting GHC before version 7.2.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">generic-deriving</remote-id>
 		<remote-id type="github">dreixel/generic-deriving</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/generically/Manifest b/dev-haskell/generically/Manifest
new file mode 100644
index 000000000000..11edf5d9211b
--- /dev/null
+++ b/dev-haskell/generically/Manifest
@@ -0,0 +1,2 @@
+DIST generically-0.1.1-rev1.cabal 1155 BLAKE2B 3554bfa3f08f83840c06ab6008f004304a28b1390585642ebe218e77e92bf02d4a716747c1a069ce1f00dce095c41469c0aa879cffce74c7e3165986e00ae4c7 SHA512 d07323461cf572b9867ae324a623b877c662f4df4ff5c97a06b895f17875d5648ae4683d1351e274b81d7dc240d1a441c759d8c0a77668e0b0f7384d32b8f358
+DIST generically-0.1.1.tar.gz 2870 BLAKE2B a67ab7a1d5aab5ad83ee3fbaecb77639caad96fb8ab7ff2385c843a6631c6ea7056d75f37caab60b5b942242c3f89751490ad3273cbe2068d4ea136dcdf66567 SHA512 029c96a5567fea56572ad5522c70d3b41a22ddac15483aee0045f4aa15bc45bf177a69bf42986391de681ab98aedf5b748a91d5bd5486427062f72e2a22a1844
diff --git a/dev-haskell/generically/generically-0.1.1-r1.ebuild b/dev-haskell/generically/generically-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..847822061c13
--- /dev/null
+++ b/dev-haskell/generically/generically-0.1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Generically newtype to use with DerivingVia"
+HOMEPAGE="https://hackage.haskell.org/package/generically"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/base-orphans-0.8.8:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/generically/metadata.xml b/dev-haskell/generically/metadata.xml
new file mode 100644
index 000000000000..2e243cd4145c
--- /dev/null
+++ b/dev-haskell/generically/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">generically</remote-id>
+		<remote-id type="github">haskell-compat/generically</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/generics-sop/Manifest b/dev-haskell/generics-sop/Manifest
index a9fe01551110..3f169d0d7f22 100644
--- a/dev-haskell/generics-sop/Manifest
+++ b/dev-haskell/generics-sop/Manifest
@@ -1,2 +1,2 @@
-DIST generics-sop-0.2.4.0.tar.gz 32986 BLAKE2B 8d4d426452f710a57fdcb4bfadd68f2b7faa208127feb7a55b9446cf2d455f799d703748c09ca2590140326f6f5a1f2e86bd609e7d52245ede4624f2c95c2baa SHA512 ce0d92214e622c58febced5684ba92b117e413d5718c6fdea1471f0fc5ea48ea53b212a536618086228542985f304dc4434c75c6ab919a72e6f49ccce342d866
-DIST generics-sop-0.5.1.0.tar.gz 29797 BLAKE2B 8e61bf85d8541f9f54aa0ae908f37cba380b68a40d83c42ff7b1cf1931eebc3d8671c22714bd18addad9aa59fd0f0b9e3bd000f033911dd7b96d32ee4dc5d5e5 SHA512 454cb30800e4c6b225df6464970746ca51028ffbfe50143559eebf16918dd783ef2e7690c4877b568d1835043ec733ec0ca9a39e0ae88c3136c82d0afb42bda8
+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
diff --git a/dev-haskell/generics-sop/generics-sop-0.2.4.0.ebuild b/dev-haskell/generics-sop/generics-sop-0.2.4.0.ebuild
deleted file mode 100644
index 005b9c33f22a..000000000000
--- a/dev-haskell/generics-sop/generics-sop-0.2.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic Programming using True Sums of Products"
-HOMEPAGE="https://hackage.haskell.org/package/generics-sop"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild b/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild
deleted file mode 100644
index a0cbdf14132d..000000000000
--- a/dev-haskell/generics-sop/generics-sop-0.5.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic Programming using True Sums of Products"
-HOMEPAGE="http://hackage.haskell.org/package/generics-sop"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/sop-core-0.5.0:=[profile?] <dev-haskell/sop-core-0.5.1:=[profile?]
-	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
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
new file mode 100644
index 000000000000..5ff74fa11c63
--- /dev/null
+++ b/dev-haskell/generics-sop/generics-sop-0.5.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic Programming using True Sums of Products"
+HOMEPAGE="https://hackage.haskell.org/package/generics-sop"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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-9.1
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/generics-sop/generics-sop-0.5.1.3.ebuild b/dev-haskell/generics-sop/generics-sop-0.5.1.3.ebuild
new file mode 100644
index 000000000000..303874e80f41
--- /dev/null
+++ b/dev-haskell/generics-sop/generics-sop-0.5.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generic Programming using True Sums of Products"
+HOMEPAGE="https://hackage.haskell.org/package/generics-sop"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+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.6:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/generics-sop/metadata.xml b/dev-haskell/generics-sop/metadata.xml
index af041149fe29..72bf2acafccc 100644
--- a/dev-haskell/generics-sop/metadata.xml
+++ b/dev-haskell/generics-sop/metadata.xml
@@ -1,37 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A library to support the definition of generic functions.
-		Datatypes are viewed in a uniform, structured way:
-		the choice between constructors is represented using an n-ary
-		sum, and the arguments of each constructor are represented using
-		an n-ary product.
-		
-		The module "Generics.SOP" is the main module of this library and contains
-		more detailed documentation.
-		
-		Examples of using this library are provided by the following
-		packages:
-		
-		* @&lt;https://hackage.haskell.org/package/basic-sop basic-sop&gt;@ basic examples,
-		
-		* @&lt;https://hackage.haskell.org/package/pretty-sop pretty-sop&gt;@ generic pretty printing,
-		
-		* @&lt;https://hackage.haskell.org/package/lens-sop lens-sop&gt;@ generically computed lenses,
-		
-		* @&lt;https://hackage.haskell.org/package/json-sop json-sop&gt;@ generic JSON conversions.
-		
-		A detailed description of the ideas behind this library is provided by
-		the paper:
-		
-		* Edsko de Vries and Andres Löh.
-		&lt;http://www.andres-loeh.de/TrueSumsOfProducts True Sums of Products&gt;.
-		Workshop on Generic Programming (WGP) 2014.
-		
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">generics-sop</remote-id>
+		<remote-id type="github">well-typed/generics-sop</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/geniplate-mirror/Manifest b/dev-haskell/geniplate-mirror/Manifest
deleted file mode 100644
index c81af88f8b08..000000000000
--- a/dev-haskell/geniplate-mirror/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST geniplate-mirror-0.7.1.tar.gz 9259 BLAKE2B 498ec095a2d34a7602ab1b48fc37f89a082766541dbf33bf8efe75e732043cbc6d1bd900f4b03d7bb0059d4a669f84cc27a8749de585f2645be1184ab440a14a SHA512 51e831034cf806b1de8bbe3e8f935894d38c61046b1a093ec837dac96972e8aef126d903fc70afb09e6f1edb143d716c3faae303bfece6d0bcb86a6be1b1210c
-DIST geniplate-mirror-0.7.4.tar.gz 9273 BLAKE2B 39aa51fb2824238498c174bdaeb88f76bed69bafb05ddb52ea37a0e64418447327158cd1043a6ff468c4c6ac783545e237909e1b7e965e011ea9f2538f6faa31 SHA512 52c2cd33320df0deaa1dc1e95d1a4874cd8493425542fcea375b81a5f85e8156a9ead67f4dc4b0e4d2e30553e2a914dd342133b4c2210501bf3442966baef8be
diff --git a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.1.ebuild b/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.1.ebuild
deleted file mode 100644
index 2746fbdc88df..000000000000
--- a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to generate Uniplate-like functions"
-HOMEPAGE="https://github.com/danr/geniplate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.4.ebuild b/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.4.ebuild
deleted file mode 100644
index ae83a126354c..000000000000
--- a/dev-haskell/geniplate-mirror/geniplate-mirror-0.7.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to generate Uniplate-like functions"
-HOMEPAGE="https://github.com/danr/geniplate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/geniplate-mirror/metadata.xml b/dev-haskell/geniplate-mirror/metadata.xml
deleted file mode 100644
index 731fc10dbe37..000000000000
--- a/dev-haskell/geniplate-mirror/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Use Template Haskell to generate Uniplate-like functions.
-		
-		This is a maintained mirror of the
-		&lt;http://hackage.haskell.org/package/geniplate geniplate&gt; package,
-		written by Lennart Augustsson.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">danr/geniplate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/geniplate/Manifest b/dev-haskell/geniplate/Manifest
deleted file mode 100644
index c7d95e91f74b..000000000000
--- a/dev-haskell/geniplate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST geniplate-0.6.0.5.tar.gz 7738 BLAKE2B e60c36ba553034400740c4b42828cb8e333331846ce719243761b9a4f8cd5a9875ee00856bf7cac1f03658392df920b9a41b2295d807f6926db1e80eba333232 SHA512 37127fa364ef0a8c67abbbadc025b932ddc62aaf09e4096548263c140b232b5442889d24f18fbb4ed3ea5eb0643b6afb4634b73471a2ec35b626dcd0c1781987
diff --git a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild b/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
deleted file mode 100644
index 466e84d75fa0..000000000000
--- a/dev-haskell/geniplate/geniplate-0.6.0.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use Template Haskell to generate Uniplate-like functions"
-HOMEPAGE="https://hackage.haskell.org/package/geniplate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'template-haskell < 2.10' 'template-haskell'
-}
diff --git a/dev-haskell/geniplate/metadata.xml b/dev-haskell/geniplate/metadata.xml
deleted file mode 100644
index 917d4595fec0..000000000000
--- a/dev-haskell/geniplate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Use template Haskell to generate Uniplate-like functions.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/genvalidity-hspec/Manifest b/dev-haskell/genvalidity-hspec/Manifest
deleted file mode 100644
index ac80c70e8685..000000000000
--- a/dev-haskell/genvalidity-hspec/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST genvalidity-hspec-0.7.0.4.tar.gz 13818 BLAKE2B c57e3f941bcc11987c1430aed1c1613c2b3af28e80d818829a07d81759e300cf7fd51c0d827efad50dbb7c465d261ff39e82f592ad25e0825f4f3996516b104b SHA512 25b660ca378f9015a71063c49ee0acb98fee2d66a61562e1fca831f1eb806ab6adc469b9694e51a610b14f9ee09765f83223b65a737effeef1fb0aeb98f30392
diff --git a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild b/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
deleted file mode 100644
index 803a16b0fd27..000000000000
--- a/dev-haskell/genvalidity-hspec/genvalidity-hspec-0.7.0.4.ebuild
+++ /dev/null
@@ -1,30 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Standard spec's for GenValidity instances"
-HOMEPAGE="https://github.com/NorfairKing/validity#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/genvalidity-0.8:=[profile?]
-	>=dev-haskell/genvalidity-property-0.5:=[profile?]
-	dev-haskell/hspec:=[profile?]
-	dev-haskell/hspec-core:=[profile?]
-	dev-haskell/quickcheck:2=[profile?]
-	>=dev-haskell/validity-0.5:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/genvalidity-hspec/metadata.xml b/dev-haskell/genvalidity-hspec/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/genvalidity-hspec/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/genvalidity-property/Manifest b/dev-haskell/genvalidity-property/Manifest
deleted file mode 100644
index 6fb0fb06ee9e..000000000000
--- a/dev-haskell/genvalidity-property/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST genvalidity-property-0.5.0.1.tar.gz 10723 BLAKE2B 520af5982119d2df2ebcd4bfce1b4378500c48af1fee95c212d5bae13e958eeb28dcc50aa3e0fd7358e74f0d98ac8da4d72f8198ccf90095fca7a8bced3bb528 SHA512 a50b3cb28cb843bfacff8b1a2248fc6e80ea1667518955a0d8479d607017f45ff99eac71be6797e232e9d6f08f6bfeb3ce00b346c9a40d2cf9da880d84f29add
diff --git a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild b/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
deleted file mode 100644
index 5af378911aee..000000000000
--- a/dev-haskell/genvalidity-property/genvalidity-property-0.5.0.1.ebuild
+++ /dev/null
@@ -1,30 +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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Standard properties for functions on 'Validity' types"
-HOMEPAGE="https://github.com/NorfairKing/validity#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/genvalidity-0.7:=[profile?]
-	>=dev-haskell/hspec-2.1:=[profile?]
-	dev-haskell/pretty-show:=[profile?]
-	dev-haskell/quickcheck:2=[profile?]
-	>=dev-haskell/validity-0.9:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/doctest )
-"
diff --git a/dev-haskell/genvalidity-property/metadata.xml b/dev-haskell/genvalidity-property/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/genvalidity-property/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/genvalidity/Manifest b/dev-haskell/genvalidity/Manifest
deleted file mode 100644
index 4e36afd05fcc..000000000000
--- a/dev-haskell/genvalidity/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST genvalidity-0.10.0.2.tar.gz 14421 BLAKE2B 60dde212f779123677ccbcbc45297602c99a3d55e4ab5c38c8d784def8b3d4d748d86d85118c3be91fa5f2e7400f58b617164f614cb3769cc4434aa4a1326a38 SHA512 67e89cee72fc5c6017e4862bf88506683ba8f26eb786fb8c7972454b44344cf2885b04e24b29e72fe1c16ff3f25330fbcf9b979fbd99d1e23e7e146336c005e5
diff --git a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild b/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
deleted file mode 100644
index a8b688efd42b..000000000000
--- a/dev-haskell/genvalidity/genvalidity-0.10.0.2.ebuild
+++ /dev/null
@@ -1,29 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Testing utilities for the validity library"
-HOMEPAGE="https://github.com/NorfairKing/validity#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/validity-0.9:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( dev-haskell/hspec
-		dev-haskell/hspec-core )
-"
diff --git a/dev-haskell/genvalidity/metadata.xml b/dev-haskell/genvalidity/metadata.xml
deleted file mode 100644
index c14cec8fca51..000000000000
--- a/dev-haskell/genvalidity/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Note: There are companion instance packages for this library:
-		
-		* &lt;https://hackage.haskell.org/package/genvalidity-text genvalidity-text&gt;
-		
-		* &lt;https://hackage.haskell.org/package/genvalidity-containers genvalidity-containers&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/getopt-generics/Manifest b/dev-haskell/getopt-generics/Manifest
index 594f4969deb4..c38b14651a85 100644
--- a/dev-haskell/getopt-generics/Manifest
+++ b/dev-haskell/getopt-generics/Manifest
@@ -1,2 +1 @@
-DIST getopt-generics-0.13.0.1.tar.gz 27772 BLAKE2B abe9dc94069dbc3cca4296290f2ca4d34a5088443cdcae018da36854963948ca7758c3622ad243f1284e39d08f420d3e9f885557d23c785520325dea11d4d278 SHA512 df27c67bd92047b5213404220389200cf72c79d20a761c390120d13a82fb126aa38ef5afbb826ae2be0fe65941f4fe5be42bb49301fabd6343e8b0c8a7f3e707
 DIST getopt-generics-0.13.0.4.tar.gz 19194 BLAKE2B 2c091df40c0c39f5e314367f2eb76aad296b8ead1fd26e84b1f578c1b3347c6961931dbc709a7c5c4374e16b965a573e4fb9c5c7c10f870b75e132ae1c84ff51 SHA512 f053dcd59126932745a98c955eca70dc3f50eda7e5a390bf7e5d7c639d89df9d714a6b449166a5b288a77e69f203207e8d8480ad86484b68c7a609e5f1a03fca
diff --git a/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild b/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild
deleted file mode 100644
index dda31d2758e5..000000000000
--- a/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Create command line interfaces with ease"
-HOMEPAGE="https://github.com/soenkehahn/getopt-generics#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.8:=[profile?]
-	dev-haskell/base-orphans:=[profile?]
-	>=dev-haskell/generics-sop-0.1:=[profile?] <dev-haskell/generics-sop-0.4:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2.1.8
-		dev-haskell/quickcheck
-		dev-haskell/safe
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild b/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
index 4b16299b9e02..38c4e932d38c 100644
--- a/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
+++ b/dev-haskell/getopt-generics/getopt-generics-0.13.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/base-compat-0.8:=[profile?]
diff --git a/dev-haskell/getopt-generics/metadata.xml b/dev-haskell/getopt-generics/metadata.xml
index 3198e24c64f7..7029bd0edc65 100644
--- a/dev-haskell/getopt-generics/metadata.xml
+++ b/dev-haskell/getopt-generics/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Create command line interfaces with ease
-	</longdescription>
+	<upstream>
+		<remote-id type="github">soenkehahn/getopt-generics</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/ghc-byteorder/Manifest b/dev-haskell/ghc-byteorder/Manifest
new file mode 100644
index 000000000000..e932ce741e0a
--- /dev/null
+++ b/dev-haskell/ghc-byteorder/Manifest
@@ -0,0 +1 @@
+DIST ghc-byteorder-4.11.0.0.10.tar.gz 2445 BLAKE2B d5da6fcc1ef39ae05cd5b044416e4caa829507312663e0388134547b086ee8e2528935665d03d98a5815ae36c63593901d1cee665957d1a36148f14358f09910 SHA512 d589aa5cf31772e013527ce404959afb75b8bc9bc922b038b6bf4704d584fbaa4de3fd044351b5a7e8df32e96c8414f02573c78643a1fbe9559a66530ff985a1
diff --git a/dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild b/dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild
new file mode 100644
index 000000000000..9764333d9327
--- /dev/null
+++ b/dev-haskell/ghc-byteorder/ghc-byteorder-4.11.0.0.10.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="\"GHC.ByteOrder\" API Compatibility Layer"
+HOMEPAGE="http://hackage.haskell.org/package/ghc-byteorder"
+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-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+CABAL_CHDEPS=(
+	'base >=4.11 && <4.15' 'base >=4.11'
+)
diff --git a/dev-haskell/ghc-byteorder/metadata.xml b/dev-haskell/ghc-byteorder/metadata.xml
new file mode 100644
index 000000000000..a23c2f79664e
--- /dev/null
+++ b/dev-haskell/ghc-byteorder/metadata.xml
@@ -0,0 +1,23 @@
+<?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>
+	<longdescription>
+		This package transparently supplies the &quot;GHC.ByteOrder&quot; API as provided in @base-4.11.0.0@ for legacy GHC releases which didn&#39;t provide it yet (i.e. GHC 7.0 through GHC 8.2).
+		
+		This release reexports [GHC.ByteOrder from base](https://hackage.haskell.org/package/base-4.11.1.0/docs/GHC-ByteOrder.html) via Cabal&#39;s @reexported-modules@ mechanism.  For GHC 8.2 and earlier a different release of @ghc-byteorder@ (with the same minor version) is eligible by the Cabal solver with a backported &quot;GHC.ByteOrder&quot; module.
+		
+		In order to use this compatibility layer, simply declare a dependency on @ghc-byteorder@ in your @.cabal@ package description like so
+		
+		&gt; build-depends: ghc-byteorder ^&gt;= 4.11.0.0
+		
+		And your code will be able to access this respective API version of the module via the usual
+		
+		&gt; import GHC.ByteOrder
+		
+		mechanism.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/ghc-paths/Manifest b/dev-haskell/ghc-paths/Manifest
index 4d0a8e403c55..b4dcd9cfa548 100644
--- a/dev-haskell/ghc-paths/Manifest
+++ b/dev-haskell/ghc-paths/Manifest
@@ -1,2 +1,2 @@
+DIST ghc-paths-0.1.0.12-rev5.cabal 699 BLAKE2B c23c4c781ff3d47a8a01f067803fb1b71e34b954018990bf03ac81c42e6ca6bc434569c66b2d4cdb13b4f651fe3969a3b3323915a30bfd3d682c4522659044ba SHA512 c68d9f16c28bbac47d6831c5f385e4e21ce2b8188e7b04eb0531ca088b79c2f1169a36650fb5588f73a5e4d78307a0fbbb17af241b8bdc46b9c7dcde39b8d096
 DIST ghc-paths-0.1.0.12.tar.gz 2565 BLAKE2B 3e4783a854510a4ae6d6a9d5f4d0fefa7fbc03088aa298d8731c7bdf961ab47553b0e46c1b8d2f61193b669c43fc74e8eb6f948abba4419b0110772d56397c1d SHA512 1c66caf459f5783bde38a47ce1292bf5c47fef21e3f69d7f6c052b4eb39f446ed5decd38f0e4143a90d55ba44ebc0891b4497050cc652cbf3fcad636d45690e9
-DIST ghc-paths-0.1.0.9.tar.gz 2402 BLAKE2B ba84e058a09fabe4b386120855966daeef0d71e0ccc4f131cacdd12cfe064c415715ef3dcbc33a1c5f0e5339f58d61b37d8842c2ca0f97245f56926716bf834b SHA512 0aa38add4a6f27ced115d769603f98eff6fe3e8b60a6477f4b1e669031cbb6408b87d2fed023d790169b623b9cb2b7983871a9bf9d5cfcc298774a34808e2094
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
index 2eaacd92bdb9..c1b92212a47b 100644
--- a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
+++ b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.2.9999
 
@@ -10,29 +10,31 @@ CABAL_FEATURES="lib profile"
 inherit haskell-cabal
 
 DESCRIPTION="Knowledge of GHC's installation directories"
-HOMEPAGE="http://hackage.haskell.org/package/ghc-paths"
+HOMEPAGE="https://hackage.haskell.org/package/ghc-paths"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6 <dev-haskell/cabal-3.3
+	>=dev-haskell/cabal-1.6 <dev-haskell/cabal-3.7
 "
 
+# https://github.com/simonmar/ghc-paths/pull/26
+CABAL_CHDEPS=(
+	'Cabal >= 1.6 && <3.1' 'Cabal >= 1.6 && <3.7'
+)
+
 src_prepare() {
-	default
+	haskell-cabal_src_prepare
 	# ghc-patch it has awfully unportable (across cabal versions) ghc detection code
 	# but in gentoo we install it to fixed patch, so remove Setup.hs detection code
 	cabal-mksetup
 
-	cabal_chdeps \
-		'Cabal >= 1.6 && <3.1' 'Cabal >= 1.6 && <3.3'
-
 	# and use gentoo's hardcoded one:
 	# a few things we need to replace, and example values
 	# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild
new file mode 100644
index 000000000000..c2d544493b0d
--- /dev/null
+++ b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="Knowledge of GHC's installation directories"
+HOMEPAGE="https://hackage.haskell.org/package/ghc-paths"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1 <dev-haskell/cabal-3.11
+"
+
+src_prepare() {
+	haskell-cabal_src_prepare
+
+	# ghc-patch it has awfully unportable (across cabal versions) ghc detection code
+	# but in gentoo we install it to fixed patch, so remove Setup.hs detection code
+	cabal-mksetup
+
+	# and use gentoo's hardcoded one:
+	# a few things we need to replace, and example values
+	# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
+	# GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html
+	# GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg
+	# GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG)
+
+	cat >"${S}/GHC/Paths.hs" <<-EOF
+	module GHC.Paths ( ghc, ghc_pkg, libdir, docdir ) where
+
+	libdir, docdir, ghc, ghc_pkg :: FilePath
+
+	libdir  = "$(ghc-libdir)"
+	docdir  = "/usr/share/doc/ghc-$(ghc-version)/html"
+
+	ghc     = "$(ghc-getghc)"
+	ghc_pkg = "$(ghc-getghcpkg)"
+	EOF
+}
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild
deleted file mode 100644
index fcf3e44bde1e..000000000000
--- a/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# haddock feature is explicitely disabled, as this library can be used as haddock depend
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Knowledge of GHC's installation directories"
-HOMEPAGE="https://hackage.haskell.org/package/ghc-paths"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	# ghc-patch it has awfully unportable (across cabal versions) ghc detection code
-	# but in gentoo we install it to fixed patch, so remove Setup.hs detection code
-	cabal-mksetup
-
-	# and use gentoo's hardcoded one:
-	# a few things we need to replace, and example values
-	# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
-	# GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html
-	# GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg
-	# GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG)
-
-	cat >"${S}/GHC/Paths.hs" <<-EOF
-	module GHC.Paths ( ghc, ghc_pkg, libdir, docdir ) where
-
-	libdir, docdir, ghc, ghc_pkg :: FilePath
-
-	libdir  = "$(ghc-libdir)"
-	docdir  = "/usr/share/doc/ghc-$(ghc-version)/html"
-
-	ghc     = "$(ghc-getghc)"
-	ghc_pkg = "$(ghc-getghcpkg)"
-	EOF
-}
diff --git a/dev-haskell/ghc-paths/metadata.xml b/dev-haskell/ghc-paths/metadata.xml
index 522384de8446..f6c086c0de21 100644
--- a/dev-haskell/ghc-paths/metadata.xml
+++ b/dev-haskell/ghc-paths/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">ghc-paths</remote-id>
+		<remote-id type="github">simonmar/ghc-paths</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/ghc-syb-utils/Manifest b/dev-haskell/ghc-syb-utils/Manifest
deleted file mode 100644
index ca8d074b642a..000000000000
--- a/dev-haskell/ghc-syb-utils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ghc-syb-utils-0.2.3.tar.gz 4689 BLAKE2B c1403610fd6e34e97d68a2ad5ca2c74adbdf1e16fa3605a6350469ec20187aa0db90f8fb0484f7c1c60a4440310796c23d017433bad690ad71ac840915085efb SHA512 af311d21396c1f7e98c532b1192d2aad27a942f66f4e09eea4cb0d6c1fe444a49c4e14ce4030504f544c796818a887e1ce6bf828cbd28c69c1123e224793cd32
diff --git a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild
deleted file mode 100644
index 1bc6d6a5b89b..000000000000
--- a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate utilities for the GHC API"
-HOMEPAGE="https://github.com/nominolo/ghc-syb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/syb-0.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml
deleted file mode 100644
index 01a2a48cb9eb..000000000000
--- a/dev-haskell/ghc-syb-utils/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Scrap Your Boilerplate utilities for the GHC API.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">nominolo/ghc-syb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/gio/Manifest b/dev-haskell/gio/Manifest
deleted file mode 100644
index c5e0aa3bf801..000000000000
--- a/dev-haskell/gio/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gio-0.12.5.3.tar.gz 79099 BLAKE2B 0c54108185f183489ed342162766937d104a9cff9e169485fd049d81e67c140808241a7110d8fddebb0f7ad7f49ff1a408d67595012f973b979019db5ae553e0 SHA512 51a72df085091847967ddf37e707a479c055a1e39f81edd1a302f2bbc2f1a4214fd9ea82bafd5a32f5e045944fcfa64c6ba6427481acee820280456ae80f413f
-DIST gio-0.13.1.1.tar.gz 79378 BLAKE2B 03b0b3dbe73fca50dd913ea024534be31c6364c2bf7416aba0c6b4a09ac71b56bc01f3a147625f3d7b1871c945589d8841d2fab62637b40ba401d3e3e3986f5c SHA512 7256450cc3bfe5469ed304ea093fef9ee11033331e2520c9deb420ff725d95c5ebfbc8cdfa24d3138a1799b70ca178b8d113957f6e09b871f270c0af168207d9
-DIST gio-0.13.3.1.tar.gz 70058 BLAKE2B a5a7b0a7fd8da7feaa5e1f7af06bf67bdec2c95b6c14e607659d3a4d27e3ccc55bf14e84a530d311176eb3ee5daf781b4d37a92fcc21b7f976c909701fb3804b SHA512 3273de2a04afc90ae569f8c36147bb4391ee4d45b64e21baeb259d67489c40a1d497587647885137e90bba21e2a460430aa56138e2099ce9e1d105b876ef33e8
-DIST gio-0.13.6.0.tar.gz 70094 BLAKE2B 5c114db1ca43def45f2deea628e6d20343c3f27f5337b8f266e1a7c32e7d1300404d21543fa082db05d8e55527bb47d9abba14a6bccca0a8202b317dc8cfe13c SHA512 d9bd77f887d7112d878b7349b7c79dcaf483ac5567d9fea0e902c161700eeb9be9b574584b440ccd580c504b1b76b0bc2b4d6d30de2c3b1a05c72c8f67790de9
diff --git a/dev-haskell/gio/gio-0.12.5.3.ebuild b/dev-haskell/gio/gio-0.12.5.3.ebuild
deleted file mode 100644
index a8e5381d4ccd..000000000000
--- a/dev-haskell/gio/gio-0.12.5.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GIO"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.12.5.3:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gio/gio-0.13.1.1.ebuild b/dev-haskell/gio/gio-0.13.1.1.ebuild
deleted file mode 100644
index f89b58922adb..000000000000
--- a/dev-haskell/gio/gio-0.13.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to GIO"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gio/gio-0.13.3.1.ebuild b/dev-haskell/gio/gio-0.13.3.1.ebuild
deleted file mode 100644
index eed75f9f6f49..000000000000
--- a/dev-haskell/gio/gio-0.13.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to GIO"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gio/gio-0.13.6.0.ebuild b/dev-haskell/gio/gio-0.13.6.0.ebuild
deleted file mode 100644
index 277a31bb655d..000000000000
--- a/dev-haskell/gio/gio-0.13.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to GIO"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'Cabal >= 1.24 && < 2.5' 'Cabal >= 1.24 && < 3.1'
-}
diff --git a/dev-haskell/gio/metadata.xml b/dev-haskell/gio/metadata.xml
deleted file mode 100644
index 4f89c61927ae..000000000000
--- a/dev-haskell/gio/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		GIO is striving to provide a modern, easy-to-use VFS API that sits at the right level in the library stack.
-		The goal is to overcome the shortcomings of GnomeVFS and provide an API that is
-		so good that developers prefer it over raw POSIX calls.
-		Among other things that means using GObject.
-		It also means not cloning the POSIX API, but providing higher-level, document-centric interfaces.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/git-lfs/Manifest b/dev-haskell/git-lfs/Manifest
index 971868f91df7..a4c299b03043 100644
--- a/dev-haskell/git-lfs/Manifest
+++ b/dev-haskell/git-lfs/Manifest
@@ -1 +1 @@
-DIST git-lfs-1.1.0.tar.gz 16488 BLAKE2B 4902cada8c580abe20a3220d8f5eee8627f7f17a2f60cc876309665fde54afa27576b39165b939cb9a31b516db9fc26a01f89333a3cf1add84b595a9e6f303f0 SHA512 c662e7752ba9346b8adec5af225806f95702aaded3ea6b3d8e8871e923db24f8bd49a275fe7477cc44b65b35edab06fb7ab92f0e57d9bdd8af7b209c4adfa5c5
+DIST git-lfs-1.2.0.tar.gz 17277 BLAKE2B 6f9fb460dc7413e5a8a89a560f437a986c6d9cd140d1c4479cb1a8becd2aa478575261d83a3889167d26fe004a59af7b9c9364f3e2a2e15f08e22630b9d004fb SHA512 13d8c3c7c9844e935af278b4b6dc477b4ef069a3b61a5fea5bf28aadbd3ca4b475aa23701fe7be8a9468af78771d1fabda3e74c5d4b9a3fbb77ee8b803198f65
diff --git a/dev-haskell/git-lfs/git-lfs-1.1.0.ebuild b/dev-haskell/git-lfs/git-lfs-1.1.0.ebuild
deleted file mode 100644
index 5f154aaee200..000000000000
--- a/dev-haskell/git-lfs/git-lfs-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="git-lfs protocol"
-HOMEPAGE="http://hackage.haskell.org/package/git-lfs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.3:=[profile?] <=dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/case-insensitive-1.2:=[profile?] <=dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/http-client-0.5:=[profile?] <=dev-haskell/http-client-0.7:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?] <=dev-haskell/http-types-0.13:=[profile?]
-	>=dev-haskell/network-uri-2.6:=[profile?] <=dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <=dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.6.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4.0.1
-"
diff --git a/dev-haskell/git-lfs/git-lfs-1.2.0-r1.ebuild b/dev-haskell/git-lfs/git-lfs-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..70a2acec2e8f
--- /dev/null
+++ b/dev-haskell/git-lfs/git-lfs-1.2.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="git-lfs protocol"
+HOMEPAGE="https://hackage.haskell.org/package/git-lfs"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+	'aeson >= 1.3 && < 2.1' 'aeson >= 1.3'
+)
+
+RDEPEND="
+	>=dev-haskell/aeson-1.3:=[profile?]
+	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/http-client-0.5:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/git-lfs/metadata.xml b/dev-haskell/git-lfs/metadata.xml
index b7878815d80d..da00322873bd 100644
--- a/dev-haskell/git-lfs/metadata.xml
+++ b/dev-haskell/git-lfs/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">git-lfs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/githash/Manifest b/dev-haskell/githash/Manifest
deleted file mode 100644
index 08eaa362f74b..000000000000
--- a/dev-haskell/githash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST githash-0.1.3.3.tar.gz 6670 BLAKE2B 5d05a438ae6c17a0db9b2f58d3b7889ca461e12bb97e26d22319e667446be6423b0387465ecf438bb0cb94004aaeb380483d87be718b9077fb7f610a914e9905 SHA512 767f9e57819b0450a3f004e6f7ec333657fa76b4507cf89f16ccee44a8f986c972501a1177a4449dceba68568b744846f70dae9f35bfcbc1537de5cb3cead676
diff --git a/dev-haskell/githash/githash-0.1.3.3.ebuild b/dev-haskell/githash/githash-0.1.3.3.ebuild
deleted file mode 100644
index 774df22e9d6c..000000000000
--- a/dev-haskell/githash/githash-0.1.3.3.ebuild
+++ /dev/null
@@ -1,27 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compile git revision info into Haskell projects"
-HOMEPAGE="https://github.com/snoyberg/githash#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		dev-haskell/temporary
-		dev-haskell/unliftio )
-"
diff --git a/dev-haskell/githash/metadata.xml b/dev-haskell/githash/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/githash/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/gitrev/Manifest b/dev-haskell/gitrev/Manifest
deleted file mode 100644
index 7ec2ae664177..000000000000
--- a/dev-haskell/gitrev/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gitrev-1.2.0.tar.gz 3238 BLAKE2B 09d1a3bc132c7e28d65246e3805323f610f5d9f9f129e1f0f26316523c11639ddb44d8b439b7de979976431d4257940387ba6ae8311058fb1eac3aa3d19e1360 SHA512 ba794dfdec21a5b8ca19dff3ce712cb31f254ac59e166aad4fd33435649a7a5209fe9952cff230edc88d81e3622fe3b4f6199f3ef89e153d6e31cc6bca14d303
-DIST gitrev-1.3.1.tar.gz 3756 BLAKE2B 6871cb2c036bba9d6e727749778e0e16939a4ff84cf5ca74caf0c198a998265a8cbeea2019ba12e1e6190413499ed1b82874bd002416d620b70bcfd85bfcce1f SHA512 8639e356490fba3461f8d7030326a6913846427255524213a73ee2ac5abf708f75efed99a0d9d574a73a2db88833814d1b634e6a5ec93c4bc03052435e0ea4cd
diff --git a/dev-haskell/gitrev/gitrev-1.2.0.ebuild b/dev-haskell/gitrev/gitrev-1.2.0.ebuild
deleted file mode 100644
index a4a3bb8e7170..000000000000
--- a/dev-haskell/gitrev/gitrev-1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compile git revision info into Haskell projects"
-HOMEPAGE="https://github.com/acfoltzer/gitrev"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/gitrev/gitrev-1.3.1.ebuild b/dev-haskell/gitrev/gitrev-1.3.1.ebuild
deleted file mode 100644
index 4dd5cd2f12d2..000000000000
--- a/dev-haskell/gitrev/gitrev-1.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compile git revision info into Haskell projects"
-HOMEPAGE="https://github.com/acfoltzer/gitrev"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.6.0:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/gitrev/metadata.xml b/dev-haskell/gitrev/metadata.xml
deleted file mode 100644
index 8f5eeed7fe9d..000000000000
--- a/dev-haskell/gitrev/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Some handy Template Haskell splices for including the current git hash and branch in the code of your project. Useful for including in panic messages, @--version@ output, or diagnostic info for more informative bug reports.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">acfoltzer/gitrev</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/glade/Manifest b/dev-haskell/glade/Manifest
deleted file mode 100644
index 73929f4f6f72..000000000000
--- a/dev-haskell/glade/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST glade-0.13.1.tar.gz 145648 BLAKE2B 31d650bdbe848b2e14efadc90f074664775cfa040def9328c084871efbd708a1bd03d34047d83f9a76cfe4069f14f787c50bde419abb0539597be2ea4a806032 SHA512 3e4282c4a8170351a6c82bf346685da7dd192d9e0139d8ef3f104f085b10686d1b89a77f01f1edc500f5d9584c1c31a63d1f89dc48a1a9a3f100207ae425ddce
diff --git a/dev-haskell/glade/files/glade-0.13.1-glib-2.62.patch b/dev-haskell/glade/files/glade-0.13.1-glib-2.62.patch
deleted file mode 100644
index 953c9df0ec13..000000000000
--- a/dev-haskell/glade/files/glade-0.13.1-glib-2.62.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/glade.cabal
-+++ b/glade.cabal
-@@ -82,6 +82,7 @@ Library
-         default-language: Haskell98
-         default-extensions: ForeignFunctionInterface
- 
-+        cpp-options: -D__attribute__(A)=
-         if os(darwin)
-           cpp-options: -U__BLOCKS__ -D__attribute__(A)= -D_Nullable= -D_Nonnull=
- 
diff --git a/dev-haskell/glade/glade-0.13.1.ebuild b/dev-haskell/glade/glade-0.13.1.ebuild
deleted file mode 100644
index d6e64bb0411d..000000000000
--- a/dev-haskell/glade/glade-0.13.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the glade library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.13.4:0=[profile?] <dev-haskell/glib-0.14:0=[profile?]
-	>=dev-haskell/gtk-0.14.5:2=[profile?] <dev-haskell/gtk-0.15:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	gnome-base/libglade:2.0
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0:0= <dev-haskell/gtk2hs-buildtools-0.14:0=
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.13.1-glib-2.62.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'Cabal >= 1.24 && < 1.25' 'Cabal >= 1.24'
-}
diff --git a/dev-haskell/glade/metadata.xml b/dev-haskell/glade/metadata.xml
deleted file mode 100644
index 2ba679a49549..000000000000
--- a/dev-haskell/glade/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library allows to load externally stored user interfaces into
-		programs. This allows alteration of the interface without recompilation
-		of the program.
-		
-		Note that this functionality is now provided in gtk directly
-		(as of version 2.12 of the gtk+ C lib) by the
-		Graphics.UI.Gtk.Builder module.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/glib/Manifest b/dev-haskell/glib/Manifest
index 7ee2ddb0f7d9..04856c88978b 100644
--- a/dev-haskell/glib/Manifest
+++ b/dev-haskell/glib/Manifest
@@ -1,4 +1 @@
-DIST glib-0.12.5.4.tar.gz 46080 BLAKE2B f787a9dddfd3eb826fb156a4c53ee2d75d7fd87c23deb39af71e08a6cbe84cba2bdf9da3808c9cdc49379f46e740d3dcb98381fa835b665351983c28e1a74d57 SHA512 2ae2b70d839c88461c6dc38bd370e336b004b94316cbffee158203a311e8b9d0ffe93063d431740f1b3c42d2c55bc8fd46ebfbd4e591a447704ceb68a5815312
-DIST glib-0.13.2.2.tar.gz 48662 BLAKE2B c64359438c7f202036f27df68b6210b1f8011200ae69d060878d30a9487e8634e48e3afc195263710cd8f1c066e95b77a3a16f265e576118dffd232106dbf075 SHA512 97c49911cc53a1a01df4cdacb0aa715b41988d3689a7dbdd2c9499c9a4858497f3deb6fb492394751210899af5569efba2171468417c5961b7fb73863ce652c1
-DIST glib-0.13.4.1.tar.gz 39441 BLAKE2B e6340021276a8bc5de4101c910a5d03c16474ddff402f3327433ca4b03a7bd300195b45045d99a9379b6f21d6474ef3043f77405060d8baca6285fca3bf42f6f SHA512 537f70688e398b8c68727b8260080790569e7f1b87633912a1438c5b1ed590221ac633168a83e7bc49728292ae53f8eaaf268d78c0be0df81527c5a3ce810869
-DIST glib-0.13.7.0.tar.gz 39518 BLAKE2B 85dd85a491f0263715cd6633282a2028cec2ccd7f12e49ac6029aa7420468f52777760cb339b35ce8123c8c0feb5947324bcb0084e8214b7c8c6919169b42ab7 SHA512 507fdcc6d686ea25b46d9d6f112aa29ebf751b3db99a19c9938ebd8675a8c167aafe151c96fe115662d15696c79aada93a0b197450159e8f45bc329e3de4455a
+DIST glib-0.13.10.0.tar.gz 39410 BLAKE2B 4de054903034e366becd3735c8bf4a6900e39906d0aac526e7994cd0b8dae35765e88cbbc4062b138f88f33d37b96a637980042c310220c4c05ab27e0ed637d6 SHA512 59f85b442140c12338b9fecb0f51cee5aba64793f2c9baef9b50490024f58b27f6d1a525d03cf7bbd37eae49d9a0bbd75861dfc21c95a6e24de4cc991559e402
diff --git a/dev-haskell/glib/glib-0.12.5.4.ebuild b/dev-haskell/glib/glib-0.12.5.4.ebuild
deleted file mode 100644
index 9ebaa1f9aad5..000000000000
--- a/dev-haskell/glib/glib-0.12.5.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closure-signals"
-
-RDEPEND=">=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closure-signals closure_signals)
-}
diff --git a/dev-haskell/glib/glib-0.13.10.0.ebuild b/dev-haskell/glib/glib-0.13.10.0.ebuild
new file mode 100644
index 000000000000..654997a0c298
--- /dev/null
+++ b/dev-haskell/glib/glib-0.13.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
+HOMEPAGE="https://projects.haskell.org/gtk2hs/"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+closure-signals"
+
+GHC_BOOTSTRAP_PACKAGES=(
+	gtk2hs-buildtools
+)
+
+RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0 <dev-haskell/cabal-3.11
+"
+BDEPEND=">=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag closure-signals closure_signals)
+}
diff --git a/dev-haskell/glib/glib-0.13.2.2.ebuild b/dev-haskell/glib/glib-0.13.2.2.ebuild
deleted file mode 100644
index e6e1436c52b8..000000000000
--- a/dev-haskell/glib/glib-0.13.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closure-signals"
-
-RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closure-signals closure_signals)
-}
diff --git a/dev-haskell/glib/glib-0.13.4.1.ebuild b/dev-haskell/glib/glib-0.13.4.1.ebuild
deleted file mode 100644
index 76c1084d0fa9..000000000000
--- a/dev-haskell/glib/glib-0.13.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closure-signals"
-
-RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-1.25
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closure-signals closure_signals)
-}
diff --git a/dev-haskell/glib/glib-0.13.7.0.ebuild b/dev-haskell/glib/glib-0.13.7.0.ebuild
deleted file mode 100644
index 0b076c520420..000000000000
--- a/dev-haskell/glib/glib-0.13.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closure-signals"
-
-RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'Cabal >= 1.24 && < 2.5' 'Cabal >= 1.24 && < 3.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closure-signals closure_signals)
-}
diff --git a/dev-haskell/glib/metadata.xml b/dev-haskell/glib/metadata.xml
index bf0f78078605..53e5649323ab 100644
--- a/dev-haskell/glib/metadata.xml
+++ b/dev-haskell/glib/metadata.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The GNU Library is a collection of C data structures and utility
-		function for dealing with Unicode. This package only binds as
-		much functionality as required to support the packages that
-		wrap libraries that are themselves based on GLib.
-	</longdescription>
 	<use>
-		<flag name="closure-signals">Use the the GClosure-based signals implementation.</flag>
+		<flag name="closure-signals">Use the the GClosure-based signals
+&#9;&#9;implementation.</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">glib</remote-id>
+		<remote-id type="github">gtk2hs/gtk2hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/glob/Manifest b/dev-haskell/glob/Manifest
index 590d4358d0d8..1e723dd0ef1b 100644
--- a/dev-haskell/glob/Manifest
+++ b/dev-haskell/glob/Manifest
@@ -1,3 +1,2 @@
-DIST Glob-0.7.14.tar.gz 23928 BLAKE2B 0f5c58f55f182051326ac2e52b3332b9f6dd4a907cc179fd3d79f1e5973a99f038fe82c1c2d517dd281880657fe465544fe5275ffc864b67506318de01959ce0 SHA512 1ad470c90da94445bac959326327166cbaed2bd9abd6b861dfe1ff4849edc4cec00baa6d8d160f2513a2d0c036075c8f80ba795d70c85f2de447254b893dfb0e
-DIST Glob-0.7.5.tar.gz 23443 BLAKE2B 9664399f418ad2979d05053b09258b9c53a877274d806ef3efb8797452234663cad53448d5ef7b7b79cda6b52328e753f53a5ff2f2022516594b6d19729afbef SHA512 7397a6003b73fba31b1515ada667f2ff536cb1cc76d552e43167135877397dfc693a563abde11ca2912e0c005a99a37b45e564becadbd47d2c4e4f40ca4245b1
-DIST Glob-0.9.3.tar.gz 29358 BLAKE2B de4a69e816b0e6e83e411c497eeb975ce6b644367c7204df0e40081f330854274ecd43e53f848b42a872de9ed6515b8a773d96fef7a7286f7a141b490cc570df SHA512 4b677745881b318a5a82668d56c4547f8d1173be55cb1589ad0b9e62622151d771d3a40479126749135cbc98f56d8cfea3619358db5929c890838d3e0b85a536
+DIST Glob-0.10.2-rev3.cabal 2938 BLAKE2B 52a1600d5eaa09126757fdc00e009708e9c3d8408523535835f8598906e24aa0590114aa75fcc5e57d0ebf6d38a2a387650824b7eb2f8ae7b79fc0f62eba0912 SHA512 8802d8cd4d19a5ffa4dda9fb55d3454de762f2701d9cc720d5a0841848a736b2470e67a9fb19a5756bd69dd89c3fec20b38466fa49d7ceb5af7ba10bf6c165da
+DIST Glob-0.10.2.tar.gz 30226 BLAKE2B b729e1b3e36d2161db185b882dcc2d331f35a284f89cb149a9210c082b1c11a3cbced76f299348a511ce1a32a5df0acdbfd4222145c62ac6e94536030f88ca70 SHA512 cd3c3fb00fad3b3e8d9ae2856a76d0d1688885ecec0b083eed87a4c1cf46111df747e66ff3e8bab2ffaf2a5f776a791442c7e0eefcf58f9d1e15e341b4c35a12
diff --git a/dev-haskell/glob/glob-0.10.2.ebuild b/dev-haskell/glob/glob-0.10.2.ebuild
new file mode 100644
index 000000000000..1945e66ecb33
--- /dev/null
+++ b/dev-haskell/glob/glob-0.10.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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_PN="Glob"
+CABAL_P="${CABAL_PN}-${PV}"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+S="${WORKDIR}/${CABAL_P}"
+CABAL_FILE="${S}/${CABAL_PN}.cabal"
+CABAL_DISTFILE="${CABAL_P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Globbing library"
+HOMEPAGE="https://iki.fi/matti.niemenmaa/glob/"
+SRC_URI="https://hackage.haskell.org/package/${CABAL_P}/${CABAL_P}.tar.gz
+	https://hackage.haskell.org/package/${CABAL_P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/dlist-0.4:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2
+		>=dev-haskell/test-framework-0.2
+		>=dev-haskell/test-framework-hunit-0.2
+		>=dev-haskell/test-framework-quickcheck2-0.3 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/glob/glob-0.7.14.ebuild b/dev-haskell/glob/glob-0.7.14.ebuild
deleted file mode 100644
index aab59674213e..000000000000
--- a/dev-haskell/glob/glob-0.7.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="Glob"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Globbing library"
-HOMEPAGE="http://iki.fi/matti.niemenmaa/glob/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.2 <dev-haskell/test-framework-1
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-1
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-1 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/glob/glob-0.7.5.ebuild b/dev-haskell/glob/glob-0.7.5.ebuild
deleted file mode 100644
index 862573454c9d..000000000000
--- a/dev-haskell/glob/glob-0.7.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Glob"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Globbing library"
-HOMEPAGE="http://iki.fi/matti.niemenmaa/glob/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.8:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'filepath     >= 1.1 && < 1.4' 'filepath     >= 1.1'
-}
diff --git a/dev-haskell/glob/glob-0.9.3.ebuild b/dev-haskell/glob/glob-0.9.3.ebuild
deleted file mode 100644
index 9afef6926486..000000000000
--- a/dev-haskell/glob/glob-0.9.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="Glob"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Globbing library"
-HOMEPAGE="http://iki.fi/matti.niemenmaa/glob/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.4:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.2 <dev-haskell/test-framework-1
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-1
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-1 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/glob/metadata.xml b/dev-haskell/glob/metadata.xml
index 3497c902c48e..937381521944 100644
--- a/dev-haskell/glob/metadata.xml
+++ b/dev-haskell/glob/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A library for globbing: matching patterns against file paths.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/gluraw/Manifest b/dev-haskell/gluraw/Manifest
deleted file mode 100644
index 245c6d94f51d..000000000000
--- a/dev-haskell/gluraw/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST GLURaw-1.3.0.0.tar.gz 7779 BLAKE2B 7de3ec011ffaeb9cb098d0253452433c1b2c0214b6345116842a21723e9c59b1edf4d4dad1a62a075b105c2df2dcfba1bf19180a8b5c09d18e9d08b80e3be316 SHA512 a51f62ab3465913216c43686c2ceac16ab78e24fabe740afec4264afd5afbfc1fc45d535b08374d719ca38dad9bb12a7227a01b1cfaee044f549fd4f4f8900b6
-DIST GLURaw-1.4.0.1.tar.gz 8445 BLAKE2B fbfe156d291fa830c91672b2c8aaff4c60c04ff990af66991da1fd8845645dc876751648f15c81c2004176d839b75a9b595be9513eb3970aad1d4fd17b5400b4 SHA512 48eb52f7923148c014f89d07029cb7293b325f9bc0d3786c685f1de73a58553602d77edd8261da3d3bdc7090249d11234ef97e76ba436bcd9acc2a8cdec78bed
-DIST GLURaw-1.5.0.1.tar.gz 10121 BLAKE2B e21d22e49349becd367686684e87f915cf42a5afb50fd03a2b811ff1047f5bc60eb709b09fcd935497a7a0512bb219a646705011dc0046e132034f49344f9eeb SHA512 085e28e63a28a72e766ec1404d4cf4f3189251e5a159fc00f5d06916a6e38ef80cf9f319e06e3a751db2354042aca4e74e5a736bba966457edc0f24197c950ad
-DIST GLURaw-2.0.0.3.tar.gz 10515 BLAKE2B eab97d41f801c5607a25e42463accdc615c4c2d21126481f472ff0faa78341d04956834eb7c6fe738c6670a788d5c7b729a08e6de234a1497391be3b8520d0f1 SHA512 dccd459c9392b1608d91cb80904346472209cb5dc8f2afbbb1ad07e24ddc0c8affc2eda4bb9aec9b2bc0e94e4546685cb60239c5687c629a8184b91162b4cc56
-DIST GLURaw-2.0.0.4.tar.gz 10557 BLAKE2B 6e25f2167bf4fd9307a07c1081966cd2072d145317752a53d104a0dcc9ad282f83c9d98ba2a0ccab14d900d2f1ab0b0e0d381aef651baf4f077d830de8ef0803 SHA512 971402ed5fd84e8f0e6abca27fd78bee298750930901e66cc782b53d79d28093085120c3fc373a38d5a1354d55f69e1ec1c5ede5a0b1f9a019cf705f11ffcfcc
diff --git a/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild b/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild
deleted file mode 100644
index 44f7f1eb1b3e..000000000000
--- a/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/openglraw-1.3*:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		virtual/glu"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild b/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild
deleted file mode 100644
index 7f29bda139a3..000000000000
--- a/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/openglraw-1.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/gluraw/gluraw-1.5.0.1.ebuild b/dev-haskell/gluraw/gluraw-1.5.0.1.ebuild
deleted file mode 100644
index b7191fc14a87..000000000000
--- a/dev-haskell/gluraw/gluraw-1.5.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/openglraw-2.4:=[profile?] <dev-haskell/openglraw-2.6:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/gluraw/gluraw-2.0.0.3.ebuild b/dev-haskell/gluraw/gluraw-2.0.0.3.ebuild
deleted file mode 100644
index 4530e72f9104..000000000000
--- a/dev-haskell/gluraw/gluraw-2.0.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild b/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild
deleted file mode 100644
index 4eb849248c7b..000000000000
--- a/dev-haskell/gluraw/gluraw-2.0.0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLURaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/gluraw/metadata.xml b/dev-haskell/gluraw/metadata.xml
deleted file mode 100644
index b0f883df7ad3..000000000000
--- a/dev-haskell/gluraw/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library. It is
-		basically a 1:1 mapping of GLU's C API, intended as a basis for a nicer
-		interface.
-		
-		OpenGL is the industry's most widely used and supported 2D and 3D graphics
-		application programming interface (API), incorporating a broad set of
-		rendering, texture mapping, special effects, and other powerful visualization
-		functions. For more information about OpenGL and its various extensions,
-		please see &lt;http://www.opengl.org/&gt;
-		and &lt;http://www.opengl.org/registry/&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/glut/Manifest b/dev-haskell/glut/Manifest
deleted file mode 100644
index 08cd0f8fe9c4..000000000000
--- a/dev-haskell/glut/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GLUT-2.5.1.1.tar.gz 655292 BLAKE2B 49347d5ffdb887388cd862902bd548dfdb1a4a024d98f0a5de64cd2e6cb7cf7021956ee170439d6cea145c65a5f3ebf9f4e9f2b6e7e38f10be3cb92c276fc8f4 SHA512 79895fea8b49178a93f59efa094a9eca26d23c2bb4b07902d83c8403e8c45c3a10a1961177bfc272339be279d012a0e8ff273881bcc54128fc40ff11f5f8bdd9
-DIST GLUT-2.7.0.11.tar.gz 656855 BLAKE2B cb45b6207a2af626c251d8c3abe64fbf295db5f7c396cb99bedb6326ed9a16e416c5e8de1f402926edf0109f52e79be1a7c7087adb388f27e07394e53b6e95c3 SHA512 aa9977f2d2141dc4fbc38915ffe8bfd6cf5a5c93502d3b813a41195556ada91644774869a6daa33f44964c517370e006830578b9b1b5cb59b7b49abedb1dcc66
-DIST GLUT-2.7.0.15.tar.gz 654907 BLAKE2B c955d2942ffa2ac8d8370726cc32a67772dba2e343f2ad0a10e24134ae9bf5762bb108292e17275db3665572379bbaab55f605b79973bf90b066818934501aeb SHA512 d4ee183f7a9600e86ddea7783e3236ab33510217b6c1e815fb46936e95db851ea35c6b504142595779665b74912fcc312cbee8462e4719e78e9d5c99913692de
diff --git a/dev-haskell/glut/glut-2.5.1.1.ebuild b/dev-haskell/glut/glut-2.5.1.1.ebuild
deleted file mode 100644
index ec8a39aa9374..000000000000
--- a/dev-haskell/glut/glut-2.5.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/opengl-2.8.0.0:=[profile?]
-	>=dev-haskell/openglraw-1.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	media-libs/freeglut
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/glut/glut-2.7.0.11.ebuild b/dev-haskell/glut/glut-2.7.0.11.ebuild
deleted file mode 100644
index 0a7e00743852..000000000000
--- a/dev-haskell/glut/glut-2.7.0.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?]
-			>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples buildexamples) \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/glut/glut-2.7.0.15.ebuild b/dev-haskell/glut/glut-2.7.0.15.ebuild
deleted file mode 100644
index 851b09bc73f4..000000000000
--- a/dev-haskell/glut/glut-2.7.0.15.ebuild
+++ /dev/null
@@ -1,40 +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.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="GLUT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL Utility Toolkit"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	examples? ( >=dev-haskell/openglraw-1.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?]
-			>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples buildexamples) \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/glut/metadata.xml b/dev-haskell/glut/metadata.xml
deleted file mode 100644
index 586b21373af3..000000000000
--- a/dev-haskell/glut/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell binding for the OpenGL Utility Toolkit, a window system independent
-		toolkit for writing OpenGL programs. For more information about the C library
-		on which this binding is based, please see:
-		&lt;http://www.opengl.org/resources/libraries/glut/&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gnuidn/Manifest b/dev-haskell/gnuidn/Manifest
deleted file mode 100644
index 61d83c5822a0..000000000000
--- a/dev-haskell/gnuidn/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gnuidn-0.2.1.tar.gz 16392 BLAKE2B cad4e9d5a03a90aa41a305e5f9424b7a2fc1a4bdaf19cb79ed7e4449f6bc999c851261b289094516e3d99455ae87f1b27a8bfbaaa46ff402f386f1c458ed1690 SHA512 f22ab90cf21b01c899ab61e231afefbb97f1f831a0dd8c32c405e381f3d3a01864c1208d0867d09e773e05d5a8a69d1f8303e35337ea51ce1277a47f9574e1ae
-DIST gnuidn-0.2.2.tar.gz 17534 BLAKE2B e6f152145bc7626dfa9757477970d6cd6066d47350d7ccb25c99ecc8b33406c54634cbf6829ab08c5d8fc7987277e110429899436c7b99d71aafef0ac496dbb7 SHA512 4ac894ba4cc4fb9fd90ccea55fda342cd0dadc863a091d31287b19117ec1e545a23b7fb69db02bbb8ee9eb84856acb51f3ab0d7778f4ca3da290dfcbc7ef27ac
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
deleted file mode 100644
index b7ba91e322d3..000000000000
--- a/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU IDN"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnuidn/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	net-dns/libidn
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.6.0.3
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
deleted file mode 100644
index d5bd3de599cc..000000000000
--- a/dev-haskell/gnuidn/gnuidn-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: uses dev-haskell/chell-quickcheck
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU IDN"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnuidn/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	net-dns/libidn:0=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.8
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild
deleted file mode 100644
index 3d7f79e6c4b8..000000000000
--- a/dev-haskell/gnuidn/gnuidn-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU IDN"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnuidn/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	net-dns/libidn
-"
-DEPEND="${RDEPEND}
-	dev-haskell/c2hs
-	>=dev-haskell/cabal-1.8
-	virtual/pkgconfig
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		>=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/gnuidn/metadata.xml b/dev-haskell/gnuidn/metadata.xml
deleted file mode 100644
index 2cb65de0d577..000000000000
--- a/dev-haskell/gnuidn/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Bindings for GNU IDN
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gnutls/Manifest b/dev-haskell/gnutls/Manifest
deleted file mode 100644
index 3778d2d7dac5..000000000000
--- a/dev-haskell/gnutls/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnutls-0.2.tar.gz 17272 BLAKE2B 2412f9a5f7a74054317f6f4c54c5813a897976da2e48a534a5a12557f04766dad680638e6f61071e9721d84ec1a4ff02b72dbf531ed392b1be6c0b5280919092 SHA512 9b5e3083fae30e4ac8584c825ed1f1c07b24136ca6d30c627f17d1c7793a515a091919784791b3a5bcd05038d8d43419802e036cefe8525efac9ee3f9ebf9e8b
diff --git a/dev-haskell/gnutls/gnutls-0.2.ebuild b/dev-haskell/gnutls/gnutls-0.2.ebuild
deleted file mode 100644
index b4f07fc9a556..000000000000
--- a/dev-haskell/gnutls/gnutls-0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU libgnutls"
-HOMEPAGE="https://john-millikin.com/software/haskell-gnutls/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	net-libs/gnutls:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gnutls/metadata.xml b/dev-haskell/gnutls/metadata.xml
deleted file mode 100644
index 85d7c5520de5..000000000000
--- a/dev-haskell/gnutls/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		You almost certainly don't want to depend on this release.
-		
-		This is a pre-alpha, almost useless release; its only purpose is to enable
-		TLS support in some of my other libraries. More complete bindings for GNU TLS
-		will be released at a later date.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/graphviz/Manifest b/dev-haskell/graphviz/Manifest
deleted file mode 100644
index 0ba928491b62..000000000000
--- a/dev-haskell/graphviz/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST graphviz-2999.18.0.2.tar.gz 223908 BLAKE2B 2f425cad55622a519ae6d6641bda6340c0dca63ea800fdd77a2c66bc4f4ad06595499089c3a7857cdc02be1f031bd91b94a9eb025e206990942ded6ee22745a4 SHA512 8b27a81af2d31780801534f785bfda1dfbd127e176fa2c4bada2b33a7c80166fbb0efa67706296201bb19d201b8e2ac56453be0d8fcb488b93feb95d2acd8a09
-DIST graphviz-2999.18.1.2.tar.gz 222546 BLAKE2B 43acbf090a0396041398e54461627339b914c590fcb10421ac3299d68805b4aaf2637a65987d6c9a1e45cc96e2e536ecf11eb88ac6a62fe92a56c1fd503e4bae SHA512 1e0bc5b72b934febb923c13052f83db12270954e37483f46c64db8a23eb7ea3894b72c8e2cb303cde6bec30f75a28897c53d81e92fe9489ec21a4589e648dd3f
-DIST graphviz-2999.20.0.4.tar.gz 222563 BLAKE2B 5c7f57c8c78d9711cca48372aa4832bc8b18656031bd51595aaad9e1428314d04a913ab6c9bce62ada407954c6db47224e26515c04fce1ceed5ce3a91d59dcd5 SHA512 fc0a959e642e245cea254ccec9b1bb36b9eace61da2f8350ea0961f7fdffe6c5d5f42cde068201e6110ed71db0dcaab3c14cced431768ef5ed7ae76b0e5b5e9b
diff --git a/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild b/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild
deleted file mode 100644
index 0eacedc6af69..000000000000
--- a/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -test-parsing
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Graphviz for graph visualisation"
-HOMEPAGE="http://projects.haskell.org/graphviz/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # too slow
-
-RDEPEND=">=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
-	>=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.8:=[profile?]
-	>=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/wl-pprint-text-1.1.0.0:=[profile?] <dev-haskell/wl-pprint-text-1.2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3
-		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.9 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'polyparse >=1.9 && <1.12' 'polyparse >=1.9'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test-parsing
-}
diff --git a/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild b/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
deleted file mode 100644
index 5628b3b5ec54..000000000000
--- a/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -test-parsing
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Graphviz for graph visualisation"
-HOMEPAGE="http://projects.haskell.org/graphviz/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
-	>=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.13:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/wl-pprint-text-1.1.0.0:=[profile?] <dev-haskell/wl-pprint-text-1.2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3
-		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.10 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test-parsing
-}
diff --git a/dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild b/dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild
deleted file mode 100644
index 1891e83361c0..000000000000
--- a/dev-haskell/graphviz/graphviz-2999.20.0.4.ebuild
+++ /dev/null
@@ -1,52 +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
-#hackport: flags: -test-parsing
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to Graphviz for graph visualisation"
-HOMEPAGE="http://projects.haskell.org/graphviz/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # 30 examples, 3 failures, also known to fail here on previous version
-
-RDEPEND=">=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
-	>=dev-haskell/dlist-0.5:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fgl-5.4:=[profile?] <dev-haskell/fgl-5.8:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/polyparse-1.9:=[profile?] <dev-haskell/polyparse-1.14:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/wl-pprint-text-1.2:=[profile?] <dev-haskell/wl-pprint-text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( >=dev-haskell/fgl-5.5.0.0
-		>=dev-haskell/fgl-arbitrary-0.2 <dev-haskell/fgl-arbitrary-0.3
-		>=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.8
-		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.14 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'hspec >= 2.1 && < 2.8' 'hspec >= 2.1' \
-		'polyparse >=1.9 && <1.14' 'polyparse >=1.9'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test-parsing
-}
diff --git a/dev-haskell/graphviz/metadata.xml b/dev-haskell/graphviz/metadata.xml
deleted file mode 100644
index 01b1d2a5ff68..000000000000
--- a/dev-haskell/graphviz/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides bindings for the Dot language used by the
-		Graphviz (&lt;http://graphviz.org/&gt;) suite of programs for visualising
-		graphs, as well as functions to call those programs.
-		
-		Main features of the graphviz library include:
-		
-		* Almost complete coverage of all Graphviz attributes and syntax.
-		
-		* Support for specifying clusters.
-		
-		* The ability to use a custom node type.
-		
-		* Functions for running a Graphviz layout tool with all specified
-		output types.
-		
-		* The ability to not only generate but also parse Dot code with two
-		options: strict and liberal (in terms of ordering of statements).
-		
-		* Functions to convert FGL graphs and other graph-like data structures
-		to Dot code - including support to group them into clusters - with a
-		high degree of customisation by specifying which attributes to use
-		and limited support for the inverse operation.
-		
-		* Round-trip support for passing an FGL graph through Graphviz to
-		augment node and edge labels with positional information, etc.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gridtables/Manifest b/dev-haskell/gridtables/Manifest
new file mode 100644
index 000000000000..841194af0442
--- /dev/null
+++ b/dev-haskell/gridtables/Manifest
@@ -0,0 +1 @@
+DIST gridtables-0.1.0.0.tar.gz 12279 BLAKE2B 046a97927ec0e0c78db52ab6f05c53bd0c81c08ac85fd6916044dd4f9f12b7e09c3e2b2ab3688bc922f295947a9273d1a83d5a56094642be3cefe1c033dc4b5e SHA512 c83a299b73df7e4bb4cbfe1c74a300f06708e7cbe516c369b77d9d83108da45f90b3cd704d8960071b5dcbf5dbd20abe3fea11c197668b515a71434e2e04943c
diff --git a/dev-haskell/gridtables/gridtables-0.1.0.0.ebuild b/dev-haskell/gridtables/gridtables-0.1.0.0.ebuild
new file mode 100644
index 000000000000..ca7f98a0ef30
--- /dev/null
+++ b/dev-haskell/gridtables/gridtables-0.1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parser for reStructuredText-style grid tables"
+HOMEPAGE="https://github.com/tarleb/gridtables"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/doclayout:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9 )
+"
diff --git a/dev-haskell/gridtables/metadata.xml b/dev-haskell/gridtables/metadata.xml
new file mode 100644
index 000000000000..abeb39d51c61
--- /dev/null
+++ b/dev-haskell/gridtables/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">gridtables</remote-id>
+		<remote-id type="github">tarleb/gridtables</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/groupoids/Manifest b/dev-haskell/groupoids/Manifest
deleted file mode 100644
index 4ee605db4792..000000000000
--- a/dev-haskell/groupoids/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST groupoids-3.0.1.1.tar.gz 2935 BLAKE2B ce54406ce4e8afc37f1f66605dd2fbddc0edbb9a4e95fb13850c4c58c8f91cacfa3a415621fe74239039dc5fd2928ca24b8ecc2d07090b86fd4f92a15af4eed1 SHA512 ebb8976a43f1486871a5ebcb5c3abef85bf95725e9f75e12396feadd8f9a883432f66bc65da5efe18b2455d8a6386e2b7e262f6c33467b0d22e2667312911e82
-DIST groupoids-4.0.tar.gz 2414 BLAKE2B 0576f3c2eb9b5a097805c6db25889a264205029ed67cf9de8769305e4f89b6880ddd1073ba6126eb5340366762e6820d7e759a21be76c34d74db0abab378a266 SHA512 d0aacc582a1d03ab42ce900992e9f9c3cec47da653c5a472934361c5656cbad6b81b18065cf3968ccc6c4d8f239329f7f0213745d2b0d78e2c74ad3d59bec289
diff --git a/dev-haskell/groupoids/groupoids-3.0.1.1.ebuild b/dev-haskell/groupoids/groupoids-3.0.1.1.ebuild
deleted file mode 100644
index 59e90df82626..000000000000
--- a/dev-haskell/groupoids/groupoids-3.0.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Groupoids"
-HOMEPAGE="https://github.com/ekmett/groupoids/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/groupoids/groupoids-4.0.ebuild b/dev-haskell/groupoids/groupoids-4.0.ebuild
deleted file mode 100644
index 84a72c93f9cb..000000000000
--- a/dev-haskell/groupoids/groupoids-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been absorbed into semigroupoids 4.0"
-HOMEPAGE="https://github.com/ekmett/groupoids/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-4.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/groupoids/metadata.xml b/dev-haskell/groupoids/metadata.xml
deleted file mode 100644
index 997de60dc21d..000000000000
--- a/dev-haskell/groupoids/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 Groupoids
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/groupoids</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/gsasl/Manifest b/dev-haskell/gsasl/Manifest
deleted file mode 100644
index c7ecf3f3a3a1..000000000000
--- a/dev-haskell/gsasl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gsasl-0.3.6.tar.gz 20170 BLAKE2B b9b4e18a3e19ebccec6889b1767fd415920b23c083fc96c835aa1d3a9e0598c295f794ca897dd97f19a02bfe7d4c1ebe6986f1a27805424d4668d29a1b1d3b2d SHA512 657b3154d32d5c40eca79fa8cc0fd7f2dfce2d5d934f0388e3a16db15d513b18f5a25479b9f71ee164f999de9748f83e63f0334f43ef31def944c987e7186122
diff --git a/dev-haskell/gsasl/gsasl-0.3.6.ebuild b/dev-haskell/gsasl/gsasl-0.3.6.ebuild
deleted file mode 100644
index d17a2682fd88..000000000000
--- a/dev-haskell/gsasl/gsasl-0.3.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for GNU libgsasl"
-HOMEPAGE="https://john-millikin.com/software/haskell-gsasl/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/gsasl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/gsasl/metadata.xml b/dev-haskell/gsasl/metadata.xml
deleted file mode 100644
index adae1a7f2f4e..000000000000
--- a/dev-haskell/gsasl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Bindings for GNU libgsasl
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
deleted file mode 100644
index 998bc3e4171c..000000000000
--- a/dev-haskell/gtk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtk-0.14.10.tar.gz 677787 BLAKE2B 536b4ce1bdbb17c662342bd8cb8086354a31842e1fc39e4bb2e4c2e505fb03f4e1ad0b689fb48dcf24d61c280cf659d8f30ac0fe77083e9887054cc8ed5feb75 SHA512 857fa71391e4bc8d884f5bb5e4f072ebd35b6bbcdc3901b6e28e03e79f4732d56430cf395aabc6007d3f7b1e991dcf0c6e21c9b84ccde96b1943d26ad37243eb
diff --git a/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch b/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch
deleted file mode 100644
index 78e1dc146b43..000000000000
--- a/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/gtk2hs/gtk2hs/issues/276
-https://bugs.gentoo.org/712988
---- a/gtk.cabal
-+++ b/gtk.cabal
-@@ -381,7 +381,7 @@ Library
-         -- needs to be imported from this module:
-         x-Signals-Import: Graphics.UI.Gtk.General.Threading
-         include-dirs:   .
--        cpp-options: -U__BLOCKS__
-+        cpp-options: -U__BLOCKS__ -D__attribute__(A)=
-         if os(darwin) || os(freebsd)
-           cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull=
-         if !flag(deprecated)
diff --git a/dev-haskell/gtk/gtk-0.14.10-r3.ebuild b/dev-haskell/gtk/gtk-0.14.10-r3.ebuild
deleted file mode 100644
index 885847eb5d6a..000000000000
--- a/dev-haskell/gtk/gtk-0.14.10-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: have-gio:gio,-have-quartz-gtk
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+deprecated +fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.14.10-glib-2.62.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag deprecated deprecated) \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio) \
-		--flag=-have-quartz-gtk
-}
diff --git a/dev-haskell/gtk/metadata.xml b/dev-haskell/gtk/metadata.xml
deleted file mode 100644
index 6adfdd23634a..000000000000
--- a/dev-haskell/gtk/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is the core library of the Gtk2Hs suite of libraries for Haskell
-		based on Gtk+. Gtk+ is an extensive and mature multi-platform toolkit
-		for creating graphical user interfaces.
-	</longdescription>
-	<use>
-		<flag name="deprecated">Include definitions in this library that are considered obsolete.</flag>
-		<flag name="gio">Depend on GIO package, thereby enabling certain features.</flag>
-		<flag name="fmode-binary">Set the default file translation mode for file I/O operations to _O_BINARY.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest
index 1fb8abf81765..c8fa72a8aac0 100644
--- a/dev-haskell/gtk2hs-buildtools/Manifest
+++ b/dev-haskell/gtk2hs-buildtools/Manifest
@@ -1,5 +1 @@
-DIST gtk2hs-buildtools-0.12.5.1.tar.gz 169038 BLAKE2B 5cfb74ddafa9137a5893edab4273ce446d1905ac96524320941bc4ae2addc1e7e225caff38634760ca17052d3b6f4bafee0933ee4ccaf73eab0e837903e3c419 SHA512 ec25d74209c79414b66cf15e7b041be39f2179d37a4ecc5a2859022db2245ebf7258d13e130d9b8eae53a35575fc200c7ab0bbc4e99571bc2e7b410a9d268c56
-DIST gtk2hs-buildtools-0.13.0.4.tar.gz 169272 BLAKE2B 25d32aae481560dfd74b7484e2533a88fef84c7c12aae0154f9e3eb80b8efbc872b35290f852c440f17a6c104fc0e50e27698bbab9c3247255ea0185e741bfe8 SHA512 ac5eba81fbeb0387a6294868259e2122b1b90aa76d5c7c9062df6796ec697cca87b73789275deaa1374fa34985b67e5b342b4cd3284393fa17f7c13543657299
-DIST gtk2hs-buildtools-0.13.2.2.tar.gz 178124 BLAKE2B b1fdaecc2260f53407a9d7bf6d5307db06a02cc0ebb0aeceafd30ba88cde60c7aeb7f169c653c7dbc191c46cb0369f8746d09a88824389003dcc51bc3ce4acad SHA512 4d5dac91529fa8856f1e3369ed97d688e7423767a2db5387f092ebc65f624d4689ead154a7036177a1de8978726901196b8161c846f5afd134ffda1e29517b06
-DIST gtk2hs-buildtools-0.13.5.1.tar.gz 178132 BLAKE2B b89696a0a0b1fc3f43413e78993133250f1a5850ee14cf4a8f10adc85135d3822ace8f3eaa8a9d2a9ff7276c202991d72c2ef866fe4b9032fcc45b2d4c5e4b0e SHA512 ddce2ae75756086b89032e3e15654e235432fdf843ef14c0833d371b3912d9489727a711cd92afc9ba96abc543c102a428b78db39cb56a35d81be6f54398b68f
-DIST gtk2hs-buildtools-0.13.8.0.tar.gz 178465 BLAKE2B 73a3bea8e002ba641f08f3104b7c8759dba2649e8b050ac769470c7d67441e86365c4687f2645fed62cb79cbe38947c02c2622224e4568440a8d2745a045b333 SHA512 fa427979f20f10ca8baf38c80c28a5190d18b767046de347950ea799660e1d54939d668c01c469da36d2df6c347f7ba67e2e85f3a7000021f8d37852093e03fd
+DIST gtk2hs-buildtools-0.13.10.0.tar.gz 178586 BLAKE2B 56752492d84d6f884f0aaaed19af165296d8d987a15ba6d050aba234090c72929f14e5389e241a81bae5a64a5c5f3d78675143b820262ea192ed331a34525e27 SHA512 ab82220caf6d8d2499de1560130182628455f57588f7cf83d677443f38b9e5fc2980783b7d9e3e941c16fa2e0dba8882e7a3c939ff05adab5706643dfc62233a
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch
deleted file mode 100644
index a772e67c687e..000000000000
--- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/c2hs/c/CLexer.x b/c2hs/c/CLexer.x
-index 77702ed..1cd2483 100644
---- a/c2hs/c/CLexer.x
-+++ b/c2hs/c/CLexer.x
-@@ -68,3 +68,3 @@ module CLexer (lexC, parseError) where
- 
--import Data.Char      (isDigit)
-+import Data.Char      (ord, isDigit)
- import Data.Word      (Word8)
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch
deleted file mode 100644
index 3caf5f769cab..000000000000
--- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-ia64 is is a special showflake.
-
-Technically does nothing bad,
-but it alone uses '__builtin_offsetof (struct sigcontext'
-in system headers. c2hs does not handle that.
-
-https://bugs.gentoo.org/498638
-diff --git a/c2hs/c/C.hs b/c2hs/c/C.hs
-index f79b6d9..aa1b5e4 100644
---- a/c2hs/c/C.hs
-+++ b/c2hs/c/C.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP, PatternGuards #-}
- --  C->Haskell Compiler: interface to C processing routines
-@@ -94,2 +95,20 @@ isuffix  = ".i"
- 
-+-- This stanza workarounds very specific limitation
-+-- of c2hs of not being able to expang __builtin_offsetof
-+-- used by all glib/gtk headers at least on ia64.
-+raw_mangle :: String -> String
-+raw_mangle s = case s of
-+    [] -> []
-+#ifdef ia64_HOST_ARCH
-+    _ | Just (h, rest) <- chop_head "__builtin_offsetof (struct sigcontext, sc_gr[0])"
-+                                    "200" -- ia64/linux/glibc, sigh
-+        -> h ++ raw_mangle rest
-+#endif /* ia64_HOST_ARCH */
-+    (h:t) -> h : raw_mangle t
-+  where chop_head prefix new_prefix =
-+            case splitAt p_len s of
-+                (h, t) | h == prefix -> Just (new_prefix, t)
-+                _                    -> Nothing
-+              where p_len = length prefix
-+
- -- given a file name (with suffix), parse that file as a C header and do the
-@@ -106,3 +124,3 @@ loadAttrC fname  = do
- 		     traceInfoRead fname
--		     contents <- readFileCIO fname
-+		     contents <- raw_mangle `fmap` readFileCIO fname
- 
-@@ -126,4 +144,4 @@ loadAttrC fname  = do
- 			 errmsgs <- showErrors
--			 fatal ("C header contains \
--				\errors:\n\n" ++ errmsgs)   -- fatal error
-+			 fatal ("C header contains " ++
-+				"errors:\n\n" ++ errmsgs)   -- fatal error
- 		       else do
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch
deleted file mode 100644
index ae5edd1a471f..000000000000
--- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-ia64 is is a special showflake.
-
-Technically does nothing bad,
-but it alone uses '__builtin_offsetof (struct sigcontext'
-in system headers. c2hs does not handle that.
-
-https://bugs.gentoo.org/498638
-diff --git a/c2hs/c/C.hs b/c2hs/c/C.hs
-index f79b6d9..aa1b5e4 100644
---- a/c2hs/c/C.hs
-+++ b/c2hs/c/C.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP, PatternGuards #-}
- --  C->Haskell Compiler: interface to C processing routines
-@@ -94,2 +95,20 @@ isuffix  = ".i"
- 
-+-- This stanza workarounds very specific limitation
-+-- of c2hs of not being able to expang __builtin_offsetof
-+-- used by all glib/gtk headers at least on ia64.
-+raw_mangle :: String -> String
-+raw_mangle s = case s of
-+    [] -> []
-+#ifdef ia64_HOST_ARCH
-+    _ | Just (h, rest) <- chop_head "__builtin_offsetof (struct sigcontext, sc_gr[0])"
-+                                    "200" -- ia64/linux/glibc, sigh
-+        -> h ++ raw_mangle rest
-+#endif /* ia64_HOST_ARCH */
-+    (h:t) -> h : raw_mangle t
-+  where chop_head prefix new_prefix =
-+            case splitAt p_len s of
-+                (h, t) | h == prefix -> Just (new_prefix, t)
-+                _                    -> Nothing
-+              where p_len = length prefix
-+
- -- given a file name (with suffix), parse that file as a C header and do the
-@@ -106,3 +124,3 @@ loadAttrC fname  = do
-                      traceInfoRead fname
--                     contents <- readFileCIO fname
-+                     contents <- raw_mangle `fmap` readFileCIO fname
- 
-@@ -126,4 +144,4 @@ loadAttrC fname  = do
-                          errmsgs <- showErrors
--                         fatal ("C header contains \
--                                \errors:\n\n" ++ errmsgs)   -- fatal error
-+                         fatal ("C header contains " ++
-+                                "errors:\n\n" ++ errmsgs)   -- fatal error
-                        else do
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild
deleted file mode 100644
index 4cc3c6b146b6..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closuresignals"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-	dev-haskell/hashtables
-	dev-haskell/random
-	>=dev-lang/ghc-6.10.4
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
deleted file mode 100644
index 38fd7f4ec894..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closuresignals"
-
-RDEPEND="dev-haskell/random:=
-	dev-haskell/hashtables:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ia64.patch
-	epatch "${FILESDIR}"/${P}-alex-3.1.6.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.10.0.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.10.0.ebuild
new file mode 100644
index 000000000000..292c62fa3acc
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
+HOMEPAGE="https://projects.haskell.org/gtk2hs/"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+closuresignals"
+
+RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
+	dev-haskell/hashtables:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/alex-3.0.1
+	>=dev-haskell/cabal-3.0.0.0
+	>=dev-haskell/happy-1.18.9
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag closuresignals closuresignals)
+}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild
deleted file mode 100644
index a6162d039119..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile" # duplicate symbols: haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closuresignals"
-
-RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?] <dev-haskell/cabal-1.25:=[profile?]
-	dev-haskell/hashtables:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.18.1.3
-	dev-haskell/happy
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.13.1.0-ia64.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild
deleted file mode 100644
index 4a86905df258..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closuresignals"
-
-RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
-	dev-haskell/fail:=[profile?]
-	dev-haskell/hashtables:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.18.1.3
-	dev-haskell/happy
-"
-# These patches are available in -r1. Disabled here
-# due to incompatibility with <dev-haskell/cabal-3
-# PATCHES=("${FILESDIR}"/${PN}-0.13.1.0-ia64.patch
-# 		 "${FILESDIR}"/${PN}-0.13.5.1-p1-cabal-3.patch
-# 		 "${FILESDIR}"/${PN}-0.13.5.1-p2-cabal-3.patch
-# 		 "${FILESDIR}"/${PN}-0.13.5.1-p3-cabal-3.patch
-# 		 "${FILESDIR}"/${PN}-0.13.5.1-p4-cabal-3.patch
-# 		 "${FILESDIR}"/${PN}-0.13.5.1-p5-cabal-3.patch
-# 		 "${FILESDIR}"/${PN}-0.13.5.1-p6-cabal-3.patch
-# 		 "${FILESDIR}"/${PN}-0.13.5.1-p7-cabal-3.patch
-# 		 "${FILESDIR}"/${PN}-0.13.5.1-p8-cabal-3.patch
-# 		 "${FILESDIR}"/${PN}-0.13.5.1-p9-cabal-3.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0.ebuild
deleted file mode 100644
index 2a1041ef1045..000000000000
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0.ebuild
+++ /dev/null
@@ -1,35 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+closuresignals"
-
-RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?]
-	dev-haskell/fail:=[profile?]
-	dev-haskell/hashtables:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.18.1.3
-	dev-haskell/happy
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag closuresignals closuresignals)
-}
diff --git a/dev-haskell/gtk2hs-buildtools/metadata.xml b/dev-haskell/gtk2hs-buildtools/metadata.xml
index af96940296fd..5b552520f5a8 100644
--- a/dev-haskell/gtk2hs-buildtools/metadata.xml
+++ b/dev-haskell/gtk2hs-buildtools/metadata.xml
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a set of helper programs necessary to
-		build the Gtk2Hs suite of libraries. These tools include
-		a modified c2hs binding tool that is used to generate
-		FFI declarations, a tool to build a type hierarchy that
-		mirrors the C type hierarchy of GObjects found in glib,
-		and a generator for signal declarations that are used
-		to call back from C to Haskell. These tools are not needed
-		to actually run Gtk2Hs programs.
-	</longdescription>
 	<use>
-		<flag name="closuresignals">Use the the GClosure-based signals
-		implementation.</flag>
+		<flag name="closuresignals">Use the the GClosure-based signals implementation.</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">gtk2hs-buildtools</remote-id>
+		<remote-id type="github">gtk2hs/gtk2hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/gtk3/Manifest b/dev-haskell/gtk3/Manifest
deleted file mode 100644
index 82f096dd588a..000000000000
--- a/dev-haskell/gtk3/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gtk3-0.14.9.tar.gz 676542 BLAKE2B d2aeec5fd59dfe71e6c62e6abf60370f12ca8d7a3d3716593151a2f7697e8b53bbf4e8c094df1a2162703422cfb390407c8a83b564fed78c16f94d3d07036122 SHA512 aaf2a257c74f5b0a569d0e61aef535e2f0c8158feb34bed523c7aff31cf155098f93d3a88ba49bea906ae669bf63fb0486f4c747a620c2199c2e7859486e7270
-DIST gtk3-0.15.5.tar.gz 677124 BLAKE2B a6a21411fb0af55dd718b2b3b63e303d05c8636ad19ed82935ce9263f29b05f85775ee0b7123ba9b6671dcf798fbdabbdbb9831e0b1e48a2663a8c2bbfd5d5e9 SHA512 937b250f04e797b821d560a768f9eaee448f2d2d98571b6ef401de44177f50861f557e653afc7f055dfa2e15180dca9d82e36469f0fb97dff5a170ebc6c62519
diff --git a/dev-haskell/gtk3/files/gtk3-0.14.9-glib-2.62.patch b/dev-haskell/gtk3/files/gtk3-0.14.9-glib-2.62.patch
deleted file mode 100644
index da921a2cf415..000000000000
--- a/dev-haskell/gtk3/files/gtk3-0.14.9-glib-2.62.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gtk3.cabal
-+++ b/gtk3.cabal
-@@ -372,7 +372,7 @@ Library
-         -- needs to be imported from this module:
-         x-Signals-Import: Graphics.UI.Gtk.General.Threading
-         include-dirs:   .
--        cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__
-+        cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__ -D__attribute__(A)=
-         if os(darwin) || os(freebsd)
-           cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull=
-         if os(windows)
diff --git a/dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild b/dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild
deleted file mode 100644
index f3975676440a..000000000000
--- a/dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: have-gio:gio,build-demos:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ 3 graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.14.9-glib-2.62.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio)
-}
diff --git a/dev-haskell/gtk3/gtk3-0.15.5.ebuild b/dev-haskell/gtk3/gtk3-0.15.5.ebuild
deleted file mode 100644
index 8afd7bb2c283..000000000000
--- a/dev-haskell/gtk3/gtk3-0.15.5.ebuild
+++ /dev/null
@@ -1,41 +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.4.9999
-#hackport: flags: have-gio:gio,build-demos:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ 3 graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio)
-}
diff --git a/dev-haskell/gtk3/metadata.xml b/dev-haskell/gtk3/metadata.xml
deleted file mode 100644
index 28e651a53516..000000000000
--- a/dev-haskell/gtk3/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is the core library of the Gtk2Hs suite of libraries for Haskell
-		based on Gtk+. Gtk+ is an extensive and mature multi-platform toolkit
-		for creating graphical user interfaces.
-	</longdescription>
-	<use>
-		<flag name="gio">Depend on GIO package, thereby enabling certain features.</flag>
-		<flag name="fmode-binary">Set the default file translation mode for file I/O operations to _O_BINARY.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index 20ef9ff45791..6e22cb418693 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1,2 +1,3 @@
-DIST hackage-security-0.5.2.2.tar.gz 83131 BLAKE2B 4ce0ff3d4ee2647ac5311996756ce43aa91ee7989ef6a46ea94679890900811c770e5ce91acc0e39fe0e42767cdd6d21bb11bee7d385c9e3a30c642b9471f423 SHA512 5adab3c46d7aada8668128ad8c9389ca65489eec776f8571b8ee5834d74b961f19b558cb6642cbb1891ee381b2d4f2019dddf29bad13607fe23bef49a3d6f535
-DIST hackage-security-0.5.3.0.tar.gz 87119 BLAKE2B 6e69b13d3ee16fbc6488e1e9d926ba07d975555e9ad80c404ccfec60ff549e7eb2d40302ace8ac5f03ed5532c031f236f8a09edc8a3f8c7d4c2bb48743f88aa1 SHA512 57af812fb3911aed6ebdbc5de733e86a2bdc7845a07246c69346c59f654e7c4ae5bf20ad753cfe71dc1d7f47ce66a37fba49b178e8e6ff74002fc8ffb72d920d
+DIST hackage-security-0.6.1.0.tar.gz 86243 BLAKE2B f28651d9c0506e4e1b9085e1efd6647ad3dd0dea4fcec2823f3072504831e7d01be34f6a14619cc352ef236214a1fd7073449f00c82c8f7ef5e95cdca1ad3133 SHA512 0a303e8c594a5fef52bf95f3ff75379aeec44fdaebc6ba78da8bf7911798040b43c3c289f0c4d7bcd2c1903d82c29d5ffa012360660c3548c0f3fb4b719a9327
+DIST hackage-security-0.6.2.3-rev3.cabal 12712 BLAKE2B 329c7ad4039411932fc8cdb6f5f31274de8adb11ab68a6688a03bd9d20043ee7df66e9c063aba33aaf7435470190d3e775f7d121011c5ef4b8dd8dfe2837eeb2 SHA512 cf4545d393745efd29da0882b093299d7a6cf8072c3219d71a3d5d1f754bf8b435e135df686447dd785f18ab190287ca57f2a749bb3b1d59199d6d00225684f5
+DIST hackage-security-0.6.2.3.tar.gz 86611 BLAKE2B 4cc851be655c6b4dc9435f129bcd1bda4b31dc16e0a97181c6e68a91c374d662937d5b629934087b6eb13db4c3b49217e3ed924f98024f2b868dca4eced13750 SHA512 d2bd80a940a2bacdbe6c6f5086ae846eb27548f0013952e0fe95dfbdea7bc4f17631f86f295d62b02a491f3903d8a5ab316bad2d8227fd240f459cbe966b1b84
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch b/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
deleted file mode 100644
index 7c30961a4b4d..000000000000
--- a/dev-haskell/hackage-security/files/hackage-security-0.5.3.0-ghc-8.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs
---- hackage-security-0.5.3.0.orig/src/Hackage/Security/TUF/FileMap.hs	2018-03-25 19:39:07.000000000 -0400
-+++ hackage-security-0.5.3.0/src/Hackage/Security/TUF/FileMap.hs	2019-03-16 08:29:08.347456951 -0400
-@@ -78,7 +78,7 @@
- lookupM :: Monad m => FileMap -> TargetPath -> m FileInfo
- lookupM m fp =
-     case lookup fp m of
--      Nothing  -> fail $ "No entry for " ++ pretty fp ++ " in filemap"
-+      Nothing  -> error $ "No entry for " ++ pretty fp ++ " in filemap"
-       Just nfo -> return nfo
- 
- {-------------------------------------------------------------------------------
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch
new file mode 100644
index 000000000000..dc26881ebdbe
--- /dev/null
+++ b/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch
@@ -0,0 +1,33 @@
+From b228347d62b7c69f16d1983d4c8c70f6601c7351 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sun, 2 Jul 2023 14:33:27 -0600
+Subject: [PATCH] Change dependency on Cabal-syntax
+
+Do not add Cabal-syntax to build-depends when the Cabal-syntax flag is
+off.
+
+This will ensure that Cabal-syntax is ignored/omitted when the flag is
+off which will prevent version conflicts with >=Cabal-syntax-3.8
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ hackage-security.cabal | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/hackage-security.cabal b/hackage-security.cabal
+index 58afd57..f0463f4 100644
+--- a/hackage-security.cabal
++++ b/hackage-security.cabal
+@@ -170,8 +170,7 @@ library
+   else
+     build-depends: Cabal        >= 1.14    && < 1.26
+                              || >= 2.0     && < 2.6
+-                             || >= 3.0     && < 3.7,
+-                   Cabal-syntax <  3.7
++                             || >= 3.0     && < 3.7
+ 
+   hs-source-dirs:      src
+   default-language:    Haskell2010
+-- 
+2.39.3
+
diff --git a/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild b/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild
deleted file mode 100644
index 322038a689a7..000000000000
--- a/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage security library"
-HOMEPAGE="https://github.com/well-typed/hackage-security"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+use-network-uri"
-
-RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-1.26:=[profile?]
-	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
-	>=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	>=dev-haskell/old-locale-1.0:=[profile?]
-	use-network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-				>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!use-network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck
-		dev-haskell/temporary
-		!use-network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory         >= 1.1.0.2 && < 1.3' 'directory         >= 1.1.0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag use-network-uri use-network-uri)
-}
diff --git a/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild b/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
deleted file mode 100644
index 2c6a4be4ebc2..000000000000
--- a/dev-haskell/hackage-security/hackage-security-0.5.3.0-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage security library"
-HOMEPAGE="https://github.com/haskell/hackage-security"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test # QC-2.10 finds counterexamples
-
-RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/cabal-1.14:=[profile?]
-	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
-	>=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	>=dev-haskell/old-locale-1.0:=[profile?]
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
-				>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/quickcheck-2.9
-		>=dev-haskell/tasty-1.0
-		>=dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.10
-		>=dev-haskell/temporary-1.2
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.8.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base              >= 4.5     && < 4.12' 'base              >= 4.5' \
-		'tasty            == 1.0.*' 'tasty            >= 1.0' \
-		'tasty-hunit      == 0.10.*' 'tasty-hunit      >= 0.10' \
-		'tasty-quickcheck == 0.10.*' 'tasty-quickcheck >= 0.10' \
-		'QuickCheck       == 2.9.*' 'QuickCheck       >= 2.9' \
-		'temporary        == 1.2.*' 'temporary        >= 1.2' \
-		'network     >= 2.6 && < 2.7' 'network     >= 2.6' \
-		'Cabal             >= 1.14    && < 2.4' 'Cabal             >= 1.14' \
-		'containers        >= 0.4     && < 0.6' 'containers        >= 0.4' \
-		'time              >= 1.2     && < 1.9' 'time              >= 1.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri use-network-uri)
-}
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
new file mode 100644
index 000000000000..ee8cdf8c13a2
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.6.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -mtl21,+use-network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko"
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
+	>=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/cabal-1.14:=[profile?] <dev-haskell/cabal-3.8:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	lukko? ( >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+		>=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4
+		dev-haskell/text
+		>=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+		>=dev-haskell/vector-0.12 <dev-haskell/vector-0.13
+		|| ( ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.5 )
+			|| ( ( >=dev-haskell/aeson-1.5 <dev-haskell/aeson-1.6 )
+				( >=dev-haskell/aeson-2.0 <dev-haskell/aeson-2.1 ) ) ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag lukko lukko) \
+		--flag=-mtl21 \
+		--flag=use-network-uri
+}
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild
new file mode 100644
index 000000000000..a1f898fad5cb
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -mtl21,+use-network-uri,-Cabal-syntax
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Requires Cabal-3.8 or newer
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.2.3-change-cabal-syntax-dep.patch"
+)
+
+CABAL_CHDEPS=(
+	'|| >= 3.0     && < 3.7' '|| >= 3.0'
+)
+
+RDEPEND="
+	>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
+	>=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	|| (
+		( >=dev-haskell/network-2.6 <dev-haskell/network-2.9 )
+		( >=dev-haskell/network-3.0 <dev-haskell/network-3.2 )
+	)
+	dev-haskell/network:=[profile?]
+	lukko? (
+		>=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+#	test? (
+#		>=dev-haskell/cabal-3.7 <dev-haskell/cabal-3.12
+#		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
+#		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.5
+#		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+#		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+#		>=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4
+#		dev-haskell/text
+#		>=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+#		>=dev-haskell/vector-0.12 <dev-haskell/vector-0.14
+#		|| (
+#			( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.6 )
+#			( >=dev-haskell/aeson-2.0 <dev-haskell/aeson-2.2 )
+#		)
+#	)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-Cabal-syntax \
+		$(cabal_flag lukko lukko) \
+		--flag=-mtl21 \
+		--flag=use-network-uri
+}
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
index 4a4ad2a438d2..63d1cf7e461f 100644
--- a/dev-haskell/hackage-security/metadata.xml
+++ b/dev-haskell/hackage-security/metadata.xml
@@ -1,36 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
 	<use>
-		<flag name="use-network-uri">Get Network.URI from the network-uri package.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="lukko">Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@</flag>
 	</use>
-	<longdescription>
-		The hackage security library provides both server and
-		client utilities for securing the Hackage package server
-		(&lt;http://hackage.haskell.org/&gt;).  It is based on The Update
-		Framework (&lt;http://theupdateframework.com/&gt;), a set of
-		recommendations developed by security researchers at
-		various universities in the US as well as developers on the
-		Tor project (&lt;https://www.torproject.org/&gt;).
-		
-		The current implementation supports only index signing,
-		thereby enabling untrusted mirrors. It does not yet provide
-		facilities for author package signing.
-		
-		The library has two main entry points:
-		"Hackage.Security.Client" is the main entry point for
-		clients (the typical example being @cabal@), and
-		"Hackage.Security.Server" is the main entry point for
-		servers (the typical example being @hackage-server@).
-		
-		This is a beta release.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">well-typed/hackage-security</remote-id>
+		<remote-id type="hackage">hackage-security</remote-id>
+		<remote-id type="github">haskell/hackage-security</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest
deleted file mode 100644
index f2501064eaef..000000000000
--- a/dev-haskell/haddock-api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST haddock-api-2.16.1.tar.gz 125372 BLAKE2B dbc0678cd38bad8549375468ddda27061e17cb74927e1a1c3c286cb25e8cd098a8f17333d199897bcd7ee56553b4d68b206a6935c44b0a5056810921fc6a3b45 SHA512 01450602d238651a8711141d51f5246536a96b69efee29942296fdfc249929f5f33df24ee676b56d0ba82269cb6557dd3a4e8fabbd1b809e506867b5f285bb17
-DIST haddock-api-2.17.3.tar.gz 145142 BLAKE2B 1ca87c180baed23ec5df5d5cbfedc7e3823c344655b2d13f2bcbce0c774874223269b06a88f45365511f6789f8068086c04460faaf4eec7354a20bc18680ce26 SHA512 00057618d970fc7786913eec0b408baabbf1aff4b705c105f6d6347ae9c46af1b2ea7bed420edfaec38c835dee08593c9ae53ab9a30153239e687de6f5301840
-DIST haddock-api-2.23.1.tar.gz 200096 BLAKE2B 0635881e198c1df3690f07185da7cc49f8eb92283d99c581756c86fb9f293b28608ac3eea9090abcc3afa12c646e584939df9b8c38b4844e9c462824426019f5 SHA512 fb7826102476a3f292da336f8f16c7a647df7c4432bed905815509fff0df164255c0856cc17663bb42479114ed9a418e6bcd214fb8594b245d401c9e091ac4ef
diff --git a/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch b/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 6aafc8f37522..000000000000
--- a/dev-haskell/haddock-api/files/haddock-api-2.17.3-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs
-index eacf447..458d15f 100644
---- a/src/Haddock/Types.hs
-+++ b/src/Haddock/Types.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards #-}
-+{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards, CPP #-}
- {-# OPTIONS_GHC -fno-warn-orphans #-}
-@@ -450,2 +450,3 @@ instance (NFData a, NFData mod)
- 
-+#if !MIN_VERSION_GLASGOW_HASKELL(8,0,1,1)
- instance NFData Name where rnf x = seq x ()
-@@ -453,2 +454,3 @@ instance NFData OccName where rnf x = seq x ()
- instance NFData ModuleName where rnf x = seq x ()
-+#endif
- 
diff --git a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
deleted file mode 100644
index dc77c8343d80..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/haddock-library-1.2:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-7.10:= <dev-lang/ghc-7.12:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild b/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
deleted file mode 100644
index f2203d2510d2..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/haddock-library-1.4:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-8.0:= <dev-lang/ghc-8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
diff --git a/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
deleted file mode 100644
index 3d0bd06d30c6..000000000000
--- a/dev-haskell/haddock-api/haddock-api-2.23.1.ebuild
+++ /dev/null
@@ -1,31 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?]
-	>=dev-haskell/haddock-library-1.8.0:=[profile?] <dev-haskell/haddock-library-1.9:=[profile?]
-	>=dev-haskell/xhtml-3000.2.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-8.8.2:=[profile?] <dev-lang/ghc-8.9:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-3.0.0.0
-	test? ( >=dev-haskell/ghc-paths-0.1.0.12 <dev-haskell/ghc-paths-0.2
-		>=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
-		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 )
-"
diff --git a/dev-haskell/haddock-api/metadata.xml b/dev-haskell/haddock-api/metadata.xml
deleted file mode 100644
index 5b91128aaa05..000000000000
--- a/dev-haskell/haddock-api/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haddock is a documentation-generation tool for Haskell
-		libraries
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
index 8972e788b109..083c44d13106 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -1,4 +1,2 @@
-DIST haddock-library-1.1.1.tar.gz 35641 BLAKE2B 1754ce1088c34629f8523a80c9ee142471b8e7f53f5a77e89265211588cc80719e7fec49e35142b8288b4632a0548def65f9f2966d6838d79e75ec1574588336 SHA512 5f1a592af66a054482fc06ca8d974db0ebd4e42b383ec6b3fd7d44d155bd89c567013af1266e697b76a96b4d39486bc22eac7eb4b1d6842ec0f842533ac8dffb
-DIST haddock-library-1.2.1.tar.gz 38606 BLAKE2B 1896a098a4858796feb9ded26914a7cfc9f6478f3993485a9c61be1a3b1aee1e32accafadaa5b1e030d17f78555b1f4c731b76c09bb83c7a7cb8132c8e25e792 SHA512 7ac9dfc648e6e59e1dbaafc7fdf26acb378997506c353dedadf89a729223cdb518edd59642e81758fd898cda163258e5e4150fc84369c3e011e59acd827a037a
-DIST haddock-library-1.4.2.tar.gz 38701 BLAKE2B 56c0f1c46100fcf8afa88ce8c44f989da9561109bf74473d5ef65962cc057cf7a54f87786171ad2f57895000e610663f1b2711f231adc7d85442e9028bd9729b SHA512 0ea02f4ac898e6d4349f3c8d3997d66c35866350bfd661b6030a0b59c609eaae3647c8898bb5142afb0235b2eb785059356f6eb2031e6e93615d1d4e3c4cce82
-DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B a8bcf9e08f6596375186930cf4a98ae547c40d85eb0bd00b7aaf8212c3738e32cd51cea044206f3746d10d228b1e8b8a2ccdb28ae7c7957006f518d090a6ceed SHA512 f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b
+DIST haddock-library-1.10.0-rev3.cabal 4178 BLAKE2B 72b7e3424ed6e7974c9549f77d924bbccf6caba55bc91ef2ce13fa0c48a1eee4dd4f3a74286b64cb3b77f60427736fc4674de10b2390bfb28145cba18ec67e2d SHA512 7b9d61d23725920f4a303be38800a5679e317b8633307b028bd8168ddce5a0cc0e42d149b3b595f5e2b6afd062e87a8df877c73cea9182d21fd0292696d1e860
+DIST haddock-library-1.10.0.tar.gz 32427 BLAKE2B 7c1b26edca2a40a43622c376cd8c064c6dd333d85db37e38a26b91ff1d61004f96e1ed330c54987b5891157f560f46a56e88a730a82b2561f430014fc7aed4f0 SHA512 dac536a2b8e2764de1a1b1a16fc328e15455656c2992fb3b3bccdeae2bb6ac81fe94e164aa2a70cff7cea3b97347b8510aadb5fa1c0564bb2429947f0aace0d1
diff --git a/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
deleted file mode 100644
index 45e613953d76..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild b/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..ca8fdfae207d
--- /dev/null
+++ b/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library exposing some functionality of Haddock"
+HOMEPAGE="https://www.haskell.org/haddock/"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+CABAL_CHDEPS=(
+	'hspec                          >= 2.4.4    && < 2.8' 'hspec >=2.4.4'
+	'hspec-discover:hspec-discover  >= 2.4.4    && < 2.8' 'hspec-discover:hspec-discover >=2.4.4'
+	'optparse-applicative  ^>= 0.15' 'optparse-applicative >=0.15'
+	'tree-diff             ^>= 0.1' 'tree-diff >=0.1'
+	'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >=0.11.0'
+	'base-compat           ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >=0.11.0'
+)
+
+RDEPEND="
+	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/base-compat-0.11.0
+		>=dev-haskell/hspec-2.4.4
+		>=dev-haskell/optparse-applicative-0.15
+		>=dev-haskell/tree-diff-0.1
+		|| (
+			( >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.12 )
+			( >=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15 )
+		)
+	)
+"
+BDEPEND="test? (
+	>=dev-haskell/hspec-discover-2.4.4
+)"
diff --git a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
deleted file mode 100644
index 5d6d6a8321a6..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # on ghc-7.6 Prelude collides with base-compat
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild b/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
deleted file mode 100644
index ee68c2a4a112..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1, might not be required but needs porting revdeps
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		dev-haskell/hspec
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
deleted file mode 100644
index 8bda04a8c3d4..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.8.0.ebuild
+++ /dev/null
@@ -1,40 +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.4.9999
-
-CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour
-inherit haskell-cabal
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-	test? ( >=dev-haskell/hspec-2.4.4 <dev-haskell/hspec-2.8
-		>=dev-haskell/optparse-applicative-0.15 <dev-haskell/optparse-applicative-0.16
-		>=dev-haskell/tree-diff-0.1 <dev-haskell/tree-diff-0.2
-		>=dev-haskell/base-compat-0.9.3 <dev-haskell/base-compat-0.12
-		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.14 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3' \
-		'base-compat           ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3'
-}
diff --git a/dev-haskell/haddock-library/metadata.xml b/dev-haskell/haddock-library/metadata.xml
index 5187ff9bad5a..9272627d4f5e 100644
--- a/dev-haskell/haddock-library/metadata.xml
+++ b/dev-haskell/haddock-library/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haddock is a documentation-generation tool for Haskell
-		libraries. These modules expose some functionality of it
-		without pulling in the GHC dependency. Please note that the
-		API is likely to change so specify upper bounds in your
-		project if you can't release often. For interacting with Haddock
-		itself, see the <pkg>dev-haskell/haddock</pkg> package.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">haddock-library</remote-id>
+		<remote-id type="github">haskell/haddock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
deleted file mode 100644
index fb245c5e8975..000000000000
--- a/dev-haskell/haddock/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST haddock-2.14.3.0.7.8.3.tar.gz 230282 BLAKE2B cb5336c72e0fa3036bf7ceaa202ff35e1d104fcb05c4317f16e78c0517b27529c1fab28e2ee4f2e14cbf2db592ff88a6b01d1840193c9a69233230fec1ffc423 SHA512 62ae4a29c877c3b9742828fcda2f1f045357f41b4a2c495a4791a42d412d41b3d206cdcb73e2d1bd4e95c40371dae865f4eaa37031cda6c1bada5dfed963c2be
-DIST haddock-2.16.1.tar.gz 216323 BLAKE2B feddc77d8072dfafb4b06486f57db89a0136ed53644efb0336a26e6c3f31789cf57e302e7bbfbfb9af036a00cbf801c47398347bd664333f0a35debdf794ada3 SHA512 709af410f8746819c8c067f3549d79ba0ecaa312fb6b19acf670a9a3e4c94e94b8e546493e08293eceeb488bc0891a8ebe033a58411c4af935b445cd7f3014b8
-DIST haddock-2.17.2.tar.gz 245690 BLAKE2B dc6f646a5972add1a5ac0e2a2a4119df5f8f0604984f0fa3f828e72bca96f8ec98b09ce65de6bb94a2714c64680a79ae3dd49f60a27cbf5483cb71f239180c87 SHA512 f8f06abd3b231fae36b900d54a70107dcd6718bab7726ad7bd8392c9053700b96672cf9efa0854033a5c1473dcdf00c390f253bc244ff5f4d25e70dd76c8ea1d
-DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 1dae0019ddc08c537aec2f0fa71f5bd1570db4061d22bf53f05aa0e211c3280d09c6a6481f704c34895e0bf70fd2b5ac95644dab23b05cc2b6fec59c845f86c5 SHA512 e69b3b5f2dcadeccc33696ee8d0646387860b98d86c08d4c07d829e3eabc4159adac0a11d408850ef54face5fa835ab8217d1057b14d8de8d758efbfc7a700db
diff --git a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild b/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
deleted file mode 100644
index 3e5a6f1536dc..000000000000
--- a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal pax-utils
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-#SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-SRC_URI="http://code.haskell.org/~slyfox/snapshots/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # many test depends are not keyworded yet
-
-RDEPEND="dev-haskell/ghc-paths:=[profile?]
-	>=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-lang/ghc-7.8.3:= <dev-lang/ghc-7.9:=
-"
-DEPEND="${RDEPEND}
-"
-
-src_prepare() {
-	if [[ ! -e "${S}/html" ]]; then
-		ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html"
-	fi
-}
-
-src_configure() {
-	# create a fake haddock executable. it'll set the right version to cabal
-	# configure, but will eventually get overwritten in src_compile by
-	# the real executable.
-	local exe="${S}/dist/build/haddock/haddock"
-	mkdir -p $(dirname "${exe}")
-	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
-	chmod +x "${exe}"
-
-	# we use 'nocabaldep' to use ghc's bundled Cabal
-	# as external one is likely to break our haddock
-	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
-	haskell-cabal_src_configure \
-		--ghc-options=-rtsopts \
-		--with-haddock="${exe}" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_compile() {
-	# when building the (recursive..) haddock docs, change the datadir to the
-	# current directory, as we're using haddock inplace even if it's built to be
-	# installed into the system first.
-	haddock_datadir="${S}" haskell-cabal_src_compile
-}
-
-src_install() {
-	cabal_src_install
-	# haddock uses GHC-api to process TH source.
-	# TH requires GHCi which needs mmap('rwx') (bug #299709)
-	pax-mark -m "${D}/usr/bin/${PN}"
-}
diff --git a/dev-haskell/haddock/haddock-2.16.1.ebuild b/dev-haskell/haddock/haddock-2.16.1.ebuild
deleted file mode 100644
index f914d15c4c06..000000000000
--- a/dev-haskell/haddock/haddock-2.16.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin test-suite"
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal pax-utils
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # tests are outdated
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	>=dev-lang/ghc-7.4.1
-	~dev-haskell/haddock-api-2.16.1
-"
-
-src_prepare() {
-	if [[ ! -e "${S}/html" ]]; then
-		ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html"
-	fi
-}
-
-src_configure() {
-	# create a fake haddock executable. it'll set the right version to cabal
-	# configure, but will eventually get overwritten in src_compile by
-	# the real executable.
-	local exe="${S}/dist/build/haddock/haddock"
-	mkdir -p $(dirname "${exe}")
-	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
-	chmod +x "${exe}"
-
-	# we use 'nocabaldep' to use ghc's bundled Cabal
-	# as external one is likely to break our haddock
-	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
-	haskell-cabal_src_configure \
-		--flags=-in-ghc-tree \
-		--ghc-options=-rtsopts \
-		--with-haddock="${exe}" \
-		--constraint="Cabal == $(cabal-version)"
-
-}
-
-src_compile() {
-	# when building the (recursive..) haddock docs, change the datadir to the
-	# current directory, as we're using haddock inplace even if it's built to be
-	# installed into the system first.
-	haddock_datadir="${S}" haskell-cabal_src_compile
-	pax-mark -m "${S}/dist/build/haddock"
-}
-
-src_install() {
-	cabal_src_install
-	# haddock uses GHC-api to process TH source.
-	# TH requires GHCi which needs mmap('rwx') (bug #299709)
-	pax-mark -m "${D}/usr/bin/${PN}"
-}
diff --git a/dev-haskell/haddock/haddock-2.17.2.ebuild b/dev-haskell/haddock/haddock-2.17.2.ebuild
deleted file mode 100644
index e37d8cb4a761..000000000000
--- a/dev-haskell/haddock/haddock-2.17.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -in-ghc-tree
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#keep in sync with ghc-8.0.1
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # there is no haddock-test on hackage yet
-
-RDEPEND=">=dev-haskell/haddock-api-2.17:= <dev-haskell/haddock-api-2.18:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-in-ghc-tree
-}
diff --git a/dev-haskell/haddock/haddock-2.23.1.ebuild b/dev-haskell/haddock/haddock-2.23.1.ebuild
deleted file mode 100644
index d2e622f4d065..000000000000
--- a/dev-haskell/haddock/haddock-2.23.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -in-ghc-tree
-
-CABAL_FEATURES="" # test-suite unavailable
-inherit haskell-cabal
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.8.3
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # test suite unavailable
-
-RDEPEND="~dev-haskell/haddock-api-2.23.1:=
-	>=dev-lang/ghc-8.8.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-3.0.0.0
-" #	test? ( ~dev-haskell/haddock-test-0.0.1 )
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-in-ghc-tree
-}
diff --git a/dev-haskell/haddock/metadata.xml b/dev-haskell/haddock/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/haddock/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hakyll/Manifest b/dev-haskell/hakyll/Manifest
deleted file mode 100644
index a6b73ffc3dc6..000000000000
--- a/dev-haskell/hakyll/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hakyll-4.13.4.0.tar.gz 105151 BLAKE2B a17ddcc7846d4c50f3ade0d430a0208c6c85d9827e5daa69b1652050313cb62fc87fd8b1547cacacbca5562f4cf172eacd7e641d3921516c4578e0684ae55ee9 SHA512 4ade6776cfee7a8293ba4a659cf8633c0e6641ee2c33db9cdddeaca996ff092d027ce4165e174d7acdeb8485904394d9a899351d9e3c065e4ce7cb5af61ee08a
diff --git a/dev-haskell/hakyll/hakyll-4.13.4.0.ebuild b/dev-haskell/hakyll/hakyll-4.13.4.0.ebuild
deleted file mode 100644
index 234752180902..000000000000
--- a/dev-haskell/hakyll/hakyll-4.13.4.0.ebuild
+++ /dev/null
@@ -1,76 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A static website compiler library"
-HOMEPAGE="http://jaspervdj.be/hakyll"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildwebsite +checkexternal +previewserver +usepandoc +watchserver"
-
-RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
-	>=dev-haskell/cryptonite-0.25:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?]
-	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
-	>=dev-haskell/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.12:=[profile?]
-	>=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3:=[profile?]
-	>=dev-haskell/memory-0.14.18:=[profile?] <dev-haskell/memory-0.16:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.16:=[profile?]
-	>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-tdfa-1.1:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	>=dev-haskell/scientific-0.3.4:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
-	>=dev-lang/ghc-8.6.3:=
-	buildwebsite? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?] )
-	checkexternal? ( >=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?] )
-	previewserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?]
-				>=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
-				>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-				>=dev-haskell/wai-app-static-3.1:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?]
-				>=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
-	!previewserver? ( checkexternal? ( >=dev-haskell/http-types-0.7:=[profile?] <dev-haskell/http-types-0.13:=[profile?] )
-				watchserver? ( >=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?] ) )
-	usepandoc? ( >=app-text/pandoc-2.0.5:=[profile?] <app-text/pandoc-2.10:=[profile?]
-			>=dev-haskell/pandoc-citeproc-0.14:=[profile?] <dev-haskell/pandoc-citeproc-0.18:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4.0.1
-	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.4
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildwebsite buildwebsite) \
-		$(cabal_flag checkexternal checkexternal) \
-		$(cabal_flag previewserver previewserver) \
-		$(cabal_flag usepandoc usepandoc) \
-		$(cabal_flag watchserver watchserver)
-}
-
-src_test() {
-	# unixFilter test expects 'option' output in error message
-	# But it's a localized string that:
-	# https://github.com/jaspervdj/hakyll/issues/607
-	LANGUAGE=en haskell-cabal_src_test
-}
diff --git a/dev-haskell/hakyll/metadata.xml b/dev-haskell/hakyll/metadata.xml
deleted file mode 100644
index 75fb004f1986..000000000000
--- a/dev-haskell/hakyll/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="buildwebsite">Build the hakyll website</flag>
-		<flag name="previewserver">Include the preview server</flag>
-		<flag name="checkexternal">Include external link checking</flag>
-		<flag name="watchserver">wait for filesystem changes and rebuild pages</flag>
-		<flag name="usepandoc">Include Pandoc support</flag>
-	</use>
-	<longdescription>
-		Hakyll is a static website compiler library. It provides you with the tools to
-		create a simple or advanced static website using a Haskell DSL and formats
-		such as markdown or RST. You can find more information, including a tutorial,
-		on the website:
-		
-		* &lt;http://jaspervdj.be/hakyll&gt;
-		
-		If you seek assistance, there's:
-		
-		* A google group: &lt;http://groups.google.com/group/hakyll&gt;
-		
-		* An IRC channel, @#hakyll@ on freenode
-		
-		Additionally, there's the Haddock documentation in the different modules,
-		meant as a reference.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/half/Manifest b/dev-haskell/half/Manifest
deleted file mode 100644
index 86c978cac181..000000000000
--- a/dev-haskell/half/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST half-0.2.2.3.tar.gz 6050 BLAKE2B 79ff80c1935814e73384b18754b3f74341c59ef55fddc40f002e1ce1a0780f45cdcb9c50726461da105508176b591f75fda955edb86091d186947d6da187b5ef SHA512 1b341670d0aa8513bef63a9522884d7c4b71cf9af6420bc67f8aab34c906a96c0288d900106878f5de9902b259f35501d09ba0b9ad82e5a759405e615572d17e
diff --git a/dev-haskell/half/half-0.2.2.3.ebuild b/dev-haskell/half/half-0.2.2.3.ebuild
deleted file mode 100644
index a3d59f34d96c..000000000000
--- a/dev-haskell/half/half-0.2.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Half-precision floating-point"
-HOMEPAGE="https://github.com/ekmett/half"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/half/metadata.xml b/dev-haskell/half/metadata.xml
deleted file mode 100644
index ceefd43cdeb4..000000000000
--- a/dev-haskell/half/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Half-precision floating-point
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/half</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hamlet/Manifest b/dev-haskell/hamlet/Manifest
deleted file mode 100644
index 54f3e14f3882..000000000000
--- a/dev-haskell/hamlet/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hamlet-1.1.9.2.tar.gz 23693 BLAKE2B 7343710f65b9e34f770b8131691ef2f07b8cad7ac6a6e66454c443c077d8d5adad6bfb50231e2d4c0448162996c1737d5d3a34e6fe5a603fb05803921f684829 SHA512 e995a92856b0a7dde7bb36439d3922cb560efbcf35d08c20041d6236583e71dd09bc2983c038ad500492f89bbf091bb9ac6e7066afcd309e7aefcbfb963d8658
-DIST hamlet-1.2.0.tar.gz 1636 BLAKE2B 21b9b161238d715f5ec2c4e97ba05b87c73276f5acfea11c2bf04eb64c4bf24902def08be45ee4199e7489798e2d6df87aebf934c9a771f070078272d99a9cff SHA512 8bc20f0ddc64b6943f0e85cd7f6babf5bbd6121bf50d420824320241b6ea270876fb58e39e3275d8476b959a815e6a6fee711e3376c18e88f25cccfeb059f99a
diff --git a/dev-haskell/hamlet/hamlet-1.1.9.2.ebuild b/dev-haskell/hamlet/hamlet-1.1.9.2.ebuild
deleted file mode 100644
index a7fd2d9c4e40..000000000000
--- a/dev-haskell/hamlet/hamlet-1.1.9.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haml-like template files that are compile-time checked"
-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=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/shakespeare-1.2.0.4:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/hamlet/hamlet-1.2.0.ebuild b/dev-haskell/hamlet/hamlet-1.2.0.ebuild
deleted file mode 100644
index e2ddb4d988ea..000000000000
--- a/dev-haskell/hamlet/hamlet-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Haml-like template files that are compile-time checked (deprecated)"
-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=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hamlet/metadata.xml b/dev-haskell/hamlet/metadata.xml
deleted file mode 100644
index c842c33be2f7..000000000000
--- a/dev-haskell/hamlet/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Hamlet gives you a type-safe tool for generating HTML code. It works via Quasi-Quoting, and generating extremely efficient output code. The syntax is white-space sensitive, and it helps you avoid cross-site scripting issues and 404 errors. Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
-		
-		Here is a quick overview of hamlet html. Due to haddock escaping issues, we can't properly show variable insertion, but we are still going to show some conditionals. Please see &lt;http://www.yesodweb.com/book/templates&gt; for a thorough description
-		
-		&gt; !!!
-		&gt; &lt;html&gt;
-		&gt;     &lt;head&gt;
-		&gt;         &lt;title&gt;Hamlet Demo
-		&gt;     &lt;body&gt;
-		&gt;         &lt;h1&gt;Information on John Doe
-		&gt;         &lt;h2&gt;
-		&gt;             $if isMarried person
-		&gt;                 Married
-		&gt;             $else
-		&gt;                 Not married
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hans/Manifest b/dev-haskell/hans/Manifest
deleted file mode 100644
index 3138ec0e3c90..000000000000
--- a/dev-haskell/hans/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hans-3.0.1.tar.gz 102002 BLAKE2B 2344c30c2143c38b77316cb34b35b38b9228452ca1a5ef0ebf2faf6f74d66a4a264db1f4d336ae86f5ab467cde4c2a914af22cc222110f649ede0bdecaadf5d4 SHA512 4495feb3bad78e8502bf1213727a130cc4e190dae54c1876ab353a919bfbce8e2fc370f3a191223e92944b3dbbba8a57e69c126d70c4ba65801eeb22a4edb55d
diff --git a/dev-haskell/hans/hans-3.0.1.ebuild b/dev-haskell/hans/hans-3.0.1.ebuild
deleted file mode 100644
index 8095c489a087..000000000000
--- a/dev-haskell/hans/hans-3.0.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=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: example:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Network Stack"
-HOMEPAGE="http://hackage.haskell.org/package/hans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RESTRICT=test # some test did not survive QC-2.10 (unicode string generator)
-
-RDEPEND="dev-haskell/boundedchan:=[profile?]
-	>=dev-haskell/cereal-0.5.0.0:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	dev-haskell/heaps:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/monadlib:=[profile?]
-	dev-haskell/psqueues:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( dev-haskell/quickcheck
-		>=dev-haskell/tasty-0.11
-		dev-haskell/tasty-ant-xml
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/hans/metadata.xml b/dev-haskell/hans/metadata.xml
deleted file mode 100644
index 0c6e0b4ba623..000000000000
--- a/dev-haskell/hans/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HaNS is a lightweight, pure Haskell network stack that can be used for Haskell
-		networking in the context of the HaLVM, or with a Linux tap device. Currently,
-		HaNS supports 802.3, IPv4, ARP, DHCP (partially), ICMP, UDP, and TCP.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest
deleted file mode 100644
index b3efd76a4f91..000000000000
--- a/dev-haskell/happstack-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST happstack-server-7.6.0.tar.gz 85715 BLAKE2B c4a673b6575a3131b29f00f4463431605bd26b469a366cbab3f87662b1e2c0ab43b4a6d205dec30ede009a71de38f27fcfcbd1ddf938ac1e4f419b1a31119c83 SHA512 cea814b470dd2d7a1dc3cf8a2724aa72e23f7832fc5292a7a1b3fbf8a6ef0980f13db777fadea3bdc5c9cb7dca7b35700ff2b94d6632ff7857a546a19ed1548f
diff --git a/dev-haskell/happstack-server/happstack-server-7.6.0.ebuild b/dev-haskell/happstack-server/happstack-server-7.6.0.ebuild
deleted file mode 100644
index ca46057156f8..000000000000
--- a/dev-haskell/happstack-server/happstack-server-7.6.0.ebuild
+++ /dev/null
@@ -1,56 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web related tools and services"
-HOMEPAGE="https://happstack.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +template-haskell"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/hslogger-1.0.2:=[profile?]
-	dev-haskell/html:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	<dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?]
-	>=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/system-filepath-0.3.1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/threads-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	dev-haskell/xhtml:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-			>=dev-haskell/network-3:=[profile?] <dev-haskell/network-3.2:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag template-haskell template_haskell)
-}
diff --git a/dev-haskell/happstack-server/metadata.xml b/dev-haskell/happstack-server/metadata.xml
deleted file mode 100644
index 8de693a1c501..000000000000
--- a/dev-haskell/happstack-server/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Happstack Server provides an HTTP server and a rich set of functions for routing requests, handling query parameters, generating responses, working with cookies, serving files, and more. For in-depth documentation see the Happstack Crash Course &lt;http://happstack.com/docs/crashcourse/index.html&gt;
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package</flag>
-		<flag name="template-haskell">Description: Template Haskell is available on this system</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
index 1bbc723221e9..aaa3de4cec94 100644
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -1,3 +1,2 @@
 DIST happy-1.19.12.tar.gz 183254 BLAKE2B 17b0d30f4aaf194a0e36c06bd6349665c704b5ab61dce16cae47f0ca6bfef0a0e2d4bbf3456f47cebf0f71f1a0b4a59ff6b581cb4ff76a26d82573eb0e7b056a SHA512 20f36b17adf7330852fd4c05335adbf31e6f19907b4ec247c85a40ee1f8496c6dc432055026696906b149cec7f982b88c9a2eeedf14a11d34b1f6f73272e5208
-DIST happy-1.19.4.tar.gz 160497 BLAKE2B a8a271ea69100d24b9a293d53e2a3262ad34c26cc9b511648cf64df719c49936b5badc6651191ca52b48ed96660335e86e706763e186f5275de1b58ae528631c SHA512 d49893098f9982321fc03dad464bf787873a1a82167165d53f617ba04923c7e5d8f177def7fa045a5669d1c7f886a88087ba8f668ef1900a71498b5800cc4b1a
-DIST happy-1.19.5.tar.gz 159280 BLAKE2B 5cfbddd981d689cfd076367e49f5b9fcfa38eca071a3d1d347a2074eb9c56436f6c7169d524b6628228472ee31ae1ccce3b5e1bcd0ae2b70d31283e3b4e33ee8 SHA512 7b43ef5236bdfba82bbddedb7edc7a8094990a389c0d3f5f848cb6208c3577e7b394cb290e51a2b2eebca25c97978a85ee932e74bbf6a792e261e5b5bff25a2b
+DIST happy-1.20.1.1.tar.gz 183409 BLAKE2B b9bb9da227b21e6a63a9649454745f32b6f9fb2c33132da60595ab1bbca0e6659a6941ec89ed0705f9c5052dfc1dc076888c0b309d797f699a1d398e04d5913a SHA512 a2ff6a1778884de22f4900a22b8a451ed5dc8a8e66020ce9e186a03068257748a3810c63b56f1efa0b646d99fe637f87178983f387d4c49bc33b82613877ec48
diff --git a/dev-haskell/happy/files/happy-1.19.5-ghc-7.10.2.patch b/dev-haskell/happy/files/happy-1.19.5-ghc-7.10.2.patch
deleted file mode 100644
index dee216b029fb..000000000000
--- a/dev-haskell/happy/files/happy-1.19.5-ghc-7.10.2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-I'm not sure if it's a ghc feature or a bug.
-Should happy emable that extension for -g option?
-
-The build error is Kind mismatch:
-
-  monad002.g.hs:296:26:
-    Couldn't match kind ‘*’ with ‘#’
-    When matching types
-      t0 :: *
-      Happy_GHC_Exts.Int# :: #
-    Relevant bindings include
-      cont :: t0 -> [Char] -> Int -> ParseResult a
-        (bound at monad002.g.hs:293:13)
-    In the first argument of ‘cont’, namely ‘8#’
-    In the expression: cont 8#
-    In a case alternative: TokenLet -> cont 8#
-
-Slightly related bug: https://ghc.haskell.org/trac/ghc/ticket/8739
-
-diff --git a/tests/monad002.ly b/tests/monad002.ly
-index 35cc5b0..4c526ca 100644
---- a/tests/monad002.ly
-+++ b/tests/monad002.ly
-@@ -5,2 +5,3 @@ Test for monadic Happy Parsers, Simon Marlow 1996.
- > {-# OPTIONS_GHC -fglasgow-exts #-}
-+> {-# LANGUAGE MonoLocalBinds #-}
- > -- -fglasgow-exts required because P is a type synonym, and Happy uses it
diff --git a/dev-haskell/happy/happy-1.19.12.ebuild b/dev-haskell/happy/happy-1.19.12.ebuild
index c67b77e14afb..b9635469540b 100644
--- a/dev-haskell/happy/happy-1.19.12.ebuild
+++ b/dev-haskell/happy/happy-1.19.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 #hackport: flags: +small_base
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-haskell/mtl-2.2.1:=
diff --git a/dev-haskell/happy/happy-1.19.4.ebuild b/dev-haskell/happy/happy-1.19.4.ebuild
deleted file mode 100644
index c7ee325b440a..000000000000
--- a/dev-haskell/happy/happy-1.19.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit eutils haskell-cabal autotools
-
-DESCRIPTION="Happy is a parser generator for Haskell"
-HOMEPAGE="http://www.haskell.org/happy/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/mtl-1.0
-	>=dev-lang/ghc-6.10.4
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-			app-text/docbook-xsl-stylesheets )
-"
-
-src_prepare() {
-	for f in AttrGrammarParser Parser; do
-		# drop broken autogenerated
-		mv "dist/build/happy/happy-tmp/$f.hs" src/ || die
-		# drop depend on itself, otherwise cabal tries to regenerate it
-		rm "src/$f.ly" || die
-	done
-	use doc && cd doc && eautoconf
-}
-
-src_configure() {
-	# '--with-happy=false' allows detecting circular
-	# depends even when 'happy' is installed in system
-	haskell-cabal_src_configure --with-happy=false
-
-	if use doc; then
-		# does not like out-of-source builds
-		cd doc || die
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C doc -j1
-	fi
-}
-
-src_install() {
-	haskell-cabal_src_install
-	if use doc; then
-		cd doc || die
-		dohtml -r happy/*
-		doman "${S}/doc/happy.1"
-	fi
-}
diff --git a/dev-haskell/happy/happy-1.19.5.ebuild b/dev-haskell/happy/happy-1.19.5.ebuild
deleted file mode 100644
index 5fc779132c7c..000000000000
--- a/dev-haskell/happy/happy-1.19.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit eutils haskell-cabal autotools
-
-DESCRIPTION="Happy is a parser generator for Haskell"
-HOMEPAGE="http://www.haskell.org/happy/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/mtl-1.0
-	>=dev-lang/ghc-6.10.4
-	doc? ( ~app-text/docbook-xml-dtd-4.2
-			app-text/docbook-xsl-stylesheets )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.19.5-ghc-7.10.2.patch
-
-	for f in AttrGrammarParser Parser; do
-		# drop broken autogenerated
-		mv "dist/build/happy/happy-tmp/$f.hs" src/ || die
-		# drop depend on itself, otherwise cabal tries to regenerate it
-		rm "src/$f.ly" || die
-	done
-	use doc && cd doc && eautoconf
-}
-
-src_configure() {
-	# '--with-happy=false' allows detecting circular
-	# depends even when 'happy' is installed in system
-	haskell-cabal_src_configure --with-happy=false
-
-	if use doc; then
-		# does not like out-of-source builds
-		cd doc || die
-		econf
-	fi
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-
-	if use doc; then
-		emake -C doc -j1
-	fi
-}
-
-src_test() {
-	# workaround https://github.com/haskell/cabal/issues/2398
-	emake -k -C tests all
-}
-
-src_install() {
-	haskell-cabal_src_install
-	if use doc; then
-		cd doc || die
-		dohtml -r happy/*
-		doman "${S}/doc/happy.1"
-	fi
-}
diff --git a/dev-haskell/happy/happy-1.20.1.1.ebuild b/dev-haskell/happy/happy-1.20.1.1.ebuild
new file mode 100644
index 000000000000..de73725aa660
--- /dev/null
+++ b/dev-haskell/happy/happy-1.20.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +small_base
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal autotools
+
+DESCRIPTION="Happy is a parser generator for Haskell"
+HOMEPAGE="https://www.haskell.org/happy/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-haskell/mtl-2.2.1:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	doc? ( ~app-text/docbook-xml-dtd-4.2
+			app-text/docbook-xsl-stylesheets )
+"
+
+src_prepare() {
+	default
+
+	if use doc; then
+		cd doc || die
+		eautoconf
+	fi
+}
+
+src_configure() {
+	# '--with-happy=false' allows detecting circular
+	# depends even when 'happy' is installed in system
+	haskell-cabal_src_configure \
+		--with-happy=false\
+		--flag=small_base
+
+	if use doc; then
+		# does not like out-of-source builds
+		cd doc || die
+		econf
+	fi
+}
+
+src_compile() {
+	haskell-cabal_src_compile
+
+	if use doc; then
+		emake -C doc -j1
+	fi
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/happy/.
+		doman doc/happy.1
+	fi
+}
diff --git a/dev-haskell/happy/metadata.xml b/dev-haskell/happy/metadata.xml
index 74ae0f3e98e6..937381521944 100644
--- a/dev-haskell/happy/metadata.xml
+++ b/dev-haskell/happy/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Happy is a parser generator for Haskell
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/harp/Manifest b/dev-haskell/harp/Manifest
deleted file mode 100644
index e4b9357569d9..000000000000
--- a/dev-haskell/harp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST harp-0.4.1.tar.gz 2831 BLAKE2B 1f160a15ef8c94d01d77ec9d571d649f3acfd123c1375a2678259b5ffd74b69aa3839acae0b0ae1697cf03fa310d74137fb8bf51a2fb641f823960eaa5775895 SHA512 f0e185df070301aa57ed3f2be1d9eaad65920de36404b4db81172565e87ddf152714e24fa57ad7d8519e464d8e6287d3a0b23c9242d759f4538033f239f061a9
-DIST harp-0.4.2.tar.gz 2900 BLAKE2B e849a5efc3e9e7274e3890e2e5cce5266e6cf3e1acfe023619696754a3c108263c59a4ec5f1069b9459e0348e0bdd02fa6b9f3120bbc8a65b11b340b81004a42 SHA512 2af06f0ccc138ba781edce6040fd4a88cace808990dc01cce4832414e2b4e29930c3493b320bd5d9a150823a9dcdce3a74bda82a078ded8afcce76edbdac1c13
-DIST harp-0.4.3.2.tar.gz 2908 BLAKE2B 70ce7ab8d4ea89700412bf78cced290ae7d4a0b880f4814c2cdae57f64e8e5a8cd3684dd5a8cae19589a520514ee71b75697bd36cb93a03458c31da235ef919b SHA512 912e4a79eea4fa5ee1b989b2b073676874303aa68fdb91dda24e2e87b7445f1fc0db92bc01159021cdfe64a3875477985fcbe5cc6a9b698e6604da978c265020
diff --git a/dev-haskell/harp/harp-0.4.1.ebuild b/dev-haskell/harp/harp-0.4.1.ebuild
deleted file mode 100644
index 42dceca12a09..000000000000
--- a/dev-haskell/harp/harp-0.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HaRP allows pattern-matching with regular expressions"
-HOMEPAGE="https://github.com/seereason/harp"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
diff --git a/dev-haskell/harp/harp-0.4.2.ebuild b/dev-haskell/harp/harp-0.4.2.ebuild
deleted file mode 100644
index d1240359730b..000000000000
--- a/dev-haskell/harp/harp-0.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HaRP allows pattern-matching with regular expressions"
-HOMEPAGE="https://github.com/seereason/harp"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/harp/harp-0.4.3.2.ebuild b/dev-haskell/harp/harp-0.4.3.2.ebuild
deleted file mode 100644
index 6d0c7ef3f3b6..000000000000
--- a/dev-haskell/harp/harp-0.4.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HaRP allows pattern-matching with regular expressions"
-HOMEPAGE="https://github.com/seereason/harp"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base < 4.13' 'base'
-}
diff --git a/dev-haskell/harp/metadata.xml b/dev-haskell/harp/metadata.xml
deleted file mode 100644
index 54b09a2c0d8b..000000000000
--- a/dev-haskell/harp/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription lang="en">
-	HaRP, or Haskell Regular Patterns, is a Haskell extension that extends the
-	normal pattern matching facility with the power of regular expressions. This
-	expressive power is highly useful in a wide range of areas, including text
-	parsing and XML processing. Regular expression patterns in HaRP work over
-	ordinary Haskell lists ([]) of arbitrary type. HaRP is implemented as a
-	pre-processor to ordinary Haskell.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">seereason/harp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hashable-time/Manifest b/dev-haskell/hashable-time/Manifest
deleted file mode 100644
index 0733a9c22011..000000000000
--- a/dev-haskell/hashable-time/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hashable-time-0.2.0.2.tar.gz 2180 BLAKE2B 194e3d4e9bcf7c9b0d8a97a210bebee91e0f22ccf76e8726b563baa2380751447a655b12eadb63a29f191e093925ebe9bf9c31c29ae01077f6e9e287f61847ad SHA512 38ade3c808072cc1488e0f68d054891576c781d33f7151721dae9f994833723b7b30e92cc77750e91929ce9cd47753a8b1d8157845d7c972f1bdbd44b3094c0a
-DIST hashable-time-0.2.tar.gz 2111 BLAKE2B cf4dec1e99e2d76a2137b121cfdc109cb527d7733f893b5d74530bfac8708aa1246168c6439b2da157e15384fdce26f203070fe3151b5bb65676c1a08604a3be SHA512 0a05707019f2cc19c26a4dac955c5f31f334589074b7ecff15ae60654dea1376205b897d674fa4b1369dec62ca4f93a061250baabccf30f877ea984495df1211
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
deleted file mode 100644
index f0ca382bfa40..000000000000
--- a/dev-haskell/hashable-time/hashable-time-0.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Hashable instances for Data.Time"
-HOMEPAGE="http://hackage.haskell.org/package/hashable-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.7 && <4.13' 'base >=4.7' \
-		'hashable >=1.2.3.3 && <=1.3' 'hashable >=1.2.3.3'
-}
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.0.2.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.0.2.ebuild
deleted file mode 100644
index cb48147255fa..000000000000
--- a/dev-haskell/hashable-time/hashable-time-0.2.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Hashable instances for Data.Time"
-HOMEPAGE="https://hackage.haskell.org/package/hashable-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.3.3:=[profile?] <=dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.ebuild
deleted file mode 100644
index 434c294e7556..000000000000
--- a/dev-haskell/hashable-time/hashable-time-0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Hashable instances for Data.Time"
-HOMEPAGE="https://hackage.haskell.org/package/hashable-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.3.3:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.7 && <4.9' 'base >=4.7' \
-		'hashable >=1.2.3.3 && <=1.3' 'hashable >=1.2.3.3'
-}
diff --git a/dev-haskell/hashable-time/metadata.xml b/dev-haskell/hashable-time/metadata.xml
deleted file mode 100644
index 7d4c05083bbc..000000000000
--- a/dev-haskell/hashable-time/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Hashable instances for types in Data.Time
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hashable/Manifest b/dev-haskell/hashable/Manifest
index 5e28cd0b8f4d..6349c517f370 100644
--- a/dev-haskell/hashable/Manifest
+++ b/dev-haskell/hashable/Manifest
@@ -1,3 +1,3 @@
-DIST hashable-1.2.1.0.tar.gz 22389 BLAKE2B 62b883954ad22e25ace7b267e79e2a62be35671dc14d04c9ad12675d9a350b829088bb3c79b254cbd4783953ff46543f68d71e002b96cb1ba272ec808b17eaaa SHA512 343f6b9eb40d089f0f2187427af7d7b5dbe15884649ddc8e0b140db129f21fc44f6bf41a262a3b2a0c74d967be6f603799472802d835e48a442f836dd8142607
-DIST hashable-1.2.4.0.tar.gz 24491 BLAKE2B c5d3fb061a2e4fbb7c85f00c24818e708d8511c547588eea024240611d427f982633cacecd35d9a8f4306377ef0b5f75889271cd6bbeabfd0d1f837cb3b4b8db SHA512 992027ce617e347414e328e05afe69b8621fb1af21fef58836761d2002a1f9f7f97c981ff3c4fe8699a1da124771df575717ed4e3fd0bbe5c62d81be1322dbf6
-DIST hashable-1.2.7.0.tar.gz 30182 BLAKE2B 7dee78e531fb396c51531f7b239f45a316bad3494590684b13814894a606ab8ddf7ef85a2027f26eeddad0a38f2c06a8a16d03b1b67ce009f9e8aed6cc872232 SHA512 41accac8fa38ab5c243caa058deaf31644d4df670520010d0d593e84fd42970f3fe2d4e945a31ac5491050467e843c7bdb299283a4c6d1446dfcbc2dbc58eec7
+DIST hashable-1.4.0.2.tar.gz 25528 BLAKE2B a9d219ce08db64b2bccf691f26ea5e248785ac3263ce1045eb612d2deaf51baa5f0b14270a9810aa1d32193fe9f52b26c2ca4fccb94b98e2ccdcb0b6ba6e8a56 SHA512 a8cc2b7cafa8f18d9a74490d2dff7edf12901b7c40ca0c1881af579695135c1ca7629347d34d0c7dc662078d7669d5d6234bd889c1f77f344297942243fe7dda
+DIST hashable-1.4.2.0-rev1.cabal 4520 BLAKE2B fa09b82c6df33e80381957593f9e4c9206467f9b81ed4dcca73f7924ffee68ccc78600875ca46709582cb231aebff54fa1328fbdee1c0b8613c0d12726f3fc1f SHA512 a244e2e323faa8e36865b52aafbf3f8a792d1051379b11fc5be5f4257c64d5a6c52e4bdbf3a24790f23de707f13ef645ac13222cbc05b5f1e77e4c05564d9298
+DIST hashable-1.4.2.0.tar.gz 25094 BLAKE2B c398381bd1555b4c3d91656391ac492b036daa2f67cc501af8734d46a891e55028f0e7af4cede1d4ebd57863a2ceb10493ec822a01d29bb0edf07c8dc574e199 SHA512 6e44177b6c00d4b385696348a8f66e6158beeb224aa85726141bc4d58c5e3094dab35dd68ae4ef61845ccb3ffd8836547d988d61e9b39176782b567189381140
diff --git a/dev-haskell/hashable/hashable-1.2.1.0.ebuild b/dev-haskell/hashable/hashable-1.2.1.0.ebuild
deleted file mode 100644
index 0d4114cdeb6a..000000000000
--- a/dev-haskell/hashable/hashable-1.2.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types that can be converted to a hash value"
-HOMEPAGE="https://github.com/tibbe/hashable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-
-RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.1
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_prepare() {
-	# a workaround for <cabal-1.18 #498480
-	hsc2hs tests/Regress/Mmap.{hsc,hs} || die
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpu_flags_x86_sse2 sse2) \
-		$(cabal_flag cpu_flags_x86_sse4_1 sse41)
-}
diff --git a/dev-haskell/hashable/hashable-1.2.4.0.ebuild b/dev-haskell/hashable/hashable-1.2.4.0.ebuild
deleted file mode 100644
index cdcc8db6cbb9..000000000000
--- a/dev-haskell/hashable/hashable-1.2.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,integer-gmp:gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types that can be converted to a hash value"
-HOMEPAGE="https://github.com/tibbe/hashable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-
-RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpu_flags_x86_sse2 sse2) \
-		$(cabal_flag cpu_flags_x86_sse4_1 sse41)
-}
diff --git a/dev-haskell/hashable/hashable-1.2.7.0.ebuild b/dev-haskell/hashable/hashable-1.2.7.0.ebuild
deleted file mode 100644
index 6b308a7bf3c7..000000000000
--- a/dev-haskell/hashable/hashable-1.2.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,integer-gmp:gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: circular depend
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="A class for types that can be converted to a hash value"
-HOMEPAGE="https://github.com/tibbe/hashable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 examples +gmp"
-
-RESTRICT=test # circular deps: hashable[test]->quickcheck->semigroups->hashable
-
-RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.4 && < 4.12' 'base >= 4.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples) \
-		$(cabal_flag gmp integer-gmp) \
-		$(cabal_flag cpu_flags_x86_sse2 sse2) \
-		$(cabal_flag cpu_flags_x86_sse4_1 sse41)
-}
diff --git a/dev-haskell/hashable/hashable-1.4.0.2-r1.ebuild b/dev-haskell/hashable/hashable-1.4.0.2-r1.ebuild
new file mode 100644
index 000000000000..94059d396072
--- /dev/null
+++ b/dev-haskell/hashable/hashable-1.4.0.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,+integer-gmp,+random-initial-seed
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+RESTRICT=test  # circular deps: hashable[test]->quickcheck->semigroups->hashable
+
+DESCRIPTION="A class for types that can be converted to a hash value"
+HOMEPAGE="https://github.com/haskell-unordered-containers/hashable"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="random-initial-seed"
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.6:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
+#	test? ( dev-haskell/hunit
+#		>=dev-haskell/quickcheck-2.4.0.1
+#		>=dev-haskell/random-1.0 <dev-haskell/random-1.3
+#		>=dev-haskell/test-framework-0.3.3
+#		dev-haskell/test-framework-hunit
+#		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=integer-gmp \
+		$(cabal_flag random-initial-seed random-initial-seed)
+}
diff --git a/dev-haskell/hashable/hashable-1.4.2.0-r2.ebuild b/dev-haskell/hashable/hashable-1.4.2.0-r2.ebuild
new file mode 100644
index 000000000000..4c505a202cd9
--- /dev/null
+++ b/dev-haskell/hashable/hashable-1.4.2.0-r2.ebuild
@@ -0,0 +1,45 @@
+# 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: sse41:cpu_flags_x86_sse4_1,sse2:cpu_flags_x86_sse2,+integer-gmp,+random-initial-seed
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A class for types that can be converted to a hash value"
+HOMEPAGE="https://github.com/haskell-unordered-containers/hashable"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="random-initial-seed"
+
+RESTRICT=test # fails 1 test consistently on ghc-9.0.2
+
+RDEPEND="
+	>=dev-haskell/base-orphans-0.8.6:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+	>=dev-haskell/data-array-byte-0.1.0.1:=[profile?] <dev-haskell/data-array-byte-0.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.4.0.1
+		>=dev-haskell/random-1.0 <dev-haskell/random-1.3
+		>=dev-haskell/test-framework-0.3.3
+		dev-haskell/test-framework-hunit
+		>=dev-haskell/test-framework-quickcheck2-0.2.9
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=integer-gmp \
+		$(cabal_flag random-initial-seed random-initial-seed)
+}
diff --git a/dev-haskell/hashable/metadata.xml b/dev-haskell/hashable/metadata.xml
index fbc05adb87d3..60a3f5314947 100644
--- a/dev-haskell/hashable/metadata.xml
+++ b/dev-haskell/hashable/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package defines a class, 'Hashable', for types that
-		can be converted to a hash value.  This class
-		exists for the benefit of hashing-based data
-		structures.  The package provides instances for
-		basic types and a way to combine hash values.
-	</longdescription>
+	<use>
+		<flag name="random-initial-seed">
+		Randomly initialize the seed on every executable invocation. This
+		is not a security feature and is intended only for testing (it
+		can affect legitimate use cases).
+		</flag>
+	</use>
 	<upstream>
-		<remote-id type="github">tibbe/hashable</remote-id>
+		<remote-id type="hackage">hashable</remote-id>
+		<remote-id type="github">haskell-unordered-containers/hashable</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hashed-storage/Manifest b/dev-haskell/hashed-storage/Manifest
deleted file mode 100644
index 8f5bbc43583d..000000000000
--- a/dev-haskell/hashed-storage/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hashed-storage-0.5.11.tar.gz 57315 BLAKE2B a97a706446117dc049810b054cad25e62b75be905a0379ef935deb2c1fee6c2de0dece3bf74917bf7bb781f6a90a989ed8b164b3d871768c6c4e9182ffdbf488 SHA512 11bfc05ecb2de5adc5a46116d15d969207a310583e7183e2a21ef767a23eabc55622c84ef351ace81a29800a544358c604b4a255800a713af01266331bf321ba
diff --git a/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-QC-2.8.2.patch b/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-QC-2.8.2.patch
deleted file mode 100644
index 1a001e73f537..000000000000
--- a/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-QC-2.8.2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Storage/Hashed/Test.hs b/Storage/Hashed/Test.hs
-index d3cab6f..7f8291e 100644
---- a/Storage/Hashed/Test.hs
-+++ b/Storage/Hashed/Test.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE ScopedTypeVariables, FlexibleInstances #-}
-+{-# LANGUAGE ScopedTypeVariables, FlexibleInstances, CPP #-}
- module Storage.Hashed.Test( tests ) where
-@@ -464,2 +464,3 @@ posix = [ testCase "getFileStatus" $ check_stat Posix.getFileStatus
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary a, Ord a) => Arbitrary (S.Set a)
-@@ -469,2 +470,3 @@ instance (Arbitrary k, Arbitrary v, Ord k) => Arbitrary (M.Map k v)
-     where arbitrary = M.fromList `fmap` arbitrary
-+#endif
- 
diff --git a/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-ghc-7.10.patch b/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-ghc-7.10.patch
deleted file mode 100644
index f071cab314fb..000000000000
--- a/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-ghc-7.10.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/Storage/Hashed/Monad.hs b/Storage/Hashed/Monad.hs
-index 67287b4..bf8ad38 100644
---- a/Storage/Hashed/Monad.hs
-+++ b/Storage/Hashed/Monad.hs
-@@ -1,2 +1,3 @@
- {-# LANGUAGE ScopedTypeVariables, BangPatterns, TypeSynonymInstances, UndecidableInstances, FlexibleInstances #-}
-+{-# LANGUAGE FlexibleContexts #-}
- 
diff --git a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
deleted file mode 100644
index c4dd82139904..000000000000
--- a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Hashed file storage support code"
-HOMEPAGE="https://hackage.haskell.org/package/hashed-storage"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE="diff hpc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/dataenc:=[profile?]
-	dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	diff? ( dev-haskell/lcs:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	test? ( dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.3:2=[profile?]
-		dev-haskell/test-framework:=[profile?]
-		dev-haskell/test-framework-hunit:=[profile?]
-		dev-haskell/test-framework-quickcheck2:=[profile?]
-		dev-haskell/zip-archive:=[profile?] )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-	epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag diff diff) \
-		$(cabal_flag hpc hpc) \
-		$(cabal_flag test test)
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	use test && rm "${ED}/usr/bin/hashed-storage-test"
-}
diff --git a/dev-haskell/hashed-storage/metadata.xml b/dev-haskell/hashed-storage/metadata.xml
deleted file mode 100644
index af6dbebb7a30..000000000000
--- a/dev-haskell/hashed-storage/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Support code for reading and manipulating hashed file storage
-		(where each file and directory is associated with a
-		cryptographic hash, for corruption-resistant storage and fast
-		comparisons).
-		
-		The supported storage formats include darcs hashed pristine, a
-		plain filesystem tree and an indexed plain tree (where the index
-		maintains hashes of the plain files and directories).
-	</longdescription>
-	<use>
-		<flag name="diff">Provide the Storage.Hashed.Diff module.</flag>
-		<flag name="hpc">Compile with the profiling ghc flag -fhpc.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/hashtables/Manifest b/dev-haskell/hashtables/Manifest
index 41e467988645..0a4264f7732a 100644
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@@ -1,3 +1 @@
-DIST hashtables-1.1.2.1.tar.gz 48553 BLAKE2B eff3d256a6e0bbf3ac31e6d26c43efce9bc06ba09d14b22a6a5bd1d0ea17b81912590739376a6912990501d33598e39e4f92818dceb8c89a8e57853dffbc4373 SHA512 87739d4021b705e40982e66925400eea38efd2f2a11dc46626f33d2a9c9287a5a323d93c82d6e8415aef0434350256fda80819a4bbb58ff2afee74ed755c266a
-DIST hashtables-1.2.1.0.tar.gz 53706 BLAKE2B 5bc1d17fdf80f561fa7d6e9a9010025098579694356484bdaf41ebf6e5e2a03dd6983cb653eef553fb41be99aaa3ce11b2004efe62a585b0ec34f7c4fa12cefe SHA512 2c6cd17434402ff963a1b3357e58dfab3d4b60f5a2848b5433dcbbc1705d24707eacfc36af5dfb461ab03ce678c0736f3277292677e8ab297b306bd14e797e64
-DIST hashtables-1.2.3.4.tar.gz 58458 BLAKE2B ea57de50f1bc02107b06ea57f215aa8b7bc97ae658a43e2e57481c097452ee5b9bf2b8d67e0656c7b94830cb7bd4ed7d2e8f3f5b1c3b2070fcc3f1ed1d5f7acc SHA512 4723540f930edd1d5fd5cf58eadf7ed24fcd7761b90f303d559bc617737ec30cee2e9571ecced61fd369a933ae95b4386e48b122b876e73d0ad4bb65df16b76e
+DIST hashtables-1.3.1.tar.gz 58697 BLAKE2B d543987f667553b0739b414600190127840cb656d1509cb2541274bed00c298d176ff8ae059f79cc1dbf9201f1e76697103c9620a6208e9a9bf744cafea379d5 SHA512 b6430e092cfa9cde3dbea34cd9e2a10869c41e40e88f79e28aa6aabfdcd359dd74fb87020f8b9e004b817a6e9a8825335fcc91c2b88f7eb93b25758c71c77833
diff --git a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild b/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
deleted file mode 100644
index c9196569efdb..000000000000
--- a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable hash tables in the ST monad"
-HOMEPAGE="https://github.com/gregorycollins/hashtables"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bounds-checking portable cpu_flags_x86_sse4_1 +unsafe-tricks"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bounds-checking bounds-checking) \
-		$(cabal_flag portable portable) \
-		$(cabal_flag cpu_flags_x86_sse4_1 sse41) \
-		$(cabal_flag unsafe-tricks unsafe-tricks)
-}
diff --git a/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild b/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild
deleted file mode 100644
index c308cbd93bfe..000000000000
--- a/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: sse42:cpu_flags_x86_sse4_2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable hash tables in the ST monad"
-HOMEPAGE="https://github.com/gregorycollins/hashtables"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bounds-checking cpu_flags_x86_sse4_2 portable +unsafe-tricks"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bounds-checking bounds-checking) \
-		$(cabal_flag portable portable) \
-		$(cabal_flag cpu_flags_x86_sse4_2 sse42) \
-		$(cabal_flag unsafe-tricks unsafe-tricks)
-}
diff --git a/dev-haskell/hashtables/hashtables-1.2.3.4.ebuild b/dev-haskell/hashtables/hashtables-1.2.3.4.ebuild
deleted file mode 100644
index b1ef85e089ff..000000000000
--- a/dev-haskell/hashtables/hashtables-1.2.3.4.ebuild
+++ /dev/null
@@ -1,38 +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.1.9999
-#hackport: flags: sse42:cpu_flags_x86_sse4_2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable hash tables in the ST monad"
-HOMEPAGE="https://github.com/gregorycollins/hashtables"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling portable +unsafe-tricks"
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bounds-checking bounds-checking) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag detailed-profiling detailed-profiling) \
-		$(cabal_flag portable portable) \
-		$(cabal_flag cpu_flags_x86_sse4_2 sse42) \
-		$(cabal_flag unsafe-tricks unsafe-tricks)
-}
diff --git a/dev-haskell/hashtables/hashtables-1.3.1.ebuild b/dev-haskell/hashtables/hashtables-1.3.1.ebuild
new file mode 100644
index 000000000000..13d8df830c14
--- /dev/null
+++ b/dev-haskell/hashtables/hashtables-1.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: sse42:cpu_flags_x86_sse4_2,+unsafe-tricks,-portable
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Mutable hash tables in the ST monad"
+HOMEPAGE="https://github.com/gregorycollins/hashtables"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling"
+
+RDEPEND="
+	=dev-haskell/hashable-1.4*:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.14
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
+		>=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16
+		>=dev-haskell/quickcheck-2.3.0.2
+		>=dev-haskell/test-framework-0.3.1 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.6 <dev-haskell/test-framework-hunit-3
+		>=dev-haskell/test-framework-quickcheck2-0.2.6 <dev-haskell/test-framework-quickcheck2-0.4
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bounds-checking bounds-checking) \
+		$(cabal_flag debug debug) \
+		$(cabal_flag detailed-profiling detailed-profiling) \
+		--flag=-portable \
+		$(cabal_flag cpu_flags_x86_sse4_2 sse42) \
+		--flag=unsafe-tricks
+}
diff --git a/dev-haskell/hashtables/metadata.xml b/dev-haskell/hashtables/metadata.xml
index 9a65adf54733..0cf72ece23fa 100644
--- a/dev-haskell/hashtables/metadata.xml
+++ b/dev-haskell/hashtables/metadata.xml
@@ -1,109 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a couple of different implementations of mutable hash
-		tables in the ST monad, as well as a typeclass abstracting their common
-		operations, and a set of wrappers to use the hash tables in the IO monad.
-		
-		/QUICK START/: documentation for the hash table operations is provided in the
-		"Data.HashTable.Class" module, and the IO wrappers (which most users will
-		probably prefer) are located in the "Data.HashTable.IO" module.
-		
-		This package currently contains three hash table implementations:
-		
-		1. "Data.HashTable.ST.Basic" contains a basic open-addressing hash table
-		using linear probing as the collision strategy. On a pure speed basis it
-		should currently be the fastest available Haskell hash table
-		implementation for lookups, although it has a higher memory overhead
-		than the other tables and can suffer from long delays when the table is
-		resized because all of the elements in the table need to be rehashed.
-		
-		2. "Data.HashTable.ST.Cuckoo" contains an implementation of \"cuckoo
-		hashing\" as introduced by Pagh and Rodler in 2001 (see
-		&lt;https://en.wikipedia.org/wiki/Cuckoo_hashing&gt;). Cuckoo hashing has
-		worst-case /O(1)/ lookups and can reach a high \"load factor\", in which
-		the table can perform acceptably well even when more than 90% full.
-		Randomized testing shows this implementation of cuckoo hashing to be
-		slightly faster on insert and slightly slower on lookup than
-		"Data.Hashtable.ST.Basic", while being more space efficient by about a
-		half-word per key-value mapping. Cuckoo hashing, like the basic hash
-		table implementation using linear probing, can suffer from long delays
-		when the table is resized.
-		
-		3. "Data.HashTable.ST.Linear" contains a linear hash table (see
-		&lt;https://en.wikipedia.org/wiki/Linear_hashing&gt;), which trades some insert
-		and lookup performance for higher space efficiency and much shorter
-		delays when expanding the table. In most cases, benchmarks show this
-		table to be currently slightly faster than @Data.HashTable@ from the
-		Haskell base library.
-		
-		It is recommended to create a concrete type alias in your code when using this
-		package, i.e.:
-		
-		&gt; import qualified Data.HashTable.IO as H
-		&gt;
-		&gt; type HashTable k v = H.BasicHashTable k v
-		&gt;
-		&gt; foo :: IO (HashTable Int Int)
-		&gt; foo = do
-		&gt;	 ht &lt;- H.new
-		&gt;	 H.insert ht 1 1
-		&gt;	 return ht
-		
-		Firstly, this makes it easy to switch to a different hash table implementation,
-		and secondly, using a concrete type rather than leaving your functions abstract
-		in the HashTable class should allow GHC to optimize away the typeclass
-		dictionaries.
-		
-		This package accepts a couple of different cabal flags:
-		
-		* @unsafe-tricks@, default /ON/. If this flag is enabled, we use some
-		unsafe GHC-specific tricks to save indirections (namely @unsafeCoerce#@
-		and @reallyUnsafePtrEquality#@. These techniques rely on assumptions
-		about the behaviour of the GHC runtime system and, although they've been
-		tested and should be safe under normal conditions, are slightly
-		dangerous. Caveat emptor. In particular, these techniques are
-		incompatible with HPC code coverage reports.
-		
-		* @sse41@, default /OFF/. If this flag is enabled, we use some SSE 4.1
-		instructions (see &lt;https://en.wikipedia.org/wiki/SSE4&gt;, first available on
-		Intel Core 2 processors) to speed up cache-line searches for cuckoo
-		hashing.
-		
-		* @bounds-checking@, default /OFF/. If this flag is enabled, array accesses
-		are bounds-checked.
-		
-		* @debug@, default /OFF/. If turned on, we'll rudely spew debug output to
-		stdout.
-		
-		* @portable@, default /OFF/. If this flag is enabled, we use only pure
-		Haskell code and try not to use unportable GHC extensions. Turning this
-		flag on forces @unsafe-tricks@ and @sse41@ /OFF/.
-		
-		This package has been tested with GHC 7.0.3, on:
-		
-		* a MacBook Pro running Snow Leopard with an Intel Core i5 processor,
-		running GHC 7.0.3 in 64-bit mode.
-		
-		* an Arch Linux desktop with an AMD Phenom II X4 940 quad-core processor.
-		
-		* a MacBook Pro running Snow Leopard with an Intel Core 2 Duo processor,
-		running GHC 6.12.3 in 32-bit mode.
-		
-		Please send bug reports to
-		&lt;https://github.com/gregorycollins/hashtables/issues&gt;.
-	</longdescription>
 	<use>
 		<flag name="bounds-checking">if on, use bounds-checking array accesses</flag>
 		<flag name="detailed-profiling">add detailed profiling information to profiled build-depends</flag>
-		<flag name="portable">if on, use only pure Haskell code and no GHC extensions.</flag>
-		<flag name="unsafe-tricks">turn on unsafe GHC tricks</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">hashtables</remote-id>
 		<remote-id type="github">gregorycollins/hashtables</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
index a32c0d543bcb..314ae7a6e71a 100644
--- a/dev-haskell/haskeline/Manifest
+++ b/dev-haskell/haskeline/Manifest
@@ -1,5 +1,2 @@
-DIST haskeline-0.7.1.2.tar.gz 68251 BLAKE2B 0e28ee337d1d7979d7ae81cf73d9b2d7e566039974420a7706a871b83b21164bef1909507dd301b3bb4c22675513ebffc36e5b68c134f5669af6acdeedc40ffd SHA512 11d3ee9507d10d14ad05a45eb269a70a661e755502c7a39c5516508e66bda7c0d56c0d91db3e6ea665ee532001bef246be14a95c12eb257724616753e2b93f6c
-DIST haskeline-0.7.1.3.tar.gz 68291 BLAKE2B f1e645d7cd4886cd1d7b9cd42ec64b27dceaa8d3f3d569555d3cafe792effc34550a320fe221f3278e33abe390908149990299e041e9480682aca6d649f6b102 SHA512 eed183edd1af5b9d77c61278c40f07599900793e47858771810b48cbd178c34a06264910dd5484f76e5a03e53551e1035e1d291d8e3577ec6f4f5a9ba8d61d5d
-DIST haskeline-0.7.2.1.tar.gz 68409 BLAKE2B e966c75e476e5167fc3b59c4c92d00af135b96f52790ce4641771fcc5d5f25e8c21abb64088da183559e4fec60a985def5d3c90e3f34b292d3d690f2b81c3aa9 SHA512 a2f790b9bb27cc8681567c3c0c3476231976d08a0e2d1e9fb69301f55511edd0221034ae8af27ec4c9db4b15f2d72b8b716d013518d0b8d15d98e859dbf0321b
-DIST haskeline-0.7.2.3.tar.gz 68332 BLAKE2B da80d367102c61775956c5c07906ef4848df60ec1af00a2a0f0199ba06219515f57681a0f158ff7a4c2a478f5af40716a6f240f16a49249249e78cf2a6892a41 SHA512 94e24ef66c7a782057c3495eba74b7ae3c703bff47b2598c840e1372b2b19a09fb97c5075660074ef6bccde9a6c35e234df06fda5de103e2fe5b4fdf7df069b8
-DIST haskeline-0.7.5.0.tar.gz 66156 BLAKE2B b8b2e589681255572393f07d3794647d657d4992979dcf1c6a3eb073dc3b5cfc6ad182b7cb2a7b9ee5b54da797b6a79d710974f2a46068fdea411fa4fdd5086c SHA512 624b102fe2446f347fb8b0f1027dcfcffc47c7ccceb900357aa3d17a1303b25480189c25dbb548d2dd303fe7577e54eacdd232c2dba143e6c8ac4d7e5fcf0b27
+DIST haskeline-0.8.2-rev3.cabal 6005 BLAKE2B 33c5f34d92060bef118fd9685cfe26384a1494e1bfe9eff0ed397fcbb00908a19a070d1c3502dd7bcf538f85ffcc56b986170453c3b59a877584bcf9bfd9e629 SHA512 86461b6b5398c42fd4776c60854b0d251a7762b21ef0a65978182b2f4411400352a55773eaa2fecb7aa1fc309554c8d50ff9bf01254c22352a3d384cde92d4c5
+DIST haskeline-0.8.2.tar.gz 72759 BLAKE2B 389908d07775bd150801c7423f3cdc860e1330c0f13cd754374870b4aea19d5bd01f761aec7aa0f2effe87a80c25dc8e7f4390c095627c4d25ed2976de855a63 SHA512 5e8dccceb2230340a7f07f2e0926a938b52106d8a1638be6c1a031802ecbdf12cb42246096518ac12614d5d48479666a44ad33e5e32ab0ac2043b630a7b53746
diff --git a/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild b/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild
deleted file mode 100644
index b1bfe1dd82bb..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild b/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild
deleted file mode 100644
index fe54e4f18e23..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild b/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild
deleted file mode 100644
index 140aee2c50f8..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3"
-
-src_prepare() {
-	cabal_chdeps \
-		'utf8-string==0.3.* && >=0.3.6' 'utf8-string >=0.3.6'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild b/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
deleted file mode 100644
index 1685b35f7801..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="https://github.com/judah/haskeline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.0.1
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="legacy-encoding libiconv +terminfo"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] )
-	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:9999"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory>=1.1 && < 1.3' 'directory>=1.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag legacy-encoding legacy-encoding) \
-		$(cabal_flag libiconv libiconv) \
-		$(cabal_flag terminfo terminfo)
-}
diff --git a/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild b/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
deleted file mode 100644
index ea4773a729a8..000000000000
--- a/dev-haskell/haskeline/haskeline-0.7.5.0.ebuild
+++ /dev/null
@@ -1,41 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="https://github.com/judah/haskeline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+terminfo"
-
-RDEPEND=">=dev-haskell/stm-2.4:=[profile?] <dev-haskell/stm-2.6:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.9 && < 4.13' 'base >=4.9'
-}
-
-src_configure() {
-	haskell-cabal_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"
diff --git a/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild b/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..e3c2e948c9c5
--- /dev/null
+++ b/dev-haskell/haskeline/haskeline-0.8.2-r1.ebuild
@@ -0,0 +1,38 @@
+# 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: -examples
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+DESCRIPTION="A command-line interface for user input, written in Haskell"
+HOMEPAGE="https://github.com/judah/haskeline"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+# Keep in sync with relevant ghc versions (CABAL_CORE_LIB_GHC_PV)
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="+terminfo"
+
+RESTRICT=test # test requires example executable which does not work correctly
+
+RDEPEND="
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-examples \
+		$(cabal_flag terminfo terminfo)
+}
+
+CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7 9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.4 9.4.5"
diff --git a/dev-haskell/haskeline/metadata.xml b/dev-haskell/haskeline/metadata.xml
index f7c660f2d70e..0151f4371988 100644
--- a/dev-haskell/haskeline/metadata.xml
+++ b/dev-haskell/haskeline/metadata.xml
@@ -1,24 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		Haskeline provides a user interface for line input in command-line
-		programs.  This library is similar in purpose to readline, but since
-		it is written in Haskell it is (hopefully) more easily used in other
-		Haskell programs.
-		
-		Haskeline runs both on POSIX-compatible systems and on Windows.
-	</longdescription>
 	<use>
 		<flag name="terminfo">Use the terminfo package for POSIX consoles.</flag>
-		<flag name="libiconv">Explicitly link against the libiconv library.</flag>
-		<flag name="legacy-encoding">Use legacy iconv encoding for POSIX. This is only intended for testing.</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">haskeline</remote-id>
 		<remote-id type="github">judah/haskeline</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/haskell-lexer/Manifest b/dev-haskell/haskell-lexer/Manifest
index 57667f19a62e..3485b5f55373 100644
--- a/dev-haskell/haskell-lexer/Manifest
+++ b/dev-haskell/haskell-lexer/Manifest
@@ -1,3 +1 @@
-DIST haskell-lexer-1.0.1.tar.gz 12380 BLAKE2B 807228188c28ea08cee15bff092bd7f9fd3ec21deaf5701f84ac0c17f33936e37be5294b41459d69bc70b6364240f615c7c13e5da4950da3016e48765f3f0ff3 SHA512 591aa5a1ffcd984127cd730a0ebc01129fa0a6486ca16b03c9462e2123f1ce4d10063b7bb3debc6d2a6b8ba51692b0e34d694adeca9dad47707ecbabacfb4740
-DIST haskell-lexer-1.0.2.tar.gz 12202 BLAKE2B d4171347eac2f9ea58368dfa76e6e1a82fbaba8c9cd0ada13497579e3e9dff25675d461cbde3fac2c90a0f9d9733a3c6bd3a49797f9cc5f6fbb1d14d2b593643 SHA512 7f5942bf159936488894649e4b5cd7b33b6cf018685299b9cfc2f807ba1b08061deae287e613c88345842183bfb6f177b8538d2dc01badb0c94fc259f110255f
-DIST haskell-lexer-1.0.tar.gz 12455 BLAKE2B adb8f62934e3ac70361ed7a1b3f5def75c40f4582e08b505d161d163d88b0e982e53a76a47638d68111e6383aede1b05ba5a83fdf4271ea118d0d7119dbaf586 SHA512 30cfd69a6c102d8baa3e14a0497e00feb6cb6fb93777ec45b8ad3ff39bd1942ecbb8653f72181a5a00b60dbd22c5fc33061869ad86063328a44ef1893dc1f827
+DIST haskell-lexer-1.1.tar.gz 14368 BLAKE2B e06a1399c45511c8f67516fc7abba2eecbdb22a39f6278ec17418ae43a4f2c74bd1e47053f55b06bf45697f9760b2efc3787429674b08554fd2aa51a3203e673 SHA512 7a93d135d8994941ac73feba6b22a82e05b3c124d2aaefeb33851c28d2268714ebf5fac6abea9544097b7afc2cb3945caed600cc08f9867bc819b96fe467b28f
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild
deleted file mode 100644
index d023edadf8cf..000000000000
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A fully compliant Haskell 98 lexer"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-lexer"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0.1.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0.1.ebuild
deleted file mode 100644
index b0adc04b043b..000000000000
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A fully compliant Haskell 98 lexer"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-lexer"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
deleted file mode 100644
index d4c2c7acfd7f..000000000000
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A fully compliant Haskell 98 lexer"
-HOMEPAGE="https://github.com/yav/haskell-lexer"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild
new file mode 100644
index 000000000000..05972606fe05
--- /dev/null
+++ b/dev-haskell/haskell-lexer/haskell-lexer-1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A fully compliant Haskell 98 lexer"
+HOMEPAGE="https://github.com/yav/haskell-lexer"
+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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/haskell-lexer/metadata.xml b/dev-haskell/haskell-lexer/metadata.xml
index 3c9993d59f15..2c08d6790c93 100644
--- a/dev-haskell/haskell-lexer/metadata.xml
+++ b/dev-haskell/haskell-lexer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A fully compliant Haskell 98 lexer.
-	</longdescription>
+	<upstream>
+		<remote-id type="github">yav/haskell-lexer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/haskell-platform/haskell-platform-2012.4.0.0.ebuild b/dev-haskell/haskell-platform/haskell-platform-2012.4.0.0.ebuild
deleted file mode 100644
index b75e2a4eecac..000000000000
--- a/dev-haskell/haskell-platform/haskell-platform-2012.4.0.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The Haskell Platform"
-HOMEPAGE="https://www.haskell.org/platform/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile X"
-
-RDEPEND=">=dev-haskell/async-2.0.1.3:=[profile?]
-		>=dev-haskell/cgi-3001.1.7.4:=[profile?]
-		>=dev-haskell/fgl-5.4.2.4:=[profile?]
-		>=dev-haskell/haskell-src-1.0.1.5:=[profile?]
-		>=dev-haskell/html-1.0.1.2:=[profile?]
-		>=dev-haskell/http-4000.2.5:=[profile?]
-		>=dev-haskell/hunit-1.2.5.1:=[profile?]
-		>=dev-haskell/mtl-2.1.2:=[profile?]
-		>=dev-haskell/network-2.3.1.0:=[profile?]
-		>=dev-haskell/parallel-3.2.0.3:=[profile?]
-		>=dev-haskell/parsec-3.1.3:=[profile?]
-		>=dev-haskell/primitive-0.5.0.1:=[profile?]
-		>=dev-haskell/quickcheck-2.5.1.1:=[profile?]
-		>=dev-haskell/random-1.0.1.1:=[profile?]
-		>=dev-haskell/regex-base-0.93.2:=[profile?]
-		>=dev-haskell/regex-compat-0.95.1:=[profile?]
-		>=dev-haskell/regex-posix-0.95.2:=[profile?]
-		>=dev-haskell/split-0.2.1.1:=[profile?]
-		>=dev-haskell/stm-2.4:=[profile?]
-		>=dev-haskell/syb-0.3.7:=[profile?]
-		>=dev-haskell/text-0.11.2.3:=[profile?]
-		>=dev-haskell/transformers-0.3.0.0:=[profile?]
-		>=dev-haskell/vector-0.10.0.1:=[profile?]
-		>=dev-haskell/xhtml-3000.2.1:=[profile?]
-		>=dev-haskell/zlib-0.5.4.0:=[profile?]
-		X? (
-			>=dev-haskell/glut-2.1.2.1:=[profile?]
-			>=dev-haskell/opengl-2.2.3.1:=[profile?]
-		)
-		>=dev-lang/ghc-7.4.2:=
-
-		>=dev-haskell/alex-3.0.2
-		>=dev-haskell/cabal-1.14.0
-		>=dev-haskell/happy-1.18.10
-		>=dev-haskell/cabal-install-0.14.0
-		>=dev-haskell/hscolour-1.19
-		>=dev-haskell/haddock-2.10.0"
-
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	if ! use X; then
-		elog "The haskell platform includes the 3D graphics libraries opengl and glut."
-		elog "To install opengl and glut requires the X use flag."
-	fi
-}
diff --git a/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild b/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild
deleted file mode 100644
index 7efa1c561c1c..000000000000
--- a/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The Haskell Platform"
-HOMEPAGE="https://www.haskell.org/platform/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+doc profile +X"
-
-RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?]
-	>=dev-haskell/attoparsec-0.10.4.0:=[profile?]
-	>=dev-haskell/case-insensitive-1.0.0.1:=[profile?]
-	>=dev-haskell/cgi-3001.1.7.5:=[profile?]
-	>=dev-haskell/fgl-5.4.2.4:=[profile?]
-	>=dev-haskell/hashable-1.1.2.5:=[profile?]
-	>=dev-haskell/haskell-src-1.0.1.5:=[profile?]
-	>=dev-haskell/html-1.0.1.2:=[profile?]
-	>=dev-haskell/http-4000.2.8:=[profile?]
-	>=dev-haskell/hunit-1.2.5.2:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/network-2.4.1.2:=[profile?]
-	>=dev-haskell/parallel-3.2.0.3:=[profile?]
-	>=dev-haskell/parsec-3.1.3:=[profile?]
-	>=dev-haskell/primitive-0.5.0.1:=[profile?]
-	>=dev-haskell/quickcheck-2.6:2=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?]
-	>=dev-haskell/regex-base-0.93.2:=[profile?]
-	>=dev-haskell/regex-compat-0.95.1:=[profile?]
-	>=dev-haskell/regex-posix-0.95.2:=[profile?]
-	>=dev-haskell/split-0.2.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/syb-0.4.0:=[profile?]
-	>=dev-haskell/text-0.11.3.1:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?]
-	>=dev-haskell/vector-0.10.0.1:=[profile?]
-	>=dev-haskell/xhtml-3000.2.1:=[profile?]
-	>=dev-haskell/zlib-0.5.4.1:=[profile?]
-	X? (
-		>=dev-haskell/gluraw-1.3.0.0:=[profile?]
-		>=dev-haskell/glut-2.4.0.0:=[profile?]
-		>=dev-haskell/opengl-2.8.0.0:=[profile?]
-		>=dev-haskell/openglraw-1.3.0.0:=[profile?]
-	)
-	>=dev-lang/ghc-7.6.2:=
-	>=dev-haskell/alex-3.0.5
-	>=dev-haskell/cabal-1.16.0.3
-	>=dev-haskell/cabal-install-1.16.0.3
-	>=dev-haskell/happy-1.18.10
-	>=dev-haskell/hscolour-1.19
-	doc? ( >=dev-haskell/haddock-2.13.2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	if ! use X; then
-		elog "The haskell platform includes the 3D graphics libraries opengl and glut."
-		elog "To install opengl and glut requires the X use flag."
-	fi
-}
diff --git a/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild b/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild
deleted file mode 100644
index 6f3f9525efa2..000000000000
--- a/dev-haskell/haskell-platform/haskell-platform-2014.2.0.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The Haskell Platform"
-HOMEPAGE="https://www.haskell.org/platform/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+doc profile +X"
-
-RDEPEND="
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/xhtml-3000.2.1
-
-	>=dev-haskell/async-2.0.1.5
-	>=dev-haskell/attoparsec-0.10.4.0:=[profile?]
-	>=dev-haskell/case-insensitive-1.1.0.3:=[profile?]
-	>=dev-haskell/fgl-5.5.0.1:=[profile?]
-	>=dev-haskell/hashable-1.2.2.0:=[profile?]
-	>=dev-haskell/haskell-src-1.0.1.6:=[profile?]
-	>=dev-haskell/html-1.0.1.2:=[profile?]
-	>=dev-haskell/http-4000.2.10:=[profile?]
-	>=dev-haskell/hunit-1.2.5.2:=[profile?]
-	>=dev-haskell/mtl-2.1.3.1:=[profile?]
-	>=dev-haskell/network-2.4.2.3:=[profile?]
-	>=dev-haskell/parallel-3.2.0.4:=[profile?]
-	>=dev-haskell/parsec-3.1.5:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	>=dev-haskell/quickcheck-2.6:2=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?]
-	>=dev-haskell/regex-base-0.93.2:=[profile?]
-	>=dev-haskell/regex-compat-0.95.1:=[profile?]
-	>=dev-haskell/regex-posix-0.95.2:=[profile?]
-	>=dev-haskell/split-0.2.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/syb-0.4.1:=[profile?]
-	>=dev-haskell/text-1.1.0.0:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4.0:=[profile?]
-	>=dev-haskell/vector-0.10.9.1:=[profile?]
-	>=dev-haskell/xhtml-3000.2.1:=[profile?]
-	>=dev-haskell/zlib-0.5.4.1:=[profile?]
-	X? (
-		>=dev-haskell/gluraw-1.4.0.1:=[profile?]
-		>=dev-haskell/glut-2.5.1.1:=[profile?]
-		>=dev-haskell/opengl-2.9.2.0:=[profile?]
-		>=dev-haskell/openglraw-1.5.0.0:=[profile?]
-	)
-
-	>=dev-lang/ghc-7.8.3:=
-
-	>=dev-haskell/alex-3.1.3
-	>=dev-haskell/cabal-install-1.18.0.5
-	>=dev-haskell/happy-1.19.4
-	>=dev-haskell/hscolour-1.20.3
-	doc? ( >=dev-haskell/haddock-2.14.2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	if ! use X; then
-		elog "The haskell platform includes the 3D graphics libraries opengl and glut."
-		elog "To install opengl and glut requires the X use flag."
-	fi
-}
diff --git a/dev-haskell/haskell-platform/metadata.xml b/dev-haskell/haskell-platform/metadata.xml
deleted file mode 100644
index 991c27c26f8e..000000000000
--- a/dev-haskell/haskell-platform/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Haskell Platform (HP) is the blessed set of libraries and tools on
-		which to build further Haskell libraries and applications. It is
-		intended to provide a comprehensive, stable, and quality tested base for
-		Haskell projects to work from.
-		
-		This version specifies the following additional developer tools be
-		installed, for a system to be in full compliance:
-		
-		* cabal-install
-		* alex
-		* happy
-		* haddock
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-src-exts-util/Manifest b/dev-haskell/haskell-src-exts-util/Manifest
deleted file mode 100644
index 0883a9994e08..000000000000
--- a/dev-haskell/haskell-src-exts-util/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST haskell-src-exts-util-0.2.5.tar.gz 6428 BLAKE2B 42211d72756d97e7761148b8cc0d7b2a548db38b007d506fc1cad3ef2e7003e352c225201e047683c82b4ec8561825170b6976f36a4d824d3595173023f2b76d SHA512 0497d8e2206402cc295289b1893f326c8f5fa7fc00177279b7af389b3351a94a123d7eb754d8a245981bae51d1a978684791d9b111befca2888bc7fe22f07147
diff --git a/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild b/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild
deleted file mode 100644
index ce057531edb5..000000000000
--- a/dev-haskell/haskell-src-exts-util/haskell-src-exts-util-0.2.5.ebuild
+++ /dev/null
@@ -1,28 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Helper functions for working with haskell-src-exts trees"
-HOMEPAGE="https://github.com/pepeiborra/haskell-src-exts-util"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	>=dev-haskell/haskell-src-exts-1.20.0:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/uniplate:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/haskell-src-exts-util/metadata.xml b/dev-haskell/haskell-src-exts-util/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/haskell-src-exts-util/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 95fa9f89aa54..4c2cdbcbf8e4 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,6 +1 @@
-DIST haskell-src-exts-1.13.5.tar.gz 291329 BLAKE2B d37ad708c0e55c5ef900a62910b05e2f9677d1d0eabb7a1844178fbf1c9e101a92a09a9a13c2902387e173c6adfd1ddf88f38d5ce820d0d5bcb9ff0a2622e70e SHA512 f7e7978a8417aaad08a88eccf22f0bf99e5586a5f28796c8525ef00fdcdf8bd17936ec93c552b61d723323a691775a41d7737f52ad16620f93bab57ac8064598
-DIST haskell-src-exts-1.14.0.tar.gz 291256 BLAKE2B e0ec5d12d8f5a0fb2fb0745fbf2db1c61133f8c2064419c97fb1a48a8761f6ef6f088135aaa6e856e1a8d4e720dbe3196ed4b051d3649c08e754e9b15f0843b0 SHA512 7d1dc90742ffb1cbde209fcadad05a8c6bc3a731267f92a201533c1d841a6aef144af501ea2e4076a99b0f50734d7823574f581411c4440657ac7f6eeb5880c2
-DIST haskell-src-exts-1.15.0.1.tar.gz 1605910 BLAKE2B 47672c636ff8da5ef38ddf83a895a454667e1c34723cb339d3f665e3a5acf678b4b9c3b1e8c2887a99a3922a14e3d310439113ead871d5869ed51b3ae9b44eec SHA512 d6fe854b2e7a13bb90815848517843ee67faad7e03d5abf6afc9e97252bcb9d915b51d94b757354a9e83b255f9b795e5c9fa2e3e962acd84772eaa9844d9b1d6
-DIST haskell-src-exts-1.16.0.1.tar.gz 1410081 BLAKE2B 6fea8732c6ea264040eb4fec73147463a530f42fcb201190b393aac2461085770853dd0f7615cbe2f2aaf34f75921180565bc72c98dacdc3190c39a08866943f SHA512 b74a824899cbf85a2bf58c7c14df33fac7e70bbb775b51d8a861172da88d1dc6db3644a6534c9076a9c5499023a347cdce7e24b3495045d11a905f31a51492d0
-DIST haskell-src-exts-1.17.1.tar.gz 2489624 BLAKE2B d98a54e9788fbc613d5843fb3886bdd44b20843978a71cdff5460390bc090504ce72191884f49ef35266c5167913ef1dbf53a19a25d235d12192dea1f3b01203 SHA512 e08bc31720640e595803ff33d454b717cd015cf8b70f0196f387e7ebaca4b3551aa41ce6c900370496a68e48e1a9c078235674f7050f6de42ffdfc9fce6544e2
-DIST haskell-src-exts-1.21.1.tar.gz 1248986 BLAKE2B f76d5e5ca978aec46a0f2e5f2442cb3960ffb3008ad11955e5f04cfce38613b6073af59b6e8eb32975664d3f22ee31334166daafc5d935f18e7a008b3d28332b SHA512 1349d419a13343fdf5579bf1f4027a3906de67ac257d0663fb6d10cf96e8312e08beec81d91044421f1202675a8c9381d280104d95c1ffea2e746f378d683e61
+DIST haskell-src-exts-1.23.1.tar.gz 1264319 BLAKE2B 4ad6fe7e2cd70523b5169569f57493e595e2700866f5c44e8044c84bcafc17f98efc57302beb0e3a7ed385c23e204dd79bb63a30bcf0ae414e66696a832038c0 SHA512 c9e6e4d93c2b4ee84d57707aed526291b5c4e297f06a3921257feb0c1df3bb095addd4b1d9bb187650490364647385ab6322e4fc54f9a7648da439a34329d734
diff --git a/dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs b/dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs
deleted file mode 100644
index 63a6c22bf33c..000000000000
--- a/dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-import Distribution.Simple
-import System.Process (rawSystem)
-import System.Exit (ExitCode(..))
-import System.FilePath ((</>))
-main = defaultMainWithHooks $ simpleUserHooks { runTests = \args _ _ _ -> do
-    ExitSuccess <- rawSystem "runhaskell" ("-package-conf=dist/package.conf.inplace" : "Test/Runner.hs" : args)
-    return ()
-                                              }
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
deleted file mode 100644
index 454b31106c74..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="http://code.haskell.org/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6
-		dev-haskell/happy"
-
-src_prepare() {
-	# test suite is broken, expects the package to be already installed.
-	# this new Setup.hs will use the package inplice for tests
-	cp "${FILESDIR}/haskell-src-exts-1.10.2-Setup.hs" "${S}/Setup.hs" \
-		|| die "Could not cp Setup.hs for tests"
-
-	# remove broken tests. they will fail if you expect them to pass, and pass
-	# if you expect them to fail...
-	rm "${S}/Test/examples/Unicode"{.hs,Syntax.hs} \
-		|| die "Could not rm broken tests"
-}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.14.0.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.14.0.ebuild
deleted file mode 100644
index 097303fc6594..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/happy
-		test? ( >=dev-haskell/smallcheck-1.0
-			dev-haskell/tasty
-			dev-haskell/tasty-hunit
-			dev-haskell/tasty-smallcheck
-		)"
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.15.0.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.15.0.1.ebuild
deleted file mode 100644
index 4dbf473990b7..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.15.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( dev-haskell/filemanip
-		dev-haskell/mtl
-		>=dev-haskell/smallcheck-1.0
-		dev-haskell/syb
-		>=dev-haskell/tasty-0.3
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-smallcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
deleted file mode 100644
index bb77027a5f9f..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( dev-haskell/mtl
-		>=dev-haskell/smallcheck-1.0
-		dev-haskell/syb
-		>=dev-haskell/tasty-0.3
-		>=dev-haskell/tasty-golden-2.2.2
-		dev-haskell/tasty-smallcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
deleted file mode 100644
index 021fe155b954..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.17.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # very slow
-
-RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( dev-haskell/mtl
-		dev-haskell/pretty-show
-		>=dev-haskell/smallcheck-1.0
-		dev-haskell/syb
-		>=dev-haskell/tasty-0.3
-		>=dev-haskell/tasty-golden-2.2.2
-		dev-haskell/tasty-smallcheck )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'tasty-golden >= 2.2.2 && < 2.3' 'tasty-golden >= 2.2.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
deleted file mode 100644
index 9f059879744c..000000000000
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.21.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
-HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.21/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/semigroups-0.18.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-	test? ( dev-haskell/mtl
-		>=dev-haskell/pretty-show-1.6.16
-		>=dev-haskell/smallcheck-1.0
-		>=dev-haskell/tasty-0.3
-		>=dev-haskell/tasty-golden-2.2.2
-		dev-haskell/tasty-smallcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
new file mode 100644
index 000000000000..11f448db3079
--- /dev/null
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.23.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
+HOMEPAGE="https://github.com/haskell-suite/haskell-src-exts"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	dev-haskell/happy
+	test? ( >=dev-haskell/pretty-show-1.6.16
+		>=dev-haskell/smallcheck-1.0
+		>=dev-haskell/tasty-0.3
+		>=dev-haskell/tasty-golden-2.2.2
+		dev-haskell/tasty-smallcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4
+}
diff --git a/dev-haskell/haskell-src-exts/metadata.xml b/dev-haskell/haskell-src-exts/metadata.xml
index 05f4bb9d8ad2..135db545c9df 100644
--- a/dev-haskell/haskell-src-exts/metadata.xml
+++ b/dev-haskell/haskell-src-exts/metadata.xml
@@ -1,22 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-    <name>Gentoo Haskell</name>
-  </maintainer>
-  <longdescription lang="en">
-Haskell-Source with eXtensions (HSX, haskell-src-exts) is an extension of the
-standard haskell-src package, and handles most common syntactic extensions to
-Haskell, including:
-
-  * Multi-parameter type classes with functional dependencies
-  * Empty data declarations
-  * GADTs
-  * Implicit parameters (ghc and hugs style)
-  * Template Haskell (broken for 6.4, needs redoing)
-</longdescription>
-  <upstream>
-    <remote-id type="github">haskell-suite/haskell-src-exts</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">haskell-suite/haskell-src-exts</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/haskell-src-meta/Manifest b/dev-haskell/haskell-src-meta/Manifest
deleted file mode 100644
index 2abdb3376e56..000000000000
--- a/dev-haskell/haskell-src-meta/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST haskell-src-meta-0.6.0.10.tar.gz 19432 BLAKE2B 8984179d1964cf06f918175cb08efb444fd8cf7cdf52ac2617b399657dbcf5ba73841fc80fce0dddba1a2d4a21548d3bbbde74ffb49dcc259b4be0ec6c22c5d3 SHA512 efd6e06dc856c05b815a8a36f3411f3d5c171ad5cd84be75baaef1d7a784f3f32d81e9de175fb2ab2455ab6f3a80c2f743e4a277964816d6e8198bc4bf67ab4d
-DIST haskell-src-meta-0.6.0.14.tar.gz 20079 BLAKE2B 49d25b0061d46a0f55cc946944e29022998f1b3929df8632a3b74acbc6392054a695585aac5d2e166945ee4e513c1b049d5321c8047527cdfac42ebd23989a17 SHA512 d043ece8f28a47572f59cfc36a9d7b2c505a3d5c2ef24f0e90496c5d57b88791417234777e146a0e75c0fba10775ba41e627a00519c2e9718bf173d95e2a201f
-DIST haskell-src-meta-0.6.0.8.tar.gz 19449 BLAKE2B 0f8e21e01e26e2eddd8ebd0835b1f69e3dad3111cf7ff264c56a363f8b6f4bd7684ad3fc413c3d1584727d6ab914aa699792a98a092d91bfadae41018f73eca9 SHA512 590e66c837bd64db9bb8d09a698f52fb8b7c3ab07523c0e7fadcbb17bf33ee0fa523ec34012db7622681b4055164288df60083992ddbfb7553087373efbdb751
-DIST haskell-src-meta-0.8.5.tar.gz 24027 BLAKE2B f94f88fa7a5edac23cab13de346056a3b9f6fb30e47de8f98142378211d7d12ad1622317bed04dec3cc322730023b0cce5e571016b6325c05e2503fe9fafa73a SHA512 873a797f53fc30dbb51b719228bc649f47d1c3432380a82b5dca11574b432676ed29d297c7547f1d752bb1c977c8858e55fb5135ffb58146b938d02414fe6723
diff --git a/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch b/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch
deleted file mode 100644
index e023b53d3401..000000000000
--- a/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-commit 24e6f45408083745080ff2f3710f58209041113c
-Author: Luite Stegeman <stegeman@gmail.com>
-Date:   Sun Dec 28 21:33:22 2014 +0100
-
-    updates for GHC 7.10 and Template Haskell 2.10
-
-diff --git a/haskell-src-meta.cabal b/haskell-src-meta.cabal
-index de6a022..42d9619 100644
---- a/haskell-src-meta.cabal
-+++ b/haskell-src-meta.cabal
-@@ -18,14 +18,14 @@ description:        The translation from haskell-src-exts abstract syntax
- extra-source-files: ChangeLog README examples/*.hs
- 
- library
--  build-depends:   base >= 4.2 && < 4.8,
-+  build-depends:   base >= 4.2 && < 4.9,
-                    haskell-src-exts == 1.16.*,
-                    pretty >= 1.0 && < 1.2,
-                    syb >= 0.1 && < 0.5,
-                    th-orphans >= 0.5 && < 0.9
- 
-   if impl(ghc >= 7.4)
--    Build-depends: template-haskell >= 2.7 && < 2.10
-+    Build-depends: template-haskell >= 2.7 && < 2.11
-   else
-     Build-depends: template-haskell >= 2.4 && < 2.7,
-                    uniplate >= 1.3 && < 1.7
-diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs
-index 189d32e..36a08f1 100644
---- a/src/Language/Haskell/Meta/Syntax/Translate.hs
-+++ b/src/Language/Haskell/Meta/Syntax/Translate.hs
-@@ -384,9 +384,15 @@ a .->. b = AppT (AppT ArrowT a) b
- toCxt :: Hs.Context -> Cxt
- toCxt = fmap toPred
-  where
-+#if MIN_VERSION_template_haskell(2,10,0)
-+  toPred (Hs.ClassA n ts) = foldl' AppT (ConT (toName n)) (fmap toType ts)
-+  toPred (Hs.InfixA t1 n t2) = foldl' AppT (ConT (toName n)) (fmap toType [t1,t2])
-+  toPred (Hs.EqualP t1 t2) = foldl' AppT EqualityT (fmap toType [t1,t2])
-+#else
-   toPred (Hs.ClassA n ts) = ClassP (toName n) (fmap toType ts)
-   toPred (Hs.InfixA t1 n t2) = ClassP (toName n) (fmap toType [t1, t2])
-   toPred (Hs.EqualP t1 t2) = EqualP (toType t1) (toType t2)
-+#endif
-   toPred a@Hs.IParam{} = noTH "toCxt" a
- 
- foldAppT :: Type -> [Type] -> Type
-diff --git a/src/Language/Haskell/Meta/Utils.hs b/src/Language/Haskell/Meta/Utils.hs
-index 36f7e96..d194f3e 100644
---- a/src/Language/Haskell/Meta/Utils.hs
-+++ b/src/Language/Haskell/Meta/Utils.hs
-@@ -166,6 +166,9 @@ renameT env new (ForallT ns cxt t) =
-     unVarT (VarT n) = PlainTV n
-     renamePreds = renameThings renamePred
- 
-+#if MIN_VERSION_template_haskell(2,10,0)
-+    renamePred = renameT
-+#else
-     renamePred env new (ClassP n ts) = let
-         (ts', env', new') = renameTs env new [] ts
-       in (ClassP (normaliseName n) ts', env', new')
-@@ -174,7 +177,7 @@ renameT env new (ForallT ns cxt t) =
-         (t1', env1, new1) = renameT env new t1
-         (t2', env2, new2) = renameT env1 new1 t2
-       in (EqualP t1' t2', env2, new2)
--
-+#endif
- 
- -- | Remove qualification, etc.
- normaliseName :: Name -> Name
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild
deleted file mode 100644
index 6306ed577a2a..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parse source to template-haskell abstract syntax"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
deleted file mode 100644
index 0bf339253ea1..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parse source to template-haskell abstract syntax"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?]
-	>=dev-lang/ghc-7.8.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
deleted file mode 100644
index c313bad3f39f..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Parse source to template-haskell abstract syntax"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-haskell/th-orphans-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.6.0.8-ghc-7.10.patch")
-
-src_prepare() {
-	base_src_prepare
-	cabal_chdeps \
-		'th-orphans >= 0.5 && < 0.9' 'th-orphans >= 0.5'
-}
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild
deleted file mode 100644
index a7392d7d0d8d..000000000000
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,36 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: fails to build
-inherit haskell-cabal
-
-DESCRIPTION="Parse source to template-haskell abstract syntax"
-HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests/Splices.hs:69:77: error: Not in scope: data constructor ‘Extension.QuantifiedConstraints’
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.18:=[profile?] <dev-haskell/haskell-src-exts-1.24:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
-	>=dev-haskell/th-orphans-0.12:=[profile?] <dev-haskell/th-orphans-0.14:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'haskell-src-exts >= 1.18 && < 1.23' 'haskell-src-exts >= 1.18 && < 1.24'
-}
diff --git a/dev-haskell/haskell-src-meta/metadata.xml b/dev-haskell/haskell-src-meta/metadata.xml
deleted file mode 100644
index 5707ebf94594..000000000000
--- a/dev-haskell/haskell-src-meta/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The translation from haskell-src-exts abstract syntax
-		to template-haskell abstract syntax isn't 100% complete yet.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/haskell-src/Manifest b/dev-haskell/haskell-src/Manifest
deleted file mode 100644
index b7c60928f94e..000000000000
--- a/dev-haskell/haskell-src/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST haskell-src-1.0.1.6.tar.gz 52967 BLAKE2B 2c98fa8a52ce54cfd281f3e86a2a8f310284d0977171b4bc5a56873d70b0fb28e0db1eb336a015df56e3d7f85db6ab656276e9c54d53c8c36e0b9687635daf89 SHA512 61035aee535335bb6e2dba96217d48054c89ef3d33af01abfbec077c40d54150bd78b200d5dff4fa6c490c500f32951eb8fb8352243625fc6ad735fad60afda9
-DIST haskell-src-1.0.2.0.tar.gz 53636 BLAKE2B 1348bfc21d66d4226fa1045d2fc64de48ff91ed6ea978964f68389ec53bfbb63f407e130b0c168029d4d1daae2d1ffb59a32912721ad6fafe6054fb74f22cae6 SHA512 202b05ffcc505fb1332f5b3c8984b08a435911f574c4e1b2f2543a8758aa9e9a33f559c5c6cf3f8a3b7cda3f540e2da5b92e6456ee40dfe690cdf69a3e018b06
-DIST haskell-src-1.0.3.0.tar.gz 29863 BLAKE2B a75a52f6df1da50a8509db495a9dde56c1b0edf4b0934deb24822940dc7a0a1e252994a55342175e8e08894aa86c540b5cb8437c190d5e2aeeb19f62eb43b602 SHA512 6426f1602b2e9165c44efc4d10cdc8bdbc0b4291b7255d8ed223f1e5f474f6c41830cdd39af154290d2e972f9699269a67279baaf63f0e4c4321c96b37f0f5a5
diff --git a/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch b/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch
deleted file mode 100644
index 84342b0d6847..000000000000
--- a/dev-haskell/haskell-src/files/haskell-src-1.0.3.0-ghc-8.8.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit bd0a8199252f4cd7f5d93ee862a919646f85a06f
-Author: Ollie Charles <ollie@ocharles.org.uk>
-Date:   Wed Sep 18 12:36:15 2019 +0100
-
-    Build with GHC 8.8
-
-diff --git a/Language/Haskell/ParseMonad.hs b/Language/Haskell/ParseMonad.hs
-index 1ed9b7a..f9bea5e 100644
---- a/Language/Haskell/ParseMonad.hs
-+++ b/Language/Haskell/ParseMonad.hs
-@@ -12,6 +12,8 @@
- --
- -----------------------------------------------------------------------------
- 
-+{-# LANGUAGE CPP #-}
-+
- module Language.Haskell.ParseMonad(
-                 -- * Parsing
-                 P, ParseResult(..), atSrcLoc, LexContext(..),
-@@ -134,7 +136,9 @@ instance Monad P where
-                 case m i x y l s mode of
-                     Failed loc msg -> Failed loc msg
-                     Ok s' a        -> runP (k a) i x y l s' mode
-+#if !(MIN_VERSION_base(4,13,0))
-         fail = Fail.fail
-+#endif
- 
- -- | @since 1.0.3.0
- instance Fail.MonadFail P where
-@@ -191,7 +195,9 @@ instance Monad (Lex r) where
-         return = pure
-         Lex v >>= f = Lex $ \k -> v (\a -> runL (f a) k)
-         (>>) = (*>)
-+#if !(MIN_VERSION_base(4,13,0))
-         fail = Fail.fail
-+#endif
- 
- -- | @since 1.0.3.0
- instance Fail.MonadFail (Lex r) where
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild
deleted file mode 100644
index 5e08ebcf301d..000000000000
--- a/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for manipulating Haskell source code"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-src"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild
deleted file mode 100644
index 5b1ae384f352..000000000000
--- a/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for manipulating Haskell source code"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-src"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	dev-haskell/happy
-"
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild
deleted file mode 100644
index 04e987ba642d..000000000000
--- a/dev-haskell/haskell-src/haskell-src-1.0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for manipulating Haskell source code"
-HOMEPAGE="https://hackage.haskell.org/package/haskell-src"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	dev-haskell/happy
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.3.0-ghc-8.8.patch )
diff --git a/dev-haskell/haskell-src/metadata.xml b/dev-haskell/haskell-src/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/haskell-src/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hastache/Manifest b/dev-haskell/hastache/Manifest
deleted file mode 100644
index 93f7931984cf..000000000000
--- a/dev-haskell/hastache/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hastache-0.5.1.tar.gz 12674 BLAKE2B d6c3d6882107b1e63c0529db87be49524aa9e898fbccba2e6460bcadd27261e9e09218e99d5fa00c766d789cce4d4d59845730b862295654ef3baeb5d8817144 SHA512 f7fe130ff047332d0db58b831f412ec398c8854f5401ff5de16493f503171e8735708c165bc090220f8db446a44389ec0715e6b4900994759093ff3e69e7a86a
-DIST hastache-0.6.1.tar.gz 16452 BLAKE2B 69e0a6fa7798767d2192fd02ae2f0f2f51962eb4bc6303186ced14a7f9c5c044075be76df5314610c3f816c76fb0d790060e547491bb2e4d972bdec5b93576c3 SHA512 3f7f7d0b97e88aca474b818c0e7b48187bfade855b6117dce50ed3e64b557586b1827272d46438a7e36990fb932d6503c982fa4fc6b2dbb33b463b14d39436b4
diff --git a/dev-haskell/hastache/hastache-0.5.1.ebuild b/dev-haskell/hastache/hastache-0.5.1.ebuild
deleted file mode 100644
index 4a3c001ea57c..000000000000
--- a/dev-haskell/hastache/hastache-0.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell implementation of Mustache templates"
-HOMEPAGE="https://github.com/lymar/hastache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-		dev-haskell/ieee754:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/syb:=[profile?]
-		dev-haskell/text:=[profile?]
-		dev-haskell/transformers:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-		)"
diff --git a/dev-haskell/hastache/hastache-0.6.1.ebuild b/dev-haskell/hastache/hastache-0.6.1.ebuild
deleted file mode 100644
index cafbefd8aced..000000000000
--- a/dev-haskell/hastache/hastache-0.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell implementation of Mustache templates"
-HOMEPAGE="https://github.com/lymar/hastache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails to build with ghc-7.10
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/ieee754:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >=4 && <4.9' 'base >=4'
-}
diff --git a/dev-haskell/hastache/metadata.xml b/dev-haskell/hastache/metadata.xml
deleted file mode 100644
index 3b604aa64bde..000000000000
--- a/dev-haskell/hastache/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell implementation of Mustache templates (&lt;https://mustache.github.com/&gt;).
-		
-		See homepage for examples of usage: &lt;https://github.com/lymar/hastache&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">lymar/hastache</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/haxml/Manifest b/dev-haskell/haxml/Manifest
deleted file mode 100644
index d4544dc21e5b..000000000000
--- a/dev-haskell/haxml/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST HaXml-1.24.1.tar.gz 142739 BLAKE2B d5f972f2dd61b512c5984264bce05e38430627055725cf6be7ff0cfe5db73c6f1be829d5c50278e09808826371169b3e24bbf98561ef3b4bccc7b937f5ec1d7f SHA512 421f3a61e8eebf5ad915551c51dcd843a544e7959b93d6dd4ab2ffc6c20954f559da75dcfecc6fea838f80dc4d3c83243be3ce7a21e92bc165b3e0be120451bf
-DIST HaXml-1.24.tar.gz 143107 BLAKE2B dd7c8507a4d53a7260a9bffcb6c9f6eb54287fa71de31945acab19c0a8b63261905a74d5ec176376016f63092871af56f5ea89d06e0747c26dff02044d5fe894 SHA512 421864e4177b16f485b72d33210a67914c2040664d604db5cc70b356a518114f11dbcc1b1c8f300fd045338605613a14317bd5bf5f041a8e38990d3c5dc7e94c
-DIST HaXml-1.25.3.tar.gz 144189 BLAKE2B f521a02d33c0d39d79a0e26defa2ae64331b5377b18980f38733ab9e2971f0685b4e8e6b68702f72687142484842fb61b4d337f0b277d88520b266799812f356 SHA512 b80a70954a79c9246ed9e92ca2bd7c94f54b2843eb387fa2045652cfa5eee69b8bfae17ef88b391855abe3dc672e3cf212be53e275e6ff350fe1074fff608828
-DIST HaXml-1.25.5.tar.gz 145834 BLAKE2B 4afb4a4ee5b9af2229edd797177550dcc6fc4c917f69d87670bb8bd1232398a0138a2f297222fc8677c1fd1cd50e37ee9e3480ff5d363095263d48e3f06efa6e SHA512 c2aa429198b4ba9b3a32ddf10e10e1213e34d617241e7a2f476f1998b8f24a7ca8462f8cdb52edceeb50f2020c74ff63db4307faebf3ae621afb3b8822398d15
diff --git a/dev-haskell/haxml/files/haxml-1.23.3-haddock.patch b/dev-haskell/haxml/files/haxml-1.23.3-haddock.patch
deleted file mode 100644
index 1da171b17678..000000000000
--- a/dev-haskell/haxml/files/haxml-1.23.3-haddock.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- HaXml-1.23.3-orig/src/Text/XML/HaXml/Schema/HaskellTypeModel.hs	2012-06-19 01:31:18.000000000 +1000
-+++ HaXml-1.23.3/src/Text/XML/HaXml/Schema/HaskellTypeModel.hs	2012-06-19 01:49:23.784392420 +1000
-@@ -77,8 +77,8 @@
-                  -- rests with the input doc, not with the caller of the parser.
-                | ElementsAttrsAbstract {-typename-}XName
-                                        {-subtypes-}[(XName,Maybe XName)]
--                                --  ^ [(type name, module where declared later)]
-                                        Comment
-+                                --  ^ [(type name, module where declared later)]
- 
-                  -- becomes function
-                  --    elementE :: Parser T
diff --git a/dev-haskell/haxml/haxml-1.24.1.ebuild b/dev-haskell/haxml/haxml-1.24.1.ebuild
deleted file mode 100644
index 787bd93be3c5..000000000000
--- a/dev-haskell/haxml/haxml-1.24.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HaXml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Utilities for manipulating XML documents"
-HOMEPAGE="https://archives.haskell.org/projects.haskell.org/HaXml/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.9:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/haxml/haxml-1.24.ebuild b/dev-haskell/haxml/haxml-1.24.ebuild
deleted file mode 100644
index 7c973da72a07..000000000000
--- a/dev-haskell/haxml/haxml-1.24.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-MY_PN="HaXml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Utilities for manipulating XML documents"
-HOMEPAGE="https://archives.haskell.org/projects.haskell.org/HaXml/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.9:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${PN}-1.23.3-haddock.patch")
diff --git a/dev-haskell/haxml/haxml-1.25.3.ebuild b/dev-haskell/haxml/haxml-1.25.3.ebuild
deleted file mode 100644
index 2456f5e01c20..000000000000
--- a/dev-haskell/haxml/haxml-1.25.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HaXml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Utilities for manipulating XML documents"
-HOMEPAGE="https://archives.haskell.org/projects.haskell.org/HaXml/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.10:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/haxml/haxml-1.25.5-r1.ebuild b/dev-haskell/haxml/haxml-1.25.5-r1.ebuild
deleted file mode 100644
index 17a81e4f1738..000000000000
--- a/dev-haskell/haxml/haxml-1.25.5-r1.ebuild
+++ /dev/null
@@ -1,40 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HaXml"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Utilities for manipulating XML documents"
-HOMEPAGE="http://projects.haskell.org/HaXml/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/polyparse-1.12.1:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.3.1.0  && < 4.13' 'base       >= 4.3.1.0' \
-		'polyparse  >= 1.12.1   && <1.13' 'polyparse  >= 1.12.1'
-}
diff --git a/dev-haskell/haxml/metadata.xml b/dev-haskell/haxml/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/haxml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hcg-minus/Manifest b/dev-haskell/hcg-minus/Manifest
deleted file mode 100644
index 14829d82c2f8..000000000000
--- a/dev-haskell/hcg-minus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hcg-minus-0.15.tar.gz 12997 BLAKE2B 77df853ae1fdf22742e5d4f4ea4e42e78619fdd52c2395ad22850d8471c98fab362bb48aede9faebde6b309db13b7d14f322106a19008c6af6d92252826bebc7 SHA512 875b89656a5340bbd9a303a98004bc13d2b7b37fc58762c9a4f96abbb78ec3e67403a5968f8b9ff59d955aaa3d2031eba45cee85a2ec19c442f31ad0f413da45
diff --git a/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild b/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild
deleted file mode 100644
index 5f4cc0dd22f2..000000000000
--- a/dev-haskell/hcg-minus/hcg-minus-0.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="haskell cg (minus)"
-HOMEPAGE="http://rd.slavepianos.org/t/hcg-minus"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/colour:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hcg-minus/metadata.xml b/dev-haskell/hcg-minus/metadata.xml
deleted file mode 100644
index e019a95fc97b..000000000000
--- a/dev-haskell/hcg-minus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		cg (minus) library
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hcodecs/Manifest b/dev-haskell/hcodecs/Manifest
deleted file mode 100644
index d64283357b09..000000000000
--- a/dev-haskell/hcodecs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HCodecs-0.5.1.tar.gz 24209 BLAKE2B f466bff90fafd4ecc26d21eee26749ef5fc92d97849eea5a5aa88b0b2882f6b9b575bc38ca599d2c33bd9a2b9ec839577b12b42d665cea7eab239e65eb64576e SHA512 470d3fbbb096b0a5e40e9c529d0b7c738ec905237bd43acec9c8b5676e0e214a864684e09614af16678a48883f670cc52e691fe93e3db14815028408cd96b3a0
-DIST HCodecs-0.5.2.tar.gz 24397 BLAKE2B 267a230f124c7ecb50f918fd5ba293373ac82b9b38d6b3ede715f79f8f7ace3e7a7f3ad2280fbdb6225febd647fec5837b4cb6d2a00c05ec3b9a514fac2e5e7b SHA512 454f499e93c9a99bb0f5b210d84e89ea1edb1714a639826ea012caa49e744de3fe024eab25a9288317135d081cab0cfb19b4fb2537c14a6c27dbb228e70c9a49
-DIST HCodecs-0.5.tar.gz 24232 BLAKE2B 0af06721ba03658c421fc3ec66370736fc439bce403307148174363179d08586a93fbde6bb957c68909cc0e876c93b828a715b9fdb872786ca533947a630d02b SHA512 40ee73995c06b34b799f1e8bd310faadc6ab267735313bdb62c0fb7ea95c13e3b443fc230cd529eb5f8ce02685d0506c80bcab3e802f2c407ef7584f6abdbe1d
diff --git a/dev-haskell/hcodecs/hcodecs-0.5.1.ebuild b/dev-haskell/hcodecs/hcodecs-0.5.1.ebuild
deleted file mode 100644
index 87755879d76f..000000000000
--- a/dev-haskell/hcodecs/hcodecs-0.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HCodecs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"
-HOMEPAGE="http://www-db.informatik.uni-tuebingen.de/team/giorgidze"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # QC finds counterexamples
-
-RDEPEND=">=dev-haskell/quickcheck-2.0:2=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hcodecs/hcodecs-0.5.2.ebuild b/dev-haskell/hcodecs/hcodecs-0.5.2.ebuild
deleted file mode 100644
index ff997f5b7a61..000000000000
--- a/dev-haskell/hcodecs/hcodecs-0.5.2.ebuild
+++ /dev/null
@@ -1,33 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HCodecs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"
-HOMEPAGE="http://www-db.informatik.uni-tuebingen.de/team/giorgidze"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
-	>=dev-haskell/quickcheck-2.0:2=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hcodecs/hcodecs-0.5.ebuild b/dev-haskell/hcodecs/hcodecs-0.5.ebuild
deleted file mode 100644
index a4c75e6ef5e5..000000000000
--- a/dev-haskell/hcodecs/hcodecs-0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HCodecs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"
-HOMEPAGE="http://www-db.informatik.uni-tuebingen.de/team/giorgidze"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # hung?
-
-RDEPEND=">=dev-haskell/quickcheck-2.0:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hcodecs/metadata.xml b/dev-haskell/hcodecs/metadata.xml
deleted file mode 100644
index 02cadfb9cc8e..000000000000
--- a/dev-haskell/hcodecs/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The library provides functions to read, write and manipulate MIDI, WAVE and
-		SoundFont2 multimedia files. It is written entirely in Haskell (without any
-		FFI). It uses efficient  parsing and building combinators for binary data
-		stored in ByteStrings (based on the one in &#39;binary&#39; package).
-		
-		Correctness of significant parts of the library has been validated with
-		QuickCheck and Haskell Program Coverage (HPC) tool-kits.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-mysql/Manifest b/dev-haskell/hdbc-mysql/Manifest
deleted file mode 100644
index e976934e7bbd..000000000000
--- a/dev-haskell/hdbc-mysql/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST HDBC-mysql-0.6.6.1.tar.gz 23120 BLAKE2B 117c7a8c8c366dd3a4c128f97105812330d85eabf4f6ade8acd1e13c31cd2a57b3b904d0d76887ab5e45fe1f3c4a527c8ca1778e5ae736ae7dbae2e36a9a7c9d SHA512 be74be365021df54c9660af699cfec05271444da0042152c944d43927efcf7cf78712d3bfe25796f944af409b9eb24ab903c0b92bb6b3c6dbcf0a3ee057366bf
-DIST HDBC-mysql-0.7.1.0.tar.gz 24086 BLAKE2B fd480ef5a3374aa8c6d36bd4f34fb1cb558769a134f60ce1b94cba7143b93adecc2cff6253cb1afbefe52c9ed8081fc7f812f7bc6539c043f783e9ced10ff4d7 SHA512 aec9387f08c16c8ccb6df1ca82e69005105a2781e253b6b8788665fa88e54a697601f99d10931ea6d3854dd9c0b43f062bccad1362a1512f5a2135cede0b0cc1
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
deleted file mode 100644
index 83ddd4a4c8ca..000000000000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-cabal-1.18.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- HDBC-mysql-0.6.6.1-orig/Setup.lhs	2012-08-30 13:40:03.000000000 +1000
-+++ HDBC-mysql-0.6.6.1/Setup.lhs	2014-07-03 22:31:21.162259637 +1000
-@@ -1,6 +1,7 @@
- #!/usr/bin/env runhaskell
- 
- \begin{code}
-+{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-}
- import Distribution.Simple
- import Distribution.PackageDescription
- import Distribution.Version
-@@ -26,8 +27,21 @@
-     }
- }
- 
-+-- 'ConstOrId' is a @Cabal-1.16@ vs @Cabal-1.18@ compatibility hack,
-+-- 'programFindLocation' has a new (unused in this case)
-+-- parameter. 'ConstOrId' adds this parameter when types say it is
-+-- mandatory.
-+class ConstOrId a b where
-+    constOrId :: a -> b
-+
-+instance ConstOrId a a where
-+    constOrId = id
-+
-+instance ConstOrId a (b -> a) where
-+    constOrId = const
-+
- mysqlConfigProgram = (simpleProgram "mysql_config") {
--    programFindLocation = \verbosity -> do
-+    programFindLocation = \verbosity -> constOrId $ do
-       mysql_config  <- findProgramOnPath "mysql_config"  verbosity
-       mysql_config5 <- findProgramOnPath "mysql_config5" verbosity
-       return (mysql_config `mplus` mysql_config5)
diff --git a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch b/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
deleted file mode 100644
index 8b9993969cb3..000000000000
--- a/dev-haskell/hdbc-mysql/files/hdbc-mysql-0.6.6.1-extralib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit d53860f7edb75873e263111129c159802b2ac5a6
-Author: Satoshi Nakamura <snakamura@infoteria.com>
-Date:   Tue May 27 15:44:57 2014 +0900
-
-    Add mysqlclient to Extra-Libraries
-
-diff --git a/HDBC-mysql.cabal b/HDBC-mysql.cabal
-index 2d56d8b..6a8967a 100644
---- a/HDBC-mysql.cabal
-+++ b/HDBC-mysql.cabal
-@@ -32,6 +32,7 @@ library
-     time,
-     utf8-string
-   ghc-options:      -Wall
-+  Extra-Libraries: mysqlclient
- 
- source-repository head
-   type:     git
diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild b/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild
deleted file mode 100644
index c77da18069b4..000000000000
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.6.6.1-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-CABAL_FEATURES+=" nocabaldep" # workaround depend on old cabal-1.16
-inherit haskell-cabal
-
-MY_PN="HDBC-mysql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL driver for HDBC"
-HOMEPAGE="https://github.com/bos/hdbc-mysql"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-cabal-1.18.patch
-	"${FILESDIR}/${P}"-extralib.patch
-)
diff --git a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild b/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
deleted file mode 100644
index 5a09fbb7663b..000000000000
--- a/dev-haskell/hdbc-mysql/hdbc-mysql-0.7.1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-mysql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL driver for HDBC"
-HOMEPAGE="https://github.com/ryantm/hdbc-mysql"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:2=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/hdbc-mysql/metadata.xml b/dev-haskell/hdbc-mysql/metadata.xml
deleted file mode 100644
index 8aa39248b6d6..000000000000
--- a/dev-haskell/hdbc-mysql/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a MySQL driver for HDBC, implemented via
-		bindings to the C @mysqlclient@ library.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/hdbc-mysql</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-odbc/Manifest b/dev-haskell/hdbc-odbc/Manifest
deleted file mode 100644
index 43cba7cfe126..000000000000
--- a/dev-haskell/hdbc-odbc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST HDBC-odbc-2.3.1.1.tar.gz 24518 BLAKE2B 306c9af823e55c56ad61f46ac44c4b055e725f0f9400998938a1c00d7d0a330bb06f581c15990bab4c60293e323464cd140b6ff14ebd80d35fe6b92d10890ff5 SHA512 dbf95afca7906c4814f79e00d1fef0d26ed71c8da45a0fd51c4e3e4e0427d56d1937be0b0c4088841d5f12d93da0c4c29ec6f359c2e58fdf4c693f34bdae250a
-DIST HDBC-odbc-2.4.0.1.tar.gz 27185 BLAKE2B 5ccd40f9dcc3ee7045f8719b16f0d65f049cd52c323b86aebdc11fba7c9003747f29850aec059d4d092826c579e0f9dc2f9d12dbbf7b1e261ca052a3e5ba122a SHA512 ae9f5ac2aa6adfc155999fb78b35a12e381d1589bf2539306a4e346af4eee401db8af8ef74348cc0707620f9586367701505d0d61bd96f00f0ebeb9240ed9a06
diff --git a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch
deleted file mode 100644
index 8092cf16da6c..000000000000
--- a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- HDBC-odbc-2.3.1.0-orig/testsrc/TestSbasics.hs	2011-08-10 07:16:38.000000000 +1000
-+++ HDBC-odbc-2.3.1.0/testsrc/TestSbasics.hs	2012-10-13 12:30:47.216363898 +1100
-@@ -1,9 +1,13 @@
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
- module TestSbasics(tests) where
- import Test.HUnit
- import Database.HDBC
- import TestUtils
- import System.IO
--import Control.Exception hiding (catch)
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-+import Control.Exception
- 
- openClosedb = sqlTestCase $ 
-     do dbh <- connectDB
-@@ -123,7 +127,7 @@
-        -- Let's try a rollback.
-        catch (withTransaction dbh (\_ -> do sExecuteMany sth rows
-                                             fail "Foo"))
--             (\_ -> return ())
-+             (\(_::IOException) -> return ())
-        sExecute qrysth []
-        sFetchAllRows qrysth >>= (assertEqual "rollback" [[Just "0"]])
- 
---- HDBC-odbc-2.3.1.0-orig/testsrc/Testbasics.hs	2011-08-10 07:16:38.000000000 +1000
-+++ HDBC-odbc-2.3.1.0/testsrc/Testbasics.hs	2012-10-13 12:30:10.883415738 +1100
-@@ -1,9 +1,13 @@
-+{-# LANGUAGE CPP, ScopedTypeVariables #-}
- module Testbasics(tests) where
- import Test.HUnit
- import Database.HDBC
- import TestUtils
- import System.IO
--import Control.Exception hiding (catch)
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-+import Control.Exception
- 
- openClosedb = sqlTestCase $ 
-     do dbh <- connectDB
-@@ -140,7 +144,7 @@
-        -- Let's try a rollback.
-        catch (withTransaction dbh (\_ -> do executeMany sth rows
-                                             fail "Foo"))
--             (\_ -> return ())
-+             (\(_::IOException) -> return ())
-        execute qrysth []
-        fetchAllRows qrysth >>= (assertEqual "rollback" [[SqlString "0"]])
- 
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild
deleted file mode 100644
index 62ce679b5c5b..000000000000
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-2.3.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-# haddock is disabled as it chokes in .hsc file:
-#     Database/HDBC/ODBC/Statement.hsc:462:3:
-#        parse error on input `Word16'
-CABAL_FEATURES="bin lib profile hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-odbc"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="ODBC driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-odbc"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # requires configured ODBC
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-7.0.1:=
-		>=dev-db/unixODBC-2.2
-	"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6
-		test? ( dev-haskell/convertible
-			dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/testpack
-		)
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.3.1.0-ghc-7.6.patch"
-}
-
-src_configure() {
-	cabal_src_configure $(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild
deleted file mode 100644
index 9b527d532bd8..000000000000
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-2.4.0.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-# haddock is disabled as it chokes in .hsc file:
-#     Database/HDBC/ODBC/Statement.hsc:462:3:
-#        parse error on input `Word16'
-CABAL_FEATURES="bin lib profile hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-odbc"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="ODBC driver for HDBC"
-HOMEPAGE="https://github.com/hdbc/hdbc-odbc"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildstresstest test"
-RESTRICT="test" # requires configured ODBC
-
-RDEPEND=">=dev-haskell/hdbc-2.1.0:2=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-db/unixODBC-2.2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	buildstresstest? ( dev-haskell/random:=[profile?]
-				dev-haskell/resource-pool:=[profile?] )
-	test? ( dev-haskell/convertible:=[profile?]
-			dev-haskell/hunit:=[profile?]
-			dev-haskell/quickcheck:2=[profile?]
-			dev-haskell/testpack:=[profile?] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildstresstest buildstresstest) \
-		$(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc-odbc/metadata.xml b/dev-haskell/hdbc-odbc/metadata.xml
deleted file mode 100644
index 5c72d4a3ad3d..000000000000
--- a/dev-haskell/hdbc-odbc/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides an ODBC database backend for HDBC.
-		It is cross-platform and supports unixODBC on Unix/Linux/POSIX platforms
-		and Microsoft ODBC on Windows.  It is also the preferred way to access
-		MySQL databases from Haskell.
-	</longdescription>
-	<use>
-		<flag name="buildstresstest">Build stress test</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">hdbc/hdbc-odbc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hdbc-postgresql/Manifest b/dev-haskell/hdbc-postgresql/Manifest
index 0c97a0207133..45507d0c9efd 100644
--- a/dev-haskell/hdbc-postgresql/Manifest
+++ b/dev-haskell/hdbc-postgresql/Manifest
@@ -1,3 +1,2 @@
-DIST HDBC-postgresql-2.3.2.3.tar.gz 25193 BLAKE2B 1f93d2d50e87213415d102fd65bfa2a7d8a0fa5a6cb03223ffa42c6830837cc1ba61421a526756f22b497c7c7486551bac6421d9ddd704ec974d5428b0df656c SHA512 407b18758e75e99230dbad56000839d8499c075e77b63809e079c7968e52177cc599dff30517f8cd08c3e4e263a71a4c65b3040c318b4b3358ff329824f4766f
-DIST HDBC-postgresql-2.3.2.4.tar.gz 25288 BLAKE2B 9ecd290932ed83cd16159d8ea17379327040eb474ccae2819b95891475395e4ccd1d9724393c15f38053137afc8185bb8c1b6c90a11b76412a199a45104af394 SHA512 44f04536d04cf5b9778a03c5cce12d538b121a578e91b338753d64d69939852aacda57fca1e6dd22b5c2160bb29c71b2f8d8f63a9a7b62401db6f89e1d272364
-DIST HDBC-postgresql-2.3.2.7.tar.gz 25606 BLAKE2B 0991686424f5912258fd1a9bdd40ef84d04a069a2ba14ce93678cce8f8fc1a73a10ed4c9fdf31a372e52a9833007e6469bcb9632d3f80022f240a3bac8aaca28 SHA512 0e4b27d5c18335e47b9782adcb09702654d9f8d04053110576a8a7ce68dc90810e35977886e2cbde0d4ef337aad5b36a4217dbfe07e1f64753f0cc34892d006e
+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
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild
deleted file mode 100644
index 6efb2a040175..000000000000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-CABAL_FEATURES+=" nocabaldep" # workaround depend on old cabal-1.16
-inherit haskell-cabal
-
-MY_PN="HDBC-postgresql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL driver for HDBC"
-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}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # requires configured postgresql
-
-RDEPEND=">=dev-db/postgresql-7:*
-	dev-haskell/convertible:=[profile?]
-	>=dev-haskell/hdbc-2.2.0:2=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hdbc-2.2.6:=[profile?]
-			dev-haskell/hunit:=[profile?]
-			dev-haskell/quickcheck:2=[profile?]
-			dev-haskell/testpack:=[profile?] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.4-r1.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.4-r1.ebuild
deleted file mode 100644
index 1a2faf34130e..000000000000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.4-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-postgresql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL driver for HDBC"
-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}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/postgresql-7:*
-	dev-haskell/convertible:=[profile?]
-	>=dev-haskell/hdbc-2.2.0:2=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=splitbase
-}
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
deleted file mode 100644
index 2942d5b03486..000000000000
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 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: +splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC-postgresql"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PostgreSQL driver for HDBC"
-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}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/postgresql-7:*
-	dev-haskell/convertible:=[profile?]
-	>=dev-haskell/hdbc-2.2.0:2=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8 <dev-haskell/cabal-3.1
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=splitbase
-}
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
new file mode 100644
index 000000000000..1d9f67c6efaa
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +splitbase,-buildtests,+minTime15
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-postgresql"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-postgresql"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+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:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+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=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
new file mode 100644
index 000000000000..0072be8a8d5a
--- /dev/null
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -buildtests,+mintime15,+splitbase
+
+CABAL_PN="HDBC-postgresql"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+# error: Connection.hsc:34:10: fatal error: pg_config.h: No such file or directory
+RESTRICT="test" # Missing files
+
+DESCRIPTION="PostgreSQL driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-postgresql"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-db/postgresql-7:*
+	dev-haskell/convertible:=[profile?]
+	>=dev-haskell/hdbc-2.2.0:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-buildtests \
+		--flag=mintime15 \
+		--flag=splitbase
+}
diff --git a/dev-haskell/hdbc-postgresql/metadata.xml b/dev-haskell/hdbc-postgresql/metadata.xml
index 9b1707d75fe9..c5d81d92f84e 100644
--- a/dev-haskell/hdbc-postgresql/metadata.xml
+++ b/dev-haskell/hdbc-postgresql/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hdbc/hdbc-postgresql</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">HDBC-postgresql</remote-id>
+		<remote-id type="github">hdbc/hdbc-postgresql</remote-id>
+	</upstream>
 </pkgmetadata>
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 6f71fc5a2a92..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
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-# ebuild generated by hackport 0.5.1
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -buildtests
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,28 +18,23 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildtests +splitbase"
+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:=
-	buildtests? ( dev-haskell/convertible:=[profile?]
-			dev-haskell/hunit:=[profile?]
-			dev-haskell/old-locale:=[profile?]
-			dev-haskell/old-time:=[profile?]
-			dev-haskell/testpack:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
+	>=dev-haskell/cabal-1.2
 "
 
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag buildtests buildtests) \
+		--flag=-buildtests \
 		$(cabal_flag splitbase splitbase)
 }
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
new file mode 100644
index 000000000000..f4c9fab13d7b
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -buildtests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sqlite v3 driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-sqlite3"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+splitbase"
+
+RDEPEND=">=dev-db/sqlite-3.0
+	>=dev-haskell/hdbc-2.3.0.0:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-buildtests \
+		$(cabal_flag splitbase splitbase)
+}
diff --git a/dev-haskell/hdbc-sqlite3/metadata.xml b/dev-haskell/hdbc-sqlite3/metadata.xml
index a6dc7b001d95..a25e9e61fb7c 100644
--- a/dev-haskell/hdbc-sqlite3/metadata.xml
+++ b/dev-haskell/hdbc-sqlite3/metadata.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="buildtests">Build the executable to run unit tests</flag>
 		<flag name="splitbase">Choose the new smaller, split-up package.</flag>
 	</use>
-	<longdescription>
-		This is the Sqlite v3 driver for HDBC, the generic
-		database access system for Haskell
-	</longdescription>
 	<upstream>
 		<remote-id type="github">hdbc/hdbc-sqlite3</remote-id>
 	</upstream>
diff --git a/dev-haskell/hdbc/Manifest b/dev-haskell/hdbc/Manifest
index c27f2313eae1..9a764c81c830 100644
--- a/dev-haskell/hdbc/Manifest
+++ b/dev-haskell/hdbc/Manifest
@@ -1,3 +1,2 @@
-DIST HDBC-2.3.1.2.tar.gz 23314 BLAKE2B cc6eca2703be4768ea55b7264f960419378e415d165d63b64ac903a5228534cedec7b7e2d9f5c3284781b5a3f253a020deadd3e335bcfa46a77df746e8e99291 SHA512 e98ca4043c311eb8e5adb02d1a59bc0d1be84ba66c224b848649a596de214a2a38b8bedfe71fa8f17ae0843cf073e814c76e7e868aca1e20619e3d5fa573109c
-DIST HDBC-2.4.0.1.tar.gz 23415 BLAKE2B a63037329bd68e09c343497dd0d95a36675872122ff30bbf40ca108f8bd56454df354628b2317c11745ba58c60b5a9023128253e07a24622c1b34ef7356d07f2 SHA512 1a20a533ffe7700cfb48c9875e9c6b09f940c1b808fd1a371327eed9c358abfe0167d206bb5b2dbb904b49f2081f91f81091d4164aad2aa08555f6de01a55d5a
 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
diff --git a/dev-haskell/hdbc/files/hdbc-2.4.0.4-fix-tests.patch b/dev-haskell/hdbc/files/hdbc-2.4.0.4-fix-tests.patch
new file mode 100644
index 000000000000..e2b94b459273
--- /dev/null
+++ b/dev-haskell/hdbc/files/hdbc-2.4.0.4-fix-tests.patch
@@ -0,0 +1,127 @@
+From cea6c0ebde0c3c7a0a0976fd9a0e745ccad9dec4 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Mon, 27 Feb 2023 07:54:10 -0700
+Subject: [PATCH] Fix tests
+
+Fix tests for modern 'time' and turn 'runtests' into a proper test
+suite.
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ HDBC.cabal              | 40 +++++++++++++++++-----------------------
+ testsrc/TestSqlValue.hs | 16 +++++++++++++++-
+ 2 files changed, 32 insertions(+), 24 deletions(-)
+
+diff --git a/HDBC.cabal b/HDBC.cabal
+index e189f9a..15d0c15 100644
+--- a/HDBC.cabal
++++ b/HDBC.cabal
+@@ -24,9 +24,6 @@ source-repository head
+ 
+ flag splitBase
+   description: Choose the new smaller, split-up base package.
+-flag buildtests
+-  description: Build the executable to run unit tests
+-  default: False
+ flag minTime15
+   description: Use time 1.5 or higher.
+   default: True
+@@ -59,28 +56,25 @@ library
+     FlexibleInstances, DeriveDataTypeable
+   Default-Language: Haskell2010
+ 
+-Executable runtests
+-   if flag(buildtests)
+-      Buildable: True
+-      Build-Depends: HUnit, QuickCheck >= 2.0
++Test-Suite runtests
++   Build-Depends: HUnit, QuickCheck >= 2.0
+ 
+-      if flag(splitBase)
+-        Build-Depends: base>=3 && <5, old-time, bytestring, containers
+-        if flag(minTime15)
+-          Build-Depends: time >= 1.5 && < 1.14
+-          CPP-Options: -DMIN_TIME_15
+-        else
+-          Build-Depends: time >= 1.2 && < 1.5, old-locale
+-      else
+-        Build-Depends: base<3
+-      Build-Depends: mtl, convertible >= 1.1.0.0, utf8-string, text
+-
+-      -- Hack for cabal-install weirdness.  cabal-install forces base 3,
+-      -- though it works fine for Setup.lhs manually.  Fix.
+-      if impl(ghc >= 6.9)
+-         build-depends: base >= 4
++   if flag(splitBase)
++     Build-Depends: base>=3 && <5, old-time, bytestring, containers
++     if flag(minTime15)
++       Build-Depends: time >= 1.5 && < 1.14
++       CPP-Options: -DMIN_TIME_15
++     else
++       Build-Depends: time >= 1.2 && < 1.5, old-locale
+    else
+-      Buildable: False
++     Build-Depends: base<3
++   Build-Depends: mtl, convertible >= 1.1.0.0, utf8-string, text
++
++   -- Hack for cabal-install weirdness.  cabal-install forces base 3,
++   -- though it works fine for Setup.lhs manually.  Fix.
++   if impl(ghc >= 6.9)
++      build-depends: base >= 4
++   Type: exitcode-stdio-1.0
+    Main-Is: runtests.hs
+    Other-Modules: TestSqlValue
+    Hs-Source-Dirs: ., testsrc
+diff --git a/testsrc/TestSqlValue.hs b/testsrc/TestSqlValue.hs
+index 7d29453..e6161e8 100644
+--- a/testsrc/TestSqlValue.hs
++++ b/testsrc/TestSqlValue.hs
+@@ -6,12 +6,18 @@ All rights reserved.
+ For license and copyright information, see the file COPYRIGHT
+ -}
+ 
++{-# LANGUAGE CPP #-}
++
+ module TestSqlValue where
+ import Test.QuickCheck hiding (Result)
+ import Test.QuickCheck.Property (Result)
+ import qualified Test.HUnit as HU
+ import Database.HDBC
++#if MIN_VERSION_time(0,10,0)
++import Data.Time.Format (parseTimeM)
++#else
+ import Data.Time.Format (parseTime)
++#endif
+ import Data.Time.LocalTime
+ import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat, oldIso8601DateFormat)
+ import Data.Maybe
+@@ -29,17 +35,25 @@ fromSql_Int x =
+ 
+ testZonedTimeStr = "1989-08-01 15:33:01 -0500"
+ testZonedTime :: ZonedTime
+-testZonedTime = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat (Just "%T %z"))
++testZonedTime = fromJust $ parseTimeM False defaultTimeLocale (iso8601DateFormat (Just "%T %z"))
+                 testZonedTimeStr
+ 
+ testZonedTimeFracStr = "1989-08-01 15:33:01.536 -0500"
+ testZonedTimeFrac :: ZonedTime
++#if MIN_VERSION_time(0,10,0)
++testZonedTimeFrac = fromJust $ parseTimeM False defaultTimeLocale (iso8601DateFormat (Just "%T%Q %z"))
++#else
+ testZonedTimeFrac = fromJust $ parseTime defaultTimeLocale (iso8601DateFormat (Just "%T%Q %z"))
++#endif
+                     testZonedTimeFracStr
+ 
+ testZonedTimeTwoDigitYearStr = "89-08-01 15:33:01 -0500"
+ testZonedTimeTwoDigitYear :: ZonedTime
++#if MIN_VERSION_time(0,10,0)
++testZonedTimeTwoDigitYear = fromJust $ parseTimeM False defaultTimeLocale (oldIso8601DateFormat (Just "%T %z"))
++#else
+ testZonedTimeTwoDigitYear = fromJust $ parseTime defaultTimeLocale (oldIso8601DateFormat (Just "%T %z"))
++#endif
+                             testZonedTimeTwoDigitYearStr
+ 
+ ztparsenf =
+-- 
+2.39.2
+
diff --git a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild b/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
deleted file mode 100644
index c346de331f61..000000000000
--- a/dev-haskell/hdbc/hdbc-2.3.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal versionator
-
-MY_PN="HDBC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="https://github.com/hdbc/hdbc"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql odbc postgres sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/convertible-1.0.10.0:=[profile?] <dev-haskell/convertible-1.1.0.0:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/text:=[profile?]
-		dev-haskell/utf8-string:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/testpack
-		)
-	"
-
-DEPENDV="$(get_version_component_range 1-2)"
-PDEPEND="mysql? ( dev-haskell/hdbc-mysql )
-		odbc? ( =dev-haskell/hdbc-odbc-${DEPENDV}* )
-		postgres? ( =dev-haskell/hdbc-postgresql-${DEPENDV}* )
-		sqlite? ( >=dev-haskell/hdbc-sqlite3-${DEPENDV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	cabal_src_configure $(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
deleted file mode 100644
index b23df73dfefe..000000000000
--- a/dev-haskell/hdbc/hdbc-2.4.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: buildtests:test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HDBC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Haskell Database Connectivity"
-HOMEPAGE="https://github.com/hdbc/hdbc"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # Tests do not compile with time 1.5
-
-RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.0:2=[profile?]
-		>=dev-haskell/testpack-2.0:=[profile?] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'time >= 1.5 && < 1.6' 'time >= 1.5'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
-}
diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
index fb05e030b9da..f2d24771a8d8 100644
--- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
+++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.1.9999
 #hackport: flags: buildtests:test
@@ -17,11 +17,15 @@ HOMEPAGE="https://github.com/hdbc/hdbc"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
 
-RESTRICT="test" # Requires dev-haskell/testpack (deprecated), and this is a problem.
+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?]
@@ -30,9 +34,6 @@ RDEPEND=">=dev-haskell/convertible-1.1.0.0:=[profile?]
 	dev-haskell/text:=[profile?]
 	dev-haskell/utf8-string:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	test? ( dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2.0:2=[profile?]
-		>=dev-haskell/testpack-2.0:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
@@ -41,21 +42,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test buildtests)
-}
-
-src_test() {
-	# default tests
-	haskell-cabal_src_test || die "cabal test failed"
-
-	# built custom tests
-	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
-}
-
-src_install() {
-	cabal_src_install
+	config_flags=(
+		--flag=-buildtests
+		--flag=splitBase
+		--flag=minTime15
+	)
 
-	# if tests were enabled, make sure the unit test driver is deleted
-	rm -f "${ED}/usr/bin/runtests"
+	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
new file mode 100644
index 000000000000..3ef978f673de
--- /dev/null
+++ b/dev-haskell/hdbc/hdbc-2.4.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+#hackport: flags: +minTime15,+splitBase
+
+CABAL_PN="HDBC"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell Database Connectivity"
+HOMEPAGE="https://github.com/hdbc/hdbc"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.0.4-fix-tests.patch"
+)
+
+RDEPEND="
+	>=dev-haskell/convertible-1.1.0.0:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.0
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=minTime15 \
+		--flag=splitBase
+}
diff --git a/dev-haskell/hdbc/metadata.xml b/dev-haskell/hdbc/metadata.xml
index 70786ef184be..4c4bed34630e 100644
--- a/dev-haskell/hdbc/metadata.xml
+++ b/dev-haskell/hdbc/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		HDBC provides an abstraction layer between Haskell programs and SQL
-		relational databases. This lets you write database code once, in
-		Haskell, and have it work with any number of backend SQL databases
-		(MySQL, Oracle, PostgreSQL, ODBC-compliant databases, etc.)
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">HDBC</remote-id>
 		<remote-id type="github">hdbc/hdbc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/heaps/Manifest b/dev-haskell/heaps/Manifest
deleted file mode 100644
index 13915bc9d3bf..000000000000
--- a/dev-haskell/heaps/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST heaps-0.3.6.1.tar.gz 12440 BLAKE2B 560a605d91b1481ec9e69510d1634e45bad2dfe589ba2fa6d3eb5391837904a9bb41fa7bfc8a6472862ae163905bc178fd71d6e60fb92c6ab8c630d3bb2ac7d1 SHA512 7c3cfb4ca95538a51b418ab2d42171883c9c51860f63e6836d42845a43cead825016fce74ed5e866decf0a6812433c3ecd6989161f2303939bbcad8ef4aab0ef
diff --git a/dev-haskell/heaps/heaps-0.3.6.1.ebuild b/dev-haskell/heaps/heaps-0.3.6.1.ebuild
deleted file mode 100644
index 7535de78d815..000000000000
--- a/dev-haskell/heaps/heaps-0.3.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Asymptotically optimal Brodal/Okasaki heaps"
-HOMEPAGE="https://github.com/ekmett/heaps/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/heaps/metadata.xml b/dev-haskell/heaps/metadata.xml
deleted file mode 100644
index 1fd7401edc94..000000000000
--- a/dev-haskell/heaps/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Asymptotically optimal Brodal/Okasaki bootstrapped skew-binomial heaps from the paper \"Optimal Purely Functional Priority Queues\", extended with a Foldable interface.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hedgehog/Manifest b/dev-haskell/hedgehog/Manifest
index 39c3d7617ff3..1fc4946becd1 100644
--- a/dev-haskell/hedgehog/Manifest
+++ b/dev-haskell/hedgehog/Manifest
@@ -1 +1,3 @@
-DIST hedgehog-1.0.2.tar.gz 66986 BLAKE2B adb4e40bedb3ffa76b39b8ee87fdd4a05d467c5a0d9e225257123ea02721a5bae5146a9e0d2d0fb79ca0d0dd41987559da2ae505662652b9e97aea3c25d362eb SHA512 b34004210f4af480e10e6fd0a715ee0efb7d718a7c0d8b84355639064b105840e59be223e90cc4fa26a9fa564df6d9686e77b03d996a8820955b19a6ef42c1bb
+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
diff --git a/dev-haskell/hedgehog/hedgehog-1.0.2-r1.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.2-r1.ebuild
deleted file mode 100644
index 4eb9dc8b0c26..000000000000
--- a/dev-haskell/hedgehog/hedgehog-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,51 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hedgehog will eat all your bugs"
-HOMEPAGE="https://hedgehog.qa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[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/fail-4.9:=[profile?] <dev-haskell/fail-5:=[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/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[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?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'template-haskell                >= 2.10       && < 2.16' 'template-haskell                >= 2.10' \
-		'pretty-show                     >= 1.6        && < 1.10' 'pretty-show                     >= 1.6'
-}
diff --git a/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
new file mode 100644
index 000000000000..5c505c139823
--- /dev/null
+++ b/dev-haskell/hedgehog/hedgehog-1.0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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"
+
+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/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/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/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?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hedgehog/hedgehog-1.4.ebuild b/dev-haskell/hedgehog/hedgehog-1.4.ebuild
new file mode 100644
index 000000000000..bc16f40c282f
--- /dev/null
+++ b/dev-haskell/hedgehog/hedgehog-1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Release with confidence"
+HOMEPAGE="https://hedgehog.qa"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/barbies-1.0:=[profile?] <dev-haskell/barbies-2.1:=[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/lifted-async-0.7:=[profile?] <dev-haskell/lifted-async-0.11:=[profile?]
+	>=dev-haskell/mmorph-1.0:=[profile?] <dev-haskell/mmorph-1.3:=[profile?]
+	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[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.9:=[profile?]
+	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+	>=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?]
+	>=dev-haskell/text-1.1:=[profile?] <dev-haskell/text-2.1:=[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?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/hedgehog/metadata.xml b/dev-haskell/hedgehog/metadata.xml
index ac25dafc9a45..a1012330d499 100644
--- a/dev-haskell/hedgehog/metadata.xml
+++ b/dev-haskell/hedgehog/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Hedgehog is a modern property-based testing system, in the spirit of
-		QuickCheck. Hedgehog uses integrated shrinking, so shrinks obey the
-		invariants of generated values by construction.
-		
-		To get started quickly, see the examples:
-		&lt;https://github.com/hedgehogqa/haskell-hedgehog/tree/master/hedgehog-example&gt;
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">hedgehog</remote-id>
+		<remote-id type="github">hedgehogqa/haskell-hedgehog</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hex/Manifest b/dev-haskell/hex/Manifest
deleted file mode 100644
index 6df1afb899a1..000000000000
--- a/dev-haskell/hex/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hex-0.1.2.tar.gz 1956 BLAKE2B e0552b6278e2be4e8985e9d1e17f653f9fa401a6324dc252c4fc0e6c200564c972541bc9ac37321bff41fa9c52555ff95679a9dc1fdea3e836d88d6016c7a6e0 SHA512 30608035819260b94759d644644b92a7145defa000685de53323ab4e765250ead410010e4ab96e99b97af647e97394c86edaf92cb811aa5df8228669b8ff9b4d
diff --git a/dev-haskell/hex/files/hex-0.1.2-monadfail.patch b/dev-haskell/hex/files/hex-0.1.2-monadfail.patch
deleted file mode 100644
index 27caaf0774f2..000000000000
--- a/dev-haskell/hex/files/hex-0.1.2-monadfail.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- hex-0.1.2/Data/Hex.hs	2011-10-11 05:44:11.000000000 +1100
-+++ Data/Hex.hs	2020-08-01 12:28:49.166983032 +1000
-@@ -22,7 +22,7 @@
-     -- | Convert string into hexadecimal.
-     hex   :: t -> t
-     -- | Convert from hexadecimal and fail on invalid input.
--    unhex :: Monad m => t -> m t
-+    unhex :: (Monad m, MonadFail m) => t -> m t
- 
- 
- instance Hex String where
-@@ -37,7 +37,7 @@
-     unhex [_]      = fail "Non-even length"
- 
- 
--c :: Monad m => Char -> m Int
-+c :: (Monad m, MonadFail m) => Char -> m Int
- c '0' = return 0
- c '1' = return 1
- c '2' = return 2
diff --git a/dev-haskell/hex/hex-0.1.2.ebuild b/dev-haskell/hex/hex-0.1.2.ebuild
deleted file mode 100644
index af2b7cfe8906..000000000000
--- a/dev-haskell/hex/hex-0.1.2.ebuild
+++ /dev/null
@@ -1,26 +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.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Convert strings into hexadecimal and back"
-HOMEPAGE="http://hackage.haskell.org/package/hex"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.8.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-
-PATCHES=( "${FILESDIR}"/${P}-monadfail.patch )
diff --git a/dev-haskell/hex/metadata.xml b/dev-haskell/hex/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/hex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/hexpat/Manifest b/dev-haskell/hexpat/Manifest
deleted file mode 100644
index 673a2505c43c..000000000000
--- a/dev-haskell/hexpat/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST hexpat-0.20.10.tar.gz 132682 BLAKE2B 0ed27d239cd7a2b5928dbcaffd1b8bda30f69b44b31af0ec6f0340628e75710090bc34950ac91bbcd2a8f1d5422542856e8e5f90c4ba48db810a2183e7a484d0 SHA512 aa230d3e002bc74d7f8c9d72eb373f63ec62f391b855119b1163504c2d4ef54ec555f9f56983f02d9268ca8615415ffee2466f404adca6393b2114b0f8f9001b
-DIST hexpat-0.20.11.tar.gz 143476 BLAKE2B 674677f92d968ef0cb687dca692dc5cb886f8c599dd55923c79efb8404b8b20da6f2186c4b5eb6d466e45b022f929e04b9ae8fb8b80c971a284f882caadaf633 SHA512 c1cb174ad8668826b3b45909589ad339683a54e9fe3c4df246530c2510a5f72b98edd66bd2730478809b3dfd7e98a6bfebec2d88871dc433ef794038988dd982
-DIST hexpat-0.20.13.tar.gz 143733 BLAKE2B 73cb82a98454f7dda6425d1366e3746741e73290dc6eb2d10510caa3a3d749a074f1592766a03a45bd820d6f44d6cbd9215eddb35bc4005b2bf273501a889695 SHA512 900abcb599bd66856c822b791222a814cc6293d655f45c4295e991ba74f750a80fd1c3993a0dfd943de6a83e90a5905711a7ce9c599471b043b10f661ca5a598
-DIST hexpat-0.20.9.tar.gz 132649 BLAKE2B cad85ca4b42551ff8a36eaf2cf59fa0558a21d5f06cf7a146982954ae3fbf8548c5a129ed1be803b0943291d13362e29405641bf637b0854fac1786cd5026f5e SHA512 619bf92d60f2d43c11861507daf6f93716b5ed5c1fc1957a27470b65264d7c0b5edb3f6e2a1a9d25cd5d7edd8146abaf5cbb772f2d84dacd9f2fe9913b81b543
diff --git a/dev-haskell/hexpat/hexpat-0.20.10.ebuild b/dev-haskell/hexpat/hexpat-0.20.10.ebuild
deleted file mode 100644
index 02bfb790e111..000000000000
--- a/dev-haskell/hexpat/hexpat-0.20.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?]
-	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/hexpat/hexpat-0.20.11.ebuild b/dev-haskell/hexpat/hexpat-0.20.11.ebuild
deleted file mode 100644
index fda29c2dc18c..000000000000
--- a/dev-haskell/hexpat/hexpat-0.20.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?]
-	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/hexpat/hexpat-0.20.13.ebuild b/dev-haskell/hexpat/hexpat-0.20.13.ebuild
deleted file mode 100644
index 01a2c7198d8b..000000000000
--- a/dev-haskell/hexpat/hexpat-0.20.13.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-#hackport: flags: bundle:bundled-expat
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bundled-expat"
-
-RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?]
-	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	!bundled-expat? ( dev-libs/expat )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bundled-expat bundle)
-}
diff --git a/dev-haskell/hexpat/hexpat-0.20.9.ebuild b/dev-haskell/hexpat/hexpat-0.20.9.ebuild
deleted file mode 100644
index f3a90906c97f..000000000000
--- a/dev-haskell/hexpat/hexpat-0.20.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.6:=[profile?]
-	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hexpat/metadata.xml b/dev-haskell/hexpat/metadata.xml
deleted file mode 100644
index 686f514d51ef..000000000000
--- a/dev-haskell/hexpat/metadata.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name='bundled-expat'> Use bundled expat instead of <pkg>dev-libs/expat</pkg></flag>
-	</use>
-	<longdescription>
-		This package provides a general purpose Haskell XML library using Expat to
-		do its parsing (&lt;http://expat.sourceforge.net/&gt; - a fast stream-oriented XML
-		parser written in C).  It is extensible to any string type, with @String@,
-		@ByteString@ and @Text@ provided out of the box.
-		
-		Basic usage: Parsing a tree (/Tree/), formatting a tree (/Format/).
-		Other features: Helpers for processing XML trees (/Proc/), trees annotated with
-		XML source location (/Annotated/), extended XML trees with comments,
-		processing instructions, etc (/Extended/), XML cursors (/Cursor/),
-		SAX-style parse (/SAX/), and access to the low-level interface in case speed
-		is paramount (/Internal.IO/).
-		
-		The design goals are speed, speed, speed, interface simplicity and modularity.
-		
-		For introduction and examples, see the /Text.XML.Expat.Tree/ module. For benchmarks,
-		&lt;http://haskell.org/haskellwiki/Hexpat/&gt;
-		
-		If you want to do interactive I\/O, an obvious option is to use lazy parsing
-		with one of the lazy I\/O functions such as hGetContents.  However, this can be
-		problematic in some applications because it doesn't handle I\/O errors properly
-		and can give no guarantee of timely resource cleanup.  In these cases, chunked
-		I\/O is a better approach: Take a look at the /hexpat-enumerator/ package.
-		
-		/IO/ is filed under /Internal/ because it's low-level and most users won't want
-		it.  The other /Internal/ modules are re-exported by /Annotated/, /Tree/ and /Extended/,
-		so you won't need to import them directly.
-		
-		Credits to Iavor Diatchki and the @xml@ (XML.Light) package for /Proc/ and /Cursor/.
-		Thanks to the many contributors.
-		
-		BOUND VS. UNBOUND THREADS: GHC (at least versions 6.12.X) will spawn threads
-		if you call a safe FFI callback from an unbound thread.  This can get out of
-		control in a busy application.  To avoid this, from version 0.19.1 we now delegate
-		processing to a single worker thread if the calling thread is not bound.
-		This essentially means that hexpat currently won't exploit multicores very well.
-		It also means that hexpat may be more efficient on threads spawned with forkOS
-		(to give you a bound thread) rather than forkIO.
-		
-		ChangeLog: 0.15 changes intended to fix a (rare) \"error: a C finalizer called back into Haskell.\"
-		that seemed only to happen only on ghc6.12.X; 0.15.1 Fix broken Annotated parse;
-		0.16 switch from mtl to transformers; 0.17 fix mapNodeContainer &amp; rename some things.;
-		0.18 rename defaultEncoding to overrideEncoding. 0.18.3 formatG and indent were demanding list
-		items more than once (inefficient in chunked processing); 0.19 add Extended.hs;
-		0.19.1 fix a memory leak introduced in 0.19, delegate parsing to bound thread
-		if unbound (see note above); 0.19.2 include expat source code so \'cabal install\' just works
-		on Linux, Mac and Windows (thanks Jacob Stanley); 0.19.3 fix misconfiguration of expat
-		which broke entity parsing; 0.19.4 bump version constraint for text; 0.19.5 bump text
-		to &lt; 0.12 and fix text-0.10.0.1 breakage; 0.19.6 dependency breakage with List;
-		0.19.7 ghc-7.2.1 compatibility; 0.19.8 fix space leak on lazy parse under ghc-7.2.1
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hgettext/Manifest b/dev-haskell/hgettext/Manifest
deleted file mode 100644
index 693aab14f595..000000000000
--- a/dev-haskell/hgettext/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hgettext-0.1.30.tar.gz 6289 BLAKE2B 1da585c19bdf8882249b22cbf9d65056b6b5856d4207578f48aeabbebb9ef68fdfff2cc29d275c74b42a0e1e54edbc4652a7cbaba1bcf59a2c6e52502636440c SHA512 f37c580e4e0e60691b86a6fa392e2809ef132d394507879adec2bd498bf0f678217d88475f261a1d359d36ffbd08e6177194a65872854d14f8f9d071f2f91af9
diff --git a/dev-haskell/hgettext/hgettext-0.1.30.ebuild b/dev-haskell/hgettext/hgettext-0.1.30.ebuild
deleted file mode 100644
index 0f991459b2f5..000000000000
--- a/dev-haskell/hgettext/hgettext-0.1.30.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to libintl.h (gettext, bindtextdomain)"
-HOMEPAGE="https://github.com/vasylp/hgettext"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
-	dev-haskell/haskell-src-exts:=[profile?]
-	dev-haskell/setlocale:=[profile?]
-	dev-haskell/uniplate:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/hgettext/metadata.xml b/dev-haskell/hgettext/metadata.xml
deleted file mode 100644
index 2f5aa808eec0..000000000000
--- a/dev-haskell/hgettext/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Bindings to libintl.h (gettext, bindtextdomain)
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vasylp/hgettext</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hi-file-parser/Manifest b/dev-haskell/hi-file-parser/Manifest
deleted file mode 100644
index 39e834a4ea0c..000000000000
--- a/dev-haskell/hi-file-parser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hi-file-parser-0.1.0.0.tar.gz 9344 BLAKE2B 4fc453a2a14c43b59ca060cfe69464693fbb3e2368919a1ccb7a01e3853d8706ae86c4d674fa28b66ef454af1092b303f1e57d774992aeee3519014d1a100a9f SHA512 e101c99486839d8c28a3a1fa7fddb0cc8287298f587affaf90cccfa517adaf84b570af8d28faae16201271e0d27059fdbac5740f429e9f4f341f760d5d9d0b5f
diff --git a/dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild b/dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild
deleted file mode 100644
index 86a7e0ea8fcd..000000000000
--- a/dev-haskell/hi-file-parser/hi-file-parser-0.1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parser for GHC's hi files"
-HOMEPAGE="https://github.com/commercialhaskell/stack#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/rio-0.1.9.2:=[profile?]
-	>=dev-haskell/vector-0.12.0.1:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( >=dev-haskell/hspec-2.4.8 )
-"
diff --git a/dev-haskell/hi-file-parser/metadata.xml b/dev-haskell/hi-file-parser/metadata.xml
deleted file mode 100644
index f51f432d327b..000000000000
--- a/dev-haskell/hi-file-parser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see the README on Github at &lt;https://github.com/commercialhaskell/stack/blob/master/subs/hi-file-parser/README.md&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/highlighting-kate/Manifest b/dev-haskell/highlighting-kate/Manifest
deleted file mode 100644
index 36c48f7e0b52..000000000000
--- a/dev-haskell/highlighting-kate/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST highlighting-kate-0.5.14.tar.gz 865527 BLAKE2B 655c3e2e3239d1074bb64c05f492e0d43c1a1206e8d3ebc0c39f42fc4d9d339b8b1806586772f5d83a65d5c7d50e2c714201e3a4d1f4edaf4366a46bc1c2efd2 SHA512 da2d1a5940357c3e067e51119fb6d209b42ea76828ed90bf4feeea099eeb844d53498dad6ef0d833c903db4d39e63dc4cbc2ebd913b51e41af3799a32d2c3b89
-DIST highlighting-kate-0.5.5.tar.gz 668017 BLAKE2B 7c57c27495aab3125325a35b384999bda688674ff4085fa7b1403e0993b3e6aec1412203d83fef07988836f7904fc480ddde266fd0335dc76c4fc347b2585017 SHA512 50c24f0a7f247ff1c5410aa31b270851c88cc3c24480da332c0a344c6959a7f8748dad4650374844b36eccee0824c991797d8327bf2b15ae055918acf129bd95
-DIST highlighting-kate-0.6.1.tar.gz 913389 BLAKE2B 4730b4c641e3a90255449c629cfefb75c89aebf121511688cb6630a3dbe0803a02a6dc8a6d6aacdff1634d23bb2e8e7f5904c66f693691585a71651ebee49e75 SHA512 c7b0696acaee1e7679582dde6da0bd0d46a573955249d4b6b1455ac9f29839daaf0dd9c7f2b2229d335d24fd512c802e268cd96b9b6ca2a7509490b1e66ab774
-DIST highlighting-kate-0.6.2.tar.gz 919467 BLAKE2B 15bcdd28afc9347869d96a92d4b07f6145751f64c7dd18cd94b318ee726b067b9b2819a1166b57db55d1f46690645a1509dfb3b1c06cdabdf4605b1ce1b8481e SHA512 b6574957352800d359f184b91f145623b7370e3e1e92ead79c5c6c5ed7a13b85e09e6f17a4d1af2b2628e30f6f34859143dfcc226b5d6f0e5d8a2fe5022c0924
-DIST highlighting-kate-0.6.3.tar.gz 905495 BLAKE2B 0849b39ddd3f1e0e0cf3885fb8261c0e5bc5815acf832f8b225b3e1b75c429ec03de86508b9d1e5aed9ae19ba321de712e01142c72ec35b13f2861e6d3005b73 SHA512 0927c28038a17270513e82ee40efda2cba6b081a80a2060d96b2a0b27291f19d9f28fd1dbceccf5e1def9cd8f5d372700239cb760738523c95c30c5b4342260e
-DIST highlighting-kate-0.6.4.tar.gz 913575 BLAKE2B d38ec3618e6703dddd5e6f568942d72749e93b56ea92bf64eabf3159c2d1b8b17f5607bcb0acda6fbe7918bf4a785207a422d74db7d3e392de3fb3b8a5924c62 SHA512 19b0c81f2465c499f3fed6a7124382ee01820bcd2f4073a374b92ae3f7e5ab5f247d8d676183e0eda2c8bb7edffde3561e19bb8a395c230658c93146e8f0d544
-DIST highlighting-kate-0.6.tar.gz 922847 BLAKE2B b523ba1ef469845bcd8d45994e40552ff672cf701bca3be63cb9c98d46b3c867d464f7f2a421102cf91ce3e483527b9d892194eb43aeaed97bbcc4dfda8891e5 SHA512 2042e22299735e49e45cb34f2807f883da91c98ca3fd37cd1698f5d1cfea49df79cfb8da6ac9664aba0629c5500e6cd9e9c812d897f59b9bd75b2a5cd5c12933
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.5.14.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.5.14.ebuild
deleted file mode 100644
index d28287c878b7..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.5.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild
deleted file mode 100644
index eb49402b0e76..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?]
-		<dev-haskell/blaze-html-0.7:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		pcre-light? ( =dev-haskell/pcre-light-0.4*:=[profile?]
-		)
-		!pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?]
-		)"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.1.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.1.ebuild
deleted file mode 100644
index 1af61606b39f..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.2.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.2.ebuild
deleted file mode 100644
index badab5941959..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.3.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.3.ebuild
deleted file mode 100644
index 0bc60b85c97c..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild
deleted file mode 100644
index 9ba7c8ba3cf7..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild
deleted file mode 100644
index d28287c878b7..000000000000
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Syntax highlighting"
-HOMEPAGE="https://github.com/jgm/highlighting-kate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable pcre-light"
-
-RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	pcre-light? ( >=dev-haskell/pcre-light-0.4:=[profile?] <dev-haskell/pcre-light-0.5:=[profile?] )
-	!pcre-light? ( >=dev-haskell/regex-pcre-builtin-0.94.4.8.8.35:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/diff )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag pcre-light pcre-light)
-}
diff --git a/dev-haskell/highlighting-kate/metadata.xml b/dev-haskell/highlighting-kate/metadata.xml
deleted file mode 100644
index 06830317afe1..000000000000
--- a/dev-haskell/highlighting-kate/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		highlighting-kate is a syntax highlighting library
-		with support for nearly one hundred languages. The syntax
-		parsers are automatically generated from Kate
-		syntax descriptions (&lt;http://kate-editor.org/&gt;),
-		so any syntax supported by Kate can be added.
-		An (optional) command-line program is provided, along
-		with a utility for generating new parsers from Kate
-		XML syntax descriptions.
-	</longdescription>
-	<use>
-		<flag name="executable">Build the Highlight executable.</flag>
-		<flag name="pcre-light">Use the pcre-light library instead of regex-pcre-builtin.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jgm/highlighting-kate</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hinotify/Manifest b/dev-haskell/hinotify/Manifest
index d61c77299b19..95a2682af8f0 100644
--- a/dev-haskell/hinotify/Manifest
+++ b/dev-haskell/hinotify/Manifest
@@ -1,2 +1,2 @@
 DIST hinotify-0.3.10.tar.gz 9193 BLAKE2B 877f98091412732656913f7af9e29e34088d240ac88214afd237e2994730f119a80db3960f27ad3a024026dcd8bb232853412aa314f416555e27886f87fda64a SHA512 d22f40bb055e14fd4be6669122a11b36fd7c5a989489d1b8c1e4117672b9f1700197a827f23242c91504b8236c349a4494adf724827001a77a1abdc11a9d6b8b
-DIST hinotify-0.3.8.1.tar.gz 8344 BLAKE2B 6258434aaa02faf35e96c8b1ce8c5bb66bdab2abbfa0689706a657f18cb374a6fbeb83762cbf58dfde6716cecf1b67a07fa2b6e02b3d6d589a7b879066e83617 SHA512 965484ed676985303e0e559985d80e37af3d1cd0d7a0bb111679ba2ac1ead4c541a409630bb679ab70e33c0e2dcb070e17b162ff8a967c65e438ec071b756f87
+DIST hinotify-0.4.1.tar.gz 9173 BLAKE2B c9baafdb64167f1d4ceb82bb072ee56fd0d9d893b321a8f50c3f125ee2756dddbe7372dbf1eeb8f44ce98e07adaf47e531b07ee0df7332fa141d825d11e4e12d SHA512 2f4627a3604ac6ec5d745ba6f4fd11e39a094ad54a5ab4d5040fe6c7c2a8823e42be575b9be95dc6848db99b421bac70798f8eb5f9ba6841f06f6156afe8797b
diff --git a/dev-haskell/hinotify/hinotify-0.3.10.ebuild b/dev-haskell/hinotify/hinotify-0.3.10.ebuild
index 83094c3897a5..b95364639d11 100644
--- a/dev-haskell/hinotify/hinotify-0.3.10.ebuild
+++ b/dev-haskell/hinotify/hinotify-0.3.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Haskell binding to inotify"
-HOMEPAGE="https://github.com/kolmodin/hinotify.git"
+HOMEPAGE="https://github.com/kolmodin/hinotify"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/async-2.0:=[profile?] <dev-haskell/async-2.3:=[profile?]
diff --git a/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild b/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild
deleted file mode 100644
index 02721e631934..000000000000
--- a/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell binding to inotify"
-HOMEPAGE="https://github.com/kolmodin/hinotify.git"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hinotify/hinotify-0.4.1.ebuild b/dev-haskell/hinotify/hinotify-0.4.1.ebuild
new file mode 100644
index 000000000000..60b1686af667
--- /dev/null
+++ b/dev-haskell/hinotify/hinotify-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell binding to inotify"
+HOMEPAGE="https://github.com/kolmodin/hinotify"
+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/async-2:=[profile?] <dev-haskell/async-3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/hinotify/metadata.xml b/dev-haskell/hinotify/metadata.xml
index 162bc3660228..2b3b0f1989b1 100644
--- a/dev-haskell/hinotify/metadata.xml
+++ b/dev-haskell/hinotify/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">kolmodin/hinotify.git</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kolmodin/hinotify</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hit/Manifest b/dev-haskell/hit/Manifest
deleted file mode 100644
index 99895faea16e..000000000000
--- a/dev-haskell/hit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hit-0.6.3.tar.gz 38690 BLAKE2B 928a532cacb2393b46b9e5abeee6d66bf140e9e4a71f359b8a35016f97db4eeb32f4efb6c56d74528d3311ae4d6477716670c14ae6ad7361a7892575185dd336 SHA512 82ccfeb77a439caa1792f1ae29535636764be9e6e94f75973f37a86db6627a492e57da835954384ef8468799de9f0897e20905f65dad256fe3547a4248d5fffc
diff --git a/dev-haskell/hit/hit-0.6.3.ebuild b/dev-haskell/hit/hit-0.6.3.ebuild
deleted file mode 100644
index 8751b75ec770..000000000000
--- a/dev-haskell/hit/hit-0.6.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Git operations in haskell"
-HOMEPAGE="https://github.com/vincenthz/hit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug executable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	>=dev-haskell/hourglass-0.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/patience:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/system-fileio:=[profile?]
-	dev-haskell/system-filepath:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( >=dev-haskell/hashable-1.2:=[profile?]
-			dev-haskell/hashtables:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/bytedump-1.0
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/hit/metadata.xml b/dev-haskell/hit/metadata.xml
deleted file mode 100644
index aeb520f51526..000000000000
--- a/dev-haskell/hit/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		An haskell implementation of git storage operations, allowing users
-		to manipulate git repositories (read and write).
-
-		This implementation is fully interoperable with the main C implementation.
-
-		This is stricly only manipulating the git store (what's inside the .git directory),
-		and doesn't do anything with the index or your working directory files.
-	</longdescription>
-	<use>
-		<flag name="executable">Build the executable</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/hjsmin/Manifest b/dev-haskell/hjsmin/Manifest
index 7df27dcfe8fb..0f0f75ea03d4 100644
--- a/dev-haskell/hjsmin/Manifest
+++ b/dev-haskell/hjsmin/Manifest
@@ -1,3 +1,2 @@
-DIST hjsmin-0.1.5.1.tar.gz 116938 BLAKE2B fbf3f19f5c137c74dc7d98e29fa2481bfdf7e8fa775a3c9537c6c46afcd91fcf53fa77c2c7e2a8291998c10e6e03312d322bc080d69aa5fa37236cd1a67c739d SHA512 e157246de9d80f6ca877d9eda185bb37a2ea0cb41fa147f387abd9050d0c5c8deee54a3caff5da82a3207672465908c9814dc6fdbb70e8fd77095af1257d2ae2
-DIST hjsmin-0.2.0.2.tar.gz 4211 BLAKE2B c6f81e0a3d5ec30da1bb83d7e7c396175ae3e1cb1810f13eed0c27351e808e37bab3dbf4678e1c84575449177a3269ef76d8c09d553b3bdbd01fc6bdbf686702 SHA512 ffd67972cef49b5026995e9852e603035513e18089df9f77c35ec084ee3487904018aea018a08408ab53f441aa5200efdd7f5a28191cd814c5e2fc91c2552902
 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
diff --git a/dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch b/dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch
new file mode 100644
index 000000000000..ce994c7588f1
--- /dev/null
+++ b/dev-haskell/hjsmin/files/hjsmin-0.2.0.4-fix-tests.patch
@@ -0,0 +1,29 @@
+From 9605b913e6aed7fa3d40aa9925975b506d3a0eb0 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Wed, 1 Mar 2023 14:13:58 -0700
+Subject: [PATCH] Fix tests
+
+Tests assume a 'dist-newstyle' directory (e.g. cabal-v2) when we
+actually have a 'dist' directory.
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ test/test-cli.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-cli.hs b/test/test-cli.hs
+index a97e1b7..7691587 100644
+--- a/test/test-cli.hs
++++ b/test/test-cli.hs
+@@ -18,7 +18,7 @@ main = do
+   IO.hSetBuffering IO.stderr LineBuffering
+ 
+   cwd <- getCurrentDirectory
+-  topdir <- canonicalizePath $ cwd </> "dist-newstyle"
++  topdir <- canonicalizePath $ cwd </> "dist"
+ 
+   -- Set an environment variable for all the exectuables we want to test.
+   setExecutableEnvVar "HJSMIN" topdir "hjsmin"
+-- 
+2.39.2
+
diff --git a/dev-haskell/hjsmin/hjsmin-0.1.5.1.ebuild b/dev-haskell/hjsmin/hjsmin-0.1.5.1.ebuild
deleted file mode 100644
index b86a969070e2..000000000000
--- a/dev-haskell/hjsmin/hjsmin-0.1.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell implementation of a javascript minifier"
-HOMEPAGE="https://github.com/erikd/hjsmin"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
-	>=dev-haskell/language-javascript-0.5.14:=[profile?] <dev-haskell/language-javascript-0.6:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.2.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.2.ebuild
deleted file mode 100644
index 0034ceb5851b..000000000000
--- a/dev-haskell/hjsmin/hjsmin-0.2.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell implementation of a javascript minifier"
-HOMEPAGE="https://github.com/erikd/hjsmin"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
-	>=dev-haskell/language-javascript-0.6:=[profile?] <dev-haskell/language-javascript-0.7:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
index e74f3c315fb3..85827564b153 100644
--- a/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
+++ b/dev-haskell/hjsmin/hjsmin-0.2.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.1
 
@@ -14,11 +14,15 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 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/hjsmin/hjsmin-0.2.1.ebuild b/dev-haskell/hjsmin/hjsmin-0.2.1.ebuild
new file mode 100644
index 000000000000..d34c0a0ac0e8
--- /dev/null
+++ b/dev-haskell/hjsmin/hjsmin-0.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell implementation of a javascript minifier"
+HOMEPAGE="https://github.com/erikd/hjsmin"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.0.4-fix-tests.patch"
+)
+
+CABAL_CHDEPS=(
+	'text                    >= 2' 'text                    >= 1.2.5.0'
+)
+
+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.5.0:=[profile?]
+	>=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.6.3.0
+	test? ( dev-haskell/extra )
+"
+
+src_prepare() {
+	# Tests need exec permissions on these files
+	local files=(
+		"test/cli/minimal-input/run"
+		"test/cli/empty-input/run"
+	)
+	chmod -v +x "${files[@]}"
+
+	haskell-cabal_src_prepare
+}
diff --git a/dev-haskell/hjsmin/metadata.xml b/dev-haskell/hjsmin/metadata.xml
index a9dfd41191a5..3ae810a2ce4b 100644
--- a/dev-haskell/hjsmin/metadata.xml
+++ b/dev-haskell/hjsmin/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Reduces size of javascript files by stripping out extraneous whitespace and
-		other syntactic elements, without changing the semantics.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">alanz/hjsmin</remote-id>
+		<remote-id type="hackage">hjsmin</remote-id>
+		<remote-id type="github">erikd/hjsmin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest
deleted file mode 100644
index b5094d40065f..000000000000
--- a/dev-haskell/hlint/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST hlint-1.8.57.tar.gz 79071 BLAKE2B 5c538ecd36a22d879b0746fa0f3df3715e7d8f85407ff3375f4b850256eb125d0dd01d875fe6babe8c912b62402da7fd88df6d05194e5501c449f9230f33b500 SHA512 1fca029067cf34f9d024640fbacfc455e733adb239e339471131b014c3d5cab671e5c267d855d1df7dd76440dab45a8981502dd840073005a4e5c50d177f91da
-DIST hlint-1.9.21.tar.gz 88802 BLAKE2B 08708331c50b73433c7fde7c826d976126f7bdd758722f6a8903d18d45da6d9ffcd32b883036f17c74165feb0245199e2e248fee9701c01153736d62f73b9494 SHA512 e7e87aba3905bb577d952a960a92038816bf057ed19aa85cff0deaa653a9c248b6a4b44b907024ad271abf615ab94ebac6f4801c77f545cadbddf0db57f13ad8
-DIST hlint-1.9.35.tar.gz 97402 BLAKE2B ea3bb516769c496be4943ab57a37bde97e1a03fca56dd6c9bdc3da30ac86b1b0538796e868de85049d28fa8286bfd45e0f1fb960e15cf12294bdb74dab08f926 SHA512 14daa5ad5652f93b3e3c4d5cff1df3735755c1561c2eb6c7ae3d05401d4a253ccba87d0cb5d09e690ce1a30f0352a26839856dd648bb10a13013cb43aed28606
-DIST hlint-2.1.17.tar.gz 119243 BLAKE2B 09d70dffdaec25e8f574fb4dd1f6012828cc8032e38b9275a676b836bff0a86e331ac4e7780618001931622e985ad4a9bd799267b06dee059f3f1b28b33bdf16 SHA512 b0a78fa970bcf2b74d969e1825dee1c7382fb5cebc47f3c752f3b3d5915905943dff21e36f8c0158e3bd10696c4785a2c86a2e1abfcf72b610ab2b564f3be5f3
diff --git a/dev-haskell/hlint/files/60hlint-gentoo.el b/dev-haskell/hlint/files/60hlint-gentoo.el
deleted file mode 100644
index 990d5a89b5fb..000000000000
--- a/dev-haskell/hlint/files/60hlint-gentoo.el
+++ /dev/null
@@ -1,7 +0,0 @@
-
-;; hlint emacs integration site initialisation
-(add-to-list 'load-path "@SITELISP@")
-(require 'hs-lint)
-(defun hlint-haskell-mode-hook ()
-   (local-set-key "\C-cl" 'hs-lint))
-(add-hook 'haskell-mode-hook 'hlint-haskell-mode-hook)
diff --git a/dev-haskell/hlint/hlint-1.8.57.ebuild b/dev-haskell/hlint/hlint-1.8.57.ebuild
deleted file mode 100644
index 20dddcc621fc..000000000000
--- a/dev-haskell/hlint/hlint-1.8.57.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="http://community.haskell.org/~ndm/hlint/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs"
-
-RDEPEND=">=dev-haskell/cpphs-1.11:=[profile?]
-	>=dev-haskell/haskell-src-exts-1.14:=[profile?] <dev-haskell/haskell-src-exts-1.15:=[profile?]
-	>=dev-haskell/hscolour-1.17:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-	cabal_src_configure \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/hlint-1.9.21.ebuild b/dev-haskell/hlint/hlint-1.9.21.ebuild
deleted file mode 100644
index b69731516182..000000000000
--- a/dev-haskell/hlint/hlint-1.9.21.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="http://community.haskell.org/~ndm/hlint/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +gpl"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/cmdargs-0.10:=[profile?]
-	>=dev-haskell/cpphs-1.18.1:=[profile?]
-	>=dev-haskell/extra-0.5:2=[profile?]
-	>=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-
-	haskell-cabal_src_configure \
-		$(cabal_flag gpl gpl) \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/hlint-1.9.35.ebuild b/dev-haskell/hlint/hlint-1.9.35.ebuild
deleted file mode 100644
index 6ee0f0185d98..000000000000
--- a/dev-haskell/hlint/hlint-1.9.35.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="https://github.com/ndmitchell/hlint#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +gpl"
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/cmdargs-0.10:=[profile?]
-	>=dev-haskell/cpphs-1.20.1:=[profile?]
-	>=dev-haskell/extra-1.4.9:2=[profile?]
-	>=dev-haskell/haskell-src-exts-1.17:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	>=dev-haskell/refact-0.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-
-	haskell-cabal_src_configure \
-		$(cabal_flag gpl gpl) \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/hlint-2.1.17-r1.ebuild b/dev-haskell/hlint/hlint-2.1.17-r1.ebuild
deleted file mode 100644
index e725b17cfa22..000000000000
--- a/dev-haskell/hlint/hlint-2.1.17-r1.ebuild
+++ /dev/null
@@ -1,82 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Source code suggestions"
-HOMEPAGE="https://github.com/ndmitchell/hlint#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +gpl"
-
-RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?]
-	>=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/cmdargs-0.10:=[profile?]
-	>=dev-haskell/cpphs-1.20.1:=[profile?]
-	>=dev-haskell/data-default-0.3:=[profile?]
-	>=dev-haskell/extra-1.6.6:=[profile?]
-	dev-haskell/haskell-src-exts:1.21=[profile?]
-	>=dev-haskell/haskell-src-exts-util-0.2.5:=[profile?]
-	>=dev-haskell/refact-0.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/uniplate-1.5:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/yaml-0.5.0:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_configure() {
-	local threaded_flag=""
-	if $(ghc-supports-threaded-runtime); then
-		threaded_flag="--flags=threaded"
-	else
-		threaded_flag="--flags=-threaded"
-	fi
-
-	haskell-cabal_src_configure \
-		$(cabal_flag gpl gpl) \
-		$threaded_flag
-}
-
-src_compile() {
-	cabal_src_compile
-
-	use emacs && elisp-compile data/hs-lint.el
-}
-
-src_install() {
-	cabal_src_install
-
-	if use emacs; then
-		elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed."
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doman data/hlint.1
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-haskell/hlint/metadata.xml b/dev-haskell/hlint/metadata.xml
deleted file mode 100644
index d9589665f744..000000000000
--- a/dev-haskell/hlint/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HLint gives suggestions on how to improve your source code.
-	</longdescription>
-	<use>
-		<flag name="gpl">Use GPL libraries, specifically hscolour.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ndmitchell/hlint</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hoauth2/Manifest b/dev-haskell/hoauth2/Manifest
deleted file mode 100644
index c6128d2f3fae..000000000000
--- a/dev-haskell/hoauth2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hoauth2-0.4.8.tar.gz 8599 BLAKE2B 9cfaf6bf26937a5b3e9e03489843cd9173aea20d4360bfbbdbb9e083f7ec0c2191f19b6c8b86f07d5216c8fa064558183203d0f3d05e8390afb2a7d3a2f82455 SHA512 b2abf00d0ae7d15911f4a1e17d90d6f0b3931800bc66d77545c566fc64de527cfc86121b57a4ff4187a4a0aa81aea2e150412bf928fdec8e506ab24f9e1bea29
-DIST hoauth2-0.5.7.tar.gz 12245 BLAKE2B 641c30f90c4420c40e0c73397d5a830c1b9f24095bf31108531303fbfc8d56e4a614a09c2e2fdc11204521d2299faf2c15fd8dc6a0541627c0804ce485cd8bc6 SHA512 218c5cb722861af099efa1cf66025b3fbdaba3574b19fbe39db5bb3ca8431c8436329b9bf9cd7a642227e2bca964843bba6b94cb70d5020321b3f743cc020569
-DIST hoauth2-1.8.9.tar.gz 16766 BLAKE2B ee95c10f571815683989f05e64539012b04009f6ee967d62ab6ed40c09d4a7f555f144452eb1a137f9a5f9d79077d8eac042c20bd9199356b8092eaaa46f1475 SHA512 c77f66f54310dea587de5d0f5a37c4d113881705a80b525a9180c94a3eae9d9d8a691ec3759bfd7681f467a633a2692df2e4ef69b6919b5147ee5546c9b49aa4
diff --git a/dev-haskell/hoauth2/hoauth2-0.4.8.ebuild b/dev-haskell/hoauth2/hoauth2-0.4.8.ebuild
deleted file mode 100644
index e376ae7ccc4a..000000000000
--- a/dev-haskell/hoauth2/hoauth2-0.4.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell OAuth2 authentication"
-HOMEPAGE="https://github.com/freizl/hoauth2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/http-conduit-2.0:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/hoauth2/hoauth2-0.5.7.ebuild b/dev-haskell/hoauth2/hoauth2-0.5.7.ebuild
deleted file mode 100644
index 027127aaccd9..000000000000
--- a/dev-haskell/hoauth2/hoauth2-0.5.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell OAuth2 authentication client"
-HOMEPAGE="https://github.com/freizl/hoauth2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/http-conduit-2.2:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?]
-	>=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test
-}
diff --git a/dev-haskell/hoauth2/hoauth2-1.8.9.ebuild b/dev-haskell/hoauth2/hoauth2-1.8.9.ebuild
deleted file mode 100644
index 0d8f917b5795..000000000000
--- a/dev-haskell/hoauth2/hoauth2-1.8.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell OAuth2 authentication client"
-HOMEPAGE="https://github.com/freizl/hoauth2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.3.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/exceptions-0.8.3:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
-	>=dev-haskell/http-types-0.11:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
-	>=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5:=[profile?]
-	>=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?]
-	>=dev-haskell/uri-bytestring-aeson-0.1:=[profile?] <dev-haskell/uri-bytestring-aeson-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test
-}
diff --git a/dev-haskell/hoauth2/metadata.xml b/dev-haskell/hoauth2/metadata.xml
deleted file mode 100644
index 409b57ebc713..000000000000
--- a/dev-haskell/hoauth2/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell OAuth2 authentication.
-		
-		Tested following services
-		
-		* google web oauth: &lt;https://developers.google.com/accounts/docs/OAuth2WebServer&gt;
-		
-		* weibo oauth2: &lt;http://open.weibo.com/wiki/Oauth2&gt;
-		
-		* github oauth: &lt;https://developer.github.com/v3/oauth/&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">freizl/hoauth2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hostname/hostname-1.0-r1.ebuild b/dev-haskell/hostname/hostname-1.0-r1.ebuild
index a8867875f3d8..382f6315397e 100644
--- a/dev-haskell/hostname/hostname-1.0-r1.ebuild
+++ b/dev-haskell/hostname/hostname-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="A a cross-platform means of determining the hostname"
-HOMEPAGE="http://hackage.haskell.org/package/hostname"
+HOMEPAGE="https://hackage.haskell.org/package/hostname"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hostname/metadata.xml b/dev-haskell/hostname/metadata.xml
index b7878815d80d..937381521944 100644
--- a/dev-haskell/hostname/metadata.xml
+++ b/dev-haskell/hostname/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/hourglass/Manifest b/dev-haskell/hourglass/Manifest
index 4c10368f1658..d6b0655fd07d 100644
--- a/dev-haskell/hourglass/Manifest
+++ b/dev-haskell/hourglass/Manifest
@@ -1,2 +1 @@
 DIST hourglass-0.2.12.tar.gz 25797 BLAKE2B c833a2cfd1686f43a9ed101570a962255d813e6f169ce23d8dabd59f405c4ea091d8d9d08b118fe191cece215457bc034c419ebb6bc1d45fc684e43ea113d921 SHA512 c748d7f875ca0b1ea9034dba1a5cfa3fc4e51613ce24c90b54856fdc385d9ccc5eda3559f1674abf3ea966cc7851891dfee86bad897062a97a79db8408574bdc
-DIST hourglass-0.2.9.tar.gz 24919 BLAKE2B f4b1332a72a887c3c72eaf41086059a6156a609e3386d66a475191ef5d864fb53499b05713deec751f991f110e24d0dce51de1314cc846a145b356c18cee613b SHA512 ba6ee78b900139e8267a4bd9676abc2189e6c581225c5718c6f753515b1b7037ee4f8197f6910cc8ef769110234ec1cef7b3af0d1c6c7cef93bd87c81c7f57d4
diff --git a/dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch b/dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch
new file mode 100644
index 000000000000..f9a62ed78904
--- /dev/null
+++ b/dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch
@@ -0,0 +1,30 @@
+From 803fc360e3aa7a772ee7fd5bd7a81c8a21f99c38 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Mon, 27 Feb 2023 13:44:09 -0700
+Subject: [PATCH] Fix tests for >=time-1.10
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ tests/Tests.hs | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/Tests.hs b/tests/Tests.hs
+index d400032..309eb84 100644
+--- a/tests/Tests.hs
++++ b/tests/Tests.hs
+@@ -210,7 +210,12 @@ tests knowns = testGroup "hourglass"
+         [ testProperty "iso8601 date" $ \(e :: Elapsed) ->
+             let fmt = calTimeFormatTimeISO8601 (elapsedToPosixTime e)
+                 ed1  = localTimeParseE ISO8601_Date fmt
++#if MIN_VERSION_time(0,10,0)
++                md2  = T.parseTimeM False T.defaultTimeLocale fmt "%F"
++#else
+                 md2  = T.parseTime T.defaultTimeLocale fmt "%F"
++#endif
++
+              in case (ed1,md2) of
+                     (Left err, Nothing)       -> error ("both cannot parse: " ++ show fmt ++ " hourglass-err=" ++ show err)
+                     (Left err, Just _)        -> error ("error parsing string: " ++ show err)
+-- 
+2.39.2
+
diff --git a/dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild b/dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild
new file mode 100644
index 000000000000..c75f291fc8b9
--- /dev/null
+++ b/dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="simple performant time related library"
+HOMEPAGE="https://github.com/vincenthz/hs-hourglass"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.12-time-1_10-fix.patch"
+)
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		dev-haskell/old-locale
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+	)
+"
diff --git a/dev-haskell/hourglass/hourglass-0.2.12.ebuild b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
index 60cfa4cc7cfe..0e63606ac731 100644
--- a/dev-haskell/hourglass/hourglass-0.2.12.ebuild
+++ b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,10 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+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/hourglass/hourglass-0.2.9.ebuild b/dev-haskell/hourglass/hourglass-0.2.9.ebuild
deleted file mode 100644
index f19e3b0eb8a7..000000000000
--- a/dev-haskell/hourglass/hourglass-0.2.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="simple performant time related library"
-HOMEPAGE="https://github.com/vincenthz/hs-hourglass"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/mtl
-		dev-haskell/old-locale
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/hourglass/metadata.xml b/dev-haskell/hourglass/metadata.xml
index aeb2e0a19f66..0a81fcfb89e9 100644
--- a/dev-haskell/hourglass/metadata.xml
+++ b/dev-haskell/hourglass/metadata.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Simple time library focusing on simple but powerful and performant API
-		
-		The backbone of the library are the Timeable and Time type classes.
-		
-		Each Timeable instances can be converted to type that has a Time instances,
-		and thus are different representations of current time.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">hourglass</remote-id>
 		<remote-id type="github">vincenthz/hs-hourglass</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hpack/Manifest b/dev-haskell/hpack/Manifest
deleted file mode 100644
index fffe72baea40..000000000000
--- a/dev-haskell/hpack/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hpack-0.14.1.tar.gz 38373 BLAKE2B d5c3b900e3e2fd852081934f4a7b4a327f4647608ceecf76ac65faf4e464bed7428e4b444f7b06f8a0e7661458e1817aedaaa2ea2dd8161a362be9f596f7f0be SHA512 5bd7b5335aef1a3d866c07937e457397c82235c99b578b6270b699895b9a5d39259eef324e6741af9a6e296bfe56587fc9888dc0fc2e4bd6fe99bbc74a7e0b04
-DIST hpack-0.33.0.tar.gz 60260 BLAKE2B 555178af9cc84e8c0dcf55890908933c9d17d3c7d45d3ec0d309a4e561bf4ea2eb7fbacae7cff232215de59dad3e36734d03f0d574c28d891bdb5c68c1113b45 SHA512 8d70bea1c18e9a26fe137f6e20fec4af28dff6ebc50981d2f57ad9a8e0b9574ff158adb5ba16597b6a5f0e4d843c09fee57dd82407dc1383b1e07453b64d010b
diff --git a/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch b/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch
deleted file mode 100644
index a4b3fd1f4b6a..000000000000
--- a/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/Hpack/Config.hs b/src/Hpack/Config.hs
-index cb84f71..5566b8c 100644
---- a/src/Hpack/Config.hs
-+++ b/src/Hpack/Config.hs
-@@ -101,3 +101,9 @@ githubBaseUrl = "https://github.com/"
- 
--genericParseJSON_ :: forall a. (Generic a, GFromJSON (Rep a), HasTypeName a) => Value -> Parser a
-+#if MIN_VERSION_aeson(1,0,0)
-+#    define AESON_ARITY Zero
-+#else
-+#    define AESON_ARITY
-+#endif
-+
-+genericParseJSON_ :: forall a. (Generic a, GFromJSON AESON_ARITY (Rep a), HasTypeName a) => Value -> Parser a
- genericParseJSON_ = genericParseJSON defaultOptions {fieldLabelModifier = hyphenize name}
-diff --git a/test/Hpack/ConfigSpec.hs b/test/Hpack/ConfigSpec.hs
-index 320ba9a..d13d932 100644
---- a/test/Hpack/ConfigSpec.hs
-+++ b/test/Hpack/ConfigSpec.hs
-@@ -971,3 +971,3 @@ spec = do
-             |]
--          readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: failed to parse field executables: The key \"main\" was not found")
-+          readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: key \"main\" not present")
- 
diff --git a/dev-haskell/hpack/hpack-0.14.1.ebuild b/dev-haskell/hpack/hpack-0.14.1.ebuild
deleted file mode 100644
index cb1770d7b30a..000000000000
--- a/dev-haskell/hpack/hpack-0.14.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An alternative format for Haskell packages"
-HOMEPAGE="https://github.com/sol/hpack#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/base-compat-0.8:=[profile?]
-	dev-haskell/glob:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/aeson-0.10
-		dev-haskell/aeson-qq
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		dev-haskell/interpolate
-		>=dev-haskell/mockery-0.3
-		dev-haskell/quickcheck
-		dev-haskell/temporary )
-"
-
-PATCHES=("${FILESDIR}"/${P}-aeson-1.patch)
diff --git a/dev-haskell/hpack/hpack-0.33.0.ebuild b/dev-haskell/hpack/hpack-0.33.0.ebuild
deleted file mode 100644
index da9f5c70e109..000000000000
--- a/dev-haskell/hpack/hpack-0.33.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An alternative format for Haskell packages"
-HOMEPAGE="https://github.com/sol/hpack#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.4.3.0:=[profile?]
-	dev-haskell/bifunctors:=[profile?]
-	>=dev-haskell/cabal-2.2:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	>=dev-haskell/glob-0.9.0:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	dev-haskell/http-client-tls:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/infer-license-0.2.0:=[profile?] <dev-haskell/infer-license-0.3:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/yaml-0.10.0:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		>=dev-haskell/hunit-1.6.0.0
-		dev-haskell/interpolate
-		>=dev-haskell/mockery-0.3
-		dev-haskell/quickcheck
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/hpack/metadata.xml b/dev-haskell/hpack/metadata.xml
deleted file mode 100644
index acec350af770..000000000000
--- a/dev-haskell/hpack/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		An alternative format for Haskell packages
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hps/Manifest b/dev-haskell/hps/Manifest
deleted file mode 100644
index 5ee8b81b7b5e..000000000000
--- a/dev-haskell/hps/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hps-0.15.tar.gz 12111 BLAKE2B 24dc23e3315f69bab6975b4b091c026c91a478b6d9c4cf220d4cea527a72522b0ef17dceeab5d7907c9f598268d2e1e7dfcd4849740615bdfa0667fe936c9738 SHA512 19b86161b46d523357863acbbdc8b7311e9f6b286429dbf1f56e044ced578d7c7026315d02b50ef831b3bce412ca623082956039181e832fb766e30729ea27c6
diff --git a/dev-haskell/hps/files/hps-0.15-ghc84.patch b/dev-haskell/hps/files/hps-0.15-ghc84.patch
deleted file mode 100644
index cbc67705459a..000000000000
--- a/dev-haskell/hps/files/hps-0.15-ghc84.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Graphics/PS/PS.hs
-+++ b/Graphics/PS/PS.hs
-@@ -14,2 +14,3 @@ import qualified Graphics.PS.Paper as P
- import qualified Graphics.PS.Image as I
-+import qualified Data.Semigroup as S
- 
-@@ -248,2 +249,6 @@ newtype MonadMonoid m = MonadMonoid {appMonadMonoid :: m ()}
- 
-+instance Monad m => S.Semigroup (MonadMonoid m) where
-+   (<>) (MonadMonoid a) (MonadMonoid b) =
-+      MonadMonoid (a >> b)
-+
- instance Monad m => Monoid (MonadMonoid m) where
---- a/Graphics/PS/Statistics.hs
-+++ b/Graphics/PS/Statistics.hs
-@@ -6,2 +6,3 @@ import Graphics.PS.Image
- import Graphics.PS.Path
-+import qualified Data.Semigroup as S
- 
-@@ -16,2 +17,8 @@ data Statistics = Statistics {nMoveTo :: Integer
- 
-+instance S.Semigroup Statistics where
-+    (<>) p q =
-+        let (Statistics m1 l1 c1 f1 g1 t1) = p
-+            (Statistics m2 l2 c2 f2 g2 t2) = q
-+        in Statistics (m1+m2) (l1+l2) (c1+c2) (f1+f2) (g1+g2) (t1+t2)
-+
- instance Monoid Statistics where
diff --git a/dev-haskell/hps/hps-0.15.ebuild b/dev-haskell/hps/hps-0.15.ebuild
deleted file mode 100644
index ca36c1bdc7f8..000000000000
--- a/dev-haskell/hps/hps-0.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Postscript"
-HOMEPAGE="https://hackage.haskell.org/package/hps"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-exec"
-
-RDEPEND=">=dev-haskell/hcg-minus-0.15:=[profile?] <dev-haskell/hcg-minus-0.16:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	build-exec? ( dev-haskell/random:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ghc84.patch
-)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-exec build-exec)
-}
diff --git a/dev-haskell/hps/metadata.xml b/dev-haskell/hps/metadata.xml
deleted file mode 100644
index d47195469b5a..000000000000
--- a/dev-haskell/hps/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="build-exec">Build the `hps-fractals' executable</flag>
-	</use>
-	<longdescription>
-		Haskell library partially implementing the
-		postscript drawing model.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hs-bibutils/Manifest b/dev-haskell/hs-bibutils/Manifest
deleted file mode 100644
index 9a8e45a92cca..000000000000
--- a/dev-haskell/hs-bibutils/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hs-bibutils-5.5.tar.gz 499546 BLAKE2B c2a83885bf09f9a2b774fba30456e2e0931a37fc77626ac006edf70cbb305253ee254aa09da43d18e525a2d02d282d940c32e2cb0d1395c436ef41cf79880b33 SHA512 cee3c3500213d93b424bf3fd36a6b4657aec3a2787373a55bfee7f4de25e43a801ed68bdb815ba57ca8ecfe2d352e406e43baf40339fba79a061180fa4ab628c
-DIST hs-bibutils-6.8.0.0.tar.gz 751679 BLAKE2B 8e229e6e15ccfe576cc9cf4a8fb44eaaa10bddc5d3e6f13d0fae9f5934eea0817504a1b96d8c131c65502a49e8f4050382d520b8a874a95b1b834dd376a59f6a SHA512 2e19f570e962b6a76ceb08a34eee8ad2533dee06cc2de0860a0b8d4ad02601dc00679ab2292e63a612cd6f0dd939d18c7c80a1493f0e24e05c992cc23c93e27d
diff --git a/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild b/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild
deleted file mode 100644
index 3e9c695d7ff8..000000000000
--- a/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to bibutils, the bibliography conversion utilities"
-HOMEPAGE="http://istitutocolli.org/repos/hs-bibutils/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.4
-"
diff --git a/dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild b/dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.ebuild
deleted file mode 100644
index a545227c809c..000000000000
--- a/dev-haskell/hs-bibutils/hs-bibutils-6.8.0.0.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.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to bibutils, the bibliography conversion utilities"
-HOMEPAGE="https://github.com/wilx/hs-bibutils"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16
-"
diff --git a/dev-haskell/hs-bibutils/metadata.xml b/dev-haskell/hs-bibutils/metadata.xml
deleted file mode 100644
index cc5b5145105c..000000000000
--- a/dev-haskell/hs-bibutils/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell bindings to Chris Putnam's bibutils, a
-		library that interconverts between various
-		bibliography formats using a common MODS-format
-		XML intermediate.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hs3/Manifest b/dev-haskell/hs3/Manifest
deleted file mode 100644
index 19135755b956..000000000000
--- a/dev-haskell/hs3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hS3-0.5.9.tar.gz 19981 BLAKE2B 085c09739c666b658f0fcf2e82cd7bd7c1fd033d29490a7a6754c43ecaaf495ce914a2c987d2fd852b95b2714cabbf9d6106cd9a3b9c92daceb9b70f46832191 SHA512 30a3393f28a6ddd930cda1b866527ead9be59d376c2a6c3123eab3278a996602307612f3eaf126b36ef4a09c65784b842442ff09caafbf605474b42b6582c79d
diff --git a/dev-haskell/hs3/hs3-0.5.9.ebuild b/dev-haskell/hs3/hs3-0.5.9.ebuild
deleted file mode 100644
index 28e59fc71f17..000000000000
--- a/dev-haskell/hs3/hs3-0.5.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="hS3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Interface to Amazon's Simple Storage Service (S3)"
-HOMEPAGE="https://gregheartsfield.com/hS3/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/crypto-4.1.0:=[profile?]
-	dev-haskell/dataenc:=[profile?]
-	>=dev-haskell/http-4000.0.0:=[profile?]
-	>=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?]
-	>=dev-haskell/missingh-0.18.6:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?]
-			<dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/hs3/metadata.xml b/dev-haskell/hs3/metadata.xml
deleted file mode 100644
index f5992552813d..000000000000
--- a/dev-haskell/hs3/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is the Haskell S3 library.  It provides an
-		interface to Amazon's Simple Storage Service (S3), allowing Haskell
-		developers to reliably store and retrieve arbitrary amounts of
-		data from anywhere on the Internet.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/hsb2hs/Manifest b/dev-haskell/hsb2hs/Manifest
deleted file mode 100644
index a1b13e4083b2..000000000000
--- a/dev-haskell/hsb2hs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hsb2hs-0.2.tar.gz 2341 BLAKE2B e66860951d395913ce3fa2874d1d42f9522ec59b7fb49c24378ac1fd9ac25fa08ab6b9d03bdeb7e6586650aa137e2461eb43586e166ef686ec6d4b68895d9a5b SHA512 d5150ee9914a4916b5162b704a29c23e2c8562c773226b2b2f017304cdd4ce55872f8c7e9be7a5385acc31711f622e74c508bdc40ba1d22981b0e8aec5e4e516
-DIST hsb2hs-0.3.1.tar.gz 2387 BLAKE2B 747ad23761939c543d067a031869528b55149bc7c01bb417d107d4be2c61726d286798b174805469f176dfd74c003534feec92ee0aba27aee9ce4e5a9bf55900 SHA512 3be89ccfee5b10e604434943ba22476c4cba2e9f4c57e169fd3674d4a46250c8d4c35edcb46ff5509ccfca80ec7d45a594008791970d15256864abfdf29381e1
diff --git a/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild b/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
deleted file mode 100644
index 13bd0f7e9e14..000000000000
--- a/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Preprocesses a file, adding blobs from files as string literals"
-HOMEPAGE="https://hackage.haskell.org/package/hsb2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	>dev-haskell/preprocessor-tools-1.0
-	>=dev-lang/ghc-7.4.1
-"
diff --git a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild b/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
deleted file mode 100644
index b8bc788b616c..000000000000
--- a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Preprocesses a file, adding blobs from files as string literals"
-HOMEPAGE="https://hackage.haskell.org/package/hsb2hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">dev-haskell/preprocessor-tools-1.0:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hsb2hs/metadata.xml b/dev-haskell/hsb2hs/metadata.xml
deleted file mode 100644
index ffccae0e3680..000000000000
--- a/dev-haskell/hsb2hs/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		hsb2hs is a preprocessor that allows you to include the contents of
-		files as string literals in your Haskell programs and libraries.
-		It is an alternative to file-embed for those who do not want to rely
-		on Template Haskell.  See @README.markdown@ for instructions.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hscolour/Manifest b/dev-haskell/hscolour/Manifest
index 4b5c9ca0dc1b..756c65f19d51 100644
--- a/dev-haskell/hscolour/Manifest
+++ b/dev-haskell/hscolour/Manifest
@@ -1,5 +1,2 @@
-DIST hscolour-1.20.3.tar.gz 25810 BLAKE2B 28a394ab9f90ac4a7d311e1aa7e4f41c55b26e51e02a72ed3d869d1d9dae566c7a70f3e15c136cbb538f56c303c0a5083d4f725ce2fc6f9cadf27d21b1b563a6 SHA512 759f0a3c3c36b48db7932477468f1c5de8fddec654010dbbd0d136e0f8a8f4e3c34bc9349467766a1cb90ffb56b950ee6b7926f4f62dcb68f8e048e2c212d853
-DIST hscolour-1.22.tar.gz 25979 BLAKE2B 42d974c9ffe439010df53d88c0b71397869eef64765eb60554e5bce060492a780d4bea8eeb805f271ac2b62ad4060bf5dee96f69ebe90caa9f62a572d8266207 SHA512 9762599fb4eef8f68a0a40ddfc8e7f50eb8592b1b3d7e4c8177f23f08300264c80a73dbedbe954fbcb9ff3fe1b80497b131e3f8d9adb8c1697d7195d48ef69a0
-DIST hscolour-1.23.tar.gz 26027 BLAKE2B 4dba77d61aff026f515d47c0cf84bd747b28f5d00739986f8a877171860835610812b8e1827879f8bad118bb7234ccfddccc8651c819696841a35ee3229f1b48 SHA512 a1525e0827bc399c0747898c814ad4b7947620c610e6ec579afa120ddb5f1d012f7f10547f09dd10e0bba9cd89cd220ab204ee0e40c37f0048c7222db04de23f
 DIST hscolour-1.24.4.tar.gz 28729 BLAKE2B fdda7f784e35ff165981de53df5535b3294f5dbd5d1f484bcd34a20bfde014ddc9a916f20fae639420eca8cd4577f683d0e799459e846aabcc7cb4290b7035d2 SHA512 39b631c0a8346beff1c2e02ca8e72c1b1e3f7dafcedad7dc9de274e6750501de2bc553fe72a7d3459d4f9797e916f27e28ff96f705c2c0f9d3e0eec0ac6182c7
-DIST hscolour-1.24.tar.gz 26057 BLAKE2B b11a4b8506ee49e845519cc44ee19b5fbc196fd07132cb6999f361870a58991c0f22e288696cbfdcfbaee95dba9e2580e8f878fda3122a5bfe0f1b46c7818fa9 SHA512 c191375ccbda80d6f7271cff69648151fe6142e72d9a47cfba71176ab89cb9740a008020e1a48a106d5f10516eec03ed68ca7610736f6ab6fba84f85fedb0fb7
+DIST hscolour-1.25.tar.gz 28695 BLAKE2B c413533a6adac73a94d837aac9d1294e339e138a972e31bc3feb47b1ef3c1f96d7d09a46f72e336a112c91986b6a783c59f9066ec8454355780a52615f77f338 SHA512 00a9b679ae0fa13f3ad873991a1d1af953fb84cc2127387a014eaa8697265dc672c3c286b24a75e07c47b6c96a829aede6ef0e0d5f5939117821654319dc6c6c
diff --git a/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild b/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
deleted file mode 100644
index 3342231607ff..000000000000
--- a/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-# disabled haddock as there is USE="doc hscolour" case with circular depends
-CABAL_FEATURES="bin lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure --ghc-options=-rtsopts
-}
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/hscolour-1.22.ebuild b/dev-haskell/hscolour/hscolour-1.22.ebuild
deleted file mode 100644
index e1b2746a89ee..000000000000
--- a/dev-haskell/hscolour/hscolour-1.22.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-# disabled haddock as there is USE="doc hscolour" case with circular depends
-CABAL_FEATURES="bin lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure --ghc-options=-rtsopts
-}
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
deleted file mode 100644
index 8deeec625d30..000000000000
--- a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	# llvm-general-pure passes rtsopts
-	haskell-cabal_src_configure --ghc-options=-rtsopts
-}
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/hscolour-1.24.4.ebuild b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
index bc3802e68d53..cb3a73c25842 100644
--- a/dev-haskell/hscolour/hscolour-1.24.4.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.24.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -32,6 +32,7 @@ src_configure() {
 src_install() {
 	cabal_src_install
 	if use doc; then
-		dohtml hscolour.css
+		docinto html
+		dodoc hscolour.css
 	fi
 }
diff --git a/dev-haskell/hscolour/hscolour-1.24.ebuild b/dev-haskell/hscolour/hscolour-1.24.ebuild
deleted file mode 100644
index 710eece99da8..000000000000
--- a/dev-haskell/hscolour/hscolour-1.24.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="Colourise Haskell code"
-HOMEPAGE="http://code.haskell.org/~malcolm/hscolour/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	# llvm-general-pure passes rtsopts
-	haskell-cabal_src_configure --ghc-options=-rtsopts
-}
-
-src_install() {
-	cabal_src_install
-	if use doc; then
-		dohtml hscolour.css
-	fi
-}
diff --git a/dev-haskell/hscolour/hscolour-1.25.ebuild b/dev-haskell/hscolour/hscolour-1.25.ebuild
new file mode 100644
index 000000000000..7ab96d0275bd
--- /dev/null
+++ b/dev-haskell/hscolour/hscolour-1.25.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle"
+# avoid Cabal dependency as it's a dependency of most packages
+# including cabal depends.
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Colourise Haskell code"
+HOMEPAGE="https://code.haskell.org/~malcolm/hscolour/"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+"
+
+src_configure() {
+	# llvm-general-pure passes rtsopts
+	haskell-cabal_src_configure --ghc-options=-rtsopts
+}
+
+src_install() {
+	cabal_src_install
+	if use doc; then
+		docinto html
+		dodoc hscolour.css
+	fi
+}
diff --git a/dev-haskell/hscolour/metadata.xml b/dev-haskell/hscolour/metadata.xml
index 522384de8446..1194f4d00e90 100644
--- a/dev-haskell/hscolour/metadata.xml
+++ b/dev-haskell/hscolour/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">hscolour</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hslogger/Manifest b/dev-haskell/hslogger/Manifest
index 7c282332a295..14d8586dd9eb 100644
--- a/dev-haskell/hslogger/Manifest
+++ b/dev-haskell/hslogger/Manifest
@@ -1,3 +1,2 @@
-DIST hslogger-1.2.10.tar.gz 35889 BLAKE2B 68f18236cfe19ad1f5b6fd8b9fc32dc571fe7aca730c5210863aedc88e32b1094e939c8825730fbf901fc1993c595ed0711f3d2efb041c789d674e4dcdb93723 SHA512 c2e3c6e7c8598aca2a18e507defa7536db7fdf15265b900401f8558b3259cd770531a3a302d6eb9ecca63a9629f0d5796e1ec94d8f21ecf153a1fc49f889183a
-DIST hslogger-1.2.9.tar.gz 35576 BLAKE2B 56c3a917d2db7207d29c304b00a237b7d62a4f8f07d72f7b1ce834d3e60bb55f825173cd8894d2063973df4095ef3409a2c1aabb99d89257a5d8562d58add76b SHA512 6315dd7e6d6769a6a8fb8576b54875fbe79860d1e3158ddbca7f15b286f13b59cf7e817ac5325f31ae82e8f5328d32f22ee6aa37f5ae11e9070f209454ec801c
+DIST hslogger-1.3.1.0-rev7.cabal 2978 BLAKE2B 6886f8313f486b6dfe978ea2e6e12567e85c58e7eb74fc0a221136fc31dbe3b923d5fbb6eb617e95b71b354a367343d556be9db4713d48139cc658ca76f9277e SHA512 22de818ce0c2c9ecdff3a2415ff98b7b3f49dec5b8d16a613357f69ef5d7468441ef2f57428f79a9189f96558a0c27610994aceb6998417f6c62a4256290aa3e
 DIST hslogger-1.3.1.0.tar.gz 37468 BLAKE2B 24bb750c356f071ee35cc84e01b2483f612b6e7403fe8fe60b8af148dba43107660a36a0e30305666fb76af1939ff00f6817dff98720ab7eef321192e6e87976 SHA512 a08e7c85efe2b3f97e87b54db993f78ac31380f9b6f8d926517854771f482b2c64c358ddd12a449a413e5af0f374c034161b6f772148835b50551dc2cdbfa15a
diff --git a/dev-haskell/hslogger/hslogger-1.2.10.ebuild b/dev-haskell/hslogger/hslogger-1.2.10.ebuild
deleted file mode 100644
index 4e91774a751a..000000000000
--- a/dev-haskell/hslogger/hslogger-1.2.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -test,-buildtests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Versatile logging framework"
-HOMEPAGE="http://software.complete.org/hslogger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-buildtests \
-		--flag=-test
-}
diff --git a/dev-haskell/hslogger/hslogger-1.2.9.ebuild b/dev-haskell/hslogger/hslogger-1.2.9.ebuild
deleted file mode 100644
index e9023bbe4ec8..000000000000
--- a/dev-haskell/hslogger/hslogger-1.2.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Versatile logging framework"
-HOMEPAGE="http://software.complete.org/hslogger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="buildtests"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildtests buildtests)
-}
diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r1.ebuild
deleted file mode 100644
index b91fd077bbf5..000000000000
--- a/dev-haskell/hslogger/hslogger-1.3.1.0-r1.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.4.9999
-#hackport: flags: -test,-buildtests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Versatile logging framework"
-HOMEPAGE="https://github.com/hvr/hslogger/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+network-3"
-
-RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
-				>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
-	!network-3? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( || ( ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.4 )
-			( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-buildtests \
-		$(cabal_flag network-3 network--gt-3_0_0) \
-		--flag=-test
-}
diff --git a/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
new file mode 100644
index 000000000000..abf50952cace
--- /dev/null
+++ b/dev-haskell/hslogger/hslogger-1.3.1.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -test,-buildtests,+network--gt-3_0_0
+
+CABAL_HACKAGE_REVISION=7
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Versatile logging framework"
+HOMEPAGE="https://github.com/haskell-hvr/hslogger/wiki"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND="
+	>=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2
+	>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9
+	=dev-haskell/old-locale-1.0*:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		|| (
+			( =dev-haskell/hunit-1.3* )
+			( =dev-haskell/hunit-1.6* )
+		)
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-buildtests \
+		--flag=network--gt-3_0_0 \
+		--flag=-test
+}
diff --git a/dev-haskell/hslogger/metadata.xml b/dev-haskell/hslogger/metadata.xml
index 08447e480706..13cea5a1ec27 100644
--- a/dev-haskell/hslogger/metadata.xml
+++ b/dev-haskell/hslogger/metadata.xml
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="buildtests">Build the executable to run unit tests.</flag>
-		<flag name="network-3">Use network-3</flag>
-	</use>
-	<longdescription>
-		hslogger is a logging framework for Haskell, roughly similar to
-		Python's logging module.
-		
-		hslogger lets each log message have a priority and source be associated
-		with it.  The programmer can then define global handlers that route
-		or filter messages based on the priority and source.  hslogger also
-		has a syslog handler built in.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">jgoerzen/hslogger</remote-id>
+		<remote-id type="hackage">hslogger</remote-id>
+		<remote-id type="github">haskell-hvr/hslogger</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hslua-aeson/Manifest b/dev-haskell/hslua-aeson/Manifest
new file mode 100644
index 000000000000..3ee1acd921ac
--- /dev/null
+++ b/dev-haskell/hslua-aeson/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-aeson-2.2.0.tar.gz 5881 BLAKE2B 00d630f676c32dd55bf66d43c01075412f453d76731d96baf1c894fff7fb122795039e46e4a8180ef1335c3a42b1a7a2e3a17766b697dfea7a5dcd6df2cd38ee SHA512 c11a94d29ba89ebcc403f41935a5338a7e77893a659beb7ce6c34644baf8d0ed03bb5651c99e873a240047673e20e3ec759b190b7419de4706796c014517d66e
+DIST hslua-aeson-2.3.0.1.tar.gz 7182 BLAKE2B 652ea54204a2e6270db1d6b371abcca260f0b8314a4ed5cf4bfb6f63a67c7a9dcc5d0db8b076826c13cba2fe1be3c0b41c37a00a6f0459189fea56e7c7e41fdc SHA512 0934ba51a554f8f889340d6f28739028c07ac26e935bd68cea85d6221b0092531f41a0c28bb99d47c0725b4947dcf4742c25f42fe3cc4ef7553158f92a7e06a5
diff --git a/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild b/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild
new file mode 100644
index 000000000000..3599f023e784
--- /dev/null
+++ b/dev-haskell/hslua-aeson/hslua-aeson-2.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Allow aeson data types to be used with Lua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.5:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-aeson/hslua-aeson-2.3.0.1.ebuild b/dev-haskell/hslua-aeson/hslua-aeson-2.3.0.1.ebuild
new file mode 100644
index 000000000000..659aa951d90a
--- /dev/null
+++ b/dev-haskell/hslua-aeson/hslua-aeson-2.3.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Allow aeson data types to be used with Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.5:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
+	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-aeson/metadata.xml b/dev-haskell/hslua-aeson/metadata.xml
new file mode 100644
index 000000000000..88d90360b9fb
--- /dev/null
+++ b/dev-haskell/hslua-aeson/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-aeson</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-classes/Manifest b/dev-haskell/hslua-classes/Manifest
new file mode 100644
index 000000000000..619f5a842fa4
--- /dev/null
+++ b/dev-haskell/hslua-classes/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-classes-2.2.0.tar.gz 11614 BLAKE2B 4fddbdd4c130562e961c627ae6a0201362036df846f18b03293d237a9b658157d8e607b5cf840ad793724dfde308e240c299a3633d185e75a40b9e9dbedf0852 SHA512 21d9da7fca86123cf1f6ac339b2453393bd97c052eb9b5ab75bf06a56fc0ff81593e30c88082aab5eb767816c479e975622b01f78e3df13ed476710d424f48c7
+DIST hslua-classes-2.3.0.tar.gz 11579 BLAKE2B b8b61a058b160060438f1d39f8024d98cdac934d7e2107ff71d8b9cea3a0945c6c8556a9c2ccd4a6c1e863a280be52a7a6454ecee58eedf34cbbc4f1717d4302 SHA512 07daa9b31bf4d3c8ec24bff67219cdcaf58ec56d45ac4c1b000aceccbbd90a79748f6786497c3a79e7c2670442859e1f31b200455cf2b26eb0dc4d699f9345ba
diff --git a/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild b/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild
new file mode 100644
index 000000000000..d41aa9607953
--- /dev/null
+++ b/dev-haskell/hslua-classes/hslua-classes-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type classes for HsLua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hslua-1.0
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-classes/hslua-classes-2.3.0.ebuild b/dev-haskell/hslua-classes/hslua-classes-2.3.0.ebuild
new file mode 100644
index 000000000000..91609b23db75
--- /dev/null
+++ b/dev-haskell/hslua-classes/hslua-classes-2.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type classes for HsLua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hslua-1.0
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-classes/metadata.xml b/dev-haskell/hslua-classes/metadata.xml
new file mode 100644
index 000000000000..b71394be1af6
--- /dev/null
+++ b/dev-haskell/hslua-classes/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-classes</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-cli/Manifest b/dev-haskell/hslua-cli/Manifest
new file mode 100644
index 000000000000..f3ccb8b9f597
--- /dev/null
+++ b/dev-haskell/hslua-cli/Manifest
@@ -0,0 +1 @@
+DIST hslua-cli-1.4.1.tar.gz 5856 BLAKE2B 80f949f9f4146bda9d391d9fe959b817c4cb79c5c75dc9bdee00548d36f14789b78fb7b7022bc9120e249de693cedf72e2acff7a85f3a2fe35d46c2a05b79f36 SHA512 799715a478bd3ee2f5b5c4aa1d5daa2126bacf7d4315855800ce5c4c189bcb340836af614fe22dabbb88f53d0fb509d7f71636ff079c8fce007d6d12032e1639
diff --git a/dev-haskell/hslua-cli/hslua-cli-1.4.1.ebuild b/dev-haskell/hslua-cli/hslua-cli-1.4.1.ebuild
new file mode 100644
index 000000000000..605153581f9c
--- /dev/null
+++ b/dev-haskell/hslua-cli/hslua-cli-1.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Command-line interface for Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/hslua-repl-0.1:=[profile?] <dev-haskell/hslua-repl-0.2:=[profile?]
+	>=dev-haskell/lua-2.3:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/hslua-cli/metadata.xml b/dev-haskell/hslua-cli/metadata.xml
new file mode 100644
index 000000000000..06ebc2e67d14
--- /dev/null
+++ b/dev-haskell/hslua-cli/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<use>
+		<flag name="executable">Compile `hslua` standalone executable.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">hslua-cli</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-core/Manifest b/dev-haskell/hslua-core/Manifest
new file mode 100644
index 000000000000..9dffd7138958
--- /dev/null
+++ b/dev-haskell/hslua-core/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-core-2.2.0.tar.gz 36808 BLAKE2B 02cbb94ea562fbaac9c2eb9445150f6f79a345ab15b2062aa7900d18c671ad0104a0ad3abe6603a38ddb40a9fa59cd13f4892d73c7dba4baff5727a9211fa503 SHA512 cb2f8b76b44432698624aac3d425be7a0c068bec1d41cd8a13b75854ed15fc614de5a0aee46c1092ef22b0e6b706a931188879d97354c01c37aa47a334baf5f3
+DIST hslua-core-2.3.1.tar.gz 39580 BLAKE2B db54e9ba24ae17762ce153af9db9e7838579264c90457df15f3dc39cf7942cb6c617dee9bf2c94cada5433fc85107ba7650c10a162c4ee06b40fd478c08ae60f SHA512 840ab7f7a17c34ec00c84b3b7ae80a9c0842ac117d61f938fb8900c0685a41d91006d154898b04e69eb9cd79d08e0e1d8f53e464e6038f08fe15b9570bbad947
diff --git a/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild b/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild
new file mode 100644
index 000000000000..2e32e5bd91df
--- /dev/null
+++ b/dev-haskell/hslua-core/hslua-core-2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/lua-2.2:=[profile?] <dev-haskell/lua-2.3:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-core/hslua-core-2.3.1.ebuild b/dev-haskell/hslua-core/hslua-core-2.3.1.ebuild
new file mode 100644
index 000000000000..418a570aa0d6
--- /dev/null
+++ b/dev-haskell/hslua-core/hslua-core-2.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/lua-2.3.1:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-core/metadata.xml b/dev-haskell/hslua-core/metadata.xml
new file mode 100644
index 000000000000..2b850d9e5612
--- /dev/null
+++ b/dev-haskell/hslua-core/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-core</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-list/Manifest b/dev-haskell/hslua-list/Manifest
new file mode 100644
index 000000000000..e99a2da9c3d4
--- /dev/null
+++ b/dev-haskell/hslua-list/Manifest
@@ -0,0 +1 @@
+DIST hslua-list-1.1.1.tar.gz 8004 BLAKE2B 8936a36fe6d0dd173fd432e4bd38318ef86d020667f32f211c1204327a76b96ce60140e897c27049fac554b474a07bc0fbbfd6760147fdf18913fb9c63c900b1 SHA512 1b9cc115503239fda71e290e05a42cb0d475b88d59767f67e89775dc4a47ad63245b632e0facc21fb275b4a6098e09d402b0497d1107db01c63579d9a4f0f43a
diff --git a/dev-haskell/hslua-list/hslua-list-1.1.1.ebuild b/dev-haskell/hslua-list/hslua-list-1.1.1.ebuild
new file mode 100644
index 000000000000..025ec711d706
--- /dev/null
+++ b/dev-haskell/hslua-list/hslua-list-1.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Opinionated, but extensible Lua list type"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-lua-1.0 )
+"
diff --git a/dev-haskell/hslua-list/metadata.xml b/dev-haskell/hslua-list/metadata.xml
new file mode 100644
index 000000000000..d45dfd379164
--- /dev/null
+++ b/dev-haskell/hslua-list/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-list</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-marshalling/Manifest b/dev-haskell/hslua-marshalling/Manifest
new file mode 100644
index 000000000000..d562173d702a
--- /dev/null
+++ b/dev-haskell/hslua-marshalling/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-marshalling-2.2.0.tar.gz 16488 BLAKE2B f5aa47ecb431c5ea2308e16f0e4568fe7ba979e4f08901fd85c1c4c7e516c9b1a59e42f58a93db6dc113646e4ab826c13ed0e669972ea8980aabe9ad41828244 SHA512 80436b67fa73a970bcbcf4b8684187ec81590030c0cd38b4feb28e9a719c32f2b0f3cd1288b03f19b130112037e47ccb9585015d7f806ce6dcfe3b12abb7bd51
+DIST hslua-marshalling-2.3.0.tar.gz 17214 BLAKE2B 08d4828bf1ac9dbefa48b1e04cdcacbdcbfc0e847a0de62f0fc327aa746121cdd33b4fac55fb5a83a5e84db5d5b22d9d89a04a7df37798ebed93c921a02d29fe SHA512 b5ebc33f4f4e5b5dd60de60a9bf73cf97b040674a0c0c5a0815f5dada18745061559abf7bfc1cfe5034d0f27ee967eadc9dc287c064d8ff593e3cedb01b771fd
diff --git a/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild b/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild
new file mode 100644
index 000000000000..3da02cd1b7bc
--- /dev/null
+++ b/dev-haskell/hslua-marshalling/hslua-marshalling-2.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Marshalling of values between Haskell and Lua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		dev-haskell/tasty-hslua
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-marshalling/hslua-marshalling-2.3.0.ebuild b/dev-haskell/hslua-marshalling/hslua-marshalling-2.3.0.ebuild
new file mode 100644
index 000000000000..b3ebed5a4d8a
--- /dev/null
+++ b/dev-haskell/hslua-marshalling/hslua-marshalling-2.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Marshalling of values between Haskell and Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		dev-haskell/tasty-hslua
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-marshalling/metadata.xml b/dev-haskell/hslua-marshalling/metadata.xml
new file mode 100644
index 000000000000..0f7290f0f208
--- /dev/null
+++ b/dev-haskell/hslua-marshalling/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-marshalling</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-module-doclayout/Manifest b/dev-haskell/hslua-module-doclayout/Manifest
new file mode 100644
index 000000000000..c408f8b838b2
--- /dev/null
+++ b/dev-haskell/hslua-module-doclayout/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-module-doclayout-1.0.4.tar.gz 10184 BLAKE2B 232b48b77ade823c53f3f46db7e227506d7a175bb1393a84cfed1af799d2761ec0742a26a5746ef03c7bb7b81347f34b34de657b84868cbd07d119f47b39bf52 SHA512 2a72e3bf2ccc407ac3208e256216cff4d8b6c80f1378c859c2361e5d932f5e513283a234902221f295db3cdb73cadecd164e59cc7a06d493b3227372b218d0da
+DIST hslua-module-doclayout-1.1.0.tar.gz 10294 BLAKE2B 63f1f8372d8e7a4175422bd67273800951b41f2e5c1cb6d653fcb2dcf4a148fdd3d9eff211061e14229936985c428d0318260323b334807f50a67db75fbb4fe3 SHA512 f9fd8120492b5c2a9d62140bb1e9fed586611b3cc994616732d6ff22975f44771969cae272a02b99608dc46b50e336f4e6c10f4c80862b9cb5b04446f9dfab4f
diff --git a/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild b/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild
new file mode 100644
index 000000000000..59819de34573
--- /dev/null
+++ b/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module wrapping Text.DocLayout"
+HOMEPAGE="https://github.com/hslua/hslua-module-doclayout"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/doclayout-0.2:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+	>=dev-haskell/hslua-2.1:=[profile?] <dev-haskell/hslua-2.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.1.0.ebuild b/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.1.0.ebuild
new file mode 100644
index 000000000000..ed5a168aaa95
--- /dev/null
+++ b/dev-haskell/hslua-module-doclayout/hslua-module-doclayout-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module wrapping Text.DocLayout"
+HOMEPAGE="https://github.com/hslua/hslua-module-doclayout"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/doclayout-0.2:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+	>=dev-haskell/hslua-2.3:=[profile?] <dev-haskell/hslua-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		>=dev-haskell/tasty-lua-1.1 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-doclayout/metadata.xml b/dev-haskell/hslua-module-doclayout/metadata.xml
new file mode 100644
index 000000000000..567263939b8b
--- /dev/null
+++ b/dev-haskell/hslua-module-doclayout/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-module-doclayout</remote-id>
+		<remote-id type="github">hslua/hslua-module-doclayout</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-module-path/Manifest b/dev-haskell/hslua-module-path/Manifest
new file mode 100644
index 000000000000..c4a40d1ce0d5
--- /dev/null
+++ b/dev-haskell/hslua-module-path/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-module-path-1.0.2.tar.gz 7991 BLAKE2B 4cb4ce417cca440185099c003f83c7baf402fb90e00d044bae4b395465083f6f04102c40f06d4e20e581fb3ddf965bb90ef551087d3aeaa12806b43e1266a2ad SHA512 57387757b5adbc52f39d3a9d6eb2bc5f0d59ef054b88a4c61541a38bd07793635c7b54212ef4e720dc5d1604054242175fc28b332bd20480461eb274c8a23b76
+DIST hslua-module-path-1.1.0.tar.gz 8040 BLAKE2B d8f24d0c80e98986563a521bcaeadb0a1ccc55e81b7f7571ef2e2a1164bfeb8b568c6322fd0f6b496afd8fcda33705016155a5308a32c6564874586f58b8da2a SHA512 0cef760dc73fd1a84cb79a6efbbd1e17c677fd6bae86cb410d324d1a6fbb63c876c59508a2da0ac02e888faf4bc28dcad661e058c928d2e572fa4d9a4edbddc0
diff --git a/dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild b/dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild
new file mode 100644
index 000000000000..1c59f8123c62
--- /dev/null
+++ b/dev-haskell/hslua-module-path/hslua-module-path-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module to work with file paths"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-path/hslua-module-path-1.1.0.ebuild b/dev-haskell/hslua-module-path/hslua-module-path-1.1.0.ebuild
new file mode 100644
index 000000000000..66366c77d6bc
--- /dev/null
+++ b/dev-haskell/hslua-module-path/hslua-module-path-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module to work with file paths"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-path/metadata.xml b/dev-haskell/hslua-module-path/metadata.xml
new file mode 100644
index 000000000000..54c3028e99ca
--- /dev/null
+++ b/dev-haskell/hslua-module-path/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-module-path</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-module-system/Manifest b/dev-haskell/hslua-module-system/Manifest
index 60559694bce2..bf2e979d5723 100644
--- a/dev-haskell/hslua-module-system/Manifest
+++ b/dev-haskell/hslua-module-system/Manifest
@@ -1 +1,2 @@
-DIST hslua-module-system-0.2.1.tar.gz 6339 BLAKE2B 0019478bf29dac977ff5124e77765eac86876879514e0346a6126574b8ca948a89a66f8417842c45357124e2990e2394275be886b43db59e05ea9065dd2b6b5b SHA512 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b
+DIST hslua-module-system-1.0.2.tar.gz 8488 BLAKE2B 433f7aefcdcc3ad6ea04192718d0a8891d4a845e6e1585da7b15b98299574b6e53391b4b5e44dc2e8ca28a5c46486ea067d390df664ea237fe1675282a4b057a SHA512 921c5098f5f5ea4483ed787de68824cd316c5c202a7387bfdc23969f7b6fa30782cc946f34137d44870e921c2d9c7aebbf67ff3cfbf158585a42e2ba38ac5963
+DIST hslua-module-system-1.1.0.1.tar.gz 8930 BLAKE2B 51baa74a331185ed02435a51e8e91cd35bb55799d7db7571a3276f78b333f701b1ef7dc264a9ef12a05428427cfa89f299cc64d833a1fafacb94e6d91ee5917b SHA512 1406a59187a98c3947fc51cc76fb38db04beb15765db51ff3a2662c57a34c77df2f0e27844c825ff1aca6eff261cf42b7db9f7a87fbba4648434d6502bb36931
diff --git a/dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild b/dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild
deleted file mode 100644
index 9dbc4cc797d2..000000000000
--- a/dev-haskell/hslua-module-system/hslua-module-system-0.2.1.ebuild
+++ /dev/null
@@ -1,30 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module wrapper around Haskell's System module"
-HOMEPAGE="https://github.com/hslua/hslua-module-system"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
-	>=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/text )
-"
diff --git a/dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild b/dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild
new file mode 100644
index 000000000000..fcf23439b04f
--- /dev/null
+++ b/dev-haskell/hslua-module-system/hslua-module-system-1.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module wrapper around Haskell's System module"
+HOMEPAGE="https://github.com/hslua/hslua"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.0:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+	>=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-system/hslua-module-system-1.1.0.1.ebuild b/dev-haskell/hslua-module-system/hslua-module-system-1.1.0.1.ebuild
new file mode 100644
index 000000000000..1badffe3bfbc
--- /dev/null
+++ b/dev-haskell/hslua-module-system/hslua-module-system-1.1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module wrapper around Haskell's System module"
+HOMEPAGE="https://github.com/hslua/hslua"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+	>=dev-haskell/temporary-1.2:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-system/metadata.xml b/dev-haskell/hslua-module-system/metadata.xml
index 286db6fad738..0d3a6e7e1d20 100644
--- a/dev-haskell/hslua-module-system/metadata.xml
+++ b/dev-haskell/hslua-module-system/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides access to system information and functionality
-		to Lua scripts via Haskell&#39;s `System` module.
-		
-		Intended usage for this package is to preload it by adding
-		the loader function to `package.preload`. Note that the
-		Lua `package` library must have already been loaded before
-		the loader can be added.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">hslua-module-system</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hslua-module-text/Manifest b/dev-haskell/hslua-module-text/Manifest
index eeefc9131377..0433511913a9 100644
--- a/dev-haskell/hslua-module-text/Manifest
+++ b/dev-haskell/hslua-module-text/Manifest
@@ -1 +1,2 @@
-DIST hslua-module-text-0.2.1.tar.gz 3498 BLAKE2B 6bf71d9c434042f881bdaa42fa2ef3e076f1bf25ae00cc04a0b64055719246901c482f4fbfa280d2f6ebf66cf5d1f5668ba73e91c589dfe081cce25439b40466 SHA512 e2da17ec688c00968537e49c18d71a3e365a57bb0c8cb2639b2052d04771686ee695186726569e82f72723c78841bccdc0de33d0302e943e67f3432bd5fb9d13
+DIST hslua-module-text-1.0.2.tar.gz 4650 BLAKE2B 94e6a2ff8682acfe29b556e6f3b5a789d7c6f2c8864e4e5d91872c637ed864af4743ca45c64f3c7ce6462c25dbc52308e7fa935b9dac214666ae177ee2ab835f SHA512 1678630a5ae7ac66946598691901a2dcb2f62723e9f7bda50d8c3711384437f4280d280363b04e2794487a541a9b5ee70bbf52a94fa042128650a9c576108e0d
+DIST hslua-module-text-1.1.0.1.tar.gz 6216 BLAKE2B 6f3ca45eefbc65d59f97d9107ad9bfa27229057015e6ec6fdf6b7310638da10740bfd88246fc923e3769caa5051d6e9cb777351e8a9a417456c7a85dd3d41286 SHA512 7f2ecc5efd0eb5b3cef42f570407df4bcea04d7e3b3b96d80823f7c33301cafd5da8f0b99216f4ddd955dcdf9c21a1b2b02891216694b877eb2371d5cd5602fb
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild
deleted file mode 100644
index f0377f866dbc..000000000000
--- a/dev-haskell/hslua-module-text/hslua-module-text-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua module for text"
-HOMEPAGE="https://github.com/hslua/hslua-module-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild
new file mode 100644
index 000000000000..d865771f4c7e
--- /dev/null
+++ b/dev-haskell/hslua-module-text/hslua-module-text-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module for text"
+HOMEPAGE="https://github.com/hslua/hslua"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-text/hslua-module-text-1.1.0.1.ebuild b/dev-haskell/hslua-module-text/hslua-module-text-1.1.0.1.ebuild
new file mode 100644
index 000000000000..aa34b09bda6c
--- /dev/null
+++ b/dev-haskell/hslua-module-text/hslua-module-text-1.1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module for text"
+HOMEPAGE="https://github.com/hslua/hslua"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-text/metadata.xml b/dev-haskell/hslua-module-text/metadata.xml
index b7878815d80d..67f7f39fcf4e 100644
--- a/dev-haskell/hslua-module-text/metadata.xml
+++ b/dev-haskell/hslua-module-text/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">hslua-module-text</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hslua-module-version/Manifest b/dev-haskell/hslua-module-version/Manifest
new file mode 100644
index 000000000000..4b0598470e93
--- /dev/null
+++ b/dev-haskell/hslua-module-version/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-module-version-1.0.2.tar.gz 5821 BLAKE2B 50e777e8656a1e6213a5aea7a35d61432611eca2f56a12c48b8b33659abf63c4f69696bab4f3e68d9dd0e7b727480bb4ba3ba976b3c9a6c09ef5c2a93d7911b8 SHA512 9c9c392206a5700d46e8481ce56eb3f52827b7017d64937263960db3b4dd05d379d14cdf3a6d1a5680e33706c4baca95b7cc6f60a5a7a7b6221e385a3746b6fd
+DIST hslua-module-version-1.1.0.tar.gz 6110 BLAKE2B 62e7b8a7c6bc61d54c812ea5c860c2e270690be92585de68e6bec10c09e19c8e7761584768ab67adf2b4eba89e7e6650eff3c61f37e3dbf233db8712ebe6e873 SHA512 b1856d103fa7ab114176a25fcf2610fa834fcb1fc7ad8af6b9bcc306576da10583ab0f6ec45141bb4bc7a827e5287d3500ce4f4175157dcc8135c8a83a667ec4
diff --git a/dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild b/dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild
new file mode 100644
index 000000000000..dd6a9ffab7b5
--- /dev/null
+++ b/dev-haskell/hslua-module-version/hslua-module-version-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module to work with version specifiers"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.1:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-haskell/hslua-packaging-2.1:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.1 )
+"
diff --git a/dev-haskell/hslua-module-version/hslua-module-version-1.1.0.ebuild b/dev-haskell/hslua-module-version/hslua-module-version-1.1.0.ebuild
new file mode 100644
index 000000000000..1470cbbcac88
--- /dev/null
+++ b/dev-haskell/hslua-module-version/hslua-module-version-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module to work with version specifiers"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.3:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-version/metadata.xml b/dev-haskell/hslua-module-version/metadata.xml
new file mode 100644
index 000000000000..49e6f6e03816
--- /dev/null
+++ b/dev-haskell/hslua-module-version/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-module-version</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-module-zip/Manifest b/dev-haskell/hslua-module-zip/Manifest
new file mode 100644
index 000000000000..620717e589e8
--- /dev/null
+++ b/dev-haskell/hslua-module-zip/Manifest
@@ -0,0 +1 @@
+DIST hslua-module-zip-1.1.0.tar.gz 7603 BLAKE2B 3f09ffa5c6e641271f9a358b62d2e8c5bf3719afa22e9674bba8bc8103f0c91ac031b461d5a320540dd17f60e509467f96fa2ef160ee123fe349751a6765db8d SHA512 ed68b34bd8f964732d2be120d2ec2372a435fd50d6494ab147351e9a882f0fb289ee33a1009ebac49ff146c70ae2b9c42104f361ba7cc862560981125eea7542
diff --git a/dev-haskell/hslua-module-zip/hslua-module-zip-1.1.0.ebuild b/dev-haskell/hslua-module-zip/hslua-module-zip-1.1.0.ebuild
new file mode 100644
index 000000000000..9002513566b4
--- /dev/null
+++ b/dev-haskell/hslua-module-zip/hslua-module-zip-1.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua module to work with file zips"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-list-1.1:=[profile?] <dev-haskell/hslua-list-1.2:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.3:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+	>=dev-haskell/hslua-typing-0.1:=[profile?] <dev-haskell/hslua-typing-0.2:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/zip-archive-0.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/hslua-module-system
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		>=dev-haskell/tasty-lua-1.0 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/hslua-module-zip/metadata.xml b/dev-haskell/hslua-module-zip/metadata.xml
new file mode 100644
index 000000000000..1299eac80ffc
--- /dev/null
+++ b/dev-haskell/hslua-module-zip/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-module-zip</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-objectorientation/Manifest b/dev-haskell/hslua-objectorientation/Manifest
new file mode 100644
index 000000000000..b8caecdf626f
--- /dev/null
+++ b/dev-haskell/hslua-objectorientation/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-objectorientation-2.2.0.tar.gz 15240 BLAKE2B 741298dd4d47b5b0bc4da565f9bae1004f13fccb4cb617ad1603821df884604a12f481626af9314f84f781a48bff836367d7fb71ce0ca5e2d3d8058c5899b394 SHA512 c40f0526264db229093f39deb9e77a44e575e6ebf97f257ff063b61279cd47aeecda4204db2ebc686b3e8ac467e2a0f4887608a54386f4afca2d47b469ee6107
+DIST hslua-objectorientation-2.3.0.tar.gz 16615 BLAKE2B 7760d09d30631bdac2255c33a12a005b134b7643d71092076d7a8142c78bb9ae9b54cb0f727746df837cf5a2661c1442edc97560a0fe839e1bd25fe0214ac413 SHA512 648dd92b7b51d8edfc8fcf455e3ae87afc828aeb4f5e54cb7d4f23d0e12173369ecac6ac44a79ddb474e723d1b007615492018d375aa7a4d58abbd13752a84e3
diff --git a/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild
new file mode 100644
index 000000000000..380a7df3bd7a
--- /dev/null
+++ b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Object orientation tools for HsLua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hslua-1.0
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.3.0.ebuild b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.3.0.ebuild
new file mode 100644
index 000000000000..6c61223c4187
--- /dev/null
+++ b/dev-haskell/hslua-objectorientation/hslua-objectorientation-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Object orientation tools for HsLua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/hslua-typing-0.1:=[profile?] <dev-haskell/hslua-typing-0.2:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hslua-1.0
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-objectorientation/metadata.xml b/dev-haskell/hslua-objectorientation/metadata.xml
new file mode 100644
index 000000000000..c43dd0fe0783
--- /dev/null
+++ b/dev-haskell/hslua-objectorientation/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-objectorientation</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-packaging/Manifest b/dev-haskell/hslua-packaging/Manifest
new file mode 100644
index 000000000000..de44d9b8d86a
--- /dev/null
+++ b/dev-haskell/hslua-packaging/Manifest
@@ -0,0 +1,2 @@
+DIST hslua-packaging-2.2.0.tar.gz 15932 BLAKE2B 724a28d8c7414766555968bca08cd6007e6637f8c4183da9524699b70b198a82f8cb4a6430af9ac6a0d26d1cf5abe25bee5153e8e8e09d058153f17a93298035 SHA512 f2dedc0674dd569f76e753edb3f20fe395fd6af082162b648d36ecb2eb0f5adaf5ab7354b809fa995c25cd17f30b7035d40c0ed9b0fb4fc78332f430cd152685
+DIST hslua-packaging-2.3.0.tar.gz 16903 BLAKE2B 8d1c0b10e80013cbe4018c7a9ae8a1b7a06227d9c2aa496ca9d3642f4622c49deedc8e37a5e877dbff568a4ca4a6e35f755a9629d4c69d0fa87665a913ec07dc SHA512 6b5b8f4bfda3798467bae4a7433f3c0ecbaaa9d3392d2fe51cc06d8b3d8ac05b1c9d32b3606ce6347bcbd43b39c583f640e7921befc095c4779db396450f5b4f
diff --git a/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild b/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild
new file mode 100644
index 000000000000..8db96786de75
--- /dev/null
+++ b/dev-haskell/hslua-packaging/hslua-packaging-2.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities to build Lua modules"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-haskell/hslua-objectorientation-2.2:=[profile?] <dev-haskell/hslua-objectorientation-2.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/tasty-0.11
+		dev-haskell/tasty-hslua
+		>=dev-haskell/tasty-hunit-0.9 )
+"
diff --git a/dev-haskell/hslua-packaging/hslua-packaging-2.3.0.ebuild b/dev-haskell/hslua-packaging/hslua-packaging-2.3.0.ebuild
new file mode 100644
index 000000000000..92d50c5953a3
--- /dev/null
+++ b/dev-haskell/hslua-packaging/hslua-packaging-2.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities to build Lua modules"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.2.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.2.1:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/hslua-objectorientation-2.3:=[profile?] <dev-haskell/hslua-objectorientation-2.4:=[profile?]
+	>=dev-haskell/hslua-typing-0.1:=[profile?] <dev-haskell/hslua-typing-0.2:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/tasty-0.11
+		dev-haskell/tasty-hslua
+		>=dev-haskell/tasty-hunit-0.9 )
+"
diff --git a/dev-haskell/hslua-packaging/metadata.xml b/dev-haskell/hslua-packaging/metadata.xml
new file mode 100644
index 000000000000..13301f339d83
--- /dev/null
+++ b/dev-haskell/hslua-packaging/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-packaging</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-repl/Manifest b/dev-haskell/hslua-repl/Manifest
new file mode 100644
index 000000000000..7df0ea685b8e
--- /dev/null
+++ b/dev-haskell/hslua-repl/Manifest
@@ -0,0 +1 @@
+DIST hslua-repl-0.1.1.tar.gz 4052 BLAKE2B cd7ca9277340a4708798144d6bd9da54e3b113a35f0896bdc8d08149677892f5fb1d5db0ed4f4ff2d2b29444be10ca737bcb1d18ec853f50284c07a7bb35b56d SHA512 c54c6bb7455d8f0cfd29812afc80d9617d0a100e94d4c3cd279b7579bf3be1fa3c1935785cb9eb4c664af345f1556e16a178049f3bd41823fdea56083d81bfdd
diff --git a/dev-haskell/hslua-repl/hslua-repl-0.1.1.ebuild b/dev-haskell/hslua-repl/hslua-repl-0.1.1.ebuild
new file mode 100644
index 000000000000..25501539d61c
--- /dev/null
+++ b/dev-haskell/hslua-repl/hslua-repl-0.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Isocline-based Lua REPL"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3.1:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/isocline-1.0:=[profile?] <dev-haskell/isocline-1.1:=[profile?]
+	>=dev-haskell/lua-2.3:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/hslua-repl/metadata.xml b/dev-haskell/hslua-repl/metadata.xml
new file mode 100644
index 000000000000..aad2a20db55b
--- /dev/null
+++ b/dev-haskell/hslua-repl/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<use>
+		<flag name="executable">Compile `luarepl` standalone executable.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">hslua-repl</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua-typing/Manifest b/dev-haskell/hslua-typing/Manifest
new file mode 100644
index 000000000000..56e376438547
--- /dev/null
+++ b/dev-haskell/hslua-typing/Manifest
@@ -0,0 +1 @@
+DIST hslua-typing-0.1.0.tar.gz 6420 BLAKE2B 06571d510baf0654199a91dd98bf4188ab3007bc1f6aa1ce6c1085a593d778e41fb65d549e75c3625c6d6e8083086dc414052e689d2331e61299336298efc271 SHA512 caca4003fab2fab4920e43491dc56cd137198f4a312d654f9489ea841b5e18b1b528a46e493692d027500a2fc5201d6f39b49b8bf0af8c199dbe357b95ccfb1f
diff --git a/dev-haskell/hslua-typing/hslua-typing-0.1.0.ebuild b/dev-haskell/hslua-typing/hslua-typing-0.1.0.ebuild
new file mode 100644
index 000000000000..2d60654a9256
--- /dev/null
+++ b/dev-haskell/hslua-typing/hslua-typing-0.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type specifiers for Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.3:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/lua-arbitrary-1.0 <dev-haskell/lua-arbitrary-1.1
+		dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/hslua-typing/metadata.xml b/dev-haskell/hslua-typing/metadata.xml
new file mode 100644
index 000000000000..339631ae3125
--- /dev/null
+++ b/dev-haskell/hslua-typing/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hslua-typing</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
index 54c702a56ef8..12918e9307d4 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1,3 +1,2 @@
-DIST hslua-0.3.13.tar.gz 128230 BLAKE2B ab252781f3130557ad25c9c36cbdc260addf58ce64f1b828dd85d3f0765b2604014da88a6bb9e6777bbd74dd869be42341e53e191e7cb46beff3e2dd6e1ec293 SHA512 5a11243f9a1da3a50ae5f30e310b2e661ed40655886b3bc6a2ba01b49fc0fbbc1ea20e24d3c227a8454cbcfd98161ad47edb5c3c111d6df09764f79476a9782a
-DIST hslua-0.3.6.1.tar.gz 127569 BLAKE2B 3738ba495dfb93e32cf62526228fc54f43267500faa283f54683cb0f9ac14237eedfad325345f5b86c3ee94b5fc33e9a534a2beb69407ce9c5699cdfa8a25ad2 SHA512 abe8a8513d74fbdf94cc9486996264c074c6b4df8e21702a03c887772624fe33f86f805275dab11a340d7f14a6f3dad71f06aaf0f7e20951df1ef9f2e670863b
-DIST hslua-1.0.3.1.tar.gz 236734 BLAKE2B 45eba849c41a22fdc7d03729f0ac15fb25ff83d1cdcb905a58a5813ef34f3b2e2a98a7ff2991083672a7afd5898e50e6ef9c83157c773b9861bd1547f4da5972 SHA512 047bcf851727e7525f10f6c705ec8968f330373aedf22bc91c96a44e5abdced46622a66a87c7973eac178c69dd3371bbcf4b858ed3c442719279e4cac4e57657
+DIST hslua-2.2.0.tar.gz 17278 BLAKE2B eda496aa4a2bd89fd0be2fcefa0b1554a931c7876f5b2e456fb315a72d304050f8d9b2ad5ee583c15f4b31dc26f1a87370c526626d8dbed1e2fc5660ee66667e SHA512 cdd4ff872557ba014bb6f64a592702820e9274456c35b9f9c42fccbd279b2157b3087a5040be2bad03890934bf682c7f4d066232480e8243d5259f871514346a
+DIST hslua-2.3.0.tar.gz 17387 BLAKE2B 298ca26eed54c508621596efd90b0c8c7f0151ff9ab5a4d61d8e10fe57b2b61a865b39fcf7b6f12087a6fe913a0f6fb1e01b37aa2ae7c7e4aab58f434aafcac7 SHA512 a3e4bd970d0a55465aafff91f6b03d29443599d819a48dc9f3296bcac5807c9cb2920cb5c6c5e3bda854403a5bea219b9a626305d932f8c452ff9cc09572d060
diff --git a/dev-haskell/hslua/hslua-0.3.13.ebuild b/dev-haskell/hslua/hslua-0.3.13.ebuild
deleted file mode 100644
index efaff9f9d8df..000000000000
--- a/dev-haskell/hslua/hslua-0.3.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/hslua"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="apicheck system-lua"
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-lua? ( dev-lang/lua )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	system-lua? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag apicheck apicheck) \
-		$(cabal_flag system-lua system-lua)
-}
diff --git a/dev-haskell/hslua/hslua-0.3.6.1.ebuild b/dev-haskell/hslua/hslua-0.3.6.1.ebuild
deleted file mode 100644
index 0faac983baf1..000000000000
--- a/dev-haskell/hslua/hslua-0.3.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/hslua"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/hslua/hslua-1.0.3.1.ebuild b/dev-haskell/hslua/hslua-1.0.3.1.ebuild
deleted file mode 100644
index 3c60e65c208d..000000000000
--- a/dev-haskell/hslua/hslua-1.0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Lua language interpreter embedding in Haskell"
-HOMEPAGE="https://hslua.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="" # system-lua disabled since it requires lua-5.3, which is masked
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
-	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/quickcheck-2.7
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allow-unsafe-gc \
-		--flag=-apicheck \
-		--flag=-export-dynamic \
-		--flag=-lua501 \
-		--flag=-lua502 \
-		--flag=-lua_32bits \
-		--flag=-system-lua \
-		--flag=-pkg-config
-}
diff --git a/dev-haskell/hslua/hslua-2.2.0.ebuild b/dev-haskell/hslua/hslua-2.2.0.ebuild
new file mode 100644
index 000000000000..e0b517abae08
--- /dev/null
+++ b/dev-haskell/hslua/hslua-2.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-aeson-2.2:=[profile?] <dev-haskell/hslua-aeson-2.3:=[profile?]
+	>=dev-haskell/hslua-classes-2.2:=[profile?] <dev-haskell/hslua-classes-2.3:=[profile?]
+	>=dev-haskell/hslua-core-2.2:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-haskell/hslua-objectorientation-2.2:=[profile?] <dev-haskell/hslua-objectorientation-2.3:=[profile?]
+	>=dev-haskell/hslua-packaging-2.2:=[profile?] <dev-haskell/hslua-packaging-2.3:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/lua-2.0
+		>=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		dev-haskell/tasty-hslua
+		>=dev-haskell/tasty-hunit-0.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-allow-unsafe-gc \
+		--flag=-apicheck \
+		--flag=-export-dynamic \
+		--flag=-lua501 \
+		--flag=-lua502 \
+		--flag=-lua_32bits \
+		--flag=-pkg-config \
+		--flag=-system-lua
+}
diff --git a/dev-haskell/hslua/hslua-2.3.0.ebuild b/dev-haskell/hslua/hslua-2.3.0.ebuild
new file mode 100644
index 000000000000..0e681552783c
--- /dev/null
+++ b/dev-haskell/hslua/hslua-2.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-aeson-2.3:=[profile?] <dev-haskell/hslua-aeson-2.4:=[profile?]
+	>=dev-haskell/hslua-classes-2.2:=[profile?] <dev-haskell/hslua-classes-2.4:=[profile?]
+	>=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.3:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/hslua-objectorientation-2.3:=[profile?] <dev-haskell/hslua-objectorientation-2.4:=[profile?]
+	>=dev-haskell/hslua-packaging-2.3:=[profile?] <dev-haskell/hslua-packaging-2.4:=[profile?]
+	>=dev-haskell/hslua-typing-0.1:=[profile?] <dev-haskell/hslua-typing-0.2:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/lua-2.0
+		>=dev-haskell/lua-arbitrary-1.0
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.11
+		dev-haskell/tasty-hslua
+		>=dev-haskell/tasty-hunit-0.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-allow-unsafe-gc \
+		--flag=-apicheck \
+		--flag=-export-dynamic \
+		--flag=-lua501 \
+		--flag=-lua502 \
+		--flag=-lua_32bits \
+		--flag=-pkg-config \
+		--flag=-system-lua
+}
diff --git a/dev-haskell/hslua/metadata.xml b/dev-haskell/hslua/metadata.xml
index e1447dd132e6..3b4e9a667d84 100644
--- a/dev-haskell/hslua/metadata.xml
+++ b/dev-haskell/hslua/metadata.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="apicheck">Compile Lua with -DLUA_USE_APICHECK..</flag>
-		<flag name="system-lua">Use the system-wide lua instead of the bundled copy.</flag>
-	</use>
-	<longdescription>
-		The Scripting.Lua module is a wrapper of Lua language interpreter
-		as described in www.lua.org.
-		
-		The package is standalone: full Lua interpreter version 5.1.4
-		is distributed in this package as well.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">hslua</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hsopenssl/Manifest b/dev-haskell/hsopenssl/Manifest
deleted file mode 100644
index ff213442589a..000000000000
--- a/dev-haskell/hsopenssl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST HsOpenSSL-0.10.4.tar.gz 67538 BLAKE2B d52fbc67bd053c8ce526bb0d30ef74ab11bbb200d01c2e00672c63f774911d113cd03c4c212077db9b56b1ac82a196bbb23adc0504b1b953c322deefa1c224dc SHA512 ab26d19a196ee299763c4a0953e5b805c9f34f9f6b8502562812e597cfdfa07bccfec08919682ce90aa3022144133ba609346139734fbfe89a42f7a6aba939e7
-DIST HsOpenSSL-0.11.1.1.tar.gz 72297 BLAKE2B 73838757886f3a7c0d9101459f995f07fab4f2f9db0ae7007178ddea9bed20c9a0538388a06bc59652701be30ef54ac2419426d7d1b7eb63d3012f79028dc208 SHA512 a7260bb47a4886e550fce71f83f1d9ab93e54fb40886b618f86db191651f95beeac30334d58ab10ab084bfcf9ff8a1b994254c13c09e678dae3b23a12b279541
-DIST HsOpenSSL-0.11.4.17.tar.gz 80235 BLAKE2B c8229b96e5d079a46255010dd44ca9caed292c974dfe5d815130696d798263c493bc8825be9ff1e360a2e0c86919842883d9125f26166184d002c619fab03649 SHA512 fe7be85a6e9690f4c7a5d79c0bab56efd42e183415c5b92b589c5bd380f2646877e0d4b1208f5583d3223a602118c9a3d74688e02f9d24a1ea20aea64a625eb6
-DIST HsOpenSSL-0.11.4.tar.gz 77764 BLAKE2B 883d38142f1c93c7fb02de59bf993433c2accf49750bdfb0dd1e1d948ed4bb964b9ef3e9d473f1904acc8954336daca176bad3b0f477a834a39a4b8ea93c68d7 SHA512 be67eec8af517bec360618883bdce1ed195bf11361ae7cad372a50cc135f0e1825a86cc581a5e94375ad85cc163553270d5c431e2a03a6a4b80dc03b027fdcac
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild
deleted file mode 100644
index 8cdede468bb2..000000000000
--- a/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HsOpenSSL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Partial OpenSSL binding for Haskell"
-HOMEPAGE="https://github.com/phonohawk/HsOpenSSL"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fast-bignum"
-
-RDEPEND=">=dev-haskell/network-2.1.0.0:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag fast-bignum fast-bignum)
-}
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
deleted file mode 100644
index 86089cbadc2a..000000000000
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HsOpenSSL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Partial OpenSSL binding for Haskell"
-HOMEPAGE="https://github.com/phonohawk/HsOpenSSL"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fast-bignum libressl"
-
-RESTRICT=test # whoops, not good
-
-RDEPEND=">=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.0 <dev-haskell/hunit-1.3
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'time       >= 1.1.1 && < 1.6' 'time       >= 1.1.1'
-}
-
-src_configure() {
-	local fbn_flag=$(cabal_flag fast-bignum fast-bignum)
-
-	# not ported to integer-gmp-1.0:
-	#  https://github.com/phonohawk/HsOpenSSL/issues/36
-	[[ $(ghc-version) == 7.10.* ]] && fbn_flag=-f-fast-bignum
-
-	haskell-cabal_src_configure \
-		${fbn_flag}
-}
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.4.17.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.4.17.ebuild
deleted file mode 100644
index f594c57b4345..000000000000
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.4.17.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -homebrew-openssl,-macports-openssl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HsOpenSSL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Partial OpenSSL binding for Haskell"
-HOMEPAGE="https://github.com/vshabanov/HsOpenSSL"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="fast-bignum"
-
-RDEPEND=">=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/openssl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag fast-bignum fast-bignum) \
-		--flag=-homebrew-openssl \
-		--flag=-macports-openssl
-}
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild
deleted file mode 100644
index a3d1bc609557..000000000000
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -homebrew-openssl,-macports-openssl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HsOpenSSL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Partial OpenSSL binding for Haskell"
-HOMEPAGE="https://github.com/vshabanov/HsOpenSSL"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-RESTRICT=test # whoops, not good
-
-RDEPEND=">=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-homebrew-openssl \
-		--flag=-macports-openssl
-}
diff --git a/dev-haskell/hsopenssl/metadata.xml b/dev-haskell/hsopenssl/metadata.xml
deleted file mode 100644
index 07731d9ca92b..000000000000
--- a/dev-haskell/hsopenssl/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="fast-bignum">Enable fast moving of bignums between OpenSSL and GMP (GHC Only)</flag>
-	</use>
-	<longdescription>
-		
-		HsOpenSSL is an OpenSSL binding for Haskell. It can generate RSA
-		and DSA keys, read and write PEM files, generate message digests,
-		sign and verify messages, encrypt and decrypt messages. It has
-		also some capabilities of creating SSL clients and servers.
-		
-		Please note that this project has started at the time when there
-		were no pure-Haskell implementations of TLS. Now there is tls
-		package (&lt;http://hackage.haskell.org/package/tls&gt;), which looks
-		pretty saner than HsOpenSSL especially for initialisation and
-		error handlings. So PHO (the initial author of HsOpenSSL) highly
-		encourages you to use and improve the tls package instead as long
-		as possible.
-		
-	</longdescription>
-	<upstream>
-		<remote-id type="github">phonohawk/HsOpenSSL</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild b/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
index 1ca03547f198..b98ca284f5c9 100644
--- a/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
+++ b/dev-haskell/hspec-contrib/hspec-contrib-0.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.5.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT=test # test-suite fails to build
diff --git a/dev-haskell/hspec-contrib/metadata.xml b/dev-haskell/hspec-contrib/metadata.xml
index b7878815d80d..937381521944 100644
--- a/dev-haskell/hspec-contrib/metadata.xml
+++ b/dev-haskell/hspec-contrib/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/hspec-core/Manifest b/dev-haskell/hspec-core/Manifest
index 7b7ba533a36d..03f9707c9277 100644
--- a/dev-haskell/hspec-core/Manifest
+++ b/dev-haskell/hspec-core/Manifest
@@ -1,5 +1,2 @@
-DIST hspec-core-2.1.2.tar.gz 29341 BLAKE2B dadc4c0d71a58fbc07d8a0d41c0822fe0db05112821a8ab2112dae41c663197080b819b0d93ebde0a64ee7b2509885efd8e1b481b1fea6566a2006640be2d846 SHA512 5af471a54b9bcfdc76ef8f0293d483b11997d88113cc28899d4148d76404b08f456a04566734d69c6c607904e80ce295dc9364d8d396f17bec748c8a32308c1c
-DIST hspec-core-2.1.4.tar.gz 29371 BLAKE2B 670147b4742ea4baa284bc70eddf615fdb79b338f7d5e2fe3042defe608d5b02ce110a6c123ac641c2ea44006b9ef2a95632227f9ea4ee967d37d21e209a12e6 SHA512 71f23c7b4075d5d48fc91b1394d1d1418f89c8756baddabea27ab09430ae982759377cb9f3fca42da72382c19fd8bfd151e89fea122e91faafb91e787bdf7b63
-DIST hspec-core-2.2.1.tar.gz 31651 BLAKE2B bcb278f103b651937c0f23fe14fd7fdc514e67c9e331d41f04cbcdfa96e925e938f8d2da4b5108e56c902f5f71654feaabd35429e1241a7a002a4a8bf0847ca2 SHA512 fa44e935609cf636ef13025ae03456e74b404d47e64fc58acf0ea1d204e32c145a471c60501e9cba3f8d2d1d211f4c999eb41798c8df45842abbc1befda14c6a
-DIST hspec-core-2.2.4.tar.gz 31553 BLAKE2B 4f5c438c652c20a9f51e6112ed455f4fc7b11713d1ce10df08504367fe4a17ec6637b346c05f519a4514d4cd38cd8b79023df13735804c846bf4efca9c084e17 SHA512 1c99ae88635886f74d1a0a28c7b3edfa4678031f62bb916724cc1efd62388ab24a7db1772955f55c7c5d1be75399a92784a5f9c0b2d2b49c0500d5ac6977b9b9
-DIST hspec-core-2.7.1.tar.gz 58835 BLAKE2B b6fa09a26c6adaf25f99d6fc3b1df80ea5407f6e8963c16473b4c98ccff694457131a9c7c35e5250beee47a03fb1c695d74f33be335623340a2d729b6221cdff SHA512 5ab0925566c3b6f05480bd4e464ca32e0a212b4b4ff439d02b3df5b75b23b45ca0c63bab8398ebeeedce0ba30bb653b1ea85df2b7e6e3a058cb4413dc1c53ee2
+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
diff --git a/dev-haskell/hspec-core/hspec-core-2.1.2.ebuild b/dev-haskell/hspec-core/hspec-core-2.1.2.ebuild
deleted file mode 100644
index b16ef88e2f0a..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-1.12
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild
deleted file mode 100644
index 25372af195c3..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-1.12
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild b/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild
new file mode 100644
index 000000000000..1b54214140c1
--- /dev/null
+++ b/dev-haskell/hspec-core/hspec-core-2.10.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="https://hspec.github.io/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+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:=[profile?]
+	>=dev-haskell/quickcheck-io-0.2.0:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/setenv:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?]
+	dev-haskell/tf-random:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/base-orphans
+		~dev-haskell/hspec-meta-2.10.5
+		>=dev-haskell/quickcheck-2.14
+		>=dev-haskell/silently-1.2.4
+		dev-haskell/temporary
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/hspec-core/hspec-core-2.2.1.ebuild b/dev-haskell/hspec-core/hspec-core-2.2.1.ebuild
deleted file mode 100644
index 4d0021b0552d..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	>=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-2.2.0
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild
deleted file mode 100644
index aa206f2fdb31..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	>=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-meta-2.2.0
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild b/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild
deleted file mode 100644
index d93f992ae506..000000000000
--- a/dev-haskell/hspec-core/hspec-core-2.7.1.ebuild
+++ /dev/null
@@ -1,38 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	dev-haskell/call-stack:=[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-io-0.2.0:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-meta-2.3.2
-		>=dev-haskell/silently-1.2.4
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
new file mode 100644
index 000000000000..47e557342c1c
--- /dev/null
+++ b/dev-haskell/hspec-core/hspec-core-2.9.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+RESTRICT=test # disabled at build time
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="https://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
+	dev-haskell/call-stack:=[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:=[profile?]
+	>=dev-haskell/quickcheck-io-0.2.0:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/setenv:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?]
+	dev-haskell/tf-random:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+#	test? ( dev-haskell/base-orphans
+#		~dev-haskell/hspec-meta-2.9.3
+#		>=dev-haskell/quickcheck-2.14
+#		>=dev-haskell/silently-1.2.4
+#		dev-haskell/temporary )
diff --git a/dev-haskell/hspec-core/metadata.xml b/dev-haskell/hspec-core/metadata.xml
index d7d62d8eae45..3b3621d13184 100644
--- a/dev-haskell/hspec-core/metadata.xml
+++ b/dev-haskell/hspec-core/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package exposes internal types and functions that can be
-		used to extend Hspec's functionality.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">hspec-core</remote-id>
+		<remote-id type="github">hspec/hspec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hspec-discover/Manifest b/dev-haskell/hspec-discover/Manifest
index abfdf74ddd28..f92632fc89c7 100644
--- a/dev-haskell/hspec-discover/Manifest
+++ b/dev-haskell/hspec-discover/Manifest
@@ -1,5 +1,2 @@
-DIST hspec-discover-2.1.2.tar.gz 5365 BLAKE2B 935070852def9c9de8059ba127e779260c79a7bb4f0437af02847d4fbb79650a726c679654b87733357ab5b557f91b1663c5b39b463e1f7c8bd9622ed18900fa SHA512 5d90e0732e0e36bf1c8da81c3ccdb000e10467e285399111c3a42df8695ca94b95e43af51bc6df861d6dd8e2fb99b8f626a67253a8902a932aa91369f7653353
-DIST hspec-discover-2.1.4.tar.gz 5570 BLAKE2B 40d84878a528df128f38914fb0fa110e482dcd138f0479364f887dbbf15f01cda472e4e490138067150b129c12a0554b90fdcd11ad420866c59db0ec48f572f1 SHA512 f511fe71ab380b640baa4e50fb5fa00089141aaaa53f04a2c24e48feb1d9d2b82dce95e1c55763f880eebdb89cc04707822cab0e9d3f69ee166a9afd7b84bef5
-DIST hspec-discover-2.2.1.tar.gz 5630 BLAKE2B b561b5f4ed0ca7e0f78dbc495422b098e2775822e4e2c6a6257fbb47206a0106e00dbbd7b313cb283bddd0f64b7bae441df5efedff3c8b208003a89d14a06c85 SHA512 cc27b6e8cee362c031a87c8af4b264824c13bc147e8780d601c7fc2390103447aacab187eb57e8079b558c0d5e643d796141ff44f079fb6b9a83fd3951f63cd9
-DIST hspec-discover-2.2.4.tar.gz 5878 BLAKE2B 250dccc3c82e0b7a4b1505d1a8a47cd8c1fc0454f545102d4db0d8f43057cdbd1d8866c933d461efc03773c89f5d9def75094c4868955696f4a11505fbf68255 SHA512 217ecedaaf35e28f270cd0b2933fb8818ae82e0ecc0152affa6e71cbc1c5a62897ac6421c384dc91567fd5e911ee02047e3b59a5772a8a5533115b0708fb7e76
-DIST hspec-discover-2.7.1.tar.gz 6755 BLAKE2B 009f49090de3d79c7776e8b9b22eb975f276081c39980b49e157dfd50c97f3253140b2d66c8f392f53f83976d01d4302d78afc1ec95df45cb0a61d4c7a741234 SHA512 b07e7be5bd81f2e116b63f27e307ac628b6d678cc24dfb519bed7dcc1c27f772ff5d4a18c801474a425d4450337e809b9563b4ee1ca397830dfc7f9a92d7359f
+DIST hspec-discover-2.10.6.tar.gz 6843 BLAKE2B bd9f6feaa3a3aabec31ee0513821b79c439377bbb865fef50af5a63ba61c126fdddf26436a7768bbcfc415ab5f3179c794f770caee24a80d719608d099a1de18 SHA512 a6fad93f31b264b3f80b2775b5420ea983014d88296f404f7b9126d6a97d290313a1e9c59ba92957fe68789cc9b5d49c30fdfa8558e2f8d853fa93aa673f64e3
+DIST hspec-discover-2.9.4.tar.gz 6829 BLAKE2B c0f3a762db63f6d50edf2af0d240c5a9ccff7092ba0f440a342c809b4cc7c7c7e9fee95ca92d426baa6956f4e459ea8da04f2d7bb2545d4ca948395d38c75cff SHA512 0c76cfbe56ee67ab14040c7252a2f1ccecf8230868435d64c9015c472c85557921f1ca30e12df6f3097866b5b791e86d06026ef5fa5e998c354f3fa26c95e5ea
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.1.2.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.1.2.ebuild
deleted file mode 100644
index dd9645370634..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-1.12 )
-"
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild
deleted file mode 100644
index b8c805761ee9..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-1.12 )
-"
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.10.6.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.10.6.ebuild
new file mode 100644
index 000000000000..2981c9f0918b
--- /dev/null
+++ b/dev-haskell/hspec-discover/hspec-discover-2.10.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatically discover and run Hspec tests"
+HOMEPAGE="https://hspec.github.io/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		~dev-haskell/hspec-meta-2.10.5
+		>=dev-haskell/mockery-0.3.5
+		>=dev-haskell/quickcheck-2.7
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.2.1.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.2.1.ebuild
deleted file mode 100644
index 6ca2ecaf9296..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-2.2.0 )
-"
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild
deleted file mode 100644
index 1567b10c10e6..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-meta-2.2.0 )
-"
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
deleted file mode 100644
index f1dbd5de681f..000000000000
--- a/dev-haskell/hspec-discover/hspec-discover-2.7.1.ebuild
+++ /dev/null
@@ -1,26 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatically discover and run Hspec tests"
-HOMEPAGE="http://hspec.github.io/"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( >=dev-haskell/hspec-meta-2.3.2
-		>=dev-haskell/quickcheck-2.7 )
-"
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild
new file mode 100644
index 000000000000..087b9912e6e0
--- /dev/null
+++ b/dev-haskell/hspec-discover/hspec-discover-2.9.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Disable test-suite: circular depends
+inherit haskell-cabal
+RESTRICT=test # disabled at build time
+
+DESCRIPTION="Automatically discover and run Hspec tests"
+HOMEPAGE="https://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+#	test? ( ~dev-haskell/hspec-meta-2.9.3
+#		>=dev-haskell/mockery-0.3.5
+#		>=dev-haskell/quickcheck-2.7 )
diff --git a/dev-haskell/hspec-discover/metadata.xml b/dev-haskell/hspec-discover/metadata.xml
index 07830dd91b22..21b829b0d806 100644
--- a/dev-haskell/hspec-discover/metadata.xml
+++ b/dev-haskell/hspec-discover/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Automatically discover and run Hspec tests
-		
-		&lt;http://hspec.github.io/hspec-discover.html&gt;
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">hspec-discover</remote-id>
+		<remote-id type="github">hspec/hspec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hspec-expectations/Manifest b/dev-haskell/hspec-expectations/Manifest
index 7e8d2a5fb88f..d36ff31c6296 100644
--- a/dev-haskell/hspec-expectations/Manifest
+++ b/dev-haskell/hspec-expectations/Manifest
@@ -1,7 +1 @@
-DIST hspec-expectations-0.3.2.tar.gz 3707 BLAKE2B b231a5859f47d2e0f261ccf86f3f032377c91c8e49e7672952255b7ffc6e80db56854a6d9276ade0637aa60e97a95917c8f9d199528fa5f8d7ef705dc1219d6f SHA512 0ccb5a8999c41df00d977cefd985f2fd9d3d1abe79e79e340ab92ab87d875edbbd22f5b7a16e9f2c7f7ad127d7a30a8491b4bb6c59e92eec0c6a1439604c2599
-DIST hspec-expectations-0.3.3.tar.gz 3848 BLAKE2B 3a814f54d8d5559ad5d8753d0b0ee01f8e3dd07dc0809b6d4cbaa612dcb5dfe1241b1cc59aa88863a267f680e44c0b3e4d04fe75cfe00864c8a6bb229e26f873 SHA512 efc475bc6f5378fa54eddc66be9c2d69e3a8431be4dc9d30fed84e403bc5982894dd1f06aa0c55b4dd8904251ec4ca4753879c315efedbb162af30caa304e1cd
-DIST hspec-expectations-0.5.0.1.tar.gz 3971 BLAKE2B e63f58bf28739d0fa4ac575ba1cc5dc0f2d8aa98d0fedca557125c1f33eb468712a63093efd244ffa0db4fdf00e49bd3f26d9a07cbfeb96bbfc503a8c69f0f53 SHA512 fba29e65c6d666f493dd55d5ed62131a5233317c587b49ba98b1447be5ddc1f530a2bd6537b88afd78ec8c35760139303c0f8ec0de52ac01e499f3eb114e4fb0
-DIST hspec-expectations-0.6.1.1.tar.gz 4553 BLAKE2B acabe7c00f5fa05538ffe3b16ea0a95c237c5a67fad98896bd7a65801ddfda5f26a791a03c3298f35d1e8edfc986208b037ba8053c58f3dc06d9ce56e6260880 SHA512 37804b7ebe3fa134e005f4cc34a980b43a78f37a50b7aa668762086e125bb46e84dc3ca2b2f2c8a9dff31f1c89d7113c78d9a0fc4c787c746d9d5315d8938973
-DIST hspec-expectations-0.6.1.tar.gz 4553 BLAKE2B 233453a972c85e9599beef759df9bb391eb1472085ba2d44ff5ee67a1e9a6646dcd25db9ba72a35859a7552d91a5d3c8e29682347d41b7ca3e38b08007657425 SHA512 dad4bdf7f10241650a5d59e0131aa93d52040d1cd7aec63ba8a9090919d2d7f49f9f5a7ead7da3d79e619f37ffed2323eb62f68c076959f58c8e2208f8fb46b2
-DIST hspec-expectations-0.7.2.tar.gz 3993 BLAKE2B 1bafd6d3e9ee45d05885b81de6a5bce2137a2226dc49bd8459293df65d123f95531c0f2d1cb283da83e828186276e06452c25b33a76d8ef30358b81feb93e701 SHA512 0c66b0997b8b751529b3f72733a3c88f6767e564e2ff60aa5ff231c10d47295f01f747d9a2955b678fc7658fd0c5cad8647ca8a4da68e607e78397028f53de09
 DIST hspec-expectations-0.8.2.tar.gz 5492 BLAKE2B ee1f50d390c2d72f50596935494b6d617d5a582376fa718a294ba33838951787d4afd1654733e6f590f166e1e36c0b651d3fc2c996ce5886e9110375af8a7750 SHA512 482799adad2a70f891a61227bcf28e6712e65fa7dceba13da15a101a6814bc0d44aafaeda360a06dcdbcdbb96e5539f15135753eabd63efdd6bf56b8994a44c9
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild
deleted file mode 100644
index 6b028aa379ac..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/markdown-unlit
-			dev-haskell/silently
-		)"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild
deleted file mode 100644
index a3802a717242..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/markdown-unlit
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild
deleted file mode 100644
index 638da0adf738..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/markdown-unlit
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild
deleted file mode 100644
index 8cfb385f62b0..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depend: hspec-expectations[test]->hspec[test]->hspec-expectations
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		dev-haskell/markdown-unlit
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.ebuild
deleted file mode 100644
index 17913cd1def1..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/markdown-unlit
-		dev-haskell/silently )
-"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild
deleted file mode 100644
index e5055f74cdbb..000000000000
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Catchy combinators for HUnit"
-HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
index 618abe1e2f74..753401c3486b 100644
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
+++ b/dev-haskell/hspec-expectations/hspec-expectations-0.8.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.3.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/call-stack:=[profile?]
diff --git a/dev-haskell/hspec-expectations/metadata.xml b/dev-haskell/hspec-expectations/metadata.xml
index 813f06e30a59..c99ed02a022a 100644
--- a/dev-haskell/hspec-expectations/metadata.xml
+++ b/dev-haskell/hspec-expectations/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Catchy combinators for HUnit: &lt;https://github.com/sol/hspec-expectations#readme&gt;
-	</longdescription>
 	<upstream>
-		<remote-id type="github">sol/hspec-expectations#readme</remote-id>
+		<remote-id type="github">hspec/hspec-expectations#readme</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hspec-megaparsec/Manifest b/dev-haskell/hspec-megaparsec/Manifest
new file mode 100644
index 000000000000..5f4ffb75b8d2
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/Manifest
@@ -0,0 +1 @@
+DIST hspec-megaparsec-2.2.0.tar.gz 5298 BLAKE2B fe18c95325a7b17c214635d8e57477dcd55b10b9a8dad20ccbf7c3d8bdd9027b49da394397493276b1b5aceb5a8337f51688c409fbb1ea1ddf86e96502e19c8e SHA512 347e1d5275fbd52bc0a51a1106aab8de123034ec34d5f0a113af76136009bc16d2c570aa747e903e050899cf3d53a091e765af5aa67dd7eb3ee7aef6e62054a4
diff --git a/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild b/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild
new file mode 100644
index 000000000000..61ab9e695e89
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/hspec-megaparsec-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utility functions for testing Megaparsec parsers with Hspec"
+HOMEPAGE="https://github.com/mrkkrp/hspec-megaparsec"
+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/hspec-expectations-0.8:=[profile?] <dev-haskell/hspec-expectations-0.9:=[profile?]
+	>=dev-haskell/megaparsec-9.0:=[profile?] <dev-haskell/megaparsec-10.0:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/hspec-megaparsec/metadata.xml b/dev-haskell/hspec-megaparsec/metadata.xml
new file mode 100644
index 000000000000..8559a2fdcf9d
--- /dev/null
+++ b/dev-haskell/hspec-megaparsec/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hspec-megaparsec</remote-id>
+		<remote-id type="github">mrkkrp/hspec-megaparsec</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hspec-meta/Manifest b/dev-haskell/hspec-meta/Manifest
index 4315600f447b..b9cabe57899f 100644
--- a/dev-haskell/hspec-meta/Manifest
+++ b/dev-haskell/hspec-meta/Manifest
@@ -1,8 +1,2 @@
-DIST hspec-meta-1.10.0.tar.gz 20256 BLAKE2B fbf55eeaa085a97114eaa39fc5cce83c09efe72ffda9e055e1b1382246d5584125863e2b8744f6391b59c69145ca8d87407cfd4dbcd03cbe6c2a3277b2951f30 SHA512 212510fd48d0285fd8bf11dda5645457ea2d33c865f00ca6e0db366e9cd1f1d65dabf79fb5178494e7d0a8cc36389b0f38af3b305dcccfe50f1f97d853ccccef
-DIST hspec-meta-1.7.2.tar.gz 22207 BLAKE2B b41d42afc93a1bfecdf90459645cf421ddd8ff6aa29c30311a432a39e3edf1637ff359a7f0d01e49b836d8c18d5d2465ba0e03f7bb7c51987f7792732ed1253f SHA512 4e3d44c9a8e57dffcd54a8f34c1f2271e593dfdc7fa10adbe5c5a3d25b7203ccffed906c390ede724ce1340cf3f7d04eb8075194ddd9dd0b9a9341091cfde833
-DIST hspec-meta-1.8.1.tar.gz 20555 BLAKE2B 124a32a479795109f854fe8f8eb219e49e4d0d455d7cea464c2664b9dadb8b2f32187853f831aa74b19e2efcc027aec92841909b9048641357d299f260c8f220 SHA512 555421fa7a693b59b7fe01340096b94ffaa263e5d6e23d5fd538284c385279f56ac1bf5b9ed07e6e74dfd8a0cc0875b2c245a72e6cce1c4e3edb68969e8403f9
-DIST hspec-meta-1.8.3.tar.gz 20877 BLAKE2B 7840d09c0fb00270a5d79af088e616a271abb1159ed782e2b94dab008fd3f2b6ff73f7b8a73166aa56bfc32b211940832b006150ac3fc3532d9d9a54d519f115 SHA512 fb71234784d5ae0906c664b24ef99578ceb4b764bf8badb528c940637774d8b598a43abc4240e4a0720cac5b088612723ab63b94d92ee5f5b3317422ea89f5d2
-DIST hspec-meta-2.0.0.tar.gz 23370 BLAKE2B 402999f1db24d8f0a79f7b7f999d2c39aa6be3ade6e6daf99b58abe5c573fe0dac39fd09d454ecb34ac29e4b5354933d729951d7d5ed200bff92a50e4da8d325 SHA512 434bf1e181cc41780f1367019e200b330a3d793232774188552d893197c1e86731aae73a4d8f44faef2289c6eeb26398481cc0b1aa8a23a414dd849655d7cfca
-DIST hspec-meta-2.2.0.tar.gz 24918 BLAKE2B 903a7dfe4b5f4f8d644fadbd8b5246b252173b6b04a319d4a7af798f1db5ffc02c66c45954c42912f5814ba9017453a5f78954a0ecf166281021e4335bec3a2d SHA512 2c2f928523d38d8b8a53ad64abcd3e612d2de3cd443197653283e02f19133ff91d42d47a85819f03189d02afc515427a0c88f43a0ae6ab819644674b30bae1d2
-DIST hspec-meta-2.2.1.tar.gz 25104 BLAKE2B b7a39dc75fd16f08d01c4ddc68b5e9c8ac81d7c3eeecd9b9d93be46802de5d2d6f7009e24d2a99f104c7d498ed405b68e6c9f916542bbb4d38e429b3731672aa SHA512 836532f58896993c83aefa57c3e0643359c02aeb208321421a6042c60a9fd7e75a80f53af2d1929cd284cc82e0d5a7b5cbf7baad175a9cfd1b742932d364b4c1
-DIST hspec-meta-2.6.0.tar.gz 49275 BLAKE2B 1c79dea90807e4cec62fcec6f894fe57639e1f8f46e360d9a668bde1cc04c9c172075dfc2b605d7d3b6399a8905920ecfe2cbd82412b8f0224e059717d19013d SHA512 c35d09f84c093ab5fe7ae31cf004d485cf6d15a06ee7c98270d3f5c471da6e0c9a71c8ec6ca0aa87e7454c9470b218c24538270711677003dc63d316fb23dce9
+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
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.10.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.10.0.ebuild
deleted file mode 100644
index b97dce705353..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-1.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild
deleted file mode 100644
index 554a88c81b15..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild
deleted file mode 100644
index 06edea61fdec..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.8.3.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.8.3.ebuild
deleted file mode 100644
index e73ee2510851..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-1.8.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild
deleted file mode 100644
index 586617507e0d..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/async:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild
new file mode 100644
index 000000000000..0162ff534d11
--- /dev/null
+++ b/dev-haskell/hspec-meta/hspec-meta-2.10.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A version of Hspec which is used to test Hspec itself"
+HOMEPAGE="https://hspec.github.io/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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:=[profile?]
+	dev-haskell/quickcheck-io:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/setenv:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.2.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.2.0.ebuild
deleted file mode 100644
index 9dde31a3c3ee..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/async:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild
deleted file mode 100644
index 94bde2bc4474..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/async:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
deleted file mode 100644
index 9b5b1040a23d..000000000000
--- a/dev-haskell/hspec-meta/hspec-meta-2.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A version of Hspec which is used to test Hspec itself"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/call-stack:=[profile?]
-	dev-haskell/clock:=[profile?]
-	>=dev-haskell/hspec-expectations-0.8.2:=[profile?] <dev-haskell/hspec-expectations-0.8.3:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/quickcheck-2.12:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
new file mode 100644
index 000000000000..ae4955444518
--- /dev/null
+++ b/dev-haskell/hspec-meta/hspec-meta-2.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A version of Hspec which is used to test Hspec itself"
+HOMEPAGE="https://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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:=[profile?]
+	dev-haskell/quickcheck-io:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/setenv:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hspec-meta/metadata.xml b/dev-haskell/hspec-meta/metadata.xml
index 16c1f0318cf6..cbe0038a21d2 100644
--- a/dev-haskell/hspec-meta/metadata.xml
+++ b/dev-haskell/hspec-meta/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A stable version of Hspec which is used to test the
-		in-development version of Hspec.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">hspec-meta</remote-id>
+		<remote-id type="github">hspec/hspec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hspec-smallcheck/Manifest b/dev-haskell/hspec-smallcheck/Manifest
deleted file mode 100644
index 4953f5ea01bb..000000000000
--- a/dev-haskell/hspec-smallcheck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hspec-smallcheck-0.5.2.tar.gz 4432 BLAKE2B 2eb26ca677a7665f65911193047ccbcf798f2620ce30959e6a667e3b6560d1f7eef68928f39f97b93a7e1abd39c891b6a6f823c227d39a892e42309d6055e2ee SHA512 2fd27126285e7d308f277480dcadcb6b047f67a82389edaf7d4761504f88ffedd8831db5b6b4f178c429cf3e8009e8aee8c6b05040dd960e7d2813e50908bd05
diff --git a/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.5.2.ebuild b/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.5.2.ebuild
deleted file mode 100644
index 164e9aac6667..000000000000
--- a/dev-haskell/hspec-smallcheck/hspec-smallcheck-0.5.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="SmallCheck support for the Hspec testing framework"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/call-stack:=[profile?]
-	>=dev-haskell/hspec-core-2.5.0:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	>=dev-haskell/smallcheck-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-orphans
-		dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/hspec-smallcheck/metadata.xml b/dev-haskell/hspec-smallcheck/metadata.xml
deleted file mode 100644
index f9940a6d1350..000000000000
--- a/dev-haskell/hspec-smallcheck/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		SmallCheck support for the Hspec testing framework
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hspec-wai/Manifest b/dev-haskell/hspec-wai/Manifest
new file mode 100644
index 000000000000..d418ef5839bc
--- /dev/null
+++ b/dev-haskell/hspec-wai/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
new file mode 100644
index 000000000000..2113672f6249
--- /dev/null
+++ b/dev-haskell/hspec-wai/hspec-wai-0.10.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Experimental Hspec support for testing WAI applications"
+HOMEPAGE="https://github.com/hspec/hspec-wai#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/base-compat:=[profile?]
+	dev-haskell/case-insensitive:=[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:=[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-9.1
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild b/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild
new file mode 100644
index 000000000000..2dffe8d9ac75
--- /dev/null
+++ b/dev-haskell/hspec-wai/hspec-wai-0.11.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Experimental Hspec support for testing WAI applications"
+HOMEPAGE="https://github.com/hspec/hspec-wai#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/base-compat:=[profile?]
+	dev-haskell/case-insensitive:=[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:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/wai-3:=[profile?]
+	>=dev-haskell/wai-extra-3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		dev-haskell/hspec
+		>=dev-haskell/wai-3.2.2
+	)
+"
diff --git a/dev-haskell/hspec-wai/metadata.xml b/dev-haskell/hspec-wai/metadata.xml
new file mode 100644
index 000000000000..0e880184b7ff
--- /dev/null
+++ b/dev-haskell/hspec-wai/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">hspec-wai</remote-id>
+		<remote-id type="github">hspec/hspec-wai</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/hspec/Manifest b/dev-haskell/hspec/Manifest
index 53750dba0017..ecfc7b1b7400 100644
--- a/dev-haskell/hspec/Manifest
+++ b/dev-haskell/hspec/Manifest
@@ -1,10 +1,2 @@
-DIST hspec-1.10.0.tar.gz 31928 BLAKE2B cd6ca92cbccaf9b60cd780d429471fcd97072255efc26a787bd6ef37d4c2d360182c9eec97945481fcf5b268124c1671b94ddd48cab03bcd6a89d2ab1e3dd8de SHA512 118fd02c78fc68e743cf2342c111fecda535b0487241e5f2d93281d2538d6b9d2e12f3f5b2b15c15dade1ffc9314e2c90f5327225d92e2ea8ef2770a912c9b83
-DIST hspec-1.5.4.tar.gz 30050 BLAKE2B fdb514050c4eb91b1f0a819e58ffdde1853ad1dbd692b0623be5dfadbec1014a6c83810d339419dda64a8873faf5afb5e619eeaf7ca24cf25015852a2669bf4d SHA512 a2587d3b105786e74664ca378c09c971f11f48daf6175dd6eb6ada84116312911545bedf93b8ef3a50c86374899f1b6267404f82587047d8d5163515ac58b346
-DIST hspec-1.7.2.1.tar.gz 34555 BLAKE2B 1f4884053079186c151cc3b9a18dc28f3066a7694c6f92d116c50e6b159233441aaac0988cb8bbc581a843461ea933e3b1034f113509c47dae7e6af1efef9e02 SHA512 e57788ff751b32d1130e866af3cb43aa2be7e2215205d47c06ea07f9a5cd6aed41ee8167ae49e3ea5d80bf00f5c12d0705dd3d4a616b58a422d9dcf48d7938e2
-DIST hspec-1.8.1.1.tar.gz 33019 BLAKE2B 6eb938d69ff79601922221bfd79c3445557d253725bafbd9daed0b4a973c77b6f2f4afa7f83499e5372de174c3895c1c6dbd1406f8f7b34c8c9c3a1bc6c4efc8 SHA512 248b1e6c712b525d4a1502e40ee8b31d186e3da48ca6fd500ee7d4a6e2e36cdb5be5d2aef1260ea7e0c24151ceb31ab01ee912ce779c159fb99227ab24f392e1
-DIST hspec-1.8.3.tar.gz 32691 BLAKE2B b6171b72c251cc9185634bdc8e2828e49b09392f0a3be18ec1423ac6224a89524e89e488ecebd542c2fcfe389e3d71d344c264e6b1b377ac80510061b5939a8f SHA512 bb07f0b0049439d31541ea5da5caab06f581149481db9f97c070535b6e2c7dac46c688be13ab89448f353aae594130c8cee51bd46a168d3073cf5b93e7e5390a
-DIST hspec-2.1.2.tar.gz 5200 BLAKE2B 387a3f54bb55b805c6a8b437cf814ffdb800cffdf57e88b675cfb6cd24cb6cfde51aacaa2643e42a6d05d9aad5cb10134a8b20fda5a599b9cc09eb731b7d4863 SHA512 9709ff584e616b1128e4ad00f93cdb6673a5db61442cb0684ca01c3e9546bfb401a8d894dea2eadec3fee4696a74f5ca846beab841cd88afa15d63aadcbe7d82
-DIST hspec-2.1.4.tar.gz 5201 BLAKE2B 056e64b74bcdf8ca0ad5c1b37c67b5a9b921a1ecd06627cba31216c074afb8304fb03e465dbfbd1deaaa0d0977d11b48d5864836ba21d9884f3b7aa3f5165483 SHA512 04def062e104e939510fba9e4d386df40f964abc07bd0c6aefcd2dca0b4abb8519073ba1ebe6e47685eb558c30f9be0986cce30fbc1cef83e0b9daf66f040398
-DIST hspec-2.2.1.tar.gz 5398 BLAKE2B ffd5cc2195aee1b6226ed6f67aaa742bbc03078a8431dd46b538bf333d3a3f8e6a3c2d2ec2a7438ed62e87f6ee903a4ef752096f9bfd58d9d42e8ac5b345d674 SHA512 47af2f1f129c8d045305e080f504c469332bd9c50c0f98a3a165bd8fd11772a499b13e223067d59a959d2e83d2858447d89bf9b83ce4c4d857e7d39379bb07b2
-DIST hspec-2.2.4.tar.gz 5438 BLAKE2B 29f4e53c8bde62314e0d351c25afb93219783b3a071fb77820955ef4dc812d206f92de43d621a05eb83070c04dcc873f82fc1100f6bfb264d7510ff755aa820d SHA512 65a76857fc6e46b1f94a419e4541e14addfad78e0cd72355aa00ba0cf035479024abf6b970e094ad86a42db6e303662a55bf25e81384ce39f00eb7e07259582d
-DIST hspec-2.7.1.tar.gz 9270 BLAKE2B b4cd1433c0e5eb0075c1560c244767cba9b0d34591fbede96c6ccc4f3ccc55f414fcdbcc943a21b7e42254ed091b4f2d496af5b42999ec8802468d9bd3c83965 SHA512 64e69444d447072ec501b745c7c8913f38bb6b540db4867ed4cbe4752e9d147e8a7e75538c15be7d8c65f9f8e7b48654e8fc2b53ae733a28236074fbafe9a6c6
+DIST hspec-2.10.6.tar.gz 10847 BLAKE2B 3ed8df690cbf77319aa6cf449df462f3bd5bbeefff31f220a9d4ed4af51fb30d63e0589559718dbbdde07708dd5d3e668a5986575b8397182b946f2641196b15 SHA512 bb20b02b22b8b6dd2cf64141a0738ee786278514fadd9e81712e5aa9e3d25d63b1cfdc89199df34b29c749b3f958f26a660116ffc10bbf6d0db0e7ee97aedddf
+DIST hspec-2.9.4.tar.gz 10117 BLAKE2B fbe881a560fc015ab4b3b3d81710d9fa758e65fe6740aeea5273e02588d373cd83b64cc7bba870bcf943787614681ad9a139912c3cbe04e9e822b8cb24788e5c SHA512 648fd812f22613616c1f81206e8bd0ee3bbfe52a4e367344887a832b56317615711aa401c1ac6dfab46f84404885e01065d91e154b9136bde041cf5e419b01a0
diff --git a/dev-haskell/hspec/hspec-1.10.0.ebuild b/dev-haskell/hspec/hspec-1.10.0.ebuild
deleted file mode 100644
index 74d68ea3bdd4..000000000000
--- a/dev-haskell/hspec/hspec-1.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/async-2:=[profile?]
-	>=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	dev-haskell/tf-random:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.4.1
-		dev-haskell/ghc-paths
-		>=dev-haskell/hspec-meta-1.9.1
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec/hspec-1.5.4.ebuild b/dev-haskell/hspec/hspec-1.5.4.ebuild
deleted file mode 100644
index 657ad84ff7e8..000000000000
--- a/dev-haskell/hspec/hspec-1.5.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="https://hspec.github.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-		=dev-haskell/hspec-expectations-0.3.2*:=[profile?]
-		>=dev-haskell/hunit-1.2.5:=[profile?]
-		>=dev-haskell/quickcheck-2.5.1:=[profile?]
-		dev-haskell/quickcheck-io:=[profile?]
-		=dev-haskell/random-1.0*:=[profile?]
-		dev-haskell/setenv:=[profile?]
-		>=dev-haskell/transformers-0.2.2.0:=[profile?]
-		<dev-haskell/transformers-0.4.0:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/doctest-0.9.4.1
-			dev-haskell/ghc-paths
-			>=dev-haskell/hspec-meta-1.5.1
-			>=dev-haskell/silently-1.2.4
-		)"
diff --git a/dev-haskell/hspec/hspec-1.7.2.1.ebuild b/dev-haskell/hspec/hspec-1.7.2.1.ebuild
deleted file mode 100644
index ae00f3b488d3..000000000000
--- a/dev-haskell/hspec/hspec-1.7.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/hspec-expectations-0.3.3:=[profile?] <dev-haskell/hspec-expectations-0.3.4:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/doctest-0.9.4.1
-		dev-haskell/ghc-paths
-		>=dev-haskell/hspec-meta-1.7.1
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec/hspec-1.8.1.1.ebuild b/dev-haskell/hspec/hspec-1.8.1.1.ebuild
deleted file mode 100644
index 45c2dfc1e7e5..000000000000
--- a/dev-haskell/hspec/hspec-1.8.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.4.1
-		dev-haskell/ghc-paths
-		>=dev-haskell/hspec-meta-1.8.0
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec/hspec-1.8.3.ebuild b/dev-haskell/hspec/hspec-1.8.3.ebuild
deleted file mode 100644
index b6d4c5562da3..000000000000
--- a/dev-haskell/hspec/hspec-1.8.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Behavior-Driven Development for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
-	>=dev-haskell/hspec-expectations-0.5.0:=[profile?] <dev-haskell/hspec-expectations-0.5.1:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:=[profile?]
-	dev-haskell/quickcheck-io:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	dev-haskell/setenv:=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?] <dev-haskell/transformers-0.4.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.4.1
-		dev-haskell/ghc-paths
-		>=dev-haskell/hspec-meta-1.8.0
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/hspec/hspec-2.1.2.ebuild b/dev-haskell/hspec/hspec-2.1.2.ebuild
deleted file mode 100644
index 4d630f6a2db9..000000000000
--- a/dev-haskell/hspec/hspec-2.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/hspec-core-2.1.2:=[profile?]
-	~dev-haskell/hspec-discover-2.1.2:=[profile?]
-	>=dev-haskell/hspec-expectations-0.6.1:=[profile?] <dev-haskell/hspec-expectations-0.6.2:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec-core
-		>=dev-haskell/hspec-meta-1.12
-		dev-haskell/stringbuilder )
-"
diff --git a/dev-haskell/hspec/hspec-2.1.4.ebuild b/dev-haskell/hspec/hspec-2.1.4.ebuild
deleted file mode 100644
index 6af355f1da05..000000000000
--- a/dev-haskell/hspec/hspec-2.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depend: hspec[test]->stringbuider[test]->hspec
-
-RDEPEND="~dev-haskell/hspec-core-2.1.4:=[profile?]
-	~dev-haskell/hspec-discover-2.1.4:=[profile?]
-	>=dev-haskell/hspec-expectations-0.6.1:=[profile?] <dev-haskell/hspec-expectations-0.6.2:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec-core
-		>=dev-haskell/hspec-meta-1.12
-		dev-haskell/stringbuilder )
-"
diff --git a/dev-haskell/hspec/hspec-2.10.6.ebuild b/dev-haskell/hspec/hspec-2.10.6.ebuild
new file mode 100644
index 000000000000..f8f9cbab5453
--- /dev/null
+++ b/dev-haskell/hspec/hspec-2.10.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="https://hspec.github.io/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hspec/hspec-2.2.1.ebuild b/dev-haskell/hspec/hspec-2.2.1.ebuild
deleted file mode 100644
index ebb2ae03b4df..000000000000
--- a/dev-haskell/hspec/hspec-2.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # has circular dependency
-
-RDEPEND="~dev-haskell/hspec-core-2.2.1:=[profile?]
-	~dev-haskell/hspec-discover-2.2.1:=[profile?]
-	>=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-haskell/transformers-0.2.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec-core
-		>=dev-haskell/hspec-meta-2.2.0
-		dev-haskell/stringbuilder )
-"
diff --git a/dev-haskell/hspec/hspec-2.2.4.ebuild b/dev-haskell/hspec/hspec-2.2.4.ebuild
deleted file mode 100644
index cba8e6c2db07..000000000000
--- a/dev-haskell/hspec/hspec-2.2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # has circular dependency
-
-RDEPEND="~dev-haskell/hspec-core-2.2.4:=[profile?]
-	~dev-haskell/hspec-discover-2.2.4:=[profile?]
-	>=dev-haskell/hspec-expectations-0.7.2:=[profile?] <dev-haskell/hspec-expectations-0.7.3:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-meta-2.2.0
-		dev-haskell/stringbuilder )
-"
diff --git a/dev-haskell/hspec/hspec-2.7.1.ebuild b/dev-haskell/hspec/hspec-2.7.1.ebuild
deleted file mode 100644
index 4634717e59ab..000000000000
--- a/dev-haskell/hspec/hspec-2.7.1.ebuild
+++ /dev/null
@@ -1,28 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Testing Framework for Haskell"
-HOMEPAGE="http://hspec.github.io/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~dev-haskell/hspec-core-2.7.1:=[profile?]
-	~dev-haskell/hspec-discover-2.7.1:=[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-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/hspec/hspec-2.9.4.ebuild b/dev-haskell/hspec/hspec-2.9.4.ebuild
new file mode 100644
index 000000000000..2f38a5db8ae6
--- /dev/null
+++ b/dev-haskell/hspec/hspec-2.9.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A Testing Framework for Haskell"
+HOMEPAGE="https://hspec.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hspec/metadata.xml b/dev-haskell/hspec/metadata.xml
index 3ab9e7c8a695..2ad3a3322f59 100644
--- a/dev-haskell/hspec/metadata.xml
+++ b/dev-haskell/hspec/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Behavior Driven Development for Haskell
-		
-		Hspec is roughly based on the Ruby library RSpec. However, Hspec is just a framework for running HUnit and QuickCheck tests. Compared to other options, it provides a much nicer syntax that makes tests very easy to read.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">hspec</remote-id>
+		<remote-id type="github">hspec/hspec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hsql-mysql/Manifest b/dev-haskell/hsql-mysql/Manifest
deleted file mode 100644
index cc5e6c2f085f..000000000000
--- a/dev-haskell/hsql-mysql/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hsql-mysql-1.8.2.tar.gz 4659 BLAKE2B 342f9baf9deb2596d2276e8050c202bbf476f56c5eb654f71b52959b8d5fba31ad4cfaf4c2b9ac47cc862e4d97468dbe5c312a73c2f8496f561183b1d226b46d SHA512 8476cfe746085f75a50aa2d24ecfd87abb8e5809f6292e3f5ebab184d96672178dc23a2d6f749b99d916932e19894ed022138eb192e4e90de94097625374941b
-DIST hsql-mysql-1.8.3.tar.gz 4366 BLAKE2B af5fcd66b15d7ac4d9fb3cf72688fcd47e262cc9fdbf77b93fef5d13d8242806c433dac98ae52948639a48d8318db3736c3bba03ced3c9463a0d49bf699d0980 SHA512 8004ad313774ecb628e9d1a8876c90efba854d2e36c5918d378269e6e1c3d09eb1c2ad0250f1455879d5097a75ec33a18a379228ea250a69af261c6e7846577e
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
deleted file mode 100644
index b98c2ee602f2..000000000000
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=6
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="MySQL driver for HSQL"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-mysql"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/cabal[profile?]
-	>=dev-haskell/hsql-1.8.2[profile?]
-	>=dev-lang/ghc-6.10.1
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
deleted file mode 100644
index 04ea099f18e3..000000000000
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.8.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=6
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="MySQL driver for HSQL"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-mysql"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="" # buggy, has no headers
-IUSE=""
-
-RDEPEND="dev-haskell/cabal[profile?]
-	>=dev-haskell/hsql-1.8.2[profile?]
-	>=dev-lang/ghc-6.10.1
-	dev-db/mysql-connector-c:0=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/hsql-mysql/metadata.xml b/dev-haskell/hsql-mysql/metadata.xml
deleted file mode 100644
index 0a9da2fcff00..000000000000
--- a/dev-haskell/hsql-mysql/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		MySQL driver for HSQL.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsql-odbc/Manifest b/dev-haskell/hsql-odbc/Manifest
deleted file mode 100644
index d82c157c4c42..000000000000
--- a/dev-haskell/hsql-odbc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hsql-odbc-1.8.2.tar.gz 8041 BLAKE2B 80b3881297218b7dadfc7826acdb19e9f61d41124f5ca2d5a589ceabdfb03a6b64020432b43579e9fc9af82956e64147354b35ac5fb08b8e6eccd13e0f10afd1 SHA512 78f91ee63007e02820eefd1bd9ae08b9659667aa70f545ef83ff6d83d592c7f542339db129bb6c3ad14f4cdde320b3a4e1251c25267db716dbd88cbb5931a6d5
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
deleted file mode 100644
index 0e404b50ee54..000000000000
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.8.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell Interface to ODBC"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-odbc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hsql-1.8.2[profile?]
-		>=dev-lang/ghc-6.10.1
-		>=dev-db/unixODBC-2.2"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
diff --git a/dev-haskell/hsql-odbc/metadata.xml b/dev-haskell/hsql-odbc/metadata.xml
deleted file mode 100644
index b9392b99fd84..000000000000
--- a/dev-haskell/hsql-odbc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ODBC driver for HSQL.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsql-sqlite3/Manifest b/dev-haskell/hsql-sqlite3/Manifest
deleted file mode 100644
index 8e0dd92c1380..000000000000
--- a/dev-haskell/hsql-sqlite3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hsql-sqlite3-1.8.2.tar.gz 4752 BLAKE2B 84a77f8bc835b4337d99cdd974f7cd5960f7b52faeb4c06e2572d31887bdae3d2cdf6bf00d4c44eae7a4f98b116a134e950353932ef9cb43d557b11b85ffff96 SHA512 962d4396a3844f4d1b4f4be6f6d81e085f1deaa2e7ca0776a93aed4f34cb5e40edab96d568fa3a086ea0c4017dff7de8dd1d25e81ad27840c844ed885af5e42e
diff --git a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
deleted file mode 100644
index 0f537298e791..000000000000
--- a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="SQLite3 driver for HSQL"
-HOMEPAGE="https://hackage.haskell.org/package/hsql-sqlite3"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/sqlite-3.0
-		>=dev-haskell/hsql-1.8.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/hsql-sqlite3/metadata.xml b/dev-haskell/hsql-sqlite3/metadata.xml
deleted file mode 100644
index cb7c1126d7b1..000000000000
--- a/dev-haskell/hsql-sqlite3/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell Interface to SQLite 3 via libsqlite3
-		in the standard library path.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsql/Manifest b/dev-haskell/hsql/Manifest
deleted file mode 100644
index 649048b12620..000000000000
--- a/dev-haskell/hsql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hsql-1.8.2.tar.gz 10568 BLAKE2B 9890847e6ec5c78feb414e247098a108bf0d6135f8795e9efeb4934fb1b5ad76ab3fb8e78f14016007932b2c51bdda635551078c391db5ccb758b1ddd25632b1 SHA512 f4a002573bead2de330d526ab4158517e66f92f4d6a87a517dd2e7949abb7566c318d96e4072535b157f3d40a5714702f4127ea106ab976bf5f0ec302e50c6f6
diff --git a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild b/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
deleted file mode 100644
index 5d1559a6e3a1..000000000000
--- a/dev-haskell/hsql/hsql-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Database access from Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/hsql"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-
-	elog "You will probably want to emerge one or more HSQL backend."
-	elog "These backends are available:"
-	elog "		hsql-postgresql"
-	elog "		hsql-mysql"
-	elog "		hsql-sqlite"
-	elog "		hsql-odbc"
-}
diff --git a/dev-haskell/hsql/metadata.xml b/dev-haskell/hsql/metadata.xml
deleted file mode 100644
index 205f44e51ba7..000000000000
--- a/dev-haskell/hsql/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Simple library for database access from Haskell.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hstringtemplate/Manifest b/dev-haskell/hstringtemplate/Manifest
deleted file mode 100644
index abfd504da44c..000000000000
--- a/dev-haskell/hstringtemplate/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST HStringTemplate-0.7.3.tar.gz 15961 BLAKE2B ffdf31dfebc407737332005ff422b1154dea6307819b7d4acfc79985fef91d9b52bd19ad62a5f11e3152257b8f876050375923fdd439b51603aa5d38436f902d SHA512 987e827dabf64f13df9ec584c6ac4d9b121bec07543f9600e212c1a20fe03aa1fcb24f8f669b5ae53f85e4ec9d2d6a7c76a2845496a8440332b601c64fcb552c
-DIST HStringTemplate-0.8.3.tar.gz 16023 BLAKE2B 5a85cf34a3be754dff9ea7b1c86d4444cdeefe97c658e8fa57e191491d0201790036c6893ebb046c404e65546854bd8351898bb56a9b46a4fb7050913425373f SHA512 d356ea7defea10535f5ec188a4bdc6ecba89f447c509af04421753dc9b0f4cf85aa24ec1dd2c8ba0b31bfef06576e0a9f8c457e890468244bae22abc47d26f8e
-DIST HStringTemplate-0.8.5.tar.gz 15740 BLAKE2B 4eb9f8bc269271bb7b307bfacdcc1426486629968da951caa9d4f835b0f1c4b12580d6dc0382ec578ac4e98e5b2b19218f0402a0ffb19d66e7ec75d7caf604a1 SHA512 81c38009abf568316263aab479bcd2e04b03419b52c98d566a402b0d1c65a49052c8f68a7c6e6b285d108489c0fb2387ab98622aacdaa7596fb009517ecbc2d5
-DIST HStringTemplate-0.8.7.tar.gz 15903 BLAKE2B c030b287893e908e2e8b70f8b8f06750978d2109daa86a26c8c08abe2e00112f7fdbb8c8da1c45c689803e7bfc2027fda87c44b24d6d3f31c129b0803c42f324 SHA512 a00552a104231aa44e06c558f200a36430774351de2e7c55b0f25fd064d29aa25e62e48185d79184d916fe7440ad2a6d20dd54a5b4ad4bb635e58fc259185e5b
diff --git a/dev-haskell/hstringtemplate/hstringtemplate-0.7.3.ebuild b/dev-haskell/hstringtemplate/hstringtemplate-0.7.3.ebuild
deleted file mode 100644
index e8c01c9c4432..000000000000
--- a/dev-haskell/hstringtemplate/hstringtemplate-0.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HStringTemplate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="StringTemplate implementation in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/HStringTemplate"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	<dev-haskell/parsec-4:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hstringtemplate/hstringtemplate-0.8.3.ebuild b/dev-haskell/hstringtemplate/hstringtemplate-0.8.3.ebuild
deleted file mode 100644
index 74e9176a2f2c..000000000000
--- a/dev-haskell/hstringtemplate/hstringtemplate-0.8.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HStringTemplate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="StringTemplate implementation in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/HStringTemplate"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	<dev-haskell/parsec-4:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hstringtemplate/hstringtemplate-0.8.5.ebuild b/dev-haskell/hstringtemplate/hstringtemplate-0.8.5.ebuild
deleted file mode 100644
index 1d9e5f7a9326..000000000000
--- a/dev-haskell/hstringtemplate/hstringtemplate-0.8.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HStringTemplate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="StringTemplate implementation in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/HStringTemplate"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	<dev-haskell/parsec-4:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild b/dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild
deleted file mode 100644
index fb6fc92d09b3..000000000000
--- a/dev-haskell/hstringtemplate/hstringtemplate-0.8.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HStringTemplate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="StringTemplate implementation in Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/HStringTemplate"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	<dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'time >= 1.4.2 && < 1.9' 'time >= 1.4.2'
-}
diff --git a/dev-haskell/hstringtemplate/metadata.xml b/dev-haskell/hstringtemplate/metadata.xml
deleted file mode 100644
index 908980a64424..000000000000
--- a/dev-haskell/hstringtemplate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A port of the Java library by Terrence Parr.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsyaml-aeson/Manifest b/dev-haskell/hsyaml-aeson/Manifest
deleted file mode 100644
index 7b09584c0b17..000000000000
--- a/dev-haskell/hsyaml-aeson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST HsYAML-aeson-0.2.0.0.tar.gz 11095 BLAKE2B b168c5d676718c99567835aaaa53321ccecc7b089e15850676a0b600f6ea2280facd4cf22e0212807c6c952287b125d52974ed19240390c0bc22d54c7047a641 SHA512 09da59c38e9fead3b11bbb6752cef803ae2d60392b710ea3958091d6256ff267f0b0f9b27293bbbc96a9d3af08464e463feafcba4a7caab6fd78286127f91527
diff --git a/dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild b/dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild
deleted file mode 100644
index a6483a89c316..000000000000
--- a/dev-haskell/hsyaml-aeson/hsyaml-aeson-0.2.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HsYAML-aeson"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="JSON to YAML Adapter"
-HOMEPAGE="https://github.com/hvr/HsYAML"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base         >= 4.5 && < 4.14' 'base         >= 4.5' \
-		'containers   >=0.4.2 && <0.7' 'containers   >=0.4.2'
-}
diff --git a/dev-haskell/hsyaml-aeson/metadata.xml b/dev-haskell/hsyaml-aeson/metadata.xml
deleted file mode 100644
index a66d30e2a063..000000000000
--- a/dev-haskell/hsyaml-aeson/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The [YAML 1.2](https://yaml.org/spec/1.2/spec.html) format provides
-		a much richer data-model and feature-set
-		than the [JavaScript Object Notation (JSON)](https://tools.ietf.org/html/rfc7159) format.
-		However, sometimes it's desirable to ignore the extra capabilities
-		and treat YAML as if it was merely a more convenient markup format
-		for humans to write JSON data. To this end this module provides a
-		compatibility layer atop [HsYAML](https://hackage.haskell.org/package/HsYAML)
-		which allows decoding YAML documents in the more limited JSON data-model while also providing
-		convenience by reusing [aeson](https://hackage.haskell.org/package/aeson)'s
-		'FromJSON' instances for decoding the YAML data into native Haskell data
-		types.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hsyaml/Manifest b/dev-haskell/hsyaml/Manifest
index 68e65ca3a7fd..611ac0253b3a 100644
--- a/dev-haskell/hsyaml/Manifest
+++ b/dev-haskell/hsyaml/Manifest
@@ -1 +1,3 @@
-DIST HsYAML-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
+DIST hsyaml-0.2.1.0-rev4.cabal 5397 BLAKE2B 66c3351dd9d89684d17c48aa7efbf6d49e422ce20f5537712fc13ea454f675cd70aca8657695075de8b75bfed1f27de6fb351abc35854535fb1972f54d2fe31e SHA512 abbcd42b604b11ad1758f85f6de732b65fc21f1d08d5855569cce6d52b7ca26c88431bcec640031b7209c768bd5902d401039f52ffd31b857616298000697ffc
+DIST hsyaml-0.2.1.0.tar.gz 83976 BLAKE2B fff32d30eb6cb76c852c9cb1909b8be06e4818d23322397271594dfe60895ea79ffa8cc4c4944173de30d46e1ef8a2872972434aeacec44fff8d52dc169264e5 SHA512 f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
+DIST hsyaml-0.2.1.2.tar.gz 84263 BLAKE2B 1fb534a31cdcc41536e3f0114f27b4f140142293aca052d72d5d5993ff5ff686fea30a893e30efe34c2969ad9237228a43960f8adac201470568628d60464237 SHA512 4ade814924422a0985096be48ce0305f8491df03985511b408fefcf68a044f9ec4a0d29d978c2bb72b36315c49ee3faea69d8336cd5d88ca3d2d86077f46d003
diff --git a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
index 756bb6481b97..12061ee0f047 100644
--- a/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
+++ b/dev-haskell/hsyaml/hsyaml-0.2.1.0.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.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"
+DESCRIPTION="Pure Haskell YAML 1.2 processor"
 HOMEPAGE="https://github.com/hvr/HsYAML"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 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,20 +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}"
-
-src_prepare() {
-	default
-
-	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/hsyaml-0.2.1.2.ebuild b/dev-haskell/hsyaml/hsyaml-0.2.1.2.ebuild
new file mode 100644
index 000000000000..162f34b60644
--- /dev/null
+++ b/dev-haskell/hsyaml/hsyaml-0.2.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_PN="HsYAML"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell YAML 1.2 processor"
+HOMEPAGE="https://github.com/haskell-hvr/HsYAML"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="exe"
+
+RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-2.2:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	exe? ( >=dev-haskell/megaparsec-7.0:=[profile?] <dev-haskell/megaparsec-10:=[profile?]
+		>=dev-haskell/microaeson-0.1:=[profile?] <dev-haskell/microaeson-0.2:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.6
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag exe exe)
+}
diff --git a/dev-haskell/hsyaml/metadata.xml b/dev-haskell/hsyaml/metadata.xml
index 4fd3981c32d1..a72f234e538f 100644
--- a/dev-haskell/hsyaml/metadata.xml
+++ b/dev-haskell/hsyaml/metadata.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		@HsYAML@ is a [YAML 1.2](http://yaml.org/spec/1.2/spec.html) parser implementation for Haskell.
-		
-		Features of @HsYAML@ include:
-		
-		* Pure Haskell implementation with small dependency footprint and emphasis on strict compliance with the [YAML 1.2 specification](http://yaml.org/spec/1.2/spec.html).
-		* Direct decoding to native Haskell types via (@aeson@-inspired) typeclass-based API (see &quot;Data.YAML&quot;).
-		* Support for constructing custom YAML node graph representation (including support for cyclic YAML data structures).
-		* Support for the standard (untyped) /Failsafe/, (strict) /JSON/, and (flexible) /Core/ \&quot;schemas\&quot; providing implicit typing rules as defined in the YAML 1.2 specification (including support for user-defined custom schemas).
-		* Event-based API resembling LibYAML&#39;s Event-based API (see &quot;Data.YAML.Event&quot;).
-		* Low-level API access to lexical token-based scanner (see &quot;Data.YAML.Token&quot;).
-		
-	</longdescription>
+	<use>
+		<flag name="exe">Enable @exe:yaml-test@ component</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">HsYAML</remote-id>
+		<remote-id type="github">hvr/HsYAML</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/htf/Manifest b/dev-haskell/htf/Manifest
deleted file mode 100644
index 61389c69d6a7..000000000000
--- a/dev-haskell/htf/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST HTF-0.13.1.0.tar.gz 78310 BLAKE2B eab7a9c2eb05246dbd413f31c32554b01527211bb469ceec8a54d11e427ca74ee706640fe3d49fc40486a238db4e284ce97511c371e7eb7161d65cb841f77a76 SHA512 1292f8f0b9189e1ce05de1cf6f686ce77a839c4191a5f8b8000c8d740abe4b8f457a7c5ed8aadc13221fe9fde9b4c15bde9f9f6f53ac03178cd1884572fb4069
-DIST HTF-0.13.2.5.tar.gz 79761 BLAKE2B 2caf1ea1192087fd614f097a45508d290cfb2a7f7633f262c7b3b37d1f1bf23d7a3cb0b7746a6b2f619b41e08500f6ce1d1a4700ae216a0641e4edd1c5db5b03 SHA512 2c68a74c6492343d21405965776d3ee7c2930677c626c5353953d53274213bee0cf803c1b6f14600759c89eb0a66db4d248af75263e6c5f1bb5a39f569b6af78
diff --git a/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch b/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
deleted file mode 100644
index ac1472051eba..000000000000
--- a/dev-haskell/htf/files/htf-0.13.1.0-aeson-pretty-0.8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/tests/TestHTF.hs b/tests/TestHTF.hs
-index 4a71874..c0442a5 100644
---- a/tests/TestHTF.hs
-+++ b/tests/TestHTF.hs
-@@ -383,3 +383,3 @@ checkOutput output =
-           BSL.toStrict $
--          J.encodePretty' (J.Config 2 J.compare) json
-+          J.encodePretty' (J.defConfig { J.confIndent = J.Spaces 2, J.confCompare = J.compare }) json
- 
diff --git a/dev-haskell/htf/htf-0.13.1.0.ebuild b/dev-haskell/htf/htf-0.13.1.0.ebuild
deleted file mode 100644
index 614b9ad03d9c..000000000000
--- a/dev-haskell/htf/htf-0.13.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Haskell Test Framework"
-HOMEPAGE="https://github.com/skogsbaer/HTF/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/cpphs-1.19:=[profile?]
-	>=dev-haskell/diff-0.3:=[profile?]
-	dev-haskell/haskell-src:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/regex-compat-0.92:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/xmlgen-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/aeson-pretty
-		>=dev-haskell/temporary-1.1
-		>=dev-haskell/unordered-containers-0.2 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-aeson-pretty-0.8.patch
-}
diff --git a/dev-haskell/htf/htf-0.13.2.5.ebuild b/dev-haskell/htf/htf-0.13.2.5.ebuild
deleted file mode 100644
index d69d9e380af8..000000000000
--- a/dev-haskell/htf/htf-0.13.2.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: needs htfpp already installed
-inherit haskell-cabal
-
-MY_PN="HTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The Haskell Test Framework"
-HOMEPAGE="https://github.com/skogsbaer/HTF/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs stack, needs htfpp already installed
-
-RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/cpphs-1.19:=[profile?]
-	>=dev-haskell/diff-0.3:=[profile?]
-	dev-haskell/haskell-src:=[profile?]
-	>=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/quickcheck-2.3:2=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/regex-compat-0.92:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/xmlgen-0.6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/htf/metadata.xml b/dev-haskell/htf/metadata.xml
deleted file mode 100644
index be697624296d..000000000000
--- a/dev-haskell/htf/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Haskell Test Framework (/HTF/ for short) lets you define unit
-		tests (&lt;http://hunit.sourceforge.net&gt;), QuickCheck properties
-		(&lt;http://www.cs.chalmers.se/~rjmh/QuickCheck/&gt;), and black box
-		tests in an easy and convenient way. The HTF uses a custom
-		preprocessor that collects test definitions automatically.
-		Furthermore, the preprocessor allows the HTF to report failing
-		test cases with exact file name and line number information.
-		
-		The documentation of the "Test.Framework.Tutorial" module
-		provides a tutorial for the HTF.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">skogsbaer/HTF</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/html-conduit/Manifest b/dev-haskell/html-conduit/Manifest
index bd5a1a4fef5b..ff9af5998f13 100644
--- a/dev-haskell/html-conduit/Manifest
+++ b/dev-haskell/html-conduit/Manifest
@@ -1,4 +1 @@
-DIST html-conduit-1.1.1.1.tar.gz 4004 BLAKE2B e38440a26bbe1d0f888dc4e773647f6e5df3982ba139a7dbfc2b746122045763f8986bf73a13d89331dda9cb2de4891ff6b8cb002cd21bfa16a64e8dbb5246f3 SHA512 fc69c595f97c952d624cc8a22597d6f966ca343dd8f6b9c5da8085ba9a7609e1bcfa803dbb705e9911c5a86de7456331226080869a04a56b69ec36f4ab5bdb50
-DIST html-conduit-1.2.1.1.tar.gz 4125 BLAKE2B 6bdd59682118a5c6724f360142f89577aa1c19502a3896b7b8cc59978c05cf13b1a626e433d4ee74348792ccb12927f10fefb49f28644e4997d54675bdb3d067 SHA512 601c1b840ab194b6a3e89c1a7af7335a8a8e2a9c01bdd4d19914c1b512bc1d56dfa199855072b9e0406f8744607bd3e3efe3a480d2dc824048b67cfe1034e9b7
-DIST html-conduit-1.2.1.tar.gz 4117 BLAKE2B 9eeaa5a5a336c9ff9f43224d4dce2f92f5c2ebf1ed6a4e302c3a0891f8111065ee4cf0eeeef745ef83d8d23dfb38b964b0089302cd8a16d517353d985ee60f60 SHA512 557dc27479cb83cb958839ec29faca4997ff52f848430b5a3c20f17dcf388c76848d0c83db376077f8a6f192312e124d5b0e6b86589d40053e1a657ca96ee5ac
 DIST html-conduit-1.3.2.1.tar.gz 8976 BLAKE2B 070f6f0bc2c47c5e884d81cca1ccd5c72fbfefc39fc4a3d937d9a10ebf496b405b3e4f46382a882fc96cd12247ee00a834e90d2d06256316c96e2d3e8f2d3147 SHA512 94e9db8db839c5368f5a042a7039d44e3fabf5ffa30426894675317b985288c0d5fa94a6d1864b94802ea2fda3ff2728c4578759405dacdc64d8e2cfbb24aa70
diff --git a/dev-haskell/html-conduit/html-conduit-1.1.1.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.1.1.1.ebuild
deleted file mode 100644
index 067ef7434615..000000000000
--- a/dev-haskell/html-conduit/html-conduit-1.1.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse HTML documents using xml-conduit datatypes"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.4:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/xml-conduit-1.1:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/html-conduit/html-conduit-1.2.1.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.2.1.1.ebuild
deleted file mode 100644
index b9c4045a3824..000000000000
--- a/dev-haskell/html-conduit/html-conduit-1.2.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse HTML documents using xml-conduit datatypes"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5.3:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/html-conduit/html-conduit-1.2.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.2.1.ebuild
deleted file mode 100644
index 82b5e04e7e44..000000000000
--- a/dev-haskell/html-conduit/html-conduit-1.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse HTML documents using xml-conduit datatypes"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5.3:=[profile?] <dev-haskell/tagstream-conduit-0.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/xml-conduit-1.3:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
index eb613fbe946e..a9f5265be7cc 100644
--- a/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
+++ b/dev-haskell/html-conduit/html-conduit-1.3.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/attoparsec:=[profile?]
diff --git a/dev-haskell/html-conduit/metadata.xml b/dev-haskell/html-conduit/metadata.xml
index 96b5e032235d..2b4fd2e4d2a7 100644
--- a/dev-haskell/html-conduit/metadata.xml
+++ b/dev-haskell/html-conduit/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/html/html-1.0.1.2-r1.ebuild b/dev-haskell/html/html-1.0.1.2-r1.ebuild
index c1bad49b169a..86f01034f9c6 100644
--- a/dev-haskell/html/html-1.0.1.2-r1.ebuild
+++ b/dev-haskell/html/html-1.0.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.2.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,9 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
+	>=dev-haskell/cabal-1.0
+"
diff --git a/dev-haskell/html/metadata.xml b/dev-haskell/html/metadata.xml
index 522384de8446..937381521944 100644
--- a/dev-haskell/html/metadata.xml
+++ b/dev-haskell/html/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/http-api-data/Manifest b/dev-haskell/http-api-data/Manifest
index f01a7d16413f..044643a2ab47 100644
--- a/dev-haskell/http-api-data/Manifest
+++ b/dev-haskell/http-api-data/Manifest
@@ -1,2 +1,3 @@
-DIST http-api-data-0.3.3.tar.gz 17668 BLAKE2B 8b4dfbf237312cd89413d45d31fd0730eecc4459e63d3e6f66bc1fb128f5c1d0358c3726df453e805014f5607373b2883fab0e38b54ede83ac4417cc6be81296 SHA512 125240fe0da41ff118937864cc5386d50b58cba98fa9d463202ac73a07b2d530563c3a7c41f81be42f25d99bcfc12ed01dca095a000f0cefc655d8046c3aa00c
-DIST http-api-data-0.4.1.1.tar.gz 19800 BLAKE2B 1dea8465ca41d6a8afdc1a994bec79e2fd58889732275dd0dfab73b917e1ae7b21824ba36ba83471d82e18f4ebe05265655098912c4136fd4a250070641c5c74 SHA512 9b768dc790999e42a82753b69f6ab48df90721468eaff79bf4b9a1eb08572dba3488908db4ad0a1afb3956513a16fcd663f005856e230748f665987766e10c59
+DIST http-api-data-0.4.3.cabal 3845 BLAKE2B fdde464e0c378bd60b135fd325bd2263df2eef42f797c1aa7b04e9382027b58498c80414a75dd83278d3bdf5676041c3ed2493b918d87eda3140ccddecc410b8 SHA512 cbf03caa0a026cad8c327b9fdf04dcc447dab3879c9cacf8fe7cf118665b9466983660937684fe8d14b7c50a29d7fa8a5f8f2eb2e8febc9d8217f3d30888e5d5
+DIST http-api-data-0.4.3.tar.gz 20827 BLAKE2B 04e7f0a9e5edebc230b47640c6a86dc76d271942cc70d0aa109d289fe2b1139e4c8103ba0799990b4c7ea0a37f3dd46ac4a72e9a5e4a39029d856e134ebfe8fb SHA512 625367d8f524eff07c69620df17c87a4365c01b9bc8bdd6bab5b8abe1b47cc429a050d63f48e50cb08fcac55aef95dfea532a5d52c87b6fa2d3e58b06aa8f4b0
+DIST http-api-data-0.5.1.tar.gz 21114 BLAKE2B 4653d97f57a8740da75e2d573d43d8ed988499d05c5d235572a2b6983fb22e2be06cdb347b179d23aca9337b7dfc75cfa2a21709ffb233da7d42ac2bee1b7b9b SHA512 04518851593fa8a081ca4ba706a7a21a693c0645968720f734df25fe884b5176a12c32f29ca9595c5de501e071b1e73bc1c45b1ae9dab5f7712ac4ac160a06db
diff --git a/dev-haskell/http-api-data/http-api-data-0.3.3.ebuild b/dev-haskell/http-api-data/http-api-data-0.3.3.ebuild
deleted file mode 100644
index 16d37ac76256..000000000000
--- a/dev-haskell/http-api-data/http-api-data-0.3.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
-HOMEPAGE="https://github.com/fizruk/http-api-data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="use-text-show"
-
-RDEPEND="dev-haskell/hashable:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/time-locale-compat-0.1.1.0:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/uri-bytestring:=[profile?]
-	>=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	use-text-show? ( >=dev-haskell/text-show-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/doctest-0.11 <dev-haskell/doctest-0.12
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.9
-		>=dev-haskell/quickcheck-instances-0.3.12
-		dev-haskell/uuid )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag use-text-show use-text-show)
-}
diff --git a/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild b/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
deleted file mode 100644
index f64232f9c25c..000000000000
--- a/dev-haskell/http-api-data/http-api-data-0.4.1.1.ebuild
+++ /dev/null
@@ -1,54 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
-HOMEPAGE="https://github.com/fizruk/http-api-data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/attoparsec-iso8601-1.0.1.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
-	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
-	>=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
-	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-compat-1.9.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.8
-		>=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/quickcheck-instances-0.3.21 <dev-haskell/quickcheck-instances-0.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base                  >= 4.7      && < 4.14' 'base                  >= 4.7'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-use-text-show
-}
diff --git a/dev-haskell/http-api-data/http-api-data-0.4.3.ebuild b/dev-haskell/http-api-data/http-api-data-0.4.3.ebuild
new file mode 100644
index 000000000000..a0df91b08980
--- /dev/null
+++ b/dev-haskell/http-api-data/http-api-data-0.4.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
+HOMEPAGE="https://github.com/fizruk/https-api-data"
+HACKAGE_REV="6"
+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"
+IUSE="text-show"
+
+RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/attoparsec-iso8601-1.0.2.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.1:=[profile?]
+	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+	>=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/time-compat-1.9.5:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	text-show? ( >=dev-haskell/text-show-3.8.2:=[profile?] <dev-haskell/text-show-3.10:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.10
+		>=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.25.2 <dev-haskell/quickcheck-instances-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag text-show use-text-show)
+}
diff --git a/dev-haskell/http-api-data/http-api-data-0.5.1.ebuild b/dev-haskell/http-api-data/http-api-data-0.5.1.ebuild
new file mode 100644
index 000000000000..033308af399f
--- /dev/null
+++ b/dev-haskell/http-api-data/http-api-data-0.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Converting to/from HTTP API data like URL pieces, headers and query parameters"
+HOMEPAGE="https://github.com/fizruk/https-api-data"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="text-show"
+
+RDEPEND=">=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/attoparsec-iso8601-1.1.0.0:=[profile?] <dev-haskell/attoparsec-iso8601-1.2:=[profile?]
+	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.14:=[profile?]
+	>=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/http-types-0.12.3:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/time-compat-1.9.5:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	text-show? ( >=dev-haskell/text-show-3.8.2:=[profile?] <dev-haskell/text-show-3.11:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hspec-2.7.1 <dev-haskell/hspec-2.11
+		>=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.13.1 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.25.2 <dev-haskell/quickcheck-instances-0.4
+		dev-haskell/text )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag text-show use-text-show)
+}
diff --git a/dev-haskell/http-api-data/metadata.xml b/dev-haskell/http-api-data/metadata.xml
index 249526e7aece..baafe048b8e7 100644
--- a/dev-haskell/http-api-data/metadata.xml
+++ b/dev-haskell/http-api-data/metadata.xml
@@ -1,14 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
 	<use>
-		<flag name="use-text-show">Use text-show library for efficient ToHttpApiData implementations</flag>
+		<flag name="text-show">Use text-show library for efficient ToHttpApiData implementations.</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">http-api-data</remote-id>
 		<remote-id type="github">fizruk/http-api-data</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/http-attoparsec/Manifest b/dev-haskell/http-attoparsec/Manifest
deleted file mode 100644
index d0ecc3a24b09..000000000000
--- a/dev-haskell/http-attoparsec/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-attoparsec-0.1.1.tar.gz 2501 BLAKE2B ffd8cfdcd7bf8b5916348633d519531a3a50426a03d9aef2818ebc3577c30f54e2e3c9ff1a4e7cfa7ea8cbe48a08c97262a796fead873128eb70d3074807a994 SHA512 7be64a4f8df874b392b3d75ecb16bb4e4f689e2c9e65eb406c7287bd637eced2c2580d27be3cfa164aac9cdfdd89cb8aaa8d9ab708e44542a478ec76a9b5955d
diff --git a/dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch b/dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch
deleted file mode 100644
index 2de100c5deb5..000000000000
--- a/dev-haskell/http-attoparsec/files/http-attoparsec-0.1.1-http.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Network/HTTP/Attoparsec.hs b/Network/HTTP/Attoparsec.hs
-index ec464d0..37f9983 100644
---- a/Network/HTTP/Attoparsec.hs
-+++ b/Network/HTTP/Attoparsec.hs
-@@ -7,3 +7,3 @@ module Network.HTTP.Attoparsec
- where
--import Network.HTTP.Types.Header
-+import Network.HTTP.Types.Header hiding (parseByteRanges)
- 
diff --git a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild
deleted file mode 100644
index 595325e6bb66..000000000000
--- a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Attoparsec parsers for http-types"
-HOMEPAGE="https://github.com/tlaitinen/http-attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.4.0:=[profile?]
-	>=dev-haskell/http-types-0.8.0:=[profile?] <dev-haskell/http-types-0.9:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'attoparsec >= 0.10.4.0 && < 0.12' 'attoparsec >= 0.10.4.0'
-}
diff --git a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
deleted file mode 100644
index a91815382e01..000000000000
--- a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Attoparsec parsers for http-types"
-HOMEPAGE="https://github.com/tlaitinen/http-attoparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.4.0:=[profile?]
-	>=dev-haskell/http-types-0.8.0:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-http.patch
-
-	cabal_chdeps \
-		'attoparsec >= 0.10.4.0 && < 0.12' 'attoparsec >= 0.10.4.0' \
-		'http-types >= 0.8.0 && < 0.9' 'http-types >= 0.8.0'
-}
diff --git a/dev-haskell/http-attoparsec/metadata.xml b/dev-haskell/http-attoparsec/metadata.xml
deleted file mode 100644
index 218272ffd685..000000000000
--- a/dev-haskell/http-attoparsec/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Attoparsec parsers for http-types.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tlaitinen/http-attoparsec</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-client-conduit/Manifest b/dev-haskell/http-client-conduit/Manifest
deleted file mode 100644
index 8c5f6933106c..000000000000
--- a/dev-haskell/http-client-conduit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST http-client-conduit-0.2.0.1.tar.gz 2104 BLAKE2B 2f8bb34e48bdc4671c51013fe81a2a0fc90f4e01cb6e22ff9bcdd8507f5f02606ca8eb2199892fa8d2106a5e86a110b4feee100a77b08815419656dfe40edf32 SHA512 1fd691f613cf874ea6f596a1d178bee034aef48923d8665b33cb7519d49034c56198a1b98786f3b65e9b5fce36d7bea8e76bafd696c52f01a240da29a06696ab
-DIST http-client-conduit-0.3.0.tar.gz 1176 BLAKE2B 29a8da8e051c31b24c710db783d330eb25316f500968df8b546cf085ca179526b26f1709d2e05cfb4d32703cf1233a8b9e9d0e0b04bc66b15fb38bbf6ce1ae7b SHA512 c6d3a2ee7d2b3efca346835d226421bf18443d7248d743b0467b32a9697d845697267a5fa9ee5a7bdf2c6918c60f4f6897f3df109b9337ab3967b3b9ef2528fe
diff --git a/dev-haskell/http-client-conduit/http-client-conduit-0.2.0.1.ebuild b/dev-haskell/http-client-conduit/http-client-conduit-0.2.0.1.ebuild
deleted file mode 100644
index f26e3a4da6f4..000000000000
--- a/dev-haskell/http-client-conduit/http-client-conduit-0.2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Frontend support for using http-client with conduit"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/conduit:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild b/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild
deleted file mode 100644
index 29e32f908c9e..000000000000
--- a/dev-haskell/http-client-conduit/http-client-conduit-0.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile" # haddock hoogle hscolour" no files
-inherit haskell-cabal
-
-DESCRIPTION="Frontend support for using http-client with conduit (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/http-client-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-conduit/metadata.xml b/dev-haskell/http-client-conduit/metadata.xml
deleted file mode 100644
index dabba697851d..000000000000
--- a/dev-haskell/http-client-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Intended for use by higher-level libraries, such as http-conduit.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/http-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-client-multipart/Manifest b/dev-haskell/http-client-multipart/Manifest
deleted file mode 100644
index d13f6b4cce55..000000000000
--- a/dev-haskell/http-client-multipart/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST http-client-multipart-0.2.0.0.tar.gz 4006 BLAKE2B aa3e8e2ba3fc24ce4754cf31816dc4bde866a7f0c2651f12a18001fbd75fe63b196dd17883d8b976ac13d1a8b39aefb51f939283dae86058d47437b62bd7b98c SHA512 7f3bc5b1b2dce4a8b5645b87a6f16e4baa3b61fbe71a7ba90a6c225af4a8d27b956280ab01805547d93378b32d5b4ab482e610f9423ccfda53d937d56586c497
-DIST http-client-multipart-0.3.0.0.tar.gz 1130 BLAKE2B 016468d0509055776615ba0e23f234f24868557c0b0c8e366e7ef7157028461e8fd5f0af73d84db68179c68c52624a8251c41195342798234c93801e7f7ed0b9 SHA512 4d0985d6cbc5e6ec4fe79b5037a4e378afd4b14382f2b26d62870ac091de661cf80be827851a8a8de014d6cd846867ea54ac7722deb6f97ecd70bee61fc1caeb
diff --git a/dev-haskell/http-client-multipart/http-client-multipart-0.2.0.0.ebuild b/dev-haskell/http-client-multipart/http-client-multipart-0.2.0.0.ebuild
deleted file mode 100644
index 1edfaf4e0b7c..000000000000
--- a/dev-haskell/http-client-multipart/http-client-multipart-0.2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate multipart uploads for http-client"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild b/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild
deleted file mode 100644
index a0211fe3e469..000000000000
--- a/dev-haskell/http-client-multipart/http-client-multipart-0.3.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile" # haddock hoogle hscolour" no files
-inherit haskell-cabal
-
-DESCRIPTION="Generate multipart uploads for http-client. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/http-client-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-client-multipart/metadata.xml b/dev-haskell/http-client-multipart/metadata.xml
deleted file mode 100644
index 56a6a08a0e25..000000000000
--- a/dev-haskell/http-client-multipart/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generate multipart uploads for http-client.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/http-client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-client-restricted/Manifest b/dev-haskell/http-client-restricted/Manifest
index ab2bc2debefc..d5b8732a61d7 100644
--- a/dev-haskell/http-client-restricted/Manifest
+++ b/dev-haskell/http-client-restricted/Manifest
@@ -1 +1,2 @@
-DIST http-client-restricted-0.0.3.tar.gz 5178 BLAKE2B 3fd0a0d1218f1a5ef0d87ac43cd3b3ddc37cf78ca3a8c6841409048d3de4cc44773539b17f0c60ec75dc5e120497e6226edad5556024623a09544a0d78ea9e4c SHA512 6734f674b6a026f1cbba495b892cd98892584817db69bc36db07f4179e6ae4841055afa37a4841edff7c30270f9977b5700ecd9640ca812d213c575fb4ffbf86
+DIST http-client-restricted-0.0.5.tar.gz 5389 BLAKE2B 83ec4694c6d99858b85c9751ed915b1d2ebf1df901c62fe59521dda18ced697ec9af71519785df16d06a795c18e496f8b90f6253845b88e810bf4caf0c02704d SHA512 d5876c02c1c6989f1da4741e191f18554efd448339e83bb9b267edec0e414141221c4f770d9f8e48c9d5f4a8fac9d58295e5f57e8c877710c95a71419e53cf3d
+DIST http-client-restricted-0.1.0.tar.gz 5462 BLAKE2B e25116e70172373c198187a4596da6f7d4f77c67b574dd02838ff31e96697386232dcdb887c26aad9ef2eafdbdd61065560a826138454210e7e26e6287456723 SHA512 c2f1f3476b01bc0c16512a1db037948d6a1365d9367d7058dee9862e328c59fb9cfbde679904ef66c8353a8422256e64fde443b7fcae2a389495f496fcc3a5ac
diff --git a/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild b/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild
deleted file mode 100644
index 15791d61c14c..000000000000
--- a/dev-haskell/http-client-restricted/http-client-restricted-0.0.3.ebuild
+++ /dev/null
@@ -1,31 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="restricting the servers that http-client will use"
-HOMEPAGE="http://hackage.haskell.org/package/http-client-restricted"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/connection-0.2.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/http-client-0.6:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
-	>=dev-haskell/http-client-tls-0.3.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/network-3.0.0.0:=[profile?]
-	dev-haskell/network-bsd:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-"
diff --git a/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild b/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
new file mode 100644
index 000000000000..ab5551d23ecb
--- /dev/null
+++ b/dev-haskell/http-client-restricted/http-client-restricted-0.0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 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="restricting the servers that http-client will use"
+HOMEPAGE="https://hackage.haskell.org/package/http-client-restricted"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/connection-0.2.5:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/http-client-0.7.11:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+	>=dev-haskell/http-client-tls-0.3.6:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/network-3.0.0.0:=[profile?]
+	dev-haskell/network-bsd:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/http-client-restricted/http-client-restricted-0.1.0.ebuild b/dev-haskell/http-client-restricted/http-client-restricted-0.1.0.ebuild
new file mode 100644
index 000000000000..54490aa6b5cc
--- /dev/null
+++ b/dev-haskell/http-client-restricted/http-client-restricted-0.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="restricting the servers that http-client will use"
+HOMEPAGE="https://hackage.haskell.org/package/http-client-restricted"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/crypton-connection-0.3.1:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/http-client-0.7.11:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+	>=dev-haskell/http-client-tls-0.3.6:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/network-3.0.0.0:=[profile?]
+	dev-haskell/network-bsd:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/http-client-restricted/metadata.xml b/dev-haskell/http-client-restricted/metadata.xml
index b7878815d80d..0654b24d0ab8 100644
--- a/dev-haskell/http-client-restricted/metadata.xml
+++ b/dev-haskell/http-client-restricted/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">http-client-restricted</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/http-client-tls/Manifest b/dev-haskell/http-client-tls/Manifest
index 8a7a345bcac7..5a2453db63b0 100644
--- a/dev-haskell/http-client-tls/Manifest
+++ b/dev-haskell/http-client-tls/Manifest
@@ -1,4 +1,2 @@
-DIST http-client-tls-0.2.2.tar.gz 2962 BLAKE2B 40a3a5c03425fc26435de089c58426e25923ac4a14528e05b0b0d9e82867a9e3673a7d3db4bdb21a1838fc19f79acec8323d4341c8c8a63b415b2ad39bed7e66 SHA512 fe750f8c89efd6f65ff4f80ed2e56caadcbd6135fe4dbe500c763994773d91924cbd12073b84dc175ec617d76077febc790a45e293a2a4bb6ca840d0f223629e
-DIST http-client-tls-0.2.4.tar.gz 3555 BLAKE2B 0192b1aef91c4023692b0ecf2270e38a5b4edc0bb32526e993e8764d593b112e9d04b3f93d1b55c5eca6de1f6cb95b2d5c90a9f4b5307feb763cc49b992a38d8 SHA512 3394b4cc6d8d398c17b3f06f6e1183103fadea0527c4fdab963a7e7cefb3b22fd0f0c3dc285efc7a8a1a902edc30f52a2ee35596dc173769c7fb9be6d033b24c
-DIST http-client-tls-0.3.3.tar.gz 6154 BLAKE2B bf7558a56194a21ee4829a679ecbde612de7abd922cc83fd941948dbf4e9f80163942f9d564479af3e1f49e49e5c22476538c0d33ebfb7f0fbecdac1a2325007 SHA512 eb4b094ce8c70154554564651dbaf57db80338b3fc88938a67fc5d7425d9f1793e805aa62cc90c0eb2d8a168d89769b45963b0382729103850920eac5fcd267e
-DIST http-client-tls-0.3.5.3.tar.gz 7679 BLAKE2B 490fb9af14ba814528560bab7cbf37bf348db38078d08d6be07934e52754741bc3b0ed91e614598ab8b26e19a67d7c6121f52a59b0b9ee47481e5c9bdf3cd36d SHA512 df4fff9fbd6736a52d54bf04669107b24e3d31c22b0f7882310204ca4ef1a895e9f79cea289423341aa575759a2667ff9ca86b889567605ad3daec266a1bbb14
+DIST http-client-tls-0.3.6.1.tar.gz 7850 BLAKE2B c2ef4e8981f2141d496d2d3e0720a29a536cd4937a95e4a59c8db356ac4390c2d419bf61b2eae6fcb4b5e98a73cd945981c9d8535353b3e444b603f9237bab3e SHA512 81b6e9ad3956f237bec83173ab8ac153ea3e9b555f0a84dc6ec0a13f6ad96dfc104d61125b66fc8733c8d8c3b7f8fc5e89cfcb885a7352f3af2e2b5473732294
+DIST http-client-tls-0.3.6.3.tar.gz 7935 BLAKE2B df9ffb0ea6dc0984faabaf4269c6cc62241b603465fdbd65af8cdf434e63f2e222ffbb73e51b404f77ef8eeee13ad0e6289e8ba27230935c4c1f9e318d46644c SHA512 2b4475a9fdcfed07512f19af989289d8b8eacc8568392c03839a806327d5b1cd6dfcbc5afe29a0dd3f63d9c93a7043c4fea594b73c46b43db94518dd7a39325f
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild
deleted file mode 100644
index 51c6b4f63a43..000000000000
--- a/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="http-client backend using the connection package and tls library"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/connection-0.2.2:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/http-client-0.3.5:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/tls-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec
-		dev-haskell/http-types )
-"
-
-# The only test in the suite requires internet access.
-RESTRICT="test"
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.2.4.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.2.4.ebuild
deleted file mode 100644
index 57f55e3870e7..000000000000
--- a/dev-haskell/http-client-tls/http-client-tls-0.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="http-client backend using the connection package and tls library"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/connection-0.2.2:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/http-client-0.3.5:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/tls-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec
-		dev-haskell/http-types )
-"
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild
deleted file mode 100644
index 736152fafc03..000000000000
--- a/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="http-client backend using the connection package and tls library"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs network access
-
-RDEPEND="dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/connection-0.2.2:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/http-client-0.5.0:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/tls-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
deleted file mode 100644
index a75058c75742..000000000000
--- a/dev-haskell/http-client-tls/http-client-tls-0.3.5.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="http-client backend using the connection package and tls library"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs network access
-
-RDEPEND="dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/connection-0.2.5:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/http-client-0.5.0:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/network-uri:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/tls-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
new file mode 100644
index 000000000000..b87d9d1812ca
--- /dev/null
+++ b/dev-haskell/http-client-tls/http-client-tls-0.3.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="http-client backend using the connection package and tls library"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network access
+
+RDEPEND="dev-haskell/case-insensitive:=[profile?]
+	>=dev-haskell/connection-0.2.5:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/http-client-0.7.11:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/network:=[profile?]
+	dev-haskell/network-uri:=[profile?]
+	>=dev-haskell/tls-1.2:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.6.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.6.3.ebuild
new file mode 100644
index 000000000000..4f1e2fc62318
--- /dev/null
+++ b/dev-haskell/http-client-tls/http-client-tls-0.3.6.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="http-client backend using the connection package and tls library"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network access
+
+RDEPEND="dev-haskell/case-insensitive:=[profile?]
+	dev-haskell/crypton:=[profile?]
+	dev-haskell/crypton-connection:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/http-client-0.7.11:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/memory:=[profile?]
+	dev-haskell/network:=[profile?]
+	dev-haskell/network-uri:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/tls-1.2:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/http-client-tls/metadata.xml b/dev-haskell/http-client-tls/metadata.xml
index dabba697851d..fd46ff83d375 100644
--- a/dev-haskell/http-client-tls/metadata.xml
+++ b/dev-haskell/http-client-tls/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Intended for use by higher-level libraries, such as http-conduit.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">http-client-tls</remote-id>
 		<remote-id type="github">snoyberg/http-client</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/http-client/Manifest b/dev-haskell/http-client/Manifest
index dac32c093c70..eda78e7fddff 100644
--- a/dev-haskell/http-client/Manifest
+++ b/dev-haskell/http-client/Manifest
@@ -1,5 +1,2 @@
-DIST http-client-0.4.18.1.tar.gz 75796 BLAKE2B 07e1f5dcd898e1e3c2f3d6d172d13256bdb3146d41f9434614cea6795e5ae5aab3694c917ae83d9728ee9b201c4819fdf44eb96618a87f1f2e91ae372811b0b6 SHA512 22b04e04edda5d0ae017acfd6b332acd9347d722245642f02caced4c60baa3b00d14e495c1b8f82e96e9c071acc045f0ab3f17b93706c95b81658a43489ac9f8
-DIST http-client-0.4.30.tar.gz 79327 BLAKE2B ed2819a51a888c0d09e71791b3eef1ac947138361b21a036810fe949c5a7368dec8f88b7dd86334c845777bc28b85fb78e50ad5813c48d7636e92c25afa509df SHA512 d8e9a2dc9a2f999d5d2ef313cebef9d3e88ee98225ceed64fc220c16d6ee1bf5174e1170bc1f3d02f8ca1dfd4d63631ed204c238cdc9e4a751aa232e5dc42224
-DIST http-client-0.5.5.tar.gz 81369 BLAKE2B 58a7fcb03ab193d08965242d3dd267f2e0de7b82b6d29868a77a52977846e78c9744c3a650e0373c60ff533d6fd5fe08ceb7b1f8921e5f04e62f47d77728b905 SHA512 3289f9e0efe3fa03a99885d12ceb0e2cf881c339f69cd0812ed65d47b00401ed4959fc19c27492de7616395a04b412cbe443af47cd82afdaafcf92e52fdffac2
-DIST http-client-0.5.7.0.tar.gz 86010 BLAKE2B 1e6f938c71d270a3f28457dad3e12000c08ef880f526db764bc06810f01440448a0071181582c3262953c2aa1dcd6d64929c7ae0ff297cce84b832db048433d4 SHA512 5a411fc6b709becdbdb727904851ff1348c39430d2358f780677fd00f154cc85d94f776f120f4435c2e9a89bb9f0a00858df0d5c7b250772c88c50179bd30275
-DIST http-client-0.6.4.1.tar.gz 89702 BLAKE2B 845488745e7429b833c92521be7abb6e03ae90fa81f819995d9fead467fce1f3c43ece8c4f5da1f8242d79086556b0f86eeea3da931a0a613eb49966ca9cd60d SHA512 b9595ebf3cb48c5ed288934976b78270a3092a35ae083853684c848301ee88a18e0e41534180033df071ab87dc9f9cbab99da37cbc74d538472409c13dcfce7d
+DIST http-client-0.7.11.tar.gz 94548 BLAKE2B 5e630b5ec1861301a8a503238c111091b9b099d181b17a1d9c5fd22dac1dc60952faa7ec1da597dd909fe5f23408d728964461d77314a30a747e5edaa1757889 SHA512 0c01961e66c71636ff2628851151a788aaf941155d50a9f20b01a2e065ca7a8218ab4867b24e7cfb434aaa9b9178f727d950017870540e0bce91fffdcc374852
+DIST http-client-0.7.14.tar.gz 95406 BLAKE2B 9cb48fb44d529bc271ce969e72ff374c3d3afe1d983193e7ae7c55ea4dc8625df02e0a1ffd3597ef7882772a3f997057f88c37f356b088a8f9c2eeb9dcf90c7c SHA512 7668bb4b53c9d60aec3bb5a9342bb7c87502820d467dbf40943828136c52e99a619f0be6e8ec96fa6dcf79d8265b55fd3d681d5ce81f0e8540392534b26a3354
diff --git a/dev-haskell/http-client/files/http-client-0.7.10-disable-net-tests.patch b/dev-haskell/http-client/files/http-client-0.7.10-disable-net-tests.patch
new file mode 100644
index 000000000000..0cc6e4f40dc2
--- /dev/null
+++ b/dev-haskell/http-client/files/http-client-0.7.10-disable-net-tests.patch
@@ -0,0 +1,16 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+Disable tests that depend on network access
+
+diff -urN http-client-0.7.10/http-client.cabal http-client-0.7.10-r1/http-client.cabal
+--- http-client-0.7.10/http-client.cabal	2022-01-20 19:39:19.388814780 -0700
++++ http-client-0.7.10-r1/http-client.cabal	2022-01-20 19:39:58.298814799 -0700
+@@ -104,6 +104,7 @@
+                      , zlib
+                      , async
+                      , streaming-commons >= 0.1.1
++  buildable: False
+ 
+ 
+ test-suite spec-nonet
diff --git a/dev-haskell/http-client/http-client-0.4.18.1.ebuild b/dev-haskell/http-client/http-client-0.4.18.1.ebuild
deleted file mode 100644
index 130af7884d81..000000000000
--- a/dev-haskell/http-client/http-client-0.4.18.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/http-client-0.4.30.ebuild b/dev-haskell/http-client/http-client-0.4.30.ebuild
deleted file mode 100644
index 79711ddb1cbc..000000000000
--- a/dev-haskell/http-client/http-client-0.4.30.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/http-client-0.5.5.ebuild b/dev-haskell/http-client/http-client-0.5.5.ebuild
deleted file mode 100644
index c59f8c721d99..000000000000
--- a/dev-haskell/http-client/http-client-0.5.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/http-client-0.5.7.0.ebuild b/dev-haskell/http-client/http-client-0.5.7.0.ebuild
deleted file mode 100644
index b47005b1b7f8..000000000000
--- a/dev-haskell/http-client/http-client-0.5.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test # needs network access
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/http-client-0.6.4.1.ebuild b/dev-haskell/http-client/http-client-0.6.4.1.ebuild
deleted file mode 100644
index 023cfce84a64..000000000000
--- a/dev-haskell/http-client/http-client-0.6.4.1.ebuild
+++ /dev/null
@@ -1,51 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client engine, intended as a base layer for more user-friendly packages"
-HOMEPAGE="https://github.com/snoyberg/http-client"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.0:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	>=dev-haskell/memory-0.7:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( dev-haskell/async
-		dev-haskell/hspec
-		dev-haskell/monad-control
-		>=dev-haskell/streaming-commons-0.1.1
-		dev-haskell/zlib
-		!network-uri? ( dev-haskell/network-uri ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-client/http-client-0.7.11.ebuild b/dev-haskell/http-client/http-client-0.7.11.ebuild
new file mode 100644
index 000000000000..043f4db8f9ee
--- /dev/null
+++ b/dev-haskell/http-client/http-client-0.7.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client engine"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?]
+	>=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/case-insensitive-1.0:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?]
+	>=dev-haskell/iproute-1.7.5:=[profile?]
+	dev-haskell/mime-types:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/stm-2.3:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( dev-haskell/hspec
+		dev-haskell/monad-control
+		>=dev-haskell/streaming-commons-0.1.1
+		dev-haskell/zlib )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.7.10-disable-net-tests.patch" )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=network-uri
+}
diff --git a/dev-haskell/http-client/http-client-0.7.14.ebuild b/dev-haskell/http-client/http-client-0.7.14.ebuild
new file mode 100644
index 000000000000..624051696f80
--- /dev/null
+++ b/dev-haskell/http-client/http-client-0.7.14.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client engine"
+HOMEPAGE="https://github.com/snoyberg/http-client"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.10-disable-net-tests.patch"
+)
+
+RDEPEND=">=dev-haskell/async-2.0:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?]
+	>=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/case-insensitive-1.0:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?]
+	>=dev-haskell/iproute-1.7.5:=[profile?]
+	dev-haskell/mime-types:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.0.2:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( dev-haskell/hspec
+		dev-haskell/monad-control
+		>=dev-haskell/streaming-commons-0.1.1
+		dev-haskell/zlib )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=network-uri
+}
diff --git a/dev-haskell/http-client/metadata.xml b/dev-haskell/http-client/metadata.xml
index 561a62a9a785..50f1751001a7 100644
--- a/dev-haskell/http-client/metadata.xml
+++ b/dev-haskell/http-client/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This codebase has been refactored from http-conduit.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 	<upstream>
+		<remote-id type="hackage">http-client</remote-id>
 		<remote-id type="github">snoyberg/http-client</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/http-common/Manifest b/dev-haskell/http-common/Manifest
deleted file mode 100644
index a9b92b79de0c..000000000000
--- a/dev-haskell/http-common/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-common-0.8.2.0.tar.gz 9473 BLAKE2B 7c37f7b605f3014d15d7b89250ecad915acb79ee1c246f3410b2c206189a64fd29a6adfc1b57c05f3a10cf22b8edebf899cea71e37b5ffdeac1702be615644a6 SHA512 e02e9b08235483220856ed1cacebea1910ec41451d7ec68b86a2193f5c050f74ef3747a4a2c35c560795727d9f62ee6485cfd1ed5597fb7645ce6339f969851a
diff --git a/dev-haskell/http-common/http-common-0.8.2.0.ebuild b/dev-haskell/http-common/http-common-0.8.2.0.ebuild
deleted file mode 100644
index 0ff6f6b7c8a4..000000000000
--- a/dev-haskell/http-common/http-common-0.8.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Common types for HTTP clients and servers"
-HOMEPAGE="https://hackage.haskell.org/package/http-common"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/http-common/metadata.xml b/dev-haskell/http-common/metadata.xml
deleted file mode 100644
index 9b125c84e713..000000000000
--- a/dev-haskell/http-common/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		/Overview/
-		
-		Base types used by a variety of HTTP clients and servers. See http-streams
-		"Network.Http.Client" or pipes-http "Pipes.Http.Client" for full
-		documentation. You can import @Network.Http.Types@ if you like, but both
-		http-streams and pipes-http re-export this package's types and functions.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/http-conduit/Manifest b/dev-haskell/http-conduit/Manifest
index 7ce590b81a6d..d970512b6c09 100644
--- a/dev-haskell/http-conduit/Manifest
+++ b/dev-haskell/http-conduit/Manifest
@@ -1,5 +1 @@
-DIST http-conduit-2.1.10.1.tar.gz 26897 BLAKE2B ccce9e4848649fc53305acc51544b259b4df59c42e7eec45e69e78f8e43f1c93c1fce43f331c177053351b70d1f2795e5a5312d1b9afabf3eb894270d50a2045 SHA512 be9334d477effb5e691a3fb8faac40abd09a855205cefe0018315fbdca7de0fca00396e7fa66ca64c87ec2ee8d04177a4a2598349cfc3948f21000c4d23a0c72
-DIST http-conduit-2.1.7.2.tar.gz 23333 BLAKE2B 6346e1872ee339585d8b92d1b20cab06ed892c7fe861387ebf2f547400c991e792a4d87e570be93671fda9d261cde157d5015f4f833abc6138069534637b440b SHA512 020eae7a5846a880270b24d85ea4e7c2742c0f701e9e895b4dcaa1856f794fd00e09951e171104a173679d062789e5214ee24e0d63984e7d94d2cb2e5e7fb0ce
-DIST http-conduit-2.1.8.tar.gz 23331 BLAKE2B cf0c85991a8220f1cdb4bab34e42d58bc1fdf49a48048879efd22d6a1fb78a116edd2475c3165bd0cffb8cc5d9d9c92af2a60fb5ad28e330255daa99279018ec SHA512 a5791e9cc9a5d8a077a54286e163cf16b388e1c1a71f31989e731ad724de887d96bd985805380b3ad7ed8d0570c8577c38bd1a36567ee38924487c7a200d304d
-DIST http-conduit-2.2.3.tar.gz 27457 BLAKE2B 411dfa2858a6058baef12f8e120648df7dd7eef0880f8a5e6d3bbcafa879865b47ddc4b3c76b5b651d1c3d7629a35ff8316abce62b0e6d61f6754c96e953de7f SHA512 675e5d81130d670377d2597a583f2ea8185604f115317cd11493127086b837d0552014fb3feb53b7930ef3b063d6339d2556f7a8f3f5568dcc5332e3b504e659
-DIST http-conduit-2.3.7.3.tar.gz 28227 BLAKE2B 9cc2583809410bf7e52244140eda9152d4021699a287a8f99cf5501f854965893b03f661a8f0d266239978e48518be386ec3f3ed5bdf44030638b94b9a95d26c SHA512 0b3733ce031299ee3b93ca44d45a913e384dbfcd43efe5c65076efb5ff8266058ecb07e90f699ebb54d2d37f4a299be79717c3988e72cce631d417ba21ed4d08
+DIST http-conduit-2.3.8.tar.gz 28858 BLAKE2B a89a858eb0c11b66046d9292d95a2df1c257ce6130ed5f3c2f4b25b6841bacdb3f2cd8b9fca2ff213a48df76910476e53d150a678d6d69accbe419f64a1ed299 SHA512 44c337f1a0a0ec74a5d6e4e28a3aa5a32609c3a4da9424e99aedc2a8db67fc4684ef10cf82d6bda0761c7ffba4f0222e683946ab6dd8de1ab8225a40cc14cf66
diff --git a/dev-haskell/http-conduit/http-conduit-2.1.10.1.ebuild b/dev-haskell/http-conduit/http-conduit-2.1.10.1.ebuild
deleted file mode 100644
index 9b7f3d2e7113..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.1.10.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="https://www.yesodweb.com/book/http-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.5:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/http-client-0.4.28:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.4:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/blaze-builder
-		dev-haskell/case-insensitive
-		>=dev-haskell/conduit-1.1
-		>=dev-haskell/connection-0.2
-		dev-haskell/cookie
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons
-		dev-haskell/temporary
-		dev-haskell/text
-		dev-haskell/utf8-string
-		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.3
-		dev-haskell/wai-conduit
-		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.3
-		dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild b/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
deleted file mode 100644
index c677d1cf9d2d..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="https://www.yesodweb.com/book/http-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/http-client-0.4.3:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/blaze-builder
-		dev-haskell/case-insensitive
-		>=dev-haskell/conduit-1.1
-		dev-haskell/conduit-extra
-		>=dev-haskell/connection-0.2
-		dev-haskell/cookie
-		dev-haskell/data-default-class
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons
-		dev-haskell/text
-		dev-haskell/utf8-string
-		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.1
-		dev-haskell/wai-conduit
-		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.2
-		dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.1.8.ebuild b/dev-haskell/http-conduit/http-conduit-2.1.8.ebuild
deleted file mode 100644
index 0791ca61c541..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.1.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="https://www.yesodweb.com/book/http-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/http-client-0.4.19:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/blaze-builder
-		dev-haskell/case-insensitive
-		>=dev-haskell/conduit-1.1
-		dev-haskell/conduit-extra
-		>=dev-haskell/connection-0.2
-		dev-haskell/cookie
-		dev-haskell/data-default-class
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons
-		dev-haskell/text
-		dev-haskell/utf8-string
-		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.1
-		dev-haskell/wai-conduit
-		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.2
-		dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild b/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild
deleted file mode 100644
index b2371dc77e17..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="https://www.yesodweb.com/book/http-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.5:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/http-client-0.5:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
-	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/blaze-builder
-		dev-haskell/case-insensitive
-		>=dev-haskell/conduit-1.1
-		>=dev-haskell/connection-0.2
-		dev-haskell/cookie
-		dev-haskell/data-default-class
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons
-		dev-haskell/temporary
-		dev-haskell/text
-		dev-haskell/utf8-string
-		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.3
-		dev-haskell/wai-conduit
-		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.3
-		dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild b/dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild
deleted file mode 100644
index 804e775f1c5b..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.3.7.3.ebuild
+++ /dev/null
@@ -1,54 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="http://www.yesodweb.com/book/http-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs network
-
-RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	>=dev-haskell/http-client-0.5.13:=[profile?] <dev-haskell/http-client-0.7:=[profile?]
-	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	>=dev-haskell/void-0.5.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/blaze-builder
-		dev-haskell/case-insensitive
-		>=dev-haskell/connection-0.2
-		dev-haskell/cookie
-		dev-haskell/data-default-class
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons
-		dev-haskell/temporary
-		dev-haskell/text
-		dev-haskell/unliftio
-		dev-haskell/utf8-string
-		>=dev-haskell/wai-3.0 <dev-haskell/wai-3.3
-		dev-haskell/wai-conduit
-		>=dev-haskell/warp-3.0.0.2 <dev-haskell/warp-3.4
-		dev-haskell/warp-tls )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild b/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild
new file mode 100644
index 000000000000..4278d2e134ea
--- /dev/null
+++ b/dev-haskell/http-conduit/http-conduit-2.3.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +aeson
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # needs a port
+inherit haskell-cabal
+
+DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
+HOMEPAGE="https://www.yesodweb.com/book/https-conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT=test # needs network
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	>=dev-haskell/conduit-1.2:=[profile?]
+	>=dev-haskell/conduit-extra-1.1:=[profile?]
+	>=dev-haskell/http-client-0.5.13:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+	>=dev-haskell/http-client-tls-0.3:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/aeson-0.8:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=+aeson
+}
diff --git a/dev-haskell/http-conduit/metadata.xml b/dev-haskell/http-conduit/metadata.xml
index 2a09e00fdd3c..df2bb58c2983 100644
--- a/dev-haskell/http-conduit/metadata.xml
+++ b/dev-haskell/http-conduit/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/http-date/Manifest b/dev-haskell/http-date/Manifest
index 234a068895fb..0ff226550df7 100644
--- a/dev-haskell/http-date/Manifest
+++ b/dev-haskell/http-date/Manifest
@@ -1,2 +1,2 @@
-DIST http-date-0.0.6.1.tar.gz 4989 BLAKE2B f1dd2f10a7ee01591d970e10128ef381b6764a121785a8b90608d486b2e5370ef0d529c3cc4995d661ca1aeccf698357b21433c8ba11baf8f667d97488c65ca8 SHA512 456d59bc9405578526ea458772ba8b01d1fe85607bc0e201efd6f0f080525205cbf8eba19dfd5f64ff520510a9a7ae3b7008fe43fee0e312b792476b965ba739
+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
diff --git a/dev-haskell/http-date/http-date-0.0.11.ebuild b/dev-haskell/http-date/http-date-0.0.11.ebuild
new file mode 100644
index 000000000000..bd0d30401b3e
--- /dev/null
+++ b/dev-haskell/http-date/http-date-0.0.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP Date parser/formatter"
+HOMEPAGE="https://hackage.haskell.org/package/http-date"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+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-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/doctest-0.8
+		dev-haskell/hspec
+		dev-haskell/old-locale )
+"
diff --git a/dev-haskell/http-date/http-date-0.0.6.1.ebuild b/dev-haskell/http-date/http-date-0.0.6.1.ebuild
deleted file mode 100644
index b8b25174e2ca..000000000000
--- a/dev-haskell/http-date/http-date-0.0.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP Date parser/formatter"
-HOMEPAGE="http://hackage.haskell.org/package/http-date"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.8
-		dev-haskell/hspec
-		dev-haskell/old-locale )
-"
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 fedf86cc4edc..7ffa278155d0 100644
--- a/dev-haskell/http-date/http-date-0.0.8.ebuild
+++ b/dev-haskell/http-date/http-date-0.0.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -9,18 +9,18 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="HTTP Date parser/formatter"
-HOMEPAGE="http://hackage.haskell.org/package/http-date"
+HOMEPAGE="https://hackage.haskell.org/package/http-date"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 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/http-date/metadata.xml b/dev-haskell/http-date/metadata.xml
index deaf14cf2f5d..937381521944 100644
--- a/dev-haskell/http-date/metadata.xml
+++ b/dev-haskell/http-date/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Fast parser and formatter for HTTP Date
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/http-download/Manifest b/dev-haskell/http-download/Manifest
deleted file mode 100644
index 46f594e22d27..000000000000
--- a/dev-haskell/http-download/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST http-download-0.2.0.0.tar.gz 8946 BLAKE2B f8b52744605ac8bd9bc922e23a5ffa02d0d7c10af7109594e0273cd46fec8afd0e20e2cbffed04ac206234d3635b2c53f6adfc8e11467e05f1b3544f02c7a271 SHA512 b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae
diff --git a/dev-haskell/http-download/http-download-0.2.0.0.ebuild b/dev-haskell/http-download/http-download-0.2.0.0.ebuild
deleted file mode 100644
index 5123c9182820..000000000000
--- a/dev-haskell/http-download/http-download-0.2.0.0.ebuild
+++ /dev/null
@@ -1,43 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Verified downloads with retries"
-HOMEPAGE="https://github.com/commercialhaskell/http-download#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test #requires network access
-
-RDEPEND="dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/cryptonite-conduit:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	dev-haskell/http-conduit:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/path:=[profile?]
-	dev-haskell/path-io:=[profile?]
-	dev-haskell/retry:=[profile?]
-	dev-haskell/rio:=[profile?]
-	dev-haskell/rio-prettyprint:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( dev-haskell/hspec
-		dev-haskell/hspec-discover )
-"
diff --git a/dev-haskell/http-download/metadata.xml b/dev-haskell/http-download/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/http-download/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/http-media/Manifest b/dev-haskell/http-media/Manifest
new file mode 100644
index 000000000000..23a0d95e094d
--- /dev/null
+++ b/dev-haskell/http-media/Manifest
@@ -0,0 +1 @@
+DIST http-media-0.8.0.0.tar.gz 18895 BLAKE2B 3a6db500f6433c6f0bc23f6b51aa5f35b3340a4258b4b5d637bdeafd5161c28af8c2630a013f06a8204a2d37242d5bc880d5c75d32adbf92fb664417872806a2 SHA512 549fa1892c81224e79bad4268993e0cfa324d9d0c9daa0d800ac7cc4eee307405155989672c49adb0e124ca29c2d83cc565ba3c935fd3be4ab4ef0594b012bb5
diff --git a/dev-haskell/http-media/http-media-0.8.0.0.ebuild b/dev-haskell/http-media/http-media-0.8.0.0.ebuild
new file mode 100644
index 000000000000..691350b0f193
--- /dev/null
+++ b/dev-haskell/http-media/http-media-0.8.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Processing HTTP Content-Type and Accept headers"
+HOMEPAGE="https://github.com/zmthy/http-media"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/case-insensitive-1.0:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/quickcheck-2.8
+		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+
+# https://hackage.haskell.org/package/http-media-0.8.0.0/revisions/
+CABAL_CHDEPS=(
+	'base             >= 4.7  && < 4.13' 'base             >= 4.8'
+	'bytestring       >= 0.10 && < 0.11' ' bytestring       >= 0.10'
+	'base                       >= 4.7  && < 4.13' 'base >= 4.7'
+	'bytestring                 >= 0.10 && < 0.11' 'bytestring >= 0.10'
+	'QuickCheck                 >= 2.8  && < 2.14' 'QuickCheck >= 2.8'
+)
diff --git a/dev-haskell/http-media/metadata.xml b/dev-haskell/http-media/metadata.xml
new file mode 100644
index 000000000000..fee7d2838ce4
--- /dev/null
+++ b/dev-haskell/http-media/metadata.xml
@@ -0,0 +1,38 @@
+<?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>
+	<longdescription>
+		This library is intended to be a comprehensive solution to parsing and
+		selecting quality-indexed values in HTTP headers. It is capable of parsing
+		both media types and language parameters from the Accept and Content header
+		families, and can be extended to match against other accept headers as well.
+		Selecting the appropriate header value is achieved by comparing a list of
+		server options against the quality-indexed values supplied by the client.
+		
+		In the following example, the Accept header is parsed and then matched against
+		a list of server options to serve the appropriate media using
+		'mapAcceptMedia':
+		
+		&gt; getHeader &gt;&gt;= maybe send406Error sendResourceWith . mapAcceptMedia
+		&gt;     [ ("text/html",        asHtml)
+		&gt;     , ("application/json", asJson)
+		&gt;     ]
+		
+		Similarly, the Content-Type header can be used to produce a parser for request
+		bodies based on the given content type with 'mapContentMedia':
+		
+		&gt; getContentType &gt;&gt;= maybe send415Error readRequestBodyWith . mapContentMedia
+		&gt;     [ ("application/json", parseJson)
+		&gt;     , ("text/plain",       parseText)
+		&gt;     ]
+		
+		The API is agnostic to your choice of server.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">zmthy/http-media</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/http-reverse-proxy/Manifest b/dev-haskell/http-reverse-proxy/Manifest
deleted file mode 100644
index 106fcd6e5224..000000000000
--- a/dev-haskell/http-reverse-proxy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST http-reverse-proxy-0.1.1.6.tar.gz 6786 BLAKE2B b7a86207dc320bbabd56edeed7571821b24fb7e7650790152a380cfc5ac241e62d8af392eb2f967affa08ba86109a960b6d8a2809a48a936f9bf0d2314937ffc SHA512 e8d9b79abcf7d8c2af4256dda385d93c9f0f4eacaf4b1227a9356de261edf5fe8ea110595753b57965072e6e96b1019455a5d3d935791a35eaef086cf18dcc94
-DIST http-reverse-proxy-0.2.0.tar.gz 7478 BLAKE2B 502c4e9ffff07b1da3efabf03c9eeda38b3b89dd38e62d519e9d392f29406a4236ec1d36687318641c0d6d4c8feca4048f7bd2b3a97caaeae6794ca06f496e7d SHA512 fa667f83603c43f22529da4fd0a7202e3d9b540e563c1ab345cf3b3701932174b3cced3d7761570a9939b84e7b503906dcc84b9c39b639663a8a0483a37fb6b0
-DIST http-reverse-proxy-0.4.3.2.tar.gz 9870 BLAKE2B a08031110810950f769c0706cb3c4875403c9de9c9427715e9cefc4dc0856b753e0000b6a0c6340126e3687a1efc1369e988e04d0a8f61453fe6732ee61ddafb SHA512 303b826b1be5a5f34703eaf865dd238973f2ff59a97a4f0810d6551f2db339d5b37a60eab75f091347e9269812d09fe3026bd8f1bfe71660ada19b3ade8865b6
-DIST http-reverse-proxy-0.4.3.tar.gz 9742 BLAKE2B a2fc4e9be455e3ef72a2e220e4b0f55d6eae8c06054e64d939eb7a2611e5a363ae310cfc413e6a2fbbe6c480d49e2c18b1f843d802dce77ebdf1693d32776476 SHA512 72326d46c0f307a1b9f31115aa7286ee4a562f0c8f513b87533a74c59df482dac3c3ce87c50dd86fdbeb1f31b13da8218f1455f6f9585ad4763651e8037a9d8f
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.1.1.6.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.1.1.6.ebuild
deleted file mode 100644
index 9d49db0d2c37..000000000000
--- a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.1.1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
-HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
-		>=dev-haskell/case-insensitive-0.4:=[profile?]
-		>=dev-haskell/classy-prelude-0.3:=[profile?]
-		>=dev-haskell/conduit-0.5:=[profile?]
-		dev-haskell/data-default:=[profile?]
-		>=dev-haskell/http-conduit-1.6:=[profile?]
-		>=dev-haskell/http-types-0.6:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/monad-control-0.3:=[profile?]
-		dev-haskell/network:=[profile?]
-		>=dev-haskell/network-conduit-0.6:=[profile?]
-		>=dev-haskell/text-0.11:=[profile?]
-		>=dev-haskell/wai-1.3:=[profile?]
-		>=dev-haskell/warp-1.3.4:=[profile?]
-		>=dev-haskell/word8-0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/transformers
-		)"
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.2.0.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.2.0.ebuild
deleted file mode 100644
index 621f6a9e904a..000000000000
--- a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
-HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
-		>=dev-haskell/case-insensitive-0.4:=[profile?]
-		>=dev-haskell/classy-prelude-0.3:=[profile?]
-		>=dev-haskell/conduit-0.5:=[profile?]
-		dev-haskell/data-default:=[profile?]
-		>=dev-haskell/http-conduit-1.6:=[profile?]
-		>=dev-haskell/http-types-0.6:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/monad-control-0.3:=[profile?]
-		dev-haskell/network:=[profile?]
-		>=dev-haskell/network-conduit-0.6:=[profile?]
-		>=dev-haskell/text-0.11:=[profile?]
-		>=dev-haskell/wai-1.3:=[profile?]
-		dev-haskell/wai-logger:=[profile?]
-		>=dev-haskell/warp-1.3.4:=[profile?]
-		>=dev-haskell/word8-0.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/transformers
-		)"
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.2.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.2.ebuild
deleted file mode 100644
index 5fa832e2660e..000000000000
--- a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
-HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/http-client-0.3:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/word8-0.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/http-conduit
-		>=dev-haskell/warp-2.1 )
-"
diff --git a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.ebuild b/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.ebuild
deleted file mode 100644
index 22ed09e04a09..000000000000
--- a/dev-haskell/http-reverse-proxy/http-reverse-proxy-0.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reverse proxy HTTP requests, either over raw sockets or with WAI"
-HOMEPAGE="https://github.com/fpco/http-reverse-proxy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/http-client-0.3:=[profile?]
-	>=dev-haskell/http-types-0.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/word8-0.0:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/http-conduit
-		>=dev-haskell/warp-2.1 )
-"
diff --git a/dev-haskell/http-reverse-proxy/metadata.xml b/dev-haskell/http-reverse-proxy/metadata.xml
deleted file mode 100644
index 3b7a6a0d440a..000000000000
--- a/dev-haskell/http-reverse-proxy/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a simple means of reverse-proxying HTTP requests. The raw approach uses the same technique as leveraged by keter, whereas the WAI approach performs full request/response parsing via WAI and http-conduit.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/http-reverse-proxy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/http-streams/Manifest b/dev-haskell/http-streams/Manifest
deleted file mode 100644
index 79a81c594237..000000000000
--- a/dev-haskell/http-streams/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST http-streams-0.8.4.0.tar.gz 35330 BLAKE2B 6e6c0fbd9a61c6ea587d7140fb0219c5a415c798ee55b47f45642c19cc67f67a6c1098d74c8451bb6285fdc001d6cac389459a3dbd5ba9409a59e47e4bf4c9a5 SHA512 763287042b37eca43941369dd2b7a7693f545ef37d87bdadb0b5ee686648bc0c3e7d2a8edee37648bb61ebc1dfefb029ca3ce22a44519a16775eab98de0b0a1a
-DIST http-streams-0.8.7.1.tar.gz 35149 BLAKE2B c7b754b694b612f167b072e17abf14a537aa36422ee4a55695c25b84e8780a6acff61ad9d2041b0ee2cc2cf51f77cdee732021870418d506cbf07a80cbb1b88e SHA512 6c2613cc6bcc1b54916c484834779fb3388085082df33216beb12685eb8e56c0f45b2bf24d657acc6c0295ea429c0e1947213a1235c4373cfdcf10899c93bee1
diff --git a/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild b/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild
deleted file mode 100644
index af7cf9cb1218..000000000000
--- a/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client using io-streams"
-HOMEPAGE="https://github.com/afcowie/http-streams/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test # cyclic dep: http-streams[test]->snap-server->http-streams
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/hsopenssl-0.10.3.5:=[profile?]
-	>=dev-haskell/http-common-0.8.2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?]
-			<dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/aeson-pretty
-		dev-haskell/hspec
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/lifted-base
-		>=dev-haskell/snap-core-1.0 <dev-haskell/snap-core-1.1
-		>=dev-haskell/snap-server-1.0 <dev-haskell/snap-server-1.1
-		>=dev-haskell/system-fileio-0.3.10 <dev-haskell/system-fileio-0.4
-		>=dev-haskell/system-filepath-0.4.1 <dev-haskell/system-filepath-0.5
-		!network-uri? ( >=dev-haskell/network-2.6
-				>=dev-haskell/network-uri-2.6 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-streams/http-streams-0.8.7.1.ebuild b/dev-haskell/http-streams/http-streams-0.8.7.1.ebuild
deleted file mode 100644
index f508569b5ad7..000000000000
--- a/dev-haskell/http-streams/http-streams-0.8.7.1.ebuild
+++ /dev/null
@@ -1,58 +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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An HTTP client using io-streams"
-HOMEPAGE="https://github.com/afcowie/http-streams/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RESTRICT=test #circular test depend: http-streams -> snap-server -> http-streams
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/hsopenssl-0.11.2:=[profile?]
-	>=dev-haskell/http-common-0.8.2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?]
-			<dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	test? ( dev-haskell/aeson-pretty
-		dev-haskell/hspec
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/lifted-base
-		>=dev-haskell/snap-core-1.0 <dev-haskell/snap-core-1.2
-		>=dev-haskell/snap-server-1.1 <dev-haskell/snap-server-1.2
-		>=dev-haskell/system-fileio-0.3.10 <dev-haskell/system-fileio-0.4
-		>=dev-haskell/system-filepath-0.4.1 <dev-haskell/system-filepath-0.5
-		!network-uri? ( >=dev-haskell/network-2.6
-				>=dev-haskell/network-uri-2.6 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/http-streams/metadata.xml b/dev-haskell/http-streams/metadata.xml
deleted file mode 100644
index 3e1a4d23211f..000000000000
--- a/dev-haskell/http-streams/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		/Overview/
-		
-		An HTTP client, using the Snap Framework's 'io-streams' library to
-		hande the streaming IO. The API is optimized for ease of use for the
-		rather common case of code needing to query web services and deal with
-		the result.
-		
-		The library is exported in a single module; see "Network.Http.Client"
-		for full documentation.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/http-types/Manifest b/dev-haskell/http-types/Manifest
index ef30cec235c7..5d9ef502fa9d 100644
--- a/dev-haskell/http-types/Manifest
+++ b/dev-haskell/http-types/Manifest
@@ -1,3 +1 @@
 DIST http-types-0.12.3.tar.gz 13547 BLAKE2B 1588845844fd4c346473fba2764e3d8714743af948c41d4163c0d039aa9840769674b6953ee4a8a80774acbd876913503992a4be611bf34a87fb3f695cc78a48 SHA512 fdaf95cfd29ed47445af4ad6349fcbbf4dcd8341f3963da453f8be5eccae4757904d3c4e7a8719ab576a7e7857aaa035ecfc1aa8f99f4ec6fce950c7ccc76597
-DIST http-types-0.8.6.tar.gz 10796 BLAKE2B cae66579a8aff76c97e4663ac1aece38c9fd0de72df7581febffd8db0c77e30e3659139aee4eb4812f0fa7011c5be89397657c82bcb3c0af563bb8470d7baf07 SHA512 c31dbc3e61afe42e6b279463b6c156dc343d1ca163a0c0b3f7e9afc0eee55cba31e655cbf7e615a62f32fa7ca1a52da288310c3b749e2d11b9c27268191cb8d1
-DIST http-types-0.9.1.tar.gz 12284 BLAKE2B 8e724b4abf896678a495fc21d942c93287e11480785730a8b79b4d158cf01ab9710c6cddb5e5287ad327f627d4eb7c1478d22c537fd9455aca5e14a0adebd18f SHA512 b51c0f6946d1952fa0e91db1164d77ab12e0709fdf9555b53f5c25ed7c55365b433733a933dd2765ce14d0ca2685edce7573c9dbfb75ae49443b4f177d170c40
diff --git a/dev-haskell/http-types/http-types-0.12.3.ebuild b/dev-haskell/http-types/http-types-0.12.3.ebuild
index 91be0dd4f5f2..a4122c117bae 100644
--- a/dev-haskell/http-types/http-types-0.12.3.ebuild
+++ b/dev-haskell/http-types/http-types-0.12.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
diff --git a/dev-haskell/http-types/http-types-0.8.6.ebuild b/dev-haskell/http-types/http-types-0.8.6.ebuild
deleted file mode 100644
index 9e2a0b0f0124..000000000000
--- a/dev-haskell/http-types/http-types-0.8.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic HTTP types for Haskell (for both client and server code)"
-HOMEPAGE="https://github.com/aristidb/http-types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/text-0.11.0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances )
-"
diff --git a/dev-haskell/http-types/http-types-0.9.1.ebuild b/dev-haskell/http-types/http-types-0.9.1.ebuild
deleted file mode 100644
index 72ef46ef205e..000000000000
--- a/dev-haskell/http-types/http-types-0.9.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generic HTTP types for Haskell (for both client and server code)"
-HOMEPAGE="https://github.com/aristidb/http-types"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/text-0.11.0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances )
-"
diff --git a/dev-haskell/http-types/metadata.xml b/dev-haskell/http-types/metadata.xml
index 2bca572a7264..4c93168c51ab 100644
--- a/dev-haskell/http-types/metadata.xml
+++ b/dev-haskell/http-types/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Generic HTTP types for Haskell (for both client and server code).
-	</longdescription>
 	<upstream>
 		<remote-id type="github">aristidb/http-types</remote-id>
 	</upstream>
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index 273145ff625f..04d7dc0b45e9 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1,6 +1,2 @@
-DIST HTTP-4000.2.17.tar.gz 69706 BLAKE2B a4fa206ceb7742b3f6420d880fa2938d90b850102b4561e705cf406e3d3143fffc5306b43ce08b939b84e61e28590ae17f2ed18ec41e06eaea6080c7a917cbdf SHA512 0c72f2f78aaa6da64c734f70e1c7e5454d0041eb0354a63b25a534614671df21433c30451ef8a54ed3e303fa105b7d0d998a4a55658933749fc77ec08d6ff8c2
-DIST HTTP-4000.2.20.tar.gz 71475 BLAKE2B fbf5619ad38c2b01e62173682e34c0eb88fc5b8a87a8eb63e19e0787fc5f0672c4bc22c869b14339db8f76fc7c6052c2f5c9f14ef0c9891c6b6eee01943c8aaa SHA512 0f5927f0cfbc638c7ebce738c4f7b460b2c0b40f28dc137909c47f05dfea04e975482dcf626425f23f90f131689f1c03d9f8dc7d834e61b9e389a92f6c64f8f0
-DIST HTTP-4000.2.22.tar.gz 71609 BLAKE2B 06bee2b2d43f1dd088fc0ab528bb0009890b257378db3cd2fbba713fa83b99145d0e82b79e8a28927c4e661452cdd027151f7c1f97cc88aaedb92e59eda071d1 SHA512 20ff5dfc5c0ba752395c187f66b0dd0859d5fd199522fb60b8b81c8f219fe1a03c1112929917ce7305e76e4a9e6228632837b13815f68c3f6f2d8abcace0f9d8
-DIST HTTP-4000.2.8.tar.gz 67903 BLAKE2B f94713b1a7e6f5bca23b0c59a86b6c6672d2f49bb527f30da631b3fb8521fcf772244e2277f8389853f62c040d9d3a80cc0824d294afb420eac92a29f530608d SHA512 f7ada9000837a06ce06f9d6aaf83158d48fa5bb4fea812d093eece3b36e9bd4b25df205948c66a4e4b60df3ceb41181f4bdf13415e86ec805239f43421518872
-DIST HTTP-4000.3.14.tar.gz 72938 BLAKE2B d1e24a693d5a63d6ff493766e959447e29c6371854360645f398e4b17f807de3d1ffc4716136fcaeb60f4157bd7622b3d8c30269a98ad7ebecf5f3521e292c03 SHA512 bcc9107412f3ff5806369675ae6cfd87c4ecc36490eab6d62c697f47e62ff8b0d1d6a25f9bfb9d8ef1f037492820eb732cb9cbec7ea9e7e4b20699573077b064
-DIST HTTP-4000.3.5.tar.gz 71718 BLAKE2B 3838c286001bef88fe4b1834bf9e924ab84057fdef1906735e5049123c3694fded687099c7c4e6cd1ad71a1193f301ee0ffec59141ee7a6997abe8efacc9ae35 SHA512 9abfbac7796c21a01828c686500ec0fa81d0ad23b8139e3f64a41dfd62a3ecf345573831f5a304390dab057687d73e5cd49507a4efeb4bc9371558e8c1676653
+DIST http-4000.4.1-rev2.cabal 5862 BLAKE2B bd161e438c968d6bf20efc5bce869b5bae297b59a01332711176e34cd99f03d449f3ca8da178b5147703c2ecebe5c67f5405d98122d59fd796c8d6b23c2113f2 SHA512 03798e5436f1da1a6ecb66879f610b3b2a34d18f90c77b0724167c5931cb25b8e711316d413b7d2688c4eb2809bc957e9af2d10ad827986d026c71b2bed40a86
+DIST http-4000.4.1.tar.gz 74330 BLAKE2B a4efc62f565609efb981c32961ad9fec28246fc67bbbc3da2c8430b7f4c2a96ee378b12b4f6f5f268353db870949cc6b04a9d8489c8f2bee70d783651a2bafc5 SHA512 c1edc529032013391263bcc0f8abd9534fc53a617b5033dfdc478318465cd988732b2644c7144979156c62bd1a08b1ace507b4fb4e2806f22ec7696cbdfd0147
diff --git a/dev-haskell/http/http-4000.2.17.ebuild b/dev-haskell/http/http-4000.2.17.ebuild
deleted file mode 100644
index 29ebc488b254..000000000000
--- a/dev-haskell/http/http-4000.2.17.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE=""
-RESTRICT=test # missing ia64 alpha keywords for dev-haskell/puremd5
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2.2.0.1:=[profile?] <dev-haskell/network-2.6:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-lang/ghc
-"
-#	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-#		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.3
-#		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-#		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-#		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-#		>=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4 )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mtl1 \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.2.20.ebuild b/dev-haskell/http/http-4000.2.20.ebuild
deleted file mode 100644
index f0cd617e230a..000000000000
--- a/dev-haskell/http/http-4000.2.20.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="conduit10 +network-uri"
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.2.1.5:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-lang/ghc
-	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.3
-		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit10 conduit10) \
-		--flag=-mtl1 \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.2.22.ebuild b/dev-haskell/http/http-4000.2.22.ebuild
deleted file mode 100644
index 1cf5433a3a9b..000000000000
--- a/dev-haskell/http/http-4000.2.22.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="conduit10 +network-uri"
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-time-1.0.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-lang/ghc
-	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.4
-		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit10 conduit10) \
-		--flag=-mtl1 \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.2.8.ebuild b/dev-haskell/http/http-4000.2.8.ebuild
deleted file mode 100644
index 8dcc8bd7810a..000000000000
--- a/dev-haskell/http/http-4000.2.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-# hackport-args: --always-disabled='mtl1 network23 old-base warn-as-error'
-IUSE=""
-
-RDEPEND="<dev-haskell/network-2.5:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		>=dev-haskell/mtl-2.0:=[profile?]
-		<dev-haskell/mtl-2.2:=[profile?]"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-RESTRICT=test # missing modules: Could not find module `Httpd'
-#		test? ( =dev-haskell/case-insensitive-0.4*
-#			>=dev-haskell/conduit-0.4
-#			<dev-haskell/conduit-0.6
-#			=dev-haskell/deepseq-1.3*
-#			>=dev-haskell/http-types-0.6
-#			<dev-haskell/http-types-0.8
-#			dev-haskell/httpd-shed
-#			dev-haskell/hunit
-#			=dev-haskell/puremd5-2.1*
-#			>=dev-haskell/split-0.1
-#			<dev-haskell/split-0.3
-#			dev-haskell/test-framework
-#			dev-haskell/test-framework-hunit
-#			>=dev-haskell/wai-1.2
-#			<dev-haskell/wai-1.4
-#			>=dev-haskell/warp-1.2
-#			<dev-haskell/warp-1.4
-#		)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-network23 \
-		--flag=-warn-as-error \
-		--flag=-mtl1 \
-		--flag=-old-base \
-		--disable-tests
-}
diff --git a/dev-haskell/http/http-4000.3.14.ebuild b/dev-haskell/http/http-4000.3.14.ebuild
deleted file mode 100644
index c2e843e563e2..000000000000
--- a/dev-haskell/http/http-4000.3.14.ebuild
+++ /dev/null
@@ -1,61 +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.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="conduit10 +network-uri"
-
-RESTRICT=test # requires network
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7
-		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.3.0.0 && < 4.14' 'base >= 4.3.0.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit10 conduit10) \
-		--flag=-mtl1 \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.3.5.ebuild b/dev-haskell/http/http-4000.3.5.ebuild
deleted file mode 100644
index 3c5a93903a97..000000000000
--- a/dev-haskell/http/http-4000.3.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="conduit10 +network-uri"
-
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.2.1.8:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
-		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.6
-		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
-		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
-		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag conduit10 conduit10) \
-		--flag=-mtl1 \
-		$(cabal_flag network-uri network-uri) \
-		--flag=-network23 \
-		--flag=-old-base \
-		--flag=-warn-as-error \
-		--flag=-warp-tests
-}
diff --git a/dev-haskell/http/http-4000.4.1-r1.ebuild b/dev-haskell/http/http-4000.4.1-r1.ebuild
new file mode 100644
index 000000000000..bf07dbb5578e
--- /dev/null
+++ b/dev-haskell/http/http-4000.4.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23,+network-uri,-conduit10
+
+CABAL_HACKAGE_REVISION=2
+CABAL_PN="HTTP"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library for client-side HTTP"
+HOMEPAGE="https://github.com/haskell/HTTP"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
+		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7
+		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
+		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-conduit10 \
+		--flag=-mtl1 \
+		--flag=network-uri \
+		--flag=-network23 \
+		--flag=-old-base \
+		--flag=-warn-as-error \
+		--flag=-warp-tests
+}
diff --git a/dev-haskell/http/metadata.xml b/dev-haskell/http/metadata.xml
index 530a8cd6df3e..39f332301d58 100644
--- a/dev-haskell/http/metadata.xml
+++ b/dev-haskell/http/metadata.xml
@@ -1,48 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The HTTP package supports client-side web programming in Haskell. It lets you set up
-		HTTP connections, transmitting requests and processing the responses coming back, all
-		from within the comforts of Haskell. It's dependent on the network package to operate,
-		but other than that, the implementation is all written in Haskell.
-		
-		A basic API for issuing single HTTP requests + receiving responses is provided. On top
-		of that, a session-level abstraction is also on offer  (the @BrowserAction@ monad);
-		it taking care of handling the management of persistent connections, proxies,
-		state (cookies) and authentication credentials required to handle multi-step
-		interactions with a web server.
-		
-		The representation of the bytes flowing across is extensible via the use of a type class,
-		letting you pick the representation of requests and responses that best fits your use.
-		Some pre-packaged, common instances are provided for you (@ByteString@, @String@.)
-		
-		Here's an example use:
-		
-		&gt;
-		&gt;    do
-		&gt;      rsp &lt;- Network.HTTP.simpleHTTP (getRequest "http://www.haskell.org/")
-		&gt;              -- fetch document and return it (as a 'String'.)
-		&gt;      fmap (take 100) (getResponseBody rsp)
-		&gt;
-		&gt;    do
-		&gt;      rsp &lt;- Network.Browser.browse $ do
-		&gt;               setAllowRedirects True -- handle HTTP redirects
-		&gt;               request $ getRequest "https://google.com/"
-		&gt;      fmap (take 100) (getResponseBody rsp)
-		&gt;
-		
-		Git repository available at &lt;https://github.com/haskell/HTTP.git&gt;
-	</longdescription>
-	<use>
-		<flag name="conduit10">Use version 1.0.x or below of the conduit package (for the test suite).</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 	<upstream>
+		<remote-id type="hackage">HTTP</remote-id>
 		<remote-id type="github">haskell/HTTP</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/http2/Manifest b/dev-haskell/http2/Manifest
index 95282eec8075..4c18f5b4a652 100644
--- a/dev-haskell/http2/Manifest
+++ b/dev-haskell/http2/Manifest
@@ -1,3 +1,2 @@
-DIST http2-1.3.1.tar.gz 39493 BLAKE2B a1a94de5d35510d02c9c43638c9193631c04277e1c53bc6d7ae2cfe93176eda72a700f61606220fcdf349d375c4e888380552193ff8a40b9ec3ca64de04123d1 SHA512 7d47cb35ce55743ecdc19ea52a1e230c8c3d608348f658ed7b3eb4f86a93ad4aa16eb23e4294dc1752bd99da8027e61a0b575ee9b89fe182d6582f6b5b402cee
-DIST http2-1.6.2.tar.gz 5138047 BLAKE2B 7febaa42b0c50cd89bfc5e9acba558bea9d7e0e8c791c5ea6e6de17ed938e431b3ba4a94375dcc5858881920b83a92491a5181a13d23420d586b13fd24222535 SHA512 c9df89cb073b57bc379857aedfba82097b805f8c9452b5a2b9cfff2ff096f185f9b8aa2dfaa5b0be7909a214a67d8ba8fb93ddc8a19f8afb43f9f5d5bf67f0da
-DIST http2-2.0.3.tar.gz 5211934 BLAKE2B cc1fad663650eaa1514e5f94737966ac86a92c2cc15f47db06c057a78873ca7d745aa77280cf451e11a9c2e328cad2a89d965bb7502d6b2e0b9b808b88570a8d SHA512 ff5f02c355f9f5c459d94993f05636955f81b91cbdbd4e8c262b56e1fa3846f92aff946f8ec6851ab57ffbb73afb42999cb3597eb250a9e15a8d6788da860b20
+DIST http2-3.0.1.tar.gz 5556373 BLAKE2B 40daf73f0460ce649d6bed41b9df961b7388f7ac2e67a11aae56be2f31209183e68cef558b7880b87d1a752f96f989779e5ecbf1a86df5bd4ac8443cd476c41b SHA512 aaa32209fb9945cc33c557866acb053df403bbe37c2bd024ac52e7fc6a3e816d0249e48b83e8846017fe0df0998327cf3498f1bc96b57b0fa81ce9c4d35589c6
+DIST http2-4.1.2.tar.gz 5496723 BLAKE2B 1939a137ce0ef3fad476721fe9059963de7b96e9e09c49735d33de3bb4382ec5536c17965677df3482edb09b93e83edee485503d989b07bff8cf7d0c76f48b3e SHA512 85fb0025854c059d186dd4cefffb1065f0c87d494740afba6a3f785c7d579bc11e2ba881eeeae8f682e55902e70a8ba8bc571f84aa27fcaf341110fb70e1b43d
diff --git a/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch b/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch
deleted file mode 100644
index 07be024ee5e1..000000000000
--- a/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/http2.cabal b/http2.cabal
-index fe57a48..b28ad06 100644
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -204,6 +204,3 @@ Executable hpack-debug
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              hpack-debug.hs
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -219,2 +216,5 @@ Executable hpack-debug
-                       , word8
-+  else
-+    Buildable:          False
-+  Main-Is:              hpack-debug.hs
- 
diff --git a/dev-haskell/http2/files/http2-1.6.0-less-deps.patch b/dev-haskell/http2/files/http2-1.6.0-less-deps.patch
deleted file mode 100644
index 1ee62446d328..000000000000
--- a/dev-haskell/http2/files/http2-1.6.0-less-deps.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/http2.cabal b/http2.cabal
-index 7986d1c..fe57a48 100644
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -180,7 +180,3 @@ Executable hpack-encode
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              hpack-encode.hs
--  Other-Modules:        HPACKEncode
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -197,2 +193,6 @@ Executable hpack-encode
-                       , word8
-+  else
-+    Buildable:          False
-+  Main-Is:              hpack-encode.hs
-+  Other-Modules:        HPACKEncode
- 
-@@ -226,6 +226,3 @@ Executable hpack-stat
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              hpack-stat.hs
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -243,2 +240,5 @@ Executable hpack-stat
-                       , word8
-+  else
-+    Buildable:          False
-+  Main-Is:              hpack-stat.hs
- 
-@@ -250,8 +250,3 @@ Executable frame-encode
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              frame-encode.hs
--  Other-Modules:        Case
--                        JSON
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -263,2 +258,7 @@ Executable frame-encode
-                       , unordered-containers
-+  else
-+    Buildable:          False
-+  Main-Is:              frame-encode.hs
-+  Other-Modules:        Case
-+                        JSON
- 
diff --git a/dev-haskell/http2/http2-1.3.1.ebuild b/dev-haskell/http2/http2-1.3.1.ebuild
deleted file mode 100644
index c263ac981cc9..000000000000
--- a/dev-haskell/http2/http2-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -devel
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP/2.0 library including frames and HPACK"
-HOMEPAGE="https://hackage.haskell.org/package/http2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/aeson-pretty:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/hex:=[profile?]
-	dev-haskell/psqueues:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/glob
-		>=dev-haskell/hspec-1.3
-		dev-haskell/mwc-random )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-devel
-}
diff --git a/dev-haskell/http2/http2-1.6.2.ebuild b/dev-haskell/http2/http2-1.6.2.ebuild
deleted file mode 100644
index dad40a704875..000000000000
--- a/dev-haskell/http2/http2-1.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.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://hackage.haskell.org/package/http2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/psqueues:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/aeson
-		dev-haskell/aeson-pretty
-		>=dev-haskell/doctest-0.9.3
-		dev-haskell/glob
-		dev-haskell/hex
-		>=dev-haskell/hspec-1.3
-		dev-haskell/text
-		dev-haskell/unordered-containers
-		dev-haskell/vector
-		dev-haskell/word8 )
-"
-
-src_prepare() {
-	# workaround Cabal bug at picking unused deps
-	eapply "${FILESDIR}"/${PN}-1.6.0-less-deps.patch
-	eapply "${FILESDIR}"/${PN}-1.6.0-even-less-deps.patch
-	eapply_user
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-devel
-}
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 6d153aeb24cb..000000000000
--- a/dev-haskell/http2/http2-2.0.3.ebuild
+++ /dev/null
@@ -1,46 +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.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 ~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..26de4836f1dd
--- /dev/null
+++ b/dev-haskell/http2/http2-3.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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 ~arm64 ~ppc64 ~riscv ~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/http2/http2-4.1.2.ebuild b/dev-haskell/http2/http2-4.1.2.ebuild
new file mode 100644
index 000000000000..3c47800475b9
--- /dev/null
+++ b/dev-haskell/http2/http2-4.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.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"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network to run one of the test suites
+
+RDEPEND="dev-haskell/async:=[profile?]
+	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/time-manager:=[profile?]
+	dev-haskell/unix-time:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/aeson-2
+		dev-haskell/aeson-pretty
+		>=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/http2/metadata.xml b/dev-haskell/http2/metadata.xml
index 8d45638c29bf..baab2d1900ab 100644
--- a/dev-haskell/http2/metadata.xml
+++ b/dev-haskell/http2/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		HTTP/2.0 library including frames and HPACK.
-		Currently HTTP/2 16 framing and HPACK 10 is supported.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">http2</remote-id>
+		<remote-id type="github">kazu-yamamoto/http2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/httpd-shed/Manifest b/dev-haskell/httpd-shed/Manifest
index c58ae1dfea56..d5cab58cd654 100644
--- a/dev-haskell/httpd-shed/Manifest
+++ b/dev-haskell/httpd-shed/Manifest
@@ -1,3 +1 @@
-DIST httpd-shed-0.4.0.3.tar.gz 4308 BLAKE2B a7218ce790ab3902b94a41c97bae27517ea4750ba80c59ae1eb38953b93606c604912f19327d0e5990c4aceb6f0d7c415a871916e560e0a32cfc6df6ac6ee3b9 SHA512 4fc4da5dd42194890e4201129c7217191cc1c8f82a366b84f42f9129c45fa5cb40211674608c84df420f8d8659fd60908880d14176a36f6aa0f89c01a8c1fa6c
 DIST httpd-shed-0.4.1.1.tar.gz 4457 BLAKE2B 0b7452c8b60517055a4ab9eb56ffcd289f66671f9d9e73ecc57adbb0861797df121f96ef82d924782a691fce83f87c32fa0b65317db06bd6a42780bf5d373b8d SHA512 b168fd18f4d476fc6d903d8dc17a1831645049dc6ae57e977b97453f69c98dc3a288e2c8d0298283bc2b8dd0d4e994fcec27058bb36b9ee0d4d4aac2b9de3b97
-DIST httpd-shed-0.4.tar.gz 4065 BLAKE2B 1f5b3f2cdcc4e5bd2d6fd933dab625dbe8c4687cb1d53411531daa23d8427b263c8c26b992ef432165e943701ebd67f0ae8be363ace462713f3a451a0e0e77b8 SHA512 71b3fc8038e5245589aab99b9fa3eeef0ec13cc78bba33d88b8c7569f30b0ba18b645a939771b3d325d3e666b99c3c4428403ae016d14df55ce8dcba2e9d61e9
diff --git a/dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch b/dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch
deleted file mode 100644
index ca5a113b7014..000000000000
--- a/dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-[1 of 1] Compiling Network.Shed.Httpd ( Network/Shed/Httpd.hs, dist/build/Network/Shed/Httpd.o )
-
-Network/Shed/Httpd.hs:142:24:
-    Ambiguous occurrence `sClose'
-    It could refer to either `N.sClose',
-                             imported from `Network' at Network/Shed/Httpd.hs:38:1-14
-                          or `Network.Socket.sClose',
-                             imported from `Network.Socket' at Network/Shed/Httpd.hs:48:1-21
-diff --git a/Network/Shed/Httpd.hs b/Network/Shed/Httpd.hs
-index 9dbc2a2..f4f7d5e 100644
---- a/Network/Shed/Httpd.hs
-+++ b/Network/Shed/Httpd.hs
-@@ -139,7 +139,7 @@ initServerMain processBody sockAddr callOut = do
-                                  hClose h
-                    _                      -> hClose h
-                  return ()
--           ) `finally` sClose sock
-+           ) `finally` N.sClose sock
-   where 
-       loopIO m          = do m
-                              loopIO m
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
deleted file mode 100644
index 67dc776eaad2..000000000000
--- a/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="A simple web-server with an interact style API"
-HOMEPAGE="https://hackage.haskell.org/package/httpd-shed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-PATCHES=("${FILESDIR}"/${P}-network.patch)
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild
deleted file mode 100644
index c3b0b4438889..000000000000
--- a/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple web-server with an interact style API"
-HOMEPAGE="https://hackage.haskell.org/package/httpd-shed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="buildexamples +network-uri"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildexamples buildexamples) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild
new file mode 100644
index 000000000000..a04f32d17dd5
--- /dev/null
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +network-uri,+network-bsd
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A simple web-server with an interact style API"
+HOMEPAGE="https://hackage.haskell.org/package/httpd-shed"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="buildexamples"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag buildexamples buildexamples) \
+		--flag=network-bsd \
+		--flag=network-uri
+}
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
deleted file mode 100644
index 9b2ee6086bba..000000000000
--- a/dev-haskell/httpd-shed/httpd-shed-0.4.1.1.ebuild
+++ /dev/null
@@ -1,40 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple web-server with an interact style API"
-HOMEPAGE="http://hackage.haskell.org/package/httpd-shed"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="buildexamples +network-bsd +network-uri"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	network-bsd? ( >=dev-haskell/network-bsd-2.7:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
-					>=dev-haskell/network-2.7:=[profile?] )
-	!network-bsd? ( <dev-haskell/network-2.7:=[profile?] )
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?]
-					>=dev-haskell/network-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?]
-					<dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag buildexamples buildexamples) \
-		$(cabal_flag network-bsd network-bsd) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/httpd-shed/metadata.xml b/dev-haskell/httpd-shed/metadata.xml
index f1bb3e790432..e8d6b06231be 100644
--- a/dev-haskell/httpd-shed/metadata.xml
+++ b/dev-haskell/httpd-shed/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -12,7 +12,5 @@
 	</longdescription>
 	<use>
 		<flag name="buildexamples">Build example executables.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-		<flag name="network-bsd">Get Network.BSD from the network-bsd package.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/hunit/Manifest b/dev-haskell/hunit/Manifest
index b39064539f31..49751e7f2dff 100644
--- a/dev-haskell/hunit/Manifest
+++ b/dev-haskell/hunit/Manifest
@@ -1,2 +1,2 @@
-DIST HUnit-1.2.5.2.tar.gz 24889 BLAKE2B 7dcc49f58cde674a5555a064bcb16d73925f31cde251acc245e5c288f536550e44c465c5bff778413db180aeba62e5f1d05df25bda193e2523264d2de33e4659 SHA512 ee16c33faacc1c26e242095823ae8df47889946a6a161affab3789d7f40b423d2f002526f6cad018084dc7b151a911cf28b37b2aeef91d186bb765e940534fc4
-DIST HUnit-1.6.0.0.tar.gz 21937 BLAKE2B 7c61d812206097d2c391f13ee9e5ccd05b12565cf43f011deb4f60f8d118e79506adb860f2b5cbe91c5d938097b81d4265a4a3fd39b9d9a8be6c40b5dcf404ca SHA512 06503884bb85733be05b82da1fcc47e5b81122c3a3959ef047acbea2df1338b4f4589479b46daa6a0d554c7cb06b8cf1712462a3496db22cec5621e878467120
+DIST HUnit-1.6.2.0.tar.gz 21179 BLAKE2B c3a299cbe8f6cfe2859baf1c8a212420fd745cb5927d54ad8aae5d13dfc657a27b972de73b405d1464695405ba932e6bfd2073386e0bb9b1f398178ef1a7ba2d SHA512 b27c33545fcb4ca78dd9543eb0ab2f09e5edd989d116fe2136d876eb94745e6d384967ea4b3c6dbf0f03511091a82ecd0b299c8ab00769c57d6dddcddc27e8e5
+DIST hunit-1.6.2.0.tar.gz 21179 BLAKE2B c3a299cbe8f6cfe2859baf1c8a212420fd745cb5927d54ad8aae5d13dfc657a27b972de73b405d1464695405ba932e6bfd2073386e0bb9b1f398178ef1a7ba2d SHA512 b27c33545fcb4ca78dd9543eb0ab2f09e5edd989d116fe2136d876eb94745e6d384967ea4b3c6dbf0f03511091a82ecd0b299c8ab00769c57d6dddcddc27e8e5
diff --git a/dev-haskell/hunit/files/hunit-1.6.2.0-prevent-abi-change.patch b/dev-haskell/hunit/files/hunit-1.6.2.0-prevent-abi-change.patch
new file mode 100644
index 000000000000..42d1027aba22
--- /dev/null
+++ b/dev-haskell/hunit/files/hunit-1.6.2.0-prevent-abi-change.patch
@@ -0,0 +1,20 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+When dependencies change (for instance switching from USE=-test to USE=test)
+the ABI hash for the package changes, causing reverse-dependencies to break.
+This keeps the dependencies the same whether tests are enabled or not.
+
+diff -urN HUnit-1.6.2.0/HUnit.cabal HUnit-1.6.2.0-r1/HUnit.cabal
+--- HUnit-1.6.2.0/HUnit.cabal	2022-08-28 14:11:57.178837140 -0600
++++ HUnit-1.6.2.0-r1/HUnit.cabal	2022-08-28 14:12:38.558837160 -0600
+@@ -32,7 +32,8 @@
+   build-depends:
+     base ==4.*,
+     call-stack >=0.3.0,
+-    deepseq
++    deepseq,
++    filepath
+   exposed-modules:
+     Test.HUnit.Base
+     Test.HUnit.Lang
diff --git a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
deleted file mode 100644
index 203a94bb6bd5..000000000000
--- a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="http://hunit.sourceforge.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/hunit-1.2.5.2.ebuild b/dev-haskell/hunit/hunit-1.2.5.2.ebuild
deleted file mode 100644
index e0d86354a4a0..000000000000
--- a/dev-haskell/hunit/hunit-1.2.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="http://hunit.sourceforge.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/hunit-1.6.0.0.ebuild b/dev-haskell/hunit/hunit-1.6.0.0.ebuild
deleted file mode 100644
index 7b7e1242292f..000000000000
--- a/dev-haskell/hunit/hunit-1.6.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="HUnit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A unit testing framework for Haskell"
-HOMEPAGE="https://github.com/hspec/HUnit#readme"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/call-stack:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/hunit-1.6.2.0-r1.ebuild b/dev-haskell/hunit/hunit-1.6.2.0-r1.ebuild
new file mode 100644
index 000000000000..69a8f58dcad5
--- /dev/null
+++ b/dev-haskell/hunit/hunit-1.6.2.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_PN="HUnit"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A unit testing framework for Haskell"
+HOMEPAGE="https://github.com/hspec/HUnit#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.2.0-prevent-abi-change.patch"
+)
+
+RDEPEND=">=dev-haskell/call-stack-0.3.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/hunit/hunit-1.6.2.0.ebuild b/dev-haskell/hunit/hunit-1.6.2.0.ebuild
new file mode 100644
index 000000000000..bd88e63271d2
--- /dev/null
+++ b/dev-haskell/hunit/hunit-1.6.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HUnit"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A unit testing framework for Haskell"
+HOMEPAGE="https://github.com/hspec/HUnit#readme"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/call-stack-0.3.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/metadata.xml b/dev-haskell/hunit/metadata.xml
index 4094d2fe0b11..f49a11c4e034 100644
--- a/dev-haskell/hunit/metadata.xml
+++ b/dev-haskell/hunit/metadata.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		HUnit is a unit testing framework for Haskell, inspired by the
-		JUnit tool for Java, see: &lt;http://www.junit.org&gt;.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">HUnit</remote-id>
+		<remote-id type="github">hspec/HUnit</remote-id>
 		<remote-id type="sourceforge">hunit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/hxt-charproperties/Manifest b/dev-haskell/hxt-charproperties/Manifest
deleted file mode 100644
index fb6599d241f7..000000000000
--- a/dev-haskell/hxt-charproperties/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hxt-charproperties-9.1.1.1.tar.gz 225230 BLAKE2B d3f022c10dbfad31eca1b0950996a898e577f4cc8e90704f8660fe3e07a1f400aef40afc79d0268e32594e9e4cbedd64cdf611cc3efb0d3f84ba9f29f6907d7c SHA512 c2dcfc9969f5651b79ca3dd3f4ba410a3389648182e7c7a7f1cd38b6adda64068b22086cedef60a7de87ff56693f4b5968aa2bdf17c2a08d6a6fe0a9073a9192
-DIST hxt-charproperties-9.2.0.1.tar.gz 270767 BLAKE2B dce70cb87f1fa09ade7a4b62a3d016a6030f6de13f090195c91c4f14fd0434a2a81742a345caaa0e36b5e62b2ca1e053df56d88abd6f36165646e29da7134bd2 SHA512 518d7c15b43a33432c402b839713e1d29a60d44286ca411bfb3d9a4b955b1181b8ec84615a131db0113280bea7973c70618f4204a32b21e627c452e05a18a7ef
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild
deleted file mode 100644
index 3d0478027597..000000000000
--- a/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Character properties and classes for XML and Unicode"
-HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/index.html"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.4"
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild
deleted file mode 100644
index d1ce0f15526f..000000000000
--- a/dev-haskell/hxt-charproperties/hxt-charproperties-9.2.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Character properties and classes for XML and Unicode"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hxt-charproperties/metadata.xml b/dev-haskell/hxt-charproperties/metadata.xml
deleted file mode 100644
index 24b0e65dc8d1..000000000000
--- a/dev-haskell/hxt-charproperties/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Character proprties defined by XML and Unicode standards.
-		These modules contain predicates for Unicode blocks and char proprties
-		and character predicates defined by XML.
-		Supported Unicode version is 5.2.0.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hxt-regex-xmlschema/Manifest b/dev-haskell/hxt-regex-xmlschema/Manifest
deleted file mode 100644
index 9153835a8351..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hxt-regex-xmlschema-9.1.0.tar.gz 26675 BLAKE2B 515cadb11536101a2332e0fca909feb7cab2339c05ba0e1dd0854d192e52f3b42f215371ff050509ddc42b9a45518f84ff9c9b4557cbc65fe393f770d7f2db8c SHA512 c41fa5a685c441d07f39eb6806ab201aaf4328466b34e98e0f0c2cfa89bdbad4d510d5e68a2f73bf94d3079db87b1cf9716d68e52bab7638b6084e8aae70a94d
-DIST hxt-regex-xmlschema-9.2.0.2.tar.gz 35896 BLAKE2B 6333073f0ba758aca7bee4d4695b26f7337eb9a9eb2d50fd5ed5acf6fb0b0cff69bdd23d83fbacc9a825592f8ec7a4bfcc3cdc412005f3c81461f3d37a85f70c SHA512 4a8f1c9fe0f14e4ab7a64f24e3cc6f1d7c29cf67c5751352629f1f847e7cc062c86d4f90c7a10c35b9afdb44d4459f0fd74968ff2101f62848aa6b5e22b52cc9
-DIST hxt-regex-xmlschema-9.2.0.3.tar.gz 35781 BLAKE2B 0ab5c2042acf032e2709e6781457ec28f2bda3b9778947b08dafd7075c9422e0375574104fd06089f19192bebce3f3f3da5e1b515c8eb62bb7ce5c06c3e8680c SHA512 707ad7a4b5c32785fd89131279dd89a871f134a26ce1f98fd4ac8fec196c8960c2d39d18674967379b40508748fca3a34b9289500173075c54c1d6726191bbd8
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild
deleted file mode 100644
index a03824b8a690..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/hxt-charproperties-9*:=[profile?]
-		>=dev-haskell/parsec-2.1:=[profile?]
-		<dev-haskell/parsec-4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild
deleted file mode 100644
index 44bfa743551d..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # slow tests
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hunit )
-"
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild
deleted file mode 100644
index 2f9190215585..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile"
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag profile profile)
-}
diff --git a/dev-haskell/hxt-regex-xmlschema/metadata.xml b/dev-haskell/hxt-regex-xmlschema/metadata.xml
deleted file mode 100644
index 1a338fdd07c1..000000000000
--- a/dev-haskell/hxt-regex-xmlschema/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library supports full W3C XML Schema regular expressions
-		inclusive all Unicode character sets and blocks.
-		The complete grammar can be found under &lt;http://www.w3.org/TR/xmlschema11-2/#regexs&gt;.
-		It is implemented by the technique of derivations of regular expressions.
-		The W3C syntax is extended to support not only union of regular sets,
-		but also intersection, set difference, exor.
-		Matching of subexpressions is also supported.
-		The library can be used for constricting lightweight scanners and tokenizers.
-		It is a standalone library, no external regex libraries are used.
-		This package is a substitute for the old regex-xmlschema package.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/hxt-unicode/Manifest b/dev-haskell/hxt-unicode/Manifest
deleted file mode 100644
index 25c96cde7be7..000000000000
--- a/dev-haskell/hxt-unicode/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hxt-unicode-9.0.2.1.tar.gz 13648 BLAKE2B 820d7835e2e554e6809b0f73e289f24daf4aabefa03f04eb958e00cd56709a04de7d2b803c23f6772b0773169d3caf518ace798d302c3a1321b5a94e82968eca SHA512 43d4c73120d29e1a8af3efc4158062b750c64c4722621ebb9c88ec77110475e7953758ad5c812b661fed740c6a043bef1b4a3925a1034aa68273105d919abdbe
-DIST hxt-unicode-9.0.2.4.tar.gz 14010 BLAKE2B cdec42564a1107f1a1d322cb22a1f5b74d2bed6e3aaa04ca2973ccc0d6b02b98c18faa86ce92881ad9229b60d2f29055e4cdaa2a2e7002fdb7b9e25133f35dc3 SHA512 4daab9c754e05e15bb0f32bce4ccc0c581c6d8dd4ca4d4868ca7b756a6e40cc9ae8890fc3c925b63bb419db0354229ca6e61fa96bec048f0c61b3ebb43d212bb
diff --git a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild
deleted file mode 100644
index 0e9771e497e9..000000000000
--- a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"
-HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/index.html"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/hxt-charproperties-9*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.4"
diff --git a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
deleted file mode 100644
index 26e2c4187699..000000000000
--- a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/hxt-unicode/metadata.xml b/dev-haskell/hxt-unicode/metadata.xml
deleted file mode 100644
index 73c4decb1fc1..000000000000
--- a/dev-haskell/hxt-unicode/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Unicode encoding and decoding functions for utf8, iso-latin-* and somes other encodings,
-		used in the Haskell XML Toolbox.
-		ISO Latin 1 - 16, utf8, utf16, ASCII are supported. Decoding
-		is done with lasy functions, errors may be detected or ignored.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/hxt/Manifest b/dev-haskell/hxt/Manifest
deleted file mode 100644
index 8e7caf40c62b..000000000000
--- a/dev-haskell/hxt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hxt-9.3.1.15.tar.gz 235096 BLAKE2B a6796bf8509b95c2a04d760e2cd3ca8d0f6315a5a9ce5c3a2d29e41a9503b6405a0f614b9b5f0b039936284cec4dc63c83b4dba0ce806e415497a1e486b86761 SHA512 f2d4d853811667b663d434671bc5743f7019fe435c9c39af359a0305e4c5bfdf53540b9cd33930bd13d07482cc583fd1f231fe33995b9a55b785af8d98f1fe24
-DIST hxt-9.3.1.16.tar.gz 223814 BLAKE2B acc0ada43249884c2da06adb8214827b626799d6ba4d4eb9de78dcfb4451c523a48b04e6f7c6cc41b4f6a708527bd824979d902452c77dabd8190d94a521bbb2 SHA512 6cc99a3b9d1ffe33002d35a5c0965919227835e0fb5b0b829b49232443dec175428dab66720a717f8a655e0de9ad4c77c501aa6d3982b43024cb3a866cd12846
-DIST hxt-9.3.1.18.tar.gz 223887 BLAKE2B 35d48b60496fc365b4ba493a8cec186fd379ee360fcf311b4529c617f4a7cf825c6547edf3ba3c7b7f5cfff14e05a0fceff71ccab8a45609f445c5c4fd29c468 SHA512 4b7c57486fe02357a45b5f835dd9f05333ce39578ec84c3c920fdcaa2df8ae1067da3650d3948559ddaf2e6f77f14291e1ddaa28a12ea9dfb62a797d296ec118
diff --git a/dev-haskell/hxt/hxt-9.3.1.15.ebuild b/dev-haskell/hxt/hxt-9.3.1.15.ebuild
deleted file mode 100644
index c201238456f0..000000000000
--- a/dev-haskell/hxt/hxt-9.3.1.15.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A collection of tools for processing XML with Haskell"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-1:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/hxt-charproperties-9.1:=[profile?] <dev-haskell/hxt-charproperties-10:=[profile?]
-	>=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?] <dev-haskell/hxt-regex-xmlschema-10:=[profile?]
-	>=dev-haskell/hxt-unicode-9.0.1:=[profile?] <dev-haskell/hxt-unicode-10:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/hxt/hxt-9.3.1.16.ebuild b/dev-haskell/hxt/hxt-9.3.1.16.ebuild
deleted file mode 100644
index b1bb74d728b0..000000000000
--- a/dev-haskell/hxt/hxt-9.3.1.16.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A collection of tools for processing XML with Haskell"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9.1:=[profile?]
-	>=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?]
-	>=dev-haskell/hxt-unicode-9.0.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/hxt/hxt-9.3.1.18.ebuild b/dev-haskell/hxt/hxt-9.3.1.18.ebuild
deleted file mode 100644
index 2a562ce245da..000000000000
--- a/dev-haskell/hxt/hxt-9.3.1.18.ebuild
+++ /dev/null
@@ -1,35 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A collection of tools for processing XML with Haskell"
-HOMEPAGE="https://github.com/UweSchmidt/hxt"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hxt-charproperties-9.1:=[profile?]
-	>=dev-haskell/hxt-regex-xmlschema-9.2:=[profile?]
-	>=dev-haskell/hxt-unicode-9.0.1:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/parsec-2.1:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/network-uri-2.6:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=network-uri
-}
diff --git a/dev-haskell/hxt/metadata.xml b/dev-haskell/hxt/metadata.xml
deleted file mode 100644
index e629e3d93946..000000000000
--- a/dev-haskell/hxt/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Haskell XML Toolbox bases on the ideas of HaXml and HXML,
-		but introduces a more general approach for processing XML with Haskell.
-		The Haskell XML Toolbox uses a generic data model for representing XML documents,
-		including the DTD subset and the document subset, in Haskell.
-		It contains a validating XML parser, a HTML parser, namespace support,
-		an XPath expression evaluator, an XSLT library, a RelaxNG schema validator
-		and funtions for serialization and deserialization of user defined data.
-		The library makes extensive use of the arrow approach for processing XML.
-		Since version 9 the toolbox is partitioned into various (sub-)packages.
-		This package contains the core functionality,
-		hxt-curl, hxt-tagsoup, hxt-relaxng, hxt-xpath, hxt-xslt, hxt-regex-xmlschema contain the extensions.
-		hxt-unicode contains encoding and decoding functions,
-		hxt-charproperties char properties for unicode and XML.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">UweSchmidt/hxt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/icalendar/Manifest b/dev-haskell/icalendar/Manifest
deleted file mode 100644
index 3dbb783ade0f..000000000000
--- a/dev-haskell/icalendar/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST iCalendar-0.4.0.3.tar.gz 29889 BLAKE2B 8cd635e5677b98b5aa2b96605a21407a9443c92a31b963aece597a1acb5d248764189fd277789c7a4d39a81760f4e5f00ec98992bbf1628086766775efb38346 SHA512 504c562a8213a899071941fc3ebce59354885a4d5b680950eb9eee8a0b1704475e91fbbffb8773d6ae5f9c124dd1fd3c39aae369f7305bf4d7ca9430984070c8
-DIST iCalendar-0.4.0.5.tar.gz 29978 BLAKE2B 36a442f83eabec17629ffb38b160e5d17c3d76f4ed54855427d6fa475c0d8d3e0201a08d8b9ed87eaafb37e30625c2d513da8f3dd234c6b8c66264ae64335e48 SHA512 31c58c275d4a4c74adba790a4f32ce368c0dc4a96ac7728111dd4ef71dbc29152786d23d8b25dc3abe064da931a0e11029c0090bf71cf90d22bb5e7a3451e093
diff --git a/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild
deleted file mode 100644
index 42839a6bf3ca..000000000000
--- a/dev-haskell/icalendar/icalendar-0.4.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="iCalendar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="iCalendar data types, parser, and printer"
-HOMEPAGE="https://github.com/chrra/iCalendar"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/data-default-0.3:=[profile?]
-	>=dev-haskell/mime-0.4.0.2:=[profile?]
-	>=dev-haskell/mtl-2.1.0:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/icalendar/icalendar-0.4.0.5.ebuild b/dev-haskell/icalendar/icalendar-0.4.0.5.ebuild
deleted file mode 100644
index 5683640c698a..000000000000
--- a/dev-haskell/icalendar/icalendar-0.4.0.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="iCalendar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="iCalendar data types, parser, and printer"
-HOMEPAGE="https://github.com/chrra/iCalendar"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/data-default-0.3:=[profile?]
-	>=dev-haskell/mime-0.4.0.2:=[profile?]
-	>=dev-haskell/mtl-2.1.0:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/parsec-3.1.0:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.9:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps\
-		'containers >= 0.5 && < 0.6' 'containers >= 0.5 && < 0.7'\
-		'network >= 2.6 && < 2.7' 'network >= 2.6 && < 2.9'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/icalendar/metadata.xml b/dev-haskell/icalendar/metadata.xml
deleted file mode 100644
index ce6e4ffec79e..000000000000
--- a/dev-haskell/icalendar/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="network-uri">use network-uri package</flag>
-	</use>
-	<longdescription>
-		Data definitions, parsing and printing of the iCalendar
-		format (RFC5545).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">chrra/iCalendar</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/iconv/Manifest b/dev-haskell/iconv/Manifest
deleted file mode 100644
index 9c953d0b58cc..000000000000
--- a/dev-haskell/iconv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST iconv-0.4.1.3.tar.gz 12706 BLAKE2B 569b61bc426115feaf321cb52230460d1cc66472e2fa18678a16e5486a80b5df698e2fece746371268d7031d82268bee98f15ae1713b9589b42f54b4e9cdd0e5 SHA512 b5541bbf477572f7546fa804a33243f5d126c6eb57d0fc12abd85fb9fb19dbb10a79cca60054c585845c3b755d2d5d021413d9aca4db63f5b0eaa52bba87d588
diff --git a/dev-haskell/iconv/iconv-0.4.1.3.ebuild b/dev-haskell/iconv/iconv-0.4.1.3.ebuild
deleted file mode 100644
index 39168dd1d6a2..000000000000
--- a/dev-haskell/iconv/iconv-0.4.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="String encoding conversion"
-HOMEPAGE="https://hackage.haskell.org/package/iconv"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/iconv/metadata.xml b/dev-haskell/iconv/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/iconv/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/idiii/Manifest b/dev-haskell/idiii/Manifest
deleted file mode 100644
index 26db451dc090..000000000000
--- a/dev-haskell/idiii/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST idiii-0.1.3.3.tar.gz 103560 BLAKE2B cc0f89cbdc2eee4d2b50f48cd1c259af57a7846e38ad80214e8ca57d5ef6e8af1c0f4aac435a8092b4c2c21584c2dd9cc33d0afc5558494c76c93af6e5782ef7 SHA512 31d993aad1891d1d673bf4cebaf639cf20c4cbf9835eb808a5d241e9933a8b2e64a33465d8a77950d9aa2afe4ae6985e4d62d890b7a52701792e3f5c7bf70547
diff --git a/dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch b/dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch
deleted file mode 100644
index 0bd0469e53af..000000000000
--- a/dev-haskell/idiii/files/idiii-0.1.3.3-fold.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/src/ID3/Type/Tag.hs
-+++ b/src/ID3/Type/Tag.hs
-@@ -89,3 +89,3 @@ getActualSize t = (footerSize t) + (framesSize (t^.frames)) + (extHSize t)
- framesSize :: Map FrameID ID3Frame -> FrameSize
--framesSize fs = Map.fold (\fr x -> fr^.frHeader^.frSize + 10 + x) 0 fs
-+framesSize fs = Map.foldr (\fr x -> fr^.frHeader^.frSize + 10 + x) 0 fs
- footerSize :: ID3Tag -> Integer
diff --git a/dev-haskell/idiii/idiii-0.1.3.3.ebuild b/dev-haskell/idiii/idiii-0.1.3.3.ebuild
deleted file mode 100644
index 874e97f42508..000000000000
--- a/dev-haskell/idiii/idiii-0.1.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour" # Broken test-suite: missing files
-inherit haskell-cabal
-
-DESCRIPTION="ID3v2 (tagging standard for MP3 files) library"
-HOMEPAGE="http://hackage.haskell.org/package/idiii"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test #missing files
-
-RDEPEND="dev-haskell/data-accessor:=[profile?]
-	dev-haskell/missingh:=[profile?]
-	dev-haskell/polyparse:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-PATCHES=("${FILESDIR}"/${P}-fold.patch)
diff --git a/dev-haskell/idiii/metadata.xml b/dev-haskell/idiii/metadata.xml
deleted file mode 100644
index 84a397179159..000000000000
--- a/dev-haskell/idiii/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ID3v2 (tagging standard for MP3 files) library
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/idna/Manifest b/dev-haskell/idna/Manifest
deleted file mode 100644
index 9f875a551d99..000000000000
--- a/dev-haskell/idna/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST idna-0.2.tar.gz 2372 BLAKE2B 9efdb1fed1bb1da07a1031fb6f5616876398594049aba71ef2bc7764971ca785f12ed94535bde5ab9c51c435f1bc1d96072ab6830ceded8d4ec70dadaccd2471 SHA512 cfbe78f2b21059802e139420120a6bce8c09f58786258c874e73b0f01f953cd07d2cedf7c2d19677b0dbe327db7ce4b39a6569fd624cfcc02b6b249e07051b81
-DIST idna-0.3.0.tar.gz 2352 BLAKE2B d4b0441c22b14d5e87438d3e39594e44943aaccc70ee4c66eab70146067e7a1a0c358e94cd68251517fcdbbb2b14f896441a6ebfccd764b31c342d82b8e79b8f SHA512 c18bd9e4157abfde7fa30a16d0df432745f04ee784a2d2be3852750d989964a77bcfc8cc34ab8629a0bb25686adacc07f510150f9696a926559964e6a724f98f
diff --git a/dev-haskell/idna/idna-0.2.ebuild b/dev-haskell/idna/idna-0.2.ebuild
deleted file mode 100644
index 992f49037a23..000000000000
--- a/dev-haskell/idna/idna-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Implements IDNA (RFC 3490)"
-HOMEPAGE="https://hackage.haskell.org/package/idna"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/punycode-2.0:=[profile?]
-		>=dev-haskell/stringprep-0.1.2:=[profile?]
-		>=dev-haskell/text-0.1:=[profile?]
-		>=dev-lang/ghc-7.0.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/idna/idna-0.3.0.ebuild b/dev-haskell/idna/idna-0.3.0.ebuild
deleted file mode 100644
index 6a58f9316aa5..000000000000
--- a/dev-haskell/idna/idna-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Implements IDNA (RFC 3490)"
-HOMEPAGE="https://hackage.haskell.org/package/idna"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/punycode-2.0:=[profile?]
-	>=dev-haskell/stringprep-1:=[profile?] <dev-haskell/stringprep-2:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
diff --git a/dev-haskell/idna/metadata.xml b/dev-haskell/idna/metadata.xml
deleted file mode 100644
index 2bc68ef0b1cc..000000000000
--- a/dev-haskell/idna/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Implements IDNA - Internationalized Domain Names in Applications (RFC 3490).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/ieee754/Manifest b/dev-haskell/ieee754/Manifest
index ee7c4e8a0207..5f21c1727c97 100644
--- a/dev-haskell/ieee754/Manifest
+++ b/dev-haskell/ieee754/Manifest
@@ -1 +1,2 @@
 DIST ieee754-0.7.8.tar.gz 17290 BLAKE2B befc4e9f5f1b69a6ad29a2bde915a6f9115a307419d903db6f4cb4108f3556d5475805f997e31212f580ed859c45e3019c55c0fd1ce8ec3bbf0d1892b04fc091 SHA512 662ed7c68797164ee5f0cd3132da96d8d9032aa23037d57636281fdc4952a7c276f92deb032db60663ab1c71311fd8d3088265fc03f772f271dcb659f3e9b866
+DIST ieee754-0.8.0.tar.gz 17564 BLAKE2B 7dcbfc3fcff5fb840bdba9e6fb6e964adf519ad3b6e21e40bbf05c9a4e571f196b9946b8f4bc3b66b1d38720ad9e44bf23c301fbee39c0da7a2766930e0a7262 SHA512 d75b619f0c0b9ac496a68997b6d79b3d7504221f1583e7c35ecc035b6e2b11559e402264f36827153aa89d9eabb27d9383413eb5fd157385b3f41c4f0050a43b
diff --git a/dev-haskell/ieee754/ieee754-0.7.8.ebuild b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
index 60c63f3a23e9..e8e44dc73401 100644
--- a/dev-haskell/ieee754/ieee754-0.7.8.ebuild
+++ b/dev-haskell/ieee754/ieee754-0.7.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.4.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ieee754/ieee754-0.8.0.ebuild b/dev-haskell/ieee754/ieee754-0.8.0.ebuild
new file mode 100644
index 000000000000..0e9230f0a20b
--- /dev/null
+++ b/dev-haskell/ieee754/ieee754-0.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities for dealing with IEEE floating point numbers"
+HOMEPAGE="https://github.com/patperry/hs-ieee754"
+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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2.0
+"
diff --git a/dev-haskell/ieee754/metadata.xml b/dev-haskell/ieee754/metadata.xml
index 9d2d16b6418a..70603691e494 100644
--- a/dev-haskell/ieee754/metadata.xml
+++ b/dev-haskell/ieee754/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-	Utilities for dealing with IEEE floating point numbers, ported from the Tangoi
-	math library; approximate and exact equality comparisons for general types. 
-	</longdescription>
 	<upstream>
 		<remote-id type="github">patperry/hs-ieee754</remote-id>
 	</upstream>
diff --git a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
index c1d6dc73bdc1..7b6731de862f 100644
--- a/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
+++ b/dev-haskell/ifelse/ifelse-0.85-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1
 
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/ifelse/ifelse-0.85.ebuild b/dev-haskell/ifelse/ifelse-0.85.ebuild
deleted file mode 100644
index a54cf2302aff..000000000000
--- a/dev-haskell/ifelse/ifelse-0.85.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="IfElse"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Anaphoric and miscellaneous useful control-flow"
-HOMEPAGE="https://hackage.haskell.org/package/IfElse"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/ifelse/metadata.xml b/dev-haskell/ifelse/metadata.xml
index 4e6e943e5365..937381521944 100644
--- a/dev-haskell/ifelse/metadata.xml
+++ b/dev-haskell/ifelse/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Anaphoric and miscellaneous useful control-flow
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/indexed-traversable-instances/Manifest b/dev-haskell/indexed-traversable-instances/Manifest
new file mode 100644
index 000000000000..aa4424fe5e72
--- /dev/null
+++ b/dev-haskell/indexed-traversable-instances/Manifest
@@ -0,0 +1,3 @@
+DIST indexed-traversable-instances-0.1.1.2-rev1.cabal 2536 BLAKE2B 31012e89159e2957839f38047c5b6f7806dc69b14aedcd99c5851584368b9e44948e22f9ae6e483ca72865bdcf75e99eee099ff00a81b01a9c9444a21a549267 SHA512 097d27918d2589f9b08ebc0d39d47b49ad67c3f594bdbbf668ae5514d0921c458d2386211f0c81753d5694523ea5221d89a73402706d1b79100c7f617fa922f5
+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
diff --git a/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.1.2.ebuild b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.1.2.ebuild
new file mode 100644
index 000000000000..e7dbb672e045
--- /dev/null
+++ b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable-instances"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/onetuple-0.3:=[profile?] <dev-haskell/onetuple-0.5:=[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?]
+	>=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/quickcheck-2.14.2 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.29 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-quickcheck-0.10.1.1 <dev-haskell/tasty-quickcheck-0.11
+	)
+"
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
new file mode 100644
index 000000000000..ce00ab299a4d
--- /dev/null
+++ b/dev-haskell/indexed-traversable-instances/indexed-traversable-instances-0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable-instances"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+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?]
+	>=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/quickcheck-2.14.2 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.25.1 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-quickcheck-0.10.1.1 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/indexed-traversable-instances/metadata.xml b/dev-haskell/indexed-traversable-instances/metadata.xml
new file mode 100644
index 000000000000..27f813d261e3
--- /dev/null
+++ b/dev-haskell/indexed-traversable-instances/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">indexed-traversable-instances</remote-id>
+		<remote-id type="github">haskellari/indexed-traversable</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/indexed-traversable/Manifest b/dev-haskell/indexed-traversable/Manifest
new file mode 100644
index 000000000000..7b589a1c7def
--- /dev/null
+++ b/dev-haskell/indexed-traversable/Manifest
@@ -0,0 +1,2 @@
+DIST indexed-traversable-0.1.2.1.tar.gz 8905 BLAKE2B 48abecc7b8e4b494fc8fde5786ac4d92d8a3463351199daf49b46a1dbcbb95e782ef860a9ac976157967e68dbbaba0e36689d2720830877c34987532047cc507 SHA512 22960e94b6cf3c661ae9db7cb8e0ad7d0931bf4bd01ee692c1c026453c6f176fe36acdbe12e8a8552011b3792c2a493d4e17e0996fad0aaa23140d39b1b6d253
+DIST indexed-traversable-0.1.2.tar.gz 8685 BLAKE2B e136715ed18919f614b1c977f27556447f3bfdf745f6e47e7cd2aeb3038d7afaae31a34f4e9f299494cc034d34ba4e75e7e8481b8b81ba421a1afb1a8408c619 SHA512 38d2dfc0e45e3eafa1e8827c7f27a64e296902f0193cb61939af74ad6845be067024ac32278a6b5bca1976a2d3ada5820a7a6879d7bf9000730450714a5df9c4
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.1.ebuild
new file mode 100644
index 000000000000..3f0590469484
--- /dev/null
+++ b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild
new file mode 100644
index 000000000000..da621553099c
--- /dev/null
+++ b/dev-haskell/indexed-traversable/indexed-traversable-0.1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 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="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/indexed-traversable/metadata.xml b/dev-haskell/indexed-traversable/metadata.xml
new file mode 100644
index 000000000000..df84db65042b
--- /dev/null
+++ b/dev-haskell/indexed-traversable/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">indexed-traversable</remote-id>
+		<remote-id type="github">haskellari/indexed-traversable</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/infer-license/Manifest b/dev-haskell/infer-license/Manifest
deleted file mode 100644
index 34ad5dc76572..000000000000
--- a/dev-haskell/infer-license/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST infer-license-0.2.0.tar.gz 48173 BLAKE2B 27b7adb74c897c03d6e8795d580d165d41ffd527ea4d6b6bed4c730a46d23177babeb57fc6e33ec379a285a76a89727bc10557f925bcc81f4bcb6c50f10bd989 SHA512 266651d9890ccbd9281ef3f9cd16df10f9c6fa8449990b63e956bd13559b1ef773c9dee92ad80de5b9d03599ac6a09766a1f4f3425884007982ab14d01697d45
diff --git a/dev-haskell/infer-license/infer-license-0.2.0.ebuild b/dev-haskell/infer-license/infer-license-0.2.0.ebuild
deleted file mode 100644
index dd1e3ed8f13e..000000000000
--- a/dev-haskell/infer-license/infer-license-0.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Infer software license from a given license file"
-HOMEPAGE="http://hackage.haskell.org/package/infer-license"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-haskell/text-metrics-0.3.0:=[profile?] <dev-haskell/text-metrics-0.4:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/infer-license/metadata.xml b/dev-haskell/infer-license/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/infer-license/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/integer-logarithms/Manifest b/dev-haskell/integer-logarithms/Manifest
index 6ff7af00eb81..b50896cee19d 100644
--- a/dev-haskell/integer-logarithms/Manifest
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -1 +1,2 @@
-DIST integer-logarithms-1.0.3.tar.gz 8840 BLAKE2B d59a01c2b712c499ee5c81da0d8055d96137f5a1c55ccc5a77ca99449743b753223949de2a0289965423ae16bb61eef7452ace736cc5a0d6448d7f1ab8318fed SHA512 b211127620bb52398ae7e64281f991d9dd016d5f74ff5d939275afea15689b01f82577efeaa2dfcdf4230cfea841f6c14f731ba16d38192f48e2e7ae90e704f3
+DIST integer-logarithms-1.0.3.1-rev4.cabal 3262 BLAKE2B 7f75cecf3dc90bc6e50f55990c2b1be832cb0b94fbd0c0b6d8d985ecd21aee1a6f078b74af72676ce303261f1e71d5e3b177985baa8b005f52020d0b84159a93 SHA512 217c0fd597f2519879adba16c8e10ee562928102f7c9786a604e7ec12ea683c751d28902296d1153d30a752f566ea6c8cb83c86c990e3cdbb358807b3de71d9b
+DIST integer-logarithms-1.0.3.1.tar.gz 9023 BLAKE2B 29a9e2e73a6fb63f31ad87b53161b9f669a3cf6fed2992d7bf7414d9c9cff9cbe00baa301f7a7889fc0a31ff635d85dafc49ed5ce3f009202ba017b47e75c8a0 SHA512 670aff419de8d6afd1b7e1a40b68290bcf7aefad788c3b08aebfa5ca3e709f5d22543fce82fb75dc18b3ba0ef6d8a8f61735cde647a7a6c9392a60ec365534b3
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r2.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r2.ebuild
new file mode 100644
index 000000000000..286e3937405a
--- /dev/null
+++ b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.1-r2.ebuild
@@ -0,0 +1,48 @@
+# 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: -check-bounds,+integer-gmp
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Integer logarithms"
+HOMEPAGE="https://github.com/haskellari/integer-logarithms"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/quickcheck-2.14.1 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3
+		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11
+		>=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-check-bounds \
+		--flag=integer-gmp
+}
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild b/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild
deleted file mode 100644
index baf54225bac4..000000000000
--- a/dev-haskell/integer-logarithms/integer-logarithms-1.0.3.ebuild
+++ /dev/null
@@ -1,43 +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.9999
-#hackport: flags: -check-bounds,+integer-gmp
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Integer logarithms"
-HOMEPAGE="https://github.com/Bodigrim/integer-logarithms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#circular dependency: scientific -> integer-logarithms -> tasty -> scientific
-RESTRICT="test"
-
-RDEPEND=">=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.3 && < 4.13' 'base >= 4.3' \
-		'ghc-prim < 0.6' 'ghc-prim'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-check-bounds \
-		--flag=integer-gmp
-}
diff --git a/dev-haskell/integer-logarithms/metadata.xml b/dev-haskell/integer-logarithms/metadata.xml
index d1bc98b5a57b..b5ed47e1ed50 100644
--- a/dev-haskell/integer-logarithms/metadata.xml
+++ b/dev-haskell/integer-logarithms/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		&quot;Math.NumberTheory.Logarithms&quot; and &quot;Math.NumberTheory.Powers.Integer&quot;
-		from the arithmoi package.
-		
-		Also provides &quot;GHC.Integer.Logarithms.Compat&quot; and
-		&quot;Math.NumberTheory.Power.Natural&quot; modules, as well as some
-		additional functions in migrated modules.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">integer-logarithms</remote-id>
+		<remote-id type="github">haskellari/integer-logarithms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/interpolate/Manifest b/dev-haskell/interpolate/Manifest
deleted file mode 100644
index 3c0470fa5f69..000000000000
--- a/dev-haskell/interpolate/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST interpolate-0.1.0.tar.gz 4894 BLAKE2B 1b8438ae6e466fddf66161314e5046dcab862bea29fe136e0c4f7b374c8c337b310d546ff714aec4adb00ed63385a600f04f6f3d6b8313f068299ee2a827c032 SHA512 5273195c77ef22919dfcb8df9e6db4a1ee186ca0d218f24e94a53236b0af20897d01273e027307a7164bf15a66ebf47afcc9ecc35f6e867c3c2a0e1572eaf435
-DIST interpolate-0.2.0.tar.gz 6889 BLAKE2B 548418c34af569e4ed0f4bfe5189f4d2957e99a7e11d70dea18f6584cb497a89b3ca458d933301798fdff29e98ba90ae75fc45aa454599f1709bab5f7f1319c9 SHA512 adc90d7da696c4aea0935c5f85dbf37a1738c89ff3b940804cd7bb4f888e28a445c51db9e0f2e1e66f98646f60964c10d135cef30c13efaaaffee3c65b93c89a
diff --git a/dev-haskell/interpolate/interpolate-0.1.0.ebuild b/dev-haskell/interpolate/interpolate-0.1.0.ebuild
deleted file mode 100644
index 31c98ac9d5ca..000000000000
--- a/dev-haskell/interpolate/interpolate-0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="String interpolation done right"
-HOMEPAGE="https://hackage.haskell.org/package/interpolate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/haskell-src-meta:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.5
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances
-		dev-haskell/text )
-"
diff --git a/dev-haskell/interpolate/interpolate-0.2.0.ebuild b/dev-haskell/interpolate/interpolate-0.2.0.ebuild
deleted file mode 100644
index 934b9f9e4085..000000000000
--- a/dev-haskell/interpolate/interpolate-0.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="String interpolation done right"
-HOMEPAGE="https://github.com/sol/interpolate#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-src-meta-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/base-compat
-		>=dev-haskell/hspec-1.5
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances
-		dev-haskell/text )
-"
diff --git a/dev-haskell/interpolate/metadata.xml b/dev-haskell/interpolate/metadata.xml
deleted file mode 100644
index 62fee7cb97ec..000000000000
--- a/dev-haskell/interpolate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		String interpolation done right
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/invariant/Manifest b/dev-haskell/invariant/Manifest
index 1e2f56cd99fb..6bb9860284e6 100644
--- a/dev-haskell/invariant/Manifest
+++ b/dev-haskell/invariant/Manifest
@@ -1 +1,2 @@
-DIST invariant-0.5.3.tar.gz 24394 BLAKE2B 5946f6419c74a0697f6017b1178f6a5a99d62b26e7bbf08e9a08430ae22f4e15fae032a5257d9c5589767125d1a5f53ce9c16e1d6c15c90081b355ca102c8149 SHA512 0a488a800b0eec85e865b100e3944d5e9dd45e6c12a411f67b4ba7f40de6fe0b8e37900f72c83ec7b92033a3d15e754dc11d991ecafe18d8f257afdaf67ca9be
+DIST invariant-0.5.5.tar.gz 27181 BLAKE2B d2a6bfb24bfcc28a4e06524e15fbf0b61412d65f9a8a8bf89f77e2ea854b4c10c5a6c30a47c2720c0e772ad20cae0459f1907bcb85b44a64d72d50712933b4af SHA512 da572f725bb1d93e6c2d07f1c8e770a8acbebd4fa3f192cc4459720f440da26f07ac66dcd44c021f82c3e351e1de53db8dd229dd4000d1b917613c6df1d65fa5
+DIST invariant-0.6.2.tar.gz 28199 BLAKE2B e9acc24e0ef05fe4664ba52e23232206b7b01e8c1d6c310eba991876032a351213f07148f59dbb18f9a4bcf1cc29f054efeebe0f8091f0f680cb39f1e679d01c SHA512 a66d21cebbcef1c247ae329e4d607573308060056c22efaedf6f16fb658b6f71d0dade7deb073bf4fd0f9b595e524d190f94b23695ad98cd40a0f141988fa2ee
diff --git a/dev-haskell/invariant/invariant-0.5.3.ebuild b/dev-haskell/invariant/invariant-0.5.3.ebuild
deleted file mode 100644
index 8708070bba60..000000000000
--- a/dev-haskell/invariant/invariant-0.5.3.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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 invariant functors"
-HOMEPAGE="https://github.com/nfrisby/invariant-functors"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?]
-	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/th-abstraction-0.2.2:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.8
-		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-3 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'template-haskell     >= 2.4    && < 2.16' 'template-haskell     >= 2.4' \
-		'template-haskell >= 2.4  && < 2.16' 'template-haskell >= 2.4'
-}
diff --git a/dev-haskell/invariant/invariant-0.5.5.ebuild b/dev-haskell/invariant/invariant-0.5.5.ebuild
new file mode 100644
index 000000000000..b16e860c3f98
--- /dev/null
+++ b/dev-haskell/invariant/invariant-0.5.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell98 invariant functors"
+HOMEPAGE="https://github.com/nfrisby/invariant-functors"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?]
+	>=dev-haskell/stm-2.2:=[profile?] <dev-haskell/stm-3:=[profile?]
+	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-1.8
+		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-3 )
+"
diff --git a/dev-haskell/invariant/invariant-0.6.2.ebuild b/dev-haskell/invariant/invariant-0.6.2.ebuild
new file mode 100644
index 000000000000..719a1d450ef1
--- /dev/null
+++ b/dev-haskell/invariant/invariant-0.6.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell98 invariant functors"
+HOMEPAGE="https://github.com/nfrisby/invariant-functors"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-2:=[profile?]
+	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hspec-1.8
+		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-3 )
+"
diff --git a/dev-haskell/invariant/metadata.xml b/dev-haskell/invariant/metadata.xml
index b7878815d80d..4e2cf6833ac7 100644
--- a/dev-haskell/invariant/metadata.xml
+++ b/dev-haskell/invariant/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">invariant</remote-id>
+		<remote-id type="github">nfrisby/invariant-functors</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/io-streams-haproxy/Manifest b/dev-haskell/io-streams-haproxy/Manifest
deleted file mode 100644
index a0839b11d40b..000000000000
--- a/dev-haskell/io-streams-haproxy/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST io-streams-haproxy-1.0.0.1.tar.gz 9892 BLAKE2B 0d96c42328bdc12a637b47f50cb9938abe658cebf075896c1e834850a4e9a97b2aa22f71977b5af6e9c080af4aead1febb7c56370df9b2a580557869e391cdb7 SHA512 03818b65765dd575bba5d9eaf508bac8251a34f64f861fb9d2b3029f8923b22e2eb5e835dd8de7c346682c26587d4f5b2086647713c6bd897ab888b81eb95fb1
-DIST io-streams-haproxy-1.0.1.0.tar.gz 10348 BLAKE2B 6c2268cacdfbe73561b8f753594fa39a4027ddf5d22696c7487e8b4c74c330627feec748789389f9f942c14412ecd030c80e779ef0031905d2fe681d7a1bff66 SHA512 6d9f2da6b014a9f2ee894237af56376b94616af1c1795681adac4bfd10edfb851cbe1a37295025c6ebf7e77fe7b5d2abba3557ac1a9ed594deabaee05151572a
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild
deleted file mode 100644
index 5b5a5c71bbeb..000000000000
--- a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HAProxy protocol 1.5 support for io-streams"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
deleted file mode 100644
index c4dab9cf9893..000000000000
--- a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HAProxy protocol 1.5 support for io-streams"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # two tests require network access
-
-RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base              >= 4.5 && < 4.13' 'base              >= 4.5' \
-		'network           >= 2.3 && < 3.1' 'network           >= 2.3 && < 3.2'
-}
diff --git a/dev-haskell/io-streams-haproxy/metadata.xml b/dev-haskell/io-streams-haproxy/metadata.xml
deleted file mode 100644
index 83e8ec3de1d8..000000000000
--- a/dev-haskell/io-streams-haproxy/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HAProxy protocol version 1.5 support (see
-		&lt;http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt&gt;) for applications
-		using io-streams. The proxy protocol allows information about a networked
-		peer (like remote address and port) to be propagated through a forwarding
-		proxy that is configured to speak this protocol.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/io-streams/Manifest b/dev-haskell/io-streams/Manifest
deleted file mode 100644
index 3cb233c7ae27..000000000000
--- a/dev-haskell/io-streams/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST io-streams-1.3.6.0.tar.gz 61651 BLAKE2B d71a5ba3d264b98d3284470021fc1d9622700b37ef1a67142d12d4d6321233eb28ad5274925e08f9d0c251ee77e25e2187c811d197a9f7b68e33479d8ea602ab SHA512 9ef5a2daa43600796b48104771c71d698f40e29def536e785421b53a310683e7db202b254310a0a5f2d1fa507dcad27c25f328c64fffe796c06d4c0d98ca982d
-DIST io-streams-1.5.1.0.tar.gz 64044 BLAKE2B 9a1a4dce626f3a569f4a7866f93d5663e9e4e8b863d1c2332bffbeb2e4481e0a250c84b75ae375144a32473b62538dbd87b53dd0a08034daea855484660aa07a SHA512 01ddf89f09cba429ab600e55994cb6740d4fcdeb23ce85822098d39dbe530a74256d66ea52429798787d9d549db3cd99a5078362b333a7f49c4926e74e0b460c
diff --git a/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild b/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
deleted file mode 100644
index f13a265b1537..000000000000
--- a/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +nointeractivetests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple, composable, and easy-to-use stream I/O"
-HOMEPAGE="https://hackage.haskell.org/package/io-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/mtl-2 <dev-haskell/mtl-3
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=nointeractivetests
-}
diff --git a/dev-haskell/io-streams/io-streams-1.5.1.0-r1.ebuild b/dev-haskell/io-streams/io-streams-1.5.1.0-r1.ebuild
deleted file mode 100644
index 001dda035c1c..000000000000
--- a/dev-haskell/io-streams/io-streams-1.5.1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: +nointeractivetests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple, composable, and easy-to-use stream I/O"
-HOMEPAGE="https://hackage.haskell.org/package/io-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # one test case requires network access
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.2:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/mtl-2 <dev-haskell/mtl-3
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'network            >= 2.3   && <3.1' 'network            >= 2.3' \
-		'primitive          >= 0.2   && <0.7' 'primitive          >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=nointeractivetests
-}
diff --git a/dev-haskell/io-streams/metadata.xml b/dev-haskell/io-streams/metadata.xml
deleted file mode 100644
index 7852149c9343..000000000000
--- a/dev-haskell/io-streams/metadata.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		/Overview/
-		
-		The io-streams library contains simple and easy-to-use primitives for I/O
-		using streams. Most users will want to import the top-level convenience
-		module "System.IO.Streams", which re-exports most of the library:
-		
-		@
-		import           "System.IO.Streams" (InputStream, OutputStream)
-		import qualified "System.IO.Streams" as Streams
-		@
-		
-		For first-time users, @io-streams@ comes with an included tutorial, which can
-		be found in the "System.IO.Streams.Tutorial" module.
-		
-		/Features/
-		
-		The @io-streams@ user API has two basic types: @InputStream a@ and
-		@OutputStream a@, and three fundamental I/O primitives:
-		
-		@
-		\-\- read an item from an input stream
-		Streams.'System.IO.Streams.read' :: 'System.IO.Streams.InputStream' a -&gt; IO (Maybe a)
-		
-		\-\- push an item back to an input stream
-		Streams.'System.IO.Streams.unRead' :: a -&gt; 'System.IO.Streams.InputStream' a -&gt; IO ()
-		
-		\-\- write to an output stream
-		Streams.'System.IO.Streams.write' :: Maybe a -&gt; 'System.IO.Streams.OutputStream' a -&gt; IO ()
-		@
-		
-		Streams can be transformed by composition and hooked together with provided combinators:
-		
-		@
-		ghci&gt; Streams.fromList [1,2,3::Int] &gt;&gt;= Streams.map (*10) &gt;&gt;= Streams.toList
-		[10,20,30]
-		@
-		
-		Stream composition leaves the original stream accessible:
-		
-		@
-		ghci&gt; input \&lt;- Streams.fromByteString \"long string\"
-		ghci&gt; wrapped \&lt;- Streams.takeBytes 4 input
-		ghci&gt; Streams.read wrapped
-		Just \"long\"
-		ghci&gt; Streams.read wrapped
-		Nothing
-		ghci&gt; Streams.read input
-		Just \" string\"
-		@
-		
-		Simple types and operations in the IO monad mean straightforward and simple
-		exception handling and resource cleanup using Haskell standard library
-		facilities like 'Control.Exception.bracket'.
-		
-		@io-streams@ comes with:
-		
-		* functions to use files, handles, concurrent channels, sockets, lists,
-		vectors, and more as streams.
-		
-		* a variety of combinators for wrapping and transforming streams, including
-		compression and decompression using zlib, controlling precisely how many
-		bytes are read from or written to a stream, buffering output using
-		bytestring builders, folds, maps, filters, zips, etc.
-		
-		* support for parsing from streams using @attoparsec@.
-		
-		* support for spawning processes and communicating with them using streams.
-		
-		/ChangeLog/
-		
-		[@1.1.4.2@] Fixed a build error with network versions older than 2.4.
-		
-		[@1.1.4.1@] @System.IO.Streams.Network@: scalability improvement: buffers
-		for socket reads are now allocated by system malloc rather than
-		by pinned pointers in GHC (currently pinned pointer allocation
-		takes a global lock).
-		
-		[@1.1.4.0@] Widened @attoparsec@ and @text@ library dependencies to allow
-		the latest versions.
-		
-		[@1.1.3.0@] Added @System.IO.Streams.ByteString.takeExactly@. Widened
-		@network@ dependency to include 2.3. Added a
-		@NoInteractiveTests@ flag to selectively disable some tests for
-		environments where spawning interactive processes is
-		impossible.
-		
-		[@1.1.2.2@] Allowed newest versions of the @process@, @test-framework@,
-		and @text@ libraries.
-		
-		[@1.1.2.1@] Fixed build error when compiled against attoparsec-0.10.0.x.
-		
-		[@1.1.2.0@] Added @System.IO.Streams.Concurrent.makeChanPipe@, to create a
-		simple concurrent pipe between an @InputStream@/@OutputStream@
-		pair.
-		
-		[@1.1.1.0@] Added @System.IO.Streams.Network.socketToStreamsWithBufferSize@,
-		allowing control over the size of the receive buffers used when
-		reading from sockets.
-		
-		[@1.1.0.3@] Fixed an inconsistent version upper bound in the test suite.
-		
-		[@1.1.0.2@] Fixed a typo in the tutorial.
-		
-		[@1.1.0.1@] A couple of Haddock markup fixes.
-		
-		[@1.1.0.0@] Reworked, simplified, and streamlined the internals of the
-		library. Exports from "System.IO.Streams.Internal" relying on
-		Sources and Sinks were deleted because they are no longer
-		necessary: Source(..), Sink(..), defaultPushback,
-		withDefaultPushback, nullSource, nullSink, singletonSource,
-		simpleSource, sourceToStream, sinkToStream, generatorToSource,
-		and consumerToSink.
-		
-		[@1.0.2.2@] Fixed a bug in which \"takeBytes 0\" was erroneously requesting
-		input from the wrapped stream.
-		
-		[@1.0.2.1@] Fixed a compile error on GHC 7.0.x.
-		
-		[@1.0.2.0@] Added "System.IO.Streams.Process" (support for communicating
-		with system processes using streams), added new functions to
-		"System.IO.Streams.Handle" for converting @io-streams@ types to
-		'System.IO.Handle's. (Now you can pass streams from this
-		library to places that expect Handles and everything will
-		work.)
-		
-		[@1.0.1.0@] Added 'System.IO.Streams.Combinators.ignoreEof'.
-		
-		[@1.0.0.1@] Fixed some haddock markup.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/iproute/Manifest b/dev-haskell/iproute/Manifest
index 4e9491085dc1..834c1a541f79 100644
--- a/dev-haskell/iproute/Manifest
+++ b/dev-haskell/iproute/Manifest
@@ -1,4 +1,2 @@
-DIST iproute-1.2.12.tar.gz 9365 BLAKE2B 1d24512b3754f3d3c184f50696a076efee21b7fbccaa02929d77ffb4477fb214201be587d3f63284cdee4426138eeaa6ea483439d12add8db5cbca20e6120eea SHA512 a8a86a04c271c58c91a969a327799737691d553b4e703469ec2f3cacd0d90c48f6c657e626b01f32a86d3c53bf10a0d2c8518ae56a8c8935c4d899eb7b17928f
-DIST iproute-1.3.1.tar.gz 9897 BLAKE2B 5ab83cc490bed7e670b8dd7f89ab11d36da2059fdb1e6fed53d306b54a076cd41885825ecade6fca9bc6b51131ea59eb501d5472354da7d8d26b600222052f7b SHA512 55452f469f16f5c2503e13ab80c3bf252e3e58a12ace961603291be4cd013471fdb4671cd338c15f77ba8a3c82a9d1545fc2901af9c1d0bf52c2ede5b0d9e23d
-DIST iproute-1.4.0.tar.gz 11468 BLAKE2B ec2094c9458ec884eb3af8b57a38bdd2218183652b7bbee78d5ae73d2a5af556ae35a5e9e3acb0e36f9f47994c25da754e3cbb8d0cf270d3c8683707d16ec8e5 SHA512 dedeeeacb057908c4269410ae0a6e4f548dd3f007ac576cbe7119aaac966638f8a965fa6b8f237d14e07b202ece2cecd573d0881f73789517278ea56284c27a1
-DIST iproute-1.5.0.tar.gz 11570 BLAKE2B 19cf5c0ba07e9f4a8dca79c60ce651ee3a3d30060c0be7bf56e34102a73e83726986a5c3998a637a29be8ca4ae5e414547c355fc3c36a5c74662f73bcb9e17e9 SHA512 bd7b7cd04229920c39e874bf0a76d8628930fa37ba3d68803275bd9ca30eedacc85d76dd7bfa0536fcf1b84185270da0f6d3ab5b0be26cc5c6606b4199c07845
+DIST iproute-1.7.12.tar.gz 17864 BLAKE2B ac69d90c43415602f52d69de69d3c044cf1908eeadb60266ccc629f8589e53a6cae27a32ad990595f65055f97fd597ca81eda83d34f909d8a0ee1f151edf6d0b SHA512 45d60e98e0a18929472d3de8850a257e21a638b3052fc31afc960c0ea755092bf44e44a1b0fae175582c1bcbda6029af028e84ba1498fe6491d925173cf310b7
+DIST iproute-1.7.8.tar.gz 13309 BLAKE2B 8d6bef341643e4f096399fcba595e339d63b056aca086434fdbb906688c5720fb556ac17cbaf0c0ff851bd44133e97643a03f35db837065268f0d791222616fa SHA512 ee1bd24a560ee73757ca71eda70a610d5c8e01101c22835bbef23ec7a2217ed66a37b49d5fc3042f3df0e943aaeda2a050e75316ff2ac11602b745cbf7d7ca6a
diff --git a/dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch b/dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch
new file mode 100644
index 000000000000..f7f88a6cedd4
--- /dev/null
+++ b/dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch
@@ -0,0 +1,20 @@
+diff -urN iproute-1.7.12/Data/IP/Addr.hs iproute-1.7.12-r1/Data/IP/Addr.hs
+--- iproute-1.7.12/Data/IP/Addr.hs	2001-09-08 19:46:40.000000000 -0600
++++ iproute-1.7.12-r1/Data/IP/Addr.hs	2022-01-15 10:13:21.758588845 -0700
+@@ -1,6 +1,7 @@
+ {-# LANGUAGE BangPatterns #-}
+ {-# LANGUAGE DeriveDataTypeable #-}
+ {-# LANGUAGE DeriveGeneric      #-}
++{-# LANGUAGE PackageImports     #-}
+ 
+ module Data.IP.Addr where
+ 
+@@ -14,7 +15,7 @@
+ import Data.Word
+ import Network.Socket
+ import Numeric (showHex, showInt)
+-import System.ByteOrder
++import "byteorder" System.ByteOrder
+ import Text.Appar.String
+ import GHC.Enum (succError,predError)
+ import GHC.Generics
diff --git a/dev-haskell/iproute/iproute-1.2.12.ebuild b/dev-haskell/iproute/iproute-1.2.12.ebuild
deleted file mode 100644
index bf7169e05e1b..000000000000
--- a/dev-haskell/iproute/iproute-1.2.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IP Routing Table"
-HOMEPAGE="https://www.mew.org/~kazu/proj/iproute/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/appar:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/iproute/iproute-1.3.1.ebuild b/dev-haskell/iproute/iproute-1.3.1.ebuild
deleted file mode 100644
index a9f75e26c2c0..000000000000
--- a/dev-haskell/iproute/iproute-1.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IP Routing Table"
-HOMEPAGE="https://www.mew.org/~kazu/proj/iproute/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/appar:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/iproute/iproute-1.4.0.ebuild b/dev-haskell/iproute/iproute-1.4.0.ebuild
deleted file mode 100644
index 2aeed211ce2c..000000000000
--- a/dev-haskell/iproute/iproute-1.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IP Routing Table"
-HOMEPAGE="https://www.mew.org/~kazu/proj/iproute/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/appar:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/iproute/iproute-1.5.0.ebuild b/dev-haskell/iproute/iproute-1.5.0.ebuild
deleted file mode 100644
index 2aeed211ce2c..000000000000
--- a/dev-haskell/iproute/iproute-1.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IP Routing Table"
-HOMEPAGE="https://www.mew.org/~kazu/proj/iproute/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/appar:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/safe )
-"
diff --git a/dev-haskell/iproute/iproute-1.7.12.ebuild b/dev-haskell/iproute/iproute-1.7.12.ebuild
new file mode 100644
index 000000000000..9d3683101441
--- /dev/null
+++ b/dev-haskell/iproute/iproute-1.7.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="IP Routing Table"
+HOMEPAGE="https://www.mew.org/~kazu/proj/iproute/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.12-package-imports.patch" )
+
+RDEPEND="dev-haskell/appar:=[profile?]
+	dev-haskell/byteorder:=[profile?]
+	dev-haskell/network:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/doctest-0.9.3
+		dev-haskell/hspec
+		dev-haskell/quickcheck
+		dev-haskell/safe )
+"
diff --git a/dev-haskell/iproute/iproute-1.7.8.ebuild b/dev-haskell/iproute/iproute-1.7.8.ebuild
new file mode 100644
index 000000000000..316f54e8548a
--- /dev/null
+++ b/dev-haskell/iproute/iproute-1.7.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="IP Routing Table"
+HOMEPAGE="http://www.mew.org/~kazu/proj/iproute/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT=test # Ambiguous modules: byte-order-0.1.2.0 byteorder-1.0.4
+
+RDEPEND="dev-haskell/appar:=[profile?]
+	dev-haskell/byteorder:=[profile?]
+	dev-haskell/network:=[profile?]
+	>=dev-haskell/semigroups-0.17:=[profile?]
+	>=dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/doctest-0.9.3
+		dev-haskell/hspec
+		dev-haskell/quickcheck
+		dev-haskell/safe )
+"
diff --git a/dev-haskell/iproute/metadata.xml b/dev-haskell/iproute/metadata.xml
index 8e75bbfd5885..937381521944 100644
--- a/dev-haskell/iproute/metadata.xml
+++ b/dev-haskell/iproute/metadata.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		IP Routing Table is a tree of IP ranges
-		to search one of them on the longest
-		match base. It is a kind of TRIE with one
-		way branching removed. Both IPv4 and IPv6
-		are supported.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/ipynb/Manifest b/dev-haskell/ipynb/Manifest
index ec2ece3b5096..96edd0471f39 100644
--- a/dev-haskell/ipynb/Manifest
+++ b/dev-haskell/ipynb/Manifest
@@ -1 +1 @@
-DIST ipynb-0.1.tar.gz 632774 BLAKE2B 9c1c7523c230730f56fd7c0fb729f67a904b34c48e573aa7e19f1b34d47791f4a3cace8d0e6d4ba6faec531b476fa012c742b8b33232f2c09e23da91541f71c0 SHA512 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4
+DIST ipynb-0.2.tar.gz 632962 BLAKE2B bdd85dd21e9e34e9e60157bb3d7447afa96a5ff83aa00fcf9662ce388617e974e81058d6588d5b41d55a38c32fe2e05458987e5ea37c53bf0852bd6c7b60b2b3 SHA512 885ffa2f2269b2bc6c2381fe7a7c91de93e8539ca3493d5a8207e75e986fc42a4b8ead0b4d05184da5bbb931466431ca1b810f03db8cd2c1624a67e1bbb782ea
diff --git a/dev-haskell/ipynb/ipynb-0.1.ebuild b/dev-haskell/ipynb/ipynb-0.1.ebuild
deleted file mode 100644
index f72cfdac7f60..000000000000
--- a/dev-haskell/ipynb/ipynb-0.1.ebuild
+++ /dev/null
@@ -1,35 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Data structure for working with Jupyter notebooks (ipynb)"
-HOMEPAGE="http://hackage.haskell.org/package/ipynb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/aeson-diff
-		dev-haskell/microlens
-		dev-haskell/microlens-aeson
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/vector )
-"
diff --git a/dev-haskell/ipynb/ipynb-0.2.ebuild b/dev-haskell/ipynb/ipynb-0.2.ebuild
new file mode 100644
index 000000000000..a8db88eb040f
--- /dev/null
+++ b/dev-haskell/ipynb/ipynb-0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Data structure for working with Jupyter notebooks (ipynb)"
+HOMEPAGE="https://hackage.haskell.org/package/ipynb"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.5.2.0:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/microlens
+		dev-haskell/microlens-aeson
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/ipynb/metadata.xml b/dev-haskell/ipynb/metadata.xml
index 57e585c9e972..f121f01a34e7 100644
--- a/dev-haskell/ipynb/metadata.xml
+++ b/dev-haskell/ipynb/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/isocline/Manifest b/dev-haskell/isocline/Manifest
new file mode 100644
index 000000000000..5f5081d1b6be
--- /dev/null
+++ b/dev-haskell/isocline/Manifest
@@ -0,0 +1 @@
+DIST isocline-1.0.9.tar.gz 101834 BLAKE2B b01a6c097bc4d3623dc2f1082ed79be1907827d133d713df3ed2a007a70e1fb4957553c9bdc17aca02eba7b4833fc2ec0789253e3327bd35dc505ae1f2db72cb SHA512 0bc1a4b2ad217e1e3b270eeab51b18b4d0f5534fb8759daed4b699f2a56628f4a18d909862abed5c949f671ed746855a6de508ee23f3d93ffbff5a8525db1a47
diff --git a/dev-haskell/isocline/isocline-1.0.9.ebuild b/dev-haskell/isocline/isocline-1.0.9.ebuild
new file mode 100644
index 000000000000..c75b7f1f6808
--- /dev/null
+++ b/dev-haskell/isocline/isocline-1.0.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A portable alternative to GNU Readline"
+HOMEPAGE="https://github.com/daanx/isocline#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/isocline/metadata.xml b/dev-haskell/isocline/metadata.xml
new file mode 100644
index 000000000000..04164fed4a5f
--- /dev/null
+++ b/dev-haskell/isocline/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">isocline</remote-id>
+		<remote-id type="github">daanx/isocline</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/iwlib/Manifest b/dev-haskell/iwlib/Manifest
deleted file mode 100644
index 6281c72cc9b7..000000000000
--- a/dev-haskell/iwlib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST iwlib-0.1.0.tar.gz 3393 BLAKE2B 32df17beb4b9df6dedb12b729249883846ca8975d41d34dda047264d5b8544ab646877705d0c02fa8478ecaad735d67dbbf3d1bb86ca463d3f811e5179c1e80c SHA512 a6e6a6f7612d61911540938aa526216ef2b5121008b9ec97de4f1d82fd1655a31bd73cc161ed0b16a4445bd5e256e1cd1206b6a8fb7bc39bf8683ac1c2565f93
diff --git a/dev-haskell/iwlib/iwlib-0.1.0.ebuild b/dev-haskell/iwlib/iwlib-0.1.0.ebuild
deleted file mode 100644
index 8669ea262872..000000000000
--- a/dev-haskell/iwlib/iwlib-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for the iw C library"
-HOMEPAGE="https://github.com/jaor/iwlib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	net-wireless/wireless-tools
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/iwlib/metadata.xml b/dev-haskell/iwlib/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/iwlib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/jira-wiki-markup/Manifest b/dev-haskell/jira-wiki-markup/Manifest
index a3acd6b786c4..0b23e6ca4c6d 100644
--- a/dev-haskell/jira-wiki-markup/Manifest
+++ b/dev-haskell/jira-wiki-markup/Manifest
@@ -1 +1,2 @@
-DIST jira-wiki-markup-1.1.4.tar.gz 20144 BLAKE2B 88b81d0107923373d6d9ce60c5028d3673e0c3175210db1cdb32846f8e7a77b2a1870da0e95bb1cefcbaf737d8aaa2b5718de0b7e45837e2ea249365030d3e75 SHA512 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f
+DIST jira-wiki-markup-1.4.0.tar.gz 24883 BLAKE2B 565c0ddca8361848683ee453e4eaa0020b74d52d847930fd8ae0da43e435c325cf42a1ca1547ad92f10607ba07137ba6a596e90b97f599d0ef055922023cf6ca SHA512 f20bf4b5242657a34cae1aeeb88ba6de61748ccc212243ae6a6d5a4defc3e2ad25445705a87a55d5cb3b6378f5f500887bf509459a66741a75a49025e1549750
+DIST jira-wiki-markup-1.5.1.tar.gz 25459 BLAKE2B 6055bab5a28538e357069e5c7b3ed64bfe64edf2fac045b4a8b3401cd0370e2d8d3e86f928b9c63a7e86568694fbe52a2c1fe208cb645eeacd0f9704e6624f3a SHA512 d72eca3fcf82fb9569eba39cd2446396b3f16bb08c805e4f8f570397001541ca921cadb642acf17af773fc486054bb0533240516a417a21a74ec1642e7b3b517
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
deleted file mode 100644
index 3bd4d3067c1a..000000000000
--- a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.1.4.ebuild
+++ /dev/null
@@ -1,29 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parse jira wiki text into an abstract syntax tree"
-HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild
new file mode 100644
index 000000000000..83908a8cbf14
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Handle Jira wiki markup"
+HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.5.1.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.5.1.ebuild
new file mode 100644
index 000000000000..f92cc66782c7
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Handle Jira wiki markup"
+HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/jira-wiki-markup/metadata.xml b/dev-haskell/jira-wiki-markup/metadata.xml
index b7878815d80d..b5e7e1d74e03 100644
--- a/dev-haskell/jira-wiki-markup/metadata.xml
+++ b/dev-haskell/jira-wiki-markup/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">jira-wiki-markup</remote-id>
+		<remote-id type="github">tarleb/jira-wiki-markup</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/js-chart/Manifest b/dev-haskell/js-chart/Manifest
new file mode 100644
index 000000000000..baf4227296a7
--- /dev/null
+++ b/dev-haskell/js-chart/Manifest
@@ -0,0 +1 @@
+DIST js-chart-2.9.4.1.tar.gz 501058 BLAKE2B 364aff9566b5fcb18cdef88af38ce7832cbe9347dd7aea0a2ef24aee80901d3802b26f6eb81b58894d94e138903b1dfb7381f8e6511294090da6f656ad63e04e SHA512 0e6325e12822d2607e04ac61e91963f4aed77a8700ec3bb3bc0662a9006780b6a60361ce135452a684dff048e6089f6057a85b2a83b093448f19dd4eeaf4ebae
diff --git a/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild b/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
new file mode 100644
index 000000000000..114bee27d6bd
--- /dev/null
+++ b/dev-haskell/js-chart/js-chart-2.9.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Obtain minified chart.js code"
+HOMEPAGE="https://github.com/jonascarpay/js-chart#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/js-chart/metadata.xml b/dev-haskell/js-chart/metadata.xml
new file mode 100644
index 000000000000..3d7fb8281ca6
--- /dev/null
+++ b/dev-haskell/js-chart/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">jonascarpay/js-chart</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/js-flot/Manifest b/dev-haskell/js-flot/Manifest
deleted file mode 100644
index 0674e3965795..000000000000
--- a/dev-haskell/js-flot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST js-flot-0.8.3.tar.gz 662691 BLAKE2B d7a8abca7eb8a45fa28da783139f6e672f5557dfc75c1a2b1f41254a3b0e09500f0f1c179b41f76fed456485d4c1db716e51306260c84c090a8779f23b86b791 SHA512 5732938b37e9036156528c0d34cd99b45405db81d1e70b6651b056075ea8d9b616da1ae709c2de1f2f5be044236a3b81fc358d973769fca26993500ff9d0dabf
diff --git a/dev-haskell/js-flot/js-flot-0.8.3.ebuild b/dev-haskell/js-flot/js-flot-0.8.3.ebuild
deleted file mode 100644
index 2f00a9e0ad5e..000000000000
--- a/dev-haskell/js-flot/js-flot-0.8.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain minified flot code"
-HOMEPAGE="https://github.com/ndmitchell/js-flot#readme"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/http )
-"
diff --git a/dev-haskell/js-flot/metadata.xml b/dev-haskell/js-flot/metadata.xml
deleted file mode 100644
index 81dc91bb8ff0..000000000000
--- a/dev-haskell/js-flot/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package bundles the minified &lt;http://www.flotcharts.org/ Flot&gt; code
-		(a jQuery plotting library) into a Haskell package,
-		so it can be depended upon by Cabal packages. The first three components of
-		the version number match the upstream flot version. The package is designed
-		to meet the redistribution requirements of downstream users (e.g. Debian).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ndmitchell/js-flot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/js-jquery/Manifest b/dev-haskell/js-jquery/Manifest
deleted file mode 100644
index dcc5f6961b8b..000000000000
--- a/dev-haskell/js-jquery/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST js-jquery-3.1.1.tar.gz 111855 BLAKE2B f59c954d455594c323d0968fc31ca8fa7b8463ca37a903f4b9cb63dee9d3ebb8790e79276e6f833bc21f5e09c02f42f66b891cc65f6c030e08dd034d8022d555 SHA512 cc95bdcf6fe2b45e7d585fcd7d83aee39b8dbed7c8e763c808a07a140203e58441896431920ee14b1861ee09a903cedca140c0a48405ffddaef2a71d11b21359
-DIST js-jquery-3.2.1.tar.gz 112319 BLAKE2B d56985f1cf202098f8fbefb1848bca0cdfe06dd74e3a2b8400542787a6a21a4d751a7b0f134972f48e8e5a8a8d8894ab88275395f4062c6149b618a2938bb14a SHA512 f3e8f1183d52c39cc456240f4e0e5cbfbab3216609cf06f3862fb512e31f72f34a100a3df920c8b55fb511db9a6cd92be2a3aeccd0a916bb455865622f213fcd
-DIST js-jquery-3.3.1.tar.gz 114431 BLAKE2B 861251a15aa7b486202be7476366ebb584278ec6a5f5d58e132f2c4aaf086367e9952facf63ab8cc74eec8a9914182c18d66d2d4c76a59d627c887c3ca5e4792 SHA512 3222259a4342bc5156d5360385a478e235def04db0381cc48f342baac5018e91350dce760adb9b9ada796bc6341d5629f807672f629ee127faefe521801d62bb
diff --git a/dev-haskell/js-jquery/js-jquery-3.1.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.1.1.ebuild
deleted file mode 100644
index 0e41fc0f4889..000000000000
--- a/dev-haskell/js-jquery/js-jquery-3.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain minified jQuery code"
-HOMEPAGE="https://github.com/ndmitchell/js-jquery#readme"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( dev-haskell/http )
-"
diff --git a/dev-haskell/js-jquery/js-jquery-3.2.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.2.1.ebuild
deleted file mode 100644
index 32341c922f15..000000000000
--- a/dev-haskell/js-jquery/js-jquery-3.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain minified jQuery code"
-HOMEPAGE="https://github.com/ndmitchell/js-jquery#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs network access
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( dev-haskell/http )
-"
diff --git a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild b/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
deleted file mode 100644
index 9487166647fc..000000000000
--- a/dev-haskell/js-jquery/js-jquery-3.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain minified jQuery code"
-HOMEPAGE="https://github.com/ndmitchell/js-jquery#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs network access
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( dev-haskell/http )
-"
diff --git a/dev-haskell/js-jquery/metadata.xml b/dev-haskell/js-jquery/metadata.xml
deleted file mode 100644
index 9b1d6090b8d9..000000000000
--- a/dev-haskell/js-jquery/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package bundles the minified &lt;http://jquery.com/ jQuery&gt; code into a Haskell package,
-		so it can be depended upon by Cabal packages. The first three components of
-		the version number match the upstream jQuery version. The package is designed
-		to meet the redistribution requirements of downstream users (e.g. Debian).
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ndmitchell/js-jquery</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/json/Manifest b/dev-haskell/json/Manifest
deleted file mode 100644
index c940876935c3..000000000000
--- a/dev-haskell/json/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST json-0.10.tar.gz 22622 BLAKE2B 4ee854a80738b6d12e027ca8562ac365bc6192532682d9b8997a8887b70d2e19553535fec6c7ab6ecf119262d6f7d229dc4217ac867dcac8dd3158c80606c727 SHA512 4015693c363810701114a222207083ab9610ebd1196d24f0eb8dcad35af54e9067259ca412b131eaa986b8dbfbf0ce62058ca4c31aeeff29fdf21f17e8d86e90
-DIST json-0.9.3.tar.gz 22562 BLAKE2B 8947d2b4bea1ee86eea19e25b73b991d186274c7a6beaff09e8f346756e870d440c4511c599d6ee5f82df08975076e47f0f528cc03cabb5063fb768506b9a660 SHA512 836ae920ef19e0cff5b617a579090ea1d760e253513d3fb28c56650a1fa413c0bd852165be487c211a52be6246eac3241a97f729342223be10275917a34230a6
diff --git a/dev-haskell/json/files/json-0.9.3-ghc-8.8.patch b/dev-haskell/json/files/json-0.9.3-ghc-8.8.patch
deleted file mode 100644
index d8dc402ae19b..000000000000
--- a/dev-haskell/json/files/json-0.9.3-ghc-8.8.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-commit a0d8bcde5ab5329d11be8cd89c407e6aa0db83a4
-Author: Fumiaki Kinoshita <fumiexcel@gmail.com>
-Date:   Tue Apr 30 18:37:40 2019 +0900
-
-    Support GHC 8.8
-
-diff --git a/Text/JSON.hs b/Text/JSON.hs
-index f2e2618..6f80949 100644
---- a/Text/JSON.hs
-+++ b/Text/JSON.hs
-@@ -37,7 +37,7 @@ module Text.JSON (
-     -- ** Instance helpers
-   , makeObj, valFromObj
-   , JSKey(..), encJSDict, decJSDict
--  
-+
-   ) where
- 
- import Text.JSON.Types
-@@ -60,7 +60,7 @@ import qualified Data.Text as T
- 
- ------------------------------------------------------------------------
- 
---- | Decode a String representing a JSON value 
-+-- | Decode a String representing a JSON value
- -- (either an object, array, bool, number, null)
- --
- -- This is a superset of JSON, as types other than
-@@ -137,7 +137,9 @@ instance MonadPlus Result where
- 
- instance Monad Result where
-   return x      = Ok x
-+#if !MIN_VERSION_base(4,13,0)
-   fail x        = Error x
-+#endif
-   Ok a >>= f    = f a
-   Error x >>= _ = Error x
- 
-@@ -199,7 +201,7 @@ instance JSON Ordering where
-   showJSON = encJSString show
-   readJSON = decJSString "Ordering" readOrd
-     where
--     readOrd x = 
-+     readOrd x =
-        case x of
-          "LT" -> return Prelude.LT
-          "EQ" -> return Prelude.EQ
-@@ -460,7 +462,7 @@ instance JSKey Int where
- instance JSKey String where
-   toJSKey   = id
-   fromJSKey = Just
--  
-+
- -- | Encode an association list as 'JSObject' value.
- encJSDict :: (JSKey a, JSON b) => [(a,b)] -> JSValue
- encJSDict v = makeObj [ (toJSKey x, showJSON y) | (x,y) <- v ]
-@@ -477,5 +479,3 @@ decJSDict l (JSObject o) = mapM rd (fromJSObject o)
-                                     "unable to read dict; invalid object key")
- 
- decJSDict l _ = mkError ("readJSON{"++l ++ "}: unable to read dict; expected JSON object")
--
--
-diff --git a/Text/JSON/String.hs b/Text/JSON/String.hs
-index 51463cd..67fdca8 100644
---- a/Text/JSON/String.hs
-+++ b/Text/JSON/String.hs
-@@ -1,7 +1,8 @@
-+{-# LANGUAGE CPP #-}
- -- | Basic support for working with JSON values.
- 
--module Text.JSON.String 
--     ( 
-+module Text.JSON.String
-+     (
-        -- * Parsing
-        --
-        GetJSON
-@@ -35,6 +36,7 @@ import Text.JSON.Types (JSValue(..),
-                         JSObject, toJSObject, fromJSObject)
- 
- import Control.Monad (liftM, ap)
-+import qualified Control.Monad.Fail as Fail
- import Control.Applicative((<$>))
- import qualified Control.Applicative as A
- import Data.Char (isSpace, isDigit, digitToInt)
-@@ -52,9 +54,14 @@ instance A.Applicative GetJSON where
-   pure  = return
-   (<*>) = ap
- 
-+instance Fail.MonadFail GetJSON where
-+  fail x          = GetJSON (\_ -> Left x)
-+
- instance Monad GetJSON where
-   return x        = GetJSON (\s -> Right (x,s))
--  fail x          = GetJSON (\_ -> Left x)
-+#if !MIN_VERSION_base(4,13,0)
-+  fail = Fail.fail
-+#endif
-   GetJSON m >>= f = GetJSON (\s -> case m s of
-                                      Left err -> Left err
-                                      Right (a,s1) -> un (f a) s1)
-@@ -93,7 +100,7 @@ tryJSNull k = do
-   xs <- getInput
-   case xs of
-     'n':'u':'l':'l':xs1 -> setInput xs1 >> return JSNull
--    _ -> k 
-+    _ -> k
- 
- -- | Read the JSON Bool type
- readJSBool :: GetJSON JSValue
-@@ -111,8 +118,8 @@ readJSString = do
-   case x of
-        '"' : cs -> parse [] cs
-        _        -> fail $ "Malformed JSON: expecting string: " ++ context x
-- where 
--  parse rs cs = 
-+ where
-+  parse rs cs =
-     case cs of
-       '\\' : c : ds -> esc rs c ds
-       '"'  : ds     -> do setInput ds
-@@ -153,22 +160,22 @@ readJSRational = do
-     '-' : ds -> negate <$> pos ds
-     _        -> pos cs
- 
--  where 
-+  where
-    pos []     = fail $ "Unable to parse JSON Rational: " ++ context []
-    pos (c:cs) =
-      case c of
-        '0' -> frac 0 cs
--       _ 
-+       _
-         | not (isDigit c) -> fail $ "Unable to parse JSON Rational: " ++ context cs
-         | otherwise -> readDigits (digitToIntI c) cs
- 
-    readDigits acc [] = frac (fromInteger acc) []
-    readDigits acc (x:xs)
--    | isDigit x = let acc' = 10*acc + digitToIntI x in 
-+    | isDigit x = let acc' = 10*acc + digitToIntI x in
-                       acc' `seq` readDigits acc' xs
-     | otherwise = frac (fromInteger acc) (x:xs)
- 
--   frac n ('.' : ds) = 
-+   frac n ('.' : ds) =
-        case span isDigit ds of
-          ([],_) -> setInput ds >> return n
-          (as,bs) -> let x = read as :: Integer
-@@ -320,15 +327,15 @@ showJSRational :: Rational -> ShowS
- showJSRational r = showJSRational' False r
- 
- showJSRational' :: Bool -> Rational -> ShowS
--showJSRational' asFloat r 
-+showJSRational' asFloat r
-  | denominator r == 1      = shows $ numerator r
-  | isInfinite x || isNaN x = showJSNull
-  | asFloat                 = shows xf
-  | otherwise               = shows x
-- where 
-+ where
-    x :: Double
-    x = realToFrac r
--   
-+
-    xf :: Float
-    xf = realToFrac r
- 
-@@ -382,4 +389,3 @@ encJSString jss ss = go (fromJSString jss)
-       | x < '\x1000' -> 'u' : '0' : hexxs
-       | otherwise    -> 'u' : hexxs
-       where hexxs = showHex (fromEnum x) xs
--
diff --git a/dev-haskell/json/json-0.10.ebuild b/dev-haskell/json/json-0.10.ebuild
deleted file mode 100644
index 55a5773eba27..000000000000
--- a/dev-haskell/json/json-0.10.ebuild
+++ /dev/null
@@ -1,35 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for serialising Haskell to and from JSON"
-HOMEPAGE="https://hackage.haskell.org/package/json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mapdict +parsec +pretty"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/syb-0.3.3:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	parsec? ( dev-haskell/parsec:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mapdict mapdict) \
-		$(cabal_flag parsec parsec) \
-		$(cabal_flag pretty pretty)
-}
diff --git a/dev-haskell/json/json-0.9.3.ebuild b/dev-haskell/json/json-0.9.3.ebuild
deleted file mode 100644
index 41198ed591a7..000000000000
--- a/dev-haskell/json/json-0.9.3.ebuild
+++ /dev/null
@@ -1,37 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for serialising Haskell to and from JSON"
-HOMEPAGE="https://hackage.haskell.org/package/json"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="mapdict +parsec +pretty"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/syb-0.3.3:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	parsec? ( dev-haskell/parsec:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.3-ghc-8.8.patch )
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mapdict mapdict) \
-		$(cabal_flag parsec parsec) \
-		$(cabal_flag pretty pretty)
-}
diff --git a/dev-haskell/json/metadata.xml b/dev-haskell/json/metadata.xml
deleted file mode 100644
index fdec5f1e3899..000000000000
--- a/dev-haskell/json/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		JSON (JavaScript Object Notation) is a lightweight data-interchange
-		format. It is easy for humans to read and write. It is easy for
-		machines to parse and generate.  It is based on a subset of the
-		JavaScript Programming Language, Standard ECMA-262 3rd Edition -
-		December 1999.
-		
-		This library provides a parser and pretty printer for converting
-		between Haskell values and JSON.
-	</longdescription>
-	<use>
-		<flag name="mapdict">Encode Haskell maps as JSON dicts</flag>
-		<flag name="parsec">Add support for parsing with Parsec</flag>
-		<flag name="pretty">Add support for using pretty printing combinators</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/juicypixels/Manifest b/dev-haskell/juicypixels/Manifest
index 2f68514fc12d..5c7732637649 100644
--- a/dev-haskell/juicypixels/Manifest
+++ b/dev-haskell/juicypixels/Manifest
@@ -1,4 +1,2 @@
-DIST JuicyPixels-3.2.5.3.tar.gz 116074 BLAKE2B 19ea3ee666503bbf87ad8ff03df685cc7e3d1661f17904059ddec318be36f8ede53fe8aa531f7e9fc86bd48e773d525b7830b88975340f97883a190d1d1f2f34 SHA512 e5c0b0442b1b79aa751afed9a5df23b9fc1f3bfddd0d7b0f3751053018f4434331a0e0ecb16d2fc36a87d3edd3fc06727cfa9557607a02d7040ead623a5917bd
-DIST JuicyPixels-3.2.7.tar.gz 118647 BLAKE2B 5542e36f7b1a7e084457f9d18a4fb7647c8ffa854bd7a8ab09f9ca27b4d34f0edb47adfe42afe199ea5a99a71f2c96d8cfac7b28976cd0837afc989694f50cef SHA512 418d887a799fc46f4c73da1ebae0288e0f25e21c943f38dbf0b2519096e4ba145711a05d9da7bb1e588a5183e91ab09dfe3a209a6728c610eb5771a5d963ee6a
-DIST JuicyPixels-3.2.8.tar.gz 125254 BLAKE2B bf373e0c595b0501d0d871e55f61bcd62ca26fd6bdac288816af6d9eb52c53d8d70aded3b93ac782580505d549654250ce5b45e4761ddcbb956376513a962893 SHA512 e0800730660e087fc65d65872ff794600436cdc421ff8d578bb0833b885a988eb468b0b90ada0badd10439919199688a43ae51c42aa2552f9cf39184c60e60f1
 DIST JuicyPixels-3.3.5.tar.gz 131914 BLAKE2B a541f8052952e9a757fecb7168a74b9cb6aef152a1913aad36ac47d4ea2dbdeec9c644a0d2edf340986bd179ba4e925d3d284fbe73725e149e2b87866a8a5865 SHA512 40ce63d01fb4dea77caeb055cf2f9f16b32252c7c5ea501b93c9020e426da9ea019b6e618da373fa41bae93789b76561f2b091bfe9340ee9c75f4d8fe29f90ed
+DIST juicypixels-3.3.7.tar.gz 132469 BLAKE2B 06b58a9969b084eeb4bea2b4e88691d92d77ebdb30fdde944c90bd4b77f780d52dd3fa1f44e0415e71bfed29c5259ec65c434f04075f02935fe052236ac1f4b2 SHA512 adb3ccae12524ddb6f2736d65d14d997e1d672960b2fcc02739742fe18d748497324c9aeecb0b0b5e7662b218c5db55b2e8f5639e6438e0b8a45960c9c0e7da1
diff --git a/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild
deleted file mode 100644
index 352905567172..000000000000
--- a/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="JuicyPixels"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
-HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mmap"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	mmap? ( dev-haskell/mmap:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mmap mmap)
-}
diff --git a/dev-haskell/juicypixels/juicypixels-3.2.7.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.7.ebuild
deleted file mode 100644
index fdbb33c4c11c..000000000000
--- a/dev-haskell/juicypixels/juicypixels-3.2.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="JuicyPixels"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
-HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mmap"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	mmap? ( dev-haskell/mmap:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mmap mmap)
-}
diff --git a/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild
deleted file mode 100644
index aed2e20fcfc3..000000000000
--- a/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="JuicyPixels"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
-HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mmap"
-
-RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	mmap? ( dev-haskell/mmap:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mmap mmap)
-}
diff --git a/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
index 7a2fbfdee5af..730b4ec64d54 100644
--- a/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
+++ b/dev-haskell/juicypixels/juicypixels-3.3.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4.9999
 
@@ -17,9 +17,13 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+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/juicypixels/juicypixels-3.3.7.ebuild b/dev-haskell/juicypixels/juicypixels-3.3.7.ebuild
new file mode 100644
index 000000000000..217a2ad292c8
--- /dev/null
+++ b/dev-haskell/juicypixels/juicypixels-3.3.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+
+CABAL_PN="JuicyPixels"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
+HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="mmap"
+
+RDEPEND=">=dev-haskell/primitive-0.4:=[profile?]
+	<dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/zlib-0.5.3.1:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+CABAL_CHDEPS=(
+	'mtl                 >= 1.1     && < 2.3' 'mtl                 >= 1.1'
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag mmap mmap)
+}
diff --git a/dev-haskell/juicypixels/metadata.xml b/dev-haskell/juicypixels/metadata.xml
index 33390b4bbc43..9bb364346e80 100644
--- a/dev-haskell/juicypixels/metadata.xml
+++ b/dev-haskell/juicypixels/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		&lt;&lt;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMAAAADABAMAAACg8nE0AAAAElBMVEUAAABJqDSTWEL/qyb///8AAABH/1GTAAAAAXRSTlMAQObYZgAAAN5JREFUeF7s1sEJgFAQxFBbsAV72v5bEVYWPwT/XDxmCsi7zvHXavYREBDI3XP2GgICqBBYuwIC+/rVayPUAyAg0HvIXBcQoDFDGnUBgWQQ2Bx3AYFaRoBpAQHWb3bt2ARgGAiCYFFuwf3X5HA/McgGJWI2FdykCv4aBYzmKwDwvl6NVmUAAK2vlwEALK7fo88GANB6HQsAAAAAAAAA7P94AQCzswEAAAAAAAAAAAAAAAAAAICzh4UAO4zWAYBfRutHA4Bn5C69JhowAMGoBaMWDG0wCkbBKBgFo2AUAACPmegUST/IJAAAAABJRU5ErkJggg==&gt;&gt;
-		
-		This library can load and store images in PNG,Bitmap, Jpeg, Radiance and
-		read Gif images.
-	</longdescription>
+	<use>
+		<flag name="mmap">Enable the file loading via mmap (memory map)</flag>
+	</use>
 	<upstream>
+		<remote-id type="hackage">JuicyPixels</remote-id>
 		<remote-id type="github">Twinside/Juicy.Pixels</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/kan-extensions/Manifest b/dev-haskell/kan-extensions/Manifest
index 84d8f328746d..0644a39def31 100644
--- a/dev-haskell/kan-extensions/Manifest
+++ b/dev-haskell/kan-extensions/Manifest
@@ -1,3 +1 @@
-DIST kan-extensions-4.2.3.tar.gz 20604 BLAKE2B 5da1194f30de5a05be3e42b32abade6fde3717f9c8b3857011f830fe645e7128154ea82f29b513c4fba26e2b3b26c292481a41924e97fefb648046908cf2789d SHA512 a06103748320379f4182e3b268fa7015a1ee67c8e62cd8eb2ad2cb41f2fa7f820a8bb4f27a7393027bdca842d924d2a3be4ba141b572f548e6fac6befc5a1beb
-DIST kan-extensions-5.0.1.tar.gz 19306 BLAKE2B 020c87999a465523a903791542bd2da82411dbea516fa2ecc77efce6c75b542cffba99c6e87ce0e4bcc48bfcc09554278860d1f82db922564f8e7d2fad4c8456 SHA512 ae3c30cbf49307bbc9d0186894486427440435b92f1158d2f00791d693acb5db43beb83d44b82eb7c92e3221fe95b6a231d55dc818c573aeb0f00ecd4c0044b1
-DIST kan-extensions-5.2.tar.gz 24151 BLAKE2B c36692fc89f4bd378a1e2a12368cc0b34548b40a56ac72cc744dbf37a6832ae8970549adda42b3b5286db98f9cb8474ebeee2754503a52caeb223ce216e7874a SHA512 209700c5c912ecebf2b8f5a5ef8a2b6943281a9a7181f47b99faf78c383cfe0f6054eb5fb59ed558cb55f06cae4b8e980c655c862717afd003f05ee952eca05e
+DIST kan-extensions-5.2.5.tar.gz 22205 BLAKE2B 372b83ed6d024e97ed76fa1a7cbee08d0ef8a2871d8d103a5c114c8616d6281e494503900e1f51d6c828f272be826e5ab3e6087e0de0b6c5119960f06a7c326e SHA512 70303f23e4935ca662f5e094a0ab9c18997c5ff2896bbbe1c8f7d994002f75176457757ad8d4647699ea1cc28701c75cb10cb4fcbe81d8c2f3c71cf28244ca9c
diff --git a/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild b/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
deleted file mode 100644
index bd3d3827cb57..000000000000
--- a/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
-HOMEPAGE="https://github.com/ekmett/kan-extensions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
deleted file mode 100644
index 8ab07637fc3b..000000000000
--- a/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
-HOMEPAGE="https://github.com/ekmett/kan-extensions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild
new file mode 100644
index 000000000000..dc371d8a1789
--- /dev/null
+++ b/dev-haskell/kan-extensions/kan-extensions-5.2.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 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="Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"
+HOMEPAGE="https://github.com/ekmett/kan-extensions/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
+	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
+	>=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?]
+	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
deleted file mode 100644
index d1b82ed4158d..000000000000
--- a/dev-haskell/kan-extensions/kan-extensions-5.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
-HOMEPAGE="https://github.com/ekmett/kan-extensions/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
-	>=dev-haskell/invariant-0.1:=[profile?] <dev-haskell/invariant-1:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/tagged-0.7.2:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/kan-extensions/metadata.xml b/dev-haskell/kan-extensions/metadata.xml
index e2fca8a9f55c..068b12ec7b54 100644
--- a/dev-haskell/kan-extensions/metadata.xml
+++ b/dev-haskell/kan-extensions/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Kan extensions, the Yoneda lemma, and (co)density (co)monads
-	</longdescription>
 	<upstream>
 		<remote-id type="github">ekmett/kan-extensions</remote-id>
 	</upstream>
diff --git a/dev-haskell/keys/Manifest b/dev-haskell/keys/Manifest
deleted file mode 100644
index 3a42b129a45c..000000000000
--- a/dev-haskell/keys/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST keys-3.10.2.tar.gz 8635 BLAKE2B dd664097549fd57c5956935d5790cdacbc51b58ed9fc6d2470f3b8b3ce5b6983ccf342a5fd2327a88a53f8590823a79c49a6adb740fc74c27552247d0fb5c109 SHA512 c595dc1201d194aca61e29aace7799f2e08459212a96b1b51922008b2dcd3dae77954ac706ef44aab05ade89933e273a4147a717a4c05bda19bd7ddbdec96eb5
-DIST keys-3.11.tar.gz 8674 BLAKE2B 27f5fb7f26631e54050bb90c04b1c6fd01e1a0798235fbb29de577b464c92602c2a802ed1ba2a369613e2545f71df092cdbd1c9b7350e059512efea2a99e4d8b SHA512 027080dcaa59f364ac5c043586f54ed42a69cf2c2fac7955ae11029e01d2fa0fa2805286e4bf70db68f1f22467cd98f68e942ec6210524c1cd71609e44f1a1a6
-DIST keys-3.12.3.tar.gz 14378 BLAKE2B 0c2c4599dfa9234e9170a285206ad94f988246a9d56440ea5a89680e17cabd488372ec7b444fd997deb27f6315f9d843494dfbbdd4d2a09ef0525829e7340ed6 SHA512 e0bab964eb38388dfb2fe7dcb4999da0263a2162f171f7ed629a2e1de33eb1cb99dc37a6fe32045f136466cebb5aed69e533417256877316c81a02abc700c28d
diff --git a/dev-haskell/keys/keys-3.10.2.ebuild b/dev-haskell/keys/keys-3.10.2.ebuild
deleted file mode 100644
index 0886353b0665..000000000000
--- a/dev-haskell/keys/keys-3.10.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Keyed functors and containers"
-HOMEPAGE="https://github.com/ekmett/keys/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/keys/keys-3.11.ebuild b/dev-haskell/keys/keys-3.11.ebuild
deleted file mode 100644
index b50b09c6e7e1..000000000000
--- a/dev-haskell/keys/keys-3.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Keyed functors and containers"
-HOMEPAGE="https://github.com/ekmett/keys/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/keys/keys-3.12.3.ebuild b/dev-haskell/keys/keys-3.12.3.ebuild
deleted file mode 100644
index 5d1ecad351ff..000000000000
--- a/dev-haskell/keys/keys-3.12.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Keyed functors and containers"
-HOMEPAGE="https://github.com/ekmett/keys/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/keys/metadata.xml b/dev-haskell/keys/metadata.xml
deleted file mode 100644
index 8f7809540aa8..000000000000
--- a/dev-haskell/keys/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Keyed functors and containers
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/keys</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-bash/Manifest b/dev-haskell/language-bash/Manifest
deleted file mode 100644
index 1cbbc76d58d5..000000000000
--- a/dev-haskell/language-bash/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST language-bash-0.6.1.tar.gz 20224 BLAKE2B 28f3fc67bf9df96bd22be997ee6cb3ece85651ca332b57f28f1212625517171dc8cccaaf3a31bfcf40d19a840e37d0d26bf432cdf08fb68bc772544c63248430 SHA512 2dfb3344a0bd15051f2d3f8bdb7185154b019141473e7f56b0decc1b840880bcccf69a910b16ef1958f149c5df5e90a4e7b6035b75b52c21d5829b018f66c143
-DIST language-bash-0.9.0.tar.gz 23660 BLAKE2B de074d6c397200514357838c621157c28c4610c7f5eab0920f99dd9c2bb1648420829822e589cde66774b8a3467fb66fe6bb1363994182d4a219ca8119ca1391 SHA512 cf14e6353b1afa487515a85b99f5cc2d93d614f3e6d653bacf55328921f5966ce5083fe19f51c0e952513c539101541c14664858315288d96b23d12d6b587fc8
diff --git a/dev-haskell/language-bash/files/language-bash-0.6.1-ghc-8.patch b/dev-haskell/language-bash/files/language-bash-0.6.1-ghc-8.patch
deleted file mode 100644
index be5f6dc49a1e..000000000000
--- a/dev-haskell/language-bash/files/language-bash-0.6.1-ghc-8.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/src/Language/Bash/Word.hs b/src/Language/Bash/Word.hs
-index ce36c4a..b9392a9 100644
---- a/src/Language/Bash/Word.hs
-+++ b/src/Language/Bash/Word.hs
-@@ -7,2 +7,3 @@
-   , TypeSynonymInstances
-+  , OverlappingInstances
-   #-}
diff --git a/dev-haskell/language-bash/language-bash-0.6.1.ebuild b/dev-haskell/language-bash/language-bash-0.6.1.ebuild
deleted file mode 100644
index bbf5fb1a1357..000000000000
--- a/dev-haskell/language-bash/language-bash-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and pretty-printing Bash shell scripts"
-HOMEPAGE="https://github.com/knrafto/language-bash/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
diff --git a/dev-haskell/language-bash/language-bash-0.9.0.ebuild b/dev-haskell/language-bash/language-bash-0.9.0.ebuild
deleted file mode 100644
index 442f6094633e..000000000000
--- a/dev-haskell/language-bash/language-bash-0.9.0.ebuild
+++ /dev/null
@@ -1,34 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and pretty-printing Bash shell scripts"
-HOMEPAGE="https://github.com/knrafto/language-bash/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails, "getDirectoryContents:openDirStream: does not exist"
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-4.0:=[profile?]
-	>=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-expected-failure
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/language-bash/metadata.xml b/dev-haskell/language-bash/metadata.xml
deleted file mode 100644
index 5db9409ff992..000000000000
--- a/dev-haskell/language-bash/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library for parsing, pretty-printing, and manipulating
-		Bash shell scripts.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">knrafto/language-bash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-c/Manifest b/dev-haskell/language-c/Manifest
index 2e9d4be9d0ee..4d89e33f9a4a 100644
--- a/dev-haskell/language-c/Manifest
+++ b/dev-haskell/language-c/Manifest
@@ -1,4 +1,2 @@
-DIST language-c-0.4.2.tar.gz 167052 BLAKE2B 8f1b5192470a25eaad5be8c0a0f374163a91f840b6b184496d1adb45c1239a666214950fda939bddcd8617becc92eaf461b564ded29ebe3b852e16900700b772 SHA512 e2cd4c2871c04fecdcdf82026c79edf7681e00bf632fcff6c119cbd95e53905695bd8f08010d2662e10d883b2fdf6bb114a199b0eaf7be31ff65aaa29df6083b
-DIST language-c-0.4.7.tar.gz 112569 BLAKE2B e7a1333315f10ac3e8490b8dc3b5aa04e40b1a7e1f9c68615f549c82f7d02bf7de5b687dd9d4f04f82202b89e468b22833816346f53bb1cd075ed6386ee1142a SHA512 fb2602606b8c2e678e170d928c3dd023acccc079381a37b64624af658788c0dee982c2d53c2d3ba66b576aa75de350d12e35a94f867e1d714e89c27d26f2af6b
-DIST language-c-0.7.1.tar.gz 181648 BLAKE2B 6c5219698fbbe995d759a0bd6e629b9dbb29137c3dfa879cbdf139721f4acd341245172ccfb3f7d3cec58a831f72f03d092f29960f6dfcf190480df02a30e66a SHA512 c62dee86b70ead9c0795cabc6b1e0487ab3d4e1e4df693cec94c255aa96d21589d9161150073a5ec1d2ae168924dd8a11ae6ee0cd46730a25ccda009f7a45f58
 DIST language-c-0.8.3.tar.gz 194870 BLAKE2B 6b35d741f73543d929bac18e3567911f7d2fa56734463cbc15f2db4ecdc127eaaa1ec2afbe6962f39feb860669c33b50d6c7c941cdd7f6b3c97b42f911b21309 SHA512 a2e653c3d6fe4573c0a7f34115d5a5d3db925c174cd574755bb174de834165bce236b354f04e1158309eda654d12104ea03e88f94cdc8b3e11cffba7260282de
+DIST language-c-0.9.2.tar.gz 125202 BLAKE2B 56b9254002757158308968b75ac42745710d426c8ba92900a9e0c5e391e6654d8cca3ffc4ae194598d3e07b860bd9ff5634270cd27911b4f7f1ff99bd8980657 SHA512 eaa1a0befbc6ccb5ed53a200a03ea7fa51c2d820fb501476576cc4268d8c8816080f942a5044a769e88a1ec58b0f3f5ca55512c70b797a6c3555186e842de701
diff --git a/dev-haskell/language-c/files/language-c-0.8.3-gcc-11.patch b/dev-haskell/language-c/files/language-c-0.8.3-gcc-11.patch
new file mode 100644
index 000000000000..5b2e8e4e899c
--- /dev/null
+++ b/dev-haskell/language-c/files/language-c-0.8.3-gcc-11.patch
@@ -0,0 +1,41 @@
+From 8133e1526750ab74ca4d5180fb140a7e172d473f Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 8 Aug 2020 23:43:12 +0100
+Subject: [PATCH] Lexer: allow zeros as line numbers in preprocessed directives
+
+Starting from `gcc-11` initial line numbers not related to
+actual files are marked as zeros. See the "preprocessor:
+Better line info for <builtin> & <command-line>"
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bf2ff0d52a9
+
+language-c's grammar did not allow it (by accident)
+
+```
+Prelude> Language.C.parseC (Data.ByteString.Char8.pack "# 0 \"/dev/null\"\n") Language.C.nopos
+Left <no file>:: [ERROR]  >>> Syntax Error !
+  Lexical error !
+  The character '#' does not fit here.
+```
+
+The change allows '0' in line numbers as well.
+
+Closes: https://github.com/visq/language-c/issues/74
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/Language/C/Parser/Lexer.x | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/Language/C/Parser/Lexer.x
++++ b/src/Language/C/Parser/Lexer.x
+@@ -147,7 +147,7 @@ $white+         ;
+ --
+ -- * see https://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
+ --
+-\#$space*@int$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*\r?$eol
++\#$space*@digits$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*\r?$eol
+   { \pos len str -> setPos (adjustLineDirective len (takeChars len str) pos) >> lexToken' False }
+ 
+ -- #pragma directive (K&R A12.8)
+-- 
+2.28.0
+
diff --git a/dev-haskell/language-c/language-c-0.4.2.ebuild b/dev-haskell/language-c/language-c-0.4.2.ebuild
deleted file mode 100644
index ab50276bca3e..000000000000
--- a/dev-haskell/language-c/language-c-0.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		dev-haskell/alex
-		>=dev-haskell/cabal-1.6
-		dev-haskell/happy"
-
-src_prepare() {
-	rm -vf "${S}"/dist/build/Language/C/Parser/{Lexer,Parser}.hs
-}
diff --git a/dev-haskell/language-c/language-c-0.4.7.ebuild b/dev-haskell/language-c/language-c-0.4.7.ebuild
deleted file mode 100644
index f081fc43e00a..000000000000
--- a/dev-haskell/language-c/language-c-0.4.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +separatesyb,+usebytestrings,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.6
-	dev-haskell/happy
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=separatesyb \
-		--flag=splitbase \
-		--flag=usebytestrings
-}
diff --git a/dev-haskell/language-c/language-c-0.7.1.ebuild b/dev-haskell/language-c/language-c-0.7.1.ebuild
deleted file mode 100644
index edfde92bc028..000000000000
--- a/dev-haskell/language-c/language-c-0.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-#hackport: flags: -allwarnings,+usebytestrings
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="https://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allwarnings \
-		--flag=usebytestrings
-}
diff --git a/dev-haskell/language-c/language-c-0.8.3-r1.ebuild b/dev-haskell/language-c/language-c-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..dd8f5c0f1f78
--- /dev/null
+++ b/dev-haskell/language-c/language-c-0.8.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -allwarnings,+separatesyb,+usebytestrings,+splitbase,+iecfpextension
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Analysis and generation of C code"
+HOMEPAGE="http://visq.github.io/language-c/"
+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/syb:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.22.2.0
+	dev-haskell/happy
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-gcc-11.patch
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-allwarnings \
+		--flag=iecfpextension \
+		--flag=separatesyb \
+		--flag=splitbase \
+		--flag=usebytestrings
+}
diff --git a/dev-haskell/language-c/language-c-0.8.3.ebuild b/dev-haskell/language-c/language-c-0.8.3.ebuild
deleted file mode 100644
index e60b7445c7d2..000000000000
--- a/dev-haskell/language-c/language-c-0.8.3.ebuild
+++ /dev/null
@@ -1,37 +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.9999
-#hackport: flags: -allwarnings,+separatesyb,+usebytestrings,+splitbase,+iecfpextension
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Analysis and generation of C code"
-HOMEPAGE="http://visq.github.io/language-c/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.22.2.0
-	dev-haskell/happy
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-allwarnings \
-		--flag=iecfpextension \
-		--flag=separatesyb \
-		--flag=splitbase \
-		--flag=usebytestrings
-}
diff --git a/dev-haskell/language-c/language-c-0.9.2.ebuild b/dev-haskell/language-c/language-c-0.9.2.ebuild
new file mode 100644
index 000000000000..46747b88aee0
--- /dev/null
+++ b/dev-haskell/language-c/language-c-0.9.2.ebuild
@@ -0,0 +1,36 @@
+# 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: -allwarnings,+separatesyb,+usebytestrings,+splitbase,+iecfpextension
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Analysis and generation of C code"
+HOMEPAGE="https://visq.github.io/language-c/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| ( dev-lang/ghc dev-haskell/process[profile?] )
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-2.2.0.1
+	dev-haskell/happy
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-allwarnings \
+		--flag=iecfpextension \
+		--flag=separatesyb \
+		--flag=splitbase \
+		--flag=usebytestrings
+}
diff --git a/dev-haskell/language-c/metadata.xml b/dev-haskell/language-c/metadata.xml
index 522384de8446..e2e11e0dbe7c 100644
--- a/dev-haskell/language-c/metadata.xml
+++ b/dev-haskell/language-c/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">language-c</remote-id>
+		<remote-id type="github">visq/language-c</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/language-css/Manifest b/dev-haskell/language-css/Manifest
deleted file mode 100644
index 19a90596245b..000000000000
--- a/dev-haskell/language-css/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST language-css-0.0.3.tar.gz 18953 BLAKE2B 388373ca490ab1bad5a5bec0316ae77dc36562b8348ea3765fee67381cbb223a1538c51235b31013aba8ee6a18880978a8520ce8a801e472bd699140b8d15ea1 SHA512 49e6223763f61892342b300b14ee372d27fb7fa4036965f026ca13f290ab6b949e1e2aa1fd679b479d004614a25d38da9bddd5b1f14af9e9c8e2211504880858
diff --git a/dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch b/dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch
deleted file mode 100644
index 43acce4e7314..000000000000
--- a/dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/src/Language/Css/Pretty.hs
-+++ b/src/Language/Css/Pretty.hs
-@@ -6,3 +6,3 @@ import Text.PrettyPrint
- import Language.Css.Syntax
--
-+import Prelude hiding ((<>))
- 
diff --git a/dev-haskell/language-css/language-css-0.0.3.ebuild b/dev-haskell/language-css/language-css-0.0.3.ebuild
deleted file mode 100644
index 6113d48e4a89..000000000000
--- a/dev-haskell/language-css/language-css-0.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="CSS 2.1 syntax"
-HOMEPAGE="http://hackage.haskell.org/package/language-css"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ghc84.patch
-)
diff --git a/dev-haskell/language-css/metadata.xml b/dev-haskell/language-css/metadata.xml
deleted file mode 100644
index 0dbf5f82cad6..000000000000
--- a/dev-haskell/language-css/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		library for building and pretty printing CSS 2.1 code
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/language-dot/Manifest b/dev-haskell/language-dot/Manifest
deleted file mode 100644
index 0c19bc8ed26d..000000000000
--- a/dev-haskell/language-dot/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST language-dot-0.1.0.tar.gz 8042 BLAKE2B e83130172cc777126f54ea16b1ee0337b275a318b0ae66c2f9fb1485b04a56444e6db14e1a8738df170c0612e78dfefcb64cf0caf65c51d812ee4c6f5eee7e1a SHA512 4166a345a31d075f6492cd519dff19b5ec4fb4c4a953ef4ddaa92acdad618a2b61271d5eaa87920b6541d7f0d72611887ed2a68764d7fa446c31db66501b1467
-DIST language-dot-0.1.1.tar.gz 8076 BLAKE2B 02d1ea0cf861d8052846961d0ad8792e83f252711f6ff64443a237f5e5aedaa8a93d3e6c32f9fd2d916fede3e6927e69fc6986311e1b367133dde8cc9de002d4 SHA512 a9a3abe5ee617614bce73952384be4e5d53942f0c011817b6a92fd6452dce8c37ba39e05ff4733be404315ef95c2de9c0d4134e7aab4e875e7f414dcdb5bfcd9
diff --git a/dev-haskell/language-dot/language-dot-0.1.0.ebuild b/dev-haskell/language-dot/language-dot-0.1.0.ebuild
deleted file mode 100644
index 08754ec650be..000000000000
--- a/dev-haskell/language-dot/language-dot-0.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for the analysis and creation of Graphviz DOT files"
-HOMEPAGE="https://hackage.haskell.org/package/language-dot"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+executable"
-
-RDEPEND=">=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/language-dot/language-dot-0.1.1.ebuild b/dev-haskell/language-dot/language-dot-0.1.1.ebuild
deleted file mode 100644
index cdd922c51593..000000000000
--- a/dev-haskell/language-dot/language-dot-0.1.1.ebuild
+++ /dev/null
@@ -1,31 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for the analysis and creation of Graphviz DOT files"
-HOMEPAGE="http://hackage.haskell.org/package/language-dot"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+executable"
-
-RDEPEND=">=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/language-dot/metadata.xml b/dev-haskell/language-dot/metadata.xml
deleted file mode 100644
index 95a3923b92cc..000000000000
--- a/dev-haskell/language-dot/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="executable">Build the `ppdot' executable</flag>
-	</use>
-	<longdescription>
-		A library for the analysis and creation of Graphviz DOT files.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/language-ecmascript/Manifest b/dev-haskell/language-ecmascript/Manifest
deleted file mode 100644
index f684a858c17e..000000000000
--- a/dev-haskell/language-ecmascript/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST language-ecmascript-0.17.1.0.tar.gz 55540 BLAKE2B 82589728b0b219759314326aa36053fa42f7465a475efd15bbdc6ef2c027c2159b932e970e9fee66c179ee7525eb99f2764aecc68c58a55ae102bc79d07662aa SHA512 20a007e2934fc1778cdc5cac123a08b534ec36bec0b6f789f7c4b68c46b548b1e898f123ff1b7512905e28a1dc78e19d6bf517ced28ffcfbafb539f82f073f91
-DIST language-ecmascript-0.19.1.0.tar.gz 56091 BLAKE2B f7f84703aaf6962164b8bfda5fc5ac624cd27e325b77db45cef058bcdb447fa54aa3462eb1ec6ef8318c6663418cfe5459880f31ba97fb89ecc0be97d6757e86 SHA512 07a562af8dcdb72f86466c2cd066252e289bfc253cefdec756dd68cfc4db867b9951ffde4d0edae492cd78feae426796273667a8fcdbf182489aaed415abb2b2
diff --git a/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild b/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild
deleted file mode 100644
index 441ced47dcf8..000000000000
--- a/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JavaScript parser and pretty-printer library"
-HOMEPAGE="https://github.com/jswebtools/language-ecmascript"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/diff-0.3:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?]
-	>=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	>=dev-haskell/testing-feat-0.4.0.2:=[profile?] <dev-haskell/testing-feat-0.5:=[profile?]
-	>=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
-	>=dev-haskell/wl-pprint-1.2:=[profile?] <dev-haskell/wl-pprint-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'data-default-class >= 0.0.1 && < 0.1' 'data-default-class >= 0.0.1'
-}
diff --git a/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r2.ebuild b/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r2.ebuild
deleted file mode 100644
index 66fda2b0b0a2..000000000000
--- a/dev-haskell/language-ecmascript/language-ecmascript-0.17.1.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JavaScript parser and pretty-printer library"
-HOMEPAGE="https://github.com/jswebtools/language-ecmascript"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/diff-0.3:=[profile?] <dev-haskell/diff-0.4:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?]
-	>=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	>=dev-haskell/testing-feat-0.4.0.2:=[profile?]
-	>=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
-	>=dev-haskell/wl-pprint-1.2:=[profile?] <dev-haskell/wl-pprint-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.1 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'data-default-class >= 0.0.1 && < 0.1' 'data-default-class >= 0.0.1' \
-		'directory >= 1.2 && < 1.3' 'directory >= 1.2' \
-		'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2' \
-		'testing-feat >= 0.4.0.2 && < 0.5' 'testing-feat >= 0.4.0.2'
-}
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
deleted file mode 100644
index 9029755ed411..000000000000
--- a/dev-haskell/language-ecmascript/language-ecmascript-0.19.1.0.ebuild
+++ /dev/null
@@ -1,37 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="JavaScript parser and pretty-printer library"
-HOMEPAGE="https://github.com/jswebtools/language-ecmascript"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-1:=[profile?]
-	>=dev-haskell/charset-0.3:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?]
-	>=dev-haskell/diff-0.4:=[profile?] <dev-haskell/diff-0.5:=[profile?]
-	>=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2.0:=[profile?]
-	>=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	>=dev-haskell/uniplate-1.6:=[profile?] <dev-haskell/uniplate-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4
-		>=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 )
-"
diff --git a/dev-haskell/language-ecmascript/metadata.xml b/dev-haskell/language-ecmascript/metadata.xml
deleted file mode 100644
index d5b2ae80330e..000000000000
--- a/dev-haskell/language-ecmascript/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Some tools for working with ECMAScript 3 (popularly known as JavaScript).
-		Includes a parser, pretty-printer, and basic building blocks for more
-		sophisticated tools.
-		This package used to be called WebBits.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jswebtools/language-ecmascript</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-glsl/Manifest b/dev-haskell/language-glsl/Manifest
deleted file mode 100644
index 706062ba8727..000000000000
--- a/dev-haskell/language-glsl/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST language-glsl-0.2.0.tar.gz 16432 BLAKE2B 19d0de18cf95368fa60112f9e81962bf7e219d78b49029199c8f45b94cd424794cbea4cccd6603edef09734c446b62a40c4fb84f2b5cfb0b114fe69457aa2b27 SHA512 b7044d7ae11c8bdd63d38d7ee1c3e880a0201a7c72bb16596ecc2e32a61e37e973a8b2aa25342737f2d2133c679f479628ae78812ea773a53cd34eb941ea6d7e
-DIST language-glsl-0.3.0.tar.gz 16622 BLAKE2B b30fc8372174a8d6204f94b23f60259580456358e80e2101c3a94a437e2ce26e31fc9802c708b328c205fa08cb527e94533b74d8b81aa64f9db191b1689e8461 SHA512 cdd004906d927654164bb6cb562457ee4d7010dea3a35c3408ebb345abc2698777c5748d1dfb27ed8d43dc7189f5299c05ac6b53eb9b400a25750f47cad62f9b
diff --git a/dev-haskell/language-glsl/language-glsl-0.2.0.ebuild b/dev-haskell/language-glsl/language-glsl-0.2.0.ebuild
deleted file mode 100644
index 9a2e7ee0d145..000000000000
--- a/dev-haskell/language-glsl/language-glsl-0.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="GLSL abstract syntax tree, parser, and pretty-printer"
-HOMEPAGE="https://hackage.haskell.org/package/language-glsl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	dev-haskell/prettyclass:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/language-glsl/language-glsl-0.3.0.ebuild b/dev-haskell/language-glsl/language-glsl-0.3.0.ebuild
deleted file mode 100644
index ae3153434ddc..000000000000
--- a/dev-haskell/language-glsl/language-glsl-0.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="GLSL abstract syntax tree, parser, and pretty-printer"
-HOMEPAGE="http://hackage.haskell.org/package/language-glsl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	dev-haskell/prettyclass:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/language-glsl/metadata.xml b/dev-haskell/language-glsl/metadata.xml
deleted file mode 100644
index a4b3e69d46c1..000000000000
--- a/dev-haskell/language-glsl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The package language-glsl is a Haskell library for the
-		representation, the parsing, and the pretty-printing of
-		GLSL 1.50 code.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch b/dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch
new file mode 100644
index 000000000000..0a8dfb93fcab
--- /dev/null
+++ b/dev-haskell/language-haskell-extract/files/language-haskell-extract-0.2.4-ghc-8.10.patch
@@ -0,0 +1,20 @@
+diff --git a/src/Language/Haskell/Extract.hs b/src/Language/Haskell/Extract.hs
+index 3e8958b..43dfe04 100644
+--- a/src/Language/Haskell/Extract.hs
++++ b/src/Language/Haskell/Extract.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ module Language.Haskell.Extract (
+   functionExtractor,
+   functionExtractorMap,
+@@ -25,5 +26,9 @@ extractAllFunctions pattern =
+ functionExtractor :: String -> ExpQ
+ functionExtractor pattern =
+   do functions <- extractAllFunctions pattern
+-     let makePair n = TupE [ LitE $ StringL n , VarE $ mkName n]
++     let makePair n = TupE
++#if MIN_VERSION_template_haskell(2,16,0)
++                           $ map Just
++#endif
++                           [ LitE $ StringL n , VarE $ mkName n]
+      return $ ListE $ map makePair functions
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..84c586cbeeb3
--- /dev/null
+++ b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Module to automatically extract functions from the local code"
+HOMEPAGE="https://github.com/finnsson/template-helper"
+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/regex-posix:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+PATCHES=( "${FILESDIR}"/${P}-ghc-8.10.patch )
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
deleted file mode 100644
index ab128e10c2b6..000000000000
--- a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Module to automatically extract functions from the local code"
-HOMEPAGE="https://github.com/finnsson/template-helper"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/regex-posix:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/language-haskell-extract/metadata.xml b/dev-haskell/language-haskell-extract/metadata.xml
index 157ee542b0a1..1a18b9abb596 100644
--- a/dev-haskell/language-haskell-extract/metadata.xml
+++ b/dev-haskell/language-haskell-extract/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/language-javascript/Manifest b/dev-haskell/language-javascript/Manifest
index e3b08b2b8037..53c831352a2e 100644
--- a/dev-haskell/language-javascript/Manifest
+++ b/dev-haskell/language-javascript/Manifest
@@ -1,3 +1,2 @@
-DIST language-javascript-0.5.14.2.tar.gz 48466 BLAKE2B 16fa3dd229634230e30f7bd1eea73a7c4d321699553c5008b2050ddc925eb48e5e923c09f080c3858f71a16197dfa2d6ae8ce03bf434547c971745d8fb25112f SHA512 f493572c33baa7f5632f211999dd367b4fa2801a9b99f52796935927493d49a81e215b6847fd6bb36078c527d872b6637362ce0c3998627e5ddcd8abc07f5c81
 DIST language-javascript-0.6.0.14.tar.gz 75969 BLAKE2B ca286024545ae1b6ceb84150865c9b4768fd7ba3e783b86c01a977793cee868b55c1bec2daaa498ecc6b672be01358f76df9bcc8196c73d7463ed3213c9e6e42 SHA512 e51dc2d94339583cea58dafc5092571d54ea170a11dd1b38068f656af63ede76cc914dbbe2c18d3743c68108e3d143c8b153ecfb39410f8a4cbe108cea26fa56
-DIST language-javascript-0.6.0.9.tar.gz 103168 BLAKE2B 80b7e95a9db9e1ee474a492dabb3423664bfcf22b5cdc4957e4834dc351e8825ae9e744b96a081e97cd6ea276e31deebd8d0a70e3c659a0b2bc20d66438c0f44 SHA512 ca5fc4f541ed2834ce492417f858593e2bb42677e787e8d91055e53a400f563ad940757bf2b341d490cd6d1c1feb07a304dacc79acbf5f731f20996acd1418f9
+DIST language-javascript-0.7.1.0.tar.gz 76438 BLAKE2B c0e893ba9547a1104afd0397ed3b9439ba78947e6650317d98eeb929c140fbedb1b13d2e2425a71326b795a1b22efddbf93325591313dba9ade2b70acef12909 SHA512 35f935f121cb8aad1a28be50ba8d571ee60bd2c6721eaf9bc7f897cbc4a33b17213e89d84bf9525ddbf555030efd5fbe6b11157c113900354430a7193223516f
diff --git a/dev-haskell/language-javascript/language-javascript-0.5.14.2.ebuild b/dev-haskell/language-javascript/language-javascript-0.5.14.2.ebuild
deleted file mode 100644
index e5538fc50452..000000000000
--- a/dev-haskell/language-javascript/language-javascript-0.5.14.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parser for JavaScript"
-HOMEPAGE="https://github.com/erikd/language-javascript"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.9.2
-	dev-haskell/happy
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/utf8-light-0.4 )
-"
diff --git a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
index f06f2a718c6c..79daaa409b53 100644
--- a/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
+++ b/dev-haskell/language-javascript/language-javascript-0.6.0.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
diff --git a/dev-haskell/language-javascript/language-javascript-0.6.0.9.ebuild b/dev-haskell/language-javascript/language-javascript-0.6.0.9.ebuild
deleted file mode 100644
index a24492ce542e..000000000000
--- a/dev-haskell/language-javascript/language-javascript-0.6.0.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parser for JavaScript"
-HOMEPAGE="https://github.com/erikd/language-javascript"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.9.2
-	dev-haskell/happy
-	test? ( dev-haskell/hspec
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/utf8-light-0.4 )
-"
diff --git a/dev-haskell/language-javascript/language-javascript-0.7.1.0.ebuild b/dev-haskell/language-javascript/language-javascript-0.7.1.0.ebuild
new file mode 100644
index 000000000000..ea7d040d8936
--- /dev/null
+++ b/dev-haskell/language-javascript/language-javascript-0.7.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parser for JavaScript"
+HOMEPAGE="https://github.com/erikd/language-javascript"
+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/blaze-builder-0.2:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?]
+	>=dev-haskell/semigroups-0.16.1:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3.7:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.9.2
+	dev-haskell/happy
+	test? ( dev-haskell/hspec
+		>=dev-haskell/quickcheck-2
+		>=dev-haskell/utf8-light-0.4 )
+"
diff --git a/dev-haskell/language-javascript/metadata.xml b/dev-haskell/language-javascript/metadata.xml
index 45c249230da2..2f963f44eea3 100644
--- a/dev-haskell/language-javascript/metadata.xml
+++ b/dev-haskell/language-javascript/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Parses Javascript into an Abstract Syntax Tree (AST).  Initially intended as frontend to hjsmin.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">alanz/language-javascript</remote-id>
+		<remote-id type="github">erikd/language-javascript</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/language-lua/Manifest b/dev-haskell/language-lua/Manifest
deleted file mode 100644
index a5d62856d402..000000000000
--- a/dev-haskell/language-lua/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST language-lua-0.10.0.tar.gz 145929 BLAKE2B 7d86971a44debfd371936de35f4071b49249f3121263379a29fd3d07a3ed9fb8d3d06572b7d9990a5c2a64e0e93e4fd9fe48aec071007a62f17e93b67a799377 SHA512 9b43e3e67f54e25e82c3f1fb9fa81be31509aab01084ef95e6eddbef71fb5df7d9e58816fa51db95f8febe66fa77c52d62b15a7060dfa6a845b662b0b16dac15
-DIST language-lua-0.11.0.1.tar.gz 122831 BLAKE2B 20b1ae06f2b22e5f75b50c04b7fe9edbb81b8897ec015d8b5c6a8ea97fa8dba49901ff101103a4f728189be6c18f76191506cda8a28583f3783d6f4af66a6b4b SHA512 59b3d64f7a920b7aee55965e2a0c847d7eeb4e7c5a33668ee4a796b403b98a11a37ed8d6d1efe8244aba6e56cba01841cd7cf00d706544d65949ac019b5fd11a
diff --git a/dev-haskell/language-lua/language-lua-0.10.0.ebuild b/dev-haskell/language-lua/language-lua-0.10.0.ebuild
deleted file mode 100644
index dacdcb0be3de..000000000000
--- a/dev-haskell/language-lua/language-lua-0.10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua parser and pretty-printer"
-HOMEPAGE="https://github.com/glguy/language-lua"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.16.0
-	dev-haskell/happy
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild b/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild
deleted file mode 100644
index 7f916d15ee72..000000000000
--- a/dev-haskell/language-lua/language-lua-0.11.0.1.ebuild
+++ /dev/null
@@ -1,32 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lua parser and pretty-printer"
-HOMEPAGE="https://github.com/glguy/language-lua"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/alex-tools-0.4:=[profile?] <dev-haskell/alex-tools-0.5:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.16.0
-	dev-haskell/happy
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/language-lua/metadata.xml b/dev-haskell/language-lua/metadata.xml
deleted file mode 100644
index 3384939fca31..000000000000
--- a/dev-haskell/language-lua/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Lua 5.3 lexer, parser and pretty-printer.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">glguy/language-lua</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/language-python/Manifest b/dev-haskell/language-python/Manifest
deleted file mode 100644
index 931949c9b635..000000000000
--- a/dev-haskell/language-python/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST language-python-0.5.4.tar.gz 153417 BLAKE2B 842fabf284a43e6b84623a6e608e95f790be2a970ff4173f601a245b44aa0fb00f307f68bc7822fac735c921f9b6f755d57bc051188f02efe449d59d423a9b41 SHA512 adbe81eeb4a161c8e685c3dacdee0924f1193fa291a753e1608f0c94effc90b77df60fee1e46e791516d01ea0153f243c13fb2fdd24d688cfe9ce8ac9ed44059
diff --git a/dev-haskell/language-python/language-python-0.5.4.ebuild b/dev-haskell/language-python/language-python-0.5.4.ebuild
deleted file mode 100644
index c247c5e0b22e..000000000000
--- a/dev-haskell/language-python/language-python-0.5.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and pretty printing of Python code"
-HOMEPAGE="https://github.com/bjpop/language-python"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.18.1.3
-	dev-haskell/happy
-"
diff --git a/dev-haskell/language-python/metadata.xml b/dev-haskell/language-python/metadata.xml
deleted file mode 100644
index dc19c4cd973b..000000000000
--- a/dev-haskell/language-python/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		language-python is a Haskell library for lexical analysis, parsing
-		and pretty printing Python code. It supports versions 2.x and 3.x of Python.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bjpop/language-python</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lazysmallcheck/Manifest b/dev-haskell/lazysmallcheck/Manifest
deleted file mode 100644
index f32bcd2e8720..000000000000
--- a/dev-haskell/lazysmallcheck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lazysmallcheck-0.6.tar.gz 16862 BLAKE2B 8099de24e51e19106da50d30e370ea71fea42da2d25641b7887d06e57a341ae10f5b440b7431ab50beffba97f9fc22cc517f7a1e8f12be4341769559ead19348 SHA512 cd9e7d53686587828b5be892bacbd902b4e916d01e65c56d7634717c00353f9d0b81f92fcae9fab5008361dc7257da50a1429568f8265136883d4cca942f954d
diff --git a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild b/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild
deleted file mode 100644
index 08dfa86ae3e2..000000000000
--- a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for demand-driven testing of Haskell programs"
-HOMEPAGE="http://www.cs.york.ac.uk/~mfn/lazysmallcheck/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
diff --git a/dev-haskell/lazysmallcheck/metadata.xml b/dev-haskell/lazysmallcheck/metadata.xml
deleted file mode 100644
index d8237d1cb4bc..000000000000
--- a/dev-haskell/lazysmallcheck/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Lazy SmallCheck is a library for exhaustive, demand-driven testing of
-		Haskell programs.  It is based on the idea that if a property holds
-		for a partially-defined input then it must also hold for all
-		fully-defined refinements of the that input.  Compared to ``eager''
-		input generation as in SmallCheck, Lazy SmallCheck may require
-		significantly fewer test-cases to verify a property for all inputs up
-		to a given depth.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lcs/Manifest b/dev-haskell/lcs/Manifest
deleted file mode 100644
index 298af2d9b699..000000000000
--- a/dev-haskell/lcs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lcs-0.2.tar.gz 11638 BLAKE2B e90201a50746416391156fadb05c67a4432d063294b751b8c48a71541e7567aaad8cc8cdad59c9a58633d8ab72fd917990cab14ef044f2ecb0f9012354add709 SHA512 ac5ac6d9a151be46054f2f56a5927182fe6942e518a04a8c484b02c8caec0506ddaf846f51f5575f1f30d6f0fca9b7b26f16e32675b322d014f8b68db76d5f5e
diff --git a/dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch b/dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch
deleted file mode 100644
index 24165ffb9104..000000000000
--- a/dev-haskell/lcs/files/lcs-0.2-ghc-7.10.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/Data/List/LCS/HuntSzymanski.hs b/Data/List/LCS/HuntSzymanski.hs
-index 306368f..e9df4ef 100644
---- a/Data/List/LCS/HuntSzymanski.hs
-+++ b/Data/List/LCS/HuntSzymanski.hs
-@@ -1,2 +1,2 @@
--
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
diff --git a/dev-haskell/lcs/lcs-0.2-r1.ebuild b/dev-haskell/lcs/lcs-0.2-r1.ebuild
deleted file mode 100644
index 7fbefa014669..000000000000
--- a/dev-haskell/lcs/lcs-0.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Find longest common sublist of two lists"
-HOMEPAGE="http://urchin.earth.li/~ian/cabal/lcs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/lcs/metadata.xml b/dev-haskell/lcs/metadata.xml
deleted file mode 100644
index 7a626927e1e6..000000000000
--- a/dev-haskell/lcs/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a function lcs that takes two lists and returns a longest
-		common sublist. For example, lcs "abcd" "acbd" is either "abd" or
-		"acd".
-		
-		The package provides a simple, stupid and (most of all) slow
-		implementation that needs, for inputs of length m and n, O(m+n)
-		space and O((m+n)!) time in the worst case.
-		
-		It also provides an implementation of the Hunt-Szymanski LCS
-		algorithm, based on that in "String searching algorithms" by
-		Graham A Stephen, ISBN 981021829X.
-		
-		Given inputs xs and ys of length m and n respectively, where there
-		are r pairs (x, y) where x is in xs, y is in ys and x == y,
-		Hunt-Szymanski needs O(r+m+n) space and O((r+m+n)*log(m+n)) time.
-		Thus this is O((m+n)^2) space and O((m+n)^2*log(m+n)) time in the
-		worst case.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/leancheck/Manifest b/dev-haskell/leancheck/Manifest
new file mode 100644
index 000000000000..b1a4364fc7a1
--- /dev/null
+++ b/dev-haskell/leancheck/Manifest
@@ -0,0 +1,2 @@
+DIST leancheck-0.9.10.tar.gz 129134 BLAKE2B d9b6d4cf63eae2e54b327783f6f396d112e2b7e59bacd4dd600ad145640a959439ffdf787c57876e8b29023da2ab3e4931803c7ef6d27ebb96fd2196e970211a SHA512 4b27366fd0128332988db1cf31fbe6654110235de45e56d8f0e2bc483567b8e6bdbd33e021d47989df20100f3eb431fa6cf82c957a541ca3cf7b9bf1de72dbbe
+DIST leancheck-0.9.3.tar.gz 125801 BLAKE2B 4825d66ddc745a1ba6e20a28c7397ca33bab79e84899d5ed0f28d88f526f8415aad8b707b2e61de25ce482673d47f4771bc2cb1e402b846fff7552df49689837 SHA512 a5591e8f23318ae6097494a62998f1553fe975058827058f4d7400f723e601bcd92060c26fd5d9c60f1c1da51f97d74de0cf380ae5652c8c0721fabc2b4f5027
diff --git a/dev-haskell/leancheck/leancheck-0.9.10.ebuild b/dev-haskell/leancheck/leancheck-0.9.10.ebuild
new file mode 100644
index 000000000000..9306a501545e
--- /dev/null
+++ b/dev-haskell/leancheck/leancheck-0.9.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Enumerative property-based testing"
+HOMEPAGE="https://github.com/rudymatela/leancheck#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/leancheck/leancheck-0.9.3.ebuild b/dev-haskell/leancheck/leancheck-0.9.3.ebuild
new file mode 100644
index 000000000000..a1b78d5c2f29
--- /dev/null
+++ b/dev-haskell/leancheck/leancheck-0.9.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Enumerative property-based testing"
+HOMEPAGE="https://github.com/rudymatela/leancheck#readme"
+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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+"
diff --git a/dev-haskell/leancheck/metadata.xml b/dev-haskell/leancheck/metadata.xml
new file mode 100644
index 000000000000..3289bf01f4a6
--- /dev/null
+++ b/dev-haskell/leancheck/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">rudymatela/leancheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/lens-aeson/Manifest b/dev-haskell/lens-aeson/Manifest
deleted file mode 100644
index c47e46f49b7f..000000000000
--- a/dev-haskell/lens-aeson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lens-aeson-1.1.tar.gz 11022 BLAKE2B 4291d060db6e6da1eac5f9ac11dc700effb3df8bdf91c4a0ae34c443cbe4655944f210bd13de78c9185465d9bf814111a649e98a7863cc1cf40fc737ffa66961 SHA512 a5e1b98cc50342ddbaf36a9c6f7a87cdfd8e8abb66852777ef8fc3362a3cb7bac473c3dfd7a4ad2f57f3318c5dca6ec7a07e2a4eae05bdcc34308d188d791460
diff --git a/dev-haskell/lens-aeson/lens-aeson-1.1.ebuild b/dev-haskell/lens-aeson/lens-aeson-1.1.ebuild
deleted file mode 100644
index 6d0862a5b3d2..000000000000
--- a/dev-haskell/lens-aeson/lens-aeson-1.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.9999
-#hackport: flags: -lib-werror,+test-doctests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Law-abiding lenses for aeson"
-HOMEPAGE="https://github.com/lens/lens-aeson/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # doctest fails: warnings of "is ambiguous"
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/lens-4.4:=[profile?] <dev-haskell/lens-5:=[profile?]
-	>=dev-haskell/scientific-0.3.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-0.11.1.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
-		dev-haskell/generic-deriving
-		>=dev-haskell/semigroups-0.9
-		>=dev-haskell/simple-reflect-0.3.1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-werror \
-		--flag=test-doctests
-}
diff --git a/dev-haskell/lens-aeson/metadata.xml b/dev-haskell/lens-aeson/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/lens-aeson/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/lens-family-core/Manifest b/dev-haskell/lens-family-core/Manifest
deleted file mode 100644
index 3d52ac5dd3f3..000000000000
--- a/dev-haskell/lens-family-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST lens-family-core-1.2.1.tar.gz 11756 BLAKE2B b1810145ce45c5a445316aa44afaa11eeff6baaaa5b36a4f99d4465ceb41b30f65232aa4c5289ca038e04142a09ddfe89fcd61478ed93a42abc225a8f34b6329 SHA512 1bdb98da1b52d44c1c6d28b92eea4452253925b813b96b04c7d7b25d0e62e91be987106d41ed8bb298173577ad3b50a24508db5bf75d501828e33218b80497e1
-DIST lens-family-core-1.2.3.tar.gz 12182 BLAKE2B 196296afe6c1b1a805cff072e67157d9e835a3c24bc71e61a0135d5136797d4ad4039d0bb31d1d6deb8a2c49253d97c49a4f1d82171aaddc8423153f53cf5999 SHA512 d4cc32e302fbd7574464dc036398b4b4f0ba765de8f8749f9f5f09ce0ab74eba1143cecb383eace4140d6b1644e7f6d189edaa1a4b48c69c8b35ae862cbe4a71
diff --git a/dev-haskell/lens-family-core/lens-family-core-1.2.1.ebuild b/dev-haskell/lens-family-core/lens-family-core-1.2.1.ebuild
deleted file mode 100644
index ec8fae4886d8..000000000000
--- a/dev-haskell/lens-family-core/lens-family-core-1.2.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=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Lens Families"
-HOMEPAGE="https://hackage.haskell.org/package/lens-family-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/lens-family-core/lens-family-core-1.2.3.ebuild b/dev-haskell/lens-family-core/lens-family-core-1.2.3.ebuild
deleted file mode 100644
index d76c45634722..000000000000
--- a/dev-haskell/lens-family-core/lens-family-core-1.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Lens Families"
-HOMEPAGE="http://hackage.haskell.org/package/lens-family-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/lens-family-core/metadata.xml b/dev-haskell/lens-family-core/metadata.xml
deleted file mode 100644
index 291ddcbcd4f3..000000000000
--- a/dev-haskell/lens-family-core/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides first class( ) functional references.
-		In addition to the usual operations of getting, setting and composition, plus integration with the state monad, lens families provide some unique features:
-		
-		* Polymorphic updating
-		
-		* Traversals
-		
-		* Cast projection functions to read-only lenses
-		
-		* Cast \"toList\" functions to read-only traversals
-		
-		* Cast semantic editor combinators to modify-only traversals.
-		
-		( ) For optimal first-class support use the @lens-family@ package with rank 2 / rank N polymorphism.
-		"Lens.Family.Clone" allows for first-class support of lenses and traversals for those who require Haskell 98.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lens-family-th/Manifest b/dev-haskell/lens-family-th/Manifest
deleted file mode 100644
index 409f3177feba..000000000000
--- a/dev-haskell/lens-family-th/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lens-family-th-0.4.1.0.tar.gz 4562 BLAKE2B 1affa13291e8e610018761b4174bc45ac8cfcc23bbece8e82844a6660e997c5ab1916762bd65d2befa1aa5b0f19cdce1023111d2d7a6d765ff158aa726de6fdd SHA512 ab4283fcb833c68a838f006a71d30ed129c1d5f8ba030c4cbec6443ebeedc83e09a707a609c3c30c4420675bf5187227ce11f39218a3afb7ee563ad26104b774
diff --git a/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch b/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch
deleted file mode 100644
index 06be29a8131b..000000000000
--- a/dev-haskell/lens-family-th/files/lens-family-th-0.4.1.0-ghc-8.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Lens/Family/THCore.hs b/Lens/Family/THCore.hs
-index d4f2740..2f53db6 100644
---- a/Lens/Family/THCore.hs
-+++ b/Lens/Family/THCore.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE TemplateHaskell #-}
-@@ -52,4 +53,9 @@ extractLensTypeInfo datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ n ts _ _ _) -> (n, ts)
-+    TyConI (NewtypeD _ n ts _ _ _) -> (n, ts)
-+#else
-     TyConI (DataD    _ n ts _ _) -> (n, ts)
-     TyConI (NewtypeD _ n ts _ _) -> (n, ts)
-+#endif
-     _ -> error $ "Can't derive Lens for: "  ++ datatypeStr
-@@ -63,2 +69,8 @@ extractConstructorFields datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ _ _ _ [RecC _ fs] _) -> fs
-+    TyConI (NewtypeD _ _ _ _ (RecC _ fs) _) -> fs
-+    TyConI (DataD    _ _ _ _ [_]         _) ->
-+      error $ "Can't derive Lens without record selectors: " ++ datatypeStr
-+#else
-     TyConI (DataD    _ _ _ [RecC _ fs] _) -> fs
-@@ -67,2 +79,3 @@ extractConstructorFields datatype = do
-       error $ "Can't derive Lens without record selectors: " ++ datatypeStr
-+#endif
-     TyConI NewtypeD{} ->
-@@ -134,4 +147,9 @@ extractConstructorInfo datatype = do
-   return $ case i of
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    TyConI (DataD    _ _ _ _ fs _) -> fs
-+    TyConI (NewtypeD _ _ _ _ f  _) -> [f]
-+#else
-     TyConI (DataD    _ _ _ fs _) -> fs
-     TyConI (NewtypeD _ _ _ f  _) -> [f]
-+#endif
-     _ -> error $ "Can't derive traversal for: " ++ datatypeStr
diff --git a/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild b/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild
deleted file mode 100644
index 784a93e87893..000000000000
--- a/dev-haskell/lens-family-th/lens-family-th-0.4.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate lens-family style lenses"
-HOMEPAGE="https://github.com/DanBurton/lens-family-th#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/lens-family-th/metadata.xml b/dev-haskell/lens-family-th/metadata.xml
deleted file mode 100644
index 1651186a0a1f..000000000000
--- a/dev-haskell/lens-family-th/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Due to a cabal/hackage defect, curly braces cannot be
-		adequately displayed here. Please see
-		&lt;https://github.com/DanBurton/lens-family-th#readme&gt;
-		for a proper description of this package.
-		
-		(See &lt;https://github.com/haskell/cabal/issues/968&gt;
-		for the ticket I created regarding the defect.)
-	</longdescription>
-	<upstream>
-		<remote-id type="github">DanBurton/lens-family-th</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lens-family/Manifest b/dev-haskell/lens-family/Manifest
deleted file mode 100644
index e4198c5412d3..000000000000
--- a/dev-haskell/lens-family/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST lens-family-1.2.1.tar.gz 8192 BLAKE2B e402d520ded809890c311be9e5856367679a64adb490a2f3c70e6cce471bdfa9be311f7de4532216c32a48c17210dbebbea45bdd0d873ab4a014442c628e3f23 SHA512 5e8bd69631b5b4da489e7cb79ca91d0bacdd6ae943b2c599f837055c6589a0d0e19bfe3be427723b5775c088201237ee7cb0f2807a70aed0fbaf46293828c6fb
-DIST lens-family-1.2.3.tar.gz 8525 BLAKE2B 769d26b7deeb392718f200ac99b6af757131a56e7725c1b90e9c40d6c352f4d812095a3863e56b48d8b17a9f84348986301c2b7fb10ff88962563449e1379547 SHA512 a8925f6596b396e65f4c5015badfd48056e3dafe372019690204fa44502fd512ebd78dcff709b1fe5d1c1648fc2f3da49d657109c495a281d998c6be67bf3201
diff --git a/dev-haskell/lens-family/lens-family-1.2.1.ebuild b/dev-haskell/lens-family/lens-family-1.2.1.ebuild
deleted file mode 100644
index c99f4ddc9a4e..000000000000
--- a/dev-haskell/lens-family/lens-family-1.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lens Families"
-HOMEPAGE="https://hackage.haskell.org/package/lens-family"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/lens-family/lens-family-1.2.3.ebuild b/dev-haskell/lens-family/lens-family-1.2.3.ebuild
deleted file mode 100644
index b0f38fc74ba2..000000000000
--- a/dev-haskell/lens-family/lens-family-1.2.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lens Families"
-HOMEPAGE="http://hackage.haskell.org/package/lens-family"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lens-family-core-1.2.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/lens-family/metadata.xml b/dev-haskell/lens-family/metadata.xml
deleted file mode 100644
index 02358802aa05..000000000000
--- a/dev-haskell/lens-family/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides first class functional references.
-		In addition to the usual operations of getting, setting and composition, plus integration with monad state, lens families provide some unique features:
-		
-		* Polymorphic updating
-		
-		* Traversals
-		
-		* Cast projection functions to read-only lenses
-		
-		* Cast \&quot;toList\&quot; functions to read-only traversals
-		
-		* Cast semantic editor combinators to modify-only traversals.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lens-simple/Manifest b/dev-haskell/lens-simple/Manifest
deleted file mode 100644
index 72fcb472ecf6..000000000000
--- a/dev-haskell/lens-simple/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lens-simple-0.1.0.9.tar.gz 4541 BLAKE2B d3967769ff693b5e1fd370a96753753e2bac502fce326e6266627f28c5ddfc3e29ec0d646c1dcda2ceeaf7ea88f6acd5fb031aaf976c42338a1e9c3190f578f6 SHA512 3bf1079f4525b534bca70f83073ebb8abbc84cd9320ef97a1fb137914fcb614f8d7c8ea7065a4484539dc6240ab1aa393ee22ed3b9e20bc421d25ce7adadbd0c
diff --git a/dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild b/dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild
deleted file mode 100644
index 54db5993e44b..000000000000
--- a/dev-haskell/lens-simple/lens-simple-0.1.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="simplified import of elementary lens-family combinators"
-HOMEPAGE="https://github.com/michaelt/lens-simple"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lens-family-1.2:=[profile?] <dev-haskell/lens-family-1.3:=[profile?]
-	>=dev-haskell/lens-family-core-1.2:=[profile?] <dev-haskell/lens-family-core-1.3:=[profile?]
-	<dev-haskell/lens-family-th-0.6:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0:=[profile?] <dev-haskell/transformers-6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/lens-simple/metadata.xml b/dev-haskell/lens-simple/metadata.xml
deleted file mode 100644
index 743355961e37..000000000000
--- a/dev-haskell/lens-simple/metadata.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This module, &lt;http://hackage.haskell.org/package/lens-simple/docs/Lens-Simple.html Lens.Simple&gt;,
-		just re-exports the main modules from Russell O\'Connor's
-		&lt;http://hackage.haskell.org/package/lens-family lens-family&gt; package, the
-		original van Laarhoven-O'Connor lens library.
-		@lens-family@ is particularly remarkable for its minute number of dependencies:
-		(apart from &lt;http://hackage.haskell.org/package/mtl mtl&gt;
-		they are all ghc \'boot\' libraries); but more importantly for its
-		extreme conceptual simplicity and theoretical soundness. Much of
-		the material it contains is well-explained, from a tutorial point of view, by
-		&lt;http://hackage.haskell.org/package/lens-tutorial lens-tutorial&gt; It is independent,
-		self-standing and readily intelligible apart from any darker
-		more general system of combinators that might attempt to extend it. Much
-		of it ought to be in the Prelude.
-		
-		Convenient import of the elementary combinators from @lens-family@,
-		however, a little complicated. The idea of this trivial module, then, is just to make a sort of
-		low-powered, minimal-dependency, @lens-family@ equivalent of
-		the 800 lb gorilla of lens library imports:
-		
-		&gt; import Control.Lens
-		
-		namely, the light-weight and elegant:
-		
-		&gt; import Lens.Simple
-		
-		Check it out, it's even one character shorter!
-		
-		The material in &lt;http://hackage.haskell.org/package/lens-tutorial lens-tutorial&gt;
-		will work fine if you make this substitution in the underlying
-		&lt;http://hackage.haskell.org/package/lens-tutorial-1.0.0/docs/src/Control-Lens-Tutorial.html source&gt;
-		and follow along as prompted.
-		
-		As another illustration of the simplicity of the
-		fundamental van Laarhoven-O'Connor lens combinators - and their homogeneity with
-		@Control.Lens@ - note that the gloss
-		&lt;https://github.com/michaelt/lens-family-simple/blob/master/examples/Pong.hs pong example&gt;
-		from the @lens@ library examples directory - which continues to be
-		among the best introductory lens tutorials precisely by saying nothing -
-		requires only this abbreviating change of imports.
-		
-		If you make that program more complicated,
-		you might of course end up needing
-		the more sophisticated material in @Control.Lens@ and
-		its immense mass of dependencies. On the other hand,
-		you might just need some of the additional material
-		present in the similarly demystifying
-		&lt;http://hackage.haskell.org/package/microlens microlens&gt;
-		or &lt;http://hackage.haskell.org/package/microlens-th microlens-th&gt; and
-		the associated modules.
-		
-		This module was originally intended to simplify the use of packages that
-		follow the original promise of the van Laarhoven-O'Connor lenses.
-		/Correct practice is to export lenses without depending on a lens-library, where possible./
-		In basic cases these just use familiar @Prelude@ types, after all.
-		Examples of best practices in this respect are e.g. &lt;http://hackage.haskell.org/package/lens-family-th lens-family-th&gt; which
-		doesn't depend on @lens-family@ despite its name and pipes-related packages like
-		&lt;http://hackage.haskell.org/package/pipes-bytestring pipes-bytestring&gt;
-		and &lt;http://hackage.haskell.org/package/pipes-group pipes-group&gt;.
-		
-		@Lens.Simple@ also re-exports @makeLenses@ and
-		other convenient TH incantations from Dan Burton's associated
-		&lt;http://hackage.haskell.org/package/lens-family-th lens-family-th&gt;.
-		
-	</longdescription>
-	<upstream>
-		<remote-id type="github">michaelt/lens-simple</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/lens/Manifest b/dev-haskell/lens/Manifest
index abf2cc6df036..97d0431ce993 100644
--- a/dev-haskell/lens/Manifest
+++ b/dev-haskell/lens/Manifest
@@ -1,8 +1,2 @@
-DIST lens-3.10.0.1.tar.gz 455039 BLAKE2B 8be7cb75d2576dd65be0f91ad0e7f0b56ef1ccbc6cac8383f0043a567e514f7c2fb1c6f6fcee7925b67e68db79503313b6577c482c96f9040230e30b6e9d9693 SHA512 3dbb1f547a63196bc37dc891e7cff63656a8f662404767bca53d4d722d1669034fada995518db1a4535e7e142552ee8ad9121db6029fe22509b7de8a44aea923
-DIST lens-3.9.2.tar.gz 454678 BLAKE2B 0c637a1a00279339a697b04d8204c14f598882e0cf222ab6d5e45cd096fe34f132cd0ab1133770ffcc857b4b02c7c1987d00b46ec0f6ef72c44801c78ff8b8af SHA512 63e3a39d0d0ad16d27a8e2319163f333b67bc9df2d89d1b7fbc4dd9944cd098f0ba4a571a66939a640143c86c2f3008d5db3619af14f11a8cbcc07c424349f7a
-DIST lens-4.11.tar.gz 964787 BLAKE2B a3fefd1dc8fa3667c28b35ecef29219dd299e103d1138aa888fe610c4c1fe9b90802dc1dd43c3d8b3df34aa30cb3b0c9994550c6c6d745b7336320b6f959275c SHA512 9dc49c7a4c5cde508a5021522b41cdbb3c32b9de4be706fed189d16435828c03382cd6f069b4a17d13bcd0af390787e9f3343eea14e98662c3de3bbd5333143a
-DIST lens-4.14.tar.gz 972873 BLAKE2B 4fdea38830b8d1c4b08f5818ef5a81e7534dc31e3a07a9dc64c91b6b1ecbca8b3fc3ce561abdb8a85bf57c63f4f092687d67780d6a48a0febbbd9ad1983ca2c1 SHA512 d27999472d281832bbf56c3dd762e1a6c310d07a21af4351e64a53d7cd197e538f30955aa108ba2f56bbfbe8612ba4b844a41667e36497f03c14797e23c9c01f
-DIST lens-4.19.1.tar.gz 704985 BLAKE2B ddb9f660ff6a1930f356ce915f653f81dfa4814f4956e89d1df213dd57e2cab85eeea7be9efb46553c36448b01579319e8bf1d4c739cdc3bc13608d54f9e43f0 SHA512 50a596ce919abc93b453189453abdbf0f455e0531e5b83397d1e61308842222433fd7d4c6c6f5ec74f98d8dd26eefe861a0d88d5faf56a7b896a0b083b920a10
-DIST lens-4.2.tar.gz 767603 BLAKE2B 2ea1d21ba0f5a4f741869aa7aebab8999c28bf14339fbaf1ed493e8f2035217f0ca62502cd5b11d1c3bbb1e577ed45d807b61b6ac363a60cbaec04add64fa32b SHA512 b1e583d3400c076f1e3648aa758b0d30d6a4e3fd9776eb9e115fbd7372b990c3aa3e5d8119de827b132e0e69a255b3532f3f044e936ac4d320cc146a6d04f7bf
-DIST lens-4.6.0.1.tar.gz 767614 BLAKE2B 96e328e8b248de223cfda1df01d418aaf2e05edc2a70556805a408b32227c9246a69479e16085e7ac3abe632c702157cb31b07c94b4c92aae4346d855b06127a SHA512 0dd233ade1c5f0e3872711ecd378b69ff98353caa33cdbf1ec87bbf0356cd54842fc83870bb51b913abbb2dfd767414ebe79cec0e058cce16c29468a69880662
-DIST lens-4.9.1.tar.gz 964188 BLAKE2B 3efe4f86e592d997804c1976c7c3cfdde5cc52ef2379d531a7f4c4c43b6c834d4aaeec86309d73b5074d961d681aca36f8d0bb12f9953fd1f760a9bca72bd27c SHA512 f77d1c46a53b65e65bec4c993db087cee720e5a63f17d8beec38fe49b713bf36f4c4ff1564c6533044b8dfaaf5f5729ec98dbb55687f70fff1344e5112e8857b
+DIST lens-5.1.1.tar.gz 697888 BLAKE2B 707a7986a561abaa33abed08b170ba23945dc97ac98af0f72ce675ecd551903eb9eaaa9c8c1e22b841ab174409f1f1e8256cb17c87230b3733f0424b2bc3b6e4 SHA512 2d64cf710b7835e63a6e5af4a3075968354e01cbcd03b1ce4f7bbc56662d029b7dc399b2d8918692715f6e94f5885a63b811704b9016284dc54d9950d9142a78
+DIST lens-5.2.2.tar.gz 700966 BLAKE2B a8c4114931cea0e6566ed3b67c22ed8e056b4d1d825665f355bae05254616034306c4cfe354841b207ba82f0e4db2c9050ab3d7c38f47883bd6987c1a7961257 SHA512 f98c0a6d86470f76d990868a8a3da8680facce982b6aaf3e5870f0e79836de664df9bc831ba7eb96765e1dde29af704d8063e5fd978f5e1726389dbc755fc494
diff --git a/dev-haskell/lens/lens-3.10.0.1.ebuild b/dev-haskell/lens/lens-3.10.0.1.ebuild
deleted file mode 100644
index 609f9849d663..000000000000
--- a/dev-haskell/lens/lens-3.10.0.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/nats
-					>=dev-haskell/simple-reflect-0.3.1
-					test-hunit? ( >=dev-haskell/hunit-1.2
-						>=dev-haskell/test-framework-0.6
-						>=dev-haskell/test-framework-hunit-0.2
-						>=dev-haskell/test-framework-th-0.2
-						test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-quickcheck2-0.2 ) )
-					!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-0.6
-									>=dev-haskell/test-framework-quickcheck2-0.2
-									>=dev-haskell/test-framework-th-0.2 ) ) )
-		!test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2
-						>=dev-haskell/test-framework-0.6
-						>=dev-haskell/test-framework-hunit-0.2
-						>=dev-haskell/test-framework-th-0.2
-						test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-quickcheck2-0.2 ) )
-					!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-0.6
-									>=dev-haskell/test-framework-quickcheck2-0.2
-									>=dev-haskell/test-framework-th-0.2 ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag lib-werror lib-werror) \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-3.9.2.ebuild b/dev-haskell/lens/lens-3.9.2.ebuild
deleted file mode 100644
index e94fe831a83e..000000000000
--- a/dev-haskell/lens/lens-3.9.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining lib-werror old-inline-pragmas safe +test-doctests +test-hunit +test-properties +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/bifunctors-3:=[profile?] <dev-haskell/bifunctors-4:=[profile?]
-	>=dev-haskell/comonad-3:=[profile?] <dev-haskell/comonad-4:=[profile?]
-	>=dev-haskell/comonad-transformers-3:=[profile?] <dev-haskell/comonad-transformers-4:=[profile?]
-	>=dev-haskell/comonads-fd-3:=[profile?] <dev-haskell/comonads-fd-4:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/generic-deriving-1.4:=[profile?] <dev-haskell/generic-deriving-1.7:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/monadcatchio-transformers-0.3:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctor-extras-3.3:=[profile?] <dev-haskell/profunctor-extras-4:=[profile?]
-	>=dev-haskell/profunctors-3.2:=[profile?] <dev-haskell/profunctors-4:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-3.0.2:=[profile?] <dev-haskell/semigroupoids-4:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-0.12:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/nats
-					>=dev-haskell/simple-reflect-0.3.1
-					test-hunit? ( >=dev-haskell/hunit-1.2
-						>=dev-haskell/test-framework-0.6
-						>=dev-haskell/test-framework-hunit-0.2
-						>=dev-haskell/test-framework-th-0.2
-						test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-quickcheck2-0.2 ) )
-					!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-0.6
-									>=dev-haskell/test-framework-quickcheck2-0.2
-									>=dev-haskell/test-framework-th-0.2 ) ) )
-		!test-doctests? ( test-hunit? ( >=dev-haskell/hunit-1.2
-						>=dev-haskell/test-framework-0.6
-						>=dev-haskell/test-framework-hunit-0.2
-						>=dev-haskell/test-framework-th-0.2
-						test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-quickcheck2-0.2 ) )
-					!test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-									>=dev-haskell/test-framework-0.6
-									>=dev-haskell/test-framework-quickcheck2-0.2
-									>=dev-haskell/test-framework-th-0.2 ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag lib-werror lib-werror) \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.11.ebuild b/dev-haskell/lens/lens-4.11.ebuild
deleted file mode 100644
index 288ddf949b50..000000000000
--- a/dev-haskell/lens/lens-4.11.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/kan-extensions-4.2.1:=[profile?] <dev-haskell/kan-extensions-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1
-					test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-0.6
-							>=dev-haskell/test-framework-quickcheck2-0.2
-							>=dev-haskell/test-framework-th-0.2 ) )
-		test-hunit? ( >=dev-haskell/hunit-1.2
-				>=dev-haskell/test-framework-0.6
-				>=dev-haskell/test-framework-hunit-0.2
-				>=dev-haskell/test-framework-th-0.2
-				test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
-	test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
-			!test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
-					!test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
-											>=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) )
-							!test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
-	!test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		--flag=-lib-werror \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hlint test-hlint) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.14.ebuild b/dev-haskell/lens/lens-4.14.ebuild
deleted file mode 100644
index 172b0cd65b8a..000000000000
--- a/dev-haskell/lens/lens-4.14.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -test-hlint,+test-hunit,+test-properties
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-templates +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.6
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2
-		>=dev-haskell/test-framework-th-0.2
-		test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		--flag=-test-hlint \
-		--flag=test-hunit \
-		--flag=test-properties \
-		$(cabal_flag test-templates test-templates) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.19.1.ebuild b/dev-haskell/lens/lens-4.19.1.ebuild
deleted file mode 100644
index c4a5a24ea015..000000000000
--- a/dev-haskell/lens/lens-4.19.1.ebuild
+++ /dev/null
@@ -1,79 +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.4.9999
-#hackport: flags: -lib-werror,+test-hunit,+test-properties
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-templates +trustworthy"
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.3:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
-	>=dev-haskell/generic-deriving-1.10:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-5.2.1:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-3.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/test-framework-0.6
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2
-		>=dev-haskell/test-framework-th-0.2
-		test-doctests? ( >=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1
-					|| ( ( >=dev-haskell/doctest-0.11.4 <dev-haskell/doctest-0.12 )
-					( >=dev-haskell/doctest-0.13 <dev-haskell/doctest-0.17 ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		--flag=-lib-werror \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		--flag=test-hunit \
-		--flag=test-properties \
-		$(cabal_flag test-templates test-templates) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.2.ebuild b/dev-haskell/lens/lens-4.2.ebuild
deleted file mode 100644
index fbc32e782f63..000000000000
--- a/dev-haskell/lens/lens-4.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j lib-werror old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-RESTRICT="test"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
-	>=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/primitive-0.4.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/scientific-0.3.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.1:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-haskell/zlib-0.5.4:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1
-					test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-0.6
-							>=dev-haskell/test-framework-quickcheck2-0.2
-							>=dev-haskell/test-framework-th-0.2 ) )
-		test-hunit? ( >=dev-haskell/hunit-1.2
-				>=dev-haskell/test-framework-0.6
-				>=dev-haskell/test-framework-hunit-0.2
-				>=dev-haskell/test-framework-th-0.2
-				test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
-	test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
-			!test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
-					!test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
-											>=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) )
-							!test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
-	!test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		$(cabal_flag lib-werror lib-werror) \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hlint test-hlint) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.6.0.1.ebuild b/dev-haskell/lens/lens-4.6.0.1.ebuild
deleted file mode 100644
index 68466d8661b0..000000000000
--- a/dev-haskell/lens/lens-4.6.0.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/primitive-0.4.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1
-					test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-0.6
-							>=dev-haskell/test-framework-quickcheck2-0.2
-							>=dev-haskell/test-framework-th-0.2 ) )
-		test-hunit? ( >=dev-haskell/hunit-1.2
-				>=dev-haskell/test-framework-0.6
-				>=dev-haskell/test-framework-hunit-0.2
-				>=dev-haskell/test-framework-th-0.2
-				test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
-	test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
-			!test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
-					!test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
-											>=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) )
-							!test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
-	!test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		--flag=-lib-werror \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hlint test-hlint) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-4.9.1.ebuild b/dev-haskell/lens/lens-4.9.1.ebuild
deleted file mode 100644
index 82ced8d8e4d3..000000000000
--- a/dev-haskell/lens/lens-4.9.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lenses, Folds and Traversals"
-HOMEPAGE="https://github.com/ekmett/lens/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
-
-RESTRICT=test # slooooooooooow
-
-RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-5:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.3:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/exceptions-0.1.1:=[profile?] <dev-haskell/exceptions-1:=[profile?]
-	>=dev-haskell/free-4:=[profile?] <dev-haskell/free-5:=[profile?]
-	>=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/kan-extensions-4.2.1:=[profile?] <dev-haskell/kan-extensions-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parallel-3.1.0.1:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/profunctors-4:=[profile?] <dev-haskell/profunctors-5:=[profile?]
-	>=dev-haskell/reflection-1.1.6:=[profile?] <dev-haskell/reflection-2:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.4:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.1
-					dev-haskell/generic-deriving
-					dev-haskell/nats
-					>=dev-haskell/semigroups-0.9
-					>=dev-haskell/simple-reflect-0.3.1
-					test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-0.6
-							>=dev-haskell/test-framework-quickcheck2-0.2
-							>=dev-haskell/test-framework-th-0.2 ) )
-		test-hunit? ( >=dev-haskell/hunit-1.2
-				>=dev-haskell/test-framework-0.6
-				>=dev-haskell/test-framework-hunit-0.2
-				>=dev-haskell/test-framework-th-0.2
-				test-properties? ( >=dev-haskell/quickcheck-2.4
-							>=dev-haskell/test-framework-quickcheck2-0.2 ) ) )
-	test-hlint? ( test-doctests? ( test? ( >=dev-haskell/hlint-1.7 ) )
-			!test-doctests? ( test-hunit? ( test? ( >=dev-haskell/hlint-1.7 ) )
-					!test-hunit? ( test-properties? ( test? ( >=dev-haskell/hlint-1.7
-											>=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) )
-							!test-properties? ( test? ( >=dev-haskell/hlint-1.7 ) ) ) ) )
-	!test-hlint? ( test? ( !test-doctests? ( !test-hunit? ( test-properties? ( >=dev-haskell/quickcheck-2.4
-											>=dev-haskell/test-framework-0.6
-											>=dev-haskell/test-framework-quickcheck2-0.2
-											>=dev-haskell/test-framework-th-0.2 ) ) ) ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag benchmark-uniplate benchmark-uniplate) \
-		$(cabal_flag dump-splices dump-splices) \
-		$(cabal_flag inlining inlining) \
-		$(cabal_flag j j) \
-		--flag=-lib-werror \
-		$(cabal_flag old-inline-pragmas old-inline-pragmas) \
-		$(cabal_flag safe safe) \
-		$(cabal_flag test-doctests test-doctests) \
-		$(cabal_flag test-hlint test-hlint) \
-		$(cabal_flag test-hunit test-hunit) \
-		$(cabal_flag test-properties test-properties) \
-		$(cabal_flag trustworthy trustworthy)
-}
diff --git a/dev-haskell/lens/lens-5.1.1.ebuild b/dev-haskell/lens/lens-5.1.1.ebuild
new file mode 100644
index 000000000000..8931646585a7
--- /dev/null
+++ b/dev-haskell/lens/lens-5.1.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -lib-werror,+test-hunit,+test-properties,-benchmark-uniplate,-dump-splices,+inlining,-j,+test-templates,+trustworthy
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lenses, Folds and Traversals"
+HOMEPAGE="https://github.com/ekmett/lens/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/assoc-1.0.2:=[profile?] <dev-haskell/assoc-1.1:=[profile?]
+	>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/bifunctors-5.5.7:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.5:=[profile?]
+	>=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1.4:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/free-5.1.5:=[profile?] <dev-haskell/free-6:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+	>=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
+	>=dev-haskell/parallel-3.2.1.0:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
+	>=dev-haskell/profunctors-5.5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
+	>=dev-haskell/semigroupoids-5.0.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.5:=[profile?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+	>=dev-haskell/transformers-compat-0.5.0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.10:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2.4
+		>=dev-haskell/simple-reflect-0.3.1
+		>=dev-haskell/test-framework-0.6
+		>=dev-haskell/test-framework-hunit-0.2
+		>=dev-haskell/test-framework-quickcheck2-0.2 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-benchmark-uniplate \
+		--flag=-dump-splices \
+		--flag=inlining \
+		--flag=-j \
+		--flag=-lib-werror \
+		--flag=test-hunit \
+		--flag=test-properties \
+		--flag=test-templates \
+		--flag=trustworthy
+}
diff --git a/dev-haskell/lens/lens-5.2.2.ebuild b/dev-haskell/lens/lens-5.2.2.ebuild
new file mode 100644
index 000000000000..ba3ceb4e3504
--- /dev/null
+++ b/dev-haskell/lens/lens-5.2.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -lib-werror,+test-hunit,+test-properties,-benchmark-uniplate,-dump-splices,+inlining,-j,+test-templates,+trustworthy
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lenses, Folds and Traversals"
+HOMEPAGE="https://github.com/ekmett/lens/"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/assoc-1.0.2:=[profile?] <dev-haskell/assoc-1.2:=[profile?]
+	>=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/bifunctors-5.5.7:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/call-stack-0.1:=[profile?] <dev-haskell/call-stack-0.5:=[profile?]
+	>=dev-haskell/comonad-5.0.7:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1.4:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.5.1:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/free-5.1.5:=[profile?] <dev-haskell/free-6:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+	>=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?]
+	>=dev-haskell/parallel-3.2.1.0:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
+	>=dev-haskell/profunctors-5.5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/reflection-2.1:=[profile?] <dev-haskell/reflection-3:=[profile?]
+	>=dev-haskell/semigroupoids-5.0.1:=[profile?] <dev-haskell/semigroupoids-7:=[profile?]
+	>=dev-haskell/strict-0.4:=[profile?] <dev-haskell/strict-0.6:=[profile?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.6:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.5.0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.10:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.12.1.2:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2.4
+		>=dev-haskell/simple-reflect-0.3.1
+		>=dev-haskell/test-framework-0.6
+		>=dev-haskell/test-framework-hunit-0.2
+		>=dev-haskell/test-framework-quickcheck2-0.2 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-benchmark-uniplate \
+		--flag=-dump-splices \
+		--flag=inlining \
+		--flag=-j \
+		--flag=-lib-werror \
+		--flag=test-hunit \
+		--flag=test-properties \
+		--flag=test-templates \
+		--flag=trustworthy
+}
diff --git a/dev-haskell/lens/metadata.xml b/dev-haskell/lens/metadata.xml
index ffb64447adda..db61bc69ecd0 100644
--- a/dev-haskell/lens/metadata.xml
+++ b/dev-haskell/lens/metadata.xml
@@ -1,107 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package comes \"Batteries Included\" with many useful lenses for the types
-		commonly used from the Haskell Platform, and with tools for automatically
-		generating lenses and isomorphisms for user-supplied data types.
-
-		The combinators in @Control.Lens@ provide a highly generic toolbox for composing
-		families of getters, folds, isomorphisms, traversals, setters and lenses and their
-		indexed variants.
-
-		An overview, with a large number of examples can be found in the @README@: &lt;https://github.com/ekmett/lens#lens-lenses-folds-and-traversals&gt;
-
-		A video on how to use lenses and how they are constructed is available from youtube: &lt;http://youtu.be/cefnmjtAolY?hd=1&gt;
-
-		Slides can be obtained here: &lt;http://comonad.com/haskell/Lenses-Folds-and-Traversals-NYC.pdf&gt;
-
-		More information on the care and feeding of lenses, including a brief tutorial and motivation
-		for their types can be found on the lens wiki: &lt;https://github.com/ekmett/lens/wiki&gt;
-
-		A small game of @pong@ and other more complex examples that manage their state using lenses can be found in the example folder: &lt;https://github.com/ekmett/lens/blob/master/examples/&gt;
-
-		/Lenses, Folds and Traversals/
-
-		The core of the hierarchy of lens-like constructions looks like:
-
-
-		&lt;&lt;http://i.imgur.com/4fHw3Fd.png&gt;&gt;
-
-		Local copy (&lt;Hierarchy.png&gt;)
-
-		You can compose any two elements of the hierarchy above using @(.)@ from the @Prelude@, and you can
-		use any element of the hierarchy as any type it linked to above it.
-
-		The result is their lowest upper bound in the hierarchy (or an error if that bound doesn't exist).
-
-		For instance:
-
-		* You can use any 'Traversal' as a 'Fold' or as a 'Setter'.
-
-		* The composition of a 'Traversal' and a 'Getter' yields a 'Fold'.
-
-		/Minimizing Dependencies/
-
-		If you want to provide lenses and traversals for your own types in your own libraries, then you
-		can do so without incurring a dependency on this (or any other) lens package at all.
-
-		/e.g./ for a data type:
-
-		&gt; data Foo a = Foo Int Int a
-
-		You can define lenses such as
-
-		&gt; -- bar :: Lens' (Foo a) Int
-		&gt; bar :: Functor f =&gt; (Int -&gt; f Int) -&gt; Foo a -&gt; f (Foo a)
-		&gt; bar f (Foo a b c) = fmap (\a' -&gt; Foo a' b c) (f a)
-
-		&gt; -- baz :: Lens (Foo a) (Foo b) a b
-		&gt; quux :: Functor f =&gt; (a -&gt; f b) -&gt; Foo a -&gt; f (Foo b)
-		&gt; quux f (Foo a b c) = fmap (Foo a b) (f c)
-
-		without the need to use any type that isn't already defined in the @Prelude@.
-
-		And you can define a traversal of multiple fields with 'Control.Applicative.Applicative':
-
-		&gt; -- traverseBarAndBaz :: Traversal' (Foo a) Int
-		&gt; traverseBarAndBaz :: Applicative f =&gt; (Int -&gt; f Int) -&gt; Foo a -&gt; f (Foo a)
-		&gt; traverseBarAndBaz f (Foo a b c) = Foo &lt;$&gt; f a &lt;*&gt; f b &lt;*&gt; pure c
-
-		What is provided in this library is a number of stock lenses and traversals for
-		common haskell types, a wide array of combinators for working them, and more
-		exotic functionality, (/e.g./ getters, setters, indexed folds, isomorphisms).
-	</longdescription>
-	<use>
-		<flag name="benchmark-uniplate">
-			Enable benchmarking against Neil Mitchell's
-			uniplate library for comparative performance analysis. Defaults to being
-			turned off to avoid the extra dependency.
-		</flag>
-		<flag name="inlining">
-			Generate inline pragmas when using
-			template-haskell. This defaults to enabled, but you can
-			to shut it off to benchmark the relative performance impact,
-			or as last ditch effort to address compile errors resulting
-			from the myriad versions of template-haskell that all purport to be 2.8.
-		</flag>
-		<flag name="old-inline-pragmas">Some 7.6.1-rc1 users report their TH still uses old style inline pragmas. This lets them turn on inlining.</flag>
-		<flag name="safe">Disallow unsafeCoerce</flag>
-		<flag name="dump-splices">Build and run the doctests test-suite.</flag>
-		<flag name="j">Attempt a parallel build with GHC 7.8.</flag>
-		<flag name="test-doctests">Build and run the doctests test-suite.</flag>
-		<flag name="test-hlint">You can disable the hlint test suite with -f-test-hlint</flag>
-		<flag name="test-hunit">You can disable the hunit test suite with -f-test-hunit</flag>
-		<flag name="test-properties">Build the properties test if we're building tests</flag>
-		<flag name="test-templates">Build the test templates if we're building tests</flag>
-		<flag name="trustworthy">Assert that we are trustworthy when we can</flag>
-		<flag name="lib-werror">Turn on ghc-options: -Werror</flag>
-	</use>
 	<upstream>
+		<remote-id type="hackage">lens</remote-id>
 		<remote-id type="github">ekmett/lens</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/lhs2tex/Manifest b/dev-haskell/lhs2tex/Manifest
deleted file mode 100644
index 4a5d8679c9a7..000000000000
--- a/dev-haskell/lhs2tex/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST lhs2tex-1.18.1.tar.gz 661053 BLAKE2B 64dbefde30d3a6a00c47d5b3397b6f7b4cb44bdf272768ed84f66db1d3e99e95df99f16e537d3959ef0566424151a44fdd70e975ac156abd2a5907bed8044520 SHA512 c44b4c5972b833ae41921d86e13c71ea60ac876a9996fb9a4e8d69ba25d000bbddb85f82d223b8a73381e3a4453c2757154a866fbbb48473f121dd88efb917d7
-DIST lhs2tex-1.19.tar.gz 658353 BLAKE2B 2a6d0ca1bc23fce29579d1f020ad9db178801177d1b0c171771d24470bf604359b85f5afab6aacc6a566fecca1d0edd26ddb01d97d8e9bc3c8bc98e042d47690 SHA512 63d4cb626c14dccc6e0989b358299078427d0c22ab726fd3d933bfef3b0d072a35113d132c87b61b7b8ac2c259c856e192d04e04d3eb744b958fc0df54c80abf
diff --git a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch b/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
deleted file mode 100644
index 1a3c922723e1..000000000000
--- a/dev-haskell/lhs2tex/files/lhs2tex-1.18.1-mandir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Setup.hs.orig	2014-11-03 00:57:44.033467328 +0530
-+++ Setup.hs	2014-11-03 00:58:05.775218672 +0530
-@@ -205,7 +205,7 @@
-                        else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc"
-         let manDir = if isWindows
-                        then dataPref `joinFileName` "Documentation"
--                       else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1"
-+                       else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1"
-         createDirectoryIfMissing True docDir
-         installOrdinaryFile v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf")
-         when (not isWindows) $
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
deleted file mode 100644
index 81391c36b1b2..000000000000
--- a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
-HOMEPAGE="http://www.andres-loeh.de/lhs2tex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
-# for guide generation
-# dev-texlive/texlive-latexextra for polytable
-RDEPEND="dev-texlive/texlive-latexextra
-	dev-texlive/texlive-mathscience"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/mtl
-		dev-haskell/regex-compat
-		>=dev-lang/ghc-6.12.1"
-
-# Setup.hs uses 'Text.Regex' available in both 'r-c' and 'r-c-tdfa'
-HCFLAGS+=" -ignore-package=regex-compat-tdfa"
-
-# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
-PATCHES=("${FILESDIR}/${PN}-1.18.1-mandir.patch")
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
deleted file mode 100644
index 81391c36b1b2..000000000000
--- a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
-HOMEPAGE="http://www.andres-loeh.de/lhs2tex/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
-# for guide generation
-# dev-texlive/texlive-latexextra for polytable
-RDEPEND="dev-texlive/texlive-latexextra
-	dev-texlive/texlive-mathscience"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		dev-haskell/mtl
-		dev-haskell/regex-compat
-		>=dev-lang/ghc-6.12.1"
-
-# Setup.hs uses 'Text.Regex' available in both 'r-c' and 'r-c-tdfa'
-HCFLAGS+=" -ignore-package=regex-compat-tdfa"
-
-# datadir is /usr/share/${PN}/${GHC_VER} so mandir is ${DATADIR}/../../man
-PATCHES=("${FILESDIR}/${PN}-1.18.1-mandir.patch")
diff --git a/dev-haskell/lhs2tex/metadata.xml b/dev-haskell/lhs2tex/metadata.xml
deleted file mode 100644
index 5523851d5d80..000000000000
--- a/dev-haskell/lhs2tex/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/libmpd/Manifest b/dev-haskell/libmpd/Manifest
index 6f56048fdd52..84cb8fd7d085 100644
--- a/dev-haskell/libmpd/Manifest
+++ b/dev-haskell/libmpd/Manifest
@@ -1,5 +1,2 @@
-DIST libmpd-0.8.0.4.tar.gz 39996 BLAKE2B b35dd8ef91bbde333c64ed904701bade2541b191121871306cc1ab196b39ce7a490ed80c948831e36abc26540bc4f89c25ebbae4b34c6ff85a73a57168ae3bee SHA512 57e06fcd9b4c1beefa95c3ff7d15bf9aea7ec92978c36ab2387f8724054ef8dd0ce6f8d9fbb437fd4b0e22b31daadf487463b95393564f8aff049d55084fe3c9
-DIST libmpd-0.9.0.2.tar.gz 38392 BLAKE2B 80b3afb64eeb5b2ff242991388c25c1581c066b7fd4700487b1b472692f1890b3299fc2e0fdbf27c035e464ee2f28314d034da8dc31db862ca47783f9042fd59 SHA512 0dcafb2085e833608c68b83bcb08177ecb68f08110c1d25e8ea7b2f69ff9fbb85e581280528d1c5a4f3a6c9077ec70105ba9d28bce4276863e91db776c698d1e
-DIST libmpd-0.9.0.4.tar.gz 38421 BLAKE2B 5679d556f0c3324225da80bbf9c6d44a928c9218fd4119b9b09a8896ea3b7f26437757bd0757cce3c831a367dc057a651d282f04c189a5a22d78cb4da4a56fbf SHA512 f2c5d300f26d9101cf248c73791f45b26803d13f39472c47109921c82c941138804a80237f359629419001f1d228c2ea199c69cb4421aaca23012d5871b796c4
-DIST libmpd-0.9.0.6.tar.gz 38707 BLAKE2B f6d11eaf7c260d375c949c0cbeed17af95397d99141a0b879d7f00e00a06dac6de302b0918f3d64ee16de740f418be22ce84fbc6ffbb56af3b1688b411a3d4e3 SHA512 87601afb3ea71675793087277c8dbd02cac596df19d8e665ccae4111f87c3f5d39fff33f7c26dba9be22d6569cce9bcb039aa6f56e8542f26c699d8f0930371b
-DIST libmpd-0.9.1.0.tar.gz 41332 BLAKE2B 16d4ee3ae4edeb647927ca03ebcad0ce94cf0e5dbcd15550843ad7a56f92683fe6e5c0e265875d4df944493d7273499e8ae0a8127d75a1b16416965d95a833df SHA512 f8fb657c4eec2444aaa6ec58966ea9fc8f4944ce13e4dc380f8fbf3dd87a39e1db18c563a25ac09ea1c6f3b5c8596a25dc0e81d8b7d2771c970d85c06d208496
+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
diff --git a/dev-haskell/libmpd/libmpd-0.10.0.0.ebuild b/dev-haskell/libmpd/libmpd-0.10.0.0.ebuild
new file mode 100644
index 000000000000..499b2215af76
--- /dev/null
+++ b/dev-haskell/libmpd/libmpd-0.10.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An MPD client library"
+HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+	'text >= 0.11 && < 2' 'text >= 0.11'
+)
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
+	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
+	>=dev-haskell/network-2.6.3.5:=[profile?]
+	>=dev-haskell/safe-exceptions-0.1:=[profile?] <dev-haskell/safe-exceptions-0.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4
+	test? ( >=dev-haskell/hspec-2
+		>=dev-haskell/quickcheck-2.10 )
+"
diff --git a/dev-haskell/libmpd/libmpd-0.8.0.4-r1.ebuild b/dev-haskell/libmpd/libmpd-0.8.0.4-r1.ebuild
deleted file mode 100644
index 4ec74f3d019d..000000000000
--- a/dev-haskell/libmpd/libmpd-0.8.0.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An MPD client library"
-HOMEPAGE="https://github.com/joachifm/libmpd-haskell#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test" # Could not find module Test.Hspec.Monadic
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
-	>=dev-haskell/data-default-0.4.0:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.6:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/utf8-string-0.3.1:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/data-default
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2.1
-		dev-haskell/text
-		dev-haskell/utf8-string )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'attoparsec >= 0.10.1 && < 0.12' 'attoparsec >= 0.10.1 && < 0.13'
-}
diff --git a/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild b/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild
deleted file mode 100644
index e0c998795b4f..000000000000
--- a/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An MPD client library"
-HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs slight port to ghc-7.10
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-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-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.1 )
-"
diff --git a/dev-haskell/libmpd/libmpd-0.9.0.4.ebuild b/dev-haskell/libmpd/libmpd-0.9.0.4.ebuild
deleted file mode 100644
index 069bf07c217a..000000000000
--- a/dev-haskell/libmpd/libmpd-0.9.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An MPD client library"
-HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # needs a port to QC-2.8.2
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-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-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.1 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'time >= 1.5 && <1.6' 'time >= 1.5'
-}
diff --git a/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild b/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild
deleted file mode 100644
index 9bf805a4173d..000000000000
--- a/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An MPD client library"
-HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-3:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-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-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.1 )
-"
diff --git a/dev-haskell/libmpd/libmpd-0.9.1.0.ebuild b/dev-haskell/libmpd/libmpd-0.9.1.0.ebuild
deleted file mode 100644
index 8ab931fc2ed5..000000000000
--- a/dev-haskell/libmpd/libmpd-0.9.1.0.ebuild
+++ /dev/null
@@ -1,34 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An MPD client library"
-HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/network-2.6.3.5:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
-	>=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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.10 )
-"
diff --git a/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
new file mode 100644
index 000000000000..562e8233c931
--- /dev/null
+++ b/dev-haskell/libmpd/libmpd-0.9.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An MPD client library"
+HOMEPAGE="https://github.com/vimus/libmpd-haskell#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
+	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-1:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3:=[profile?]
+	>=dev-haskell/network-2.6.3.5:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?]
+	>=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-9.1
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/hspec-1.3
+		>=dev-haskell/quickcheck-2.10 )
+"
diff --git a/dev-haskell/libmpd/metadata.xml b/dev-haskell/libmpd/metadata.xml
index 6c9830eddc95..d15c9225ef07 100644
--- a/dev-haskell/libmpd/metadata.xml
+++ b/dev-haskell/libmpd/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A client library for MPD, the Music Player Daemon
-		(&lt;https://www.musicpd.org/&gt;).
-	</longdescription>
 	<upstream>
-		<remote-id type="github">vimus/libmpd-haskell#readme</remote-id>
+		<remote-id type="hackage">libmpd</remote-id>
+		<remote-id type="github">vimus/libmpd-haskell</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/libxml-sax/Manifest b/dev-haskell/libxml-sax/Manifest
deleted file mode 100644
index e5392fb8a1aa..000000000000
--- a/dev-haskell/libxml-sax/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libxml-sax-0.7.5.tar.gz 8916 BLAKE2B d6d08951825a154e1d983097bb85f2007ed68d25a5fd2dfbe545f0db6f99d3fc8a7721599fee43a9b4f94327f8546d4ff3466be21ab1933bc5658e525d9586cc SHA512 8a7345610de1fa7fdbe0c251c5e3675f980731f3c4212e87243aec606457a152ef36d78c777428a8b879aa8662f75b6cd878fd5a9e48d283def24c853be43c28
diff --git a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild b/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
deleted file mode 100644
index 4d4d88b66315..000000000000
--- a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings for the libXML2 SAX interface"
-HOMEPAGE="https://john-millikin.com/software/haskell-libxml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	dev-libs/libxml2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/libxml-sax/metadata.xml b/dev-haskell/libxml-sax/metadata.xml
deleted file mode 100644
index 746e917f70c8..000000000000
--- a/dev-haskell/libxml-sax/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Bindings for the libXML2 SAX interface
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/libxml/Manifest b/dev-haskell/libxml/Manifest
deleted file mode 100644
index 489a0f20f30a..000000000000
--- a/dev-haskell/libxml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libxml-0.1.1.tar.gz 3959 BLAKE2B 938bf1b309696574e47b4128dba8824ed9b756416980fa367269730051ff319c68ea8e49b9f4e63ab2da358f9a2ed9adc2f5a1f12cf729fbdd3b3ea48beedd10 SHA512 59a52200e7c7ab17a60a89e4a3aefdf6356e868be6be53696e5708a4d30863ae879834404ccfecb91b6d4b93a7ce0e147a3cc04bc4d5838c2aa990a290af5c5c
diff --git a/dev-haskell/libxml/libxml-0.1.1.ebuild b/dev-haskell/libxml/libxml-0.1.1.ebuild
deleted file mode 100644
index 811bfb96c3d5..000000000000
--- a/dev-haskell/libxml/libxml-0.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to libxml2"
-HOMEPAGE="https://hackage.haskell.org/package/libxml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	dev-libs/libxml2
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -e 's@includes: libxml/xmlIO.h libxml/xmlmemory.h@pkgconfig-depends: libxml-2.0@' \
-		-i "${S}/${PN}.cabal" \
-		|| die "Could not patch libxml2 configuration in ${PN}.cabal"
-}
diff --git a/dev-haskell/libxml/metadata.xml b/dev-haskell/libxml/metadata.xml
deleted file mode 100644
index 3f3a10dd69c5..000000000000
--- a/dev-haskell/libxml/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Minimal binding to libxml2. Additional functions will be added when needed.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/libyaml/libyaml-0.1.2.ebuild b/dev-haskell/libyaml/libyaml-0.1.2.ebuild
index be4c94e648a6..62db191a52ba 100644
--- a/dev-haskell/libyaml/libyaml-0.1.2.ebuild
+++ b/dev-haskell/libyaml/libyaml-0.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4
 
@@ -14,8 +14,8 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="no-unicode system-libyaml"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+unicode system-libyaml"
 
 RDEPEND=">=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
 	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
@@ -27,7 +27,10 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
+	local unicode_flag="no-unicode"
+	use unicode && unicode_flag="-no-unicode"
+
 	haskell-cabal_src_configure \
-		$(cabal_flag no-unicode no-unicode) \
+		--flag="${unicode_flag}" \
 		$(cabal_flag system-libyaml system-libyaml)
 }
diff --git a/dev-haskell/libyaml/metadata.xml b/dev-haskell/libyaml/metadata.xml
index f4381ff218c5..8958352628bb 100644
--- a/dev-haskell/libyaml/metadata.xml
+++ b/dev-haskell/libyaml/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="no-unicode">Don't enable unicode output. Instead, unicode characters will be escaped.</flag>
+		<flag name="unicode">Enable unicode output. Otherwise, unicode characters will be escaped.</flag>
 		<flag name="system-libyaml">Use the system-wide libyaml instead of the bundled copy</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">snoyberg/yaml</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/lift-type/Manifest b/dev-haskell/lift-type/Manifest
new file mode 100644
index 000000000000..9be6c71c7b6e
--- /dev/null
+++ b/dev-haskell/lift-type/Manifest
@@ -0,0 +1 @@
+DIST lift-type-0.1.0.1.tar.gz 3133 BLAKE2B 64e27c549960e2a02a1f01431f602d4dc34ac3ad8db430c0e8f473c70a412ebebf31b7da5ea4e6024b3e59df654dbccfc3b9f980b32516d9419476941417c41f SHA512 3555cfc79a317849921306f8766d031dbdf247aa9bec604e20b47c31c4d001c7392b2f47a3463a9699b33826fec4a5d092fbad82c3d6a75f3c3151afa033b372
diff --git a/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild b/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild
new file mode 100644
index 000000000000..d898c66d798b
--- /dev/null
+++ b/dev-haskell/lift-type/lift-type-0.1.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lift a type from a Typeable constraint to a Template Haskell type"
+HOMEPAGE="https://github.com/parsonsmatt/lift-type#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/lift-type/metadata.xml b/dev-haskell/lift-type/metadata.xml
new file mode 100644
index 000000000000..30704d31ed6e
--- /dev/null
+++ b/dev-haskell/lift-type/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">parsonsmatt/lift-type</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/lifted-async/Manifest b/dev-haskell/lifted-async/Manifest
index 8c07fc41c97c..dc5a10c53020 100644
--- a/dev-haskell/lifted-async/Manifest
+++ b/dev-haskell/lifted-async/Manifest
@@ -1,6 +1,3 @@
-DIST lifted-async-0.10.0.6.tar.gz 10308 BLAKE2B f9718ed3d97d4cb17b87d49efb594a7b61f11b6be9819b44bd8382a87bb247b754328db07417699f5140f6168d42c3d51fceaaaf33da748f9aba8683101cd6ec SHA512 9e5ae5d906df2577453c9b86f196f4bb4ec4d7766c5d9bcb7d2fa66be62daa44c033ed1475bdc004e1540da81f645a4d39db35142d32d09b33cfe9c01412f1ce
-DIST lifted-async-0.2.0.2.tar.gz 6907 BLAKE2B da3f85064197fe4dae8f54f28d040d05d4acb9d3bbc638d32af61edf0e361ad9b9398d858d808e8264caace4e88754aa75dab32fa60ae0837f8d9619f7dbf14b SHA512 a69e3f93c33ca76889afd894fcadb3f0d53fae05ff47bdbaa5d164deb756c60f7282671bdfa14d092b0a985f5cdf30746fcf847241aeda08be553f7c8d90bce3
-DIST lifted-async-0.6.0.1.tar.gz 8871 BLAKE2B d4629501d4696487a703b08216afd2baba298b100a4c1664e0dc43d29642b1b52fbf817a3582e3d9124d9bbfe896c18f399fa19877e10bad939941127ab9bc4b SHA512 afa436919bf50a343739ec9ca1e492cdac037df1e286812e77089c939303ce00a0f8681303eb41ea476df5d4013be6ef45c63c161ab0fa92b0ced4a0c4e57120
-DIST lifted-async-0.7.0.2.tar.gz 9096 BLAKE2B 48203cf7fb41108a37b236c827e5fcb623e3bd82b43df7a1ee6f8e47363bfcb08a8feb9c5908471e84df0cbb83480a2e1fb4fb4a94e906f8a63d71480a1601f0 SHA512 7dcbc10d0e5c055b3b1d3f4a2a69304b2b66413cb0ba99d1abb03f067b6f898b1aa0d9ed9deae0016fd1198717c048b8ba5b40e60ce3c1bf888c876dca15a222
-DIST lifted-async-0.8.0.1.tar.gz 9453 BLAKE2B f74d017f8afd51f08e48225b590d6b88899429214cc0a33fcac2bc5e1e67524d43e7d78830ff0be9258dbb333069331b18850968d1b896cd26abdf66943a472b SHA512 529a8c2c88f6277f5618d89f62d99318c9ae059c650f40e6cbc61f70621f073a10fff0ce3f27936d71a0dcd222afdbfa58d0922ae45075753d74c3e7bab5bcfa
-DIST lifted-async-0.9.1.1.tar.gz 10077 BLAKE2B 13132800149f014add45245ef3a2988fab4e1609b5f0cf05284d73f584e0a541d7eccc8e7a6ce5117fc374ab2c4c123adc9bc6fbdb52a5fc2662913b986a54f1 SHA512 c8e3d3e6bcfb361b5fe1bd948d21f8d2087e18b2f035557564e94fb444fae64baf0302d3938c5ca31f8a68a2fd5e7fb1389f1a318c3a2b447facee823511b5ad
+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
diff --git a/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch b/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch
deleted file mode 100644
index 970d9842f770..000000000000
--- a/dev-haskell/lifted-async/files/lifted-async-0.2.0.2-monad-control-1.1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 448176aa98e03a31121501af004d8159e92b2f66
-Author: Roman Cheplyaka <roma@ro-che.info>
-Date:   Tue Dec 16 12:09:52 2014 +0200
-
-    Make lifted-async build with monad-control-1.0
-
-diff --git a/src/Control/Concurrent/Async/Lifted.hs b/src/Control/Concurrent/Async/Lifted.hs
-index fa5a158..e5034c1 100644
---- a/src/Control/Concurrent/Async/Lifted.hs
-+++ b/src/Control/Concurrent/Async/Lifted.hs
-@@ -2,6 +2,7 @@
- {-# LANGUAGE KindSignatures #-}
- {-# LANGUAGE RankNTypes #-}
- {-# LANGUAGE TypeFamilies #-}
-+{-# LANGUAGE ScopedTypeVariables #-}
- 
- {- |
- Module      : Control.Concurrent.Async.Lifted
-@@ -47,7 +48,7 @@ module Control.Concurrent.Async.Lifted
- 
- import Control.Applicative
- import Control.Concurrent (threadDelay)
--import Control.Monad ((>=>), forever, liftM, void)
-+import Control.Monad ((>=>), forever, liftM)
- import Data.Traversable (Traversable(..))
- import GHC.IO (unsafeUnmask)
- import Prelude hiding (mapM)
-@@ -180,11 +181,11 @@ waitCatch
- waitCatch a = liftBase (A.waitCatch a) >>= sequenceEither
- 
- -- | Generalized version of 'A.cancel'.
--cancel :: MonadBase IO m => Async (StM m a) -> m ()
-+cancel :: MonadBase IO m => Async a -> m ()
- cancel = liftBase . A.cancel
- 
- -- | Generalized version of 'A.cancelWith'.
--cancelWith :: (MonadBase IO m, Exception e) => Async (StM m a) -> e -> m ()
-+cancelWith :: (MonadBase IO m, Exception e) => Async a -> e -> m ()
- cancelWith = (liftBase .) . A.cancelWith
- 
- -- | Generalized version of 'A.waitAny'.
-@@ -261,10 +262,10 @@ waitEitherCatchCancel a b =
- -- | Generalized version of 'A.waitEither_'.
- waitEither_
-   :: MonadBaseControl IO m
--  => Async (StM m a)
--  -> Async (StM m b)
-+  => Async a
-+  -> Async b
-   -> m ()
--waitEither_ = (void .) . waitEither
-+waitEither_ a b = liftBase (A.waitEither_ a b)
- 
- -- | Generalized version of 'A.waitBoth'.
- waitBoth
-@@ -280,11 +281,11 @@ waitBoth a b = do
- {-# INLINABLE waitBoth #-}
- 
- -- | Generalized version of 'A.link'.
--link :: MonadBase IO m => Async (StM m a) -> m ()
-+link :: MonadBase IO m => Async a -> m ()
- link = liftBase . A.link
- 
- -- | Generalized version of 'A.link2'.
--link2 :: MonadBase IO m => Async (StM m a) -> Async (StM m b) -> m ()
-+link2 :: MonadBase IO m => Async a -> Async a -> m ()
- link2 = (liftBase .) . A.link2
- 
- -- | Generalized version of 'A.race'.
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild
deleted file mode 100644
index fd66768fffd0..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.10.0.6.ebuild
+++ /dev/null
@@ -1,37 +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.4.9999
-
-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 ~x86"
-IUSE=""
-
-#beware: hackport not reading `constraints` upper bound correctly
-
-RDEPEND=">=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
-	>=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.13:=[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-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		<dev-haskell/tasty-expected-failure-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-		dev-haskell/tasty-th )
-"
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.2.3.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.2.3.ebuild
new file mode 100644
index 000000000000..42c5ecac4aa8
--- /dev/null
+++ b/dev-haskell/lifted-async/lifted-async-0.10.2.3.ebuild
@@ -0,0 +1,32 @@
+# 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
+
+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"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit
+		dev-haskell/tasty
+		<dev-haskell/tasty-expected-failure-0.13
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		dev-haskell/tasty-th )
+"
diff --git a/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild b/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
new file mode 100644
index 000000000000..f90e56840529
--- /dev/null
+++ b/dev-haskell/lifted-async/lifted-async-0.10.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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"
+
+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-9.0.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.4.1.0
+	test? ( dev-haskell/hunit
+		dev-haskell/tasty
+		<dev-haskell/tasty-expected-failure-0.13
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		dev-haskell/tasty-th )
+"
diff --git a/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild
deleted file mode 100644
index 6eb3a3d3e4ee..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base 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 ~x86"
-IUSE=""
-RESTRICT="test" # patch has a test failure: withAsync waitEither : FAIL
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.2.0.2-monad-control-1.1.patch")
diff --git a/dev-haskell/lifted-async/lifted-async-0.6.0.1.ebuild b/dev-haskell/lifted-async/lifted-async-0.6.0.1.ebuild
deleted file mode 100644
index e0ff1c8210b5..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.6.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-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 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.5:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild b/dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild
deleted file mode 100644
index bb02d14dd1e5..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.7.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-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 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.1:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.6:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
deleted file mode 100644
index 90466b09e0bc..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-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 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild
deleted file mode 100644
index 8428de08c804..000000000000
--- a/dev-haskell/lifted-async/lifted-async-0.9.1.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="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 ~x86"
-IUSE="+monad-control-1"
-
-RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?]
-	>=dev-haskell/lifted-base-0.2:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	monad-control-1? ( >=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.10:=[profile?]
-				>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] )
-	!monad-control-1? ( >=dev-haskell/monad-control-0:=[profile?] <dev-haskell/monad-control-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl
-		dev-haskell/tasty
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag monad-control-1 monad-control-1)
-}
diff --git a/dev-haskell/lifted-async/metadata.xml b/dev-haskell/lifted-async/metadata.xml
index 7fd3c230ac1d..159a65915cec 100644
--- a/dev-haskell/lifted-async/metadata.xml
+++ b/dev-haskell/lifted-async/metadata.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides IO operations from @async@ package lifted to any
-		instance of 'MonadBase' or 'MonadBaseControl'.
-	</longdescription>
-	<use>
-		<flag name="monad-control-1">Use moand-control == 1.*</flag>
-	</use>
 	<upstream>
+		<remote-id type="hackage">lifted-async</remote-id>
 		<remote-id type="github">maoe/lifted-async</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/lifted-base/Manifest b/dev-haskell/lifted-base/Manifest
index e5dc5daa02ac..4c2df65c31a3 100644
--- a/dev-haskell/lifted-base/Manifest
+++ b/dev-haskell/lifted-base/Manifest
@@ -1,3 +1 @@
-DIST lifted-base-0.2.3.10.tar.gz 11779 BLAKE2B 786abee9094b999472586b01025d3fb72149f1dff3cea2b495d3e6e95e4edf0a30bf6b688d76320e511d5f77079b74b1f2aeca767d58ec34e1f9af1cf1628d94 SHA512 f4251e0322b2802c6eebf7ee2f1d7b0bc8cb89464e710373ef66868c657bcdf9a5ca9a1c0f0b1c9d397c60fa25dbfe78e925820acdd2520633877dadea9c6370
 DIST lifted-base-0.2.3.12.tar.gz 11700 BLAKE2B 27fd9728c6523185390b13fa1a53578d7210f79a5cfd8a2f1461dbb83d57ea8f94180d3bd77bd34dfad7e78042084616228a618515f2c9f33c7f43fa717cd73c SHA512 8bdd69686cdcd8841304341282f9b32a7d1c095da276bfb877017f12400f0f62018fda47fb41f36b817a91093856d8a02f0b8c7b8fe397fd9a839f20e64b8a32
-DIST lifted-base-0.2.3.6.tar.gz 11613 BLAKE2B d013fd232fbb4afc1a335e775c14d5e7f258540643e14e221ac9a679c02fbc464b5ed511f8cb465416f144001e454481e0ebe262747cee857e7b15ff333315ef SHA512 7fee2208c9043cdeccbea87d0ad44bff82505c10f55a539220484fe09792cd61562a94c9f6fbc2c6f360dd25e8d39ed139972432dbdb748fc2e1f2d47be8a658
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
deleted file mode 100644
index 3e815b866a30..000000000000
--- a/dev-haskell/lifted-base/lifted-base-0.2.3.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="lifted IO operations from the base library"
-HOMEPAGE="https://github.com/basvandijk/lifted-base"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monad-control-0.3:=[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-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.5
-		>=dev-haskell/monad-control-1.0.0.3 <dev-haskell/monad-control-1.1
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6
-		>=dev-haskell/transformers-base-0.4.4 <dev-haskell/transformers-base-0.5
-		>=dev-haskell/transformers-compat-0.3 <dev-haskell/transformers-compat-0.6 )
-"
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
index 9bb5a3e8a30d..c0a90695c5bd 100644
--- a/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
+++ b/dev-haskell/lifted-base/lifted-base-0.2.3.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?]
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild
deleted file mode 100644
index f84be97e8c60..000000000000
--- a/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="lifted IO operations from the base library"
-HOMEPAGE="https://github.com/basvandijk/lifted-base"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monad-control-0.3:=[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-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2.2
-		>=dev-haskell/monad-control-1.0.0.3 <dev-haskell/monad-control-1.1
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/transformers-0.3
-		>=dev-haskell/transformers-base-0.4.4 <dev-haskell/transformers-base-0.5
-		>=dev-haskell/transformers-compat-0.3 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit                >= 1.2.2   && < 1.3' 'HUnit                >= 1.2.2' \
-		'transformers         >= 0.3     && < 0.5' 'transformers         >= 0.3' \
-		'transformers  >= 0.2 && < 0.5' 'transformers  >= 0.2' \
-		'transformers-compat  >= 0.3     && < 0.5' 'transformers-compat  >= 0.3'
-}
diff --git a/dev-haskell/lifted-base/metadata.xml b/dev-haskell/lifted-base/metadata.xml
index d358812e1f66..3f2ca2cc08a9 100644
--- a/dev-haskell/lifted-base/metadata.xml
+++ b/dev-haskell/lifted-base/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
deleted file mode 100644
index acbf95ba2137..000000000000
--- a/dev-haskell/linear/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST linear-1.20.5.tar.gz 44886 BLAKE2B 54b08c4c9997ebb60b4f46d9caeb9d8630a470cda04c8096428eafd6ecb3be1c3b052c59d4825d27199364f17b693feac64b4c6e0313fb4c37b889630703f9c3 SHA512 a45e38d5b25f53b809a67c17e0b532b96e9766d0e81d2da0265c93a9976cdbb183c60dce79eda17259d4169cc25884cc4831a24b93ccd43709df374ce5187600
-DIST linear-1.20.6.tar.gz 50036 BLAKE2B a81e762e43be22a8eb7f1ad0118275f8fadde206f60c1160eb40dabcd8674bb1217d73a4b67626e8392ddbd644cd4d88e55bb7038c17ceb4df5384053a175811 SHA512 40ca3f855664a86c9c70fbe398b2ceeceaefdc5c6d5d66c36c6fc60a8252c70fa0566d9eaef61b0559d0eab0d30cde207640d738a007dd5a0ee6cdc72c1c9690
-DIST linear-1.20.9.tar.gz 49250 BLAKE2B ae51a3d7c7570ffa2e43ba9c7170c53f010050ab83ffe5f99f6717c76c4b78e462919f3938a0b7db5f654d4a65241abe87dc167ac5dba78db0097d8a806ee33d SHA512 4b3fc0d1f0cfc79b67cb3c0fe823ca7f1f02b7b3deab98c32ec56b12f5764a6a18db9cbe2218e91b3efa5deea6675d4ddf166a1600a9aa8b7ad3f1da68cb6f52
diff --git a/dev-haskell/linear/linear-1.20.5.ebuild b/dev-haskell/linear/linear-1.20.5.ebuild
deleted file mode 100644
index 9547d301cf8d..000000000000
--- a/dev-haskell/linear/linear-1.20.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -herbie
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Linear Algebra"
-HOMEPAGE="https://github.com/ekmett/linear/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
-	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?]
-	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.8 <dev-haskell/doctest-0.12
-		>=dev-haskell/hunit-1.2.5
-		>=dev-haskell/simple-reflect-0.3.1
-		>=dev-haskell/test-framework-0.8
-		>=dev-haskell/test-framework-hunit-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-herbie \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/linear/linear-1.20.6.ebuild b/dev-haskell/linear/linear-1.20.6.ebuild
deleted file mode 100644
index 41b2310e2db0..000000000000
--- a/dev-haskell/linear/linear-1.20.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-#hackport: flags: -herbie
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Linear Algebra"
-HOMEPAGE="https://github.com/ekmett/linear/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
-	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/lens-4:=[profile?] <dev-haskell/lens-5:=[profile?]
-	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-3:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.12
-		>=dev-haskell/hunit-1.2.5
-		>=dev-haskell/simple-reflect-0.3.1
-		>=dev-haskell/test-framework-0.8
-		>=dev-haskell/test-framework-hunit-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-herbie \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/linear/linear-1.20.9.ebuild b/dev-haskell/linear/linear-1.20.9.ebuild
deleted file mode 100644
index ebf29418bf02..000000000000
--- a/dev-haskell/linear/linear-1.20.9.ebuild
+++ /dev/null
@@ -1,54 +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.9999
-#hackport: flags: -herbie
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Linear Algebra"
-HOMEPAGE="https://github.com/ekmett/linear/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
-	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?]
-	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
-	>=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
-		>=dev-haskell/hunit-1.2.5
-		>=dev-haskell/simple-reflect-0.3.1
-		>=dev-haskell/test-framework-0.8
-		>=dev-haskell/test-framework-hunit-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-herbie \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/linear/metadata.xml b/dev-haskell/linear/metadata.xml
deleted file mode 100644
index ac6c35143387..000000000000
--- a/dev-haskell/linear/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Types and combinators for linear algebra on free vector spaces
-	</longdescription>
-	<use>
-		<flag name="template-haskell">
-			You can disable the use of the
-			`template-haskell` package using `-f-template-haskell`. Disabling this is an
-			unsupported configuration, but it may be useful for accelerating builds in
-			sandboxes for expert users.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/linear</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/list/Manifest b/dev-haskell/list/Manifest
deleted file mode 100644
index db4f4f0fe03e..000000000000
--- a/dev-haskell/list/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST List-0.5.2.tar.gz 6242 BLAKE2B 9ddac7229416a94b7e91d3c959d641a01bb14edbf0787b971790cc1e016fa59b78313254c156e2ba5ac78c0646f2f356144c0b2b4b8043fa2d0c9cb57a0a4055 SHA512 6bdeb8f8484b84ffc15ac933b37083dc2c76dc617242322a02ff20cbdbe44fc7201539bf3dae4d7afdcf899e625fff074e9df33b630ba1626419b6b8564817b2
-DIST List-0.6.2.tar.gz 7128 BLAKE2B 8ca05ea3994555afd7b1466b104ed8dc5ea8e88fc5f2c994abe504033b5776976f0b68a7a7d2c752466f470e0a2580995e5ddc409c8a6368f2c5212b05839d15 SHA512 c4bde8c31831c8364e3da9db2aa6520de7dc01504ce8619afe012c3f27d3c7453610ad8b86450fe2b0be6276b09570aeb030094ce49e2d6e17e3259749ed4c4a
diff --git a/dev-haskell/list/list-0.5.2.ebuild b/dev-haskell/list/list-0.5.2.ebuild
deleted file mode 100644
index 55ae87cb7c56..000000000000
--- a/dev-haskell/list/list-0.5.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="List"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="List monad transformer and class"
-HOMEPAGE="https://github.com/yairchu/generator/tree"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/list/list-0.6.2.ebuild b/dev-haskell/list/list-0.6.2.ebuild
deleted file mode 100644
index 047f60c80eef..000000000000
--- a/dev-haskell/list/list-0.6.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="List"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="List monad transformer and class"
-HOMEPAGE="https://github.com/yairchu/generator"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/list/metadata.xml b/dev-haskell/list/metadata.xml
deleted file mode 100644
index 7b3a0f6d7bcf..000000000000
--- a/dev-haskell/list/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A List monad transformer and a List class.
-		With standard list operations for Lists
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yairchu/generator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/listlike/Manifest b/dev-haskell/listlike/Manifest
deleted file mode 100644
index 5a858c9a8899..000000000000
--- a/dev-haskell/listlike/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ListLike-4.2.1.tar.gz 26970 BLAKE2B bac409776f37ba43f1e1bfa06424ed823866735cbb7b05d30cb98a9620b05891d651e10fd0a1c2c10642ad6215e2de9554221ab3edc6060c7f7cef51b4561c67 SHA512 dc245b4c2bc4fa0ea24efe55434eb8c7b2f2ee1a078fef331997bb0311260732970255fc8a18c9a7f22d90f47f661e543d18e6ad60b8d46992a6e973ccd375ad
-DIST ListLike-4.5.1.tar.gz 29600 BLAKE2B bc6b54b91e95ea8340db305975ee3b5ab5239989db518930353fffb643d29a23d8634d2760cd39729389fe983b553a3a7816a939d583f9470cc56284150d1568 SHA512 4e59eb8cdade42ff63db9f90a7ec524dab674872960bd294da3195c280e0f488a3c0acb3827def8a071e5ecd820bb2bf0d5d68c22b8388adc933accbb0bcc630
-DIST ListLike-4.6.3.tar.gz 30538 BLAKE2B e43f67bd5838eca31b4169b36dc33f872c21396e01e15ccd61db26f5deefbcd7e9a1ff596b95425a92edc1740b51c7a8dbf728f4801298d848fa79419008b447 SHA512 9a5eac3543e62d33b433b809f119b0394d71dfee7f6442ab9e436144367e5745438d6806263a8e8658a28dafa11290d5ed50f2aa9cb5528e1762c23efe3cb705
diff --git a/dev-haskell/listlike/files/listlike-4.2.1-QC-2.8.2.patch b/dev-haskell/listlike/files/listlike-4.2.1-QC-2.8.2.patch
deleted file mode 100644
index 1615c29047e2..000000000000
--- a/dev-haskell/listlike/files/listlike-4.2.1-QC-2.8.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/testsrc/TestInfrastructure.hs b/testsrc/TestInfrastructure.hs
-index f4d574e..d427495 100644
---- a/testsrc/TestInfrastructure.hs
-+++ b/testsrc/TestInfrastructure.hs
-@@ -76,2 +76,3 @@ instance (CoArbitrary i) => CoArbitrary (FM.FMList i) where
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary i) => Arbitrary (S.Seq i) where
-@@ -85,2 +86,3 @@ instance (CoArbitrary i) => CoArbitrary (S.Seq i) where
-     coarbitrary l = coarbitrary (LL.toList l)
-+#endif
- 
diff --git a/dev-haskell/listlike/listlike-4.2.1.ebuild b/dev-haskell/listlike/listlike-4.2.1.ebuild
deleted file mode 100644
index 713e30c253d4..000000000000
--- a/dev-haskell/listlike/listlike-4.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ListLike"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generic support for list-like structures"
-HOMEPAGE="http://software.complete.org/listlike"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1 <dev-haskell/random-2 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
-}
diff --git a/dev-haskell/listlike/listlike-4.5.1.ebuild b/dev-haskell/listlike/listlike-4.5.1.ebuild
deleted file mode 100644
index 1714b16e774d..000000000000
--- a/dev-haskell/listlike/listlike-4.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ListLike"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generic support for list-like structures"
-HOMEPAGE="https://github.com/JohnLato/listlike"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1 <dev-haskell/random-2 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/listlike/listlike-4.6.3.ebuild b/dev-haskell/listlike/listlike-4.6.3.ebuild
deleted file mode 100644
index 9f80458f817d..000000000000
--- a/dev-haskell/listlike/listlike-4.6.3.ebuild
+++ /dev/null
@@ -1,38 +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 test-suite"
-inherit haskell-cabal
-
-MY_PN="ListLike"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Generic support for list-like structures"
-HOMEPAGE="https://github.com/ddssff/listlike"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.7:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/fmlist-0.8:=[profile?] <dev-haskell/fmlist-0.10:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.6.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1 <dev-haskell/random-2 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/listlike/metadata.xml b/dev-haskell/listlike/metadata.xml
deleted file mode 100644
index 4651de9eac1d..000000000000
--- a/dev-haskell/listlike/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generic support for list-like structures in Haskell.
-		
-		The ListLike module provides a common interface to the various Haskell
-		types that are list-like.  Predefined interfaces include standard
-		Haskell lists, Arrays, ByteStrings, and lazy ByteStrings.  Custom
-		types can easily be made ListLike instances as well.
-		
-		ListLike also provides for String-like types, such as String and
-		ByteString, for types that support input and output, and for types that can handle
-		infinite lists.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/logging-facade/Manifest b/dev-haskell/logging-facade/Manifest
index 8786c923ccdd..9fa0e29f1d88 100644
--- a/dev-haskell/logging-facade/Manifest
+++ b/dev-haskell/logging-facade/Manifest
@@ -1 +1 @@
-DIST logging-facade-0.0.0.tar.gz 3644 BLAKE2B cd199aa66f8b124f56ede02f1872f56f8f0613c969b1619f556077c9693f059bc37b10404e423d0be98c3768e0038d8c3383563929a1713af1866424a65ed5a1 SHA512 d666aa763a7e94a914e7542f1420f1f96a1923bd97532db5e114140d33cee5374de78bc73491b008985d4470cec61fba05bf16a2eb68198f917480e0fe1a680e
+DIST logging-facade-0.3.0.tar.gz 4016 BLAKE2B 71be7c7616a533f8c97b9da88cf76fe1f8814172a43b190861a53dc0fcfc3a1adf673c7166c2834f20af304b9334f75e2bb0902b5a381c619d67de08bfc2f920 SHA512 3a6fbd7b309f6094224f6af2b98408a2a49519f8c0ca1a26178fc6c0b593af2101769a4981bcf250dab2ed99144ec14b19263a755e8c71a5b01400651076228f
diff --git a/dev-haskell/logging-facade/logging-facade-0.0.0.ebuild b/dev-haskell/logging-facade/logging-facade-0.0.0.ebuild
deleted file mode 100644
index 937fb57dee46..000000000000
--- a/dev-haskell/logging-facade/logging-facade-0.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple logging abstraction that allows multiple backends"
-HOMEPAGE="https://hackage.haskell.org/package/logging-facade"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild b/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild
new file mode 100644
index 000000000000..32a64b07d9dc
--- /dev/null
+++ b/dev-haskell/logging-facade/logging-facade-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Simple logging abstraction that allows multiple back-ends"
+HOMEPAGE="https://github.com/sol/logging-facade#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/call-stack:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
+"
diff --git a/dev-haskell/logging-facade/metadata.xml b/dev-haskell/logging-facade/metadata.xml
index fe43f47ce5b9..b65d66b23236 100644
--- a/dev-haskell/logging-facade/metadata.xml
+++ b/dev-haskell/logging-facade/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Simple logging abstraction that allows multiple backends
-	</longdescription>
+	<upstream>
+		<remote-id type="github">sol/logging-facade</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/logict-state/Manifest b/dev-haskell/logict-state/Manifest
deleted file mode 100644
index d79bf330ba67..000000000000
--- a/dev-haskell/logict-state/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST logict-state-0.1.0.2.tar.gz 5669 BLAKE2B 4596ac415c48c14f7d1c74f6f8613756582405467779a1a185111861f3374842c02a56b6665311b6b6c0c7ce12d908682572dcaaf37a5c61e8f937d01996b5bc SHA512 b3e113c3f124ee6716a0532060e7ca9a5c4dcac2a4de565562f3aeff8884310bb84c2631c555c881e2cdf02ab73afb6323b1a5d33bc743eaece7e382c74298d6
-DIST logict-state-0.1.0.5.tar.gz 4525 BLAKE2B 9dbd41d4b1f1f9023082836a852bc3f2d273f920db6caa4383fc23c967e588dcb2e94b053a5c7a3fb3c28afbd714f7006583a65dd87c3eb3b535202caf2223fc SHA512 f641907213c23de22a779f1dd065aa3c02de5686dae0fac86403d958ba6d2cba23d86d6a43b8c78fff0963f7ed62837d704243eeac006163eb6fa2ab26fe9ad4
diff --git a/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild b/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild
deleted file mode 100644
index ca8bd82ad6e5..000000000000
--- a/dev-haskell/logict-state/logict-state-0.1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for logic programming based on haskell package logict"
-HOMEPAGE="https://github.com/atzedijkstra/logict-state"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/logict-0.6.0.2:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.4.2:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
diff --git a/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild b/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild
deleted file mode 100644
index 86cad39395b7..000000000000
--- a/dev-haskell/logict-state/logict-state-0.1.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for logic programming based on haskell package logict"
-HOMEPAGE="https://github.com/atzedijkstra/logict-state"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/logict-0.6.0.2:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
diff --git a/dev-haskell/logict-state/metadata.xml b/dev-haskell/logict-state/metadata.xml
deleted file mode 100644
index 8419c5504031..000000000000
--- a/dev-haskell/logict-state/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Logic programming built on top of part of logict library, in particular for dealing with backtrackable state
-	</longdescription>
-	<upstream>
-		<remote-id type="github">atzedijkstra/logict-state</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/logict/Manifest b/dev-haskell/logict/Manifest
index 6bd4a8ef6783..100ee4bab151 100644
--- a/dev-haskell/logict/Manifest
+++ b/dev-haskell/logict/Manifest
@@ -1,2 +1,2 @@
-DIST logict-0.6.0.2.tar.gz 5370 BLAKE2B c66d17f4595a27c83d9b2fddfb3c9e824d838ab353a8a71d6a78f436e20f529d7f408cf818b7034500bbfb5a14da7c6b8b2b067d36e4820898379f870922a3c7 SHA512 dfb72d006d9b7a5f0d7447d956ea0c3d083e200a616efc4b34fafa0582c2dc7e9369156cf4f51a472b97f7afb6167030edeb84e77c7bc410bfe58a44f0ac4fc4
-DIST logict-0.7.0.2.tar.gz 5892 BLAKE2B 13f521f69c2c3453d54ccfd87bb4ffde9dc7b222e8989757567bd91bb1c3e20c8fa85a37b078675bbc25c906acde1b4651381ac348180583f03b4214cc81afc1 SHA512 f7019533ed1ccd7e2c87b6f78aaece5d4062b378c75ff52ffb3d618a27e23ec1d8fdd823904fc94df017f682b49aef2b0549b91c7c45e395eb79ed2772c107b5
+DIST logict-0.7.0.3.tar.gz 5924 BLAKE2B 1d5fe5a78ff0448e70b68c063f3e1a4d632208e4b5bc35c51c17d12bf0ae5175db31b5c8854776ae41d7ca1fe450f8767a9f5db113c85e60ffc26bb949f1406e SHA512 0d845daffb841efea93b59e48ee86daeb0dbacbe4fc7fa417ff71d1dcda3a5551901f589097416441736007d256197932b83de76a2f630a5f7835909cd758e79
+DIST logict-0.8.1.0.tar.gz 18721 BLAKE2B 733be00e92c6ff47b302c444228335bfbbdbbace75c0076ed29b4f2c65730eafcebdecb5bfa6a20ceceaf4df2d1a0e807c9052b48d614a71c00bff08b1a7f319 SHA512 9202d53252b38f9cab39ca95f74a56e3f858cc05ff6ab27f827fcad9a484416ff743195f528636d18a11dccb1e8566314287e8265c98d856fe374f8748de2739
diff --git a/dev-haskell/logict/logict-0.6.0.2.ebuild b/dev-haskell/logict/logict-0.6.0.2.ebuild
deleted file mode 100644
index 6f613d9a92a6..000000000000
--- a/dev-haskell/logict/logict-0.6.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A backtracking logic-programming monad"
-HOMEPAGE="https://github.com/Bodigrim/logict"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-"
diff --git a/dev-haskell/logict/logict-0.7.0.2.ebuild b/dev-haskell/logict/logict-0.7.0.2.ebuild
deleted file mode 100644
index fda9f35cc82f..000000000000
--- a/dev-haskell/logict/logict-0.7.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A backtracking logic-programming monad"
-HOMEPAGE="https://github.com/Bodigrim/logict#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/logict/logict-0.7.0.3.ebuild b/dev-haskell/logict/logict-0.7.0.3.ebuild
new file mode 100644
index 000000000000..fb111886043b
--- /dev/null
+++ b/dev-haskell/logict/logict-0.7.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A backtracking logic-programming monad"
+HOMEPAGE="https://github.com/Bodigrim/logict#readme"
+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/fail:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/logict/logict-0.8.1.0.ebuild b/dev-haskell/logict/logict-0.8.1.0.ebuild
new file mode 100644
index 000000000000..b1a55d511be6
--- /dev/null
+++ b/dev-haskell/logict/logict-0.8.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A backtracking logic-programming monad"
+HOMEPAGE="https://github.com/Bodigrim/logict#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/async-2.0 <dev-haskell/async-2.3
+		<dev-haskell/tasty-1.5
+		<dev-haskell/tasty-hunit-0.11 )
+"
diff --git a/dev-haskell/logict/metadata.xml b/dev-haskell/logict/metadata.xml
index 7988c1d2a442..f00a63d92b3a 100644
--- a/dev-haskell/logict/metadata.xml
+++ b/dev-haskell/logict/metadata.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A continuation-based, backtracking, logic programming monad.
-		An adaptation of the two-continuation implementation found
-		in the paper "Backtracking, Interleaving, and Terminating
-		Monad Transformers" available here:
-		&lt;http://okmij.org/ftp/papers/LogicT.pdf&gt;
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">logict</remote-id>
 		<remote-id type="github">Bodigrim/logict</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/lpeg/Manifest b/dev-haskell/lpeg/Manifest
new file mode 100644
index 000000000000..e8375ee4a088
--- /dev/null
+++ b/dev-haskell/lpeg/Manifest
@@ -0,0 +1,2 @@
+DIST lpeg-1.0.3.tar.gz 40092 BLAKE2B fa7abf62be859a15b66aacefb8b170488a59a48cf8d209653bb274327af5ad145a047a0e654b37819045eb594389d405813dbe2c9956f91461bf29e4f3ad99d1 SHA512 636a983054576487af8663d627ea16b57894eca18c92a5994abcdeec11acaa1b5d7bb0da1eae0a1a175c75fad44c93a78c5a5e6e7ce25ddac67f5b376559fbdc
+DIST lpeg-1.0.4.tar.gz 40132 BLAKE2B 03b1edc225b21d09a69da62157564b504115428843dec4f49575f701f4153b12f5f35005bcb7b5738d299910fddbc58851963800f28bed5584ab73efdaa4fcea SHA512 683af7bc2b695a4058f757de7b45759bbaea790d893109256fb9ee13607f15e765e36aa7df7fff6215d93e4aee480b4e0097a52d261673603e7ae6f632d476c0
diff --git a/dev-haskell/lpeg/lpeg-1.0.3.ebuild b/dev-haskell/lpeg/lpeg-1.0.3.ebuild
new file mode 100644
index 000000000000..d7bf73d17e18
--- /dev/null
+++ b/dev-haskell/lpeg/lpeg-1.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="LPeg - Parsing Expression Grammars For Lua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="rely-on-shared-lpeg-library"
+
+RDEPEND=">=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag rely-on-shared-lpeg-library rely-on-shared-lpeg-library)
+}
diff --git a/dev-haskell/lpeg/lpeg-1.0.4.ebuild b/dev-haskell/lpeg/lpeg-1.0.4.ebuild
new file mode 100644
index 000000000000..1d47374670a2
--- /dev/null
+++ b/dev-haskell/lpeg/lpeg-1.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="LPeg – Parsing Expression Grammars For Lua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="rely-on-shared-lpeg-library"
+
+RDEPEND=">=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag rely-on-shared-lpeg-library rely-on-shared-lpeg-library)
+}
diff --git a/dev-haskell/lpeg/metadata.xml b/dev-haskell/lpeg/metadata.xml
new file mode 100644
index 000000000000..571add0e90e2
--- /dev/null
+++ b/dev-haskell/lpeg/metadata.xml
@@ -0,0 +1,18 @@
+<?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>
+	<use>
+		<flag name="rely-on-shared-lpeg-library">Do not build lpeg from source, but trust that lpeg is
+made available in other ways, e.g., through a
+system-wide installation. The loader will be replaced
+with a placeholder function that only emits a message.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">lpeg</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/lrucache/Manifest b/dev-haskell/lrucache/Manifest
deleted file mode 100644
index 0a5230e75708..000000000000
--- a/dev-haskell/lrucache/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lrucache-1.2.0.1.tar.gz 9224 BLAKE2B d29cfee3d21fcf66318f272011551a1a04e17ccac5ba58da0a80591502488ab7446a5b2137c57c91ded80b2486d95c28f5449c5417c88a99f2e121dd17841eea SHA512 fae5c8a10bb7ee781ed84ccf9c342bd583e112eb840d07aa72803affe3fa7dd394b3d6b73212e45005ec9155a409539902c4893ce20dc0a2a0e3f4a44b2c715b
diff --git a/dev-haskell/lrucache/lrucache-1.2.0.1.ebuild b/dev-haskell/lrucache/lrucache-1.2.0.1.ebuild
deleted file mode 100644
index 48b8f20f6e50..000000000000
--- a/dev-haskell/lrucache/lrucache-1.2.0.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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a simple, pure LRU cache"
-HOMEPAGE="https://github.com/chowells79/lrucache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/lrucache/metadata.xml b/dev-haskell/lrucache/metadata.xml
deleted file mode 100644
index 832a2c27f608..000000000000
--- a/dev-haskell/lrucache/metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains a simple, pure LRU cache, implemented in
-		terms of "Data.Map".
-		
-		It also contains a mutable IO wrapper providing atomic updates to
-		an LRU cache.
-		
-		Version History:
-		
-		1.1.1 - Add an additional modification function for AtomicLRUCache.
-		
-		1.1.0.1 - Update containers constraint to allow containers from ghc-7
-		
-		1.1 - Add a Functor instance for LRUCache.
-		Add a generic modification function for AtomicLRUCache.
-		
-		1.0 - Breaking API changes:
-		1) The newLRU smart constructor now makes the maximum
-		size optional.
-		2) The delete function now returns the value removed, if
-		one was.
-		Additionally, a function was added to remove the least-recently
-		used element in the LRU.
-		
-		0.3 - Added a Show instance for LRU. (Requested by Ben Lee)
-		
-		0.2.0.1 - Increase strictness slightly.
-		Remove cabal target for test executable.
-		(Just include test sources instead.)
-		
-		0.2 - Added an Eq instance for LRU.
-		Added strictness to eliminate space leaks in common use patterns.
-		
-		0.1.1 - Add the Data.Cache.LRU.IO.Internal module.
-		Clean up build warnings on GHC 6.12.1.
-		
-		0.1.0.1 - Minor refactoring
-		
-		0.1 - First release
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/lua-arbitrary/Manifest b/dev-haskell/lua-arbitrary/Manifest
new file mode 100644
index 000000000000..8e7dbd4add11
--- /dev/null
+++ b/dev-haskell/lua-arbitrary/Manifest
@@ -0,0 +1,2 @@
+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
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
new file mode 100644
index 000000000000..9dd27d589e9e
--- /dev/null
+++ b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Arbitrary instances for Lua types"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+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:=[profile?] <dev-haskell/quickcheck-3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
new file mode 100644
index 000000000000..0451a2963615
--- /dev/null
+++ b/dev-haskell/lua-arbitrary/lua-arbitrary-1.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 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="Arbitrary instances for Lua types"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+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:=[profile?] <dev-haskell/quickcheck-3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/lua-arbitrary/metadata.xml b/dev-haskell/lua-arbitrary/metadata.xml
new file mode 100644
index 000000000000..a36ef1983206
--- /dev/null
+++ b/dev-haskell/lua-arbitrary/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">lua-arbitrary</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/lua/Manifest b/dev-haskell/lua/Manifest
new file mode 100644
index 000000000000..93981a094680
--- /dev/null
+++ b/dev-haskell/lua/Manifest
@@ -0,0 +1,2 @@
+DIST lua-2.2.0.tar.gz 260005 BLAKE2B ec79108a72a6060fc82b94aac1e61c51aea0d570bac37add749654d903fec5b62c5caa82932606e9778431c80c68fceb11b5eba9d6c45c183a8f249934d26c55 SHA512 d19f54c9424773557f7ef7929be84dfcb7624d8a617d3383a771fe1ba7d6d5cd724c8fcd40475cde443e02e0cf3164a8869c0d67c90cf04b3b09ef6d876aa727
+DIST lua-2.3.1.tar.gz 262809 BLAKE2B f12e2566008e713e89a87b02edd216bda1f8e9865faf1dcee2e4909b4759990836c3fa4a78d5864812a975ba46f8a6266b45568dc9abd4f752cd765407bcc69f SHA512 3fd5c4d55fdb7480ffc629e7dfd9fb31b7376ca4245e9db098fce7dc4dbdf1a576f521f55902bdf484ad9b4bbfab4a565de4e1528a1cb4296682508ccb977686
diff --git a/dev-haskell/lua/lua-2.2.0.ebuild b/dev-haskell/lua/lua-2.2.0.ebuild
new file mode 100644
index 000000000000..df40677a9ebe
--- /dev/null
+++ b/dev-haskell/lua/lua-2.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua_32bits,pkg-config:system-lua
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="system-lua"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+	system-lua? ( dev-lang/lua:5.4 )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9 )
+	system-lua? ( virtual/pkgconfig )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-allow-unsafe-gc \
+		--flag=-apicheck \
+		--flag=-export-dynamic \
+		--flag=-lua_32bits \
+		$(cabal_flag system-lua pkg-config)
+}
diff --git a/dev-haskell/lua/lua-2.3.1.ebuild b/dev-haskell/lua/lua-2.3.1.ebuild
new file mode 100644
index 000000000000..d79cf4d78381
--- /dev/null
+++ b/dev-haskell/lua/lua-2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua_32bits,pkg-config:system-lua
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lua, an embeddable scripting language"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="system-lua"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+	system-lua? ( dev-lang/lua:5.4 )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9 )
+"
+BDEPEND="system-lua? ( virtual/pkgconfig )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-allow-unsafe-gc \
+		--flag=-apicheck \
+		--flag=-export-dynamic \
+		--flag=-lua_32bits \
+		$(cabal_flag system-lua pkg-config)
+}
diff --git a/dev-haskell/lua/metadata.xml b/dev-haskell/lua/metadata.xml
new file mode 100644
index 000000000000..e48f482bf8de
--- /dev/null
+++ b/dev-haskell/lua/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<use>
+		<flag name="system-lua">Use @pkg-config@ to discover library and include paths.
+Setting this flag implies `pkg-config`.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-haskell/lukko/Manifest b/dev-haskell/lukko/Manifest
index 4bd93cb9427f..7ae64b144fc0 100644
--- a/dev-haskell/lukko/Manifest
+++ b/dev-haskell/lukko/Manifest
@@ -1 +1,2 @@
-DIST lukko-0.1.1.2.tar.gz 28366 BLAKE2B 8e7a0257c187ed76f2399a2ca381210ad44d683faff74ca583658eab13545e6809fe6ea57b4c4c22c16560272c0d53736183437e4f5ad64919d98dbac239a864 SHA512 fe3a6687b741491ebaeace29c8d4d01307fad43f0e649c087fef24ec227eb231541fa1500e1685c814eb2a1ea472546033e837ce84fa64df79f00b19f8abebb6
+DIST lukko-0.1.1.3-rev4.cabal 4584 BLAKE2B f940efd241489c7a078f0c13edf2cd1cce1a6e99109cd423fedefd94ffe73a3a83b021b49c54a760e554f9c6f254261ed16f533feb262543acc5f40a8eba72b8 SHA512 5cde0f7dc7037037a42b73675e1d0c597f77190b5878f6246bc8c71f57fca6de8bb4fb87297fd6dfd145109354341bac55d822ee6c399edbd968f81be2b26a7b
+DIST lukko-0.1.1.3.tar.gz 28575 BLAKE2B 9f0006d05ba1db03de6fda88265e8949797201124f71ca6690113431f398eb59f19ec67363eb6b2834cac136e985b84882d45dfeb71c67e1147dd000c06cd243 SHA512 8bed8b88a101883f642bb9d9d41512436f5c80db5ea1ad0cddb069c6d09257d21b56a60e0f70b57453e91126065fbfdeeb721064763e64de1975dcb51b1a484a
diff --git a/dev-haskell/lukko/lukko-0.1.1.2.ebuild b/dev-haskell/lukko/lukko-0.1.1.2.ebuild
deleted file mode 100644
index dc9393ce2aea..000000000000
--- a/dev-haskell/lukko/lukko-0.1.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="File locking"
-HOMEPAGE="http://hackage.haskell.org/package/lukko"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ofd-locking"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-	test? ( >=dev-haskell/async-2.2.2 <dev-haskell/async-2.3
-		>=dev-haskell/singleton-bool-0.1.5 <dev-haskell/singleton-bool-0.2
-		>=dev-haskell/tagged-0.8.5 <dev-haskell/tagged-0.9
-		>=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-expected-failure-0.11.1.2 <dev-haskell/tasty-expected-failure-0.12
-		>=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag ofd-locking ofd-locking)
-}
diff --git a/dev-haskell/lukko/lukko-0.1.1.3-r1.ebuild b/dev-haskell/lukko/lukko-0.1.1.3-r1.ebuild
new file mode 100644
index 000000000000..b89bdca78478
--- /dev/null
+++ b/dev-haskell/lukko/lukko-0.1.1.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +ofd-locking
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="File locking"
+HOMEPAGE="https://hackage.haskell.org/package/lukko"
+
+LICENSE="GPL-2 BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/async-2.2.2 <dev-haskell/async-2.3
+		>=dev-haskell/singleton-bool-0.1.5 <dev-haskell/singleton-bool-0.2
+		>=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4
+		|| (
+			( >=dev-haskell/tasty-expected-failure-0.11.1.2 <dev-haskell/tasty-expected-failure-0.12 )
+			( >=dev-haskell/tasty-expected-failure-0.12.2 <dev-haskell/tasty-expected-failure-0.13 )
+		)
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=ofd-locking
+}
diff --git a/dev-haskell/lukko/metadata.xml b/dev-haskell/lukko/metadata.xml
index a2f47beee925..a6129181f6be 100644
--- a/dev-haskell/lukko/metadata.xml
+++ b/dev-haskell/lukko/metadata.xml
@@ -1,47 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="ofd-locking">Enable open file descriptor locking. Available on Linux (kernel 3.15, released Jun 8, 2014).</flag>
-	</use>
-	<longdescription>
-		This package provides access to platform dependent file locking APIs:
-		
-		* Open file descriptor locking on Linux (&quot;Lukko.OFD&quot;)
-		* @flock@ locking on unix platforms (&quot;Lukko.FLock&quot;)
-		* Windows locking @LockFileEx@ (&quot;Lukko.Windows&quot;)
-		* No-op locking, which throws exceptions (&quot;Lukko.NoOp&quot;)
-		* &quot;Lukko&quot; module exports the best option for the target platform with uniform API.
-		
-		There are alternative file locking packages:
-		
-		* &quot;GHC.IO.Handle.Lock&quot; in @base &gt;= 4.10@ is good enough for most use cases.
-		However, uses only &#39;Handle&#39;s so these locks cannot be used for intra-process locking.
-		(You should use e.g. &#39;MVar&#39; in addition).
-		
-		* &lt;https://hackage.haskell.org/package/filelock filelock&gt; doesn&#39;t support OFD locking.
-		
-		/Lukko/ means lock in Finnish.
-		
-		Submodules &quot;Lukko.OFD&quot;, &quot;Lukko.Windows&quot; etc are available based on following conditions.
-		
-		@
-		if os(windows)
-		\  cpp-options: -DHAS_WINDOWS_LOCK
-		
-		elif (os(linux) &amp;&amp; flag(ofd-locking))
-		\  cpp-options: -DHAS_OFD_LOCKING
-		\  cpp-options: -DHAS_FLOCK
-		
-		elif !(os(solaris) || os(aix))
-		\  cpp-options: -DHAS_FLOCK
-		@
-		
-		&quot;Lukko.FLock&quot; is available on not (Windows or Solaris or AIX).
-		&quot;Lukko.NoOp&quot; is always available.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">lukko</remote-id>
+		<remote-id type="github">haskellari/lukko</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/lvmlib/Manifest b/dev-haskell/lvmlib/Manifest
deleted file mode 100644
index 0c3fc2b3db0f..000000000000
--- a/dev-haskell/lvmlib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lvmlib-1.1.tar.gz 62388 BLAKE2B 9effe8b0b71ef36b3f73e792a9702d44efa5a7ed9f48f35825d75706a7dad2d5f5cac06d5941f60730c79216af5f3009110919dfa397343287e7359e702c5fbc SHA512 3f085f3ff8e53ab19de3b425c4c5a271111afcd334ec08fefd983838608ae436005c20c2d7c545650f0dd1b76d466f81661a14c8ce972df27d79a78c22023861
diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch
deleted file mode 100644
index ad68d78f56e7..000000000000
--- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/Lvm/Asm/Data.hs b/Lvm/Asm/Data.hs
-index 7939754..f3da0b7 100644
---- a/Lvm/Asm/Data.hs
-+++ b/Lvm/Asm/Data.hs
-@@ -17,2 +17,3 @@ import Lvm.Core.Module
- import Text.PrettyPrint.Leijen
-+import Prelude hiding ((<$>))
- 
-diff --git a/Lvm/Common/IdMap.hs b/Lvm/Common/IdMap.hs
-index a50bcb6..10758e6 100644
---- a/Lvm/Common/IdMap.hs
-+++ b/Lvm/Common/IdMap.hs
-@@ -24,2 +24,3 @@ import Lvm.Common.Id
- import Control.Arrow (first)
-+import Prelude hiding (foldMap)
- 
-diff --git a/Lvm/Core/Expr.hs b/Lvm/Core/Expr.hs
-index 8bc50d7..935e16a 100644
---- a/Lvm/Core/Expr.hs
-+++ b/Lvm/Core/Expr.hs
-@@ -17,2 +17,3 @@ import Lvm.Core.PrettyId
- import Text.PrettyPrint.Leijen
-+import Prelude hiding ((<$>))
- 
-diff --git a/Lvm/Core/Module.hs b/Lvm/Core/Module.hs
-index 923870e..ac52201 100644
---- a/Lvm/Core/Module.hs
-+++ b/Lvm/Core/Module.hs
-@@ -24,2 +24,3 @@ import Lvm.Instr.Data
- import Text.PrettyPrint.Leijen
-+import Prelude hiding ((<$>))
- 
-diff --git a/Lvm/Instr/Data.hs b/Lvm/Instr/Data.hs
-index 497a690..959cb5c 100644
---- a/Lvm/Instr/Data.hs
-+++ b/Lvm/Instr/Data.hs
-@@ -19,2 +19,3 @@ import Lvm.Common.Id
- import Text.PrettyPrint.Leijen
-+import Prelude hiding ((<$>))
- 
-diff --git a/Lvm/Instr/Resolve.hs b/Lvm/Instr/Resolve.hs
-index 6845f74..4172a74 100644
---- a/Lvm/Instr/Resolve.hs
-+++ b/Lvm/Instr/Resolve.hs
-@@ -10,2 +10,4 @@ module Lvm.Instr.Resolve (instrResolve) where
- import Control.Exception (assert)
-+import Control.Applicative
-+import Control.Monad
- import Data.Maybe
-@@ -32,2 +34,6 @@ instance Functor Resolve where
- 
-+instance Applicative Resolve where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Resolve where
-diff --git a/Lvm/Read.hs b/Lvm/Read.hs
-index 7137331..25797f9 100644
---- a/Lvm/Read.hs
-+++ b/Lvm/Read.hs
-@@ -9,2 +9,3 @@ module Lvm.Read (lvmReadFile, lvmRead) where
- 
-+import Control.Applicative
- import Control.Monad
-@@ -390,2 +391,7 @@ instance Functor (Read v) where
-                                         Result x st2 -> Result (f x) st2)
-+
-+instance Applicative (Read v) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad (Read v) where
-diff --git a/Lvm/Write.hs b/Lvm/Write.hs
-index 48570f8..37469bc 100644
---- a/Lvm/Write.hs
-+++ b/Lvm/Write.hs
-@@ -11,2 +11,3 @@ import qualified Control.Exception as CE (assert, catch, IOException)
- import Control.Monad
-+import Control.Applicative
- import Data.Maybe
-@@ -465,2 +466,6 @@ instance Functor Emit where
- 
-+instance Applicative Emit where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Emit where
diff --git a/dev-haskell/lvmlib/lvmlib-1.1.ebuild b/dev-haskell/lvmlib/lvmlib-1.1.ebuild
deleted file mode 100644
index 9512fb153ec8..000000000000
--- a/dev-haskell/lvmlib/lvmlib-1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="The Lazy Virtual Machine (LVM)"
-HOMEPAGE="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	dev-haskell/wl-pprint:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.1.0
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch
-}
diff --git a/dev-haskell/lvmlib/metadata.xml b/dev-haskell/lvmlib/metadata.xml
deleted file mode 100644
index 2d49cd8f1b3c..000000000000
--- a/dev-haskell/lvmlib/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Lazy Virtual Machine (LVM) defines a portable instruction set and file
-		format. It is specifically designed to execute languages with non-strict (or
-		lazy) semantics. This cabal package defines the core assembler (coreasm) for
-		compiling core programs into LVM instructions and a library. The LVM is used
-		as a backend for the Helium compiler. At the moment, one LVM runtime
-		implementation is available (written in C). More information about LVM can be
-		found in Chapter 6 of Daan Leijen's PhD Thesis, The Lambda Abroad.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/maccatcher/Manifest b/dev-haskell/maccatcher/Manifest
deleted file mode 100644
index 89d50514aca9..000000000000
--- a/dev-haskell/maccatcher/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST maccatcher-2.1.5.tar.gz 4947 BLAKE2B 96a1a7a888e0340c3a69aae24aea102bc5cd361db6e35b2c5ee47902caa82c3910955739fe71c1dcfdea9e4c23b69f93238001a5c8a3a4fe1446fc93718c638a SHA512 a74c5c2e45168ded3319696e59f3f0ba6a5aec4a5316e02b4b1f8d012d8122faf564a059ef1f249d5a6e5f01f922d8e7fe05844b808e3b7673490494ed84adf4
diff --git a/dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild b/dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild
deleted file mode 100644
index cdf0c578dd60..000000000000
--- a/dev-haskell/maccatcher/maccatcher-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +split-base,+cli
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Obtain the host MAC address on *NIX and Windows"
-HOMEPAGE="https://hackage.haskell.org/package/maccatcher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=cli \
-		--flag=split-base
-}
diff --git a/dev-haskell/maccatcher/metadata.xml b/dev-haskell/maccatcher/metadata.xml
deleted file mode 100644
index 4f663119bdca..000000000000
--- a/dev-haskell/maccatcher/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Obtain the host MAC address on *NIX and Windows.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/magic/magic-1.1.ebuild b/dev-haskell/magic/magic-1.1.ebuild
index 24aa55d96711..5e7a36997fa1 100644
--- a/dev-haskell/magic/magic-1.1.ebuild
+++ b/dev-haskell/magic/magic-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.4
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,12 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
 	sys-apps/file
 "
 DEPEND="${RDEPEND}
-	dev-haskell/cabal
+	>=dev-haskell/cabal-1.0
 "
diff --git a/dev-haskell/magic/metadata.xml b/dev-haskell/magic/metadata.xml
index 32e691a5478a..937381521944 100644
--- a/dev-haskell/magic/metadata.xml
+++ b/dev-haskell/magic/metadata.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a Haskell interface to the C libmagic library.
-		With it, you can determine the type of a file by examining its contents
-		rather than its name.  The Haskell interface provides a full-featured
-		binding.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/markdown-unlit/Manifest b/dev-haskell/markdown-unlit/Manifest
index d62dc7357d57..422e7476ad38 100644
--- a/dev-haskell/markdown-unlit/Manifest
+++ b/dev-haskell/markdown-unlit/Manifest
@@ -1 +1,2 @@
-DIST markdown-unlit-0.2.0.1.tar.gz 2950 BLAKE2B 34d7dd34126c2a4e05b9c1b117e45dcc70fd3e4cd43640fdefdf036f865e39e927f11fa3f7b73a9b1b1c6b10cdaaf47aa9abe6f7ddac2ad99495479a39e1efeb SHA512 72098e14fd7c8abceb2001d0b180384b7e1e1ad180d41417841bef6c327a242cf1eec060e23137f46f766c4b15366c212f1dde9500647e504ebf6246f0e89072
+DIST markdown-unlit-0.5.0.tar.gz 4681 BLAKE2B cde0d867185c714e0c5d3c76e0baed4b1f7df4f0b85170e3d69476149caa5dd06f7de181e750eee357543ebc2d8e4178d711bee903bd41a5085c75057c9374c8 SHA512 580b4e4a4fcccf845c3e618b2ebc425dd8dba024c1c8bbae8db00a3e4b768353fe6738195dad80ae2afb1a46fcfad46cbed6d98bea1017ef098366fa7a2633ea
+DIST markdown-unlit-0.6.0.tar.gz 5201 BLAKE2B fe5e50cd6df156b1db92859099681f2c6796cc2557144b771819ca215cc171dc5f6dd4d11a15fe24da9ac18e92e925b5e2199e6b85b7d789e4167812028e1c0f SHA512 a1d7179ee82635c5fc07a39fd47b8ec288b260844ac3a90038ea97c7a22c170f2e9db0c72ad538242cbe1ae23b75fd27319650142d0f5bf47793954c3b45639a
diff --git a/dev-haskell/markdown-unlit/files/markdown-unlit-0.5.1-add-executable-flag.patch b/dev-haskell/markdown-unlit/files/markdown-unlit-0.5.1-add-executable-flag.patch
new file mode 100644
index 000000000000..3a40c845652e
--- /dev/null
+++ b/dev-haskell/markdown-unlit/files/markdown-unlit-0.5.1-add-executable-flag.patch
@@ -0,0 +1,23 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+Add new USE flag: executable
+This toggles building the executable. Since this seems to be the primary
+purpose of the package, it is enabled by default.
+
+--- markdown-unlit-0.5.1/markdown-unlit.cabal.bak	2021-08-28 01:55:59.160717350 -0600
++++ markdown-unlit-0.5.1/markdown-unlit.cabal	2021-08-28 01:58:49.820717433 -0600
+@@ -35,7 +35,13 @@
+       Paths_markdown_unlit
+   default-language: Haskell2010
+ 
++flag executable
++  description: Build executable
++  default: True
++
+ executable markdown-unlit
++  if !flag(executable)
++      buildable: False
+   main-is: Main.hs
+   other-modules:
+       Paths_markdown_unlit
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
deleted file mode 100644
index d55f2fc6b1fb..000000000000
--- a/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Literate Haskell support for Markdown"
-HOMEPAGE="https://hackage.haskell.org/package/markdown-unlit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-			dev-haskell/silently
-			dev-haskell/stringbuilder
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
new file mode 100644
index 000000000000..be0a1fa55749
--- /dev/null
+++ b/dev-haskell/markdown-unlit/markdown-unlit-0.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Literate Haskell support for Markdown"
+HOMEPAGE="https://github.com/sol/markdown-unlit#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/base-compat:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		dev-haskell/quickcheck
+		dev-haskell/silently
+		dev-haskell/stringbuilder
+		dev-haskell/temporary )
+"
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.6.0.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.6.0.ebuild
new file mode 100644
index 000000000000..f26205873cf5
--- /dev/null
+++ b/dev-haskell/markdown-unlit/markdown-unlit-0.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Literate Haskell support for Markdown"
+HOMEPAGE="https://github.com/sol/markdown-unlit#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+executable"
+
+RDEPEND="
+	dev-haskell/base-compat:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		=dev-haskell/hspec-2*
+		dev-haskell/quickcheck
+		dev-haskell/silently
+		dev-haskell/stringbuilder
+		dev-haskell/temporary
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.1-add-executable-flag.patch" )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/markdown-unlit/metadata.xml b/dev-haskell/markdown-unlit/metadata.xml
index 117a1485cfc3..ff003871f22c 100644
--- a/dev-haskell/markdown-unlit/metadata.xml
+++ b/dev-haskell/markdown-unlit/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Documentation is here: &lt;https://github.com/sol/markdown-unlit#readme&gt;
-	</longdescription>
+	<use>
+		<flag name="executable">Build executable</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">markdown-unlit</remote-id>
+		<remote-id type="github">sol/markdown-unlit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/math-functions/Manifest b/dev-haskell/math-functions/Manifest
index c11322ef8dd6..17ed2533d34e 100644
--- a/dev-haskell/math-functions/Manifest
+++ b/dev-haskell/math-functions/Manifest
@@ -1,2 +1,2 @@
-DIST math-functions-0.1.5.2.tar.gz 28490 BLAKE2B 70dbe8673442e0103311f913d486acd0953823d852b33c1dbbd2e3072c61e19c75366d48fd29346e33895cc038cf6deb7f995db927c41cee1e9c0cde9b8f7d80 SHA512 7723400ef7eaf3996babc4cacc1b02b7ee46837b8c4105abf0aa69f896e97ce3fc9fae6e527a0513688d66810a05ce2f5bef527d04b54bedd82c16fe2bbe342b
-DIST math-functions-0.1.6.0.tar.gz 30734 BLAKE2B 445bbfefa7e4a67922ad0fcdac65b1458115285ac5d7c38a0ea6f32ab3658a9720cce164bbb6473a608e7466e67dc9743e719b24c2b5f3e5755af9c3ba105f85 SHA512 b1f0df7b7b99bb41e6ca232bfabd0f0db07b98be1bb3d9c64235b283efd3a5441f02829e637e71cccf70917413e7145afd0dc23686732d4797ab7351c3d3e060
+DIST math-functions-0.3.3.0.tar.gz 424169 BLAKE2B 8b53c657fb5eba8d3ab54d5ba29f7d316e8c2f4803d0587a1071fd9b6c0cf0d8a17c4dadc903280faf028622207ab84db5fb628c8826af0e615524ef45b625c5 SHA512 f6ac6f9fb604207c11d7888fa375a52b544732dd8e811c3b9bf74237bbc0dc83839eb83c11c5ef0dd88666cff4919d4e06236e14d84da7065b4dc75717ceafad
+DIST math-functions-0.3.4.2.tar.gz 429223 BLAKE2B 63d305c524c6ab40c415828375a8c2491911693fdf7a1462b9e4d9055a26e1570fb4e80eee8dd617852c96dfc802b6e6a8e2d7bc822d9bf62c00241e5cf43dd7 SHA512 cb29901294463edbba37e97445bb9ed039bdc43815c9bbd9b9bb92b87393e6e891f5840d337c6c06c7e30d26107d32a59c39ac51436be43dba00d0e2411a9053
diff --git a/dev-haskell/math-functions/files/math-functions-0.3.4.2-fix-test-suite.patch b/dev-haskell/math-functions/files/math-functions-0.3.4.2-fix-test-suite.patch
new file mode 100644
index 000000000000..5dd2d9c622f7
--- /dev/null
+++ b/dev-haskell/math-functions/files/math-functions-0.3.4.2-fix-test-suite.patch
@@ -0,0 +1,118 @@
+From 7e5deed1cb3fafdd6eb035b3713ae2f46b67014a Mon Sep 17 00:00:00 2001
+From: Alexey Khudyakov <alexey.skladnoy@gmail.com>
+Date: Thu, 8 Jun 2023 13:26:11 +0300
+Bug: https://github.com/haskell/math-functions/pull/75
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Subject: [PATCH] Fix test suite
+
+QC as of 2.14.3. became much better at generating test cases and started
+reliably failing Kahan summation
+
+This was fixed by tweaking badvec to be just very bad. Not outrageously
+bad.
+---
+ tests/Tests/Sum.hs | 72 +++++++++++++++++++++++++++-------------------
+ 1 file changed, 43 insertions(+), 29 deletions(-)
+
+diff --git a/tests/Tests/Sum.hs b/tests/Tests/Sum.hs
+index 08eaf1e..1fcb2e9 100644
+--- a/tests/Tests/Sum.hs
++++ b/tests/Tests/Sum.hs
+@@ -4,54 +4,68 @@ module Tests.Sum (tests) where
+ 
+ import Control.Applicative ((<$>))
+ import Numeric.Sum as Sum
++import Numeric.MathFunctions.Comparison
+ import Prelude hiding (sum)
+ import Test.Tasty (TestTree, testGroup)
+-import Test.Tasty.QuickCheck (testProperty)
++import Test.Tasty.QuickCheck
+ import Test.QuickCheck (Arbitrary(..))
+ import qualified Prelude
+ 
+-t_sum :: ([Double] -> Double) -> [Double] -> Bool
+-t_sum f xs = f xs == trueSum xs
+-
+-t_sum_error :: ([Double] -> Double) -> [Double] -> Bool
+-t_sum_error f xs = abs (ts - f xs) <= abs (ts - Prelude.sum xs)
+-  where ts = trueSum xs
+-
+-t_sum_shifted :: ([Double] -> Double) -> [Double] -> Bool
++-- Test that summation result is same as exact sum. That should pass
++-- if we're effectively working with quad precision
++t_sum :: ([Double] -> Double) -> [Double] -> Property
++t_sum f xs
++  = counterexample ("APPROX = " ++ show approx)
++  $ counterexample ("EXACT  = " ++ show exact)
++  $ counterexample ("DELTA  = " ++ show (approx - exact))
++  $ counterexample ("ULPS   = " ++ show (ulpDistance approx exact))
++  $ approx == exact
++  where
++    approx = f xs
++    exact  = trueSum xs
++
++-- Test that summation has smaller error than naive summation or no
++-- worse than given number of ulps. If we're close enough to exact
++-- answer naive may get ahead
++t_sum_error :: ([Double] -> Double) -> [Double] -> Property
++t_sum_error f xs
++  = counterexample ("APPROX  = " ++ show approx)
++  $ counterexample ("NAIVE   = " ++ show naive)
++  $ counterexample ("EXACT   = " ++ show exact)
++  $ counterexample ("A-EXACT = " ++ show (approx - exact))
++  $ counterexample ("N-EXACT = " ++ show (naive  - exact))
++  $ counterexample ("ULPS[A] = " ++ show (ulpDistance approx exact))
++  $ counterexample ("ULPS[N] = " ++ show (ulpDistance naive  exact))
++  $ abs (exact - approx) <= abs (exact - naive)
++  where
++    naive  = Prelude.sum xs
++    approx = f xs
++    exact  = trueSum xs
++
++t_sum_shifted :: ([Double] -> Double) -> [Double] -> Property
+ t_sum_shifted f = t_sum_error f . zipWith (+) badvec
+ 
+ trueSum :: (Fractional b, Real a) => [a] -> b
+ trueSum xs = fromRational . Prelude.sum . map toRational $ xs
+ 
+ badvec :: [Double]
+-badvec = cycle [1,1e16,-1e16]
++badvec = cycle [1, 1e14, -1e14]
+ 
+ tests :: TestTree
+-tests = testGroup "Summation" [
+-    testGroup "ID" [
+-      -- plain summation loses precision quickly
+-      -- testProperty "t_sum" $ t_sum (sum id)
+-
+-      -- tautological tests:
+-      -- testProperty "t_sum_error" $ t_sum_error (sum id)
+-      -- testProperty "t_sum_shifted" $ t_sum_shifted (sum id)
+-    ]
+-  , testGroup "Kahan" [
+-      -- tests that cannot pass:
+-      -- testProprty "t_sum" $ t_sum (sum kahan)
+-      -- testProperty "t_sum_error" $ t_sum_error (sum kahan)
+-
+-      -- kahan summation only beats normal summation with large values
++tests = testGroup "Summation"
++  [ testGroup "Kahan" [
++      -- Kahan summation only beats naive summation when truly
++      -- catastrophic cancellation occurs
+       testProperty "t_sum_shifted" $ t_sum_shifted (sum kahan)
+     ]
+   , testGroup "KBN" [
+-      testProperty "t_sum" $ t_sum (sum kbn)
+-    , testProperty "t_sum_error" $ t_sum_error (sum kbn)
++      testProperty "t_sum"         $ t_sum         (sum kbn)
++    , testProperty "t_sum_error"   $ t_sum_error   (sum kbn)
+     , testProperty "t_sum_shifted" $ t_sum_shifted (sum kbn)
+     ]
+   , testGroup "KB2" [
+-      testProperty "t_sum" $ t_sum (sum kb2)
+-    , testProperty "t_sum_error" $ t_sum_error (sum kb2)
++      testProperty "t_sum"         $ t_sum         (sum kb2)
++    , testProperty "t_sum_error"   $ t_sum_error   (sum kb2)
+     , testProperty "t_sum_shifted" $ t_sum_shifted (sum kb2)
+     ]
+   ]
diff --git a/dev-haskell/math-functions/math-functions-0.1.5.2.ebuild b/dev-haskell/math-functions/math-functions-0.1.5.2.ebuild
deleted file mode 100644
index e431b3631a4b..000000000000
--- a/dev-haskell/math-functions/math-functions-0.1.5.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Special functions and Chebyshev polynomials"
-HOMEPAGE="https://github.com/bos/math-functions"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/erf-2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	dev-haskell/vector-th-unbox:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.4
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/math-functions/math-functions-0.1.6.0.ebuild b/dev-haskell/math-functions/math-functions-0.1.6.0.ebuild
deleted file mode 100644
index fda82a77fdcb..000000000000
--- a/dev-haskell/math-functions/math-functions-0.1.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Special functions and Chebyshev polynomials"
-HOMEPAGE="https://github.com/bos/math-functions"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/erf-2:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	dev-haskell/vector-th-unbox:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.4
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild b/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild
new file mode 100644
index 000000000000..26a5949bcd1c
--- /dev/null
+++ b/dev-haskell/math-functions/math-functions-0.3.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +system-erf,+system-expm1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Special functions and Chebyshev polynomials"
+HOMEPAGE="https://github.com/haskell/math-functions"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
+	>=dev-haskell/vector-th-unbox-0.2.1.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/erf
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/tasty-1.2
+		>=dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.10 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=system-erf \
+		--flag=system-expm1
+}
diff --git a/dev-haskell/math-functions/math-functions-0.3.4.2.ebuild b/dev-haskell/math-functions/math-functions-0.3.4.2.ebuild
new file mode 100644
index 000000000000..cb3dfe1b5008
--- /dev/null
+++ b/dev-haskell/math-functions/math-functions-0.3.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +system-erf,+system-expm1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Collection of tools for numeric computations"
+HOMEPAGE="https://github.com/bos/math-functions"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.4.2-fix-test-suite.patch"
+)
+
+RDEPEND=">=dev-haskell/data-default-class-0.1.2.0:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/erf
+		>=dev-haskell/quickcheck-2.7
+		>=dev-haskell/tasty-1.2
+		>=dev-haskell/tasty-hunit-0.10
+		>=dev-haskell/tasty-quickcheck-0.10
+		dev-haskell/vector-th-unbox )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=system-erf \
+		--flag=system-expm1
+}
diff --git a/dev-haskell/math-functions/metadata.xml b/dev-haskell/math-functions/metadata.xml
index 4aec12451c4d..6e48d98c7be5 100644
--- a/dev-haskell/math-functions/metadata.xml
+++ b/dev-haskell/math-functions/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library provides implementations of special mathematical
-		functions and Chebyshev polynomials.  These functions are often
-		useful in statistical and numerical computing.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">math-functions</remote-id>
 		<remote-id type="github">bos/math-functions</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/megaparsec-tests/Manifest b/dev-haskell/megaparsec-tests/Manifest
new file mode 100644
index 000000000000..8d398d082cba
--- /dev/null
+++ b/dev-haskell/megaparsec-tests/Manifest
@@ -0,0 +1 @@
+DIST megaparsec-tests-9.2.2.tar.gz 31021 BLAKE2B 872222cfe08fc813445275a747c61e3520b076b3a3f6454f5f95ff91cd85f5ed91b86a2273ee4198f6599d6359369ce410cb6290f66cc7dd9e7c9c3f499fa5c5 SHA512 379098b9d87900540c82e3ae17c2d930ee11644f20535e5eb1730159f59a6dc7f181ee6a022a93893b37ca063a097bea0bdecd1278e7fcc581cb7e95b93c665c
diff --git a/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild b/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild
new file mode 100644
index 000000000000..b6a1029b9e53
--- /dev/null
+++ b/dev-haskell/megaparsec-tests/megaparsec-tests-9.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Test utilities and the test suite of Megaparsec"
+HOMEPAGE="https://github.com/mrkkrp/megaparsec"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+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:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+	>=dev-lang/ghc-9.0.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.4.1.0
+	test? ( >=dev-haskell/case-insensitive-1.2 <dev-haskell/case-insensitive-1.3
+		>=dev-haskell/parser-combinators-1.0 <dev-haskell/parser-combinators-2.0
+		>=dev-haskell/scientific-0.3.1 <dev-haskell/scientific-0.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/megaparsec-tests/metadata.xml b/dev-haskell/megaparsec-tests/metadata.xml
new file mode 100644
index 000000000000..1422b861c8e2
--- /dev/null
+++ b/dev-haskell/megaparsec-tests/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">megaparsec-tests</remote-id>
+		<remote-id type="github">mrkkrp/megaparsec</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/megaparsec/Manifest b/dev-haskell/megaparsec/Manifest
index 4af01e43768c..e95eebd3d7bf 100644
--- a/dev-haskell/megaparsec/Manifest
+++ b/dev-haskell/megaparsec/Manifest
@@ -1,2 +1 @@
-DIST megaparsec-6.5.0.tar.gz 91498 BLAKE2B 339e68e211e871d77236770ab789523879a1a44286d5ff5567b75f32278826f79ee6a76a80309b07771703a415c252e92d8327e6a34b86f0670b1ac89c742d6c SHA512 4a8194909f2779bd82226a1f8fb6cce089820fa960249fdd723a4f54aa0c0d52436b4835431327be1164a7698d59059e866b694477407fae4d93c1ae42664011
-DIST megaparsec-8.0.0.tar.gz 59692 BLAKE2B dabde94500b5f4e27437779fa2db288f71c7b493201e2150eed3d2ed6d2117bc9d9ba8100c1ffad7a6ac6160ea03d373fd3360e549d7f20284dae2257ba10e2c SHA512 ab550a99548da2739a70cc4bdb3313085b3179c58d19a84d30744d89fe2d7556b9b552d4ad7b177b18f9f5821daa5417c2b9267eadd9eb537132666c151513c3
+DIST megaparsec-9.2.2.tar.gz 61325 BLAKE2B eef0cbcf9c46da28e354bdb6b62845957d449248307dfbac4dc6d9c01d16b36b4ea89b406cfdeb2dee2cf350581f8d4cc55d67ea1596e840fbada29380859f5b SHA512 4cd759a91dcdd50a14ffca1f83afe1a2cb8b99f2afe589739f6fac2ad6ea7cbd7c7e8cb22924a1f8c5d64cbf1602f39b1e4137d9c8a2aeb005d8c970255d9fe4
diff --git a/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild b/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
deleted file mode 100644
index 3921b92735da..000000000000
--- a/dev-haskell/megaparsec/megaparsec-6.5.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/megaparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
-	>=dev-haskell/parser-combinators-0.4:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
-		>=dev-haskell/hspec-expectations-0.5 <dev-haskell/hspec-expectations-0.9
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.12 )
-"
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'parser-combinators >= 0.4 && < 1.0' 'parser-combinators >= 0.4' \
-		'build-tools:        hspec-discover >= 2.0 && < 3.0' 'build-depends:        hspec-discover >= 2.0 && < 3.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/megaparsec/megaparsec-8.0.0.ebuild b/dev-haskell/megaparsec/megaparsec-8.0.0.ebuild
deleted file mode 100644
index aba2ec44c287..000000000000
--- a/dev-haskell/megaparsec/megaparsec-8.0.0.ebuild
+++ /dev/null
@@ -1,35 +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.5.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/megaparsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/mtl-2.2.2:=[profile?] <dev-haskell/mtl-3.0:=[profile?]
-	>=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?]
-	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flags=-dev
-}
diff --git a/dev-haskell/megaparsec/megaparsec-9.2.2.ebuild b/dev-haskell/megaparsec/megaparsec-9.2.2.ebuild
new file mode 100644
index 000000000000..fe52dfb49006
--- /dev/null
+++ b/dev-haskell/megaparsec/megaparsec-9.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/megaparsec"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/parser-combinators-1.0:=[profile?] <dev-haskell/parser-combinators-2.0:=[profile?]
+	>=dev-haskell/scientific-0.3.7:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-lang/ghc-9.0.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.4.1.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
diff --git a/dev-haskell/megaparsec/metadata.xml b/dev-haskell/megaparsec/metadata.xml
index 3d98afc09884..f054ea68814e 100644
--- a/dev-haskell/megaparsec/metadata.xml
+++ b/dev-haskell/megaparsec/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This is industrial-strength monadic parser combinator library. Megaparsec is
-		a fork of Parsec library originally written by Daan Leijen.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">megaparsec</remote-id>
+		<remote-id type="github">mrkkrp/megaparsec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/memory/Manifest b/dev-haskell/memory/Manifest
index 507c41b250ac..486c42174d9d 100644
--- a/dev-haskell/memory/Manifest
+++ b/dev-haskell/memory/Manifest
@@ -1,4 +1,3 @@
-DIST memory-0.10.tar.gz 35039 BLAKE2B bca8342ebd866c53fa2fe476b11fa3ecb75ac8383a98baf86bb577f99d623828e5656b2a23b9f95f03044fefa97aea5fd1429c1df45e625eabca36b8b54dbbd2 SHA512 e548dddfe168f6094e066b7bbda165e842d1eab429b5d2ea978706acfd4b3a93a84f9ba56cc2830fecddadefe60efcfb474a791a72211f552fb223a6989dd55c
-DIST memory-0.14.1.tar.gz 35928 BLAKE2B 6ac85e5f9cd41ea4058abdc168bd094e7632582fb234c00aab9e6a3359a87e0695907e3821a684ca8c1ad6259c7343e8d0dd38a8fc3e4e85dd89efa09fcbabb5 SHA512 12f8d8f3d14dc060b5da9950ddef398ac55464cf79438c501ba8eaa222817d474c191463fd5f97ed460f5ca4af6d3b643363eb2cca278c583cc14e442fe669cf
 DIST memory-0.15.0.tar.gz 42299 BLAKE2B fd4cebe132ebc824e88907325d6106ab62d01942f5055481f0ff85248ba1a84211e768e49409b02f45ff224a4149338abb771b1dcad38c31175c340e35063fad SHA512 49aabf5fdaddae597df6d8f30a3e07c4d6d70fcc7b9146452a4ad4e81858786041676bc780e2b048fd683cc7c0d799d4579596c14fae940ea57954e9a7ee9129
-DIST memory-0.7.tar.gz 33072 BLAKE2B e29aac80f99121c2ae588b8b4e2db468a83e19583aabd524384b7aad43a210147746bbad3e05c682a5226dae163d39a9724fcd38b5b813889620ec7c918b9aa4 SHA512 5df9d3ff6ab1fad7760a34d22657af255d7ad57019e8b61bd81dbd09b5df6da83d93e667989c10ebea2910a3399be05ef33d298aca0b09764b0e3a855fba15a8
+DIST memory-0.18.0.tar.gz 41957 BLAKE2B 606c197b7ef5ff8189c0ce35b838a9866b9c7996452f77aab5d7632ac5b6c97d44a8a75c3d7e7f707be5fce70de91ec4db727c0732b2a6225d58ce1a8f8dd810 SHA512 5f341dfab54d3f063ac34cc092240082f885f7ee5a23b3b3ed8b58a741ae238df289ccc7e40bbf52f2ce19c4f7bee186e7d9ed6e207e59de6758a7eea5a9fe85
+DIST memory-81.patch 4543 BLAKE2B 451af2f23cd975403604f40129c5112f1f1e2856ec90c34058cfc6c97b5f84069b6379dd49d9167ad6e25365035470a0c20d76d4d441f26c6ac283b7999cfa44 SHA512 663672478660b0c693ebf41cbbb1ea123857b4f9c10560c4b0faeafea2cab49291daa99eac623a2c0b8541bcff3285a8837f407a61bf3e83084170c63d111a4e
diff --git a/dev-haskell/memory/memory-0.10.ebuild b/dev-haskell/memory/memory-0.10.ebuild
deleted file mode 100644
index 980428bc0330..000000000000
--- a/dev-haskell/memory/memory-0.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +support_bytestring,+support_deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="memory and related abstraction stuff"
-HOMEPAGE="https://github.com/vincenthz/hs-memory"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=support_bytestring \
-		--flag=support_deepseq
-}
diff --git a/dev-haskell/memory/memory-0.14.1.ebuild b/dev-haskell/memory/memory-0.14.1.ebuild
deleted file mode 100644
index b4829216fcb3..000000000000
--- a/dev-haskell/memory/memory-0.14.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +support_bytestring,+support_deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="memory and related abstraction stuff"
-HOMEPAGE="https://github.com/vincenthz/hs-memory"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=support_bytestring \
-		--flag=support_deepseq
-}
diff --git a/dev-haskell/memory/memory-0.15.0-r1.ebuild b/dev-haskell/memory/memory-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..2029df86440b
--- /dev/null
+++ b/dev-haskell/memory/memory-0.15.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: +support_foundation,+support_deepseq,+support_bytestring,+support_basement
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="memory and related abstraction stuff"
+HOMEPAGE="https://github.com/vincenthz/hs-memory"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://patch-diff.githubusercontent.com/raw/vincenthz/hs-memory/pull/81.patch -> ${PN}-81.patch"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/basement-0.0.7:=[profile?]
+	>=dev-lang/ghc-8.0.1:= <dev-lang/ghc-9.1
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( dev-haskell/foundation )
+"
+
+PATCHES=( "${DISTDIR}/${PN}-81.patch" )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=support_basement \
+		--flag=support_bytestring \
+		--flag=support_deepseq \
+		--flag=support_foundation
+}
diff --git a/dev-haskell/memory/memory-0.15.0.ebuild b/dev-haskell/memory/memory-0.15.0.ebuild
deleted file mode 100644
index b7a87029607e..000000000000
--- a/dev-haskell/memory/memory-0.15.0.ebuild
+++ /dev/null
@@ -1,35 +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.1.9999
-#hackport: flags: +support_foundation,+support_deepseq,+support_bytestring,+support_basement
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="memory and related abstraction stuff"
-HOMEPAGE="https://github.com/vincenthz/hs-memory"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/basement-0.0.7:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/foundation )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=support_basement \
-		--flag=support_bytestring \
-		--flag=support_deepseq \
-		--flag=support_foundation
-}
diff --git a/dev-haskell/memory/memory-0.18.0.ebuild b/dev-haskell/memory/memory-0.18.0.ebuild
new file mode 100644
index 000000000000..7953c9442466
--- /dev/null
+++ b/dev-haskell/memory/memory-0.18.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: +support_foundation,+support_deepseq,+support_bytestring,+support_basement
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="memory and related abstraction stuff"
+HOMEPAGE="https://github.com/vincenthz/hs-memory"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/basement-0.0.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		dev-haskell/foundation
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=support_basement \
+		--flag=support_bytestring \
+		--flag=support_deepseq \
+		--flag=support_foundation
+}
diff --git a/dev-haskell/memory/memory-0.7.ebuild b/dev-haskell/memory/memory-0.7.ebuild
deleted file mode 100644
index d40110bb1510..000000000000
--- a/dev-haskell/memory/memory-0.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: +support_bytestring,+support_deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="memory and related abtraction stuff"
-HOMEPAGE="https://github.com/vincenthz/hs-memory"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=support_bytestring \
-		--flag=support_deepseq
-}
diff --git a/dev-haskell/memory/metadata.xml b/dev-haskell/memory/metadata.xml
index 665d58e92c9f..809c410867c2 100644
--- a/dev-haskell/memory/metadata.xml
+++ b/dev-haskell/memory/metadata.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Chunk of memory, polymorphic byte array management and manipulation
-		
-		* A polymorphic byte array abstraction and function similar to strict ByteString.
-		
-		* Different type of byte array abstraction.
-		
-		* Raw memory IO operations (memory set, memory copy, ..)
-		
-		* Aliasing with endianness support.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">memory</remote-id>
 		<remote-id type="github">vincenthz/hs-memory</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/memotrie/Manifest b/dev-haskell/memotrie/Manifest
deleted file mode 100644
index 3d46083f4b6f..000000000000
--- a/dev-haskell/memotrie/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST MemoTrie-0.6.10.tar.gz 8403 BLAKE2B 4d8d3bbefef13d56c16fdd4e3584a811e6cfdca6de27df7d8eee7bd684050275c0e7299073e7ad3edd231db0dec91f3e42725295f21a096796f2a8445d10822a SHA512 73be7e356ad2aeef49abf43975d2e24ee8b883e12453f316366b52998637ac26d98feef34388c2a46f683027dc7132444b17a25a12d3e86748088fadf081b186
-DIST MemoTrie-0.6.4.tar.gz 7695 BLAKE2B 4bd5ae0fa7b0ec6e95e221903e28367773d8cc310963d73cbba110f3d3285f2cf5a72a62d3a53f9b5cb46b86efab182089440bb142927eeccbbf4ed9b4765f29 SHA512 5700a36ae2a53e84bc31d80765afff3041972b4b64da359e16e7981009cc581d9c8aac019eb46d44d5dba7080dad494587ad1f4256f101387eb6de2959dd659f
diff --git a/dev-haskell/memotrie/memotrie-0.6.10.ebuild b/dev-haskell/memotrie/memotrie-0.6.10.ebuild
deleted file mode 100644
index f8320abeea47..000000000000
--- a/dev-haskell/memotrie/memotrie-0.6.10.ebuild
+++ /dev/null
@@ -1,36 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MemoTrie"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Trie-based memo functions"
-HOMEPAGE="https://github.com/conal/MemoTrie"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/newtype-generics-0.5.3:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/memotrie/memotrie-0.6.4.ebuild b/dev-haskell/memotrie/memotrie-0.6.4.ebuild
deleted file mode 100644
index f47073c496c0..000000000000
--- a/dev-haskell/memotrie/memotrie-0.6.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile" #broken haddock: haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MemoTrie"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Trie-based memo functions"
-HOMEPAGE="https://github.com/conal/MemoTrie"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/memotrie/metadata.xml b/dev-haskell/memotrie/metadata.xml
deleted file mode 100644
index 2a3b094947a8..000000000000
--- a/dev-haskell/memotrie/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		MemoTrie provides a basis for memoized functions over some domains,
-		using tries.  It's based on some code I got from Spencer Janssen.
-		
-		Project wiki page: &lt;http://haskell.org/haskellwiki/MemoTrie&gt;
-		
-		&amp;#169; 2008,2009,2010 by Conal Elliott; BSD3 license.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">conal/MemoTrie</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mersenne-random-pure64/Manifest b/dev-haskell/mersenne-random-pure64/Manifest
deleted file mode 100644
index d881cc2c328f..000000000000
--- a/dev-haskell/mersenne-random-pure64/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mersenne-random-pure64-0.2.0.5.tar.gz 7094 BLAKE2B 8a2793f575bc318e5296b3974b6eb0561c19a92b9c9dfdc5ba204f361110569027ab74261c092c620c6ef637e52cddaaf1e0c9037f8768eeceb51f18d3a3b70a SHA512 1dd09fc1bad2ce9c847f7815f6fbc60556bb10fa4a01b30d3ad53dacd560392a866f8f13b334f0bba8f87490ff3d4ab54a054300d7682d4b73d33f6c161cb022
-DIST mersenne-random-pure64-0.2.2.0.tar.gz 7190 BLAKE2B aaaa92b939f96bc5654694ff63e88c15a3de5b3e6c93607cbebcd0503680787220c84dc40980e85f0bcc2504e70489971f706ba4eaeb3ff86879c0e0e9f65bad SHA512 4329491b2f86dc256f24111ac7ae6ee527113e4fc32ecb3fb81563ca175296cf6fb3844147740845a9d7e6d09f48e2be338bd8e56468075b36c1f00d7c47e331
diff --git a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.0.5.ebuild b/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.0.5.ebuild
deleted file mode 100644
index 8def9e756f0a..000000000000
--- a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate high quality pseudorandom numbers purely using a Mersenne Twister"
-HOMEPAGE="http://code.haskell.org/~dons/code/mersenne-random-pure64/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild b/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild
deleted file mode 100644
index 00700ca894da..000000000000
--- a/dev-haskell/mersenne-random-pure64/mersenne-random-pure64-0.2.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate high quality pseudorandom numbers purely using a Mersenne Twister"
-HOMEPAGE="http://code.haskell.org/~dons/code/mersenne-random-pure64/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
diff --git a/dev-haskell/mersenne-random-pure64/metadata.xml b/dev-haskell/mersenne-random-pure64/metadata.xml
deleted file mode 100644
index e6e083ca3ffc..000000000000
--- a/dev-haskell/mersenne-random-pure64/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The Mersenne twister is a pseudorandom number generator developed by
-		Makoto Matsumoto and Takuji Nishimura that is based on a matrix linear
-		recurrence over a finite binary field. It provides for fast generation
-		of very high quality pseudorandom numbers. The source for the C code
-		can be found here:
-		
-		&lt;http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt64.html&gt;
-		
-		This library provides a purely functional binding to the 64 bit
-		classic mersenne twister, along with instances of RandomGen, so the
-		generator can be used with System.Random. The generator should
-		typically be a few times faster than the default StdGen (but a tad
-		slower than the impure 'mersenne-random' library based on SIMD
-		instructions and destructive state updates.
-		
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/metadata.xml b/dev-haskell/metadata.xml
index e6044576f941..2f43cbc44f89 100644
--- a/dev-haskell/metadata.xml
+++ b/dev-haskell/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
 		The dev-haskell category contains libraries and utilities relevant to the
@@ -37,4 +37,3 @@
 		językiem programowania Haskell.
 	</longdescription>
 </catmetadata>
-
diff --git a/dev-haskell/microaeson/Manifest b/dev-haskell/microaeson/Manifest
new file mode 100644
index 000000000000..3f627cf820ee
--- /dev/null
+++ b/dev-haskell/microaeson/Manifest
@@ -0,0 +1,2 @@
+DIST microaeson-0.1.0.1-rev2.cabal 4032 BLAKE2B 01dc7e93b8d00024108627326eb01ee9df89326827ce3f42911b2cd02faeb4bf2c184107485e9a4a1724a18950b4933f99601070c78b759fad270b32ac67f6b4 SHA512 b6fb42c04a69f2c478063105d43978d2a150a77b51ce9d57526d9fba730abf5f1c87812bcc962251b466fe03134636f39371e44cd3e57c680e5f15cda9487b6d
+DIST microaeson-0.1.0.1.tar.gz 20630 BLAKE2B 3c2de86b976b4532464623e6452bf9675bc187b8bacde5ebae5915a6640680a4593e40e3d71a9405f09a05d9723c459763a084022cb84b4721e0425c1e9eccfb SHA512 4e8aecd9128bca4e8cddfa5a421d886d630adb03cffe08141223993184f441f87c9e0e5105c9e5e0d0dfde47dc6531b1855d1e0411a403315520e46c282e6cff
diff --git a/dev-haskell/microaeson/metadata.xml b/dev-haskell/microaeson/metadata.xml
new file mode 100644
index 000000000000..3190cd92d667
--- /dev/null
+++ b/dev-haskell/microaeson/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">microaeson</remote-id>
+		<remote-id type="github">haskell-hvr/microaeson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/microaeson/microaeson-0.1.0.1.ebuild b/dev-haskell/microaeson/microaeson-0.1.0.1.ebuild
new file mode 100644
index 000000000000..c9b435941ddd
--- /dev/null
+++ b/dev-haskell/microaeson/microaeson-0.1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A tiny JSON library with light dependency footprint"
+HOMEPAGE="https://hackage.haskell.org/package/microaeson"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/alex-3.2.0 <dev-haskell/alex-3.3
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/aeson-1.3.1.0 <dev-haskell/aeson-2.2
+		>=dev-haskell/quickcheck-2.11.3 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.16 <dev-haskell/quickcheck-instances-0.4
+		>=dev-haskell/tasty-1.0.1.1 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+		>=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+		>=dev-haskell/vector-0.12.0.1 <dev-haskell/vector-0.14
+	)
+"
diff --git a/dev-haskell/microlens-aeson/Manifest b/dev-haskell/microlens-aeson/Manifest
index d7a51c7818d0..caa2cfef11ab 100644
--- a/dev-haskell/microlens-aeson/Manifest
+++ b/dev-haskell/microlens-aeson/Manifest
@@ -1 +1 @@
-DIST microlens-aeson-2.3.0.4.tar.gz 439564 BLAKE2B f8077c78ffb86f8f87afc165651e79c1f2b4737d954c5a720a1e9da0133245e5e8082969af177c4302469c339eeff9a659e334efbf8e5c8320d4683661b2c0b9 SHA512 34986eda7737947357999992f617bfd00079048f9fb75dd60f533e58a9671906d9bd0e4fcee1f4a3df309d98ddcb25144fb59f1a779675b119669c27739c3f6a
+DIST microlens-aeson-2.5.0.tar.gz 439908 BLAKE2B 70f9ca0e7d06988cbe8ef63a26333430a00917a36f3df7deabb5a5913a2a728ae82327fd5023d98b4582f57a8e40c1dc0b689012ce12b7d71f605f6b392c05df SHA512 b8f99796045bc5f014b1535380c680a43b2e5dd4e5543cf3b4a9683c40780a54bf4b7904a4f9cc8a6ef2c5b4caa8f74b7d116ef06011201c28b63ceac22790e4
diff --git a/dev-haskell/microlens-aeson/metadata.xml b/dev-haskell/microlens-aeson/metadata.xml
index b7878815d80d..68f03216cbf2 100644
--- a/dev-haskell/microlens-aeson/metadata.xml
+++ b/dev-haskell/microlens-aeson/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">fosskers/microlens-aeson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild b/dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild
deleted file mode 100644
index 813122c70617..000000000000
--- a/dev-haskell/microlens-aeson/microlens-aeson-2.3.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Law-abiding lenses for Aeson, using microlens"
-HOMEPAGE="https://github.com/fosskers/microlens-aeson/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/microlens-0.3:=[profile?]
-	>=dev-haskell/scientific-0.3.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-	test? ( >=dev-haskell/tasty-0.10.1.2
-		>=dev-haskell/tasty-hunit-0.9.2 )
-"
diff --git a/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild b/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild
new file mode 100644
index 000000000000..5f467c42bbf8
--- /dev/null
+++ b/dev-haskell/microlens-aeson/microlens-aeson-2.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Law-abiding lenses for Aeson, using microlens"
+HOMEPAGE="https://github.com/fosskers/microlens-aeson/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-2.0:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	dev-haskell/hashable:=[profile?]
+	>=dev-haskell/microlens-0.3:=[profile?]
+	>=dev-haskell/scientific-0.3.2:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/tasty-0.10.1.2
+		>=dev-haskell/tasty-hunit-0.9.2 )
+"
diff --git a/dev-haskell/microlens-mtl/Manifest b/dev-haskell/microlens-mtl/Manifest
index 8728384c620c..9b24b9c7cd19 100644
--- a/dev-haskell/microlens-mtl/Manifest
+++ b/dev-haskell/microlens-mtl/Manifest
@@ -1 +1,2 @@
 DIST microlens-mtl-0.2.0.1.tar.gz 9019 BLAKE2B 48fdd193522c239bf477cb289310d2d2c461a3d192f4d70218a2bf2013923fd1f06d79bff9ada29a2729ec5d01884c25f3fb13bf1765803d11b15f354be8baf9 SHA512 2153a38e637e33e426bb64986fe7e818a2be99e4005cc7db51b94a4f66be8170e20071bf785c27a0beeb48cab97da037f68a008fa157a21a70fbf9fd943f6a45
+DIST microlens-mtl-0.2.0.2.tar.gz 9056 BLAKE2B 3de3ee55d885b1cea8e31512d6ee3ae107bc8c3c06a948baca5d493e73f5db36d32a5d03ba500d52fff6b22652763873a5edf33f39d3590f9105b4386e154775 SHA512 562680ae4cae7879f592af511f48f76573e5d483645a9d7f1096a185d1cc919b0221eb01d65eea1ba219a394592ac4a6c2ec32a93a785d782834ccd238943286
diff --git a/dev-haskell/microlens-mtl/metadata.xml b/dev-haskell/microlens-mtl/metadata.xml
index 31f5b531504c..07612aa0c41e 100644
--- a/dev-haskell/microlens-mtl/metadata.xml
+++ b/dev-haskell/microlens-mtl/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package contains functions (like &#39;view&#39; or &#39;+=&#39;) which work on &#39;MonadReader&#39;, &#39;MonadWriter&#39;, and &#39;MonadState&#39; from the mtl package.
-		
-		This package is a part of the &lt;http://hackage.haskell.org/package/microlens microlens&gt; family; see the readme &lt;https://github.com/aelve/microlens#readme on Github&gt;.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">microlens-mtl</remote-id>
+		<remote-id type="github">monadfix/microlens</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
index 5e3dbeb42b78..9276e56e3292 100644
--- a/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
+++ b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
diff --git a/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.2.ebuild b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.2.ebuild
new file mode 100644
index 000000000000..4557a480661d
--- /dev/null
+++ b/dev-haskell/microlens-mtl/microlens-mtl-0.2.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="microlens support for Reader/Writer/State from mtl"
+HOMEPAGE="https://github.com/monadfix/microlens"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/microlens-0.4:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/microlens-th/Manifest b/dev-haskell/microlens-th/Manifest
index c9d05599b46a..c18886914637 100644
--- a/dev-haskell/microlens-th/Manifest
+++ b/dev-haskell/microlens-th/Manifest
@@ -1 +1,2 @@
-DIST microlens-th-0.4.3.4.tar.gz 21662 BLAKE2B 0c228791dae5b4ab10bd47d574b2dfc1a9bd046ee7941ba15be02d5c60f78f495c719ab64cd74434734c7a7ee1ca67eb083621319325bb3fbd518a1a36c1aa90 SHA512 456d0cfe6f93a4adb8c5d0004983bcc7906f8750787eecd2ccbb9063d3e63da824c1bec29f81b37485aeebc356baa478bc26cc439e45ec03642f2d61217cbb7f
+DIST microlens-th-0.4.3.10.tar.gz 24189 BLAKE2B f763ecbe003339bd7102180a97f264c96dcf1e9097663a619e8044c3a03cf3d381189dfa94c1a0f6b326b7882e7017d5e07c12eb88a898592d806a0810dffadb SHA512 8c2c4984eb76ddfbde96b0a429a87fa2643c891fc680e6843abadb2691c2898eb7e89e21e6a82a6631e2115204db443346fe3459764d865b23854dbcd940e5bd
+DIST microlens-th-0.4.3.12.tar.gz 24150 BLAKE2B 6ac749eb4933cbadffcac985a89aa922e1a0f48ab3071c5edf2f46390be0a1711bd63abdb3fe14311e3ce5343df9f9a9bd92097a044e02e31b7586086c3898a5 SHA512 452d9a53c4b1111c45e87260ab31e6fbe06f06185975486c07d28369ed7312b87b96b2b59865f86fcb545ebf782834783bc80e3d49a71a63ea464fe35818f7eb
diff --git a/dev-haskell/microlens-th/metadata.xml b/dev-haskell/microlens-th/metadata.xml
index 66694ad55ecf..20223e7fb486 100644
--- a/dev-haskell/microlens-th/metadata.xml
+++ b/dev-haskell/microlens-th/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package lets you automatically generate lenses for data types; code was extracted from the lens package, and therefore generated lenses are fully compatible with ones generated by lens (and can be used both from lens and microlens).
-		
-		This package is a part of the &lt;http://hackage.haskell.org/package/microlens microlens&gt; family; see the readme &lt;https://github.com/aelve/microlens#readme on Github&gt;.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">microlens-th</remote-id>
+		<remote-id type="github">stevenfontanella/microlens</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild b/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild
new file mode 100644
index 000000000000..990d772f9edd
--- /dev/null
+++ b/dev-haskell/microlens-th/microlens-th-0.4.3.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatic generation of record lenses for microlens"
+HOMEPAGE="https://github.com/stevenfontanella/microlens"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
+	>=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tagged )
+"
diff --git a/dev-haskell/microlens-th/microlens-th-0.4.3.12.ebuild b/dev-haskell/microlens-th/microlens-th-0.4.3.12.ebuild
new file mode 100644
index 000000000000..a24bdd59eb21
--- /dev/null
+++ b/dev-haskell/microlens-th/microlens-th-0.4.3.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatic generation of record lenses for microlens"
+HOMEPAGE="https://github.com/stevenfontanella/microlens"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
+	>=dev-haskell/th-abstraction-0.4.1:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tagged )
+"
diff --git a/dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild b/dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild
deleted file mode 100644
index 8469da80b613..000000000000
--- a/dev-haskell/microlens-th/microlens-th-0.4.3.4.ebuild
+++ /dev/null
@@ -1,33 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Automatic generation of record lenses for microlens"
-HOMEPAGE="https://github.com/monadfix/microlens"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/microlens-0.4.0:=[profile?] <dev-haskell/microlens-0.5:=[profile?]
-	>=dev-haskell/th-abstraction-0.2.1:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'template-haskell >=2.7 && <2.16' 'template-haskell >=2.7'
-}
diff --git a/dev-haskell/microlens/Manifest b/dev-haskell/microlens/Manifest
index 99cc953cc8e7..0d3a0465900a 100644
--- a/dev-haskell/microlens/Manifest
+++ b/dev-haskell/microlens/Manifest
@@ -1,2 +1,2 @@
 DIST microlens-0.4.11.2.tar.gz 26549 BLAKE2B 7b4eb026ed937f5b710fbdaca6154c9f4e37a494d4b01b7ff141a8446b80c1c9eb707076f743d9916adb33de4d30e003c66e235c4ec95ef59c43293713389d2d SHA512 16a70dc5b524dc5165faa6502bb74c7eb48a6eaa3ec9bd4bb16c6cbd6eccf5ab365e2e0e2e10e9e60b65e604de78dd62789b53a7c7d2ccd0da93bce5b09fadc8
-DIST microlens-0.4.8.0.tar.gz 24766 BLAKE2B d033f58cd378d3c0c2274536b50ddcafa19f726a1eb7303032077bd232491b90eac0d277cdc6a73ee0fb06288c19aa2dd63dfc10acdec280baad01b9743f718f SHA512 472b4ef43161a21c2864d87d53e2e4138d4ee16d64cc9e96f43c2cdc11894df178189525be1c6e5c8e0db582f878d1d603696f0ace82986fcb42d888aee99ae2
+DIST microlens-0.4.13.0.tar.gz 27372 BLAKE2B 1763936e44f4931eb3117e8de23d818e26091f98cdf770f2148220cc85b33a75cc8d78191e0e2998a407c4d613cff33086b516b1070ea6e68e97ac562228cd1a SHA512 dacbab28ac54bab596a353e4707f2f83b4d4e4fa7e40dd14f3acaf4276f1e552a74decd7b1275966fa4dac2a3099dbb55f84b9306116a5e0242aaf5749dad36b
diff --git a/dev-haskell/microlens/metadata.xml b/dev-haskell/microlens/metadata.xml
index b7878815d80d..058feaa71d9a 100644
--- a/dev-haskell/microlens/metadata.xml
+++ b/dev-haskell/microlens/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">microlens</remote-id>
+		<remote-id type="github">monadfix/microlens</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/microlens/microlens-0.4.11.2.ebuild b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
index c01efa466b75..462bf702c48d 100644
--- a/dev-haskell/microlens/microlens-0.4.11.2.ebuild
+++ b/dev-haskell/microlens/microlens-0.4.11.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.1
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="A tiny lens library with no dependencies"
-HOMEPAGE="https://github.com/monadfix/microlens"
+HOMEPAGE="https://github.com/stevenfontanella/microlens"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/microlens/microlens-0.4.13.0.ebuild b/dev-haskell/microlens/microlens-0.4.13.0.ebuild
new file mode 100644
index 000000000000..348155fc573c
--- /dev/null
+++ b/dev-haskell/microlens/microlens-0.4.13.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A tiny lens library with no dependencies"
+HOMEPAGE="https://github.com/monadfix/microlens"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/microlens/microlens-0.4.8.0.ebuild b/dev-haskell/microlens/microlens-0.4.8.0.ebuild
deleted file mode 100644
index 0e8231558ff8..000000000000
--- a/dev-haskell/microlens/microlens-0.4.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A tiny lens library with no dependencies"
-HOMEPAGE="https://github.com/aelve/microlens"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/microstache/Manifest b/dev-haskell/microstache/Manifest
new file mode 100644
index 000000000000..55c362496844
--- /dev/null
+++ b/dev-haskell/microstache/Manifest
@@ -0,0 +1,4 @@
+DIST microstache-1.0.2-rev3.cabal 2873 BLAKE2B 8d389ffbb9216b19f0d91fa690230e9bb2a79a74f4742394a8d7fe8ec2e0344c7485ebcd40b516dcdce25dd275ff16eae67bdc22bba0c60da54f7ff1199623ba SHA512 2c952588bbd355f313ae63eba4bb0cea38f36da8e0a7f29be6a841836e32cf05ef86d1bbc2b21bc871b218778ca521484ca146cf0f83e9053e0b00d821258e10
+DIST microstache-1.0.2.3-rev2.cabal 3247 BLAKE2B 78c1fd439c104821dd753945f2a6069ca4908cc41ee0bd9d1b0c6b02335bfdccbecbaf9a73f2dece5eb1ea45a5f16911274b491675c0e0758c1b2bf94f0916b8 SHA512 7349239c7b3156d37379caa13e8fba38ab06a97b7959570554eee098f82e5a583e74f432b5ce2589e2f15e8a76c86cd45b0e1e2f356e1c199ddfbffa4990bfab
+DIST microstache-1.0.2.3.tar.gz 22421 BLAKE2B 9d243f5545d95cf48c3acaebbf05f978b69c78e73b0dfd80c94dc5f118033b7917e47b3a9850fdba36d4b46eafed729971c0a4647a109b93996c2990de3bcd34 SHA512 c50fa66a019116ca81e63de59951df29316c39c50d3672197353987ac431f63cc97ee26adb1f8f31ffdad7409f58e2a369502da0e0484af0b0632b6ac8deac4d
+DIST microstache-1.0.2.tar.gz 21333 BLAKE2B 05f726b88c96e47157e76705bf6961bf27f81cdee8f3c7860e9f24f368e450862d854a6a47492da179ed6830006059100470e029183f11164e1042766111cb6d SHA512 bbf1de864c88809cfd159a679ec1709c7fb523e2b3ac91232e2cabb9a4bf2eda0913666b3a6ab81b6ba9c2488ce1200cb6b43e21a7f475d2dc20f9854c47a61e
diff --git a/dev-haskell/microstache/metadata.xml b/dev-haskell/microstache/metadata.xml
new file mode 100644
index 000000000000..02d7514695e0
--- /dev/null
+++ b/dev-haskell/microstache/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">microstache</remote-id>
+		<remote-id type="github">haskellari/microstache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/microstache/microstache-1.0.2.3-r1.ebuild b/dev-haskell/microstache/microstache-1.0.2.3-r1.ebuild
new file mode 100644
index 000000000000..10399293c94f
--- /dev/null
+++ b/dev-haskell/microstache/microstache-1.0.2.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Mustache templates for Haskell"
+HOMEPAGE="https://github.com/haskellari/microstache"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/parsec-3.1.11:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	>=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/aeson
+		>=dev-haskell/base-orphans-0.8.7 <dev-haskell/base-orphans-0.10
+		>=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.10.0.3 <dev-haskell/tasty-hunit-0.11
+		dev-haskell/text )
+"
diff --git a/dev-haskell/microstache/microstache-1.0.2.ebuild b/dev-haskell/microstache/microstache-1.0.2.ebuild
new file mode 100644
index 000000000000..9e5d938cee2c
--- /dev/null
+++ b/dev-haskell/microstache/microstache-1.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 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 test-suite"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Mustache templates for Haskell"
+HOMEPAGE="https://github.com/haskellari/microstache"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/aeson
+		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/mime-mail/Manifest b/dev-haskell/mime-mail/Manifest
deleted file mode 100644
index d637c467d359..000000000000
--- a/dev-haskell/mime-mail/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mime-mail-0.4.11.tar.gz 8918 BLAKE2B 9d335f1953584961e377bdf041b7e93cf6a6e09d8ad3d86410bc565628a4aa75ad93a0bcdd484a566d88b36e1708ae32fdaa8a18424bf5135b5e44c16e9fa46e SHA512 576390c99ebfb390a4e3b2c441add80923033d91160aa834ee8b4491e117645d5ce2936fee798370feda8c21c477c95a1984314b28235a3cfcb5f72b2fc52a54
diff --git a/dev-haskell/mime-mail/metadata.xml b/dev-haskell/mime-mail/metadata.xml
deleted file mode 100644
index abcd14239f1e..000000000000
--- a/dev-haskell/mime-mail/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides some high-level datatypes for declaring MIME email messages, functions for automatically composing these into bytestrings, and the ability to send bytestrings via the sendmail executable. You can also use any other library you wish to send via different methods, eg directly to SMTP.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/mime-mail</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild b/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild
deleted file mode 100644
index c6ffe5c78c87..000000000000
--- a/dev-haskell/mime-mail/mime-mail-0.4.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compose MIME email messages"
-HOMEPAGE="https://github.com/snoyberg/mime-mail"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/mime-types/Manifest b/dev-haskell/mime-types/Manifest
index 6dc7b30b80a5..ac1285ccc1a2 100644
--- a/dev-haskell/mime-types/Manifest
+++ b/dev-haskell/mime-types/Manifest
@@ -1,4 +1,2 @@
-DIST mime-types-0.1.0.3.tar.gz 10953 BLAKE2B 1bc690ee43d3ac77f07d2c69136efba7ee5778e97dab42afe86ad172106dbf6ed0ba1d00edf29d809cc07ab9f23d6178e17d45c7e73b65f6baf99cc38d06d4b6 SHA512 10bdd7ed39af89645bcc2daef6d234d571811cda51583e93df43039c09a5bd4b0d5a6f23e7ac8bc91e471c8bbe8b2124e4db48b88436f5c22b96a065f925b206
-DIST mime-types-0.1.0.6.tar.gz 11135 BLAKE2B 75d2ded069ef1a3b9daf435545eb900fc8829f5abe5c4ca949ec41455a4757c258f8afb40e5fcface0feb8adc0231c21f1aa061b4dd87367c326d19722782069 SHA512 ceed01578103e5a739c81dc87b76d72125fc6bd88e67ae34057a1ecbdd1fbca004295315a985eb0430e030104928fb4ae59c44ec6faa484b35c08116fb29b36c
-DIST mime-types-0.1.0.7.tar.gz 11363 BLAKE2B a946e97c6c051d1d0eeed52e6d2bb742909f289def220a35ee0c33e3e79a8b3559d2a684f01c2caa0b7c709a3b6e185f05b2e80d645e8448a4caa136996926d6 SHA512 411bc4cbb471a0f520413831e7613ede6a2f326120adba1f8acc92b12f2eb241e12323cc68d3ea829e26009b8d7728bf26b0a634b9c672c88345a6a2cc94cd8a
 DIST mime-types-0.1.0.9.tar.gz 11384 BLAKE2B 610604f93b5225589478f87b710c32793c07685b4b009cea146399bf68655188f2771d36b82baee6b09ba331441687b270373c22bdc080a803d2bf133fe293a0 SHA512 cffc9d4d808d52b35bf6b5bdd6c069411ec8746bb3951e7c1a6200eecb2ae0617ede9891aa3e077e9ea5fc6f08bc2a1c44547971ed2a66108c96fd9dda30e6db
+DIST mime-types-0.1.1.0.tar.gz 11818 BLAKE2B 9bdc26c7b7eca4aaa936d0dfb885dc6ebe278913035b2da04a56696e440d3e10cf6fdc57987231618a45a56a97a6ab77aed97d4125d45e86a4c69b47d57a94d1 SHA512 48fdb8a4284bf89e76a6875399f7faa082f1a3f0d275a23c1761f8265c33081731bebff8549d248bc31dbf789b0f3a96bdd8ca5fb07efb79085ddd156f635f32
diff --git a/dev-haskell/mime-types/metadata.xml b/dev-haskell/mime-types/metadata.xml
index a9c34a421375..26445a0f3c5a 100644
--- a/dev-haskell/mime-types/metadata.xml
+++ b/dev-haskell/mime-types/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Basic mime-type handling types and functions
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">mime-types</remote-id>
 		<remote-id type="github">yesodweb/wai</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild
deleted file mode 100644
index 9b874aedb0c4..000000000000
--- a/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic mime-type handling types and functions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.6.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.6.ebuild
deleted file mode 100644
index 7c6c34bb98cc..000000000000
--- a/dev-haskell/mime-types/mime-types-0.1.0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic mime-type handling types and functions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.7.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.7.ebuild
deleted file mode 100644
index 3fa481c6f144..000000000000
--- a/dev-haskell/mime-types/mime-types-0.1.0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic mime-type handling types and functions"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
index 7348ee13f728..f4227fb0dcf2 100644
--- a/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
+++ b/dev-haskell/mime-types/mime-types-0.1.0.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/mime-types/mime-types-0.1.1.0.ebuild b/dev-haskell/mime-types/mime-types-0.1.1.0.ebuild
new file mode 100644
index 000000000000..05ab823764ba
--- /dev/null
+++ b/dev-haskell/mime-types/mime-types-0.1.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Basic mime-type handling types and functions"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/mime/Manifest b/dev-haskell/mime/Manifest
deleted file mode 100644
index 0d6934f44d03..000000000000
--- a/dev-haskell/mime/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mime-0.4.0.2.tar.gz 9438 BLAKE2B 0aef0b6cb44aac122943654e05238616cd13d0b6431911e55df13634623922ed2bb8616ce09ca18d700ab4cd460f8dbde248b7cbb4f723609f4e50a02ade0af4 SHA512 03fad3792a6935ea5ea75cc9756760277ad005db106cf6aa4f951a23e32d170bcb09dea399d2ace5b4f44afc2c73ec1b377f86b8f70616320490cd690ae4ea15
diff --git a/dev-haskell/mime/metadata.xml b/dev-haskell/mime/metadata.xml
deleted file mode 100644
index 24d6f7a179b0..000000000000
--- a/dev-haskell/mime/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Working with MIME types.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">GaloisInc/mime</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mime/mime-0.4.0.2.ebuild b/dev-haskell/mime/mime-0.4.0.2.ebuild
deleted file mode 100644
index 5389dd18a73b..000000000000
--- a/dev-haskell/mime/mime-0.4.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Working with MIME types"
-HOMEPAGE="https://github.com/GaloisInc/mime"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/minisat/Manifest b/dev-haskell/minisat/Manifest
deleted file mode 100644
index 7e5cc8c0a53f..000000000000
--- a/dev-haskell/minisat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST minisat-0.1.2.tar.gz 45469 BLAKE2B 69a422874c40ec05f97af75ab63d263faafaa4623aa1fe9a40059d2285742ee11ee2fa14aca7ffb8b8503838f0612abea7e8c4b26826dd230abb422fe6c96731 SHA512 557f5f8412adb84784a1edab4981bf5029dea5b0ac731eca2e464f3573ba537c6696613bf494f08cfb7f1b53468f563f758138b60c00edaf046d7ce74f023a85
diff --git a/dev-haskell/minisat/metadata.xml b/dev-haskell/minisat/metadata.xml
deleted file mode 100644
index e14761e6d7da..000000000000
--- a/dev-haskell/minisat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell bundle of the Minisat SAT solver
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/minisat/minisat-0.1.2.ebuild b/dev-haskell/minisat/minisat-0.1.2.ebuild
deleted file mode 100644
index ab72ae827094..000000000000
--- a/dev-haskell/minisat/minisat-0.1.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell bundle of the Minisat SAT solver"
-HOMEPAGE="https://hackage.haskell.org/package/minisat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	sys-devel/gcc[cxx]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/mintty/Manifest b/dev-haskell/mintty/Manifest
deleted file mode 100644
index f7b33075eeee..000000000000
--- a/dev-haskell/mintty/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mintty-0.1.2.tar.gz 6945 BLAKE2B 6fe05a5d130c807b8dca29e5c207bff3ce73778ed4ca9e27f2a54c1b28410a7043b8d7f8ad4de7b8c93e555f8577e9644a1d7e86cae0fdba94098d34e3fadfce SHA512 6737851b82bec6977114baa572bdd012ff933a9d1c401857b97183fe341f605cc85618f2d0ac4afe2046cd90ec011d595bb82dea775f65b7e1d73dcf41777667
diff --git a/dev-haskell/mintty/metadata.xml b/dev-haskell/mintty/metadata.xml
deleted file mode 100644
index dccdf4080195..000000000000
--- a/dev-haskell/mintty/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		MinTTY is a Windows-specific terminal emulator for the
-		widely used Cygwin and MSYS projects, which provide
-		Unix-like environments for Windows. MinTTY consoles behave
-		differently from native Windows consoles (such as
-		@cmd.exe@ or PowerShell) in many ways, and in some cases,
-		these differences make it necessary to treat MinTTY
-		consoles differently in code.
-		
-		The @mintty@ library provides a simple way to detect if
-		your code in running in a MinTTY console on Windows. It
-		exports @isMinTTY@, which does the right thing 90% of the
-		time (by checking if standard error is attached to
-		MinTTY), and it also exports @isMinTTYHandle@ for the
-		other 10% of the time (when you want to check is some
-		arbitrary handle is attached to MinTTY). As you might
-		expect, both of these functions will simply return @False@
-		on any non-Windows operating system.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mintty/mintty-0.1.2.ebuild b/dev-haskell/mintty/mintty-0.1.2.ebuild
deleted file mode 100644
index 827af5189248..000000000000
--- a/dev-haskell/mintty/mintty-0.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A reliable way to detect the presence of a MinTTY console on Windows"
-HOMEPAGE="https://github.com/RyanGlScott/mintty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
index 14e242c982e5..cc5d48701e4b 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1,4 +1,3 @@
-DIST MissingH-1.2.0.2.tar.gz 115774 BLAKE2B ae1e4db5de9c9559f9687bfed16e52dba3fe782e6ce33e72bb60fe1cd5044cc70b0f839064144711c0f5863786c75ec34b17acd1449a8ca7387a5596185594e2 SHA512 148146468688d855af988874b28ec3e3ebafb99b8168d50734294ecc5400c832826e11c9714727f83381979f8f8a7c6e7bf6479e582e484ec0abcb741d22a0a9
-DIST MissingH-1.2.1.0.tar.gz 116445 BLAKE2B 66d319c3bdb883eb5a8349c6bf98cd119b143fb4180c3f3376f136d2fd398666ef92a47164516a33a7f7fe3a5da5ba41ffe1998b715168c27f0466dd042e09e6 SHA512 54ad72973ef20a2eb6a0e72ae8ff496ee48d359ba491bf094957737e02fce217fb00e950735f8c0b36a7fe48a7322a122e447b0c67e0205e8d1b6450ac4df3e3
-DIST MissingH-1.3.0.1.tar.gz 116812 BLAKE2B f2b17ed9df625558bf05719e490547f4fd605a494922d1b8daf0602fe913346a1e028940e63645de2c786339555b4480bce237f6ae613a2741d0d81acb75ec7c SHA512 e7c6f95d5437d86516f9aba79026b2abdd5131917a09da452623be68b2377067f8f093412c9919ebc904c4e61d43e755282d5bb333596de935c705958111dcf3
-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
diff --git a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch b/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
deleted file mode 100644
index 0b249462fa51..000000000000
--- a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- MissingH-1.2.0.2-orig/src/System/Cmd/Utils.hs	2013-08-22 00:35:27.000000000 +1000
-+++ MissingH-1.2.0.2/src/System/Cmd/Utils.hs	2013-09-28 01:17:29.697333968 +1000
-@@ -325,7 +325,11 @@
-                 Just (Exited (ExitSuccess)) -> return ()
-                 Just (Exited (ExitFailure fc)) ->
-                     cmdfailed funcname fp args fc
-+#if (__GLASGOW_HASKELL__ >= 707)
-+                Just (Terminated sig _) ->
-+#else
-                 Just (Terminated sig) ->
-+#endif
-                     warnfail fp args $ "Terminated by signal " ++ show sig
-                 Just (Stopped sig) ->
-                     warnfail fp args $ "Stopped by signal " ++ show sig
-@@ -351,7 +355,11 @@
-        case ec of
-             Exited ExitSuccess -> return ()
-             Exited (ExitFailure fc) -> cmdfailed "safeSystem" command args fc
-+#if (__GLASGOW_HASKELL__ >= 707)
-+            Terminated s _ -> cmdsignalled "safeSystem" command args s
-+#else
-             Terminated s -> cmdsignalled "safeSystem" command args s
-+#endif
-             Stopped s -> cmdsignalled "safeSystem" command args s
- #endif
- 
---- MissingH-1.2.0.2-orig/testsrc/Eithertest.hs	2013-08-22 00:35:27.000000000 +1000
-+++ MissingH-1.2.0.2/testsrc/Eithertest.hs	2013-09-28 01:19:32.177332800 +1000
-@@ -6,6 +6,7 @@
- For license and copyright information, see the file LICENSE
- 
- -}
-+{-# LANGUAGE CPP #-}
- 
- module Eithertest(tests) where
- import Test.HUnit
-@@ -13,8 +14,10 @@
- import Test.HUnit.Tools
- import Control.Exception
- 
-+#if (__GLASGOW_HASKELL__ < 707)
- instance Eq ErrorCall where
-     (ErrorCall x) == (ErrorCall y) = x == y
-+#endif
- 
- test_maybeToEither =
-     let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp inp in
diff --git a/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch b/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch
deleted file mode 100644
index ac4563960636..000000000000
--- a/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- MissingH-1.3.0.1-orig/src/Data/BinPacking.hs	2014-10-28 23:46:24.000000000 +1100
-+++ MissingH-1.3.0.1/src/Data/BinPacking.hs	2016-04-20 10:23:16.403505044 +1000
-@@ -69,7 +69,7 @@
- > [(size, obj)] is the sizes and objects
- > result is Either error or results
- -}
--type BinPacker = (Num size, Ord size, Show size, Show obj) => 
-+type BinPacker = forall size obj . (Num size, Ord size, Show size, Show obj) => 
-                   [size]        -- The sizes of bins
-                -> [(size, obj)] -- The sizes and objects
-                -> Either (BinPackerError size obj) [[(size, obj)]] -- Either error or results
---- MissingH-1.3.0.1-orig/src/System/IO/HVFS.hs	2014-10-28 23:46:24.000000000 +1100
-+++ MissingH-1.3.0.1/src/System/IO/HVFS.hs	2016-04-24 18:50:36.893741944 +1000
-@@ -60,7 +60,10 @@
- import System.IO.PlafCompat
- import System.Posix.Types
- import System.Time
--import System.Directory
-+import System.Directory (createDirectory, doesDirectoryExist, doesFileExist,
-+                         getCurrentDirectory, getDirectoryContents, getModificationTime,
-+                         removeDirectory, removeFile, renameDirectory,
-+                         renameFile, setCurrentDirectory)
- 
- #if MIN_VERSION_directory(1,2,0)
- import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds )
diff --git a/dev-haskell/missingh/metadata.xml b/dev-haskell/missingh/metadata.xml
index c06a693b89c3..6b12c539c764 100644
--- a/dev-haskell/missingh/metadata.xml
+++ b/dev-haskell/missingh/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="network-3">Use network-3</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">jgoerzen/missingh</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">MissingH</remote-id>
+		<remote-id type="github">hvr/missingh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/missingh/missingh-1.2.0.2.ebuild b/dev-haskell/missingh/missingh-1.2.0.2.ebuild
deleted file mode 100644
index 7b5d141a05ce..000000000000
--- a/dev-haskell/missingh/missingh-1.2.0.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Large utility library"
-HOMEPAGE="http://software.complete.org/missingh"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/hslogger:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/quickcheck
-		dev-haskell/testpack )
-"
-
-# libiconv is needed for the trick below to make it compile with ghc-6.12
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${PN}-1.2.0.2-ghc-7.7.patch")
-
-src_prepare() {
-	base_src_prepare
-	# (non-ASCII non-UTF-8 source breaks hscolour)
-	cd src/System/Time
-	mv ParseDate.hs ParseDate.hs.ISO-8859-1
-	iconv -f ISO-8859-1 -t UTF-8 -c ParseDate.hs.ISO-8859-1 > ParseDate.hs || die "unable to recode ParseDate.hs to UTF-8"
-}
diff --git a/dev-haskell/missingh/missingh-1.2.1.0.ebuild b/dev-haskell/missingh/missingh-1.2.1.0.ebuild
deleted file mode 100644
index 99bcc7bbed06..000000000000
--- a/dev-haskell/missingh/missingh-1.2.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Large utility library"
-HOMEPAGE="http://software.complete.org/missingh"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/hslogger:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/errorcall-eq-instance
-		dev-haskell/quickcheck
-		dev-haskell/testpack )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/missingh/missingh-1.3.0.1.ebuild b/dev-haskell/missingh/missingh-1.3.0.1.ebuild
deleted file mode 100644
index 7c5973af14b6..000000000000
--- a/dev-haskell/missingh/missingh-1.3.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-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://github.com/jgoerzen/missingh/wiki"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/hslogger:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/errorcall-eq-instance
-		dev-haskell/quickcheck
-		dev-haskell/testpack )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.0.1-ghc-8.0.patch"
-}
diff --git a/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
new file mode 100644
index 000000000000..3902a1b62e92
--- /dev/null
+++ b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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
+
+DESCRIPTION="Large utility library"
+HOMEPAGE="https://hackage.haskell.org/package/MissingH"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RESTRICT=test # tests are present for removed modules
+
+RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?]
+	>=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	dev-haskell/random
+	>=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( >=dev-haskell/errorcall-eq-instance-0.3 <dev-haskell/errorcall-eq-instance-0.4
+		>=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=network--ge-3_0_0
+}
diff --git a/dev-haskell/missingh/missingh-1.4.3.0.ebuild b/dev-haskell/missingh/missingh-1.4.3.0.ebuild
deleted file mode 100644
index 2d4e6aecde27..000000000000
--- a/dev-haskell/missingh/missingh-1.4.3.0.ebuild
+++ /dev/null
@@ -1,49 +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.4.9999
-#hackport: flags: network--ge-3-0-0:network-3
-
-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="http://hackage.haskell.org/package/MissingH"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+network-3"
-
-RESTRICT=test # tests are present for removed modules
-
-RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?]
-	>=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
-				>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
-	!network-3? ( >=dev-haskell/network-2.6.3.1:=[profile?] <dev-haskell/network-2.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( >=dev-haskell/errorcall-eq-instance-0.3 <dev-haskell/errorcall-eq-instance-0.4
-		>=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-3 network--ge-3_0_0)
-}
diff --git a/dev-haskell/missingh/missingh-1.6.0.0.ebuild b/dev-haskell/missingh/missingh-1.6.0.0.ebuild
new file mode 100644
index 000000000000..ccd03c06605a
--- /dev/null
+++ b/dev-haskell/missingh/missingh-1.6.0.0.ebuild
@@ -0,0 +1,38 @@
+# 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: +network--ge-3_0_0
+
+CABAL_PN="MissingH"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Large utility library"
+HOMEPAGE="https://hackage.haskell.org/package/MissingH"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?]
+	>=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	|| ( dev-lang/ghc ( >=dev-haskell/process-1.1.0.1[profile?] <dev-haskell/process-1.7[profile?] ) )
+	>=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=network--ge-3_0_0
+}
diff --git a/dev-haskell/mmap/Manifest b/dev-haskell/mmap/Manifest
index 8aeef12b5cf2..fffbf585afb1 100644
--- a/dev-haskell/mmap/Manifest
+++ b/dev-haskell/mmap/Manifest
@@ -1,2 +1 @@
-DIST mmap-0.5.8.tar.gz 11657 BLAKE2B 875557d3f28260028368a8979f398f13e501be507ebdb5bc098935c1ef3dff05fc7b7d7abbf29e632f0368e19b952b466ee7f192cb3cf4f4944009fa525ab7d9 SHA512 6c8b526ec9fedba195ce021f86eeb3fa35f7c95b9299d17503ad7d7e91b9485b3d9980e0ccbdc3876ec465ec8aa07cf9d0521c62e2c8a652a36df11b9badffb5
 DIST mmap-0.5.9.tar.gz 11731 BLAKE2B 1a2133f487f9b214c8a4be3aa91a38ee849b40649b77eec8e656fbd99d32c31761d1daeb474a56e9e0611db631a22828ab20171c6522f324e278ace0de0dac2e SHA512 3b9ac1150050ac9d8e7870610923c8303b5fc74a4fdd796d7b6b411e2ba836111ae8520e16ad345aaf93b4dbcd27abd4c359a89b27d854db8dbd252b90a5298d
diff --git a/dev-haskell/mmap/metadata.xml b/dev-haskell/mmap/metadata.xml
index d6079ee99c4c..32349dd710f5 100644
--- a/dev-haskell/mmap/metadata.xml
+++ b/dev-haskell/mmap/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/mmap/mmap-0.5.8.ebuild b/dev-haskell/mmap/mmap-0.5.8.ebuild
deleted file mode 100644
index e05537cc541d..000000000000
--- a/dev-haskell/mmap/mmap-0.5.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Memory mapped files for POSIX and Windows"
-HOMEPAGE="https://hackage.haskell.org/package/mmap"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-# IUSE="test"
-IUSE=""
-
-RESTRICT="test" # the test suite compile fails: Not in scope: data constructor `Permissions'
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-#		test? ( dev-haskell/hunit[profile?] )" # pcheck dislikes useless depends
-
-src_configure() {
-	cabal_src_configure # $(cabal_flag test mmaptest)
-}
-
-src_test() {
-	# breaking the abstraction a bit, we're not supposed to know about ./setup
-	# and how it works...
-	./dist/build/mmaptest/mmaptest || die "tests failed"
-}
-
-src_install() {
-	cabal_src_install
-
-	rm "${D}/usr/bin/mmaptest"
-	rmdir "${D}/usr/bin" 2> /dev/null # only if empty
-}
diff --git a/dev-haskell/mmap/mmap-0.5.9.ebuild b/dev-haskell/mmap/mmap-0.5.9.ebuild
index 969500d066f2..16646a499746 100644
--- a/dev-haskell/mmap/mmap-0.5.9.ebuild
+++ b/dev-haskell/mmap/mmap-0.5.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.3.3.9999
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Memory mapped files for POSIX and Windows"
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 # IUSE="test"
 IUSE=""
 
diff --git a/dev-haskell/mmorph/Manifest b/dev-haskell/mmorph/Manifest
index 76dd1959b4ea..38b246e4fd92 100644
--- a/dev-haskell/mmorph/Manifest
+++ b/dev-haskell/mmorph/Manifest
@@ -1,5 +1,3 @@
-DIST mmorph-1.0.0.tar.gz 4989 BLAKE2B 75b47cb76d19588bc15d5da9e588edc056ae68b3465ae4e315e39593ba8818fe84138ea9ec2e0dbf82f7fc4568d0cb42d393d212cd5d382d9ed7976a43a18f5b SHA512 789e50edb576c8443003926c697bf977e858d9814704ba6279cbe67c179331fbeb8599bd9284caa4b68808acfd8d8053a006442e29b9e56376b1abfe463e7ad4
-DIST mmorph-1.0.5.tar.gz 6100 BLAKE2B ba8a10e10969fc799c3d4dae49eb2478c9c6b41a1f36e0c6ef265b6dc3aee9a101f323b0ed57666ab3626bcfecdace54948dab4b8a60bf054212b66497fbbde0 SHA512 e39d84cdddb7063a3f8528d0053815305079cc199b9cbab76d860f18a9cc40df8738fde603ea7e83fbf01d3227ec27c5898a67bbdf8fc4bf343f1f5c228a5de0
-DIST mmorph-1.0.6.tar.gz 6504 BLAKE2B 2dd92d3010fa39313d4b1ce8009c62fa23cd5470d8dfe877d52df8a3f2b4c551ec97f10d6a68e9b6cad1620cf7a608164c503dc051a496f314cc04348e8cd915 SHA512 d8d4ca5e017f1a94dc8f4ac02f18de8de201264311d5b7debd9ba405b63e25a63fa83385cc287eb07a31b3e00ec02ce75c2d83f6d354f025e87d24eee911da81
-DIST mmorph-1.0.9.tar.gz 6497 BLAKE2B f30af26a16c4a573cef8bd95301b481cf83f12f87c956cbf387541140c3b1b3eb7cb9a876ac040d6e6cb6e3363747e8d3845b780b9dcd1c990e8dee85377bca0 SHA512 7cabf68a886ddc8d4b4d7b5af528bd1c1d7ff957845eeb7a216dd2e79117d2828740199424ff38525ff825b77fdb5363ddc4a3907c6bc3677674e8d0f8b516bb
 DIST mmorph-1.1.3.tar.gz 6975 BLAKE2B 93316f34fe13ffbf50934394bf7b4831f787e1c79eda625f1ebb5fad92ec143e5744ad0725eec80184c737c8978bf153dad63cdddf153cb69a306ef62dd040cb SHA512 3ef260682b5de48d765f9524abcd6853b5c4bfe94e2ca116ee4077aa0d7e5853f87e8ce1742f59b8753d2c0c3605251188346be7b394fa51d6ff2c5983edc3ec
+DIST mmorph-1.2.0-rev3.cabal 1083 BLAKE2B 82896ec005a74ce05475019f1f72448abef6aeabf96bce5d2b837ce0664ed1225c287f23be9cf7ac145faa7bdd952e866f76a6df29d594bd7aaaccd14cae33e0 SHA512 1f3d778b5d66bde30e37ec18e5507a9bc7a9f6b24bc0c737742cc103744013a97b028c2b026eeccd34bc7f8c2bfa80b2046bf5e2832a2f0e7e73195f463b1f5d
+DIST mmorph-1.2.0.tar.gz 6861 BLAKE2B f79c2fa9ef374ca93755e2ee5b7b3792140266e363b27cb07f95f46f8df0e8e73855b3cbcd4778dc0655c4542642a60dd442dd5e35c8b8750ab19bf6e3ee85bf SHA512 06c9e2b2d7caa65c6049225ba40a54cf9480e561a6ea521b4c83e38094beea0c2ed595244f434793c6964c6161ac3122da5a8b53fe772d527fbefb15e4cc2c14
diff --git a/dev-haskell/mmorph/metadata.xml b/dev-haskell/mmorph/metadata.xml
index 07d736c44973..908cae683347 100644
--- a/dev-haskell/mmorph/metadata.xml
+++ b/dev-haskell/mmorph/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library provides monad morphism utilities, most commonly used
-		for manipulating monad transformer stacks.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">mmorph</remote-id>
+		<remote-id type="github">Gabriella439/Haskell-MMorph-Library</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/mmorph/mmorph-1.0.0.ebuild b/dev-haskell/mmorph/mmorph-1.0.0.ebuild
deleted file mode 100644
index bf58a6e8bd22..000000000000
--- a/dev-haskell/mmorph/mmorph-1.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad morphisms"
-HOMEPAGE="https://hackage.haskell.org/package/mmorph"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8.0.2"
diff --git a/dev-haskell/mmorph/mmorph-1.0.5.ebuild b/dev-haskell/mmorph/mmorph-1.0.5.ebuild
deleted file mode 100644
index 195fa3ebf625..000000000000
--- a/dev-haskell/mmorph/mmorph-1.0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad morphisms"
-HOMEPAGE="https://hackage.haskell.org/package/mmorph"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/mmorph/mmorph-1.0.6.ebuild b/dev-haskell/mmorph/mmorph-1.0.6.ebuild
deleted file mode 100644
index db85cd515dd9..000000000000
--- a/dev-haskell/mmorph/mmorph-1.0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad morphisms"
-HOMEPAGE="https://hackage.haskell.org/package/mmorph"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/mmorph/mmorph-1.0.9.ebuild b/dev-haskell/mmorph/mmorph-1.0.9.ebuild
deleted file mode 100644
index 3c31ca6e984f..000000000000
--- a/dev-haskell/mmorph/mmorph-1.0.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad morphisms"
-HOMEPAGE="https://hackage.haskell.org/package/mmorph"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/mmorph/mmorph-1.1.3.ebuild b/dev-haskell/mmorph/mmorph-1.1.3.ebuild
index de9f02525959..1055678865db 100644
--- a/dev-haskell/mmorph/mmorph-1.1.3.ebuild
+++ b/dev-haskell/mmorph/mmorph-1.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Monad morphisms"
-HOMEPAGE="http://hackage.haskell.org/package/mmorph"
+HOMEPAGE="https://hackage.haskell.org/package/mmorph"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/mmorph/mmorph-1.2.0.ebuild b/dev-haskell/mmorph/mmorph-1.2.0.ebuild
new file mode 100644
index 000000000000..d6a1729ee0f2
--- /dev/null
+++ b/dev-haskell/mmorph/mmorph-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monad morphisms"
+HOMEPAGE="https://hackage.haskell.org/package/mmorph"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/mockery/Manifest b/dev-haskell/mockery/Manifest
index 97a32fe57323..4ab0edde446c 100644
--- a/dev-haskell/mockery/Manifest
+++ b/dev-haskell/mockery/Manifest
@@ -1,3 +1 @@
-DIST mockery-0.3.2.tar.gz 3421 BLAKE2B 3f0a3a8f8dddc1b607e38922048abfa82bf77d1a96945f1ceb795d74c93aec5af6fcc61656c001be9ad99087b8689de8ab0cca7b90a415ce6e2ac8fb044626a4 SHA512 f9b94c205a1fa6c0da93b4859d0e541fdb887470213a1ef3e38468c7d2561803389b3497718936a3b79d20c78708b49d2f8941be4dde95d62ef335752c6f3626
-DIST mockery-0.3.3.tar.gz 3952 BLAKE2B 6bc93493b19e4b2a24c8a6ea4b75503ebc8c435d082f7805feb0f004e65ba7654bc4c12324c4b935272bfed082faa52f8b9a424495c07bf6eb7a813cce5ed5d1 SHA512 090f2a9400c958b6ae89a8ebfceff156da16588ad20e4da1c155db281bc40bbafc0335607ca3ab888d87b0da820cc5a3a1ba8bd7e231ab19d6ff3adf519b6be1
 DIST mockery-0.3.5.tar.gz 4040 BLAKE2B ca8b761639822947f030bad0dcdd227aa188c568404c2b3f30602d85bd03544e773dfa9ada57be369c8a1e9fa93417bd80b379b51578e7f118270b6694d1bf30 SHA512 bcb9bef083749028ec27ba879feca7c7a8f966f50b31fe1df3e82b3ac206b634b961755e4ee90ebc72ba8c17be3bbab6acf1b01776bca9497cc5cbc1ccb58850
diff --git a/dev-haskell/mockery/metadata.xml b/dev-haskell/mockery/metadata.xml
index 30af892f6ecf..937381521944 100644
--- a/dev-haskell/mockery/metadata.xml
+++ b/dev-haskell/mockery/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Support functions for automated testing
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/mockery/mockery-0.3.2.ebuild b/dev-haskell/mockery/mockery-0.3.2.ebuild
deleted file mode 100644
index 5a9ebe271f7f..000000000000
--- a/dev-haskell/mockery/mockery-0.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support functions for automated testing"
-HOMEPAGE="https://hackage.haskell.org/package/mockery"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/logging-facade:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/mockery/mockery-0.3.3.ebuild b/dev-haskell/mockery/mockery-0.3.3.ebuild
deleted file mode 100644
index 4c90af078930..000000000000
--- a/dev-haskell/mockery/mockery-0.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support functions for automated testing"
-HOMEPAGE="https://hackage.haskell.org/package/mockery"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base-compat:=[profile?]
-	dev-haskell/logging-facade:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 )
-"
diff --git a/dev-haskell/mockery/mockery-0.3.5.ebuild b/dev-haskell/mockery/mockery-0.3.5.ebuild
index 54ec0bf08ddc..2b4c0f1ba340 100644
--- a/dev-haskell/mockery/mockery-0.3.5.ebuild
+++ b/dev-haskell/mockery/mockery-0.3.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.3.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/base-compat:=[profile?]
diff --git a/dev-haskell/monad-control/Manifest b/dev-haskell/monad-control/Manifest
index a9ce7add42a8..c1bad6539efd 100644
--- a/dev-haskell/monad-control/Manifest
+++ b/dev-haskell/monad-control/Manifest
@@ -1,5 +1,2 @@
-DIST monad-control-0.3.2.2.tar.gz 10684 BLAKE2B 4bb1e101a24f3d1209698dc99d53beaef40109f442d6c2690428cfb96f34a9b19138565974870fb0c24a2deeb4168cb127a9a426879dd829a78269a1071e2e9c SHA512 4ae7959347a83a781bef6275f4880b53d1c67a9ef5d1bc32c3337797bb991df71c4df71206073a12e46a1512e3290d474a03b0c4ae6496316f41f4248c0c8de9
-DIST monad-control-0.3.3.0.tar.gz 10518 BLAKE2B 8ef230a6cf1999c5549cf8a4889933a0f05cc07972ee6e40877435e42fcdfb7487942cf71775dfdf49b00e4461f1a26d52afedc840a8d2c1a3acc3e84b7fa96e SHA512 734ca14baea74f9bd6f3603dc84426bd6d79ae23998ffcce5c8b994dfa8d58b8a573e7b0f68f7eaab07163c8806d8d5f95160f0439cc5fbd07b9509c84e4ef8a
-DIST monad-control-1.0.0.4.tar.gz 10709 BLAKE2B c8c017ddcae0b7e6cc7647fcf0153fa28d525e1262798e2aebdef8ef027090f934636f633788e43d3b66ce822917278c1940e4093612110e2d7944c76c973606 SHA512 98a5448cf01a0310d2c16b648d02ea6643e30271046324d0f1bbea132e9f81a54fe6bb1700877b1ea4c8e291cefac81394bfaec089ea661fcbf4c04c9596bded
-DIST monad-control-1.0.1.0.tar.gz 11115 BLAKE2B f11ebe4f3dd1060ac9a852646c52ecbf15a4c022483ad030a43b4a78f00330545ca89c75f8d2d05652a6f662ed783f53a880c40d19c7740637344c3c3baf1f76 SHA512 f1dde1d46dac0a1aff8525729cc499f6aa7f5b0ddda37d120599b8b1925e653adfb2694aa24cfecd0da8b5dde95ec22fced0ecbb5dd600bc5b0c2b8da656224a
 DIST monad-control-1.0.2.3.tar.gz 13864 BLAKE2B c150338e8a585dc045fd23404719fe61a2367f7308e15344f81549fd7f0808ef8fa2238a35b0a7c7984d26885352186bd6bf43359dec68b2df93581b021dd794 SHA512 59837326ec9f25220cb6c7329c91a5806b0ec7412d6af24c0f0d52c4fd93b084e92edd4f5f61a4f9c4248034fa540c23b65d2aacdfca737ece98bb132b8f08d4
+DIST monad-control-1.0.3.1.tar.gz 13985 BLAKE2B b7dbf0b579ca114190cfe6a5400950d20825f7455a4924154e8416dd475eafa81310c397f3283e5d77ac70e158caf46f34fe5214b989ae2bd051de1968cde704 SHA512 b82ac2d3b2ab1892f79bab1341c9ff17ea89b988438cfd40c246f5ffe4560cb2b77e4a1ed1aa9dc2bb64644b9d6da76eda7b40acf8cc34bb03e77b18127e93a1
diff --git a/dev-haskell/monad-control/metadata.xml b/dev-haskell/monad-control/metadata.xml
index 7edd4dbbacf6..e1666433271d 100644
--- a/dev-haskell/monad-control/metadata.xml
+++ b/dev-haskell/monad-control/metadata.xml
@@ -1,41 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package defines the type class @MonadControlIO@, a subset of
-		@MonadIO@ into which generic control operations such as @catch@ can
-		be lifted from @IO@.  Instances are based on monad transformers in
-		@MonadTransControl@, which includes all standard monad transformers
-		in the @transformers@ library except @ContT@.  For convenience, it
-		provides a wrapped version of @Control.Exception@ with types
-		generalized from @IO@ to all monads in @MonadControlIO@.
-
-		Note that this package is a rewrite of Anders Kaseorg's @monad-peel@ library.
-		The main difference is that this package provides CPS style
-		operators and exploits the @RankNTypes@ language extension to
-		simplify most definitions.
-
-		The package includes a copy of the @monad-peel@ testsuite written by Anders Kaseorg.
-		The tests can be performed by using @cabal test@.
-
-		The following @critertion@ based benchmark shows that @monad-control@
-		is on average about 2.5 times faster than @monad-peel@:
-
-		&lt;https://github.com/basvandijk/bench-monad-peel-control&gt;
-	</longdescription>
-	<use>
-		<flag name="instancest">
-			If enabled this package will export
-			MonadBaseControl instances for the lazy and strict ST monad. If disabled these
-			instances are only exported when base &gt;= 4.4. If enabled it is required that
-			the transformer-base package exports MonadBase instances for ST. It will do
-			this by default.
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">basvandijk/monad-control</remote-id>
 	</upstream>
diff --git a/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild b/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild
deleted file mode 100644
index aa45de968c64..000000000000
--- a/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+instancest"
-
-RDEPEND=">=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag instancest instancest)
-}
diff --git a/dev-haskell/monad-control/monad-control-0.3.3.0.ebuild b/dev-haskell/monad-control/monad-control-0.3.3.0.ebuild
deleted file mode 100644
index 0eca556fefda..000000000000
--- a/dev-haskell/monad-control/monad-control-0.3.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+instancest"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag instancest instancest)
-}
diff --git a/dev-haskell/monad-control/monad-control-1.0.0.4.ebuild b/dev-haskell/monad-control/monad-control-1.0.0.4.ebuild
deleted file mode 100644
index ca4758a4fab7..000000000000
--- a/dev-haskell/monad-control/monad-control-1.0.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild b/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
deleted file mode 100644
index e0e77ad6bfdc..000000000000
--- a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild b/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
index 6619429ed548..2135619b8435 100644
--- a/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
+++ b/dev-haskell/monad-control/monad-control-1.0.2.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
diff --git a/dev-haskell/monad-control/monad-control-1.0.3.1.ebuild b/dev-haskell/monad-control/monad-control-1.0.3.1.ebuild
new file mode 100644
index 000000000000..096011c07e8b
--- /dev/null
+++ b/dev-haskell/monad-control/monad-control-1.0.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
+HOMEPAGE="https://github.com/basvandijk/monad-control"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
+	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/monad-journal/Manifest b/dev-haskell/monad-journal/Manifest
deleted file mode 100644
index b957cf2ef484..000000000000
--- a/dev-haskell/monad-journal/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST monad-journal-0.7.1.tar.gz 4582 BLAKE2B c1fc8f48cd961491676a418434879bb4e99218cbc400b6673c86756617a66281774bee11b77cd6545aa3187827696708b27479c2a77885ab384f2c64ef6a132b SHA512 5a19f49d05aa00e558b1a945c2064342bc265d8579767903d0080a5c8bc39ced8b871922d2e4b50dbbcc73d431b4784b1ec66ee1a53df97898eaf6c8ed23d7ab
-DIST monad-journal-0.7.2.tar.gz 4568 BLAKE2B d9a265d972c298ed2c8490b0c6508df8e51b9fe3b7daf585543ec5344cc29495bcfb95acb8ca264a6f4e4af91813f34162d57586792f965e751b4ebf3447ee5f SHA512 13ffe40a991d3862b14fca1d7fe7202eb70d0c13a2e3d1adff4aec68afab7ce44607ece28297a32f04e12620c2d414e0924aa8068ee9485d431885ce7effe8c9
-DIST monad-journal-0.8.1.tar.gz 4694 BLAKE2B a9e901bd3dc049f3565fb3c07289040840205499226c66b14804631cb7e9fbc24fed76cd4d376e7b44552d577831867272574ae759bc18a0795c70cc6b237d40 SHA512 3fbc984b3f74d24fca71bc2530832f3748a64e636adfd504fe48e86fefabe53b0911e5b173b6acbbd85128c11f5bd2a7079d6c3fd622148aee7b56f26173379d
diff --git a/dev-haskell/monad-journal/metadata.xml b/dev-haskell/monad-journal/metadata.xml
deleted file mode 100644
index a393bafd2d26..000000000000
--- a/dev-haskell/monad-journal/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a typeclass for logging in
-		pure code, or more generally, in any kind of
-		context. You can do whatever you want with
-		logs, especially get them, clear them or even
-		sink them through `IO` if you're logging in
-		`(MonadIO m) =&gt; m`.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">phaazon/monad-journal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-journal/monad-journal-0.7.1.ebuild b/dev-haskell/monad-journal/monad-journal-0.7.1.ebuild
deleted file mode 100644
index 9c2779250b14..000000000000
--- a/dev-haskell/monad-journal/monad-journal-0.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pure logger typeclass and monad transformer"
-HOMEPAGE="https://github.com/phaazon/monad-journal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/either-4.1:=[profile?] <dev-haskell/either-4.5:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/monad-journal/monad-journal-0.7.2.ebuild b/dev-haskell/monad-journal/monad-journal-0.7.2.ebuild
deleted file mode 100644
index aa067e42b2b2..000000000000
--- a/dev-haskell/monad-journal/monad-journal-0.7.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pure logger typeclass and monad transformer"
-HOMEPAGE="https://github.com/phaazon/monad-journal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/either-4.1:=[profile?] <dev-haskell/either-4.5:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/monad-journal/monad-journal-0.8.1.ebuild b/dev-haskell/monad-journal/monad-journal-0.8.1.ebuild
deleted file mode 100644
index 152da2b02274..000000000000
--- a/dev-haskell/monad-journal/monad-journal-0.8.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pure logger typeclass and monad transformer"
-HOMEPAGE="https://github.com/phaazon/monad-journal"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/monad-logger/Manifest b/dev-haskell/monad-logger/Manifest
index bafba742f815..223ded43c68e 100644
--- a/dev-haskell/monad-logger/Manifest
+++ b/dev-haskell/monad-logger/Manifest
@@ -1,4 +1,2 @@
-DIST monad-logger-0.3.17.tar.gz 7871 BLAKE2B aaed5e4267d1b851bd632fae3627e2e43fdda8306c9dfc062c2cbd684b4964714c1128a378b53be2e04252c0344eed52d571f6bd297deff2be5d4b334b14ab69 SHA512 7905a9cec560e3fbe617e28d9a006d744ae6662a23c4f19807a11c0ca409cf4cf994175d528f000af53804b14ed1beceb8e4c7c4dd9b1a480d506e9455a6e6e0
-DIST monad-logger-0.3.18.tar.gz 8094 BLAKE2B 5c5025e936012773b2c6721af2ec8c81c16f23ece9a817f93425e31ed50d064db36a2917cdb49aefbc30bd14a4571da9e29d0ecbd04b6109d4c0d148ec84675e SHA512 30b309b441a3be81e209e7aabc9cf712d7a436e89833c84d74ae9b1011bb55bab77e728882670ef6877c32657b30b65c09997867ad0318fc4dced8751db90e9c
-DIST monad-logger-0.3.20.1.tar.gz 9034 BLAKE2B fda6ecb84b8df5f969c2c36daae32b36db36bf0365d28d3942de71da77f6ceb76fe9342f9e430c35d74f40cbccd713bc8e04c8e0bf4ce36289192998421ddb60 SHA512 f8d70d2620e5f24e283c484215ae1ef3ef7db854ba65b0e16938ab4589d0600543b1f06934e98ba374982433bb831613882280645cea5076f9a9da7bf6426faa
 DIST monad-logger-0.3.32.tar.gz 10984 BLAKE2B d03a94f9b207e5a64a150140d9b4dcdd56e6ca28db1f371c08ffb9d35168602b8cbe478b19b47fdb38e69f0d08431f3a2a98b7ea916448079d27674bb70cf454 SHA512 d65fad10fc4bcc5a597c7a9b03b9e275c40ef7c930d1b7f703115c2f18b8bd3c5a42b4c3cc445889e0878e62709c62fdf5f0b2b60d1a15430064f11853b01ef3
+DIST monad-logger-0.3.40.tar.gz 11909 BLAKE2B 8c61039a2f104e7f257fb4c4b49f69b8a3337445379b0305f2c6de1a354cc17502efb760eda11217253e442da009cf4c303b145d6868ef48aafe2cb3522dd927 SHA512 a4dd32624a9feb399cf30f107b591742ac558180cb3220acb91f833459c9c525947efd5e8c5961a079c8a5b06263ff7a9a8a9a73067031f4551d6dec4a1db218
diff --git a/dev-haskell/monad-logger/metadata.xml b/dev-haskell/monad-logger/metadata.xml
index d83f8eff0123..635423e6f19e 100644
--- a/dev-haskell/monad-logger/metadata.xml
+++ b/dev-haskell/monad-logger/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="template-haskell">Enable Template Haskell support.</flag>
+		<flag name="template-haskell">Enable Template Haskell support</flag>
 	</use>
-	<longdescription>
-		This package uses template-haskell for determining source code locations of messages.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">kazu-yamamoto/logger</remote-id>
+		<remote-id type="hackage">monad-logger</remote-id>
+		<remote-id type="github">snoyberg/monad-logger</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.17.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.17.ebuild
deleted file mode 100644
index 3581010b8cda..000000000000
--- a/dev-haskell/monad-logger/monad-logger-0.3.17.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class of monads which can log messages"
-HOMEPAGE="https://github.com/kazu-yamamoto/logger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/monad-loops:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/stm-chans:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag template-haskell template_haskell)
-}
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.18.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.18.ebuild
deleted file mode 100644
index 3581010b8cda..000000000000
--- a/dev-haskell/monad-logger/monad-logger-0.3.18.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class of monads which can log messages"
-HOMEPAGE="https://github.com/kazu-yamamoto/logger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/monad-loops:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/stm-chans:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag template-haskell template_haskell)
-}
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.20.1.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.20.1.ebuild
deleted file mode 100644
index 80839a7944ce..000000000000
--- a/dev-haskell/monad-logger/monad-logger-0.3.20.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A class of monads which can log messages"
-HOMEPAGE="https://github.com/kazu-yamamoto/logger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.0:=[profile?] <dev-haskell/conduit-extra-1.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/fast-logger-2.0:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	dev-haskell/lifted-base:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/monad-loops:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/stm-chans:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag template-haskell template_haskell)
-}
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
index 1259e939884f..cd3925731c53 100644
--- a/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
+++ b/dev-haskell/monad-logger/monad-logger-0.3.32.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+template-haskell"
 
 RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
diff --git a/dev-haskell/monad-logger/monad-logger-0.3.40.ebuild b/dev-haskell/monad-logger/monad-logger-0.3.40.ebuild
new file mode 100644
index 000000000000..b7dd487f6680
--- /dev/null
+++ b/dev-haskell/monad-logger/monad-logger-0.3.40.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A class of monads which can log messages"
+HOMEPAGE="https://github.com/snoyberg/monad-logger#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/conduit-extra-1.1:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+	>=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-3.3:=[profile?]
+	dev-haskell/lifted-base:=[profile?]
+	>=dev-haskell/monad-control-1.0:=[profile?]
+	dev-haskell/monad-loops:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+	dev-haskell/stm-chans:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag template-haskell template_haskell)
+}
diff --git a/dev-haskell/monad-loops/metadata.xml b/dev-haskell/monad-loops/metadata.xml
index c766ee1f8714..554c1d669480 100644
--- a/dev-haskell/monad-loops/metadata.xml
+++ b/dev-haskell/monad-loops/metadata.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Some useful control operators for looping.
-		
-		New in 0.3.2.0: various functions for traversing lists and
-		computing minima/maxima using arbitrary procedures to compare
-		or score the elements.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">mokus0/monad-loops</remote-id>
 	</upstream>
diff --git a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild b/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
index 20fd3dd4b280..1e179635696a 100644
--- a/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
+++ b/dev-haskell/monad-loops/monad-loops-0.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/monad-par-extras/metadata.xml b/dev-haskell/monad-par-extras/metadata.xml
index 75de66f9460a..e1a3773f73a0 100644
--- a/dev-haskell/monad-par-extras/metadata.xml
+++ b/dev-haskell/monad-par-extras/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..3eea1c28d5de
--- /dev/null
+++ b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Combinators and extra features for Par monads"
+HOMEPAGE="https://github.com/simonmar/monad-par"
+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/abstract-par-0.3:=[profile?] <dev-haskell/abstract-par-0.4:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/mtl-2.0:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3.ebuild b/dev-haskell/monad-par-extras/monad-par-extras-0.3.3.ebuild
deleted file mode 100644
index a8cf4eb3f96f..000000000000
--- a/dev-haskell/monad-par-extras/monad-par-extras-0.3.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Combinators and extra features for Par monads"
-HOMEPAGE="https://github.com/simonmar/monad-par"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/abstract-par-0.3*:=[profile?]
-		>=dev-haskell/cereal-0.3:=[profile?]
-		>=dev-haskell/mtl-2.0:=[profile?]
-		>=dev-haskell/random-1.0:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/monad-par/Manifest b/dev-haskell/monad-par/Manifest
index 68747cde1814..7fbec42aafeb 100644
--- a/dev-haskell/monad-par/Manifest
+++ b/dev-haskell/monad-par/Manifest
@@ -1,3 +1,2 @@
-DIST monad-par-0.3.4.7.tar.gz 30411 BLAKE2B b7ed0e6e10c992fb3c2cb75813f180b6124215902aa5decd66d96ada7fc14623a3a1b2c4cfe9cf863087643091ebe24da3099e4f4652a4d1fce17f5cd71eb2f0 SHA512 eb9bd155589e9e7aea51e8b79f7fca20cfc8ac0dabf9c475fbbb312139311d567e1f19779247fd331c8242c93c9cefc1d52fca599c6444f90194d2a193182772
-DIST monad-par-0.3.4.8.tar.gz 30583 BLAKE2B c0d31959d7f1b50eb763810e4199b2a7a27b8ca202f078d23b6ae5c62f94cadbf5f7169959e577d59d0bb85cfe450af06e71b85410573ec50f37d9c36b458411 SHA512 6d2f6f571a3eef804e69ca892cf865bb169863d4fa97cad94cfb740925861b827fef14595c2edf235a8a60babdb854eecb87ff09bb798a6912edb7c3c6fe7027
+DIST monad-par-0.3.5-rev2.cabal 6536 BLAKE2B a9181b9df868e6dfcde1faa49cb0761ff79b28b4faba19213b58243fbd4e9d19f493beda6e8324ca6eaaa3a710d64e489a31e0b391d35f6f3996cfe16999127d SHA512 033b672b05222115e5c7d6c22f2333f7482fa7d4eacbc60b59139eb65e5b1fe9ca368d83f0090f0021297e3bbfa660c5af32189d3cca9af4679b6919d7883a57
 DIST monad-par-0.3.5.tar.gz 31675 BLAKE2B 02299d3a6813618e43d2786bb6963d1fda74fe50f84f2ada86890e87b38803ef1a1042dddc83c8e813cd9b1461710991a37900ee059222ecf65dc7706ed99450 SHA512 0843753f5a1465f46ade4c60b0707a07e996f12b13f8248e4c3dc6eeb5f0b8b4a321acb4dff685d17ef52d36db32cec5564e6492f7027c9d93f03c5780895b9c
diff --git a/dev-haskell/monad-par/metadata.xml b/dev-haskell/monad-par/metadata.xml
index 42da13462ec1..31e4f277f2d8 100644
--- a/dev-haskell/monad-par/metadata.xml
+++ b/dev-haskell/monad-par/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/monad-par/monad-par-0.3.4.7.ebuild b/dev-haskell/monad-par/monad-par-0.3.4.7.ebuild
deleted file mode 100644
index e33c0c1a48f1..000000000000
--- a/dev-haskell/monad-par/monad-par-0.3.4.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -newgeneric
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for parallel programming based on a monad"
-HOMEPAGE="https://github.com/simonmar/monad-par"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="chaselev"
-
-RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
-	dev-haskell/abstract-par:=[profile?]
-	>=dev-haskell/monad-par-extras-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?]
-	>=dev-haskell/mwc-random-0.11:=[profile?]
-	>=dev-haskell/parallel-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	chaselev? ( dev-haskell/chaselev-deque:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3
-		dev-haskell/test-framework-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag chaselev chaselev) \
-		--flag=-newgeneric
-}
diff --git a/dev-haskell/monad-par/monad-par-0.3.4.8.ebuild b/dev-haskell/monad-par/monad-par-0.3.4.8.ebuild
deleted file mode 100644
index 9e9ed56788fc..000000000000
--- a/dev-haskell/monad-par/monad-par-0.3.4.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -newgeneric
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for parallel programming based on a monad"
-HOMEPAGE="https://github.com/simonmar/monad-par"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="chaselev"
-
-RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
-	dev-haskell/abstract-par:=[profile?]
-	>=dev-haskell/monad-par-extras-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?]
-	>=dev-haskell/mwc-random-0.11:=[profile?]
-	>=dev-haskell/parallel-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	chaselev? ( dev-haskell/chaselev-deque:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3
-		dev-haskell/test-framework-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag chaselev chaselev) \
-		--flag=-newgeneric
-}
diff --git a/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild b/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..fd2b9fa54cfc
--- /dev/null
+++ b/dev-haskell/monad-par/monad-par-0.3.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: -newgeneric,-chaselev
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library for parallel programming based on a monad"
+HOMEPAGE="https://github.com/simonmar/monad-par"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="chaselev"
+
+RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
+	dev-haskell/abstract-par:=[profile?]
+	>=dev-haskell/monad-par-extras-0.3:=[profile?]
+	>=dev-haskell/mwc-random-0.11:=[profile?]
+	>=dev-haskell/parallel-3.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit
+		>=dev-haskell/test-framework-quickcheck2-0.3
+		dev-haskell/test-framework-th )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-chaselev \
+		--flag=-newgeneric
+}
diff --git a/dev-haskell/monad-par/monad-par-0.3.5.ebuild b/dev-haskell/monad-par/monad-par-0.3.5.ebuild
deleted file mode 100644
index a82a39857566..000000000000
--- a/dev-haskell/monad-par/monad-par-0.3.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: -newgeneric
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library for parallel programming based on a monad"
-HOMEPAGE="https://github.com/simonmar/monad-par"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="chaselev"
-
-RDEPEND=">=dev-haskell/abstract-deque-0.1.4:=[profile?]
-	dev-haskell/abstract-par:=[profile?]
-	>=dev-haskell/monad-par-extras-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?]
-	>=dev-haskell/mwc-random-0.11:=[profile?]
-	>=dev-haskell/parallel-3.1:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	chaselev? ( dev-haskell/chaselev-deque:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		>=dev-haskell/test-framework-quickcheck2-0.3
-		dev-haskell/test-framework-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag chaselev chaselev) \
-		--flag=-newgeneric
-}
diff --git a/dev-haskell/monad-parallel/Manifest b/dev-haskell/monad-parallel/Manifest
new file mode 100644
index 000000000000..34a80309842d
--- /dev/null
+++ b/dev-haskell/monad-parallel/Manifest
@@ -0,0 +1 @@
+DIST monad-parallel-0.8.tar.gz 6414 BLAKE2B 84e240ece3100fc75686b6cb548c9118d3d8515994a3302a0c9599d6dcf3dc12ad3027702452d917cc8b26057013b0045454188923210a34e4c82808c23b82e8 SHA512 28231723034ac7a224034d1a8ba6618d38a2abfa139b3185bb8c0d08bc42d265ca8e0564a8f01e9ba2b50b72f789e084bd1aadae730e48b7ed105557c96c6959
diff --git a/dev-haskell/monad-parallel/metadata.xml b/dev-haskell/monad-parallel/metadata.xml
new file mode 100644
index 000000000000..f5df80165715
--- /dev/null
+++ b/dev-haskell/monad-parallel/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">monad-parallel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/monad-parallel/monad-parallel-0.8.ebuild b/dev-haskell/monad-parallel/monad-parallel-0.8.ebuild
new file mode 100644
index 000000000000..436a92d3daf6
--- /dev/null
+++ b/dev-haskell/monad-parallel/monad-parallel-0.8.ebuild
@@ -0,0 +1,24 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Parallel execution of monadic computations"
+HOMEPAGE="https://hub.darcs.net/blamario/SCC.wiki/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/parallel:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/monad-unlift/Manifest b/dev-haskell/monad-unlift/Manifest
deleted file mode 100644
index 146b4bb04933..000000000000
--- a/dev-haskell/monad-unlift/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monad-unlift-0.2.0.tar.gz 5845 BLAKE2B a5677a6356678b5bf508d4b06552d452c7d396bf48d9fa37969bdc50da91f0c1f0caacd294e01c1046a3b3930216263cfb7ba8a163d6a2299e843f8555828889 SHA512 4b9db8679532e89c05c63328603bc7e72131b79d31e35225e8655ddc4d32e761de58c6db70bfdde2c148f105daa57ff08976cb79bddbdc99f85f083f8183afb3
diff --git a/dev-haskell/monad-unlift/metadata.xml b/dev-haskell/monad-unlift/metadata.xml
deleted file mode 100644
index 40e23bd3fbfc..000000000000
--- a/dev-haskell/monad-unlift/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		See README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/monad-unlift</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild b/dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild
deleted file mode 100644
index 4be9be28fbf5..000000000000
--- a/dev-haskell/monad-unlift/monad-unlift-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Typeclasses for representing monad transformer unlifting"
-HOMEPAGE="https://github.com/fpco/monad-unlift"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/constraints:=[profile?]
-	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/monadcatchio-mtl/Manifest b/dev-haskell/monadcatchio-mtl/Manifest
deleted file mode 100644
index a7e459fa0887..000000000000
--- a/dev-haskell/monadcatchio-mtl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MonadCatchIO-mtl-0.3.1.0.tar.gz 1730 BLAKE2B 30d1b5d3f83fd09a1b3e78848d7c1a664374294cde8fca4c60546490adcf9fb14584d7ecf6fe5ec2033b76e0dddb6c367157595f87ac544ac5aaaae7db01bb97 SHA512 b39deb663e1f1aaed287fdcb52d3c452dae32b92ddac3a19e96d37fa7e4605b5631130d92759d28834f90a12e3eab2f0131cf72b2501b5ff1e36723cc0e19d02
diff --git a/dev-haskell/monadcatchio-mtl/metadata.xml b/dev-haskell/monadcatchio-mtl/metadata.xml
deleted file mode 100644
index 6428af9ccf7a..000000000000
--- a/dev-haskell/monadcatchio-mtl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		Provides a monad-transformer version of the @Control.Exception.catch@
-		function. For this, it defines the @MonadCatchIO@ class, a subset of
-		@MonadIO@. It defines proper instances for most monad transformers in
-		the 'mtl' library.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild b/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild
deleted file mode 100644
index 09027fb66cb4..000000000000
--- a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadCatchIO-mtl"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Monad-transformer version of the Control.Exception module"
-HOMEPAGE="http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-	>=dev-haskell/monadcatchio-transformers-0.3.1.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'MonadCatchIO-transformers==0.3.1.0' 'MonadCatchIO-transformers>=0.3.1.0'
-}
diff --git a/dev-haskell/monadcatchio-transformers/Manifest b/dev-haskell/monadcatchio-transformers/Manifest
deleted file mode 100644
index 9780a28f90d1..000000000000
--- a/dev-haskell/monadcatchio-transformers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MonadCatchIO-transformers-0.3.1.3.tar.gz 4526 BLAKE2B d7fd79bf3cb2ace84c969d2566cdd0bb2641452b159c064d4a4bec87deadb1533fae8978bc32e97c661a753ac225caa26eaf37250398306cccd15a8619a081b1 SHA512 7794596851f59bcf3cc60e69bbad7c32f2f35fb4c9b1f53455e92d38503539b06dc50d4a9633ed3b6855bdfd0d69d41c37805c727025a81e9841d0819fea684c
diff --git a/dev-haskell/monadcatchio-transformers/metadata.xml b/dev-haskell/monadcatchio-transformers/metadata.xml
deleted file mode 100644
index c5eb3035ebf1..000000000000
--- a/dev-haskell/monadcatchio-transformers/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides functions to throw and catch exceptions. Unlike the functions from
-		@Control.Exception@, which work in @IO@, these work in any stack of monad
-		transformers (from the 'transformers' package) with @IO@ as the base monad.
-		You can extend this functionality to other monads, by creating an instance
-		of the @MonadCatchIO@ class.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
deleted file mode 100644
index e4729f3c913a..000000000000
--- a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadCatchIO-transformers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Monad-transformer compatible version of the Control.Exception module"
-HOMEPAGE="https://hackage.haskell.org/package/MonadCatchIO-transformers"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'base < 4.9' 'base' \
-		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
diff --git a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild
deleted file mode 100644
index ab0c6668fca2..000000000000
--- a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadCatchIO-transformers"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Monad-transformer compatible version of the Control.Exception module"
-HOMEPAGE="https://hackage.haskell.org/package/MonadCatchIO-transformers"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
-	>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadlib/Manifest b/dev-haskell/monadlib/Manifest
deleted file mode 100644
index 3d0205a7021b..000000000000
--- a/dev-haskell/monadlib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monadLib-3.10.tar.gz 11475 BLAKE2B d77ba15ab1e4a535a265d4d8f4cd9b6f6cf57e030cd241d5d92e96ab943f895b1102174b65e229f2f39b80732d0a203615c65ff44cd9b24f970ae6dd62f20dfc SHA512 db579c362e1a5d7737c3cadd8cc3cfaea620fc9ee3057a00f1400c84b3d25b52d91a192553898c4ee51f0d8a6ad4a66a4e97bc10bf132b1955abb89cfc4b053d
diff --git a/dev-haskell/monadlib/metadata.xml b/dev-haskell/monadlib/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/monadlib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/monadlib/monadlib-3.10.ebuild b/dev-haskell/monadlib/monadlib-3.10.ebuild
deleted file mode 100644
index af1edb68c810..000000000000
--- a/dev-haskell/monadlib/monadlib-3.10.ebuild
+++ /dev/null
@@ -1,29 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="monadLib"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A collection of monad transformers"
-HOMEPAGE="https://wiki.github.com/yav/monadlib"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadplus/Manifest b/dev-haskell/monadplus/Manifest
deleted file mode 100644
index e2a0736ac90b..000000000000
--- a/dev-haskell/monadplus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monadplus-1.4.2.tar.gz 3671 BLAKE2B b256d49436933b446d3aa74e23ea778a6cf092cb858eb8ad1024adc370caeec6a1153a7cba7a25507213f758c3393c9040f354ca5238f8950b3bab6153d8416e SHA512 839a35b3de1226e177c07e30b86e841ddd19075d3ce29fa7154fefb371d9bef8aa85847d7c139faad93713d5b7889979498097f69c6e3bccfcee2fbbf7bf6539
diff --git a/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch b/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch
deleted file mode 100644
index feebd15b06b0..000000000000
--- a/dev-haskell/monadplus/files/monadplus-1.4.2-ghc-8.4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 63978a11cc1a512e564237e83060e9aa29ebce73 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9s=20Sicard-Ram=C3=ADrez?= <asr@eafit.edu.co>
-Date: Sun, 7 Jan 2018 23:52:32 -0500
-Subject: [PATCH] Added Semigroup instance.
-
-The instance was required by GHC 8.4.1-alpha1.
----
- src/Control/Monad/Plus.hs | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/Control/Monad/Plus.hs b/src/Control/Monad/Plus.hs
-index 25f4782..654d133 100644
---- a/src/Control/Monad/Plus.hs
-+++ b/src/Control/Monad/Plus.hs
-@@ -1,5 +1,5 @@
-
--{-# LANGUAGE DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE CPP, DeriveFunctor, DeriveFoldable, GeneralizedNewtypeDeriving #-}
-
- -------------------------------------------------------------------------------------
- -- |
-@@ -263,6 +263,9 @@ instance Category Partial where
-
- instance Monoid (Partial a b) where
-     mempty  = mzero
-+#if !MIN_VERSION_base(4,11,0)
-     mappend = mplus
--
--
-+#else
-+instance Semigroup (Partial a b) where
-+  (<>) = mappend
-+#endif
diff --git a/dev-haskell/monadplus/metadata.xml b/dev-haskell/monadplus/metadata.xml
deleted file mode 100644
index 493cefbbe2f9..000000000000
--- a/dev-haskell/monadplus/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Filtering and folding over arbitrary `MonadPlus` instances.
-		This package generalizes many common stream operations such as
-		`filter`, `catMaybes` etc.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild b/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
deleted file mode 100644
index 3c0e06d76c7d..000000000000
--- a/dev-haskell/monadplus/monadplus-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell98 partial maps and filters over MonadPlus"
-HOMEPAGE="https://hackage.haskell.org/package/monadplus"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.4.patch)
diff --git a/dev-haskell/monadplus/monadplus-1.4.2.ebuild b/dev-haskell/monadplus/monadplus-1.4.2.ebuild
deleted file mode 100644
index 4d8c002c8d4a..000000000000
--- a/dev-haskell/monadplus/monadplus-1.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell98 partial maps and filters over MonadPlus"
-HOMEPAGE="https://hackage.haskell.org/package/monadplus"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/monadrandom/Manifest b/dev-haskell/monadrandom/Manifest
deleted file mode 100644
index 5a0ed3e11c9a..000000000000
--- a/dev-haskell/monadrandom/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST MonadRandom-0.1.13.tar.gz 4465 BLAKE2B a7a307d3b76bc763d96af6727f5a29704d895802f6e8ba9d37c9c109ebdc09f815722bbe7b6d1491ddb7fd4a39899f44dc9619757aed26b0b2352e1589230f91 SHA512 c9ceba1cfa28b222ad16329ec0b1e1c5becb255e76ac4d4ea03cc4309e95b7341bae5167d2ceb5a7c2567ed776ae375acd80b07449d88b4b9f89b8c78f958bee
-DIST MonadRandom-0.3.0.2.tar.gz 4971 BLAKE2B 1da515075ae6e9b83c3e0f39481490ed732fe2f352f9a16452192ab20c1a5dc902781e22ae85d6d0a7d8a491adb736b0b72d40ec771c5286cfc2ba21d4962938 SHA512 12bfa6ee3aa9c3f2bad4c341b57f383c4b03f3743b74e5646456839198c3479dc283ac00b1ce5638f043bb6b5281a49429220ba57ce722753a7dd9350c8ef003
-DIST MonadRandom-0.4.2.1.tar.gz 5297 BLAKE2B ebe2376049bcfeb1e41a21df45c1dc07e0249b790f6a8d948a3cdf3ed6524fca6f548551bcf67c77942406fbc0ce5554fb6ccae63179b1ea5bf0eec6f68bf49c SHA512 2b173dee59005e44d3106cafa1b194a027846cc2bcaac41f76197771516d7f181a9a53cb1507d586c30f37d9d6de4fe475d46cefd31a441d9cbe14703867d60b
-DIST MonadRandom-0.4.2.3.tar.gz 5379 BLAKE2B e3603f2f715a91d07945ef2653c722170896a7678e52804633e8b92ac41e09c2738e6f0f9db6837e7317ef497ddb4cf77aed496254db36c7d134b28f80bd4ff0 SHA512 4e378c73463ed65370067913c3c59ab05e73160251cfe4daae417186d75bfbaf2be790aeed70dfb51802906e0234ff67ec1bca45e90f82bf909be73751159f24
-DIST MonadRandom-0.5.1.2.tar.gz 10562 BLAKE2B d98ca62c498b31fd7b3bdd3d91753d69687ad7d1d970300ade0113f42fd1e7190c1503113ad733d1b795984687825a1544ae08279301a45c7236111e1bd9722f SHA512 2c92c51868f48e548402c63bccb7bfb13f6ba342f1f6a81e6cc2c8a92248f47ccfb3763907f6e564b284ba4243d4ab1e83cd9a2c309e238fca6b017eb9833198
diff --git a/dev-haskell/monadrandom/metadata.xml b/dev-haskell/monadrandom/metadata.xml
deleted file mode 100644
index 9a057c8fc4e2..000000000000
--- a/dev-haskell/monadrandom/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Support for computations which consume random values.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/monadrandom/monadrandom-0.1.13.ebuild b/dev-haskell/monadrandom/monadrandom-0.1.13.ebuild
deleted file mode 100644
index 083172af083f..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.1.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="https://hackage.haskell.org/package/MonadRandom"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadrandom/monadrandom-0.3.0.2.ebuild b/dev-haskell/monadrandom/monadrandom-0.3.0.2.ebuild
deleted file mode 100644
index 946f69401bd9..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.3.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="https://hackage.haskell.org/package/MonadRandom"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadrandom/monadrandom-0.4.2.1.ebuild b/dev-haskell/monadrandom/monadrandom-0.4.2.1.ebuild
deleted file mode 100644
index 9459ec3e7f82..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.4.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="https://hackage.haskell.org/package/MonadRandom"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadrandom/monadrandom-0.4.2.3.ebuild b/dev-haskell/monadrandom/monadrandom-0.4.2.3.ebuild
deleted file mode 100644
index 2b6d53940bac..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.4.2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="https://hackage.haskell.org/package/MonadRandom"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monadrandom/monadrandom-0.5.1.2.ebuild b/dev-haskell/monadrandom/monadrandom-0.5.1.2.ebuild
deleted file mode 100644
index 3246e2ca151b..000000000000
--- a/dev-haskell/monadrandom/monadrandom-0.5.1.2.ebuild
+++ /dev/null
@@ -1,34 +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
-
-MY_PN="MonadRandom"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Random-number generation monad"
-HOMEPAGE="http://hackage.haskell.org/package/MonadRandom"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/monads-tf/Manifest b/dev-haskell/monads-tf/Manifest
index 7c4d119f511b..f37299557660 100644
--- a/dev-haskell/monads-tf/Manifest
+++ b/dev-haskell/monads-tf/Manifest
@@ -1,2 +1,2 @@
-DIST monads-tf-0.1.0.2.tar.gz 14206 BLAKE2B 1e01e6b5632ff28b64476fe019aa7b7453da9ed7994662cfb556f17da689e3071dd21b63fdde497837a6846d3abf37c4a239f435545777dec1a7b717d0155071 SHA512 5539d735f3d638a700a36e1d3cf0a96dbfd15f9701208e2a6ab71eaee2d00b6e2bd49acbc3e561414e923952ca702d33662511fe057a95bad125609f6216b620
 DIST monads-tf-0.1.0.3.tar.gz 14159 BLAKE2B e77b87e274ab8a29af6033fdc69a965b4013f43556bbc65e16eea35d49899e022294a87196a8e7c086659874a939010449102f5c9fa2f17b128212e567bcd588 SHA512 e1be602c584b42390b617cee164c8cb1c4bb17093c44033275924f273c94212e53faceb35aeabadf43e68f9631830e41266858daa10aa2f3af6300ebc20f3ea4
+DIST monads-tf-0.3.0.1.tar.gz 13675 BLAKE2B a363832f9d092708bbdf778acda8fd6c86904c6f43cfc4c596f19c804a33e3450ad6cdd4a3d5cc004cbdfc28086ea1ae6a0156db8a3ff27fb81236f2b0d3e058 SHA512 4074094c1eafa9a4739fd04e183841ac36314c03022f7cacb324d5fa6e6eab4eb6b10efbe9b89181814485a76a3aa64fcf99801c39c831e63e24e88115dbf438
diff --git a/dev-haskell/monads-tf/metadata.xml b/dev-haskell/monads-tf/metadata.xml
index bc1ca19bbc27..f9cb3771ae43 100644
--- a/dev-haskell/monads-tf/metadata.xml
+++ b/dev-haskell/monads-tf/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Monad classes using type families, with instances for various
-		monad transformers, inspired by the paper /Functional Programming
-		with Overloading and Higher-Order Polymorphism/, by Mark P
-		Jones, in /Advanced School of Functional Programming/, 1995
-		(&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
-		
-		This package is almost a compatible replacement for the @mtl-tf@ package.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">monads-tf</remote-id>
+		<remote-id type="github">typeclasses/monads-tf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.2-r1.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.2-r1.ebuild
deleted file mode 100644
index db36483426a2..000000000000
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using type families"
-HOMEPAGE="https://hackage.haskell.org/package/monads-tf"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers >= 0.2.0.0 && < 0.5' 'transformers >= 0.2.0.0'
-}
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
deleted file mode 100644
index ba36b511c6fd..000000000000
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using type families"
-HOMEPAGE="https://hackage.haskell.org/package/monads-tf"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
index 1dab52ccfec2..004a35e99960 100644
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
+++ b/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
diff --git a/dev-haskell/monads-tf/monads-tf-0.3.0.1.ebuild b/dev-haskell/monads-tf/monads-tf-0.3.0.1.ebuild
new file mode 100644
index 000000000000..2c384616557c
--- /dev/null
+++ b/dev-haskell/monads-tf/monads-tf-0.3.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monad classes, using type families"
+HOMEPAGE="https://github.com/typeclasses/monads-tf"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+	'base ^>= 4.16 || ^>= 4.17 || ^>= 4.18' 'base >= 4.14 && < 5'
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/mono-traversable-instances/Manifest b/dev-haskell/mono-traversable-instances/Manifest
deleted file mode 100644
index 7855baa3b591..000000000000
--- a/dev-haskell/mono-traversable-instances/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mono-traversable-instances-0.1.0.0.tar.gz 2520 BLAKE2B d32b11aa8a9c73859fb1f30cb64b2a9573ce40afb29eb008cd031e642366b56dddb869e44964fcb47587beabe63476c3fe4ccba01158e5fc3b999d01c7ed351e SHA512 53eeb28d68769cc995a2abf4219e6ccbe211d53f190112bb3c6792a3591ccb6334691ec491d92563489d64c7f39df81b02c0a36178daff135fce8b8475f43d0b
diff --git a/dev-haskell/mono-traversable-instances/metadata.xml b/dev-haskell/mono-traversable-instances/metadata.xml
deleted file mode 100644
index 874395902d38..000000000000
--- a/dev-haskell/mono-traversable-instances/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/mono-traversable</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.0.0.ebuild b/dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.0.0.ebuild
deleted file mode 100644
index dee90d08cead..000000000000
--- a/dev-haskell/mono-traversable-instances/mono-traversable-instances-0.1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Extra typeclass instances for mono-traversable"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	>=dev-haskell/mono-traversable-1.0:=[profile?] <dev-haskell/mono-traversable-1.1:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/mono-traversable/Manifest b/dev-haskell/mono-traversable/Manifest
index 127741ba8055..112de1a2a7fb 100644
--- a/dev-haskell/mono-traversable/Manifest
+++ b/dev-haskell/mono-traversable/Manifest
@@ -1,9 +1,2 @@
-DIST mono-traversable-0.1.0.0.tar.gz 10583 BLAKE2B 7ef52b14d0a9839563d325bee616f429fd4acabdc22420f72b4830e1fe75fe61c4c50cece947ed76ef0da33ff217704c585358caf6d0c71caa5a171ecf943f08 SHA512 ed193e9560995e63c18b31923b2ebebf391070c62bc2437174648f555cf6d003cf6017f50ddf7acc9b10d4f7840e62f119cafe6674e6e9f8cb2a91064ba1e80c
-DIST mono-traversable-0.10.0.1.tar.gz 38271 BLAKE2B 8cd761b41eb9bb511ca7116fd01bc2a7eb9f3f06726288c8f716a2f79a2933ce3a778bce04c7e9838938ddd01c7e5165970e44d00112300898a1f1ce54e754f5 SHA512 d7aad07345f1df9c9e48911f5febe63c3bad921f7dbe6115e082e70605d73411605724b00d6ef0efebce168ca40e7fedb7ea6068986b7f5ba0db1c6bc6e47e36
-DIST mono-traversable-0.10.2.tar.gz 38494 BLAKE2B f30887b8b8183e4f480cf22711dd18f6e55c84e22e01f4e439f30ee83811afecd5b605efb235d5dc519edc25f0fb638a9dd2209cd9d10f490bd890a0dd061ee5 SHA512 49e6ed11f280093b013c6489a96a4eaba09bfe656dd8fa1100db3188d5d6c9a24550115b071e14821f7cc696e50bb03dae06b1cf1c53430887ae4d7f0b058577
-DIST mono-traversable-0.4.0.1.tar.gz 21696 BLAKE2B d6c4b55621ef6348f1831b205fdda6ff2658045fbd17bd85b928b7a9172aa6fc082fecb8d9849090416256b073f21ec737fb046a84d56e2b5d3e3601fdd61104 SHA512 f38e1511ed8887902571f2908e3e94c2806ef528ced0fe56bbf5c92d6237fa2f7c721f2a41350164182fa2f8e914987376e99c0ae61b06f9299b744e9aeb2246
-DIST mono-traversable-0.6.3.tar.gz 23577 BLAKE2B 2c7b239beb3c142347f22b49897b57da304f561b93d6400d470321f514c6c01ac77c39856c9e29339bb2c9295373bac63088a236ad9da27fa16887792402a8f9 SHA512 e850f48fb8510052e20170dc8b113b0b85653dfda7fc705fbf9169b487af3537dd779601c88fbabc0873987b66baf3bebcb3ab1536798ff884a8e781918163e6
-DIST mono-traversable-0.7.0.tar.gz 27752 BLAKE2B 9201a12a06fda335ed637c46cb982b14196ca58818cdd3b04ff8be5899bf369728910382038a0ed2a8c7daa9bc4989039bae776cad8f1483daaf59144db6bb51 SHA512 ef2bda089208c85048d400541c4b5d0c336e06ff8aeeecb0bce7f804888e35560621ba685c53a2037bc11a9703f488e289b0ed86e47a4165e91c47b57d62b6c2
-DIST mono-traversable-0.9.2.1.tar.gz 36866 BLAKE2B 941cc511660f341f0301fbad513c97f43fa6d4d954a398bc78c3b3601b563424d8a9ad2f746a19542432226738bb0b9baf812b0911dadb71b40dd4c6f9d8e605 SHA512 595f4d48034a9a002951359fced926492939cb16e34db8cdaf302e07da72420ed54619613fdec8d7186be008d2f75c7726f76cc6326ec734aedd72f8a0256db2
-DIST mono-traversable-1.0.1.1.tar.gz 37982 BLAKE2B cbee32442ce30bfde8230b2914905d1ae34c81ed36190c57609e582fa6a952436061f4d7bd87501d004c069e2ca57ca2a483cf6f655bfc92d6af609dc56bf33c SHA512 2be39644bc67841ece7675098b3507a5cac1a0eb6e97d776d3e0ffffc09821fa2c4db1d0046e69ae611301144308f27d29e45ff449ac2290ee74fde07db0638d
 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
diff --git a/dev-haskell/mono-traversable/metadata.xml b/dev-haskell/mono-traversable/metadata.xml
index 6717fd02f8a4..a1de5e8eb364 100644
--- a/dev-haskell/mono-traversable/metadata.xml
+++ b/dev-haskell/mono-traversable/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Monomorphic variants of the Functor, Foldable, and Traversable typeclasses. Contains even more experimental code for abstracting containers and sequences.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">snoyberg/mono-traversable</remote-id>
 	</upstream>
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.1.0.0.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.1.0.0.ebuild
deleted file mode 100644
index 58aff128d337..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.1.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.10.0.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.10.0.1.ebuild
deleted file mode 100644
index cbe25059b4b5..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.10.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.10.2.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.10.2.ebuild
deleted file mode 100644
index 3cef15ef8bfd..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.10.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.4.0.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.4.0.1.ebuild
deleted file mode 100644
index 11d21caef69f..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.4.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.6.3.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.6.3.ebuild
deleted file mode 100644
index aab91bce751e..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.6.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.7.0.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.7.0.ebuild
deleted file mode 100644
index aab91bce751e..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-0.9.2.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-0.9.2.1.ebuild
deleted file mode 100644
index 6504da40cef4..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-0.9.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3.0.3:=[profile?]
-	>=dev-haskell/dlist-0.6:=[profile?] <dev-haskell/dlist-1.0:=[profile?]
-	>=dev-haskell/dlist-instances-0.1:=[profile?] <dev-haskell/dlist-instances-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroupoids-3.0:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	dev-haskell/vector-instances:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mono-traversable/mono-traversable-1.0.1.1.ebuild b/dev-haskell/mono-traversable/mono-traversable-1.0.1.1.ebuild
deleted file mode 100644
index c9edcbcd2d89..000000000000
--- a/dev-haskell/mono-traversable/mono-traversable-1.0.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashable:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/foldl
-		dev-haskell/hspec
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
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 6f25112213a2..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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hashable:=[profile?]
@@ -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/mono-traversable/mono-traversable-1.0.15.3.ebuild b/dev-haskell/mono-traversable/mono-traversable-1.0.15.3.ebuild
new file mode 100644
index 000000000000..c3804221ac69
--- /dev/null
+++ b/dev-haskell/mono-traversable/mono-traversable-1.0.15.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type classes for mapping, folding, and traversing monomorphic containers"
+HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/hashable:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	>=dev-haskell/text-0.11:=[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.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/foldl
+		dev-haskell/hspec
+		dev-haskell/hunit
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/mountpoints/metadata.xml b/dev-haskell/mountpoints/metadata.xml
index b6a3cce6bc7d..937381521944 100644
--- a/dev-haskell/mountpoints/metadata.xml
+++ b/dev-haskell/mountpoints/metadata.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Lists currently mounted filesystems.
-		
-		Works on: Linux, BSD, Mac OS X, Android
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
index 2cdee7360f85..a78113a9b0e9 100644
--- a/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
+++ b/dev-haskell/mountpoints/mountpoints-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.7.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/mtl-compat/Manifest b/dev-haskell/mtl-compat/Manifest
index db1759b3fca5..15c69b17e736 100644
--- a/dev-haskell/mtl-compat/Manifest
+++ b/dev-haskell/mtl-compat/Manifest
@@ -1,2 +1 @@
-DIST mtl-compat-0.2.1.3.tar.gz 4584 BLAKE2B 47cfbaf9f60f586318a0aa838e64d0ae13fe69386b738e3c45eb393acb77176c85a9e99f7c81384704d177bf7c895f866813880ba0f2285116a566f24114645c SHA512 c9afa97eb5dc1bddcbf0e088352141d56b603562f80fcbde6811610a4e71e1496dd5f07e4338644930bf06b403bc08d35799f7063ae845ecdb71e619b2342a18
 DIST mtl-compat-0.2.2.tar.gz 5128 BLAKE2B e1066f61c8087ffd6c8afc9545dd73402b01e9995fcbe226094777f93623f93209c7afdcd01fe2a5fdae4fc4aa2d39eeb821772ce9d542c80f7d0714d25dc79f SHA512 78a93e9e59d01bf0ffeb32f1322decd65d87cba8912d00f77347f0fc2f7190a755297953ac363ca3342c83822d36101b43ef044dc1f3b2ffef7c7710afda9d0d
diff --git a/dev-haskell/mtl-compat/metadata.xml b/dev-haskell/mtl-compat/metadata.xml
index 033f9421a7a1..11043fffaddb 100644
--- a/dev-haskell/mtl-compat/metadata.xml
+++ b/dev-haskell/mtl-compat/metadata.xml
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package backports the "Control.Monad.Except" module from
-		@mtl@ (if using @mtl-2.2.0.1@ or earlier), which reexports the
-		@ExceptT@ monad transformer and the @MonadError@ class.
-		
-		This package should only be used if there is a need to use the
-		@Control.Monad.Except@ module specifically. If you just want
-		the @mtl@ class instances for @ExceptT@, use
-		@transformers-compat@ instead, since @mtl-compat@ does nothing
-		but reexport the instances from that package.
-		
-		Note that unlike how @mtl-2.2@ or later works, the
-		"Control.Monad.Except" module defined in this package exports
-		all of @ExceptT@'s monad class instances. Therefore, you may
-		have to declare @import Control.Monad.Except ()@ at the top of
-		your file to get all of the @ExceptT@ instances in scope.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">RyanGlScott/mtl-compat</remote-id>
+		<remote-id type="hackage">mtl-compat</remote-id>
+		<remote-id type="github">haskell-compat/mtl-compat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild b/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild
deleted file mode 100644
index e40eaa3c9e1d..000000000000
--- a/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5
-
-CABAL_FEATURES="lib profile" # haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Backported Control.Monad.Except module from mtl"
-HOMEPAGE="https://github.com/RyanGlScott/mtl-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	dev-haskell/transformers-compat:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	local mtl_arg=()
-
-	has_version '>=dev-haskell/mtl-2.0.1' && \
-		has_version '<dev-haskell/mtl-2.2' && \
-		mtl_arg+=(--flag=two-point-one)
-	has_version '>=dev-haskell/mtl-2.2.0.1' && \
-		has_version '<dev-haskell/mtl-2.2.1' && \
-		mtl_arg+=(--flag=two-point-two)
-
-	haskell-cabal_src_configure \
-		${mtl_arg}
-}
diff --git a/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild b/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
index f849a6a4791a..409eec0f3b25 100644
--- a/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
+++ b/dev-haskell/mtl-compat/mtl-compat-0.2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,10 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.4:=[profile?]
 	dev-haskell/transformers-compat:=
 	>=dev-lang/ghc-7.4.1:=
 "
diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest
index 7a243effbe25..76173523f63e 100644
--- a/dev-haskell/mtl/Manifest
+++ b/dev-haskell/mtl/Manifest
@@ -1,3 +1 @@
-DIST mtl-2.1.3.1.tar.gz 13955 BLAKE2B ded18304c2c5158cfaf02e77c01829895079d9a344692d8a4294ccafce66f867b709fb64b9b82fba728d659afb17ee54560fdb3b3894398677408eda7cf878dd SHA512 dbb388eda920ba23525f89f1be840f23e7afdf8a0efdbee9a2efd03eb0c9fd64e0788e186236bbdcc6203c9fc02a3512a63ad4dc82946f6e9364bdb1a94e5f62
-DIST mtl-2.2.1.tar.gz 15391 BLAKE2B a3ef2496a7b876cb1747a00aec092c21751c2774983f8db0fd78a8c4da220296c96dec3327c78c3e9eec9f43af25d7462518e3a03a69e80c1186777bcca43f08 SHA512 5c31626b15551ee1757ad701b8e5552202bb6fe1dbd002039e3b78c6d01108a5c50f565c4993d165a00eb564d9d72fb8d2aae891b6242f0ca8cb11f7b95c5c6b
 DIST mtl-2.2.2.tar.gz 16966 BLAKE2B 29755d32aa2b0107e512ab6fff1e2695076217d81d3d46276aa2610b7054c98c01b44611b50a0127f277b54d74e0d812e52b3ae2667bf1c2913e1276993fb5d4 SHA512 25aa48f53d9b1da04bb82d9eefff2e5f797a54bc0b22d6465fcef3bee8da0a459e714f4daf69669cc28a8fef5d638d8f9b1407dad2260d67d5a63e1cc324fe7c
diff --git a/dev-haskell/mtl/metadata.xml b/dev-haskell/mtl/metadata.xml
index bd178081f99e..2171e4c94b9b 100644
--- a/dev-haskell/mtl/metadata.xml
+++ b/dev-haskell/mtl/metadata.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Monad classes using functional dependencies, with instances
-		for various monad transformers, inspired by the paper
-		/Functional Programming with Overloading and Higher-Order Polymorphism/,
-		by Mark P Jones, in /Advanced School of Functional Programming/, 1995
-		(&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
-	</longdescription>
 	<upstream>
-		<remote-id type="github">ekmett/mtl</remote-id>
+		<remote-id type="hackage">mtl</remote-id>
+		<remote-id type="github">haskell/mtl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/mtl/mtl-2.1.3.1.ebuild b/dev-haskell/mtl/mtl-2.1.3.1.ebuild
deleted file mode 100644
index d8e5251d6c26..000000000000
--- a/dev-haskell/mtl/mtl-2.1.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/mtl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/mtl/mtl-2.2.1-r1.ebuild b/dev-haskell/mtl/mtl-2.2.1-r1.ebuild
deleted file mode 100644
index db020fa38a31..000000000000
--- a/dev-haskell/mtl/mtl-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/mtl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers == 0.4.*' 'transformers >= 0.4'
-}
diff --git a/dev-haskell/mtl/mtl-2.2.1.ebuild b/dev-haskell/mtl/mtl-2.2.1.ebuild
deleted file mode 100644
index cbebad8cfef7..000000000000
--- a/dev-haskell/mtl/mtl-2.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/ekmett/mtl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.4:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/mtl/mtl-2.2.2-r1.ebuild b/dev-haskell/mtl/mtl-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..377dc6705b05
--- /dev/null
+++ b/dev-haskell/mtl/mtl-2.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Monad classes, using functional dependencies"
+HOMEPAGE="https://github.com/haskell/mtl"
+
+LICENSE="BSD"
+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 ~ppc-macos"
+
+RDEPEND="
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}"
+
+CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7 9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.4 9.4.5"
diff --git a/dev-haskell/mtl/mtl-2.2.2.ebuild b/dev-haskell/mtl/mtl-2.2.2.ebuild
deleted file mode 100644
index b59256306480..000000000000
--- a/dev-haskell/mtl/mtl-2.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="https://github.com/haskell/mtl"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-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:9999"
diff --git a/dev-haskell/multipart/Manifest b/dev-haskell/multipart/Manifest
deleted file mode 100644
index 0548c487e43f..000000000000
--- a/dev-haskell/multipart/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST multipart-0.1.2.tar.gz 6787 BLAKE2B f367f689510873eb0f58e08cd74efceb021ab4294495e4048766b12fe7242163a61f4207821e0fd7c12289433807cf0d198ef53d3a471469ee40a3a9f88d0620 SHA512 abc3c7ad89cf9f46d72abaca3ca4782ba717ed6306b81c0c2c0bebde098a330c3a2ee4c62494cd66928265843ef497005bcf09962b50f302a9419712adef578a
-DIST multipart-0.2.0.tar.gz 6593 BLAKE2B e7528c1d95df96ada9b9c17315ebe9c9f304842c0783007e37c545769195b87105dce4a0ee9690bbd8143ca9dfd43a8ad7c1b0e98fd386944f1af5e868fd1a4d SHA512 e2ea580113a84a6ad218e9c0ef79da94ab92017c81969c864847df020759cd94555f53ea0722c230555af2d2ccb531bd9d07cb2da1342d0e3556b70a58678be0
diff --git a/dev-haskell/multipart/metadata.xml b/dev-haskell/multipart/metadata.xml
deleted file mode 100644
index 8073f02ae312..000000000000
--- a/dev-haskell/multipart/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		HTTP multipart split out of the cgi package
-	</longdescription>
-	<upstream>
-		<remote-id type="github">silkapp/multipart</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/multipart/multipart-0.1.2.ebuild b/dev-haskell/multipart/multipart-0.1.2.ebuild
deleted file mode 100644
index f9c109554d08..000000000000
--- a/dev-haskell/multipart/multipart-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP multipart split out of the cgi package"
-HOMEPAGE="https://github.com/silkapp/multipart"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/multipart/multipart-0.2.0.ebuild b/dev-haskell/multipart/multipart-0.2.0.ebuild
deleted file mode 100644
index 9da933fdb468..000000000000
--- a/dev-haskell/multipart/multipart-0.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP multipart split out of the cgi package"
-HOMEPAGE="http://www.github.com/silkapp/multipart"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.0:=[profile?]
-	dev-haskell/stringsearch:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/murmur-hash/Manifest b/dev-haskell/murmur-hash/Manifest
deleted file mode 100644
index a1b11996902c..000000000000
--- a/dev-haskell/murmur-hash/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST murmur-hash-0.1.0.9.tar.gz 4204 BLAKE2B 33781f0a94f767d8f4fc9e10e3c94718308e24370ebfd9f66cd5279bf9c7204136103a8e4aa86f3025559e87075e47bde6930135215cd9b1c4275d696f2c2490 SHA512 7ec34346d6361de9e9d716d98f207534807faea97c683212e5ab037d2e16f007845eb265dba0e232617a80acc7e37f4238d4424883b975d04057ade595788486
diff --git a/dev-haskell/murmur-hash/metadata.xml b/dev-haskell/murmur-hash/metadata.xml
deleted file mode 100644
index e0fb34889e78..000000000000
--- a/dev-haskell/murmur-hash/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Implements MurmurHash2, a good, fast, general-purpose,
-		non-cryptographic hashing function.  See
-		&lt;http://murmurhash.googlepages.com/&gt; for details.
-		
-		This implementation is pure Haskell, so it might be a bit slower
-		than a C FFI binding.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">nominolo/murmur-hash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild b/dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild
deleted file mode 100644
index 7e13750d322a..000000000000
--- a/dev-haskell/murmur-hash/murmur-hash-0.1.0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="MurmurHash2 implementation for Haskell"
-HOMEPAGE="https://github.com/nominolo/murmur-hash"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/mustache/Manifest b/dev-haskell/mustache/Manifest
deleted file mode 100644
index b595bbadb82d..000000000000
--- a/dev-haskell/mustache/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mustache-2.3.1.tar.gz 20207 BLAKE2B 87691b14e85ac5934c08d1b3f8261d6e7bb3786b808d0f1a04630b96b4f2ed4aeae4d049ccf0e408b47586e990db2bbc09e3eac56af67922538e73250ef486d5 SHA512 162360cb635d40086721d4dd350036884207679b240d30420b9fc71eebef847e542bd143275931a22a42c583d513d0c906a6b112d780824dc189ad07e3027aa3
diff --git a/dev-haskell/mustache/metadata.xml b/dev-haskell/mustache/metadata.xml
deleted file mode 100644
index 546170479152..000000000000
--- a/dev-haskell/mustache/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Allows parsing and rendering template files with mustache markup. See the
-		mustache &lt;http://mustache.github.io/mustache.5.html language reference&gt;.
-		
-		Implements the mustache spec version 1.1.3.
-		
-		/Note/: Versions including and beyond 0.4 are compatible with ghc 7.8 again.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/mustache/mustache-2.3.1.ebuild b/dev-haskell/mustache/mustache-2.3.1.ebuild
deleted file mode 100644
index 23b768a9e9d5..000000000000
--- a/dev-haskell/mustache/mustache-2.3.1.ebuild
+++ /dev/null
@@ -1,44 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A mustache template parser library"
-HOMEPAGE="https://github.com/JustusAdam/mustache"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tries to access network
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/cmdargs:=[profile?]
-	dev-haskell/either:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/th-lift:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/base-unicode-symbols
-		dev-haskell/hspec
-		dev-haskell/lens
-		dev-haskell/tar
-		dev-haskell/temporary
-		dev-haskell/wreq
-		dev-haskell/zlib )
-"
diff --git a/dev-haskell/mutable-containers/Manifest b/dev-haskell/mutable-containers/Manifest
deleted file mode 100644
index 3d2afa6e133e..000000000000
--- a/dev-haskell/mutable-containers/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST mutable-containers-0.3.2.1.tar.gz 12102 BLAKE2B d681d6283d6c4a7a0d53fd9d112f818b540b62e3e307014b6a10f1d6fb4fa08ea20e9159b8e927f4ccb1fd7590d2c6c4bab3eb7e775922c9fc357afc29a21126 SHA512 77c573e6e4e1bb8efd5bc1ec049d62b2db3c7973a8ce750b061f23561e23edb49b896ee59d27d88cc10ff67932ed101999bd7f5750959a3c0bcca021afbf6960
-DIST mutable-containers-0.3.2.tar.gz 11969 BLAKE2B aca0aec25ad68f086e79186b7e20405947e16e9b73431db018b27a85c87e8b239a4468fdd0005ff70c6a7575d627435ceced27039956bdd4b94011557fda396d SHA512 b75e650406d92de25b903b4a761d760a797d099c7d3fd82a791c1b86caee104081edff159e78022178a284f7ca61233de91c179a435429dd585c46f97c384274
-DIST mutable-containers-0.3.3.tar.gz 12062 BLAKE2B df134f1186ec174f50b3413079c56e427dd89200a0120aa0cf31abf36f0a74aae1c56f9b7e34373877a4d005b26eb918ac907882960cfee39303f2cae09b49d1 SHA512 0708f0d432136fc3bb52b9f0159e131f4c02829bd6a2e47d4f1be9a1a70e0b492d885d1ca64e11955aceb7a4b98b9a44dce0c3f0865b1513112c5f8fc2189abf
-DIST mutable-containers-0.3.4.tar.gz 12286 BLAKE2B f782c4b7a80699317814ae57c867314cbb374f90a84e9647010d29c6a5ca58a6812febd07cbff07572d6a76f2df89dd9056186adada25989ea86bdb4c263013a SHA512 1731380fd57c8c79a77cea781fb7630f90e11cfa977ca836695981bcecf10b7d2d5f3e89e8a6de5fd3fb32ac441b0512c7a6fd356107e6efa47b0d5fd491157c
diff --git a/dev-haskell/mutable-containers/metadata.xml b/dev-haskell/mutable-containers/metadata.xml
deleted file mode 100644
index e18e9b048ff8..000000000000
--- a/dev-haskell/mutable-containers/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		See docs and README at &lt;http://www.stackage.org/package/mutable-containers&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/mutable-containers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.2.1.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.2.1.ebuild
deleted file mode 100644
index 39b45d8a79b2..000000000000
--- a/dev-haskell/mutable-containers/mutable-containers-0.3.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstactions and concrete implementations of mutable containers"
-HOMEPAGE="https://github.com/fpco/mutable-containers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mono-traversable:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.2.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.2.ebuild
deleted file mode 100644
index 259eed7155da..000000000000
--- a/dev-haskell/mutable-containers/mutable-containers-0.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstactions and concrete implementations of mutable containers"
-HOMEPAGE="https://github.com/fpco/mutable-containers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mono-traversable:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.3.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.3.ebuild
deleted file mode 100644
index 6281f266f593..000000000000
--- a/dev-haskell/mutable-containers/mutable-containers-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstactions and concrete implementations of mutable containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mono-traversable:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild b/dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild
deleted file mode 100644
index e3852e48097f..000000000000
--- a/dev-haskell/mutable-containers/mutable-containers-0.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Abstactions and concrete implementations of mutable containers"
-HOMEPAGE="https://github.com/snoyberg/mono-traversable#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mono-traversable:=[profile?]
-	>=dev-haskell/primitive-0.5.2.1:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/mwc-random/Manifest b/dev-haskell/mwc-random/Manifest
index d0d65a97f0c5..dc55022b9c51 100644
--- a/dev-haskell/mwc-random/Manifest
+++ b/dev-haskell/mwc-random/Manifest
@@ -1,3 +1,3 @@
-DIST mwc-random-0.12.0.1.tar.gz 19471 BLAKE2B 077a8fb171440a65202e64d1a4bbebda3491885cf2d54106bbd5f6c9e6e9ca516cf7a7352bf419672509876a4e122f3b026f186d07dbc62e24c871ba1f9e08b6 SHA512 fbb08f2ee50a650e994e123b10e5211a5d87c1a0f65c910f984b81bef85713e18a7c8780cc6e8dc9ab60644e57cacb39ab5bc462151d285c74900d048394e490
-DIST mwc-random-0.13.3.2.tar.gz 22290 BLAKE2B 2686689205c232fc2fae3ee28f478b50dd0dd27cb49efa1f81752655f464fb8ea16e46ae6d27e45104082fa4f930ea09450fd863253188233df29e9133e645b1 SHA512 67a4f99bba5884cc59d5bd521f89b1b9c0b1d473d1f157a23857e45d4759f30b6e868fd5a9e444c8563345b2dd465256fdeee97e6a68d51b00e4bbbcd8bb200f
-DIST mwc-random-0.13.4.0.tar.gz 22927 BLAKE2B 1c7bf3470a389f0c77fdebe7e1a90f750fc7458d1c574b3a45933eddd87961433b0f4b21e784a2e5bf85a73893f96fb730e86d1c0a7c3d0c3400bf72be153c0c SHA512 1f1e005998fa8310710629d69258465b214bc2b369ab95cb307689209f1812b17301fba28d33c45f8ae0ba63381ea6775ad9037a9b52464d7df35c36b77594cf
+DIST mwc-random-0.14.0.0.tar.gz 19674 BLAKE2B 3410f8d237c8e4a0f079c13567082273fc79d287c8de2b9ea0c1f396271ba7571caf890d6065ae7f0e5aae41f66575d90df178b981db24c9792213facf1d9c3d SHA512 bb262d6f4a37d91e4c0667ec5140894ed36bf3ef4b90e487f4d689a6bc4eddd09dcdc3c8b75013124908ca1642e990c3e074fb728acc1b36f63b3db66528301d
+DIST mwc-random-0.15.0.2-rev1.cabal 3372 BLAKE2B 1e565e2028fe1cba958684ebfef4c3c248776402c8310e389c553084cae82c2451c19bd78567df9aa58fb926a8b10bf5e8fbec211c9bd0a33c3d0ac15b4f16e3 SHA512 7b3f2bb05148fc85ed4f85bbd96fbe6e836857a117c839cb2ceb51c4b17aa4ebc03b8989970cbf9b51aadfc6a9507a6af4dd864ec65b8b421456f46eee0974ed
+DIST mwc-random-0.15.0.2.tar.gz 26591 BLAKE2B 8320eaa28e5bc302104c8e9617e8e50728934d7143ea5a243570aed28cec5c98bb17d128460aed27dcbf5b3b71570a39f6247a3868cb18eb3f3c0325c20fed67 SHA512 7e30a4584bca7f5e5147388dc9c081ac417d3aff1e9bd431535eac695db0779b4d20c6b3bedbda06a4780d9d57ab1f7880743f7bad20e4f5d2b7d32ce7f373bd
diff --git a/dev-haskell/mwc-random/metadata.xml b/dev-haskell/mwc-random/metadata.xml
index 62bc3b139fc2..c6a1cbc7566e 100644
--- a/dev-haskell/mwc-random/metadata.xml
+++ b/dev-haskell/mwc-random/metadata.xml
@@ -1,25 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package contains code for generating high quality random
-		numbers that follow either a uniform or normal distribution.  The
-		generated numbers are suitable for use in statistical applications.
-		
-		The uniform PRNG uses Marsaglia's MWC256 (also known as MWC8222)
-		multiply-with-carry generator, which has a period of 2^8222 and
-		fares well in tests of randomness.  It is also extremely fast,
-		between 2 and 3 times faster than the Mersenne Twister.
-		
-		Compared to the mersenne-random package, this package has a more
-		convenient API, is faster, and supports more statistical
-		distributions.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">mwc-random</remote-id>
 		<remote-id type="github">bos/mwc-random</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/mwc-random/mwc-random-0.12.0.1.ebuild b/dev-haskell/mwc-random/mwc-random-0.12.0.1.ebuild
deleted file mode 100644
index c8a84aa979c4..000000000000
--- a/dev-haskell/mwc-random/mwc-random-0.12.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, high quality pseudo random number generation"
-HOMEPAGE="https://github.com/bos/mwc-random"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-		>=dev-haskell/vector-0.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			>=dev-haskell/statistics-0.10.1.0
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/mwc-random/mwc-random-0.13.3.2.ebuild b/dev-haskell/mwc-random/mwc-random-0.13.3.2.ebuild
deleted file mode 100644
index bda20dc121ec..000000000000
--- a/dev-haskell/mwc-random/mwc-random-0.13.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, high quality pseudo random number generation"
-HOMEPAGE="https://github.com/bos/mwc-random"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # breaks when already installed package is broken
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		>=dev-haskell/statistics-0.10.1.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/mwc-random/mwc-random-0.13.4.0.ebuild b/dev-haskell/mwc-random/mwc-random-0.13.4.0.ebuild
deleted file mode 100644
index 7c470db83dda..000000000000
--- a/dev-haskell/mwc-random/mwc-random-0.13.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast, high quality pseudo random number generation"
-HOMEPAGE="https://github.com/bos/mwc-random"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circylar depend: mwc-random[test]->statistics->mwc-random
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.4
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		>=dev-haskell/statistics-0.10.1.0
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild b/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild
new file mode 100644
index 000000000000..8c625cf12c31
--- /dev/null
+++ b/dev-haskell/mwc-random/mwc-random-0.14.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Fast, high quality pseudo random number generation"
+HOMEPAGE="https://github.com/bos/mwc-random"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/math-functions-0.2.1.0:=[profile?]
+	>=dev-haskell/primitive-0.6:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.4
+"
diff --git a/dev-haskell/mwc-random/mwc-random-0.15.0.2-r2.ebuild b/dev-haskell/mwc-random/mwc-random-0.15.0.2-r2.ebuild
new file mode 100644
index 000000000000..017026e79567
--- /dev/null
+++ b/dev-haskell/mwc-random/mwc-random-0.15.0.2-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Fast, high quality pseudo random number generation"
+HOMEPAGE="https://github.com/bos/mwc-random"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+	'doctest    >=0.15 && <0.20' 'doctest >=0.15'
+)
+
+RDEPEND="
+	>=dev-haskell/math-functions-0.2.1.0:=[profile?]
+	>=dev-haskell/primitive-0.6.2:=[profile?]
+	>=dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/doctest-0.15
+		>=dev-haskell/quickcheck-2.2
+		>=dev-haskell/tasty-1.3.1
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+		>=dev-haskell/vector-0.12.1
+	)
+"
diff --git a/dev-haskell/nanospec/Manifest b/dev-haskell/nanospec/Manifest
index d3d3ea0f6b04..70d337550864 100644
--- a/dev-haskell/nanospec/Manifest
+++ b/dev-haskell/nanospec/Manifest
@@ -1,4 +1 @@
-DIST nanospec-0.1.0.tar.gz 3408 BLAKE2B 1aee0ad0d544439ff7baf1b58bee79f3348d13f4bb21042fa2818a79a4d719f7c66b6ade0902d18967f6822d2165a8da815b5bfc10dd946139afe3213aac47c5 SHA512 6e38bcee0d9a5f2e6b42566bb3e4aec57a61115dd649cb441721cb79193caac5aaf59aeef54a30dccb7e939e6512632221ec9e03b86142e5cb7671ef3433d4e9
-DIST nanospec-0.2.0.tar.gz 3451 BLAKE2B 428d01a9fccd73aef9e7cc268c96127e39b81cba30778a4979b5a9eebbf9d4e3e49f29e3b9fd42331cc2dd3f1e6b7eef0fa4def617335ca679dd25fdfd8156df SHA512 318458a205bc0bb48d83f9291cb8f047d6ca20b03174ae6a4a00d9f1b921a058641f80870e12f8eda3f238bd1b98dca96cb324161ea14cf2f0f3da1314edade4
-DIST nanospec-0.2.1.tar.gz 3478 BLAKE2B 1bee45c06ca7fce951c5652708843c3a91eb579e59a82e50403d8549f421eb48519c9e263596c381df6247983e5f9fb4dc07d1fd90299cb56644bfb24ccf78cd SHA512 ee5b5080fefc5a213b59c8d146054f59b73dbfc8ed909ea308ec2646cd3e071a7de6115563a13fb683434725e3756fa71acbfcec77e85e3dfaa9400c7e249769
 DIST nanospec-0.2.2.tar.gz 3698 BLAKE2B 38351f999a2e71b598734b75aff06486f44166ed8df80956d2486d99687cda6f4b4b0f12f44db17f6b0c43ddfdf5bd13b788967e18caccafddfe27f27af27f86 SHA512 6161b5cc1797a3fdcd07cad14deaa3edd6faa87309b5e8a31834d7c1dda23737fe4f2e763b13da7f5ef6f6ee3a9414f88b9ae01e5403320ba23d76404324a3b0
diff --git a/dev-haskell/nanospec/metadata.xml b/dev-haskell/nanospec/metadata.xml
index f22e2abd4a74..8f1b8ce8ed3a 100644
--- a/dev-haskell/nanospec/metadata.xml
+++ b/dev-haskell/nanospec/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A lightweight implementation of a subset of Hspec's API with
-		minimal dependencies.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">nanospec</remote-id>
+		<remote-id type="github">hspec/nanospec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/nanospec/nanospec-0.1.0.ebuild b/dev-haskell/nanospec/nanospec-0.1.0.ebuild
deleted file mode 100644
index 5801b527e191..000000000000
--- a/dev-haskell/nanospec/nanospec-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
-HOMEPAGE="https://hackage.haskell.org/package/nanospec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/silently
-		)"
diff --git a/dev-haskell/nanospec/nanospec-0.2.0.ebuild b/dev-haskell/nanospec/nanospec-0.2.0.ebuild
deleted file mode 100644
index f97a4227bfcf..000000000000
--- a/dev-haskell/nanospec/nanospec-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
-HOMEPAGE="https://hackage.haskell.org/package/nanospec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depend: nanospec[test]->silently[test]->nanospec
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/nanospec/nanospec-0.2.1.ebuild b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
deleted file mode 100644
index ec10eeb6f834..000000000000
--- a/dev-haskell/nanospec/nanospec-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
-HOMEPAGE="https://hackage.haskell.org/package/nanospec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # cyclic depend
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/nanospec/nanospec-0.2.2.ebuild b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
index da4c12d5cc29..c14d160d5dfb 100644
--- a/dev-haskell/nanospec/nanospec-0.2.2.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
@@ -1,26 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-# ebuild generated by hackport 0.5.5.9999
+# ebuild generated by hackport 0.8.0.0.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # drop test-suite: cyclic depend
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
 HOMEPAGE="https://github.com/hspec/nanospec#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
-RESTRICT=test # cyclic depend: silently[test]->nanospec
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/hspec-1.3
+		>=dev-haskell/silently-1.2.4
+	)
 "
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/nats/Manifest b/dev-haskell/nats/Manifest
index 210cb70ae67c..a8cf5a997b14 100644
--- a/dev-haskell/nats/Manifest
+++ b/dev-haskell/nats/Manifest
@@ -1,4 +1,2 @@
-DIST nats-0.1.2.tar.gz 3954 BLAKE2B f20f839d3aa4ac0a06f873d87ac5a691a7eeb62489904875918dd395302cee021cd59bbb0cafb88fd8554c99e14ba7dc9dff5a3704a394b5d342133560347fd3 SHA512 11903b123d0ed27af9fccc8bb7c343dcf42ac8d58768e628460153b0bf6f27bf1f1271890b26a48eb234b3b89bb7b9e48266a4b39742f56bcf8913e0c3751ab1
-DIST nats-0.2.tar.gz 4740 BLAKE2B 9300e1834feec441d35246377314c7c302c16c76548498352c08f07262bb491dd68ea9303cc22e67416c349e224153c484977d14491eabcb6ce22a2991f7c0cb SHA512 419f2b4f938b7d590f45a25be163e25f29d47ec0fe7cf5d1f69cb9624c5617dfc25a0b14daf1b31ac590c021120eb5cd93bdf902d27136e3019e30ce2b5d3188
+DIST nats-1.1.2-r1.cabal 2749 BLAKE2B b0b7406ce0362cfea14dd8cc492b9d0a5a1e34ae4cf5c4aba78d3cd7052a24a3be1c742287d85e6f9699fecbeee491a0eadcdf1994e92ce86e559c6965774cc2 SHA512 0702e4a69cbc368de33993ab49ab5aa458202df538606b73dd9291a6cf61f82ab44e4b12e3e82d2690ba151fe8b1c65e8791ac0f45a24a7f2534abdebd2e87cb
 DIST nats-1.1.2.tar.gz 7776 BLAKE2B ae2012e1e8a433c3802b7470f95a7e4b391f9c7ee50f41b94d2ee9d20b630820e550efa76fb5d64926942e87e761db0702ae4310573d0bca38f52fa419a93390 SHA512 596f11e98fe57893279ddd1f5af11a12e747e0d5e87000c7e20d0f5c2da0f0be9a6b8d19c8d5759716a7fb9a3e77d0e999380af3d5a350fe32a5492dc6077450
-DIST nats-1.tar.gz 5768 BLAKE2B 1c8e08ce3cefade9103d4d16202d68eb1efae526ec1a4595768b121b15ee55ae5e071cfe6a1923219422a33278d53b290ec0aeee47c4eb8a7c6aed319dec0628 SHA512 a53b8890d3b9f9f799d0af25626d23a570b7d3f227968d4a1033385d87e4502120e26f8623a3c5c0c21dc0db98a000ff79565cbab0298fd9c17a917ea8e11edf
diff --git a/dev-haskell/nats/metadata.xml b/dev-haskell/nats/metadata.xml
index dc01d7df7855..268af54dfd5c 100644
--- a/dev-haskell/nats/metadata.xml
+++ b/dev-haskell/nats/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haskell 98 natural numbers
-	</longdescription>
 	<use>
 		<flag name="binary">enable binary instances</flag>
 		<flag name="hashable">enable hashable instances</flag>
 		<flag name="template-haskell">enable template_haskell</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ekmett/nats</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/nats/nats-0.1.2.ebuild b/dev-haskell/nats/nats-0.1.2.ebuild
deleted file mode 100644
index 5fc2a8ac92a3..000000000000
--- a/dev-haskell/nats/nats-0.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/nats/nats-0.2.ebuild b/dev-haskell/nats/nats-0.2.ebuild
deleted file mode 100644
index 1792cb4b0572..000000000000
--- a/dev-haskell/nats/nats-0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+hashable"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-7.10:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag hashable hashable)
-}
diff --git a/dev-haskell/nats/nats-1.1.2-r1.ebuild b/dev-haskell/nats/nats-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..e67bc613e041
--- /dev/null
+++ b/dev-haskell/nats/nats-1.1.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Natural numbers"
+HOMEPAGE="https://github.com/ekmett/nats/"
+SRC_URI="
+	https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/3.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+binary +hashable +template-haskell"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+	hashable? ( >=dev-haskell/hashable-1.1.2.0:=[profile?] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag binary binary) \
+		$(cabal_flag hashable hashable) \
+		$(cabal_flag template-haskell template-haskell)
+}
diff --git a/dev-haskell/nats/nats-1.1.2.ebuild b/dev-haskell/nats/nats-1.1.2.ebuild
deleted file mode 100644
index 0ffa621e1a6a..000000000000
--- a/dev-haskell/nats/nats-1.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+binary +hashable +template-haskell"
-
-RESTRICT=test # avoid circular dep: nats[hashable]->hashable[test]->quickcheck->nats
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	binary? ( >=dev-haskell/binary-0.2:=[profile?] <dev-haskell/binary-0.9:=[profile?] )
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag binary binary) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/nats/nats-1.ebuild b/dev-haskell/nats/nats-1.ebuild
deleted file mode 100644
index 8aee789a0a54..000000000000
--- a/dev-haskell/nats/nats-1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile" # on ghc-7.10 does nothing
-inherit haskell-cabal
-
-DESCRIPTION="Natural numbers"
-HOMEPAGE="https://github.com/ekmett/nats/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+hashable"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag hashable hashable)
-}
diff --git a/dev-haskell/neat-interpolation/Manifest b/dev-haskell/neat-interpolation/Manifest
deleted file mode 100644
index f34022ca99ea..000000000000
--- a/dev-haskell/neat-interpolation/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST neat-interpolation-0.3.2.1.tar.gz 4339 BLAKE2B e3f7a87308839de027e566bb5498ab7d1983bfaa8c81ee225a18d40e3cf5a3ad31dc8f52660e85f1532e33fcc5bc29e6ffcc3d9bf69095ef7d5408cf98231659 SHA512 aaefc95b85e8546bd20848b3d4da39437b48e5e3c54829f9ae06f8f4021752812a643a638bcc10213db168d3217bd8913b2feec81d90199a14eea8c35fe62245
-DIST neat-interpolation-0.3.2.6.tar.gz 5437 BLAKE2B 0a84a4e0ed3126d6ab11ff382dc46d8760a14f725c23bb87650290b2b8c3791be996f734fecfe326fc8236548360a163de3979eb12534e52fa927787d2dfb803 SHA512 0b3725258cebdf6144a9442b3dfb5e46a1d36525fdfec7f1797546416ef7788c7ad679d33105d541ae37b208c170d695757355291ef0d05297d8e35ea4116546
diff --git a/dev-haskell/neat-interpolation/metadata.xml b/dev-haskell/neat-interpolation/metadata.xml
deleted file mode 100644
index d8ffb5043713..000000000000
--- a/dev-haskell/neat-interpolation/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A quasiquoter for producing Text values with support for
-		a simple interpolation of input values.
-		It removes the excessive indentation from the input and
-		accurately manages the indentation of all lines of the interpolated variables.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild b/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild
deleted file mode 100644
index 01a6f8cd2457..000000000000
--- a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A quasiquoter for neat and simple multiline text interpolation"
-HOMEPAGE="https://github.com/nikita-volkov/neat-interpolation"
-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-2:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/htf-0.11 <dev-haskell/htf-0.14 )
-"
diff --git a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.6.ebuild b/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.6.ebuild
deleted file mode 100644
index 809ded48fb0f..000000000000
--- a/dev-haskell/neat-interpolation/neat-interpolation-0.3.2.6.ebuild
+++ /dev/null
@@ -1,32 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A quasiquoter for neat and simple multiline text interpolation"
-HOMEPAGE="https://github.com/nikita-volkov/neat-interpolation"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/megaparsec-7:=[profile?] <dev-haskell/megaparsec-9:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-3
-		>=dev-haskell/quickcheck-instances-0.3.22 <dev-haskell/quickcheck-instances-0.4
-		<dev-haskell/rerebase-2
-		>=dev-haskell/tasty-1.2.3 <dev-haskell/tasty-2
-		>=dev-haskell/tasty-hunit-0.10.0.2 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11 )
-"
diff --git a/dev-haskell/netlink/metadata.xml b/dev-haskell/netlink/metadata.xml
index c32804186997..11ba1c5afa1d 100644
--- a/dev-haskell/netlink/metadata.xml
+++ b/dev-haskell/netlink/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name='generators'>build the generator scripts for constants</flag>
-	</use>
+	<upstream>
+		<remote-id type="github">Ongy/netlink-hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild b/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild
new file mode 100644
index 000000000000..b6db6924e6eb
--- /dev/null
+++ b/dev-haskell/netlink/netlink-1.1.1.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.6
+#hackport: flags: -generators
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Netlink communication for Haskell"
+HOMEPAGE="https://github.com/Ongy/netlink-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/monad-loops-0.3:=[profile?]
+	dev-haskell/pretty-hex:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-generators
+}
diff --git a/dev-haskell/netlink/netlink-1.1.1.0.ebuild b/dev-haskell/netlink/netlink-1.1.1.0.ebuild
index 53e93b7bd2f0..7e28c549bf00 100644
--- a/dev-haskell/netlink/netlink-1.1.1.0.ebuild
+++ b/dev-haskell/netlink/netlink-1.1.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6
-
+#hackport: flags: -generators
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
@@ -14,15 +14,12 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="generators"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
 	>=dev-haskell/monad-loops-0.3:=[profile?]
 	dev-haskell/pretty-hex:=[profile?]
 	>=dev-lang/ghc-7.6.1:=
-	generators? ( <dev-haskell/language-c-0.7:=[profile?]
-			dev-haskell/regex-pcre:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.16.0
@@ -30,5 +27,5 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag generators generators)
+		--flag=-generators
 }
diff --git a/dev-haskell/network-bsd/metadata.xml b/dev-haskell/network-bsd/metadata.xml
index c784256ff24c..9dfa95250f48 100644
--- a/dev-haskell/network-bsd/metadata.xml
+++ b/dev-haskell/network-bsd/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<longdescription>
-		This package reexports the &quot;Network.BSD&quot; module split from the &lt;https://hackage.haskell.org/package/network-2.8.0.0 network-2.8.0.0&gt; package.
+		This package reexports the "Network.BSD" module split from the &lt;https://hackage.haskell.org/package/network-2.8.0.0 network-2.8.0.0&gt; package.
 		
 		See newer versions of &lt;https://hackage.haskell.org/package/network-bsd network-bsd&gt; for more information.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">haskell/network-bsd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild b/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild
new file mode 100644
index 000000000000..89a6c97d38da
--- /dev/null
+++ b/dev-haskell/network-bsd/network-bsd-2.8.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Network.BSD"
+HOMEPAGE="https://github.com/haskell/network-bsd"
+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.8.2:=
+	>=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+CABAL_CHDEPS=(
+	'network >= 3.0.0.0 && < 3.0.1' 'network >= 3.0.0.0'
+)
diff --git a/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild b/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild
deleted file mode 100644
index 0681ee2efcf9..000000000000
--- a/dev-haskell/network-bsd/network-bsd-2.8.1.0.ebuild
+++ /dev/null
@@ -1,32 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Network.BSD"
-HOMEPAGE="https://github.com/haskell/network-bsd"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-	>=dev-haskell/network-3.0.0.0:=[profile?] <dev-haskell/network-3.1.2:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'network >= 3.0.0.0 && < 3.0.1' 'network >= 3.0.0.0'
-}
diff --git a/dev-haskell/network-byte-order/Manifest b/dev-haskell/network-byte-order/Manifest
index 066a7079849d..4b4e63879627 100644
--- a/dev-haskell/network-byte-order/Manifest
+++ b/dev-haskell/network-byte-order/Manifest
@@ -1 +1 @@
-DIST network-byte-order-0.1.4.0.tar.gz 6426 BLAKE2B fc4f414622f8feab70bbc76dec977a591099bf81bb050aa0426791523d75bc4bb7fed877d08e9c55cda881638b47d84beee9a6c5ffbba89a95b3e40afdade3b8 SHA512 b0b9f468df51963bb6ef6cd6dcd90345cbee7ec96686b8c4f5b94639f6a78280f30af55779208a14f468ec9c5509aea0e65865a7e8966f9779d4c0eb83933dc2
+DIST network-byte-order-0.1.6.tar.gz 6648 BLAKE2B 4cacbf0af40b2763663456dbc551da9305e10d80ea2e749214b6617aac8cfdedcf2070c8d9d40d2d37d0886a4d3d43bb58addfce3983f8e402a92e51abca6282 SHA512 bfb15f6e1aa863af7f81dc35518273e936d04f5f9decf6a0938a972dc9780ab5c9c10ed062ea027d1e92aa1e61dfb0059dcbc38324dbd4124f89d08017a2ae97
diff --git a/dev-haskell/network-byte-order/metadata.xml b/dev-haskell/network-byte-order/metadata.xml
index b7878815d80d..937381521944 100644
--- a/dev-haskell/network-byte-order/metadata.xml
+++ b/dev-haskell/network-byte-order/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
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.4.0.ebuild
deleted file mode 100644
index 30a9fcf44988..000000000000
--- a/dev-haskell/network-byte-order/network-byte-order-0.1.4.0.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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Network byte order utilities"
-HOMEPAGE="http://hackage.haskell.org/package/network-byte-order"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/doctest )
-"
diff --git a/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild b/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild
new file mode 100644
index 000000000000..61bc2393fe13
--- /dev/null
+++ b/dev-haskell/network-byte-order/network-byte-order-0.1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Network byte order utilities"
+HOMEPAGE="https://hackage.haskell.org/package/network-byte-order"
+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.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/doctest )
+"
diff --git a/dev-haskell/network-bytestring/Manifest b/dev-haskell/network-bytestring/Manifest
deleted file mode 100644
index 4af6b5dce1e0..000000000000
--- a/dev-haskell/network-bytestring/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST network-bytestring-0.1.3.4.tar.gz 9182 BLAKE2B d36a2e56aa2c024ef2e42f1580d9f149863b50ec92ff7b50db14ba4fd7d49da5631b989276f9d9efeea411d367d1314a970461e0eb5c95b2c91532ffa4b31681 SHA512 eba844a3d8927c08d119342f196a6cfbb0c54eb194abb4e4da5614cddbdd685923950a339494e17fdae47eae4249896c5f68390d4abb5d0321fb358612cd3a76
diff --git a/dev-haskell/network-bytestring/files/network-bytestring-0.1.3.4-ghc-7.6.patch b/dev-haskell/network-bytestring/files/network-bytestring-0.1.3.4-ghc-7.6.patch
deleted file mode 100644
index 7ba2e0f465b6..000000000000
--- a/dev-haskell/network-bytestring/files/network-bytestring-0.1.3.4-ghc-7.6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Network/Socket/ByteString.hs b/Network/Socket/ByteString.hs
-index 2fbeaa3..adf3116 100644
---- a/Network/Socket/ByteString.hs
-+++ b/Network/Socket/ByteString.hs
-@@ -45,7 +45,7 @@ import Data.ByteString (ByteString)
- import Data.ByteString.Internal (createAndTrim)
- import Data.ByteString.Unsafe (unsafeUseAsCStringLen)
- import Data.Word (Word8)
--import Foreign.C.Types (CInt)
-+import Foreign.C.Types
- import Foreign.Marshal.Alloc (allocaBytes)
- import Foreign.Ptr (Ptr, castPtr)
- import Network.Socket (SockAddr, Socket(..), sendBufTo, recvBufFrom)
-diff --git a/Network/Socket/ByteString/Internal.hs b/Network/Socket/ByteString/Internal.hs
-index c6a835b..eb41194 100644
---- a/Network/Socket/ByteString/Internal.hs
-+++ b/Network/Socket/ByteString/Internal.hs
-@@ -11,9 +11,9 @@ module Network.Socket.ByteString.Internal
- import System.IO.Error (ioeSetErrorString, mkIOError)
- 
- #if !defined(mingw32_HOST_OS)
--import Foreign.C.Types (CInt)
-+import Foreign.C.Types
- import Foreign.Ptr (Ptr)
--import System.Posix.Types (CSsize)
-+import System.Posix.Types
- 
- import Network.Socket.ByteString.IOVec (IOVec)
- import Network.Socket.ByteString.MsgHdr (MsgHdr)
diff --git a/dev-haskell/network-bytestring/metadata.xml b/dev-haskell/network-bytestring/metadata.xml
deleted file mode 100644
index ff0b4d01a27a..000000000000
--- a/dev-haskell/network-bytestring/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast, memory-efficient, low-level socket functions
-		that use 'Data.ByteString's instead of 'String's.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">tibbe/network-bytestring</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild b/dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild
deleted file mode 100644
index 3dc7f2993f61..000000000000
--- a/dev-haskell/network-bytestring/network-bytestring-0.1.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Fast, memory-efficient, low-level networking"
-HOMEPAGE="https://github.com/tibbe/network-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/network-2.2.1.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.6.patch
-	cabal_chdeps \
-		'network    >= 2.2.1.1 && < 2.3' 'network    >= 2.2.1.1' \
-		'base       < 4.4' 'base'
-}
diff --git a/dev-haskell/network-conduit/Manifest b/dev-haskell/network-conduit/Manifest
deleted file mode 100644
index 0457f7bf008c..000000000000
--- a/dev-haskell/network-conduit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST network-conduit-1.0.0.tar.gz 5853 BLAKE2B 9c6a1692d8839dd81ba5b9ae6d6728c310ea5888753089a35bfdb8b53d98925a7925da4ed5f75ae64de23b0962df83e9f941588e3f1a5b2ca09bcfd04dd74d4b SHA512 9f16e529da022d2a4049fe9d41f8df0eb1fb34b4ad80f755944074b4016688169f3efd78a4ad2c052c1951ddccb728552077d88b533ed8fde1425c469a27f7c4
-DIST network-conduit-1.0.2.2.tar.gz 7072 BLAKE2B edbef7b63493b5317dd9a043273e310c47529933b82f8ea9876ac3ac0044d6f8e6d9a39c893b52b2c7ff88de4ce705dd55e039e1ae49a17420dee1386f464d96 SHA512 3dcc755ccb0ddb9c543fccec54c32ab52749602c7c9367ee70b569a1f6aa2924ae0b7207b946d6e3d55e562758e65e694c13aa464498f5927c84239f09b1c8b7
-DIST network-conduit-1.1.0.tar.gz 1357 BLAKE2B 7952df2ab1a141a6d9b5460bc128ea1b45df0ea178a1d75e8e746d66d5d11c9cee278e56bb99dc4aed62af94312b1c3e6eb9f89be4ba94c198d96091b90100a5 SHA512 1bda46190bc9759e9d85f61f4555dca4444c307305b8a7ebfc3e88519ae8119e313eaf4095541c487b8431ad342320d83ff4dd1ebf271cf10c11414c652b34d1
diff --git a/dev-haskell/network-conduit/metadata.xml b/dev-haskell/network-conduit/metadata.xml
deleted file mode 100644
index 8451d83ac011..000000000000
--- a/dev-haskell/network-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Stream socket data using conduits.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild b/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
deleted file mode 100644
index dfbc31ae7f13..000000000000
--- a/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stream socket data using conduits"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/conduit-1.0*:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		=dev-haskell/monad-control-0.3*:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		>=dev-haskell/network-2.3:=[profile?]
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild b/dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild
deleted file mode 100644
index 0936a177d177..000000000000
--- a/dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stream socket data using conduits"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-network-bytestring
-}
diff --git a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild b/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
deleted file mode 100644
index 3fdab3fde1fd..000000000000
--- a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Stream socket data using conduits. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/network-data/Manifest b/dev-haskell/network-data/Manifest
deleted file mode 100644
index 55766ff70382..000000000000
--- a/dev-haskell/network-data/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST network-data-0.5.3.tar.gz 5795 BLAKE2B 38946312b36f27dc6dc4e6324f716fc7a7d3e19af41e309be17eeeda9139cc1385bafabeaa33dcd9de1d3a9302f279c4b069c7ec9eb37519d0dd7b8b200f93a4 SHA512 911cd9cc5af3b0bd49939b6ce79886c8d07fb2e4700a837560f5e6b6bb2a74dca319889f01dea87f463c6ee0df2d7b9442f4ed5201ed4acd4aadceb85b69ddec
diff --git a/dev-haskell/network-data/metadata.xml b/dev-haskell/network-data/metadata.xml
deleted file mode 100644
index 5738ce3e28f2..000000000000
--- a/dev-haskell/network-data/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="small-base">Build the split-up base package.</flag>
-	</use>
-	<longdescription>
-		This library includes definitions for common headers such as
-		Ethernet, IPv4, IPv6, UDP, TCP, etc. This code is untested for any serious
-		work - use at your own risk.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/network-data/network-data-0.5.3.ebuild b/dev-haskell/network-data/network-data-0.5.3.ebuild
deleted file mode 100644
index 26571def8913..000000000000
--- a/dev-haskell/network-data/network-data-0.5.3.ebuild
+++ /dev/null
@@ -1,43 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for network data structures and their serialization"
-HOMEPAGE="https://hackage.haskell.org/package/network-data"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+small-base"
-
-# dev-haskell/prettyclass is not required for ghc 7.10.1, just adding
-# it for backwards compatibility with <ghc 7.10.1
-
-RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
-	>=dev-haskell/prettyclass-1.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
-	default
-
-	if has_version "<dev-lang/ghc-7.10.1"; then
-		cabal_chdeps \
-			'pretty >= 1.1.2' 'pretty >= 1.0, prettyclass >= 1.0'
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag small-base small_base)
-}
diff --git a/dev-haskell/network-info/Manifest b/dev-haskell/network-info/Manifest
index eae3ee92e8a1..3f1755712c23 100644
--- a/dev-haskell/network-info/Manifest
+++ b/dev-haskell/network-info/Manifest
@@ -1,2 +1,2 @@
 DIST network-info-0.2.0.10.tar.gz 6278 BLAKE2B 52cec7dc2866ff0aad9f0180391c2e093d3147f7de1dd96baa7ec1f9d149792aca371d7f5bb3a32d254f2fd3a35f6a6b3fb479967ad7cb0a125944aca7eeaa88 SHA512 d578f64860fb3c04d11a444d9636bde57402b6728529e73c7741b056ef0d8f68cb0958118212f2d47826dc28ba9b2bfcc9aef8b5b2e9fc3da8eaadc796160895
-DIST network-info-0.2.0.8.tar.gz 5998 BLAKE2B 99ec593628e7f0f3e3995145917bed53d22b381b65bd6aaf611f3b60fc2c093967ac8e7914c614012c66fc410fc106213e34e9fe787e09dc847554e1f670533c SHA512 3b2d23085c8c4cb1cfefc8be75dd7b0c2e144a28b8c203149a246c8b9173d1e3f6b2fdb0e6ac3d13066d0d3b219b12dc82f2e935d3b661ff4dc6d858e376f3be
+DIST network-info-0.2.1.tar.gz 6387 BLAKE2B 82ff522ddf8bb4b22fabda228148cc428cb847589727dfa18182d6516c1367a6549c07fdca4492c56a012e61b9e3fe168827bd31e837d8f6bea30f0dfef3e19d SHA512 a252bd5c34cbbde9dcdd9606b31ed9b9fa802edfc694795f8779fd8f4ffa9092df0ab25426e0a1dca836d74a9357c1b31acb2aa01a9e46e8ffd5959be7a5d619
diff --git a/dev-haskell/network-info/metadata.xml b/dev-haskell/network-info/metadata.xml
index f67a3903830a..870e8e27d82c 100644
--- a/dev-haskell/network-info/metadata.xml
+++ b/dev-haskell/network-info/metadata.xml
@@ -1,23 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library provides simple read-only access to the
-		local computer's networking configuration. It is
-		currently capable of getting a list of all the network
-		interfaces and their respective IPv4, IPv6 and MAC
-		addresses.
-		
-		network-info has been tested and is known to work on
-		Ubuntu 10.10, FreeBSD 9.0, Mac OS X 10.6.4 and Windows
-		XP/7. It probably works on other flavours of Linux,
-		OS X, FreeBSD and Windows as well.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">jystic/network-info</remote-id>
+		<remote-id type="hackage">network-info</remote-id>
+		<remote-id type="github">jacobstanley/network-info</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/network-info/network-info-0.2.0.10.ebuild b/dev-haskell/network-info/network-info-0.2.0.10.ebuild
index 82bcf31a5f03..aca2a535bd68 100644
--- a/dev-haskell/network-info/network-info-0.2.0.10.ebuild
+++ b/dev-haskell/network-info/network-info-0.2.0.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/network-info/network-info-0.2.0.8.ebuild b/dev-haskell/network-info/network-info-0.2.0.8.ebuild
deleted file mode 100644
index 14f9e45cafc8..000000000000
--- a/dev-haskell/network-info/network-info-0.2.0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Access the local computer's basic network configuration"
-HOMEPAGE="https://github.com/jystic/network-info"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/network-info/network-info-0.2.1.ebuild b/dev-haskell/network-info/network-info-0.2.1.ebuild
new file mode 100644
index 000000000000..eb5ab6b19e2a
--- /dev/null
+++ b/dev-haskell/network-info/network-info-0.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Access the local computer's basic network configuration"
+HOMEPAGE="https://github.com/jacobstanley/network-info"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/network-multicast/Manifest b/dev-haskell/network-multicast/Manifest
index 3bf34af16ce3..d1c697c1e517 100644
--- a/dev-haskell/network-multicast/Manifest
+++ b/dev-haskell/network-multicast/Manifest
@@ -1,3 +1 @@
-DIST network-multicast-0.0.11.tar.gz 2970 BLAKE2B b58ed23c8dc8ed0c556685ce2a233c72517fbb7a72fa6fc71676f7ac6886a7e3a5ec3ec90bb37805dbb3dd07e3b129bf3a1a5be958d2240df782dc7e40e12ce1 SHA512 f38f4e683117412b97b602ddc324b17ffbb6c20f265086565b16124c15cb99ec63e4a21092cd33e87756d7c9ae15de8c63d8dd192503f7abfbbcf455f02796b2
-DIST network-multicast-0.1.0.tar.gz 3023 BLAKE2B f9ab3881a6ca4d575643328121dd69626fb5e35fe508da0611e4b74d4725f232365db63fc97a8926e653ca972ba6663c476a2c4d159fc52c93dfa5464f824bb3 SHA512 e40de36f5e9bfd999033825c1b834895fd20e649ed5e297f601c0112ed9c02a66aaa05110df8eaa3329d79a7d44d77f077ca231f4fd1587a633ca1847083b0c7
 DIST network-multicast-0.3.2.tar.gz 3352 BLAKE2B ffbde4c01b286fa5d06382bddbab5bf820f029f371114948ba7e3ad3e26b23c0e94afc9ecc764a481fc7fc2dbd1f13f2252274091a30656ae148de2fb3596f99 SHA512 6308b09e882a3b99ce762cc30da790d6ff83b777d322842d342f555a307c59f0110b9a46557559e9bb5bfba258644f25ebfb9007f33e62cf6855dec8fd48da99
diff --git a/dev-haskell/network-multicast/metadata.xml b/dev-haskell/network-multicast/metadata.xml
index 6ca2a5311001..937381521944 100644
--- a/dev-haskell/network-multicast/metadata.xml
+++ b/dev-haskell/network-multicast/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The "Network.Multicast" module is for sending
-		UDP datagrams over multicast (class D) addresses.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/network-multicast/network-multicast-0.0.11.ebuild b/dev-haskell/network-multicast/network-multicast-0.0.11.ebuild
deleted file mode 100644
index 6df5247e5b82..000000000000
--- a/dev-haskell/network-multicast/network-multicast-0.0.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple multicast library"
-HOMEPAGE="https://hackage.haskell.org/package/network-multicast"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/network-multicast/network-multicast-0.1.0.ebuild b/dev-haskell/network-multicast/network-multicast-0.1.0.ebuild
deleted file mode 100644
index 40a1eb2d736a..000000000000
--- a/dev-haskell/network-multicast/network-multicast-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple multicast library"
-HOMEPAGE="https://hackage.haskell.org/package/network-multicast"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild b/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
index d7bbf4142bc3..bffad67dceec 100644
--- a/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
+++ b/dev-haskell/network-multicast/network-multicast-0.3.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Simple multicast library"
-HOMEPAGE="http://hackage.haskell.org/package/network-multicast"
+HOMEPAGE="https://hackage.haskell.org/package/network-multicast"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/network-protocol-xmpp/Manifest b/dev-haskell/network-protocol-xmpp/Manifest
deleted file mode 100644
index f834be408a9c..000000000000
--- a/dev-haskell/network-protocol-xmpp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST network-protocol-xmpp-0.4.8.tar.gz 24289 BLAKE2B 53d5f7c35846a4727fc15994d332213573b73893e37ef8fb5121bcf7e4ea684e1f794856317d3b8b51e0b8a7d5cb829ab1af0d226c75d745a7e280e9c4ecc992 SHA512 029cbb1a0ea6691fd886b326eee7a24e8300bbece1f0c0f564b43b0e344f4107ca980d97342271cab0b9c1333fc445ac10f7dfae41dd2b6e6ea995bfb810311e
diff --git a/dev-haskell/network-protocol-xmpp/metadata.xml b/dev-haskell/network-protocol-xmpp/metadata.xml
deleted file mode 100644
index c36ec5ac9648..000000000000
--- a/dev-haskell/network-protocol-xmpp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Client library for the XMPP protocol.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.8.ebuild b/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.8.ebuild
deleted file mode 100644
index b60b7b8f9632..000000000000
--- a/dev-haskell/network-protocol-xmpp/network-protocol-xmpp-0.4.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Client library for the XMPP protocol"
-HOMEPAGE="https://john-millikin.com/software/haskell-xmpp/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gnuidn-0.2:=[profile?] <dev-haskell/gnuidn-0.3:=[profile?]
-	>=dev-haskell/gnutls-0.1.4:=[profile?] <dev-haskell/gnutls-0.3:=[profile?]
-	>=dev-haskell/gsasl-0.3:=[profile?] <dev-haskell/gsasl-0.4:=[profile?]
-	>=dev-haskell/libxml-sax-0.7:=[profile?] <dev-haskell/libxml-sax-0.8:=[profile?]
-	>=dev-haskell/monads-tf-0.1:=[profile?] <dev-haskell/monads-tf-0.2:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/network-run/Manifest b/dev-haskell/network-run/Manifest
new file mode 100644
index 000000000000..a7d60f7e8cce
--- /dev/null
+++ b/dev-haskell/network-run/Manifest
@@ -0,0 +1 @@
+DIST network-run-0.2.4.tar.gz 3092 BLAKE2B 6297645c5ae200dc584fad8a9a6be1403087cddf7c0bdcb1c928745bed7cc92302d9ffab1b66678941239b478ed595406c299e08f6aa417021f1dc36829d865d SHA512 45f5490e3f3409919a0c9405c96f6529a322dc145017347321a3bceafbefca3f19aba39d8acfcd5b31ee05a324c63355833fce5fabed8ea87a358bf7e3a1ab05
diff --git a/dev-haskell/network-run/metadata.xml b/dev-haskell/network-run/metadata.xml
new file mode 100644
index 000000000000..cc983e9d2a29
--- /dev/null
+++ b/dev-haskell/network-run/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">network-run</remote-id>
+		<remote-id type="github">kazu-yamamoto/network-run</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/network-run/network-run-0.2.4.ebuild b/dev-haskell/network-run/network-run-0.2.4.ebuild
new file mode 100644
index 000000000000..ab9398987ed9
--- /dev/null
+++ b/dev-haskell/network-run/network-run-0.2.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple network runner library"
+HOMEPAGE="https://hackage.haskell.org/package/network-run"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/network-3.1.0:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/network-uri/Manifest b/dev-haskell/network-uri/Manifest
index 8d1ab37065bf..e6efe7b1d15e 100644
--- a/dev-haskell/network-uri/Manifest
+++ b/dev-haskell/network-uri/Manifest
@@ -1,4 +1,2 @@
-DIST network-uri-2.5.0.0.tar.gz 1665 BLAKE2B 7f4c1090cf22f83b69b2cc222001f607f6bc0ff9a98a9d20438da8cdea751cded6ffd2b39f05561724cb87f194a15028240bb44c06d24d539dc6c42ac4b25f86 SHA512 9bc738e6de09a3dfd1b929c6f9c557abedef239034e886ca65d15a1ffc423dc72ce8b09f0f374ebd701b237600b65d031d5bc75f5ea937291328f4a1d01e6061
-DIST network-uri-2.6.0.3.tar.gz 26639 BLAKE2B 6d94ac9c89bf0758deabc6869d0964050a610620466054f704608212033e410edd23497c8cfb4d746b891d6f0e7b30c76581f2ba1cf57082d0ce59714ce1c5c6 SHA512 69d52462ed5af44fc3c1e27b741d87a33e0e90fe1fb314f68fd7b8819007a0e88dbde5f53ae7672d820ee48ac99cb9e422dc7274b7032c965f867089468d73ba
-DIST network-uri-2.6.1.0.tar.gz 27262 BLAKE2B 9ef806e6a97a62b43d15887f7e8bad20568db5cbfcbea320d749b9f4b98ebc8eb729762982baf627df792d0535665f4a52a76afdba40e3a73c475bcf86b17238 SHA512 c1b6e516cd19875aab0da325dcb8f5c6b98d43c3952bda4f96bd9c798882357c724b2facbef09e2e98d29b696a9e5518a2de9463fb0af4c5df0734fe2654cc24
-DIST network-uri-2.6.3.0.tar.gz 31997 BLAKE2B 305a32a14eb32bb723ade1b20665e1f37a14111a7725bfcba99bd59120e5ac08c0f30c7fa32692a64f5a0bd4b26292e93bb079b89aa043c3fa0188316d0908f8 SHA512 15091367e4543de1e2af0d81973b8e456e2c5f5295dcd7a91b91f46c2e07a6a655c6ab4c0837ce7566b21b43bca3569c1b27bb7f437572b09d00e678c7b512f0
+DIST network-uri-2.6.4.1.tar.gz 32373 BLAKE2B cceeb533cae70b4b3e2a4caa2a2f3722949698bcc6c2c454787195ec33050c0a3f6ff9f2d60d5d965eb13043b22759525298a1840ac7046e765bc40b3ae960c7 SHA512 8e5b01fd11197ac36de9b804d37256662f904f2b94a997a2e262439bb1706d1c460db368e935bf3971fd1581162abbc07439a0bae391e1e616264bd00fe7104e
+DIST network-uri-2.6.4.2.tar.gz 31309 BLAKE2B 4ff7d3211ac89ef06ecc6f769c0a0a6933f23bd191dbfdae90697eb31c898d05d42094dec67161ff7cff648b2a6115b7a49d40218037cd838d2160a45cb0b445 SHA512 999e94a3053a101d1dc737a26ff93f832040365e949805b1ff5327ade9ab63d20f686c9f1bb3544d6d22c7c6d0b10bfcb64b30aa226d74ed6ad8bbb28fce6c0f
diff --git a/dev-haskell/network-uri/metadata.xml b/dev-haskell/network-uri/metadata.xml
index 8bbc355a0a8b..9e1b07f449dd 100644
--- a/dev-haskell/network-uri/metadata.xml
+++ b/dev-haskell/network-uri/metadata.xml
@@ -1,34 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides an URI manipulation inteface.
-		
-		In network-2.6 the @Network.URI@ module was split off from the
-		network package into this package. If you're using the @Network.URI@
-		module you can automatically get it from the right package by adding
-		this to your .cabal file:
-		
-		&gt; flag network-uri
-		&gt;   description: Get Network.URI from the network-uri package
-		&gt;   default: True
-		&gt;
-		&gt; library
-		&gt;   -- ...
-		&gt;   if flag(network-uri)
-		&gt;     build-depends: network-uri &gt;= 2.6
-		&gt;   else
-		&gt;     build-depends: network &lt; 2.6
-		
-		If you want to use other modules from the network package while
-		using the @Network.URI@ modules from this package, add a @network &gt;
-		2.6@ clause to the first @build-depends@ line.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">network-uri</remote-id>
 		<remote-id type="github">haskell/network-uri</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild b/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
deleted file mode 100644
index 17840d2a8699..000000000000
--- a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild b/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild
deleted file mode 100644
index fd3d201904ab..000000000000
--- a/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!<dev-haskell/network-2.6
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild b/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
deleted file mode 100644
index bbb6682ef743..000000000000
--- a/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!<dev-haskell/network-2.6
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild b/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild
deleted file mode 100644
index a542da827e19..000000000000
--- a/dev-haskell/network-uri/network-uri-2.6.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depend
-inherit haskell-cabal
-
-DESCRIPTION="URI manipulation"
-HOMEPAGE="https://github.com/haskell/network-uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular depend: network-uri[test]->criterion->js-flot->http->network-uri
-
-RDEPEND=">=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild b/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild
new file mode 100644
index 000000000000..4624897d973e
--- /dev/null
+++ b/dev-haskell/network-uri/network-uri-2.6.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+DESCRIPTION="URI manipulation"
+HOMEPAGE="https://github.com/haskell/network-uri"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT=test # circular depend: network-uri[test]->criterion->js-flot->http->network-uri
+
+RDEPEND=">=dev-haskell/parsec-3.1.12.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/th-compat-0.1.1:=[profile?] <dev-haskell/th-compat-1.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
+# 	test? ( dev-haskell/hunit
+# 		dev-haskell/quickcheck
+# 		dev-haskell/tasty
+# 		dev-haskell/tasty-hunit
+# 		dev-haskell/tasty-quickcheck )
+# "
diff --git a/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild b/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild
new file mode 100644
index 000000000000..78efe4ef49f6
--- /dev/null
+++ b/dev-haskell/network-uri/network-uri-2.6.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="URI manipulation"
+HOMEPAGE="https://github.com/haskell/network-uri"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-haskell/th-compat-0.1.1:=[profile?] <dev-haskell/th-compat-1.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index 300618fd5429..d64e643810e4 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -1,6 +1,2 @@
-DIST network-2.4.1.2.tar.gz 140424 BLAKE2B 7e9d3036caa1ecdec1ffbc684310271cdd92998cebc35a51d65b858975ab8210612e445bc26071bebc67bb7ece5af31a6082de46932724a4afca63fb68238791 SHA512 a9a0237477fbb484ff8a66121a7808e35d4df68552c18cead1f96243f945e9517583f39c769c3ecbd643ec86a253bb3cba638ffb780feb503d60595ad7c4c7f5
-DIST network-2.4.2.2.tar.gz 141558 BLAKE2B a2e9137b79da5e9d136a9e10eee796b2aeaa81bd38cdfa5b4a2822711a9ec2fed3019ecf91c84f2ca6dc00824455814fac53c6a75bf7a5af89ec733ea4be0c6f SHA512 e1aa5caa4e3ca368f8499ff9ed337e6827909a6d1c622cc2133871eac3b9d257d982c421f40d4d0118e50a5a421102f084d95b4e98faf91599b6c002988b1466
-DIST network-2.5.0.0.tar.gz 141768 BLAKE2B a7da62a236f87d4afb48e1289b536d924b04179b1608b6ca55f755dcbe08a468546a52c69f2a3f681e9e2ff05a952d1dbbd87831dd03e3a8a2f911eb17a379c0 SHA512 37048752b5d4d68f9ce57f9c7a3bfe2657a207c5853a6ecaae74ff9c8f9afb2ba76c9e517bfd955c427cbfccc39d921a1849c5a8094603ad5081012d9f5bb47d
-DIST network-2.6.2.1.tar.gz 118092 BLAKE2B 38f5be09b44ef90e4ecec2d73809abc8bcd15f55b95f6e390d925634e9e56776e00fd0bb5d223d26c85bd31d318ec61553918eeaf8b9c15258aaa70a41e6494d SHA512 debf0a05e1b9d048b7212ff21b92895da84c864bf71c3c5adee5070402c94a38f6722fbc11cfb15df36fe9bfe092bb0c29a0f3f9475a319f38e0c0659989cb68
-DIST network-2.6.3.1.tar.gz 120418 BLAKE2B 5e48e61e3f8b3ac9d9fa5bfca37929581291941d1f55f332614bf61552354a31e1f565092e4f83e67181384553b5efe2040d12882f85fe03d2377b93233e883a SHA512 3c23ef0a1bf5383cc2479a517875037f9de38c79c1293734cc723111ab880a5842e091ee91a612090d0a2e422d53028d17cf5b0800af0d1d6c983d564197b9a6
-DIST network-3.0.1.1.tar.gz 114777 BLAKE2B 05ced39ff17eb68e5e70ddb1036770413224839d5a2c84ee568823feb364f1da898bdc56ae7e64f0e24db80dbc2ec739e42763708b3373f49a85ecf911c72621 SHA512 faca3b25c8724a0c832b6e12e21381fa9642a60bce8a01ea7b570216cd429b2332b14903011f4a554af227de5e502f9619860c230a8f2a69cb5e2289b1947e3d
+DIST network-3.1.2.5.tar.gz 139267 BLAKE2B 682726d42db1d899810fbe6c0aa89f1b25770a46041a9136260d104f658611bc747c4695f403ae52234ac3506221619d7741e75bea987d0cc19e6a5066172f9f SHA512 671429b18f11285b157c70e669051f57a30bf5e85ada1134464f80dd978f71878f8b4d2564242c9ff4bb100b49af771e449c556654486f5eb433f39401ec6c00
+DIST network-3.1.3.0.tar.gz 139436 BLAKE2B e689f4a7ff235e07029f3d24714a8a1b465b8884aad8c0067f8980fd6a7876ef110f3759a0a7bd4cb3565d99ba1ae60b31ee0a2a87409b59c101c0862bd9f43b SHA512 000e2bf2bb9143e4808b02d8065809c67de9562aca35d043d15c064ae2b9e946a717862253add5ae65bf4bddc720ee266931c798238d2b5a546b52a5ab133cb8
diff --git a/dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch b/dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch
deleted file mode 100644
index eeb41c960c7b..000000000000
--- a/dev-haskell/network/files/network-2.6.3.1-no-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
-diff --git a/network.buildinfo.in b/network.buildinfo.in
-index 69e63a6..2079179 100644
---- a/network.buildinfo.in
-+++ b/network.buildinfo.in
-@@ -2,3 +2,2 @@ ghc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
- ghc-prof-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
--ld-options: @LDFLAGS@
- cc-options: -DCALLCONV=@CALLCONV@ @EXTRA_CPPFLAGS@
diff --git a/dev-haskell/network/metadata.xml b/dev-haskell/network/metadata.xml
index 6c171b8854fc..dd74ff6d9d5c 100644
--- a/dev-haskell/network/metadata.xml
+++ b/dev-haskell/network/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-    <name>Gentoo Haskell</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">haskell/network</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="devel">using tests for developers</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">network</remote-id>
+		<remote-id type="github">haskell/network</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/network/network-2.4.1.2.ebuild b/dev-haskell/network/network-2.4.1.2.ebuild
deleted file mode 100644
index 4fe652f56b35..000000000000
--- a/dev-haskell/network/network-2.4.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hunit
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-			dev-haskell/test-framework-quickcheck2
-		)"
diff --git a/dev-haskell/network/network-2.4.2.2.ebuild b/dev-haskell/network/network-2.4.2.2.ebuild
deleted file mode 100644
index 71b77c4ab690..000000000000
--- a/dev-haskell/network/network-2.4.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/network-2.5.0.0.ebuild b/dev-haskell/network/network-2.5.0.0.ebuild
deleted file mode 100644
index ce69664a4fbb..000000000000
--- a/dev-haskell/network/network-2.5.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/network/network-2.6.2.1.ebuild b/dev-haskell/network/network-2.6.2.1.ebuild
deleted file mode 100644
index ab4c59f42ac8..000000000000
--- a/dev-haskell/network/network-2.6.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/network/network-2.6.3.1-r1.ebuild b/dev-haskell/network/network-2.6.3.1-r1.ebuild
deleted file mode 100644
index b1e276c3e6d5..000000000000
--- a/dev-haskell/network/network-2.6.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # missing regression test file
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.10.1
-		dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
diff --git a/dev-haskell/network/network-3.0.1.1.ebuild b/dev-haskell/network/network-3.0.1.1.ebuild
deleted file mode 100644
index 4756e2bc55d0..000000000000
--- a/dev-haskell/network/network-3.0.1.1.ebuild
+++ /dev/null
@@ -1,28 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level networking interface"
-HOMEPAGE="https://github.com/haskell/network"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3/${PV}" # NOTE: remember to set SLOT="3/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # requires network
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.6
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/network/network-3.1.2.5.ebuild b/dev-haskell/network/network-3.1.2.5.ebuild
new file mode 100644
index 000000000000..f5a9d12439a4
--- /dev/null
+++ b/dev-haskell/network/network-3.1.2.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Low-level networking interface"
+HOMEPAGE="https://github.com/haskell/network"
+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"
+IUSE="devel"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2.6
+		dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag devel devel)
+}
diff --git a/dev-haskell/network/network-3.1.3.0.ebuild b/dev-haskell/network/network-3.1.3.0.ebuild
new file mode 100644
index 000000000000..caff0339fd4c
--- /dev/null
+++ b/dev-haskell/network/network-3.1.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Low-level networking interface"
+HOMEPAGE="https://github.com/haskell/network"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="devel"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hspec-2.6
+		dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag devel devel)
+}
diff --git a/dev-haskell/newtype-generics/Manifest b/dev-haskell/newtype-generics/Manifest
deleted file mode 100644
index bf45efe58281..000000000000
--- a/dev-haskell/newtype-generics/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST newtype-generics-0.5.4.tar.gz 6878 BLAKE2B c260a0eeaecfe3d97aa6b7f794f588d64252373ecd92a5bbae55ab373620d96b4dece32fae0e96a74b1c9c1a0744fc222480c7271cd21addf93a7747465a14e5 SHA512 33128015f68a01633b778b8fd7f3d3df8f13b33479705edd4b47036641d7b358667998eb56a6fecdb1f65cb7fb0ac456b8d08ef264e1c17b2fad08ce0a0ffea1
diff --git a/dev-haskell/newtype-generics/metadata.xml b/dev-haskell/newtype-generics/metadata.xml
deleted file mode 100644
index e28f27a0de98..000000000000
--- a/dev-haskell/newtype-generics/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Per Conor McBride, the Newtype typeclass represents the packing and unpacking of a newtype,
-		and allows you to operatate under that newtype with functions such as ala.
-		Generics support was added in version 0.4, making this package a full replacement
-		for the original newtype package, and a better alternative to newtype-th.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild b/dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild
deleted file mode 100644
index 105dcb183f0b..000000000000
--- a/dev-haskell/newtype-generics/newtype-generics-0.5.4.ebuild
+++ /dev/null
@@ -1,32 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass for working with newtypes, with generics support"
-HOMEPAGE="https://github.com/sjakobi/newtype-generics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.1 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.6 && < 4.14' 'base >= 4.6'
-}
diff --git a/dev-haskell/newtype/Manifest b/dev-haskell/newtype/Manifest
deleted file mode 100644
index 28c6e838ff57..000000000000
--- a/dev-haskell/newtype/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST newtype-0.2.2.0.tar.gz 4853 BLAKE2B 7b4b14b3ff158b6ceba22465421933fdadeddf20a6309cb107078f792087c63a614eb8df99f5ad515cbedd0897342252929ab34aa1694013d95d2e165c2a02e8 SHA512 9d8b344ac5f6ff62d8100b95dd879715639af2d8d1f63a8cb17a18fa7c4f427eade49aa3d6b47034351ac0f2cb5061013f6321038bff1053eb3aa84faf157a5b
-DIST newtype-0.2.tar.gz 3476 BLAKE2B 2c1dc7f78966680b927c7fb30bb76469b0fd5043e4d3a5917bf0de53e67f6bd7e9eb080a566d732e55afc4116dc3ad3d7eef511468adc67ff7a9076449c98d08 SHA512 9f5115df618223b5acf81ef7d15dc95db5930b39863ee89e2613500bd5a5b4cf421510a4330bbe77d7c456b56f4e93072b53fe31aec2f4dbebd966b80f667958
diff --git a/dev-haskell/newtype/metadata.xml b/dev-haskell/newtype/metadata.xml
deleted file mode 100644
index 483360127934..000000000000
--- a/dev-haskell/newtype/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Per Conor McBride, the Newtype typeclass represents the packing and unpacking of a newtype, and allows you to operatate under that newtype with functions such as ala.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/newtype/newtype-0.2.2.0.ebuild b/dev-haskell/newtype/newtype-0.2.2.0.ebuild
deleted file mode 100644
index 2b424a821927..000000000000
--- a/dev-haskell/newtype/newtype-0.2.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass and set of functions for working with newtypes"
-HOMEPAGE="https://hackage.haskell.org/package/newtype"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/newtype/newtype-0.2.ebuild b/dev-haskell/newtype/newtype-0.2.ebuild
deleted file mode 100644
index beca6243a27f..000000000000
--- a/dev-haskell/newtype/newtype-0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A typeclass and set of functions for working with newtypes"
-HOMEPAGE="https://hackage.haskell.org/package/newtype"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/nonce/Manifest b/dev-haskell/nonce/Manifest
deleted file mode 100644
index ac1d4cc69518..000000000000
--- a/dev-haskell/nonce/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nonce-1.0.2.tar.gz 2872 BLAKE2B ca6fe229e9682b91eee7886576eead09f47d259c760fc8e37d4c079ce810fa4ba3e08e53ef175ebe9787e7c921d3ab866fb2a446a116fde4a979d513b494dbdb SHA512 e47ed297c7aaa1ed98b6ce711cbc6653dbcbeba9b132750e588c9134f544e8b92b857f36a9331350711df14259dd0f54e49fa6e0da10e9334c5bf76952431894
diff --git a/dev-haskell/nonce/metadata.xml b/dev-haskell/nonce/metadata.xml
deleted file mode 100644
index ef3750fcd2b4..000000000000
--- a/dev-haskell/nonce/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		According to the Wikipedia, a nonce is an arbitrary number used
-		only once in a cryptographic communication.  This package
-		contain helper functions for generating nonces.
-		
-		There are many kinds of nonces used in different situations.
-		It's not guaranteed that by using the nonces from this package
-		you won't have any security issues.  Please make sure that the
-		nonces generated via this package are usable on your design.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">prowdsponsor/nonce</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/nonce/nonce-1.0.2.ebuild b/dev-haskell/nonce/nonce-1.0.2.ebuild
deleted file mode 100644
index 5c3ac867b5c3..000000000000
--- a/dev-haskell/nonce/nonce-1.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate cryptographic nonces"
-HOMEPAGE="https://github.com/prowdsponsor/nonce"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/cprng-aes-0.5:=[profile?] <dev-haskell/cprng-aes-0.7:=[profile?]
-	>=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base              >= 4.5   && < 4.9' 'base              >= 4.5'
-}
diff --git a/dev-haskell/nothunks/Manifest b/dev-haskell/nothunks/Manifest
new file mode 100644
index 000000000000..922334f3ab1e
--- /dev/null
+++ b/dev-haskell/nothunks/Manifest
@@ -0,0 +1 @@
+DIST nothunks-0.1.4.tar.gz 18501 BLAKE2B 5f5bda104990dbecf7e313134d1d723f5ecb0dfb9b3abdb0ab68774f55e416b954720de7ccc449047f795cb03464c15cbf37dd4e20bdac71d0188f8fb76dc70e SHA512 6decd4bcc6c72c09c87692e772affeb4bb22d6312974bfb184567e399844d437bd4c68814f2f208d82a012498090a780958d138a946e907258e9a5d221a697c4
diff --git a/dev-haskell/nothunks/metadata.xml b/dev-haskell/nothunks/metadata.xml
new file mode 100644
index 000000000000..de0c1b2d1b19
--- /dev/null
+++ b/dev-haskell/nothunks/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+	<use>
+		<flag name="bytestring">Provide instances for bytestring</flag>
+		<flag name="text">Provide instances for text</flag>
+		<flag name="vector">Provide instances for vector</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">nothunks</remote-id>
+		<remote-id type="github">input-output-hk/nothunks</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/nothunks/nothunks-0.1.4-r1.ebuild b/dev-haskell/nothunks/nothunks-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..f70ecce1a7c2
--- /dev/null
+++ b/dev-haskell/nothunks/nothunks-0.1.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Examine values for unexpected thunks"
+HOMEPAGE="https://hackage.haskell.org/package/nothunks"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+bytestring +text +vector"
+
+CABAL_CHDEPS=(
+	'hedgehog       >= 1.1 && < 1.3' 'hedgehog >= 1.1'
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.10.6:=
+	text? (
+		|| (
+			( >=dev-haskell/text-1.2 <dev-haskell/text-1.3 )
+			( >=dev-haskell/text-2 <dev-haskell/text-2.1 )
+		)
+		dev-haskell/text:=[profile?]
+	)
+	vector? (
+		>=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/hedgehog-1.1
+		>=dev-haskell/random-1.1 <dev-haskell/random-1.3
+		>=dev-haskell/tasty-1.3 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hedgehog-1.1 <dev-haskell/tasty-hedgehog-1.5
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bytestring bytestring) \
+		$(cabal_flag text text) \
+		$(cabal_flag vector vector)
+}
diff --git a/dev-haskell/numinstances/Manifest b/dev-haskell/numinstances/Manifest
deleted file mode 100644
index 6d8af659cbe1..000000000000
--- a/dev-haskell/numinstances/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NumInstances-1.4.tar.gz 4749 BLAKE2B d25b62c0396c85ceed1bc1fe384a9d6f7a7601c0d1e3952ef482884db91f3a33306be2e2637a58fccd51cafd03ac3e0203ba65906a0c167f97a08726b68d2bd4 SHA512 d36b6d924345142004c3fdfe5d329a8679ddab2763a117d80b7f8a7077cd98961696fdca573578ce2389bc54563a926445cb63c3d3b888a1c54d22bc329236c6
diff --git a/dev-haskell/numinstances/metadata.xml b/dev-haskell/numinstances/metadata.xml
deleted file mode 100644
index b02d6f3617e9..000000000000
--- a/dev-haskell/numinstances/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Instances of numeric classes for functions and tuples
-	</longdescription>
-	<upstream>
-		<remote-id type="github">conal/NumInstances</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/numinstances/numinstances-1.4.ebuild b/dev-haskell/numinstances/numinstances-1.4.ebuild
deleted file mode 100644
index 89dfc164e733..000000000000
--- a/dev-haskell/numinstances/numinstances-1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="NumInstances"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Instances of numeric classes for functions and tuples"
-HOMEPAGE="https://github.com/conal/NumInstances"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/objectname/Manifest b/dev-haskell/objectname/Manifest
deleted file mode 100644
index 5548bc4100b9..000000000000
--- a/dev-haskell/objectname/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ObjectName-1.0.0.0.tar.gz 1843 BLAKE2B 029eddfd406b45bec034b8e93d1b8bea78ef4f217f6bf3fc8fb81630f67933f538327df59688c34e64f43d35a447b23fd4d8cbc04b1b11e6b18f9faccc84da99 SHA512 ceb9c88e20641f29725d1cfd4ad421cdd3ade2b6e7ba6d45efa1802a616b950299832d47d2c71208c639bfdb7ae8af051541dfef4d92c9a10ae7d3cf4ba076c7
-DIST ObjectName-1.0.1.0.tar.gz 2265 BLAKE2B de1e8ae29569f355f4b711d8e08f03842e4176feb7bd79a1b5d3c1df050f698a8927ed216447783182b601b339564f172a58bc2431331039d0389a46aa5e1078 SHA512 e526ca1334a2ec81eac1ab7dde4a459d9541761cf708098fe011f84681143819553e1540ce71d122a5f744c1adc9965bb9eb25f216e039233edcdfbc5d6d33d2
-DIST ObjectName-1.1.0.1.tar.gz 2557 BLAKE2B ba67de5c6bf8dc522dbb245064ceaf9b6498979d511fb0b7624083362c6d954c70e292c03edec1663e4265cf935c5eb833dc4833b2acb17b29f957e6b028a98e SHA512 e0b94813d29ccba4a54c699e039ab101039a9482f594c990547a04f9de511e4d27d5a93fc5f176ea5e3a8d940d31477f0e69dcd6f7c867f67bb117933d2cce64
diff --git a/dev-haskell/objectname/metadata.xml b/dev-haskell/objectname/metadata.xml
deleted file mode 100644
index 87310c649b7b..000000000000
--- a/dev-haskell/objectname/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This tiny package contains the class ObjectName, which corresponds to the
-		general notion of explicitly handled identifiers for API objects, e.g. a
-		texture object name in OpenGL or a buffer object name in OpenAL.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">haskell-opengl/ObjectName</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/objectname/objectname-1.0.0.0.ebuild b/dev-haskell/objectname/objectname-1.0.0.0.ebuild
deleted file mode 100644
index ae972b29958d..000000000000
--- a/dev-haskell/objectname/objectname-1.0.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ObjectName"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Explicitly handled object names"
-HOMEPAGE="https://github.com/svenpanne/ObjectName"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/objectname/objectname-1.0.1.0.ebuild b/dev-haskell/objectname/objectname-1.0.1.0.ebuild
deleted file mode 100644
index 6d49d4fff569..000000000000
--- a/dev-haskell/objectname/objectname-1.0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ObjectName"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Explicitly handled object names"
-HOMEPAGE="https://github.com/svenpanne/ObjectName"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/objectname/objectname-1.1.0.1.ebuild b/dev-haskell/objectname/objectname-1.1.0.1.ebuild
deleted file mode 100644
index 16c408c15fc4..000000000000
--- a/dev-haskell/objectname/objectname-1.1.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="ObjectName"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Explicitly handled object names"
-HOMEPAGE="https://github.com/svenpanne/ObjectName"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/old-locale/metadata.xml b/dev-haskell/old-locale/metadata.xml
index 326450b71c69..937381521944 100644
--- a/dev-haskell/old-locale/metadata.xml
+++ b/dev-haskell/old-locale/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides the ability to adapt to
-		locale conventions such as date and time formats.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
index 79bc9454560b..75fdf036433b 100644
--- a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
+++ b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.4.4.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -26,7 +26,6 @@ DEPEND="${RDEPEND}
 # it's not quite true, but there was no major releases
 CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
 
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.2 && < 4.9' 'base >= 4.2'
-}
+CABAL_CHDEPS=(
+	'base >= 4.2 && < 4.9' 'base >= 4.2'
+)
diff --git a/dev-haskell/old-time/metadata.xml b/dev-haskell/old-time/metadata.xml
index 96a6689305de..674db4dba4b2 100644
--- a/dev-haskell/old-time/metadata.xml
+++ b/dev-haskell/old-time/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
index 5e32161147d6..0bc605e4e901 100644
--- a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
+++ b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.4.4.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 # it's not quite true, but there was no major releases
 CABAL_CORE_LIB_GHC_PV="6.12.* 7.0.* 7.2.* 7.4.* 7.6.* 7.8.*"
 
-src_prepare() {
-	cabal_chdeps \
-		'base       >= 4.7 && < 4.9' 'base       >= 4.7'
-}
+CABAL_CHDEPS=(
+	'base       >= 4.7 && < 4.9' 'base       >= 4.7'
+)
diff --git a/dev-haskell/onetuple/Manifest b/dev-haskell/onetuple/Manifest
new file mode 100644
index 000000000000..cb540b679187
--- /dev/null
+++ b/dev-haskell/onetuple/Manifest
@@ -0,0 +1,3 @@
+DIST onetuple-0.3.1-rev2.cabal 2262 BLAKE2B 8cc887f52d2dc6efba347c945c3d7e2075b0051259179e6e46c3a3c5bc53434cc03ba07d5d2fb4427a6a158fa716038478b1f6337c4721f1303369c7bbf95e08 SHA512 c665b01a6c234f90c662cc48b268ea970da8ba29b38c8cdd43426d9361d2d1b6a8f9ec56fd4166358c3be35d4b45373d7f83c7e1c650207173d5149d949681a0
+DIST onetuple-0.3.1.tar.gz 5148 BLAKE2B 114cb7d8ba0ff28b7ad2ff7b3874446259a9a88f18a8ff6114975e60f712c466cd31861cac4bc2bf47f02280c155b3f2eb2f0880f0f39dfb855f6ad1b6dd4d69 SHA512 92678ca3e05c6da7d60e460efa88dbd8c19f8ec6b149dc5a9a493f93bd944b7d0c3ac650a3c1ad9d3742bc2a8bfaef1bab8a6e4ba71ebbb1fc0c9f7a07c0906c
+DIST onetuple-0.4.1.1.tar.gz 5601 BLAKE2B d847f732babbc5a692ca00cc483be1ca8f4912321bbcbfca5704827706d4e0d8e49127bcfb33b453a730fdb1161f0ba31878cfb53bfe97f51f9a885784e42cc2 SHA512 ee82a427558ad81ec95884794871c1a9245fefe32e21500e82d4f0539e4677dd6048e82bfd0f2b02c6d1a52d4d2392bb8f969c4fd663c35f4f7348a97aba8a26
diff --git a/dev-haskell/onetuple/metadata.xml b/dev-haskell/onetuple/metadata.xml
new file mode 100644
index 000000000000..5f2bfc74586b
--- /dev/null
+++ b/dev-haskell/onetuple/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">OneTuple</remote-id>
+		<remote-id type="github">phadej/OneTuple</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/onetuple/onetuple-0.3.1.ebuild b/dev-haskell/onetuple/onetuple-0.3.1.ebuild
new file mode 100644
index 000000000000..76c167ec07f2
--- /dev/null
+++ b/dev-haskell/onetuple/onetuple-0.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_HACKAGE_REVISION="2"
+CABAL_PN="OneTuple"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Singleton Tuple"
+HOMEPAGE="https://hackage.haskell.org/package/OneTuple"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.6:=[profile?]
+	>=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/onetuple/onetuple-0.4.1.1.ebuild b/dev-haskell/onetuple/onetuple-0.4.1.1.ebuild
new file mode 100644
index 000000000000..cdbeb54747e4
--- /dev/null
+++ b/dev-haskell/onetuple/onetuple-0.4.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_PN="OneTuple"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Singleton Tuple"
+HOMEPAGE="https://hackage.haskell.org/package/OneTuple"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/base-orphans-0.8.6:=[profile?]
+	>=dev-haskell/foldable1-classes-compat-0.1:=[profile?] <dev-haskell/foldable1-classes-compat-0.2:=[profile?]
+	>=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/only/metadata.xml b/dev-haskell/only/metadata.xml
index 180274c79810..fcb016d800e1 100644
--- a/dev-haskell/only/metadata.xml
+++ b/dev-haskell/only/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -11,8 +11,8 @@
 		
 		NOTE: There is also the &lt;/package/OneTuple OneTuple package&gt; which
 		by using a boxed @data@-type provides a 1-tuple type which has
-		laziness properties which are more faithful to the ones of Haskell&#39;s
-		native tuples; whereas the primary purpose of &#39;Only&#39; is to
+		laziness properties which are more faithful to the ones of Haskell's
+		native tuples; whereas the primary purpose of 'Only' is to
 		provide the traditionally so named type-wrapper for attaching typeclass
 		instances.
 	</longdescription>
diff --git a/dev-haskell/only/only-0.1.ebuild b/dev-haskell/only/only-0.1.ebuild
index f83748215b38..eb3d6ce1b6f7 100644
--- a/dev-haskell/only/only-0.1.ebuild
+++ b/dev-haskell/only/only-0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.5.3.9999
 
@@ -12,12 +12,12 @@ MY_PN="Only"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="The 1-tuple type or single-value \"collection\""
-HOMEPAGE="http://hackage.haskell.org/package/Only"
+HOMEPAGE="https://hackage.haskell.org/package/Only"
 SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/open-browser/Manifest b/dev-haskell/open-browser/Manifest
deleted file mode 100644
index 70e6a72eb6d2..000000000000
--- a/dev-haskell/open-browser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST open-browser-0.2.1.0.tar.gz 2629 BLAKE2B 5b56acd53d887e92e5a10cdb36e62ccd4bfdb4002988ebb553b9a5d52af5d7d13f02e5d6d37df52788191d951c401e7497eaf972e59884fd0eb41a28342a0f1d SHA512 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1
diff --git a/dev-haskell/open-browser/metadata.xml b/dev-haskell/open-browser/metadata.xml
deleted file mode 100644
index 59f5d334b5e5..000000000000
--- a/dev-haskell/open-browser/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Open a web browser from Haskell.
-		Currently BSD, Linux, OS X and Windows are supported.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild b/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild
deleted file mode 100644
index 98e9b5c6d426..000000000000
--- a/dev-haskell/open-browser/open-browser-0.2.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Open a web browser from Haskell"
-HOMEPAGE="https://github.com/rightfold/open-browser"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'executable example' 'executable open-browser-example'
-}
diff --git a/dev-haskell/openal/Manifest b/dev-haskell/openal/Manifest
deleted file mode 100644
index d61df3099b45..000000000000
--- a/dev-haskell/openal/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST OpenAL-1.4.0.2.tar.gz 116835 BLAKE2B ffc833fa7fb69ec52ca2a6ae05c8971eab1b90c48f75760f0e148d4b69c3102736dedc02fcbf867fae16c3977ea75ad01e8df07f4ff225b08602974143979dbf SHA512 33075901fab42af8b91c0c46c590ddc5d1409c0ef2d49dfb1aa6f9b584ac3b8aa1f099cb9d5fdbf84905a9a1f689c3c0a389954db36b06b0eef5e1ceaef5928a
-DIST OpenAL-1.6.0.0.tar.gz 41111 BLAKE2B 65a4e85554e27b42be20846893ce0b8c1003a86e5f52dc6a58993eb499225382ae65c3b34219ab6677822a4aed7af08ccc466ae2d67f35ad892771486f102add SHA512 e804a89124f26b66e55715a7bc69d741c76cbd8dd1b08d32e6284d86d76f91626afcbdd8d4f8716cf124a509f5e252c5e584839255db2af12c9c4160d13668f3
-DIST OpenAL-1.7.0.0.tar.gz 41297 BLAKE2B c306699e4dec7c2f4ce29085f8003bd7096aedc3abeea655cad2a650dc530a137ab7bdb8591f05717492a5c823834ceea0003369b0ed35ea7a736666ce89df1c SHA512 2d2a4623e8559c49ae025a695e50115cf9dc31952a4666006913c797b45fcb560e772d939f76999de6273078cf1986feb263fd428e52df3a1db2cdfa80815f17
-DIST OpenAL-1.7.0.4.tar.gz 40801 BLAKE2B 098ac8dc76e7b530d8c3546555e365897b6070b908b7294567a62d911ba2ad6900d218b5e4dc371a2240891d8ca0302211e55b300f077f385af25d9177ca0198 SHA512 4268e1c356451cafc7aaf211076712cbd6c84022837cb50670a15d9d98c8df823cb11a07696ef39bf30baa813a770710c3f7628289212e02e10fa59e339a3013
-DIST OpenAL-1.7.0.5.tar.gz 40744 BLAKE2B 44c5a0e9ba3bc336cc63fbf4efc743d8403ce448ad84ecaad476ec0e9c0c8fdeea1fe0b42e7e950dc6606736c69cd59d90bb1c9557277dc4aa2b3a89b567a3f8 SHA512 b8c9fb4227fd55dbd173301c4960bc7bbaa3d460a9892366ffe20ad9e5c6a85b7b5f2c740d9ff2aaf70a3a91956daf339813d93d46ee01407a86f3b6bfb0df57
diff --git a/dev-haskell/openal/metadata.xml b/dev-haskell/openal/metadata.xml
deleted file mode 100644
index da1f27875e62..000000000000
--- a/dev-haskell/openal/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">haskell-openal/ALUT</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/openal/openal-1.4.0.2.ebuild b/dev-haskell/openal/openal-1.4.0.2.ebuild
deleted file mode 100644
index fb3aec3796a2..000000000000
--- a/dev-haskell/openal/openal-1.4.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="http://connect.creativelabs.com/openal/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/objectname:=[profile?]
-		dev-haskell/statevar:=[profile?]
-		dev-haskell/tensor:=[profile?]
-		media-libs/openal
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openal/openal-1.6.0.0.ebuild b/dev-haskell/openal/openal-1.6.0.0.ebuild
deleted file mode 100644
index 46a53918bdc6..000000000000
--- a/dev-haskell/openal/openal-1.6.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/opengl-2.9.0.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	media-libs/openal
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openal/openal-1.7.0.0.ebuild b/dev-haskell/openal/openal-1.7.0.0.ebuild
deleted file mode 100644
index 3a5ea7c700b9..000000000000
--- a/dev-haskell/openal/openal-1.7.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -usenativewindowslibraries
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-2.13:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	media-libs/openal
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openal/openal-1.7.0.4.ebuild b/dev-haskell/openal/openal-1.7.0.4.ebuild
deleted file mode 100644
index 7e3aaf549f0a..000000000000
--- a/dev-haskell/openal/openal-1.7.0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	media-libs/openal
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples buildexamples) \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openal/openal-1.7.0.5.ebuild b/dev-haskell/openal/openal-1.7.0.5.ebuild
deleted file mode 100644
index eae49d704508..000000000000
--- a/dev-haskell/openal/openal-1.7.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -usenativewindowslibraries,buildexamples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="https://github.com/haskell-openal/ALUT"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-3.1:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	media-libs/openal
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples buildexamples) \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/opengl/Manifest b/dev-haskell/opengl/Manifest
deleted file mode 100644
index e916d0c0fac7..000000000000
--- a/dev-haskell/opengl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST OpenGL-2.12.0.1.tar.gz 125419 BLAKE2B f6cb30335f783d9474d112159fef0d7af744c3bef54580485e1df77d58f625d4ba9a6c46120c1dc5d96fa98c89f34a6e63e91909f0f5dd1f7626460ad3f55612 SHA512 58c21efade5a8e10a78a61eaee35986e61581e3ef898f657e3f4c0479e0e35f60772bfa489bf49dfdbf3c395826df513f3f116278fb400d568babed1061e4765
-DIST OpenGL-2.9.2.0.tar.gz 122514 BLAKE2B f6d4e40b2b49dcbf542e7ec8e437d5b69834b593d0584ac512dffde97478b5e2f66d94c96129c910d428e1c7311319a0c751b48d52402fc90993407545bd124a SHA512 1abb31033fe57056a0a3d00308910033d25d800f3da9ee4ecfd43bf25d8a392d6344463f3173da432a35ab3bbe5b5964c2aa5b0de5252e4f274025fd8d0dd0e9
-DIST OpenGL-3.0.1.0.tar.gz 129993 BLAKE2B b47ac84c84ef891c0663d26b286e17b1b444ef0f05cd15ebeaf67a2469f26a745d3dee5e998b1d996ad23942ff43ed54ef82acd3f80440193a7a5e3c9628b5df SHA512 ce6d7a15b4a7d43ed0a8896a36dc890057b67472ca9b8c96143df9b5936ae3fdfc49a7dec4cff4d76407d76420ae60e606a4747a8ecc995141c82291433a1cdd
-DIST OpenGL-3.0.3.0.tar.gz 130752 BLAKE2B 3378cc470f68d51900d54ee3a1cdf78a01f096f5efaa0c0fdc73910fea661ebf4db8338d8563c3f593d0a1fcf947b17b65af6548276266a7bf72b6571e1b1ed9 SHA512 1ccd11095d5d36346bd22c8ebeab3b9bcb267744d6c3ddfe3c76dc2ed620493d688353a778454a053c710464db0de8228823a95f63dfae5784c2f1ca931b0ae9
diff --git a/dev-haskell/opengl/files/opengl-2.9.2.0-ghc-7.10.patch b/dev-haskell/opengl/files/opengl-2.9.2.0-ghc-7.10.patch
deleted file mode 100644
index 02967bf16502..000000000000
--- a/dev-haskell/opengl/files/opengl-2.9.2.0-ghc-7.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Graphics/Rendering/OpenGL/GL/IOState.hs b/Graphics/Rendering/OpenGL/GL/IOState.hs
-index 6fbc144..2c2a42d 100644
---- a/Graphics/Rendering/OpenGL/GL/IOState.hs
-+++ b/Graphics/Rendering/OpenGL/GL/IOState.hs
-@@ -21 +21,2 @@ module Graphics.Rendering.OpenGL.GL.IOState (
--import Control.Monad(replicateM)
-+import Control.Applicative
-+import Control.Monad(replicateM,ap)
-@@ -31,0 +33,4 @@ instance Functor (IOState s) where
-+instance Applicative (IOState s) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
diff --git a/dev-haskell/opengl/metadata.xml b/dev-haskell/opengl/metadata.xml
deleted file mode 100644
index cbb3b5a94e2c..000000000000
--- a/dev-haskell/opengl/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A Haskell binding for the OpenGL graphics system (GL, version 3.2) and its
-		accompanying utility library (GLU, version 1.3).
-		
-		OpenGL is the industry's most widely used and supported 2D and 3D graphics
-		application programming interface (API), incorporating a broad set of
-		rendering, texture mapping, special effects, and other powerful visualization
-		functions. For more information about OpenGL and its various extensions,
-		please see &lt;http://www.opengl.org/&gt;
-		and &lt;http://www.opengl.org/registry/&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/opengl/opengl-2.12.0.1.ebuild b/dev-haskell/opengl/opengl-2.12.0.1.ebuild
deleted file mode 100644
index 1ddf571262b1..000000000000
--- a/dev-haskell/opengl/opengl-2.12.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-1.3:=[profile?] <dev-haskell/gluraw-1.6:=[profile?]
-	>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/openglraw-2.1:=[profile?] <dev-haskell/openglraw-2.6:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/opengl/opengl-2.9.2.0.ebuild b/dev-haskell/opengl/opengl-2.9.2.0.ebuild
deleted file mode 100644
index 41b00a0070fd..000000000000
--- a/dev-haskell/opengl/opengl-2.9.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-1.3.0.0:=[profile?]
-	>=dev-haskell/openglraw-1.4.1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/opengl/opengl-3.0.1.0.ebuild b/dev-haskell/opengl/opengl-3.0.1.0.ebuild
deleted file mode 100644
index 17f8357165f2..000000000000
--- a/dev-haskell/opengl/opengl-3.0.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?]
-	>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.3:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild b/dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild
deleted file mode 100644
index 5fe15f8d0947..000000000000
--- a/dev-haskell/opengl/opengl-3.0.3.0-r1.ebuild
+++ /dev/null
@@ -1,42 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="https://wiki.haskell.org/OpenGL"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?]
-	>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	#as per https://hackage.haskell.org/package/OpenGL-3.0.3.0/revisions/
-	cabal_chdeps \
-		'StateVar     >= 1.1 && < 1.2' 'StateVar     >= 1.1 && < 1.3'
-}
diff --git a/dev-haskell/opengl/opengl-3.0.3.0.ebuild b/dev-haskell/opengl/opengl-3.0.3.0.ebuild
deleted file mode 100644
index 2fdc4b9aca58..000000000000
--- a/dev-haskell/opengl/opengl-3.0.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding for the OpenGL graphics system"
-HOMEPAGE="https://wiki.haskell.org/OpenGL"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/gluraw-2.0:=[profile?] <dev-haskell/gluraw-2.1:=[profile?]
-	>=dev-haskell/objectname-1.1:=[profile?] <dev-haskell/objectname-1.2:=[profile?]
-	>=dev-haskell/openglraw-3.0:=[profile?] <dev-haskell/openglraw-3.4:=[profile?]
-	>=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.3:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openglraw/Manifest b/dev-haskell/openglraw/Manifest
deleted file mode 100644
index e9230703ca47..000000000000
--- a/dev-haskell/openglraw/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST OpenGLRaw-1.3.0.0.tar.gz 75328 BLAKE2B 0bccfed258369fa0e84737bc752b6db5db768cec2bcb5030c11c265f8565ec0f8269da29ede8d91ae899b97e11a06a552f9cc81a0949256f8a9c55cf820f1e6d SHA512 444cf2238ebb24710cfca95f11c2ba4888bc70793880f69bc93c932ebb5e44485303699fb0c1e2ea9450f5a911162fe3142aa2bf91d3948f7abd2d07ad1b255e
-DIST OpenGLRaw-1.5.0.0.tar.gz 102276 BLAKE2B 33cf8f755a48952bf65fc748e11febd0ddbd3ba6810c2d9ed71d24926c3ba257c73a65aa58505757221b75b9f7912c4dc7aa080425e7b6b19035fc2d1acaa4a2 SHA512 455d1149d70a73e12493ce931bce72c62a11568a43d4b139b8c4a5e5c940533e23feb46c71b2a76eb80d3d9512825bb8ed176d4701e17be890b47ba63fccac76
-DIST OpenGLRaw-2.5.1.0.tar.gz 733570 BLAKE2B 6d8ae440d4ab782a578dd3d3bc3bd734f06909a5ecdd9474561596249eb7bfe7dce4047634ad2d271c612f006a18f4ab2706083a572acacf9f78cbc1889b024c SHA512 98f6224d57e8fd5d152a9e028c4c8dafa69de4d52ef30e5a44555cb4c32d0fc92db1b3651beb388f357f59d2a0dd40e0946b26967287f56f268f0ed08008873a
-DIST OpenGLRaw-3.2.4.0.tar.gz 799693 BLAKE2B 3eb97d991242113175b737a1fc9e59e3ff58d63dc4b1ea605414c9650002760e93c6bb3493199d62f8f7ae6db7220c2b07e1e901ed3fbaa8a464c023fda915b6 SHA512 8339fb8a04ddc1c366bb6e93e3c0cabaf7a7c18f5bd687e1f7af36e66f664d8877716a3ac97cce9855ee5af50e3f95e5e0ed19c0137d90013a9cbf6f529ebcfc
-DIST OpenGLRaw-3.3.4.0.tar.gz 882560 BLAKE2B 10cddf9b739d40394859090ea7a7f237fa4f48e1a219a5adf87329424cf2c2d2ef2465793b53f431cc6382de0adf2188ad8b093031ed3cb3290c66be4e340291 SHA512 1db7196cc59d7107ba53a497b6cf78a82b280a9bdc115bd49109193e3fa4077c84eb34b757669a3da95d6bce214fc523a9b75444f9a7019049649e2431a2f076
diff --git a/dev-haskell/openglraw/metadata.xml b/dev-haskell/openglraw/metadata.xml
deleted file mode 100644
index 84cd0aab231b..000000000000
--- a/dev-haskell/openglraw/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		OpenGLRaw is a raw Haskell binding for the OpenGL 3.2 graphics system and
-		lots of OpenGL extensions. It is basically a 1:1 mapping of OpenGL's C API,
-		intended as a basis for a nicer interface. OpenGLRaw offers access to all
-		necessary functions, tokens and types plus a general facility for loading
-		extension entries. The module hierarchy closely mirrors the naming structure
-		of the OpenGL extensions, making it easy to find the right module to import.
-		All API entries are loaded dynamically, so no special C header files are
-		needed for building this package. If an API entry is not found at runtime, a
-		userError is thrown.
-		
-		OpenGL is the industry's most widely used and supported 2D and 3D graphics
-		application programming interface (API), incorporating a broad set of
-		rendering, texture mapping, special effects, and other powerful visualization
-		functions. For more information about OpenGL and its various extensions,
-		please see &lt;http://www.opengl.org/&gt;
-		and &lt;http://www.opengl.org/registry/&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild b/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild
deleted file mode 100644
index 49cb3c3b9182..000000000000
--- a/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-		virtual/opengl"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild b/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild
deleted file mode 100644
index 0b4a7cde08a0..000000000000
--- a/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -usenativewindowslibraries,-useglxgetprocaddress
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-useglxgetprocaddress \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openglraw/openglraw-2.5.1.0.ebuild b/dev-haskell/openglraw/openglraw-2.5.1.0.ebuild
deleted file mode 100644
index 1d1c7476d3fa..000000000000
--- a/dev-haskell/openglraw/openglraw-2.5.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -usenativewindowslibraries,-useglxgetprocaddress,-osandroid,-usegles2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-osandroid \
-		--flag=-usegles2 \
-		--flag=-useglxgetprocaddress \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openglraw/openglraw-3.2.4.0.ebuild b/dev-haskell/openglraw/openglraw-3.2.4.0.ebuild
deleted file mode 100644
index 95dd26a6a6de..000000000000
--- a/dev-haskell/openglraw/openglraw-3.2.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -usenativewindowslibraries,-useglxgetprocaddress,-osandroid,-usegles2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.3:=[profile?]
-	>=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.3:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-osandroid \
-		--flag=-usegles2 \
-		--flag=-useglxgetprocaddress \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild b/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
deleted file mode 100644
index 61096c6ba093..000000000000
--- a/dev-haskell/openglraw/openglraw-3.3.4.0.ebuild
+++ /dev/null
@@ -1,42 +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
-#hackport: flags: -usenativewindowslibraries,-useglxgetprocaddress,-osandroid,-usegles2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="OpenGLRaw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A raw binding for the OpenGL graphics system"
-HOMEPAGE="http://www.haskell.org/haskellwiki/Opengl"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fixed-0.2:=[profile?] <dev-haskell/fixed-0.4:=[profile?]
-	>=dev-haskell/half-0.2.2.1:=[profile?] <dev-haskell/half-0.4:=[profile?]
-	>=dev-haskell/text-0.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-osandroid \
-		--flag=-usegles2 \
-		--flag=-useglxgetprocaddress \
-		--flag=-usenativewindowslibraries
-}
diff --git a/dev-haskell/openssl-streams/Manifest b/dev-haskell/openssl-streams/Manifest
deleted file mode 100644
index df261113ddb4..000000000000
--- a/dev-haskell/openssl-streams/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST openssl-streams-1.2.1.0.tar.gz 6266 BLAKE2B 2d7866b7667547f5c4f2c2873471c7ff9ac60ee89e9c791d816b46185bda456d4bdd13ce5894688ff56926b337d38208719f8c3d22cfd0606529732cfcec3235 SHA512 c429bdcbb4ce893d79941eccb849f7064fb88073423b4395e0f50795ddef699934c148549f800b551914c7983cb2b8fc988dccfb4e0363f422726c0cdeaa5018
-DIST openssl-streams-1.2.2.0.tar.gz 6376 BLAKE2B f0d0684c3ed5e13de4d4745d16cf6bccc75961e57d164cc3a5620d1de0b0cbb40acdf4819266c45ceacd4473bdd831ec9ca92aa086e01eab55408e2588f9a0eb SHA512 ff1262afd26c82e97ed0a8bc7237728b47341968e8c6fe4a2351780508241f1588d12b32709d9be3b385db14b9b56eee77676cacb1c0a6bf632a8f25bdb775eb
diff --git a/dev-haskell/openssl-streams/metadata.xml b/dev-haskell/openssl-streams/metadata.xml
deleted file mode 100644
index 55c1e4ed829e..000000000000
--- a/dev-haskell/openssl-streams/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The openssl-streams library contains io-streams routines for secure
-		networking using OpenSSL (by way of HsOpenSSL).
-		
-		/ChangeLog/
-		
-		[@1.1.0.0@] Updated @openssl-streams@ to work with @io-streams@ 1.1.0.0.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild b/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
deleted file mode 100644
index 058b082d55fe..000000000000
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="OpenSSL network support for io-streams"
-HOMEPAGE="https://hackage.haskell.org/package/openssl-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
-	>=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild b/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
deleted file mode 100644
index 79422fe4d712..000000000000
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
+++ /dev/null
@@ -1,32 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="OpenSSL network support for io-streams"
-HOMEPAGE="https://hackage.haskell.org/package/openssl-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
-	>=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
-	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/options/Manifest b/dev-haskell/options/Manifest
index c7c54738adab..53b51528f0b1 100644
--- a/dev-haskell/options/Manifest
+++ b/dev-haskell/options/Manifest
@@ -1 +1,2 @@
 DIST options-1.2.1.1.tar.gz 25327 BLAKE2B 66611694e5beb558e185cd9a89e9368ebac035118360a4c1cb9bcba5ad2a0be74c32848e3983aec999b4cee6e3138c527fe31c869b52c84719ee89afe3aad232 SHA512 615a3767b74ca0ba2eae993f6e475963df2a0933f1e6c9bbfe35144c4dc6018af276144b2ec1b608b695dc7fca904784ebc63cd58a432f966588846cb36f94ea
+DIST options-1.2.1.2.tar.gz 22693 BLAKE2B 4e17e038a910deb114182a5f98860cf4bef6ee6b03901105a23760cd108352e5be63ba762dadbd225ec10ef7c3b34c76184ccc927a36f2ff4720d6c0ee77ae5f SHA512 82c366adce56a27ab68a4388bc759b90ee4bfe38fd72325af954bef2eb3aee360729d5ed2de2964c8087b3b5a51d321321d9c02024b34b6167f09d7412aa2568
diff --git a/dev-haskell/options/metadata.xml b/dev-haskell/options/metadata.xml
index 4d7ecf23aaee..c78c1cd7c4aa 100644
--- a/dev-haskell/options/metadata.xml
+++ b/dev-haskell/options/metadata.xml
@@ -1,63 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The @options@ package lets library and application developers easily work
-		with command-line options.
-		
-		The following example is a full program that can accept two options,
-		@--message@ and @--quiet@:
-		
-		@
-		import Control.Applicative
-		import Options
-		
-		data MainOptions = MainOptions
-		&amp;#x20;   &amp;#x7b; optMessage :: String
-		&amp;#x20;   , optQuiet :: Bool
-		&amp;#x20;   &amp;#x7d;
-		
-		instance 'Options' MainOptions where
-		&amp;#x20;   defineOptions = pure MainOptions
-		&amp;#x20;       \&lt;*\&gt; simpleOption \"message\" \"Hello world!\"
-		&amp;#x20;           \"A message to show the user.\"
-		&amp;#x20;       \&lt;*\&gt; simpleOption \"quiet\" False
-		&amp;#x20;           \"Whether to be quiet.\"
-		
-		main :: IO ()
-		main = runCommand $ \\opts args -&gt; do
-		&amp;#x20;   if optQuiet opts
-		&amp;#x20;       then return ()
-		&amp;#x20;       else putStrLn (optMessage opts)
-		@
-		
-		&gt;$ ./hello
-		&gt;Hello world!
-		&gt;$ ./hello --message='ciao mondo'
-		&gt;ciao mondo
-		&gt;$ ./hello --quiet
-		&gt;$
-		
-		In addition, this library will automatically create documentation options
-		such as @--help@ and @--help-all@:
-		
-		&gt;$ ./hello --help
-		&gt;Help Options:
-		&gt;  -h, --help
-		&gt;    Show option summary.
-		&gt;  --help-all
-		&gt;    Show all help options.
-		&gt;
-		&gt;Application Options:
-		&gt;  --message :: text
-		&gt;    A message to show the user.
-		&gt;    default: "Hello world!"
-		&gt;  --quiet :: bool
-		&gt;    Whether to be quiet.
-		&gt;    default: false
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">options</remote-id>
+		<remote-id type="github">typeclasses/options</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/options/options-1.2.1.1.ebuild b/dev-haskell/options/options-1.2.1.1.ebuild
index bf9be388fee6..410373f86de7 100644
--- a/dev-haskell/options/options-1.2.1.1.ebuild
+++ b/dev-haskell/options/options-1.2.1.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.4.4.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" #Drop test-suite: circular depend
 inherit haskell-cabal
 
 DESCRIPTION="A powerful and easy-to-use command-line option parser"
@@ -14,10 +14,10 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RESTRICT=test # circular depends
+RESTRICT=test # circular depends: options[test]->chell->options
 
 RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?]
 	>=dev-haskell/transformers-0.2:=[profile?]
@@ -25,6 +25,4 @@ RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/chell-0.4 <dev-haskell/chell-0.5
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 )
 "
diff --git a/dev-haskell/options/options-1.2.1.2.ebuild b/dev-haskell/options/options-1.2.1.2.ebuild
new file mode 100644
index 000000000000..f8c85444f9d0
--- /dev/null
+++ b/dev-haskell/options/options-1.2.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Powerful and easy command-line option parser"
+HOMEPAGE="https://github.com/typeclasses/options/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+	'base ^>= 4.16 || ^>= 4.17 || ^>= 4.18' 'base >= 4.14 && < 5'
+)
+
+RDEPEND="
+	>=dev-haskell/monads-tf-0.3:=[profile?] <dev-haskell/monads-tf-0.4:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/hspec-2.9.7 <dev-haskell/hspec-2.12
+		>=dev-haskell/patience-0.3 <dev-haskell/patience-0.4
+	)
+"
diff --git a/dev-haskell/optparse-applicative/Manifest b/dev-haskell/optparse-applicative/Manifest
index 054f199631b8..6fb42cf25fa4 100644
--- a/dev-haskell/optparse-applicative/Manifest
+++ b/dev-haskell/optparse-applicative/Manifest
@@ -1,8 +1,3 @@
-DIST optparse-applicative-0.11.0.2.tar.gz 30425 BLAKE2B 2bcdff429adc14240883b2bb1f54449d18ce10ae787f4575a60bf170868f71d4633ceea509f0b5ed4fc71a1d0d1fd68b07782ebf2b2a820e47a8c2fbf246c677 SHA512 eb10a274074dacf2a481c964f8fcb125c1ea6be7f33388c938ad310b49d959484102caeb1849e0370292286b7603f68853cf23ded634bb09cd34871eaec74caf
-DIST optparse-applicative-0.13.0.0.tar.gz 36101 BLAKE2B 4dae014b933ee9e89cc417327763b92a94647ee7b5b31662df73cc3d7a1ae26dae2e2931cc1f5e573753ba7dbdefffc797125621650c248c12ecdc72c40a4232 SHA512 ef08f4b994703a35f7c50ba93017742188c612c99a6e69cf7329a42427e2862ec0b8498fa57dd1f64a225d3ed94c62815af211efead9e73adc32482e22e46ccb
-DIST optparse-applicative-0.14.2.0.tar.gz 53512 BLAKE2B 512823fe0c10c31eb213aa68e1821918ebc4034b171c3f5b0c62ea2072c9b6e54695a3f94bc4d73dc1f19f67dfb664ccdfae7fe1cf0ab46433a618e7709401d3 SHA512 ad2252e4501be93ccf1fd9529790b850bdb01b8f36ac9cbb4145015d7609799c9774fd42feec9c8a8b535a9d17b60e0f80b9e75ac7c92444aa5098d2b9ccc096
-DIST optparse-applicative-0.15.1.0.tar.gz 56203 BLAKE2B b4db1a96d0dbe1e4f1a4969e5fe1597ca314364bc71da505b9582b8cd0bf0025edc1dea3d1d39b84c108a7b38bea2c53ecd660d1d0b7d44c56b8d18dde14d812 SHA512 e7ab0a2b4812bbfe7802c2d51a45a4f5a5ea162b094631dc6ee4cd79e5def4101ccb04305cfa16942926809ed656f91aa6f68c4d98e93171ca9be99ba40cc51e
-DIST optparse-applicative-0.5.2.1.tar.gz 24123 BLAKE2B aec5c0718ff629097b80a635077544d6f441fa653c4d71b196c4a5fe6773485c62fb94d615f56852bef024f262800316c18db3df30ed0d4b53c745125ace1c86 SHA512 7246fc6b6c9ec1c9a7b4f4e8850d80fe0958b9c659b2f31c455738d09b70178bb71f164198871874414e1fdf0ecf38098fdbc65f838224a6f6235f2d000f3876
-DIST optparse-applicative-0.7.0.2.tar.gz 26682 BLAKE2B 4cca1216fc7267adb848d716e8ea5a9e895b418d9cd8410e1de6ee22f3eb909559ab404846af3cdbbb9c26503410f3c02dbf440296ba49252ca691ad144337e9 SHA512 94f583d7df97f2887cc4fea8d5b22261195c3f30bb9bf0aec2579d5b2d31583692835dc9df1273c544c3ef72343159ee90531450f7c498617a0595479efc5d0c
-DIST optparse-applicative-0.8.1.tar.gz 32055 BLAKE2B cc11e066a37e4506189c390db7b999ef1e87082d015f09c0bc922369e864d861791c9cfad543a9d891ce964dfd53625fc36d9a4d4513a7ca9973562e3fda679a SHA512 bd7b8462d897439a77dffdc187dbf61e51937960e339c3bd5009b7479e84dd1ca1e40529c8ffd7d198d26542c23e38c45d91abe8e1b1d420090859f0f07574d6
-DIST optparse-applicative-0.9.1.1.tar.gz 32757 BLAKE2B c169a44d8256a573e9df11f8754930e5b3e8aa6c9b49d370f7cd3debc3546dabda40319a875b8a44b9c25bd5281377568e80e5b705d55f16e3fbb95851f4726a SHA512 616e144512e8628dbc88bc0ce6e47f4aa95a6d5e5fbc3b07aabaf4bedb104808bed7bb959bbb4d88aa6861b98dedbc4ac08924e220ef2cd3b3ebc42945871bdd
+DIST optparse-applicative-0.16.1.0.cabal 4982 BLAKE2B 7e9fed3ff6f09f8b7994d4fd2177ade79e62bc2292dd5fa78bfdf15b0b6f7af0bd696d61ef02ed358460a61f0e2f960d01455091168687f6d2db0b07caf182f6 SHA512 31a1e01b4d0a247c10b1eec2f5bb40e518b447527736b8692846980d182ef2ac4d839b4a24b3d17414fac28700d43d0317deb481c1e0c7ac2b7b38aaafc654a1
+DIST optparse-applicative-0.16.1.0.tar.gz 58315 BLAKE2B 3998ef8594abd3f0f1e85cc44a3efa19d78751f5d17181e1b203504221c219ebf3fa36ccde7351e5821fe1c4a4c0c16a20fffe92259710dbcc7656f4e3a83c50 SHA512 46bdb37b1328a6dbf271dcdb3483266c0c8412fc489e68e32b114745d9cf0108dd49df6cb565df3470121931a769f11996f5fd9fd8e9e38ed6b6853faab56710
+DIST optparse-applicative-0.18.1.0.tar.gz 60682 BLAKE2B 7fc64b6d135fbec6165050e059235a34b0cbe0633076acc97f645af9e25d805ddd5bc03101823ac4645bf7c390dd6c19d96505aeb6c54a4253317b6cbc160d8a SHA512 a5a7667cadd3c2785d787cb6bddb009750308376c771f45d72e2245577f42c2946a069bf420d3404653f9f3662cb798341ee96d1ead35dbf95ab42447698e41d
diff --git a/dev-haskell/optparse-applicative/metadata.xml b/dev-haskell/optparse-applicative/metadata.xml
index a9f0962e5dcf..2a153711a9ce 100644
--- a/dev-haskell/optparse-applicative/metadata.xml
+++ b/dev-haskell/optparse-applicative/metadata.xml
@@ -1,72 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Here is a simple example of an applicative option parser:
-		
-		@
-		data Sample = Sample
-		&amp;#x20; &amp;#x7b; hello :: String
-		&amp;#x20; , quiet :: Bool &amp;#x7d;
-		
-		sample :: Parser Sample
-		sample = Sample
-		&amp;#x20; \&lt;$\&gt; strOption
-		&amp;#x20;     ( long \"hello\"
-		&amp;#x20;     &amp; metavar \"TARGET\"
-		&amp;#x20;     &amp; help \"Target for the greeting\" )
-		&amp;#x20; \&lt;*\&gt; switch
-		&amp;#x20;     ( long \"quiet\"
-		&amp;#x20;     &amp; help \"Whether to be quiet\" )
-		@
-		
-		The parser is built using applicative style starting from a set of basic
-		combinators. In this example, @hello@ is defined as an 'option' with a
-		@String@ argument, while @quiet@ is a boolean 'flag' (called 'switch').
-		
-		A parser can be used like this:
-		
-		@
-		greet :: Sample -&gt; IO ()
-		greet (Sample h False) = putStrLn $ \"Hello, \" ++ h
-		greet _ = return ()
-		
-		main :: IO ()
-		main = execParser opts \&gt;\&gt;= greet
-		&amp;#x20; where
-		&amp;#x20;   opts = info (helper \&lt;*\&gt; sample)
-		&amp;#x20;     ( fullDesc
-		&amp;#x20;     &amp; progDesc \"Print a greeting for TARGET\"
-		&amp;#x20;     &amp; header \"hello - a test for optparse-applicative\" )
-		@
-		
-		The @greet@ function is the entry point of the program, while @opts@ is a
-		complete description of the program, used when generating a help text. The
-		'helper' combinator takes any parser, and adds a @help@ option to it (which
-		always fails).
-		
-		The @hello@ option in this example is mandatory (since it doesn't have a
-		default value), so running the program without any argument will display a
-		help text:
-		
-		&gt;hello - a test for optparse-applicative
-		&gt;
-		&gt;Usage: hello --hello TARGET [--quiet]
-		&gt;  Print a greeting for TARGET
-		&gt;
-		&gt;Available options:
-		&gt;  -h,--help                Show this help text
-		&gt;  --hello TARGET           Target for the greeting
-		&gt;  --quiet                  Whether to be quiet
-		
-		containing a short usage summary, and a detailed list of options with
-		descriptions.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">optparse-applicative</remote-id>
 		<remote-id type="github">pcapriotti/optparse-applicative</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild
deleted file mode 100644
index 53b15500623f..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild
deleted file mode 100644
index 4337e6548509..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.8 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck                      == 2.8.*' 'QuickCheck                      >= 2.8'
-}
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.14.2.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.14.2.0.ebuild
deleted file mode 100644
index e07055736f28..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.14.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.12 )
-"
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild
deleted file mode 100644
index 4e1407187440..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.15.1.0.ebuild
+++ /dev/null
@@ -1,29 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/semigroups-0.10:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.14 )
-"
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild
new file mode 100644
index 000000000000..ca54409218be
--- /dev/null
+++ b/dev-haskell/optparse-applicative/optparse-applicative-0.16.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackage: flags: +process
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities and combinators for parsing command line options"
+HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
+HACKAGE_REV="2"
+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"
+
+RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6.8:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15 )
+"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=process
+}
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.18.1.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.18.1.0.ebuild
new file mode 100644
index 000000000000..69832dbebf11
--- /dev/null
+++ b/dev-haskell/optparse-applicative/optparse-applicative-0.18.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +process
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Utilities and combinators for parsing command line options"
+HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-1.8:=[profile?]
+	>=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-1.2:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=process
+}
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.5.2.1.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.5.2.1.ebuild
deleted file mode 100644
index 93f1a391e897..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.5.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		test? ( =dev-haskell/hunit-1.2*
-			>=dev-haskell/test-framework-0.6
-			<dev-haskell/test-framework-0.9
-			>=dev-haskell/test-framework-hunit-0.2
-			<dev-haskell/test-framework-hunit-0.4
-			=dev-haskell/test-framework-th-prime-0.0*
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild
deleted file mode 100644
index d50e4e33566b..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-th-prime-0.0 <dev-haskell/test-framework-th-prime-0.1 )
-"
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.8.1-r1.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.8.1-r1.ebuild
deleted file mode 100644
index d9b6a545e05c..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/test-framework-th-prime-0.0 <dev-haskell/test-framework-th-prime-0.1 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers >= 0.2 && < 0.4' \
-		'transformers >= 0.2 && < 0.5'
-}
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.9.1.1.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.9.1.1.ebuild
deleted file mode 100644
index 9a730b4b7641..000000000000
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.9.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Utilities and combinators for parsing command line options"
-HOMEPAGE="https://github.com/pcapriotti/optparse-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
-		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.8
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/test-framework-th-prime-0.0 <dev-haskell/test-framework-th-prime-0.1 )
-"
diff --git a/dev-haskell/optparse-simple/Manifest b/dev-haskell/optparse-simple/Manifest
deleted file mode 100644
index d6796a4f1101..000000000000
--- a/dev-haskell/optparse-simple/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST optparse-simple-0.0.3.tar.gz 2972 BLAKE2B ff7a559c9f05278ba3b18085fc4f8a48d43025383c38840b3987613ad79aa74590df1ce518b78c338c8bef412c098954b72cb92a31744dbad113510c2e3b4eb7 SHA512 d607482a9ef9e9d4992328fb141cf797ad72e43cbe42eab23adacd21843b8c62c98d6c8fc342b2a11019a220759854b6587a1fd07fa8268462c4cc3d40c4a1c4
-DIST optparse-simple-0.1.1.2.tar.gz 5067 BLAKE2B 1a1bbca9d142bb61af1c00eca720bb5c3315f021dcdf59e9eba418f5511a94b3fe0799c9f958ab4962ba8ed4ac6ef524a6edd4d678331935ae11d3a8e85401e9 SHA512 a2810745ba4a3fd62585fc7367f02ff8eb70752d4836da495a73f15d2b1672d7b5ff59a72bcbc8688efff71fec189c5cc11331b6c46b714233ad86049d581c03
diff --git a/dev-haskell/optparse-simple/metadata.xml b/dev-haskell/optparse-simple/metadata.xml
deleted file mode 100644
index 35a220f21d80..000000000000
--- a/dev-haskell/optparse-simple/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="build-example">Build the example executable</flag>
-	</use>
-	<longdescription>
-		Simple interface to optparse-applicative
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild b/dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild
deleted file mode 100644
index ee21268650a8..000000000000
--- a/dev-haskell/optparse-simple/optparse-simple-0.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to optparse-applicative"
-HOMEPAGE="https://hackage.haskell.org/package/optparse-simple"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/either:=[profile?]
-	dev-haskell/gitrev:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/optparse-simple/optparse-simple-0.1.1.2.ebuild b/dev-haskell/optparse-simple/optparse-simple-0.1.1.2.ebuild
deleted file mode 100644
index 55010cdd03e5..000000000000
--- a/dev-haskell/optparse-simple/optparse-simple-0.1.1.2.ebuild
+++ /dev/null
@@ -1,31 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Simple interface to optparse-applicative"
-HOMEPAGE="https://github.com/fpco/optparse-simple#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-example"
-
-RDEPEND=">=dev-haskell/githash-0.1.3.0:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-example build-example)
-}
diff --git a/dev-haskell/ordered-containers/Manifest b/dev-haskell/ordered-containers/Manifest
new file mode 100644
index 000000000000..e266df26597a
--- /dev/null
+++ b/dev-haskell/ordered-containers/Manifest
@@ -0,0 +1 @@
+DIST ordered-containers-0.2.3.tar.gz 7404 BLAKE2B 1e731a5bcf78a3ab8262fcc6edfc5e51ea286d93271f605b7d6b43356994f704eaa438887671f72f4811638108ff52924029fb956d05b1ed6fcc18d9c37f2911 SHA512 a5e141705f9bdbccf152238bcd6be22f3a04966bf57cdf9485f1ea5efd9cc25de80b2d2dd92f281520fddaa74906e9fbbb789e111d19b46854f1cf5297b1b7e9
diff --git a/dev-haskell/ordered-containers/metadata.xml b/dev-haskell/ordered-containers/metadata.xml
new file mode 100644
index 000000000000..1f356cb193b1
--- /dev/null
+++ b/dev-haskell/ordered-containers/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">ordered-containers</remote-id>
+		<remote-id type="github">dmwit/ordered-containers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/ordered-containers/ordered-containers-0.2.3.ebuild b/dev-haskell/ordered-containers/ordered-containers-0.2.3.ebuild
new file mode 100644
index 000000000000..5552b1a0d557
--- /dev/null
+++ b/dev-haskell/ordered-containers/ordered-containers-0.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Set- and Map-like types that remember the order elements were inserted"
+HOMEPAGE="https://hackage.haskell.org/package/ordered-containers"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest
deleted file mode 100644
index 64d4910d697a..000000000000
--- a/dev-haskell/pandoc-citeproc/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST pandoc-citeproc-0.1.2.1.tar.gz 217171 BLAKE2B 1d8080616fe8ed838a8b1d6f59b10fd5abf1c9eb0fe2b1d0fd183670e6db41dcb70258fdb5dbf70fbd053a2a8759eb3afade8573b87d35efcf67d77a0a4a5825 SHA512 a83e34700b2f6f835aec0f66b199a1a43cb5e3318133774b7897316d676870ba56538468904ca754f246bf10a0826f834d6dba791d18a906405ed7c01126b77e
-DIST pandoc-citeproc-0.10.4.1.tar.gz 252717 BLAKE2B 048c38cec654a07ac2f5fea21269eb234eba17f362ce4aa84b26d8bd09c6a7c14bc2c0258f3d9c1984dcb06f8db99eb34d832894cb4b959171e62376e9517b98 SHA512 afe0b81c4e58dc80cd0d05977d919bb1f1c8e7a77aba5ed960a04f3a6ff8ec398a62dc5e8497d01db7f67e9ce808a94d1b53c4cecb8b6a28893ec8076555c7ec
-DIST pandoc-citeproc-0.10.4.tar.gz 252481 BLAKE2B 782de52be122a7cb94d816d6ba2438db036036167985244f6b8ab63b95f12077511ce9eb0d84a20a7a59834eb88159dd1953ec205c7403c614d9ad0dee8bf9cd SHA512 f188cf2d6642c0dddf2437d23096d488f5e6eb44b9931b004feb72c8adc1a5240d85f8ed48ced9f073733ee546818e3530962e2f2b2ce6cfa52979ec1fdd7cee
-DIST pandoc-citeproc-0.17.0.1.tar.gz 344529 BLAKE2B f3aaa74eb52d8c023638dc0ff608d2651af8a294cc3f6beae727dc6b0537229e92929c01b24ba7f45c41acc6dd465e5afe1087aa9f2e902bb2b6cfb8aba7512d SHA512 b616007c8b105e3245bae87f60e2ad55809435c82cf91cf32498dad8f2303df48d4555e68c3fbd9f78dc49fd1042ff46061273031c3352df130fc735f443be96
-DIST pandoc-citeproc-0.2.tar.gz 249374 BLAKE2B 375ed1517d64d3bfd94fa7d7d66480e796a94e33c29eed7cb84019b6d77f77f6ae2c0b23a92596de890f6a70805ace0ba454e73d166c47819896e6b6ce977a0d SHA512 f7205afb15aeb71dc756e9f49a265f4c4c1380075b088b8c9e366fe363c2ea059b1d28bcbbe70bab449b987bbceba5d1cb7a693f5bf6bc0e3132cb995fd639c4
-DIST pandoc-citeproc-0.3.1.tar.gz 258552 BLAKE2B 6206dc5739e61f9763fc52e591d3b3272744f0a70186ac068a3f6b91b3b61a624c38bf17bb2c050a05cc8629c67906c4919dea5b2ea52eede0346ec2fe6196e3 SHA512 739580e46d3c7f447d7c0092e62c22339e8b3d656b9adc25b235b06cc8815c1d57a9221fb3b62854bc32ab02c64f4dad036d44a2357fbbd470b9c1bd0224621a
-DIST pandoc-citeproc-0.6.tar.gz 227239 BLAKE2B 3942af5577d69b08f22fa00f1174f61c63b886ed2a6c62758903cbe2b0f34d21466dec272b747a4bd80d8b879a048dce5a887c69d588e99c1de0b96eb67b470c SHA512 eb626e0d776b798757d6b8644d0f5642f07141d614f1a3afe6e265ca77cf17030cee3ff267870d3f0a226c7111d68746a5a88c4a9689e2103f329f1b8fc4bd58
-DIST pandoc-citeproc-0.7.2.tar.gz 246215 BLAKE2B 503335489085918de584fcb3b623a3b5b40255efaa80ac8e58f4e4b85073f238fd92e547e4dbbdc90c71ee050be015e37955fdf1a06bdfa4a95d345bcadd1e0b SHA512 857fe05cc1b427a5de36d61c568b1054ecc5517ef9b9e73ade768d886340f6092784c0cbcdc9f87e04a1820edfebc702b34776f664c4d427f484011993f4bec2
-DIST pandoc-citeproc-0.8.1.3.tar.gz 310914 BLAKE2B 1944971f25cc0d43908a25ebfa7fde19a53f3af880ead82ba2c278580ff74c37087086921eb9087dca60419a4bf59b49d543ad78aa61f358e98ebda5a875b2ad SHA512 f03e036b05e108e1720715d0f5020ef443491478230a3ebb5024e4cbc2dfa05765b4118e5fbe124514439f14b3a07a898df74a0c3b3bbeb138abbad6af2f473b
diff --git a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch
deleted file mode 100644
index cee2d93bc213..000000000000
--- a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.6-ghc-7.10.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Pandoc.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Pandoc.hs	2015-01-10 11:57:26.900041860 +1100
-@@ -201,10 +201,10 @@
-                                        && isEndPunct c -> True
-                               (c:_) | isEndPunct c     -> True
-                                     | otherwise        -> False
--  where isEndPunct c = c `elem` ".,;:!?"
-+  where isEndPunct c = c `elem` (".,;:!?" :: String)
- 
- startWithPunct :: [Inline] -> Bool
--startWithPunct = and . map (`elem` ".,;:!?") . headInline
-+startWithPunct = and . map (`elem` (".,;:!?" :: String)) . headInline
- 
- deNote :: Pandoc -> Pandoc
- deNote = topDown go
-@@ -324,7 +324,7 @@
-   sp <- option "" (pSpace >> return " ")
-   r <- many1 (notFollowedBy pSpace >> notFollowedBy pLocatorPunct >> anyToken)
-   let s = stringify r
--  guard $ any isDigit s || all (`elem` "IVXLCM") s
-+  guard $ any isDigit s || all (`elem` ("IVXLCM" :: String)) s
-   return $ punct ++ sp ++ s
- 
- pDigit :: Parsec [Inline] st ()
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Proc.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Proc.hs	2015-01-10 11:56:18.797456065 +1100
-@@ -288,7 +288,7 @@
-         case ys of
-              Formatted [] -> xs
-              Formatted (Note _ : _) -> xs <> ys
--             Formatted (Str [c]:_) | c `elem` ", ;:" -> xs <> ys
-+             Formatted (Str [c]:_) | c `elem` (", ;:" :: String) -> xs <> ys
-              _ -> xs <> Formatted [Space] <> ys
-       formatAuth   = formatOutput . localMod
-       formatCits   = (if isNote then toNote else id) .
-@@ -328,7 +328,7 @@
-     | otherwise        = id
-     where
-       isPunct' [] = False
--      isPunct' xs = all (`elem` ".,;:!? ") xs
-+      isPunct' xs = all (`elem` (".,;:!? " :: String)) xs
-       check o = case cleanOutput o of
-                   [] -> ONull
-                   x  -> case trim' x of
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Eval/Names.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Eval/Names.hs	2015-01-10 11:55:41.839119783 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE PatternGuards, FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval.Names
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Eval.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Eval.hs	2015-01-10 11:55:23.090597159 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE PatternGuards, FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Parser.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Parser.hs	2015-01-10 11:54:59.755477862 +1100
-@@ -144,7 +144,7 @@
- 
- parseCslTerm :: Cursor -> CslTerm
- parseCslTerm cur =
--    let body = unpack $ T.dropAround (`elem` " \t\r\n") $
-+    let body = unpack $ T.dropAround (`elem` (" \t\r\n" :: String)) $
-                   T.concat $ cur $/ content
-     in CT
-       { cslTerm        = stringAttr "name" cur
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Style.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Style.hs	2015-01-10 11:53:23.641828264 +1100
-@@ -130,7 +130,7 @@
-   -- this is needed for versions of pandoc that don't turn
-   -- a span with font-variant:small-caps into a SmallCaps element:
-   where handleSmallCapsSpans (Span ("",[],[("style",sty)]) ils)
--            | filter (`notElem` " \t;") sty == "font-variant:small-caps" =
-+            | filter (`notElem` (" \t;" :: String)) sty == "font-variant:small-caps" =
-               SmallCaps ils
-         handleSmallCapsSpans x = x
- 
-@@ -206,15 +206,15 @@
- appendWithPunct (Formatted left) (Formatted right) =
-   Formatted $
-   case concat [lastleft, firstright] of
--       [' ',d] | d `elem` ",.:;" -> initInline left ++ right
--       [c,d] | c `elem` " ,.:;", d == c -> left ++ tailInline right
--       [c,'.'] | c `elem` ",.!:;?" -> left ++ tailInline right
--       [c,':'] | c `elem` ",!:;?" -> left ++ tailInline right  -- Mich.: 2005
--       [c,'!'] | c `elem` ",.!:;?" -> left ++ tailInline right
--       [c,'?'] | c `elem` ",.!:;?" -> left ++ tailInline right
--       [c,';'] | c `elem` ",:;" -> left ++ tailInline right -- et al.;
--       [':',c] | c `elem` ",.!:;?" -> left ++ tailInline right
--       [';',c] | c `elem` ",.!:;?" -> left ++ tailInline right
-+       [' ',d] | d `elem` (",.:;" :: String) -> initInline left ++ right
-+       [c,d] | c `elem` (" ,.:;" :: String), d == c -> left ++ tailInline right
-+       [c,'.'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-+       [c,':'] | c `elem` (",!:;?" :: String) -> left ++ tailInline right  -- Mich.: 2005
-+       [c,'!'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-+       [c,'?'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-+       [c,';'] | c `elem` (",:;" :: String) -> left ++ tailInline right -- et al.;
-+       [':',c] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-+       [';',c] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right
-        -- ".;" -> right  -- e.g. et al.;
-        _    -> left ++ right
-   where lastleft     = lastInline left
---- pandoc-citeproc-0.6-orig/src/Text/CSL/Util.hs	2014-09-22 14:04:21.000000000 +1000
-+++ pandoc-citeproc-0.6/src/Text/CSL/Util.hs	2015-01-10 11:51:31.789057499 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE ScopedTypeVariables, PatternGuards #-}
-+{-# LANGUAGE ScopedTypeVariables, PatternGuards, FlexibleContexts #-}
- module Text.CSL.Util
-   ( safeRead
-   , readNum
diff --git a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch b/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch
deleted file mode 100644
index c7c8655e14d8..000000000000
--- a/dev-haskell/pandoc-citeproc/files/pandoc-citeproc-0.9-no-binutils.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fails to build with -f-bibutils:
-https://bugs.gentoo.org/516640
-diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs
-index 7006e02..f72fa41 100644
---- a/pandoc-citeproc.hs
-+++ b/pandoc-citeproc.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- module Main where
-@@ -75,2 +76,3 @@ readFormat = go . map toLower
-         go "bibtex"   = Just Bibtex
-+#ifdef USE_BIBUTILS
-         go "ris"      = Just Ris
-@@ -87,2 +89,3 @@ readFormat = go . map toLower
-         go "yaml"     = Just Yaml
-+#endif
-         go _          = Nothing
-diff --git a/src/Text/CSL/Input/Bibutils.hs b/src/Text/CSL/Input/Bibutils.hs
-index 081fa91..49ddbd0 100644
---- a/src/Text/CSL/Input/Bibutils.hs
-+++ b/src/Text/CSL/Input/Bibutils.hs
-@@ -64,3 +64,3 @@ readBiblioFile f
- #else
--        _           -> error $ "citeproc: Bibliography format not supported.\n" ++
-+        _           -> error $ "citeproc: Bibliography format not supported.\n"
- #endif
diff --git a/dev-haskell/pandoc-citeproc/metadata.xml b/dev-haskell/pandoc-citeproc/metadata.xml
deleted file mode 100644
index 98effe1c3ac6..000000000000
--- a/dev-haskell/pandoc-citeproc/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
-		<flag name="embed-data-files">Embed locale files into the library (needed for windows packaging)</flag>
-		<flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag>
-		<flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
-		<flag name="small-base">Choose the new smaller, split-up base package.</flag>
-		<flag name="test-citeproc">Build the test-citeproc program</flag>
-		<flag name="unicode-collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
-		<flag name="unicode_collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
-	</use>
-	<longdescription>
-		The pandoc-citeproc library exports functions for
-		using the citeproc system with pandoc.  It relies on
-		citeproc-hs, a library for rendering
-		bibliographic reference citations into a variety
-		of styles using a macro language called Citation
-		Style Language (CSL). More details on CSL can be
-		found here: &lt;http://citationstyles.org/&gt;.
-		
-		Currently this package includes a copy of the citeproc-hs
-		code. When citeproc-hs is updated to be compatible,
-		this package will simply depend on citeproc-hs.
-		
-		This package also contains two executables: pandoc-citeproc,
-		which works as a pandoc filter (pandoc &gt;= 1.12), and
-		biblio2yaml, which converts bibliographic databases to
-		a yaml format suitable for inclusion in pandoc YAML
-		metadata.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jgm/pandoc-citeproc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild
deleted file mode 100644
index d56932e09dbb..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode_collation"
-RESTRICT=test # missing files: locales-en-US.xml: openBinaryFile
-
-RDEPEND=">=app-text/pandoc-1.12.0.2:=[profile?]
-	dev-haskell/aeson:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/json:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/tagsoup:=[profile?]
-	>=dev-haskell/texmath-0.6.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/yaml-0.8:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
-	!hexpat? ( dev-haskell/xml:=[profile?] )
-	network? ( >=dev-haskell/http-4000.0.9:=[profile?]
-			>=dev-haskell/network-2:=[profile?] )
-	unicode_collation? ( dev-haskell/text-icu:=[profile?] )
-	!unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( dev-haskell/aeson-pretty
-		>=dev-haskell/diff-0.3 )
-"
-
-src_configure() {
-	# workaround bug on ghc-7.6.3:
-	# > [13 of 24] Compiling Text.CSL.Input.Bibtex ...
-	# > stack overflow: use +RTS -K<size> to increase it
-	replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		$(cabal_flag small-base small_base) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
deleted file mode 100644
index 6f5a77d320c6..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://github.com/jgm/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
-
-RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
-
-RDEPEND=">=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
-	>=dev-haskell/aeson-pretty-0.8:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/tagsoup:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.6:=[profile?]
-	>=dev-haskell/yaml-0.8.8.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	debug? ( dev-haskell/pretty-show:=[profile?] )
-	test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?]
-				>=dev-haskell/vector-0.10:=[profile?] )
-	!test-citeproc? ( dev-haskell/vector:=[profile?] )
-	unicode_collation? ( dev-haskell/text-icu:=[profile?] )
-	!unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( !test-citeproc? ( >=dev-haskell/temporary-1.1 ) )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test-citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild
deleted file mode 100644
index 3eae2f1feb22..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://github.com/jgm/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
-
-RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
-
-RDEPEND=">=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
-	>=dev-haskell/aeson-pretty-0.8:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/tagsoup:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?]
-	>=dev-haskell/yaml-0.8.8.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	debug? ( dev-haskell/pretty-show:=[profile?] )
-	test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?]
-				>=dev-haskell/vector-0.10:=[profile?] )
-	!test-citeproc? ( dev-haskell/vector:=[profile?] )
-	unicode_collation? ( dev-haskell/text-icu:=[profile?] )
-	!unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( !test-citeproc? ( >=dev-haskell/temporary-1.1 ) )
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test-citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild
deleted file mode 100644
index 7c28423ccd3e..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild
+++ /dev/null
@@ -1,69 +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.6.9999
-#hackport: flags: -small_base,-test_citeproc
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://github.com/jgm/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils debug embed-data-files static unicode-collation"
-
-RESTRICT=test # fails
-
-RDEPEND=">=app-text/pandoc-2.8:=[profile?] <app-text/pandoc-2.11:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
-	>=dev-haskell/aeson-pretty-0.8:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	>=dev-haskell/base-compat-0.9:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
-	>=dev-haskell/hsyaml-aeson-0.2:=[profile?] <dev-haskell/hsyaml-aeson-0.3:=[profile?]
-	dev-haskell/libyaml:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	<dev-haskell/network-3.2:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/tagsoup:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
-	>=dev-haskell/yaml-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-6.4:=[profile?] )
-	debug? ( dev-haskell/pretty-show:=[profile?] )
-	embed-data-files? ( >=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?] )
-	unicode-collation? ( dev-haskell/text-icu:=[profile?] )
-	!unicode-collation? ( dev-haskell/rfc5051:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( >=dev-haskell/temporary-1.1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag static static) \
-		--flag=-test_citeproc \
-		$(cabal_flag unicode-collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild
deleted file mode 100644
index f3e0d8fb4735..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode_collation"
-RESTRICT=test # missing files: locales-en-US.xml: openBinaryFile
-
-RDEPEND=">=app-text/pandoc-1.12.1:=[profile?]
-	dev-haskell/aeson:=[profile?]
-	dev-haskell/aeson-pretty:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/tagsoup:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?]
-	>=dev-haskell/texmath-0.6.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/yaml-0.8:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
-	!hexpat? ( dev-haskell/xml:=[profile?] )
-	network? ( >=dev-haskell/http-4000.0.9:=[profile?]
-			>=dev-haskell/network-2:=[profile?] )
-	unicode_collation? ( dev-haskell/text-icu:=[profile?] )
-	!unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-src_configure() {
-	# workaround bug on ghc-7.6.3:
-	# > [13 of 24] Compiling Text.CSL.Input.Bibtex ...
-	# > stack overflow: use +RTS -K<size> to increase it
-	replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		$(cabal_flag small-base small_base) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
deleted file mode 100644
index c935617185d1..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed-data-files +hexpat +network test-citeproc unicode_collation"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-text/pandoc-1.12.1:=[profile?]
-	dev-haskell/aeson:=[profile?]
-	dev-haskell/aeson-pretty:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/tagsoup:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?]
-	>=dev-haskell/texmath-0.6.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
-	!hexpat? ( dev-haskell/xml:=[profile?] )
-	network? ( >=dev-haskell/http-4000.0.9:=[profile?]
-			>=dev-haskell/network-2:=[profile?]
-			dev-haskell/network-uri:=[profile?] )
-	unicode_collation? ( dev-haskell/text-icu:=[profile?] )
-	!unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( >=app-text/pandoc-1.12.1
-		dev-haskell/aeson
-		>=dev-haskell/pandoc-types-1.12.3
-		dev-haskell/text
-		>=dev-haskell/yaml-0.8.8.2 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'network >= 2,' 'network >= 2, network-uri,'
-}
-
-src_configure() {
-	# workaround bug on ghc-7.6.3:
-	# > [13 of 24] Compiling Text.CSL.Input.Bibtex ...
-	# > stack overflow: use +RTS -K<size> to increase it
-	[[ $(ghc-version) == 7.6.* ]] && replace-hcflags -O[2-9] -O1
-	[[ $(ghc-version) == 7.8.* ]] && replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		--flag=-small_base \
-		$(cabal_flag test-citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild
deleted file mode 100644
index 118eea96a21a..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed-data-files test-citeproc unicode_collation"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=app-text/pandoc-1.12.1:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.9:=[profile?]
-	dev-haskell/aeson-pretty:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/tagsoup:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
-	>=dev-haskell/yaml-0.8.8.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	unicode_collation? ( dev-haskell/text-icu:=[profile?] )
-	!unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.6-ghc-7.10.patch")
-
-src_configure() {
-	# workaround bug on ghc-7.6.3:
-	# > [13 of 24] Compiling Text.CSL.Input.Bibtex ...
-	# > stack overflow: use +RTS -K<size> to increase it
-	[[ $(ghc-version) == 7.6.* ]] && replace-hcflags -O[2-9] -O1
-	[[ $(ghc-version) == 7.8.* ]] && replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test-citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
deleted file mode 100644
index 7e737565c182..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
-
-RESTRICT=test # fd:8: hClose: resource vanished (Broken pipe)
-
-RDEPEND=">=app-text/pandoc-1.13:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	dev-haskell/aeson-pretty:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/tagsoup:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	debug? ( dev-haskell/pretty-show:=[profile?] )
-	unicode_collation? ( dev-haskell/text-icu:=[profile?] )
-	!unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test-citeproc test-citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
deleted file mode 100644
index 5eff54b67a26..000000000000
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -small_base
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Supports using pandoc with citeproc"
-HOMEPAGE="https://hackage.haskell.org/package/pandoc-citeproc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
-
-RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
-
-RDEPEND=">=app-text/pandoc-1.13:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.11:=[profile?]
-	dev-haskell/aeson-pretty:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/tagsoup:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?]
-	>=dev-haskell/yaml-0.8.8.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	debug? ( dev-haskell/pretty-show:=[profile?] )
-	unicode_collation? ( dev-haskell/text-icu:=[profile?] )
-	!unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	embed-data-files? ( dev-haskell/hsb2hs )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9-no-binutils.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		--flag=-small_base \
-		$(cabal_flag test-citeproc test_citeproc) \
-		$(cabal_flag unicode_collation unicode_collation)
-}
diff --git a/dev-haskell/pandoc-lua-engine/Manifest b/dev-haskell/pandoc-lua-engine/Manifest
new file mode 100644
index 000000000000..64df061cf7b0
--- /dev/null
+++ b/dev-haskell/pandoc-lua-engine/Manifest
@@ -0,0 +1,2 @@
+DIST pandoc-lua-engine-0.2.1.2-rev1.cabal 6835 BLAKE2B 70217c170c8eeb59571b208fab3ea34b7e1bcf30afad7365249fbd292a8c571910a3afe868f2b1fd68f8801eeeeb95f08810901f8dd5a32f511fdfc0ea665b98 SHA512 6c0fa6f266ab796f3c041f839a8fdb11f511dd76b88f2a48b6aa3df717e9a137a571ea204398a92be39bdc5e0d3a1e1e1814374192a9a9ea243c6303770ed4ae
+DIST pandoc-lua-engine-0.2.1.2.tar.gz 81179 BLAKE2B b6e8c29a754b093ebd17695a12a28a8755417033068668b6f8154f30ed649031b03c94f9a4ba262f7fa644b718f44c470273371cfa9866d1d7da1d5526fffc42 SHA512 4226463f889ae08fd6449ee3cc66b47830e3c0afee70cf897500461924176a62a2e7123cda8c1c2f8b47bcfdd67ae41502cc01cc04fc73f489c01dff6c897232
diff --git a/dev-haskell/pandoc-lua-engine/metadata.xml b/dev-haskell/pandoc-lua-engine/metadata.xml
new file mode 100644
index 000000000000..daccca3763a8
--- /dev/null
+++ b/dev-haskell/pandoc-lua-engine/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">pandoc-lua-engine</remote-id>
+		<remote-id type="github">jgm/pandoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/pandoc-lua-engine/pandoc-lua-engine-0.2.1.2.ebuild b/dev-haskell/pandoc-lua-engine/pandoc-lua-engine-0.2.1.2.ebuild
new file mode 100644
index 000000000000..b0b2b0d9301c
--- /dev/null
+++ b/dev-haskell/pandoc-lua-engine/pandoc-lua-engine-0.2.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Lua engine to power custom pandoc conversions"
+HOMEPAGE="https://pandoc.org"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network access to fetch .svg
+
+RDEPEND=">=dev-haskell/pandoc-3.1.4:=[profile?] <dev-haskell/pandoc-3.2:=[profile?]
+	dev-haskell/aeson:=[profile?]
+	>=dev-haskell/citeproc-0.8:=[profile?] <dev-haskell/citeproc-0.9:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doclayout-0.4:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+	>=dev-haskell/doctemplates-0.11:=[profile?] <dev-haskell/doctemplates-0.12:=[profile?]
+	>=dev-haskell/hslua-2.3:=[profile?] <dev-haskell/hslua-2.4:=[profile?]
+	>=dev-haskell/hslua-module-doclayout-1.1:=[profile?] <dev-haskell/hslua-module-doclayout-1.2:=[profile?]
+	>=dev-haskell/hslua-module-path-1.1:=[profile?] <dev-haskell/hslua-module-path-1.2:=[profile?]
+	>=dev-haskell/hslua-module-system-1.1:=[profile?] <dev-haskell/hslua-module-system-1.2:=[profile?]
+	>=dev-haskell/hslua-module-text-1.1:=[profile?] <dev-haskell/hslua-module-text-1.2:=[profile?]
+	>=dev-haskell/hslua-module-version-1.1:=[profile?] <dev-haskell/hslua-module-version-1.2:=[profile?]
+	>=dev-haskell/hslua-module-zip-1.1:=[profile?] <dev-haskell/hslua-module-zip-1.2:=[profile?]
+	>=dev-haskell/hslua-repl-0.1.1:=[profile?] <dev-haskell/hslua-repl-0.2:=[profile?]
+	>=dev-haskell/lpeg-1.0.4:=[profile?] <dev-haskell/lpeg-1.1:=[profile?]
+	>=dev-haskell/pandoc-lua-marshal-0.2.2:=[profile?] <dev-haskell/pandoc-lua-marshal-0.3:=[profile?]
+	>=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-2.2:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		>=dev-haskell/tasty-lua-1.1 <dev-haskell/tasty-lua-1.2 )
+"
diff --git a/dev-haskell/pandoc-lua-marshal/Manifest b/dev-haskell/pandoc-lua-marshal/Manifest
new file mode 100644
index 000000000000..c01529711831
--- /dev/null
+++ b/dev-haskell/pandoc-lua-marshal/Manifest
@@ -0,0 +1,2 @@
+DIST pandoc-lua-marshal-0.1.6.tar.gz 41737 BLAKE2B 878f28c9f20b752f09c9c94215a90d7d2e43f32f598f95272aac0e1847d90cbe03df1a52cc93c025f24b8c439e633599d5b0d0b4c9f224f21c505b2a82cd8290 SHA512 be425707b82da8d82d544da5c67f58537ddaa7eabf2508ab4e7bd4c0cff05b394a784bea744e6f702047ee733e259369eef43de615436607b38ceb8bda89417d
+DIST pandoc-lua-marshal-0.2.2.tar.gz 38236 BLAKE2B 34685d34caa523390639fcdbf98faa19ef4f91f7bfab8e3a99016562280712409a2ddedc45be370f30165e66af849cd9e4d8c4069f1020c604ca2974236aeee3 SHA512 4a861beb82d2abd95c4c671c9962c99d5302d1fa44de7d80e6e0896c172a6cd3c3758fc4b51b29667dcec1a6d51385cbe8d8e53c15e6eab761840e39270cfe3d
diff --git a/dev-haskell/pandoc-lua-marshal/metadata.xml b/dev-haskell/pandoc-lua-marshal/metadata.xml
new file mode 100644
index 000000000000..b4ca44993479
--- /dev/null
+++ b/dev-haskell/pandoc-lua-marshal/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">pandoc-lua-marshal</remote-id>
+		<remote-id type="github">pandoc/pandoc-lua-marshal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild b/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild
new file mode 100644
index 000000000000..f57a09a97e7d
--- /dev/null
+++ b/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.1.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use pandoc types in Lua"
+HOMEPAGE="https://github.com/pandoc/pandoc-lua-marshal"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-2.1:=[profile?] <dev-haskell/hslua-2.3:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.1:=[profile?] <dev-haskell/hslua-marshalling-2.3:=[profile?]
+	>=dev-haskell/lua-2.1:=[profile?] <dev-haskell/lua-2.3:=[profile?]
+	>=dev-haskell/pandoc-types-1.22.1:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-lua-1.0
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.2.2.ebuild b/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.2.2.ebuild
new file mode 100644
index 000000000000..d240a29a02ac
--- /dev/null
+++ b/dev-haskell/pandoc-lua-marshal/pandoc-lua-marshal-0.2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Use pandoc types in Lua"
+HOMEPAGE="https://github.com/pandoc/pandoc-lua-marshal"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.5:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
+	>=dev-haskell/hslua-2.2:=[profile?] <dev-haskell/hslua-2.4:=[profile?]
+	>=dev-haskell/hslua-list-1.1:=[profile?] <dev-haskell/hslua-list-1.2:=[profile?]
+	>=dev-haskell/hslua-marshalling-2.2:=[profile?] <dev-haskell/hslua-marshalling-2.4:=[profile?]
+	>=dev-haskell/lua-2.2:=[profile?] <dev-haskell/lua-2.4:=[profile?]
+	>=dev-haskell/pandoc-types-1.23:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+	>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-lua-1.0
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/pandoc-server/Manifest b/dev-haskell/pandoc-server/Manifest
new file mode 100644
index 000000000000..b58a33eb3d8d
--- /dev/null
+++ b/dev-haskell/pandoc-server/Manifest
@@ -0,0 +1 @@
+DIST pandoc-server-0.1.0.3.tar.gz 12779 BLAKE2B a2265acd435053d8c7bbe61c9dd2ada19b75554ca49be2fe6dddd232dcf44e41194c984a4cde6c4dcb060ebd630ee0584cf6217d31080cacaae27fa026ae345b SHA512 3fc7af2fcc16dfcbd05f12f04ac7682c56d2ea8e19d554d3abc803e3cc3ccedfdaaa14583fe5afa69961b86ba6a52d5ef099bf51330c70c4f5dc401d615098c6
diff --git a/dev-haskell/pandoc-server/metadata.xml b/dev-haskell/pandoc-server/metadata.xml
new file mode 100644
index 000000000000..53c2244508b1
--- /dev/null
+++ b/dev-haskell/pandoc-server/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">pandoc-server</remote-id>
+		<remote-id type="github">jgm/pandoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/pandoc-server/pandoc-server-0.1.0.3.ebuild b/dev-haskell/pandoc-server/pandoc-server-0.1.0.3.ebuild
new file mode 100644
index 000000000000..4f55a6ec2a51
--- /dev/null
+++ b/dev-haskell/pandoc-server/pandoc-server-0.1.0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Pandoc document conversion as an HTTP servant-server"
+HOMEPAGE="https://pandoc.org"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/pandoc-3.0:=[profile?]
+	>=dev-haskell/aeson-2.0:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+	>=dev-haskell/base64-0.4:=[profile?] <dev-haskell/base64-0.5:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doctemplates-0.11:=[profile?] <dev-haskell/doctemplates-0.12:=[profile?]
+	>=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+	>=dev-haskell/servant-server-0.19:=[profile?] <dev-haskell/servant-server-0.21:=[profile?]
+	>=dev-haskell/skylighting-0.13:=[profile?] <dev-haskell/skylighting-0.15:=[profile?]
+	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-2.2:=[profile?]
+	>=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-cors-0.2.7:=[profile?] <dev-haskell/wai-cors-0.3:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/pandoc-types/Manifest b/dev-haskell/pandoc-types/Manifest
index eed78ef3a0e9..6dcbaa2575ee 100644
--- a/dev-haskell/pandoc-types/Manifest
+++ b/dev-haskell/pandoc-types/Manifest
@@ -1,5 +1,2 @@
-DIST pandoc-types-1.12.3.tar.gz 18633 BLAKE2B 53776ac60c3e658ae6bf348d065d449045b5b0474b16550270c7087c766f1726fed80135ae92cab087a76dee8994a6ff3f68cc7085145f1e065a7cddf3b2759f SHA512 8da2d37baa962c4a414a60ac274736897499b3ba26bd54e2e6dd10616f204c3e143e4e66c97fa209781d73bde35fab7a466a8eaa06edaa13eaa178aa77c285af
-DIST pandoc-types-1.12.4.5.tar.gz 13341 BLAKE2B e0c9d079a8b5ee1eef07d8da87f621a1b005a984ae9b52b81241530bc5e7ef632fd9efe52aa7ab6f55978b28a15ef049769bdaeb5a94cc3b09b5cba8f34f757d SHA512 7f4c1156b074e61cd6fb5f37f5555700f5c21a24eb4226770fb8c83be3dc6075fef0b7b183c06561cc42c194fea0ac7356572e05097165e87e162b161f9c8993
-DIST pandoc-types-1.12.4.7.tar.gz 13208 BLAKE2B 6d823bc596cb779e67d6ba3af0323de2747ff0280e82fb4c319a8ebb5dbe5211015708c5241146a6a8210f9f1907c1d92aa5aac90397d3de3c249d5cf32968fd SHA512 cabb59d4f6bfec3c00d4cac4f2bda60e11ce96394b61d79650544b3249b5ef81758da0d8d08cb3de68ed252845ae1b6f2c4d663e80b4cdc076916c278ac4fc4b
-DIST pandoc-types-1.17.0.4.tar.gz 21540 BLAKE2B ba11e3a9c8fc98597cfaf0812ca35d6346f2c43aa7f67adf3f098b2410d12aed6b60b28003eec16e4cd82c6a355ec03b78d590bfa672d579ca8adc5ad1c63fb5 SHA512 3b3aaa2d6b62be8b3876ead411a0d48277666ab3dd718e5aad5ecca01cb9d66a4d7973bdc250e4fd2d061917d0836f63e6412534fa854c2c886dc798e34c60fc
-DIST pandoc-types-1.20.tar.gz 29505 BLAKE2B f455cc8462b20e86403cba1de836545100402db34b23f8be0d8907fa9d5596fe515f522c513f0cef3c67e7f8d3bb5bd3409f7bf5f1216f9b9f234c44552650fd SHA512 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee
+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
diff --git a/dev-haskell/pandoc-types/metadata.xml b/dev-haskell/pandoc-types/metadata.xml
index 39e4e9303f27..05ac3948269e 100644
--- a/dev-haskell/pandoc-types/metadata.xml
+++ b/dev-haskell/pandoc-types/metadata.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package contains definitions for the <pkg>app-text/pandoc</pkg> data
-		structure, which is used by pandoc to represent
-		structured documents.  These definitions used to live
-		in the pandoc package, but starting with pandoc 1.7, they
-		have been split off, so that other packages can use them
-		without drawing in all of pandoc's dependencies, and
-		pandoc itself can depend on packages (like <pkg>dev-haskell/citeproc-hs</pkg>)
-		that use them.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">pandoc-types</remote-id>
+		<remote-id type="github">jgm/pandoc-types</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
deleted file mode 100644
index a042d0f51bb6..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
deleted file mode 100644
index 0bd0a14f78e8..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild
deleted file mode 100644
index a13b3e07c2ef..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.11:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
deleted file mode 100644
index c6839b395ca1..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?]
-	>=dev-haskell/quickcheck-2:2=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		~dev-haskell/string-qq-0.0.2
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild
deleted file mode 100644
index 0afc02176b72..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild
+++ /dev/null
@@ -1,34 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://pandoc.org/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/quickcheck-2.4:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/string-qq-0.0.2
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
new file mode 100644
index 000000000000..0966156abcb5
--- /dev/null
+++ b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Types for representing a structured document"
+HOMEPAGE="https://pandoc.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+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:=[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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/string-qq-0.0.2 <dev-haskell/string-qq-0.1
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild
new file mode 100644
index 000000000000..e02997758c0e
--- /dev/null
+++ b/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Types for representing a structured document"
+HOMEPAGE="https://pandoc.org/"
+
+LICENSE="BSD"
+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:=[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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
diff --git a/dev-haskell/pandoc/Manifest b/dev-haskell/pandoc/Manifest
new file mode 100644
index 000000000000..3afdee24cae4
--- /dev/null
+++ b/dev-haskell/pandoc/Manifest
@@ -0,0 +1 @@
+DIST pandoc-3.1.8.tar.gz 7315618 BLAKE2B 6e24c1e113be040f413f9e351d020ca911a1e895144cbc2182d10bedf82f75f5d4fbc05fd15c575bb2f6b6605a2574aa3e2a6a9ee36599d1344ee76612a93b53 SHA512 2de648e7f3808d3139c214882a53157b2003c3fd340d7beee77a1cc49c2438004c03016f870d2348032457da5c6a63dd075eb7098e6f126db5a185325cbcc528
diff --git a/dev-haskell/pandoc/metadata.xml b/dev-haskell/pandoc/metadata.xml
new file mode 100644
index 000000000000..d70da6d9333b
--- /dev/null
+++ b/dev-haskell/pandoc/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<use>
+		<flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">pandoc</remote-id>
+		<remote-id type="github">jgm/pandoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild b/dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild
new file mode 100644
index 000000000000..f66010e6cc3a
--- /dev/null
+++ b/dev-haskell/pandoc/pandoc-3.1.8-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -static,-lua53,-nightly
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="https://pandoc.org"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="embed-data-files"
+
+RESTRICT=test # test case fails
+
+RDEPEND=">=dev-haskell/aeson-2.0.1.0:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+	>=dev-haskell/aeson-pretty-0.8.9:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
+	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base64-0.4:=[profile?] <dev-haskell/base64-0.5:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/citeproc-0.8.1:=[profile?] <dev-haskell/citeproc-0.9:=[profile?]
+	>=dev-haskell/commonmark-0.2.3:=[profile?] <dev-haskell/commonmark-0.3:=[profile?]
+	>=dev-haskell/commonmark-extensions-0.2.3.5:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+	>=dev-haskell/commonmark-pandoc-0.2.1.3:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?]
+	>=dev-haskell/crypton-connection-0.3.1:=[profile?] <dev-haskell/crypton-connection-0.4:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doclayout-0.4.0.1:=[profile?] <dev-haskell/doclayout-0.5:=[profile?]
+	>=dev-haskell/doctemplates-0.11:=[profile?] <dev-haskell/doctemplates-0.12:=[profile?]
+	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+	>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+	>=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
+	>=dev-haskell/gridtables-0.1:=[profile?] <dev-haskell/gridtables-0.2:=[profile?]
+	>=dev-haskell/haddock-library-1.10:=[profile?] <dev-haskell/haddock-library-1.12:=[profile?]
+	>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/ipynb-0.2:=[profile?] <dev-haskell/ipynb-0.3:=[profile?]
+	>=dev-haskell/jira-wiki-markup-1.5.1:=[profile?] <dev-haskell/jira-wiki-markup-1.6:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
+	>=dev-haskell/mime-types-0.1.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+	>=dev-haskell/pandoc-types-1.23.1:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/pretty-show-1.10:=[profile?] <dev-haskell/pretty-show-1.11:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/skylighting-0.14:=[profile?] <dev-haskell/skylighting-0.15:=[profile?]
+	>=dev-haskell/skylighting-core-0.14:=[profile?] <dev-haskell/skylighting-core-0.15:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	>=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	>=dev-haskell/texmath-0.12.8.2:=[profile?] <dev-haskell/texmath-0.13:=[profile?]
+	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-2.2:=[profile?]
+	>=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
+	>=dev-haskell/typst-0.3.2.0:=[profile?] <dev-haskell/typst-0.3.3:=[profile?]
+	>=dev-haskell/unicode-collation-0.1.1:=[profile?] <dev-haskell/unicode-collation-0.2:=[profile?]
+	>=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.5:=[profile?]
+	>=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/xml-conduit-1.9.1.1:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-haskell/yaml-0.11:=[profile?] <dev-haskell/yaml-0.12:=[profile?]
+	>=dev-haskell/zip-archive-0.4.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	!<app-text/pandoc-3
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
+		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed-data-files embed_data_files) \
+		--flag=-lua53 \
+		--flag=-nightly \
+		--flag=-static
+}
+
+src_install() {
+	haskell-cabal_src_install
+	doman "${S}/man/${PN}.1"
+}
+
+pkg_postinst() {
+	einfo "As of version 3, ${PN} no longer packages the pandoc executable"
+	einfo "as standard. For the executable, run 'emerge -av app-text/pandoc-cli'."
+}
diff --git a/dev-haskell/pango/Manifest b/dev-haskell/pango/Manifest
index 79002801f0ad..e7d95edab6a2 100644
--- a/dev-haskell/pango/Manifest
+++ b/dev-haskell/pango/Manifest
@@ -1,4 +1 @@
-DIST pango-0.12.5.3.tar.gz 60968 BLAKE2B 93abd241ed7809b3ece5862e667c80153169011a48bb901e7f14bab71da98fa62d564823bc3a30f3b9d6f3d5ead96d63b99abd34cd278fdf580413f97f7962b5 SHA512 bf93159f10519a0b5c313e0398f4fef703aa97eb4d0c998851be1cb1b7b69b2e28595dbfea2659de89cd2b0df64e1a945a90c22aee503eed2e85482bfa583d45
-DIST pango-0.13.1.1.tar.gz 61730 BLAKE2B 185e53cb9b5355a1eb4ffe39e56eb043ab2ce09bd902a7af85f4c8d5925f8640c5aa64f74fe3d630fa155745eed5eb73e409889bde953ed9ed850cfd4724e5ff SHA512 4dd021e03e18bea64b51ad1b4c5cae2cd214f0f26bd41deecf83626f25d70670e2472877e60ff49c30cd0f3e993d8cb4ba7adc3fee26454f8713e2a5bc7a9284
-DIST pango-0.13.3.1.tar.gz 52564 BLAKE2B 1c562635e9c0586363e5f3b234ae7303bf6f624a9e368afabdd3ee83477c9f4a831e072c336347af10c6b6442edac19714e4839b0f5b8a8d142b7309718e9e52 SHA512 7bcdd64abaf768bcbfc08f2fad93bc8ac142aa30b17ac0ee67ceec1429368f5a1c7cda6ed14d78278b69c948cdd4cd01630febfe41d9078c7f54d72c59d7b9b6
-DIST pango-0.13.6.1.tar.gz 52637 BLAKE2B 1e7febf9c60271404e49b91f06ebfcea06657b70410f4ff87fbe69427dbb9aae991ccf0980c216a933b06c3bafddab32c176f885905099415db6a09afe7426cc SHA512 44cb7af9b04dec8d6ab8256bc39f9777238d3cb22b90576f3a77c14cf0ce23ecd0926733a6ddaa96a62da13ac88f8637d4ffa82ae875b4276d7712f3a3d81a19
+DIST pango-0.13.10.0.tar.gz 52695 BLAKE2B 5551b0352b8c444de6ad6cfb216e571ef71b38e76d4d174ac9dd090bc3cec7c3c395065cf2a90e889ce945939ef5cd64715d443283cb350c78b99bc7ab02879b SHA512 050729ddf2a35bd21836a3a67eaa7218faf3534ff1affe74be840b6a7cfff256cc207b7805d5e3a48f6f6c365e3b0793818f98e94fc4a9dd03c31e1a60e7d078
diff --git a/dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch b/dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch
deleted file mode 100644
index fbe18552e3e5..000000000000
--- a/dev-haskell/pango/files/pango-0.13.6.1-cabal-1.24.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/702986
-
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -8,7 +8,7 @@ import Distribution.Simple ( defaultMainWithHooks, UserHooks(postConf),
- import Gtk2HsSetup ( gtk2hsUserHooks, getPkgConfigPackages)
- import Distribution.Simple.Setup ( ConfigFlags(configVerbosity), fromFlag)
- import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo(..) )
--import Distribution.Simple.BuildPaths ( autogenPackageModulesDir )
-+import Distribution.Simple.BuildPaths ( autogenModulesDir )
- import Distribution.Text ( display )
- import Distribution.Version ( Version(..) )
- import Distribution.Verbosity
-@@ -49,7 +49,7 @@ writePangoVersionHeaderFile verbosity lbi (Version (major:minor:micro:_) []) = d
-     , "#define PANGO_VERSION_MICRO " ++ show micro
-     ]
-   where
--    targetDir  = autogenPackageModulesDir lbi
-+    targetDir  = autogenModulesDir lbi
-     targetFile = targetDir </> "hspangoversion.h"
- 
- writeVersionHeaderFile _ _ version =
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -43,7 +43,7 @@ writePangoVersionHeaderFile verbosity lbi (versionNumbers -> (major:minor:micro:
- writePangoVersionHeaderFile verbosity lbi (Version (major:minor:micro:_) []) = do
- #endif
-   createDirectoryIfMissingVerbose verbosity True targetDir
--  rewriteFileEx verbosity targetFile $ unlines
-+  rewriteFile targetFile $ unlines
-     [ "#define PANGO_VERSION_MAJOR " ++ show major
-     , "#define PANGO_VERSION_MINOR " ++ show minor
-     , "#define PANGO_VERSION_MICRO " ++ show micro
diff --git a/dev-haskell/pango/metadata.xml b/dev-haskell/pango/metadata.xml
index b7878815d80d..584240bb2f12 100644
--- a/dev-haskell/pango/metadata.xml
+++ b/dev-haskell/pango/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">pango</remote-id>
+		<remote-id type="github">gtk2hs/gtk2hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/pango/pango-0.12.5.3.ebuild b/dev-haskell/pango/pango-0.12.5.3.ebuild
deleted file mode 100644
index 28109766e9e3..000000000000
--- a/dev-haskell/pango/pango-0.12.5.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Pango text rendering engine"
-HOMEPAGE="https://hackage.haskell.org/package/pango"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?]
-	>=dev-haskell/glib-0.12.5.3:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	x11-libs/cairo
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/pango/pango-0.13.1.1.ebuild b/dev-haskell/pango/pango-0.13.1.1.ebuild
deleted file mode 100644
index c030fcb1eb9f..000000000000
--- a/dev-haskell/pango/pango-0.13.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Pango text rendering engine"
-HOMEPAGE="https://hackage.haskell.org/package/pango"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/cairo
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	dev-haskell/gtk2hs-buildtools
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/pango/pango-0.13.10.0.ebuild b/dev-haskell/pango/pango-0.13.10.0.ebuild
new file mode 100644
index 000000000000..1beb5cff52e8
--- /dev/null
+++ b/dev-haskell/pango/pango-0.13.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Pango text rendering engine"
+HOMEPAGE="https://projects.haskell.org/gtk2hs/"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
+	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
+	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	x11-libs/cairo
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0 <dev-haskell/cabal-3.11
+"
+BDEPEND="virtual/pkgconfig
+	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
+"
+
+GHC_BOOTSTRAP_PACKAGES=( gtk2hs-buildtools )
diff --git a/dev-haskell/pango/pango-0.13.3.1.ebuild b/dev-haskell/pango/pango-0.13.3.1.ebuild
deleted file mode 100644
index 8da2fba4a718..000000000000
--- a/dev-haskell/pango/pango-0.13.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Pango text rendering engine"
-HOMEPAGE="https://hackage.haskell.org/package/pango"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/cairo
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/pango/pango-0.13.6.1.ebuild b/dev-haskell/pango/pango-0.13.6.1.ebuild
deleted file mode 100644
index 84b96a358147..000000000000
--- a/dev-haskell/pango/pango-0.13.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Pango text rendering engine"
-HOMEPAGE="https://hackage.haskell.org/package/pango"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/cairo
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${P}-cabal-1.24.patch)
diff --git a/dev-haskell/pantry/Manifest b/dev-haskell/pantry/Manifest
deleted file mode 100644
index 24d5402699af..000000000000
--- a/dev-haskell/pantry/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pantry-0.4.0.2.tar.gz 89491 BLAKE2B df082f4bf08f345fd64d54950241cc27af8259f1ae40ed3b123a10aeda3596c70029b1de08f8d551542af6b9cbdd77184e5dc1bda031be79d371a1051589771a SHA512 17e564825b9b7fa3bf2b091d0d0ba261c5ba17105ae34193b1aeb45db823877240d8d138f9bfb9699e87c946a5c87ce83ba12144aae73919d94c7cf3e7df1d7c
diff --git a/dev-haskell/pantry/metadata.xml b/dev-haskell/pantry/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/pantry/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/pantry/pantry-0.4.0.2.ebuild b/dev-haskell/pantry/pantry-0.4.0.2.ebuild
deleted file mode 100644
index 553d2801748c..000000000000
--- a/dev-haskell/pantry/pantry-0.4.0.2.ebuild
+++ /dev/null
@@ -1,72 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Content addressable Haskell package management"
-HOMEPAGE="https://github.com/commercialhaskell/pantry#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test" # seems related to http-download, requiring network access
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/ansi-terminal:=[profile?]
-	>=dev-haskell/cabal-3:=[profile?] <dev-haskell/cabal-3.3:=[profile?]
-	dev-haskell/casa-client:=[profile?]
-	dev-haskell/casa-types:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/cryptonite-conduit:=[profile?]
-	dev-haskell/digest:=[profile?]
-	dev-haskell/filelock:=[profile?]
-	dev-haskell/generic-deriving:=[profile?]
-	dev-haskell/hackage-security:=[profile?]
-	>=dev-haskell/hpack-0.31.2:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	dev-haskell/http-client-tls:=[profile?]
-	dev-haskell/http-conduit:=[profile?]
-	dev-haskell/http-download:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network-uri:=[profile?]
-	dev-haskell/path:=[profile?]
-	dev-haskell/path-io:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	>=dev-haskell/persistent-sqlite-2.9.3:=[profile?]
-	dev-haskell/persistent-template:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/rio:=[profile?]
-	dev-haskell/rio-orphans:=[profile?]
-	dev-haskell/rio-prettyprint:=[profile?]
-	dev-haskell/tar-conduit:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/text-metrics:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/unliftio:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	dev-haskell/zip-archive:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( dev-haskell/exceptions
-		dev-haskell/hedgehog
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/raw-strings-qq )
-"
diff --git a/dev-haskell/parallel-io/Manifest b/dev-haskell/parallel-io/Manifest
index 95d437720d5c..e3b9e0581737 100644
--- a/dev-haskell/parallel-io/Manifest
+++ b/dev-haskell/parallel-io/Manifest
@@ -1 +1 @@
-DIST parallel-io-0.3.3.tar.gz 9435 BLAKE2B 97d3e1343a20748173d9bc15e1bd84cde4e66f4e8bc916a18550c9f5e9c7a97a06861ab83db6ed3c7975da0142e287da0c6dc1c6483d9f78544564516181e650 SHA512 4d2ddb9ad4b3b362e431774495fa7e4cc4476768257f2915f3a6e64c1872a5bcf880d71e1f678997a23fbf9cfa22bc2b38df9f2866897d3cbb6d35e65eb542db
+DIST parallel-io-0.3.5.tar.gz 9422 BLAKE2B 55fbcf6aa8aa2742b53cd549917edde83a1399255be35cc4c023b4a150913699e13398bcd900f4c6971ec550b3b3f030e0d2d6e974baf21ad4fc92266d3cfd73 SHA512 5a77f66c32603a8d15d10508de6f8e7e7f3523927217974350d79ea2639b0eb3bde08fc7cd3a6b14226c67e7637271f5aaddfcbd07d163764e44df0babedd570
diff --git a/dev-haskell/parallel-io/metadata.xml b/dev-haskell/parallel-io/metadata.xml
index a02ec8bbfe5a..c737ff2ad9dc 100644
--- a/dev-haskell/parallel-io/metadata.xml
+++ b/dev-haskell/parallel-io/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild b/dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild
deleted file mode 100644
index 1e8265804853..000000000000
--- a/dev-haskell/parallel-io/parallel-io-0.3.3-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Combinators for executing IO actions in parallel on a thread pool"
-HOMEPAGE="http://batterseapower.github.com/parallel-io"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-#hackport: flags: -test -fuzz -benchmark
-
-RDEPEND=">dev-haskell/extensible-exceptions-0.1.0.1:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	# Hackage metadata revision -r1.
-	cabal_chdeps \
-		'random >= 1.0 && < 1.1' 'random >= 1.0 && < 1.2'
-
-	# Hackage metadata revision -r2.
-	cabal_chdeps \
-		'containers >= 0.2 && < 0.6' 'containers >= 0.2 && < 0.7'
-
-	default
-}
diff --git a/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild b/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild
new file mode 100644
index 000000000000..0ca40c57fc97
--- /dev/null
+++ b/dev-haskell/parallel-io/parallel-io-0.3.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -tests,-fuzz,-benchmark
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Combinators for executing IO actions in parallel on a thread pool"
+HOMEPAGE="https://batterseapower.github.io/parallel-io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">dev-haskell/extensible-exceptions-0.1.0.1:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-benchmark \
+		--flag=-fuzz \
+		--flag=-tests
+}
diff --git a/dev-haskell/parallel/Manifest b/dev-haskell/parallel/Manifest
index d70105a771db..4a731a2900a2 100644
--- a/dev-haskell/parallel/Manifest
+++ b/dev-haskell/parallel/Manifest
@@ -1,3 +1 @@
-DIST parallel-3.2.0.3.tar.gz 12527 BLAKE2B a3c52089a36ba1189d037b3fb93bcfb029965f3a8329990f464bf0d880654b40fa6148b23070f30053bda9efdf123cdf70a1b6d0d6ce02fd22fc5f0792997eba SHA512 28c0d30d51a6d66379190f96e6c057dde044e2bab25b9e87d6bbad2d43e9f1e6e82c1a11aaa61ce3fbf3681ddcc04f7d48cb6b8c9b611d24e5d95247a0cd0882
-DIST parallel-3.2.1.0.tar.gz 13199 BLAKE2B 7559c9b90f7849c119b545aa2a110f45150367a179c6d9a8514853b4a8bd5aca524d790e1bf111cfdd83d33886cb38fc136c29ed9a2a99f4d4d890946ad1f0eb SHA512 5b5051aa70320a70eb0f2326d49afbcda32f24f9a48463f8854f9d61cca2e61cf321b1f34989d1009f0cc8e49934c820f3d5f89a1d675701d9cf46df65dd2d6d
 DIST parallel-3.2.2.0.tar.gz 14681 BLAKE2B 579ac5a9c5310ca74b852fcc4d396815fa81603f939149a4c9aa6ca40d24caee9273d77e31a395c1478cf05750f25c63b4561e2eb0f175091c58d0260e6b7fca SHA512 ca1fe3fc5f9478dd52b42243d1191a2327c22946eb11d2d3426b9da2d833a61f182c20af9d15f7ceda6b58a28ee03de8837b6ca5bdd34e7306894db97f37f7bc
diff --git a/dev-haskell/parallel/metadata.xml b/dev-haskell/parallel/metadata.xml
index dd457a941da4..937381521944 100644
--- a/dev-haskell/parallel/metadata.xml
+++ b/dev-haskell/parallel/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a library for parallel programming.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/parallel/parallel-3.2.0.3.ebuild b/dev-haskell/parallel/parallel-3.2.0.3.ebuild
deleted file mode 100644
index 084a9bf7683a..000000000000
--- a/dev-haskell/parallel/parallel-3.2.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parallel programming library"
-HOMEPAGE="https://hackage.haskell.org/package/parallel"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	cabal_chdeps \
-		'array      >= 0.1 && < 0.5' 'array      >= 0.1 && < 0.6' \
-		'deepseq >= 1.1 && < 1.4' 'deepseq >= 1.1'
-}
diff --git a/dev-haskell/parallel/parallel-3.2.1.0.ebuild b/dev-haskell/parallel/parallel-3.2.1.0.ebuild
deleted file mode 100644
index b8495c44ab9e..000000000000
--- a/dev-haskell/parallel/parallel-3.2.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parallel programming library"
-HOMEPAGE="https://hackage.haskell.org/package/parallel"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/parallel/parallel-3.2.2.0.ebuild b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
index e0166cf4ada8..dfcf7d93965f 100644
--- a/dev-haskell/parallel/parallel-3.2.2.0.ebuild
+++ b/dev-haskell/parallel/parallel-3.2.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Parallel programming library"
-HOMEPAGE="http://hackage.haskell.org/package/parallel"
+HOMEPAGE="https://hackage.haskell.org/package/parallel"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="3/${PV}"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.3 && < 4.13' 'base       >= 4.3'
-}
+CABAL_CHDEPS=(
+	'base       >= 4.3 && < 4.13' 'base       >= 4.3'
+)
diff --git a/dev-haskell/parsec-numbers/metadata.xml b/dev-haskell/parsec-numbers/metadata.xml
index d5d60858e43f..23577e3f950a 100644
--- a/dev-haskell/parsec-numbers/metadata.xml
+++ b/dev-haskell/parsec-numbers/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild b/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild
index 088d4d166306..3927d7c46437 100644
--- a/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild
+++ b/dev-haskell/parsec-numbers/parsec-numbers-0.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="parsec1"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index 685a08327fe9..9b16df62bf2d 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,5 +1,3 @@
-DIST parsec-3.1.11.tar.gz 32412 BLAKE2B 7e463d37b1da799820079500d96d719e2f34781ba1d443391d5a49b60c3ad935c6c4e766aaa5963c1128ca12a0070f86b17fcbdf6e96224573742e0f9341c7f6 SHA512 f913c172295b184fc118a59ad5fd66c35133885c39aac62239fc3a1aa98b4741465f67d0cffafc1706262ada42259a4694bfbb9175a399997e5b8840da4a809f
-DIST parsec-3.1.13.0.tar.gz 35207 BLAKE2B d5d39122bdc8117aa45b7fc83c15162ac5d366ede01fbf99a94909c0b8ff6a31b6058bbd52ec6aa2366c6e9b1c909acb78c90a697821f8a88b67fa01c7655ff4 SHA512 4efa52bf5f8cdfe81ea97f1ea0bb5522331217976feaf98bb5ebfdf37f4685263f653de091c0ec0ecb0fc26cf6f8525639f9728c9e92afc154e91c6d4239c9b3
+DIST parsec-3.1.14.0-rev4.cabal 4356 BLAKE2B 6c0d7b4ae6c2adad8e79eee1f90ce51b6451b5929bddbd553e9a58cf4f9c169d48910ed8a6254afec54c096caf473230ce3f5672da60c4c170dcadfe9e1d1120 SHA512 4f5cef855f39497f7c84cb9f033cde9b8326a38a81d6ed1dab310078a935a14f36aa3f660b0ff1ef73333841c603c4a28237e96df1737de70ba9f88df84780c1
 DIST parsec-3.1.14.0.tar.gz 35688 BLAKE2B 474b14ff35d332339ce07f09ef22cbbdf971de9d9712848eb1c67b7ea4359e46079b67d39f978755c7560c55baf6d5f0d69a425291644a3ff638139a8bbec3ce SHA512 db14f77a2d36da5e540be35f0facb7fa61f2c46057b98039bdf16c06fe9865d5ee47e3523a312201665ca133f3f93855b42f0d0a920b8e233ffc8274075c56d3
-DIST parsec-3.1.5.tar.gz 27894 BLAKE2B 4c0daaa10d2307f59770747662b387cd286b46d27c3dff27c581d0e295f7bc652cc7e6e0f141ce69ef15da2af0e9f612f732b9bf09f17c9bab56dba0dc596481 SHA512 58bd5e1ea878349a678c4a8d77caf42962ab65f801411bbbad4fa1e4f387de743f2f64944b5d7ef82042507552f281f70a7f4b40984a0ca4fd37618a0d1ec662
-DIST parsec-3.1.9.tar.gz 29668 BLAKE2B 296049551258044915936afa0928b0d73b30ec7cbb217b3ac76972cfc3f9cb49efbe5091c49fe1232f5bb24951efc0c56d89b7818046cc5b8edeb67796de28f6 SHA512 bc5209813ad0742c68c275f0ecd3e284b6249d2651f75daf16ad9a776003591217eb7d47fdaad88530af90455fe7d3e014c3c1d7d0893482721d4997b23a2d16
+DIST parsec-3.1.15.0.tar.gz 36412 BLAKE2B b7d0b0eb022c0662a023d94e83106a528ed2fe280e3aa4cbd643479045d8afdee66a6dee938d5b7932e823fa39dddff18a407efb03a26d0029f1aea59b8738ef SHA512 fab7c48f43fae2708ee2d345897f827111408f82f4370442047d49d703de5d7a9666753926486764a3cfab15df98cf0f8e37d5b73811ffc80797ee498b4eb591
diff --git a/dev-haskell/parsec/metadata.xml b/dev-haskell/parsec/metadata.xml
index e593d5b00bd3..5e5863ecfd97 100644
--- a/dev-haskell/parsec/metadata.xml
+++ b/dev-haskell/parsec/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aslatter/parsec</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">parsec</remote-id>
+		<remote-id type="github">haskell/parsec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/parsec/parsec-3.1.11.ebuild b/dev-haskell/parsec/parsec-3.1.11.ebuild
deleted file mode 100644
index 5cf1bcd1d0b2..000000000000
--- a/dev-haskell/parsec/parsec-3.1.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/aslatter/parsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
deleted file mode 100644
index 9999fac242a9..000000000000
--- a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/hvr/parsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#keep in sync with ghc-8.6
-#KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular dependencies
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.11.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		|| ( ( >=dev-haskell/hunit-1.3.1.2 <dev-haskell/hunit-1.4 )
-			( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) )
-"
-
-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:9999"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.5.1   && < 4.12' 'base       >= 4.5.1'
-}
diff --git a/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild b/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
new file mode 100644
index 000000000000..066780005d1d
--- /dev/null
+++ b/dev-haskell/parsec/parsec-3.1.14.0-r2.ebuild
@@ -0,0 +1,41 @@
+# 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=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Circular depends: test-suite
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/haskell/parsec"
+
+LICENSE="BSD"
+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"
+
+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:=
+"
+DEPEND="${RDEPEND}
+"
+#	test? (
+#		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
+#		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
+#		>=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7
+#	)
+
+CABAL_CORE_LIB_GHC_PV="8.8.4 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 PM:9999"
diff --git a/dev-haskell/parsec/parsec-3.1.14.0.ebuild b/dev-haskell/parsec/parsec-3.1.14.0.ebuild
deleted file mode 100644
index fde0a720b3b4..000000000000
--- a/dev-haskell/parsec/parsec-3.1.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite has circular depends
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/haskell/parsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT=test # circular dependencies
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-1.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}"
-# 	test? ( >=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-# 		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-# 		|| ( ( >=dev-haskell/hunit-1.3.1.2 <dev-haskell/hunit-1.4 )
-# 			( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 ) ) )
-# "
-
-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:9999"
diff --git a/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild
new file mode 100644
index 000000000000..e31e8cee36c8
--- /dev/null
+++ b/dev-haskell/parsec/parsec-3.1.15.0-r1.ebuild
@@ -0,0 +1,34 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour" # test-suite circular depends
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/haskell/parsec"
+
+LICENSE="BSD-2"
+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"
+
+RESTRICT=test # circular dependencies: dev-haskell/base-orphans->cabal->parsec[test]->test-framework-hunit->test-framework->base-orphans
+
+RDEPEND="
+	>=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+"
+#	test? (
+#		>=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.5
+#		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+#	)
+
+CABAL_CORE_LIB_GHC_PV="9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.4 9.4.5"
diff --git a/dev-haskell/parsec/parsec-3.1.5.ebuild b/dev-haskell/parsec/parsec-3.1.5.ebuild
deleted file mode 100644
index ff5420a91684..000000000000
--- a/dev-haskell/parsec/parsec-3.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="http://www.cs.uu.nl/~daan/parsec.html"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/parsec/parsec-3.1.9-r1.ebuild b/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
deleted file mode 100644
index f5970d8f255d..000000000000
--- a/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Monadic parser combinators"
-HOMEPAGE="https://github.com/aslatter/parsec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit == 1.2.*' 'HUnit >= 1.2'
-}
diff --git a/dev-haskell/parsec1/Manifest b/dev-haskell/parsec1/Manifest
index be6b4fc88ea3..fc973842a4cb 100644
--- a/dev-haskell/parsec1/Manifest
+++ b/dev-haskell/parsec1/Manifest
@@ -1,2 +1,2 @@
-DIST parsec1-1.0.0.6.tar.gz 13871 BLAKE2B 4159797292ee8a5a64ec53c324fab116aad1c3974183c978b6e43a124e58e897b5115ff36349218b8c57fd2a69c54b592322dfa7c0cfc20761490d7f0c205d82 SHA512 1372007edd048aa5cca20f44fe70041b238c0b5aa36ed2c189124072f5d7671d3d164cbad58c8ce3f5c7bff01096fc9deec80cd21edc5475eecae12d2c4c6c38
 DIST parsec1-1.0.0.7.tar.gz 13440 BLAKE2B c445585d3db87a1abf7ea0a3157145241396ced3202c70927d355e76ad7b40f802ec0701efdc4e4dcbcdd024d6837d8eae118513acaedd44b77634befd89f7d7 SHA512 6ce75332064f811b105091d6adbdc2d0cfe571ec04674cf7b8f79d50df5b6d81f4a32a703151c09dfd9022b6df0929ceafc7f7451b4dff7bbc79382dc5ac743c
+DIST parsec1-1.0.0.8.tar.gz 12933 BLAKE2B 414077432a74a719754c634f16815bfd9c78892067f275d0dbdeed929950c88a2e87c56ffd9e2c07560d92ed6640d8778d0b4ff83a8d73313f7fb6276d7d7550 SHA512 fa7185ff5392130c5fd538f93a613046e667bd95596951dd04340d818f8e6412e5c254c10517bd8decd1547d547da2b920acfb32fcc90980627bb0214b9941b0
diff --git a/dev-haskell/parsec1/metadata.xml b/dev-haskell/parsec1/metadata.xml
index b0ea7c4648b7..937381521944 100644
--- a/dev-haskell/parsec1/metadata.xml
+++ b/dev-haskell/parsec1/metadata.xml
@@ -1,34 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Parsec is designed from scratch as an industrial-strength parser
-		library.  It is simple, safe, well documented (on the package
-		homepage), has extensive libraries and good error messages,
-		and is also fast.
-		
-		This package is the core haskell98 part of the parsec2
-		package, intended to preserve its simplicity and portability.
-		
-		Note, that the module names overlap with those of parsec from the Haskell
-		Platform, therefore I do not recommend to unconditionally use parsec1 (or
-		parsec2 and parsec3) as dependency in cabal files of packages for hackage.
-		But you may want to develop your code using these limited and portable
-		parsec1 functions and finally change the dependency from parsec1 to parsec
-		in order to avoid module ambiguities for users just installing your package.
-		Your own module ambiguities are best avoided by hiding packages.
-		
-		This version only differs from the pervious one by improved error messages
-		for try (positions are not reset), tokens and thus string (longer
-		unexpected strings are now reported to match the error position).
-		The notFollowedBy-parser was generalized (as in parsec-3) so
-		characters in messages are now shown in single instead of double
-		quotes.
-		Also (as since parsec-3.1.2) lookAhead no longer consumes tokens on success
-		(so that the many-parser can detect this).
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/parsec1/parsec1-1.0.0.6.ebuild b/dev-haskell/parsec1/parsec1-1.0.0.6.ebuild
deleted file mode 100644
index 6af89318f95b..000000000000
--- a/dev-haskell/parsec1/parsec1-1.0.0.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable monadic parser combinators"
-HOMEPAGE="http://www.cs.uu.nl/~daan/parsec.html"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild b/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild
index e9718d6c2c2c..67a49598a3ef 100644
--- a/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild
+++ b/dev-haskell/parsec1/parsec1-1.0.0.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-8.0.1:=
diff --git a/dev-haskell/parsec1/parsec1-1.0.0.8.ebuild b/dev-haskell/parsec1/parsec1-1.0.0.8.ebuild
new file mode 100644
index 000000000000..ee19cfb2e456
--- /dev/null
+++ b/dev-haskell/parsec1/parsec1-1.0.0.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Portable monadic parser combinators"
+HOMEPAGE="https://hackage.haskell.org/package/parsec1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest
index 519cbe1cc8ce..465db364cdf3 100644
--- a/dev-haskell/parser-combinators/Manifest
+++ b/dev-haskell/parser-combinators/Manifest
@@ -1 +1,2 @@
-DIST parser-combinators-1.0.0.tar.gz 10349 BLAKE2B c8b21ab8c1afd8fdc931f60258245596a70adb404366f5926743b61b6c7b802558436e7869d012dabaaa8d36097028269cec3c99f647958d0b15d14402c05c6b SHA512 308b38faca865801c2356b9eb0128824956f00a31d98de075166018b34d53a04bad0dc7f1afabafa9946b307ef3fb77df303db78ac7bd6ff476c9b96a3020e9c
+DIST parser-combinators-1.3.0.tar.gz 11699 BLAKE2B 0a24e95c52627a3219cc8e89ed49ebc12e759a487e7daf333f3ab788837576aef88d295f585aecd0831866319ee0445369cc3cd26255d6ef85d602f44d7767fa SHA512 f7a4581d229b788e841d844003e058a6c63827c5cadeb6fe8f1b94e2a920b11d3b08a8a7a412fa95e1b75bca24f6957f88162f8d1af5bb174ca7f91ef47c0b71
+DIST parser-combinators-tests-1.3.0.tar.gz 6860 BLAKE2B ececd5d8a47501a90e68ba77da679aed2c00da225c234f8afeebd43bf4cb821c988cd5612e8411e70179b39f0fcf8c15fcd93accd81e42ce1b8999d0cd8c7bdf SHA512 ac863afcbe81ea83c20cbab3229c5321860d1d45b4b04031db1a8cc493239096aef80d24148fe3cd5a18dfc811d806855386736be94e32cecabab3ae656d5389
diff --git a/dev-haskell/parser-combinators/metadata.xml b/dev-haskell/parser-combinators/metadata.xml
index 8f34fbbfb77a..d9090efa8693 100644
--- a/dev-haskell/parser-combinators/metadata.xml
+++ b/dev-haskell/parser-combinators/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Lightweight package providing commonly useful parser combinators.
-	</longdescription>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">parser-combinators</remote-id>
+		<remote-id type="github">mrkkrp/parser-combinators</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
deleted file mode 100644
index 7eff94752fda..000000000000
--- a/dev-haskell/parser-combinators/parser-combinators-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lightweight package providing commonly useful parser combinators"
-HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
new file mode 100644
index 000000000000..8c34b94aff0f
--- /dev/null
+++ b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -dev
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+TEST_PN="${PN}-tests"
+TEST_P="${TEST_PN}-${PV}"
+
+DESCRIPTION="Lightweight package providing commonly useful parser combinators"
+HOMEPAGE="https://github.com/mrkkrp/parser-combinators"
+SRC_URI+=" test? ( https://hackage.haskell.org/package/${TEST_P}/${TEST_P}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT+=" !test? ( test )"
+
+RDEPEND=">=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? (
+		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
+		>=dev-haskell/hspec-expectations-0.8 <dev-haskell/hspec-expectations-0.9
+		>=dev-haskell/hspec-megaparsec-2.0 <dev-haskell/hspec-megaparsec-3.0
+		>=dev-haskell/megaparsec-8.0 <dev-haskell/megaparsec-10.0
+		>=dev-haskell/megaparsec-tests-8.0 <dev-haskell/megaparsec-tests-10.0
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev
+}
+
+src_test() {
+	if use test; then
+		cabal-register-inplace || die
+		local pkg_db="${S}/dist/package.conf.inplace"
+
+		local old_S="${S}"
+		export S="${WORKDIR}/${TEST_P}"
+		pushd "${S}" > /dev/null || die
+
+		export CABAL_TEST_SUITE=yes
+		export CABAL_USE_HADDOCK=''
+		haskell-cabal_src_configure \
+			--package-db="${pkg_db}" \
+			--flag=-dev
+
+		haskell-cabal_src_compile
+
+		SKIP_REGISTER_INPLACE=yes haskell-cabal_src_test
+
+		popd > /dev/null || die
+		export S="${old_S}"
+	fi
+}
diff --git a/dev-haskell/parsers/Manifest b/dev-haskell/parsers/Manifest
index be0190f33d01..3458589c17f8 100644
--- a/dev-haskell/parsers/Manifest
+++ b/dev-haskell/parsers/Manifest
@@ -1 +1,3 @@
+DIST parsers-0.12.10-rev2.cabal 3428 BLAKE2B ff4fa52451f5f85a76dc8a3cd7fecfacfd74bfc5836b46b1c463ff7d021c0f680feedb5816f0cc1e66bc32fddde491c58108fde60d7073bd150b33185c218c76 SHA512 3861ecd2139dadc721b3e3a0ae45f83e488c48b067fc600cffe7b194102e9ac135ce1bbdc8094f10d670367dd5d2571c88b2943be136a682b53d0408d50836b8
 DIST parsers-0.12.10.tar.gz 26215 BLAKE2B 35303f6f4919e07b77490f5bcbc2a45efe8fda5edf169ade7dd7cd3bd080f2d24d5470ecb47f8a6428be1176faa8d138616e8f2635f9974ed473c8a61145e8ee SHA512 99ff90de4e60be3c03c8e1e5ae7902a37424c3139ccf566ff1cbc363d176787bd60bb709ef6c56f5b446f1f1b7eca65aa5d431897a0f82a9d6f7fe77fd2ee49f
+DIST parsers-0.12.11.tar.gz 24004 BLAKE2B 4d5d700e1dd8e89b3025b9d659c9bb35ede45c327359ea18d4db2961bec2ad05c44c7484ca6a8aff8f10679107996bb989516889df311c44de464b2d593b0928 SHA512 7ffa8b092aa731dc263151f755b52126924a8dd0a6c51aa52b044937976ad6410dd0755af5d361f5255c212e6cadc5793d15fa3a3fe26514c1324eeee71b4019
diff --git a/dev-haskell/parsers/metadata.xml b/dev-haskell/parsers/metadata.xml
index 0149708d6d5a..88974e5372c2 100644
--- a/dev-haskell/parsers/metadata.xml
+++ b/dev-haskell/parsers/metadata.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="parsec">Enable the use of the `parsec` package</flag>
-		<flag name="attoparsec">Enable the use of the `attoparsec` package</flag>
+		<flag name="attoparsec">You can disable the use of the `attoparsec` package using `-f-attoparsec`.</flag>
+		<flag name="binary">You can disable the use of the `binary` package using `-f-binary`.</flag>
+		<flag name="parsec">You can disable the use of the `parsec` package using `-f-parsec`.</flag>
 	</use>
-	<longdescription>
-		This library provides convenient combinators for working with and building parsing combinator libraries.
-		
-		Given a few simple instances, e.g. for the class &#39;Text.Parser.Combinators.Parsing&#39; in &quot;Text.Parser.Combinators.Parsing&quot; you
-		get access to a large number of canned definitions. Instances exist for the parsers provided by @parsec@,
-		@attoparsec@ and base’s &quot;Text.Read&quot;.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">parsers</remote-id>
+		<remote-id type="github">ekmett/parsers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/parsers/parsers-0.12.10-r1.ebuild b/dev-haskell/parsers/parsers-0.12.10-r1.ebuild
new file mode 100644
index 000000000000..9e9fd1bf7044
--- /dev/null
+++ b/dev-haskell/parsers/parsers-0.12.10-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 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 test-suite"
+CABAL_HACKAGE_REVISION="2"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Parsing combinators"
+HOMEPAGE="https://github.com/ekmett/parsers/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+attoparsec +binary +parsec"
+
+RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag attoparsec attoparsec) \
+		$(cabal_flag binary binary) \
+		$(cabal_flag parsec parsec)
+}
diff --git a/dev-haskell/parsers/parsers-0.12.10.ebuild b/dev-haskell/parsers/parsers-0.12.10.ebuild
deleted file mode 100644
index a262cb26304a..000000000000
--- a/dev-haskell/parsers/parsers-0.12.10.ebuild
+++ /dev/null
@@ -1,41 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing combinators"
-HOMEPAGE="https://github.com/ekmett/parsers/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+attoparsec +parsec"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.12:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/text-0.10:=[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:=
-	attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] )
-	parsec? ( >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag attoparsec attoparsec) \
-		$(cabal_flag parsec parsec)
-}
diff --git a/dev-haskell/parsers/parsers-0.12.11.ebuild b/dev-haskell/parsers/parsers-0.12.11.ebuild
new file mode 100644
index 000000000000..a635ff0fbc7d
--- /dev/null
+++ b/dev-haskell/parsers/parsers-0.12.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing combinators"
+HOMEPAGE="https://github.com/ekmett/parsers/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+attoparsec +binary +parsec"
+
+RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/charset-0.3:=[profile?] <dev-haskell/charset-1:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	attoparsec? ( >=dev-haskell/attoparsec-0.12.1.4:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag attoparsec attoparsec) \
+		$(cabal_flag binary binary) \
+		$(cabal_flag parsec parsec)
+}
diff --git a/dev-haskell/path-io/Manifest b/dev-haskell/path-io/Manifest
deleted file mode 100644
index e82504fe5938..000000000000
--- a/dev-haskell/path-io/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST path-io-1.2.2.tar.gz 17818 BLAKE2B 5a4a39ff0282e2d2294b8392af954fd0bba036ff223b95dca1951b202b6a4be14373bf439b826d4fb868e4378f9beb45488a77955a6c8e10bd5af70ea72fb57d SHA512 910af5fd9345daa815235027992e6ab4af3784da7afa314644abaf8acb5bee59f3f1444449ce55e88961c86031cf4537c855e13ba2e777348d9fe4c0104fb6d1
-DIST path-io-1.6.0.tar.gz 20848 BLAKE2B 89236aca7c41b5095bb989c7638640ce6735843db36028b2b9d4f0427b0bb94403d915eb3abdfd34cf02f5b6b02cb02e57525eb9e056c942481802b24401117c SHA512 dcafbbfe1531d7b00a9df751c093e6affdefafe7589c0243530579b9f5733ef1357b1085cfd88bf53ff9794accddbc789b927a199f4c4a2b7778268cf1719477
diff --git a/dev-haskell/path-io/metadata.xml b/dev-haskell/path-io/metadata.xml
deleted file mode 100644
index f7fb2720334b..000000000000
--- a/dev-haskell/path-io/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Interface to directory package for users of path.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/path-io/path-io-1.2.2.ebuild b/dev-haskell/path-io/path-io-1.2.2.ebuild
deleted file mode 100644
index ff4aa8026ebb..000000000000
--- a/dev-haskell/path-io/path-io-1.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface to 'directory' package for users of 'path'"
-HOMEPAGE="https://github.com/mrkkrp/path-io"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/path-0.5:=[profile?] <dev-haskell/path-0.6:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'time         >= 1.4     && < 1.7' 'time         >= 1.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/path-io/path-io-1.6.0-r1.ebuild b/dev-haskell/path-io/path-io-1.6.0-r1.ebuild
deleted file mode 100644
index fdde596e893d..000000000000
--- a/dev-haskell/path-io/path-io-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,43 +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.1.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interface to 'directory' package for users of 'path'"
-HOMEPAGE="https://github.com/mrkkrp/path-io"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/dlist-0.8:=[profile?] <dev-haskell/dlist-0.9:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/path-0.6:=[profile?]
-	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-lang/ghc-8.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4.0.1
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'path         >= 0.6     && < 0.7' 'path         >= 0.6'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/path-pieces/Manifest b/dev-haskell/path-pieces/Manifest
index f5e690d62a62..937e3d5bc624 100644
--- a/dev-haskell/path-pieces/Manifest
+++ b/dev-haskell/path-pieces/Manifest
@@ -1,2 +1 @@
-DIST path-pieces-0.1.5.tar.gz 3236 BLAKE2B 8c9261293fd09dd71e2bec2fd48b9e906db656c5fa822d81ae6654c8d9abb59e36c5d8e13659e5ca59a112e3f83bf0c244ca6d3d9e87dd35dd49bfb7b50c1980 SHA512 634a90bc99135192faac44191fc6d40f17795750250cb6088385574eba55717eb40c17b57ba7677e3ce1962d2275a09f3ab7167f465359c152926bee624cd7eb
 DIST path-pieces-0.2.1.tar.gz 3529 BLAKE2B e3b34a630ec0cf69531c46604060efcbe287a45e4fd5b0fb8f76768b605943957d5a99dd3ebee16073e965906ded52584062fbeb4bd4b635c6511b47565c57f2 SHA512 83b8bda16db42ed347e2caa1978f195faf161f53beaaccbf450d21b29b9ae9fc04bcdf8dd17a0db2e11eb9e5bfeddcb605237325c7aaf4ec5cc3402b859674c0
diff --git a/dev-haskell/path-pieces/metadata.xml b/dev-haskell/path-pieces/metadata.xml
index 45d002c00dba..937381521944 100644
--- a/dev-haskell/path-pieces/metadata.xml
+++ b/dev-haskell/path-pieces/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Components of paths.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/path-pieces/path-pieces-0.1.5.ebuild b/dev-haskell/path-pieces/path-pieces-0.1.5.ebuild
deleted file mode 100644
index 8578f3bf8dea..000000000000
--- a/dev-haskell/path-pieces/path-pieces-0.1.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Components of paths"
-HOMEPAGE="https://hackage.haskell.org/package/path-pieces"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
index b61283ae4fe7..a4dd67858e9d 100644
--- a/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
+++ b/dev-haskell/path-pieces/path-pieces-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,14 +14,14 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.6.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.16.0
 	test? ( >=dev-haskell/hspec-1.3
 		dev-haskell/hunit
 		dev-haskell/quickcheck )
diff --git a/dev-haskell/path/Manifest b/dev-haskell/path/Manifest
deleted file mode 100644
index 82cddbc1a3f3..000000000000
--- a/dev-haskell/path/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST path-0.5.13.tar.gz 16988 BLAKE2B 4fbc3464f674a15a2dc3c543cbf9d705f9c189224e45c6bb4f180e46483547822ed8a90920c183c756ebcd3529ceaa142b7a644b6e2f28a474e1302827b37204 SHA512 bf1e4750aa025382735f0b8329daa092501f1bbcb25ca3951be653cc3193d19be4339697e966db7dbff7ea2f78b251259c9f6f4cb36402a51221b077af388284
-DIST path-0.7.0.tar.gz 24227 BLAKE2B b2f3347c29dfae0e7674f4de39f07bb7ee681735d1509c7eefd29cc2141dcf974212fc970095a783fdb47dbffaac9489097116768bfe996a160bb9b8886cc9e6 SHA512 b07fc95eab12188d49e4525ea5bbadfda9d5bfb61cc306d624730087d2fc1f946407e4861f7f66de48d9cdf2541591d4518fcc77f28d65671bfa65a963e18a9c
diff --git a/dev-haskell/path/metadata.xml b/dev-haskell/path/metadata.xml
deleted file mode 100644
index e42b1c1a4d04..000000000000
--- a/dev-haskell/path/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Path
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/path/path-0.5.13.ebuild b/dev-haskell/path/path-0.5.13.ebuild
deleted file mode 100644
index cf56eceb1a0e..000000000000
--- a/dev-haskell/path/path-0.5.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-#hackport: flags: -validity
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for well-typed paths"
-HOMEPAGE="https://hackage.haskell.org/package/path"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
-		>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-validity
-}
diff --git a/dev-haskell/path/path-0.7.0.ebuild b/dev-haskell/path/path-0.7.0.ebuild
deleted file mode 100644
index 969e56affe31..000000000000
--- a/dev-haskell/path/path-0.7.0.ebuild
+++ /dev/null
@@ -1,42 +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
-#hackport: flags: -validity,-dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for well-typed paths"
-HOMEPAGE="http://hackage.haskell.org/package/path"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( >=dev-haskell/genvalidity-0.8
-		>=dev-haskell/genvalidity-hspec-0.7
-		>=dev-haskell/genvalidity-property-0.4
-		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
-		>=dev-haskell/mtl-2.0 <dev-haskell/mtl-3
-		dev-haskell/quickcheck
-		>=dev-haskell/validity-0.8.0.0 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev \
-		--flag=-validity
-}
diff --git a/dev-haskell/patience/Manifest b/dev-haskell/patience/Manifest
index bc128bc0b24b..e591252ebdf2 100644
--- a/dev-haskell/patience/Manifest
+++ b/dev-haskell/patience/Manifest
@@ -1 +1,2 @@
 DIST patience-0.1.1.tar.gz 4610 BLAKE2B 6ce8e959dec8493990f66c9cb7b5dc8aaef6cb4edc3207f19156ba527fd993112a29a9d39241a39c2d9c4af600cebdfd31f02833779ce6cbf74e14ce6305273a SHA512 dac94580d9b82023841b5406509f8cd0e58148756e4259708c21b78b480fb4fb67b21a82c81e702275f49d90bcd1d2b46d20bb96267131d4ff57334f110e14f7
+DIST patience-0.3.tar.gz 6247 BLAKE2B d461e0739a0f03f31bee30f5940e7f3803984643b0a90b65f968ce00b5487efed7b44176d9c603f1fe566966169fd18e188c0c7efb3812ffed6db3cb5569b4e5 SHA512 12bc0005d6ca47ac9954aee8950d00f5c6af133958015fe791d2e100295660bebe967e37ce859abb67ae38bedefa1bd1d81a7770842448485d2f7466652e7ea5
diff --git a/dev-haskell/patience/metadata.xml b/dev-haskell/patience/metadata.xml
index 2af4d28dc291..ee2f452d0522 100644
--- a/dev-haskell/patience/metadata.xml
+++ b/dev-haskell/patience/metadata.xml
@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library implements the \"patience diff\" algorithm, as well as the patience
-		algorithm for the longest increasing subsequence problem.
-		
-		Patience diff computes the difference between two lists, for example the
-		lines of two versions of a source file.  It provides a good balance of
-		performance, nice output for humans, and implementation simplicity.  For more
-		information, see &lt;http://alfedenzo.livejournal.com/170301.html&gt; and
-		&lt;http://bramcohen.livejournal.com/73318.html&gt;.
-		
-		New in version 0.1.1: relaxed @containers@ dependency, so it should build on
-		GHC 6.10.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">patience</remote-id>
+		<remote-id type="github">chessai/patience</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/patience/patience-0.1.1-r1.ebuild b/dev-haskell/patience/patience-0.1.1-r1.ebuild
index 32f019022b6c..56ca2d60b402 100644
--- a/dev-haskell/patience/patience-0.1.1-r1.ebuild
+++ b/dev-haskell/patience/patience-0.1.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.3.6.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Patience diff and longest increasing subsequence"
-HOMEPAGE="http://hackage.haskell.org/package/patience"
+HOMEPAGE="https://hackage.haskell.org/package/patience"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/patience/patience-0.1.1.ebuild b/dev-haskell/patience/patience-0.1.1.ebuild
deleted file mode 100644
index fddc9c0dcf58..000000000000
--- a/dev-haskell/patience/patience-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Patience diff and longest increasing subsequence"
-HOMEPAGE="https://hackage.haskell.org/package/patience"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/patience/patience-0.3.ebuild b/dev-haskell/patience/patience-0.3.ebuild
new file mode 100644
index 000000000000..0ea1c786e96d
--- /dev/null
+++ b/dev-haskell/patience/patience-0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Patience diff and longest increasing subsequence"
+HOMEPAGE="https://github.com/chessai/patience"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/pcap/Manifest b/dev-haskell/pcap/Manifest
deleted file mode 100644
index 79e479c282f2..000000000000
--- a/dev-haskell/pcap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pcap-0.4.5.2.tar.gz 49414 BLAKE2B 3218a30d1b5fe14981578ee95648e0b5f38a6800351645bac7590ece92cadab4f5e2feb67fd9599861751f205240be757e15f0374ad381edeab6f7fb5692bb48 SHA512 75bdaf3700826d94309e7b26f7ed9b367c33df0a7c8e7f4104230f57fff6916c193b0123dbb64f12d2031a1c350d029e471a58ea6bad0dd36de3a40eafbeab33
diff --git a/dev-haskell/pcap/metadata.xml b/dev-haskell/pcap/metadata.xml
deleted file mode 100644
index ece2d746a816..000000000000
--- a/dev-haskell/pcap/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A system-independent interface for user-level packet capture
-	</longdescription>
-	<upstream>
-		<remote-id type="github">bos/pcap</remote-id>
-		<remote-id type="bitbucket">bos/pcap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild b/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
deleted file mode 100644
index 378d0711b823..000000000000
--- a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A system-independent interface for user-level packet capture"
-HOMEPAGE="https://github.com/bos/pcap"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/network:=[profile?]
-		>=dev-lang/ghc-6.12.1:=
-		net-libs/libpcap"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/pcg-random/Manifest b/dev-haskell/pcg-random/Manifest
new file mode 100644
index 000000000000..df133729331e
--- /dev/null
+++ b/dev-haskell/pcg-random/Manifest
@@ -0,0 +1 @@
+DIST pcg-random-0.1.3.7.tar.gz 25416 BLAKE2B e964c59aafd7114cd6c731ab35da9154e698dd3b1445be37408018d09a623c007eedbfc18fc3d4b0cfcda1fba58a50abd0a58f72e8999680f7014c0af443da4d SHA512 995c7ef160dfcde373cda3cab185bdf8f2448168d9d08409291b0e7c77d6cd7e9ec14933fa2e61896ea62eaaae49a1ddf99979dd6b7364ae7b788e5773cac984
diff --git a/dev-haskell/pcg-random/metadata.xml b/dev-haskell/pcg-random/metadata.xml
new file mode 100644
index 000000000000..ea3ec888549e
--- /dev/null
+++ b/dev-haskell/pcg-random/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">pcg-random</remote-id>
+		<remote-id type="github">cchalmers/pcg-random</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/pcg-random/pcg-random-0.1.3.7.ebuild b/dev-haskell/pcg-random/pcg-random-0.1.3.7.ebuild
new file mode 100644
index 000000000000..ce7bbed88311
--- /dev/null
+++ b/dev-haskell/pcg-random/pcg-random-0.1.3.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell bindings to the PCG random number generator"
+HOMEPAGE="https://github.com/cchalmers/pcg-random"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+GHC_BOOTSTRAP_PACKAGES=(
+	cabal-doctest
+)
+
+RDEPEND="dev-haskell/entropy:=[profile?]
+	>=dev-haskell/primitive-0.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-2.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( dev-haskell/doctest )
+"
diff --git a/dev-haskell/pcre-light/Manifest b/dev-haskell/pcre-light/Manifest
index 98343960ee1d..34bd1df2bb4d 100644
--- a/dev-haskell/pcre-light/Manifest
+++ b/dev-haskell/pcre-light/Manifest
@@ -1,3 +1 @@
-DIST pcre-light-0.4.0.4.tar.gz 15065 BLAKE2B 5ce576bc77e61265326bda0109ce5b8692f06401630400a5f3e8fc94afe3cf7334c0800774bc5acae251a78d4ffe488a3c3435c67d467f75c9ff58c2d8a33996 SHA512 ca5f52a8737b2785b4d3eb7c1463233dc579cf10bdb620397f842d4bddafbe636b992f725f85086e5916f2def163d5d25661acd24a358421e2f7f859a2f876f0
 DIST pcre-light-0.4.1.0.tar.gz 28908 BLAKE2B 10b24f61d6d4a8669464d2a003fcf3a677fc34f7e0369106d3986e18c97c0cb6509620ac7a545dc0e3246c76e5221ae30e32565c02b5fbdc58b6c2524265f314 SHA512 491d9581e4c29d1a5a3b161210b83abbc135c2d0ee4018481f4101f91c95e93d7acf0764cb464a9ffe84bed9bf8fb400f4c68441ae1be03c0aa182a9be26dc39
-DIST pcre-light-0.4.tar.gz 28943 BLAKE2B 3458990cddf6361c7b67fcc66c8abfb900e6e1efd93c1eb5b8ab9d46337911e5122dc20d5ba9a1cb28a9cafbab64d06bb15e79361d64e06bb4f6c19674fe40ad SHA512 1cbb37743018e0199d3c23f5cda34a41514ecc375650f2a79935c16b12b4411e5ce1d7fc84b29fbb41458a2493998471cbefc54adbf848d59877c6be4d34b6aa
diff --git a/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch b/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch
deleted file mode 100644
index 2b4181929f60..000000000000
--- a/dev-haskell/pcre-light/files/pcre-light-0.4-ghc-7.7.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Text/Regex/PCRE/Light.hs b/Text/Regex/PCRE/Light.hs
-index 80c28a0..7fc9581 100644
---- a/Text/Regex/PCRE/Light.hs
-+++ b/Text/Regex/PCRE/Light.hs
-@@ -77,6 +77,7 @@ import qualified Data.ByteString          as S
- #if __GLASGOW_HASKELL__ >= 608
- import qualified Data.ByteString.Internal as S
- import qualified Data.ByteString.Unsafe   as S
-+import qualified System.IO.Unsafe         as U
- #else
- import qualified Data.ByteString.Base     as S
- #endif
-@@ -193,7 +194,7 @@ compile s o = case compileM s o of
- -- > Left "nothing to repeat"
- --
- compileM :: S.ByteString -> [PCREOption] -> Either String Regex
--compileM str os = unsafePerformIO $
-+compileM str os = U.unsafePerformIO $
-   S.useAsCString str $ \pattern -> do
-     alloca $ \errptr       -> do
-     alloca $ \erroffset    -> do
-@@ -263,7 +264,7 @@ compileM str os = unsafePerformIO $
- -- is returned.
- --
- match :: Regex -> S.ByteString -> [PCREExecOption] -> Maybe [S.ByteString]
--match (Regex pcre_fp _) subject os = unsafePerformIO $ do
-+match (Regex pcre_fp _) subject os = U.unsafePerformIO $ do
-   withForeignPtr pcre_fp $ \pcre_ptr -> do
-     n_capt <- captureCount' pcre_ptr
- 
-@@ -324,7 +325,7 @@ match (Regex pcre_fp _) subject os = unsafePerformIO $ do
- 
- 
- captureCount :: Regex -> Int
--captureCount (Regex pcre_fp _) = unsafePerformIO $ do
-+captureCount (Regex pcre_fp _) = U.unsafePerformIO $ do
-   withForeignPtr pcre_fp $ \pcre_ptr -> do
-     captureCount' pcre_ptr
- 
diff --git a/dev-haskell/pcre-light/metadata.xml b/dev-haskell/pcre-light/metadata.xml
index db85e01eaea8..c8fbbc902a61 100644
--- a/dev-haskell/pcre-light/metadata.xml
+++ b/dev-haskell/pcre-light/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild b/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
deleted file mode 100644
index 1b938d18b1d4..000000000000
--- a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions"
-HOMEPAGE="http://code.haskell.org/~dons/code/pcre-light"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.7.patch)
diff --git a/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild b/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild
deleted file mode 100644
index c24b8ef991ce..000000000000
--- a/dev-haskell/pcre-light/pcre-light-0.4.0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable regex library for Perl 5 compatible regular expressions"
-HOMEPAGE="https://github.com/Daniel-Diaz/pcre-light"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.0
-	virtual/pkgconfig
-"
diff --git a/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild b/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
index 0f291f743a7c..5cebcf4343c0 100644
--- a/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
+++ b/dev-haskell/pcre-light/pcre-light-0.4.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.1
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 #IUSE="use-pkg-config"
 IUSE=""
 
diff --git a/dev-haskell/pem/Manifest b/dev-haskell/pem/Manifest
index 5a894d6bcbb1..f377cb492b6b 100644
--- a/dev-haskell/pem/Manifest
+++ b/dev-haskell/pem/Manifest
@@ -1,2 +1 @@
-DIST pem-0.1.2.tar.gz 3577 BLAKE2B 2e6a76c1a4b61c50eb1fb0095cdbf18b3a6bc3cd1aeb3f48c04feeda6fdbce3e231e850f61180957bd56b38dee1e093cf99494a7a0d82a78a3bfe6e44732aa5d SHA512 f9bccbbbed160ba662163c90968be71401a1777fbad74bd6b12a4eb23ca61cadd81f92b80a7e5a84a6a76cf15d83aa81ffd5f1fb2fe444679edd4157a8fa388a
-DIST pem-0.2.2.tar.gz 4641 BLAKE2B 488cf8d1ec2dc107657593da3107b98940144772955124fa3c08dfd9963a46d61fdb80fd55520a2dfce130f99351fea4b0c3ff9d3053711d880afcc238f84dbf SHA512 699b13a89c9caa14c25d4a4e1775bc1ccd9b681193622d9638049631dd84b8ddf4e1b25fa5f31b36c8192157c7303b11226917e57d92abc0366bb01bd527b64a
+DIST pem-0.2.4.tar.gz 4717 BLAKE2B f78472c15a78e201b7c5e29e7855af143f0c4f071fcea39175eaa7928be36e48ee65272fbfa822f8f468dc5771c8996683b238c1ed2bd2bbc73f5166efa85992 SHA512 c27531ae89e69cebbeeecdf3cf72b897eb65c2f9b22c898bf88d79664f1b54b592f0e0f2bc007f84ec3b0efee8bd20eee187bf73a2947b2fc7d9f4a7e418872d
diff --git a/dev-haskell/pem/metadata.xml b/dev-haskell/pem/metadata.xml
index 81dbf4317f85..ad2d0d042e1c 100644
--- a/dev-haskell/pem/metadata.xml
+++ b/dev-haskell/pem/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Privacy Enhanced Mail (PEM) format reader and writer.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-pem</remote-id>
 	</upstream>
diff --git a/dev-haskell/pem/pem-0.1.2.ebuild b/dev-haskell/pem/pem-0.1.2.ebuild
deleted file mode 100644
index 83e6a3ea2b19..000000000000
--- a/dev-haskell/pem/pem-0.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Privacy Enhanced Mail (PEM) format reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-pem"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/attoparsec:=[profile?]
-		dev-haskell/base64-bytestring:=[profile?]
-		dev-haskell/cereal:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/quickcheck-2.4.0.1
-			>=dev-haskell/test-framework-0.3.3
-			dev-haskell/test-framework-quickcheck2
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/pem/pem-0.2.2.ebuild b/dev-haskell/pem/pem-0.2.2.ebuild
deleted file mode 100644
index 5fb5ee3ff2be..000000000000
--- a/dev-haskell/pem/pem-0.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Privacy Enhanced Mail (PEM) format reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-pem"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-1.0.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.4.0.1
-		>=dev-haskell/test-framework-0.3.3
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/pem/pem-0.2.4.ebuild b/dev-haskell/pem/pem-0.2.4.ebuild
new file mode 100644
index 000000000000..0d60ca26657f
--- /dev/null
+++ b/dev-haskell/pem/pem-0.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Privacy Enhanced Mail (PEM) format reader and writer"
+HOMEPAGE="https://github.com/vincenthz/hs-pem"
+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/basement:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.4.0.1
+		>=dev-haskell/test-framework-0.3.3
+		dev-haskell/test-framework-hunit
+		dev-haskell/test-framework-quickcheck2 )
+"
diff --git a/dev-haskell/persistent-sqlite/Manifest b/dev-haskell/persistent-sqlite/Manifest
index 69ee9cd94c35..c51087274175 100644
--- a/dev-haskell/persistent-sqlite/Manifest
+++ b/dev-haskell/persistent-sqlite/Manifest
@@ -1,3 +1,2 @@
-DIST persistent-sqlite-2.1.4.2.tar.gz 1460596 BLAKE2B b5bb2a869888fd276fc4a515000253408f878964b5b4b0740406a7655f2488a8b5c9354be108bc4f24b31caafa4916a9973ed2204a4be7ca53745dbc7217893f SHA512 9c959164135120f02464daee6d9012872d12212bcb94128010f05784cd11cd04d2fd2dcca5dafd9036d0bd4154a5262b26816b27d7a335f0404634471e3944c7
-DIST persistent-sqlite-2.10.6.2.tar.gz 2220390 BLAKE2B f146ec84ae45d0d4b4cb3c809bf694182c8592369e222029824f6eb6a39abbbb67acc6bdd2af4a9b8080d50ffcdc20968fa14cac237a475b220dcefe3329fc2d SHA512 b1db41bf77ae53b99c28f3224c9a2b7335faa4a78c96487270249959cc9491fa542e28d38dd63a2b417580f6a41608ffcee152e8609fe16392005c728862c7bc
-DIST persistent-sqlite-2.6.tar.gz 3565770 BLAKE2B e92865929494d37ea5363dcb5110821e5ae5de099aca3fefa59311d2586b9c450f648fd4077ac7310efe72d5c7267b8f5c943610e65db7731608d8e86c62fdfe SHA512 c0be576429ee0051eeeffff6c6d7168a7993deeca47acd27bf2d0075afad2702855f2c14d8b389697d5053aa097d81fe119e4eb215a1c56f782e2ac95a5f8ff8
+DIST persistent-sqlite-2.13.1.0.tar.gz 2276809 BLAKE2B acc9f4b0e351313486e89f695b69756ea165146fd8aaafcc2d3da8dc620c109cee8d922fe0246e688691748c18e75fa64f9f4a992ca2cd28e01677766d56326b SHA512 19842dcd867f57ac2f81d8651838f41f6a4f0074293c0b3a21a52d2fb96410c26d5340307983da21ca89170a01621da257320e36f33170657acb6890f70299d4
+DIST persistent-sqlite-2.13.1.1.tar.gz 2276814 BLAKE2B e408ce749a1648874a33fc99677540ee609cb3ffe30eb2043e9425df724f15db41a692b7b3b0cb43388629db52b8e3a74e3025489290cc412dfdf8878490c92b SHA512 12489af434a9748670f621072872bd43abbecafde3ff01960a2fb446466f6320137e13e0029a944ad6efb60dc2bcf8632c4b60541292e8627065e34d5f467d22
diff --git a/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch b/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch
deleted file mode 100644
index 2bd856f5f786..000000000000
--- a/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/persistent-sqlite.cabal b/persistent-sqlite.cabal
-index 39971e7..c0edfe3 100644
---- a/persistent-sqlite.cabal
-+++ b/persistent-sqlite.cabal
-@@ -76,2 +76,2 @@ executable sanity
-     hs-source-dirs: test
--    build-depends: base, persistent-sqlite
-+    build-depends: base, persistent-sqlite, monad-logger
-diff --git a/test/sanity.hs b/test/sanity.hs
-index aed09a3..ce61fed 100644
---- a/test/sanity.hs
-+++ b/test/sanity.hs
-@@ -3,2 +3,3 @@
- import Database.Persist.Sqlite
-+import Control.Monad.Logger
- 
-@@ -7,2 +8,2 @@ $(return []) -- just force TH to run
- main :: IO ()
--main = withSqliteConn ":memory:" $ const $ return ()
-+main = runStderrLoggingT $ withSqliteConn ":memory:" $ const $ return ()
diff --git a/dev-haskell/persistent-sqlite/metadata.xml b/dev-haskell/persistent-sqlite/metadata.xml
index 8db950fedcee..d634eb999f8a 100644
--- a/dev-haskell/persistent-sqlite/metadata.xml
+++ b/dev-haskell/persistent-sqlite/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package includes a thin sqlite3 wrapper based on the direct-sqlite package, as well as the entire C library, so there are no system dependencies.
-	</longdescription>
 	<use>
-		<flag name="build-sanity-exe">Build a sanity check test executable.</flag>
+		<flag name="build-sanity-exe">Build a sanity check test executable</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">persistent-sqlite</remote-id>
+		<remote-id type="github">yesodweb/persistent</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild
deleted file mode 100644
index 56c7aa40a997..000000000000
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: +systemlib
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-sanity-exe"
-
-RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/aeson-0.6.2:=[profile?]
-	>=dev-haskell/conduit-0.5.3:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?]
-	>=dev-haskell/monad-logger-0.2.4:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-template )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-exe.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-sanity-exe build-sanity-exe) \
-		--flag=systemlib
-}
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
deleted file mode 100644
index e3b69f748f49..000000000000
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.10.6.2.ebuild
+++ /dev/null
@@ -1,60 +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.4.9999
-#hackport: flags: +systemlib,-use-stat3,-use-stat4,-uri-filenames,-full-text-search,-have-usleep,-json1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-sanity-exe"
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
-	>=dev-haskell/conduit-1.2.12:=[profile?]
-	>=dev-haskell/microlens-th-0.4.1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.25:=[profile?]
-	>=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-1.1.9:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	virtual/libc
-	>=dev-db/sqlite-3.0
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/exceptions
-		dev-haskell/fast-logger
-		>=dev-haskell/hspec-2.4
-		dev-haskell/hunit
-		dev-haskell/persistent-template
-		dev-haskell/persistent-test
-		dev-haskell/quickcheck
-		dev-haskell/system-fileio
-		dev-haskell/system-filepath
-		dev-haskell/temporary )
-"
-
-src_configure() {
-	# most flags disabled since they have no effect when system-sqlite is used.
-	haskell-cabal_src_configure \
-		$(cabal_flag build-sanity-exe build-sanity-exe) \
-		--flag=-full-text-search \
-		--flag=-have-usleep \
-		--flag=-json1 \
-		--flag=systemlib \
-		--flag=-uri-filenames \
-		--flag=-use-stat3 \
-		--flag=-use-stat4
-}
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild
new file mode 100644
index 000000000000..e0fe59ff9da2
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: +systemlib,-use-stat3,-use-stat4,-uri-filenames,-full-text-search,-have-usleep,-json1,-use-pkgconfig
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backend for the persistent library using sqlite3"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="build-sanity-exe"
+
+RDEPEND=">=dev-db/sqlite-3.0
+	>=dev-haskell/aeson-1.0:=[profile?]
+	>=dev-haskell/conduit-1.2.12:=[profile?]
+	>=dev-haskell/microlens-th-0.4.1.1:=[profile?]
+	>=dev-haskell/monad-logger-0.3.25:=[profile?]
+	>=dev-haskell/persistent-2.13.3:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	dev-haskell/resource-pool:=[profile?]
+	>=dev-haskell/resourcet-1.1.9:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	virtual/libc
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/exceptions
+		dev-haskell/fast-logger
+		>=dev-haskell/hspec-2.4
+		dev-haskell/hunit
+		dev-haskell/microlens
+		dev-haskell/persistent-test
+		dev-haskell/quickcheck
+		dev-haskell/system-fileio
+		dev-haskell/system-filepath
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag build-sanity-exe build-sanity-exe) \
+		--flag=-full-text-search \
+		--flag=-have-usleep \
+		--flag=-json1 \
+		--flag=systemlib \
+		--flag=-uri-filenames \
+		--flag=-use-pkgconfig \
+		--flag=-use-stat3 \
+		--flag=-use-stat4
+}
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.1.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.1.ebuild
new file mode 100644
index 000000000000..3a486c7720cd
--- /dev/null
+++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.13.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +systemlib,-use-stat3,-use-stat4,-uri-filenames,-full-text-search,-have-usleep,-json1,-use-pkgconfig
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backend for the persistent library using sqlite3"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="build-sanity-exe"
+
+RDEPEND=">=dev-db/sqlite-3.0
+	>=dev-haskell/aeson-1.0:=[profile?]
+	>=dev-haskell/conduit-1.2.12:=[profile?]
+	>=dev-haskell/microlens-th-0.4.1.1:=[profile?]
+	>=dev-haskell/monad-logger-0.3.25:=[profile?]
+	>=dev-haskell/persistent-2.13.3:=[profile?] <dev-haskell/persistent-3:=[profile?]
+	dev-haskell/resource-pool:=[profile?]
+	>=dev-haskell/resourcet-1.1.9:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	virtual/libc
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/exceptions
+		dev-haskell/fast-logger
+		>=dev-haskell/hspec-2.4
+		dev-haskell/hunit
+		dev-haskell/microlens
+		dev-haskell/persistent-test
+		dev-haskell/quickcheck
+		dev-haskell/system-fileio
+		dev-haskell/system-filepath
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag build-sanity-exe build-sanity-exe) \
+		--flag=-full-text-search \
+		--flag=-have-usleep \
+		--flag=-json1 \
+		--flag=systemlib \
+		--flag=-uri-filenames \
+		--flag=-use-pkgconfig \
+		--flag=-use-stat3 \
+		--flag=-use-stat4
+}
diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild
deleted file mode 100644
index da127f5e3af4..000000000000
--- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +systemlib
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Backend for the persistent library using sqlite3"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-sanity-exe"
-
-RDEPEND=">=dev-db/sqlite-3.0
-	>=dev-haskell/aeson-0.6.2:=[profile?]
-	>=dev-haskell/conduit-0.5.3:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?]
-	>=dev-haskell/monad-logger-0.2.4:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/persistent-2.6:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-template
-		dev-haskell/temporary )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-sanity-exe build-sanity-exe) \
-		--flag=systemlib
-}
diff --git a/dev-haskell/persistent-template/Manifest b/dev-haskell/persistent-template/Manifest
index 1374e9cbc9d3..b29023adf369 100644
--- a/dev-haskell/persistent-template/Manifest
+++ b/dev-haskell/persistent-template/Manifest
@@ -1,3 +1 @@
-DIST persistent-template-2.1.3.4.tar.gz 19084 BLAKE2B 625532bca1e65a40f043f6975cf1c3c93329bd593cc2c5f6f9f62c0aa925c91a358518ce69ccc65609b4d2e9686a4337af47bd2a7e6778769d7f3cb40796241d SHA512 8b218dea93a6a2ca80801acb43f101d6809d7118f3b6765a98543d87b12b4b565d5b3ea1f1256863b2493553f996ef5dcc569432507de6477b1f59a02093d95a
-DIST persistent-template-2.5.1.6.tar.gz 20196 BLAKE2B d7d63dbead0348bc3c9239c23e5976337fa952a4a19cf86507064632d0ab1ddd7b26f984285307cf7b3ff177afd8aa5e94708412ba954815959ff09fb857bfb0 SHA512 4e2432a0f0fca28699c3abe9298b10451330dfb4e2b1a7048a2a98e3e18d4b41df06ba1bd53ffbbce3aebb123cd2f6ec9249580490a32c478ff3aff628011916
-DIST persistent-template-2.8.2.3.tar.gz 25949 BLAKE2B 2b2fbfcb4e8dad68da8a820ae082db8cee9f683db9509b55b4ba908bff0a20cdf4e925db4bfe2d5c0014912e58469aa593e24a428f181928e8024917a3ab7db8 SHA512 eef94f07783f2b61ed4d00c75a57e976e2546ee1cb564471ea33e5faf01634701a7b60b4c1ee64594e0058949966f132fe46f1a5efc5a64f949fc6e6b27d5ddb
+DIST persistent-template-2.12.0.0.tar.gz 4506 BLAKE2B 1246629206981e4631a48055d23ab2f2a5851e7c200c0c809117217d3531d1b7ccc36cb27cb79ab33abef14f298ea80e2ccee9e4c115d362b132e0bf980f4c34 SHA512 5098c88f92d5e8609de62f6571d8c7f1b2f08d0286974f1ba5eabc01e3479b48a2ae1a0e85e54f1e9956902189142c5d04a4b314a1945341f4e76828959405a7
diff --git a/dev-haskell/persistent-template/metadata.xml b/dev-haskell/persistent-template/metadata.xml
index eaabdf9abe86..f35742ff7064 100644
--- a/dev-haskell/persistent-template/metadata.xml
+++ b/dev-haskell/persistent-template/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild b/dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild
deleted file mode 100644
index 36fbfa68a7e8..000000000000
--- a/dev-haskell/persistent-template/persistent-template-2.1.3.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/path-pieces:=[profile?]
-	>=dev-haskell/persistent-2.1.3:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild b/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild
new file mode 100644
index 000000000000..312c22eb83d8
--- /dev/null
+++ b/dev-haskell/persistent-template/persistent-template-2.12.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild b/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild
deleted file mode 100644
index fa0195fefb94..000000000000
--- a/dev-haskell/persistent-template/persistent-template-2.5.1.6-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/aeson-compat-0.3.2.0:=[profile?] <dev-haskell/aeson-compat-0.4:=[profile?]
-	>=dev-haskell/http-api-data-0.2:=[profile?]
-	>=dev-haskell/monad-control-0.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/path-pieces:=[profile?]
-	>=dev-haskell/persistent-2.5:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'aeson                    >= 0.7       && < 0.12' 'aeson                    >= 0.7' \
-		'http-api-data            >= 0.2       && < 0.3' 'http-api-data            >= 0.2'
-}
diff --git a/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild b/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
deleted file mode 100644
index 2a2501f66988..000000000000
--- a/dev-haskell/persistent-template/persistent-template-2.8.2.3.ebuild
+++ /dev/null
@@ -1,35 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, non-relational, multi-backend persistence"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/http-api-data-0.3.7:=[profile?]
-	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/path-pieces:=[profile?]
-	>=dev-haskell/persistent-2.10:=[profile?] <dev-haskell/persistent-3:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( >=dev-haskell/hspec-2.4
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/persistent-test/Manifest b/dev-haskell/persistent-test/Manifest
index 9c8f14d6ae45..a4d43bb3a26b 100644
--- a/dev-haskell/persistent-test/Manifest
+++ b/dev-haskell/persistent-test/Manifest
@@ -1 +1 @@
-DIST persistent-test-2.0.3.0.tar.gz 24642 BLAKE2B a1f94ffd7d574ac575db79f2afcd9f627be9dffff8c29811d104b1c30239f0518c90b096a34689c18e9e1a4fa63a3dccb819bd910ecfdadb5239806d53e5cb17 SHA512 511aa72db39687b2b90ef262d5dd83a64887902c2fe57bb87bfd437421170f39af4ebf54ba217eddce80d2afac54ed7e546214775f056e478f20de27c518fdf1
+DIST persistent-test-2.13.1.3.tar.gz 32262 BLAKE2B 77bfae47292edd08cec0504d4006f44f349ba6fef2d670833d5f2c339bbe75f5d5e5afe924793d2f4ae9afb57f018d1e32a11b2cdecfe5c451f5aaa94897dbcf SHA512 906df4039bbd6e054cbcc18b300ea293814b7365c6267348a88abc9902cd30d60bd314b42331a1341befe787f566bca311ca7fb398594ae56cbc2e764d5a8ba2
diff --git a/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch b/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch
deleted file mode 100644
index e27746b85731..000000000000
--- a/dev-haskell/persistent-test/files/persistent-test-2.0.3.0-new-exts.patch
+++ /dev/null
@@ -1,252 +0,0 @@
---- a/src/CompositeTest.hs
-+++ b/src/CompositeTest.hs
-@@ -1,6 +1,8 @@
- {-# LANGUAGE DeriveGeneric #-}
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-} -- FIXME
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
- module CompositeTest where
- 
---- a/src/CustomPersistFieldTest.hs
-+++ b/src/CustomPersistFieldTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module CustomPersistFieldTest (specsWith, customFieldMigrate) where
- 
---- a/src/CustomPrimaryKeyReferenceTest.hs
-+++ b/src/CustomPrimaryKeyReferenceTest.hs
-@@ -1,4 +1,6 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
- -- This test is based on this issue: https://github.com/yesodweb/persistent/issues/421
- -- The primary thing this is testing is the migration, thus the test code itself being mostly negligible.
---- a/src/DataTypeTest.hs
-+++ b/src/DataTypeTest.hs
-@@ -1,5 +1,8 @@
- {-# LANGUAGE ScopedTypeVariables #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module DataTypeTest
-     ( specsWith
---- a/src/EmbedOrderTest.hs
-+++ b/src/EmbedOrderTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module EmbedOrderTest (specsWith, embedOrderMigrate, cleanDB) where
- 
---- a/src/EmbedTest.hs
-+++ b/src/EmbedTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-orphans -O0 #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module EmbedTest (specsWith, cleanDB, embedMigrate) where
---- a/src/EmptyEntityTest.hs
-+++ b/src/EmptyEntityTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module EmptyEntityTest (specsWith, migration, cleanDB) where
- 
---- a/src/EntityEmbedTest.hs
-+++ b/src/EntityEmbedTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module EntityEmbedTest where
- 
- -- because we are using a type alias we need to declare in a separate module
---- a/src/EquivalentTypeTest.hs
-+++ b/src/EquivalentTypeTest.hs
-@@ -1,4 +1,6 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- 
---- a/src/HtmlTest.hs
-+++ b/src/HtmlTest.hs
-@@ -1,4 +1,8 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
-+
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module HtmlTest (specsWith, cleanDB, htmlMigrate) where
- 
---- a/src/LargeNumberTest.hs
-+++ b/src/LargeNumberTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module LargeNumberTest where
- 
- import Data.Word
---- a/src/MaxLenTest.hs
-+++ b/src/MaxLenTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- 
- module MaxLenTest (specsWith, maxlenMigrate) where
---- a/src/MigrationColumnLengthTest.hs
-+++ b/src/MigrationColumnLengthTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationColumnLengthTest where
- 
- import qualified Data.Text as T
---- a/src/MigrationIdempotencyTest.hs
-+++ b/src/MigrationIdempotencyTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationIdempotencyTest where
- 
- import qualified Data.Text as T
---- a/src/MigrationOnlyTest.hs
-+++ b/src/MigrationOnlyTest.hs
-@@ -1,5 +1,8 @@
- {-# LANGUAGE UndecidableInstances #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationOnlyTest (specsWith, migrateAll1, migrateAll2) where
- 
- import qualified Data.Text as T
---- a/src/MigrationTest.hs
-+++ b/src/MigrationTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module MigrationTest where
- 
- import Database.Persist.TH
---- a/src/PersistUniqueTest.hs
-+++ b/src/PersistUniqueTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module PersistUniqueTest where
- 
- import Init
---- a/src/PersistentTestModels.hs
-+++ b/src/PersistentTestModels.hs
-@@ -1,6 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-} -- FIXME
-+{-# LANGUAGE DerivingStrategies #-}
- module PersistentTestModels where
- 
- import Data.Aeson
---- a/src/PrimaryTest.hs
-+++ b/src/PrimaryTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module PrimaryTest where
- 
- import Init
---- a/src/Recursive.hs
-+++ b/src/Recursive.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module Recursive (specsWith, recursiveMigrate, cleanup) where
- 
---- a/src/RenameTest.hs
-+++ b/src/RenameTest.hs
-@@ -1,4 +1,7 @@
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module RenameTest where
- 
- import qualified Data.Map as Map
---- a/src/SumTypeTest.hs
-+++ b/src/SumTypeTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE StandaloneDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# OPTIONS_GHC -Wno-unused-top-binds #-}
- module SumTypeTest (specsWith, sumTypeMigrate) where
- 
---- a/src/TransactionLevelTest.hs
-+++ b/src/TransactionLevelTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- 
- module TransactionLevelTest where
- 
---- a/src/TreeTest.hs
-+++ b/src/TreeTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-} -- FIXME
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module TreeTest where
- 
- import Database.Persist.TH (mkDeleteCascade)
---- a/src/UniqueTest.hs
-+++ b/src/UniqueTest.hs
-@@ -1,5 +1,7 @@
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
- {-# LANGUAGE UndecidableInstances #-}
-+{-# LANGUAGE DerivingStrategies #-}
-+{-# LANGUAGE StandaloneDeriving #-}
- module UniqueTest where
- 
- import Init
diff --git a/dev-haskell/persistent-test/metadata.xml b/dev-haskell/persistent-test/metadata.xml
index 06a1d4de2257..4a15004563ed 100644
--- a/dev-haskell/persistent-test/metadata.xml
+++ b/dev-haskell/persistent-test/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild b/dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild
deleted file mode 100644
index 31a319f723d7..000000000000
--- a/dev-haskell/persistent-test/persistent-test-2.0.3.0.ebuild
+++ /dev/null
@@ -1,47 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tests for Persistent"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
-	>=dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/conduit-1.2.12:=[profile?]
-	>=dev-haskell/exceptions-0.8:=[profile?]
-	>=dev-haskell/hspec-2.4:=[profile?]
-	dev-haskell/hspec-expectations:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/monad-logger-0.3.25:=[profile?]
-	>=dev-haskell/path-pieces-0.2:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/persistent-template:=[profile?]
-	>=dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/quickcheck-instances-0.3:=[profile?]
-	>=dev-haskell/random-1.1:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unliftio:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
-
-PATCHES=("${FILESDIR}"/${P}-new-exts.patch)
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
new file mode 100644
index 000000000000..8bac9b253e70
--- /dev/null
+++ b/dev-haskell/persistent-test/persistent-test-2.13.1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tests for Persistent"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/conduit-1.2.12:=[profile?]
+	>=dev-haskell/hspec-2.4:=[profile?]
+	dev-haskell/hspec-expectations:=[profile?]
+	dev-haskell/http-api-data:=[profile?]
+	dev-haskell/hunit:=[profile?]
+	dev-haskell/monad-control:=[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:=[profile?]
+	>=dev-haskell/quickcheck-instances-0.3:=[profile?]
+	>=dev-haskell/random-1.1:=[profile?]
+	>=dev-haskell/resourcet-1.1:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+"
diff --git a/dev-haskell/persistent/Manifest b/dev-haskell/persistent/Manifest
index 10285fc1bfff..44f03fce73dc 100644
--- a/dev-haskell/persistent/Manifest
+++ b/dev-haskell/persistent/Manifest
@@ -1,3 +1,3 @@
-DIST persistent-2.1.6.tar.gz 42889 BLAKE2B 73b5235cca8104b4d10cb87f8ec3faea4f4b4c48b017b5b6a44fbf50cd955b9446e6fccc91a1a7572f9e480270436723316e1c4ed25a8ee9b5399390ff4d8757 SHA512 b1de69547d252a142bce18b837b37be60cc384172473f08dc0d7826dc82f7ce879bb7e0860d31e5c8dadab78992f2c84766bdc804f6ca06b29fa5e7f8391273e
-DIST persistent-2.10.5.2.tar.gz 72570 BLAKE2B fb5fe4704076e66b6aa24615e4faa14803879b18da6dc972f7f05a5ecc27435ee4e7f46376a2082bb327b189db4cc51aa04f673ffc8df46d8b85a56e2c26b111 SHA512 5d7fe9259d89ab210bd136d9f9b0f3e52d48825a003cc02dfb01f50457324daf2c8659b9123cc0e958b636613fa61004f649f97980c6a5427d425656ceb166f1
-DIST persistent-2.6.tar.gz 50030 BLAKE2B 434b452c55339acf3ebc5631d6038b1e875959b7b867f033d2d55b72a2cbcc536c999e25bfc1ee6326f93e2c3a730c8a9a781c4677a44a55648edd32951db6ac SHA512 39fe1ec0c959ca0ec9c37feda8b2e4d4ddd706ae2bd4de9c4161db02c85747475f5a61d5daa3ef73f4adc061e13ff138edcbe34fe1baeb93512c1fe68053a282
+DIST persistent-2.14.0.3.tar.gz 171536 BLAKE2B 2659ebf0acd64a4dde77f8d17f0081676a4215093eaace2f847d8aa7bff736535ca15fe0a7b023a4ec145f4091fa4f3ae9b9dc3b8a77086b44d61d6968ad006b SHA512 63256b0a4e32f5b229e4924f787db3ffa18f40b4101c4610ea51311d6f0b5ac295abfea632bc8cf095de858f19bfe0649c2d2c07289e50ac845e6c945ac172ba
+DIST persistent-2.14.5.1-rev1.cabal 7162 BLAKE2B 99345333efb85d4308a882c4ad292cf6d52e53340540c88a2d5a61cd2cf0799e28c4081b466cf7f33313b4c5609b7409e6d549a1b71c85e492a41cce19036088 SHA512 3f1b880c3cff83e6094bd62879bb5b0e0d3f0c94c68b5f4e2596c64fc5603a53ea5f10b6128e300be7183fdfd133a34da720149e8d3e83581b377462c24c8995
+DIST persistent-2.14.5.1.tar.gz 175205 BLAKE2B d064d07b90e29c0b738962e537da433444d25a2688013034e4b22de3ae45735600e707d036cebdd565eb32f69ce0d184573832e33d17bde6d9811b7192915326 SHA512 a3969142f77d9fc54a0e73ac54b53a96de0b93fadf67326f6b8d9fdb668fc4acf78eece4502cc557873b011e2191fc1607836a5aa0d5d287e79820c0bf6e90a4
diff --git a/dev-haskell/persistent/metadata.xml b/dev-haskell/persistent/metadata.xml
index 1d312dd3e939..f8895bd89e6f 100644
--- a/dev-haskell/persistent/metadata.xml
+++ b/dev-haskell/persistent/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library provides just the general interface and helper functions. You must use a specific backend in order to make this useful.
-	</longdescription>
-	<use>
-		<flag name="nooverlap">Use OverlappingInstances only for String. Only developers should use this.</flag>
-	</use>
+	<upstream>
+		<remote-id type="hackage">persistent</remote-id>
+		<remote-id type="github">yesodweb/persistent</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/persistent/persistent-2.1.6.ebuild b/dev-haskell/persistent/persistent-2.1.6.ebuild
deleted file mode 100644
index ce72657ecd53..000000000000
--- a/dev-haskell/persistent/persistent-2.1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, multi-backend data serialization"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="nooverlap"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.1:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/monad-logger-0.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/path-pieces-0.1:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/silently:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-haskell/transformers-0.2.1:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag nooverlap nooverlap)
-}
diff --git a/dev-haskell/persistent/persistent-2.10.5.2.ebuild b/dev-haskell/persistent/persistent-2.10.5.2.ebuild
deleted file mode 100644
index 1bbbd221307b..000000000000
--- a/dev-haskell/persistent/persistent-2.10.5.2.ebuild
+++ /dev/null
@@ -1,49 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, multi-backend data serialization"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="nooverlap"
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/conduit-1.2.12:=[profile?]
-	>=dev-haskell/fast-logger-2.4:=[profile?]
-	>=dev-haskell/http-api-data-0.3:=[profile?]
-	>=dev-haskell/monad-logger-0.3.28:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/path-pieces-0.2:=[profile?]
-	>=dev-haskell/resource-pool-0.2.3:=[profile?]
-	>=dev-haskell/resourcet-1.1.10:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/silently:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	dev-haskell/unliftio:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( >=dev-haskell/hspec-2.4 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag nooverlap nooverlap)
-}
diff --git a/dev-haskell/persistent/persistent-2.14.0.3.ebuild b/dev-haskell/persistent/persistent-2.14.0.3.ebuild
new file mode 100644
index 000000000000..0f9ad39d2eaf
--- /dev/null
+++ b/dev-haskell/persistent/persistent-2.14.0.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: -nooverlap
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe, multi-backend data serialization"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/conduit-1.2.12:=[profile?]
+	>=dev-haskell/fast-logger-2.4:=[profile?]
+	>=dev-haskell/http-api-data-0.3:=[profile?]
+	>=dev-haskell/lift-type-0.1.0.0:=[profile?] <dev-haskell/lift-type-0.2.0.0:=[profile?]
+	>=dev-haskell/monad-logger-0.3.28:=[profile?]
+	>=dev-haskell/path-pieces-0.2:=[profile?]
+	>=dev-haskell/resource-pool-0.2.3:=[profile?]
+	>=dev-haskell/resourcet-1.1.10:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/silently:=[profile?]
+	>=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vault:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2.4
+		dev-haskell/quickcheck
+		>=dev-haskell/quickcheck-instances-0.3
+		dev-haskell/shakespeare )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-nooverlap
+}
diff --git a/dev-haskell/persistent/persistent-2.14.5.1.ebuild b/dev-haskell/persistent/persistent-2.14.5.1.ebuild
new file mode 100644
index 000000000000..26db569711a4
--- /dev/null
+++ b/dev-haskell/persistent/persistent-2.14.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -nooverlap
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type-safe, multi-backend data serialization"
+HOMEPAGE="https://www.yesodweb.com/book/persistent"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/fast-logger-2.4:=[profile?]
+	>=dev-haskell/http-api-data-0.3:=[profile?]
+	>=dev-haskell/lift-type-0.1.0.0:=[profile?] <dev-haskell/lift-type-0.2.0.0:=[profile?]
+	>=dev-haskell/monad-logger-0.3.28:=[profile?]
+	>=dev-haskell/path-pieces-0.2:=[profile?]
+	>=dev-haskell/resource-pool-0.2.3:=[profile?]
+	>=dev-haskell/resourcet-1.1.10:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/silently:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/th-lift-instances-0.1.14:=[profile?] <dev-haskell/th-lift-instances-0.2:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vault:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hspec-2.4
+		dev-haskell/quickcheck
+		>=dev-haskell/quickcheck-instances-0.3
+		dev-haskell/shakespeare )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-nooverlap
+}
diff --git a/dev-haskell/persistent/persistent-2.6-r1.ebuild b/dev-haskell/persistent/persistent-2.6-r1.ebuild
deleted file mode 100644
index c35276b2964d..000000000000
--- a/dev-haskell/persistent/persistent-2.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type-safe, multi-backend data serialization"
-HOMEPAGE="https://www.yesodweb.com/book/persistent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="nooverlap"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.1:=[profile?]
-	>=dev-haskell/http-api-data-0.2:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?]
-	>=dev-haskell/monad-logger-0.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	>=dev-haskell/path-pieces-0.1:=[profile?]
-	>=dev-haskell/resource-pool-0.2.2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/silently:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/http-api-data-0.2 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'http-api-data            >= 0.2       && < 0.3' 'http-api-data            >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag nooverlap nooverlap)
-}
diff --git a/dev-haskell/pgp-wordlist/Manifest b/dev-haskell/pgp-wordlist/Manifest
index 08f42a1c930d..0424e2ee7ad9 100644
--- a/dev-haskell/pgp-wordlist/Manifest
+++ b/dev-haskell/pgp-wordlist/Manifest
@@ -1,2 +1 @@
-DIST pgp-wordlist-0.1.0.2.tar.gz 10142 BLAKE2B 6a4efe0e495a3755b19a8bf49f5fd0e44853a77bec5c9731a4fb0ba9ea2da524d737b7580baebb1aa1bd6e8df40c4584f8e5aca57b95d67e5a4936a66a8a761e SHA512 c34d565b043d6ffb3fee10258fb30596ae08e5c4d57bf8d129f49b4794daf13ae55fae7f648f218821133a824f2abb66a8b5f02b10a9e11f4529007b1a4620b3
 DIST pgp-wordlist-0.1.0.3.tar.gz 10143 BLAKE2B f6523be71399c90e6248b583f5e68a2ad51069d3ecf62609aac09e289a799c15e4f30241cc558f070fae7d68990e1dd4ddd2fd7a30e046902405c7e19189eeea SHA512 b7c6db47c1f9a0b10c5c94ea46b8eee282988e5990ef3dafa2d07a5bfc0718572b04494d23ddab063811ef2452546d6b17010c6490a89031f4b071f1a43d989b
diff --git a/dev-haskell/pgp-wordlist/metadata.xml b/dev-haskell/pgp-wordlist/metadata.xml
index 36a5661f1120..9fe7cea78594 100644
--- a/dev-haskell/pgp-wordlist/metadata.xml
+++ b/dev-haskell/pgp-wordlist/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -15,9 +15,12 @@
 		them at each byte.
 		
 		The PGP words corresponding to the bytes @5B 1D CA 6E@
-		are &quot;erase breakaway spellbind headwaters&quot;, for example.
+		are "erase breakaway spellbind headwaters", for example.
 		
 		For further information, see
 		&lt;http://en.wikipedia.org/wiki/PGP_word_list Wikipedia&gt;.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">quchen/pgp-wordlist</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild
deleted file mode 100644
index 5318b7274414..000000000000
--- a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Translate between binary data and a human-readable collection of words"
-HOMEPAGE="https://github.com/quchen/pgp-wordlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/doctest-0.10
-		dev-haskell/hunit
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild
index 38991ca8a028..90f3843d10b6 100644
--- a/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild
+++ b/dev-haskell/pgp-wordlist/pgp-wordlist-0.1.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT=test # ambiguous packages: AC-Vector-Fancy vector
diff --git a/dev-haskell/pid1/Manifest b/dev-haskell/pid1/Manifest
deleted file mode 100644
index 4dad0bb1c43a..000000000000
--- a/dev-haskell/pid1/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pid1-0.1.0.1.tar.gz 5677 BLAKE2B bddf32fa3c1d777a4b05977ca0ae806beddd1205998f333c958ffd57ef3bd076701d866648a45c085fe84bb8abf59cf64b879f476ccb80be66989197140586db SHA512 9cf7953d35d230162307c656351f4d552c2d137b54b0cdc8f5bcb07ab6a77aadb903cd968961fbf8b25fa7b9375e149f21e67af3d57713d3dde1d8c8d9df970f
-DIST pid1-0.1.2.0.tar.gz 7289 BLAKE2B 449f309a21c16e97e6cd7e33c91469bc27241312aeb33efe78016a62bf180490b8146a5390b308a0149d06b4bac071707a88146ecb46c17b04723e05b30adf28 SHA512 92d639637d13ad2cd4db2e4c5a0858ebd2fb6784b5826e4446b0a873e193a614e960a3fce8353742fd7439a93c9af309b254b55cf1b32f43620199a93864b729
diff --git a/dev-haskell/pid1/metadata.xml b/dev-haskell/pid1/metadata.xml
deleted file mode 100644
index f1430f9dafe6..000000000000
--- a/dev-haskell/pid1/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md or view Haddocks at &lt;https://www.stackage.org/package/pid1&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pid1/pid1-0.1.0.1.ebuild b/dev-haskell/pid1/pid1-0.1.0.1.ebuild
deleted file mode 100644
index 543bad334146..000000000000
--- a/dev-haskell/pid1/pid1-0.1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Do signal handling and orphan reaping for Unix PID1 init processes"
-HOMEPAGE="https://github.com/fpco/pid1#readme"
-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.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/pid1/pid1-0.1.2.0.ebuild b/dev-haskell/pid1/pid1-0.1.2.0.ebuild
deleted file mode 100644
index 857d0309bd11..000000000000
--- a/dev-haskell/pid1/pid1-0.1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Do signal handling and orphan reaping for Unix PID1 init processes"
-HOMEPAGE="https://github.com/fpco/pid1#readme"
-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.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/pipes/Manifest b/dev-haskell/pipes/Manifest
deleted file mode 100644
index d5b7a0779387..000000000000
--- a/dev-haskell/pipes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pipes-4.1.7.tar.gz 40008 BLAKE2B 88ed7685da4640d62d5065fe04065477191526990d517376a7cff8c97cbbcf939db5b062e45fe23f15b65f9fcca97d2f30be078354b47109e6d418f7055e2073 SHA512 95e4a24c156d34ac542a3535f71b60248850b228e96f90452dd6ddb1468f2f9db7a60540536568ac49b6a49d3b43caefa867c42d5e75f010e90b99fadf02827c
-DIST pipes-4.1.9.tar.gz 40061 BLAKE2B 038ebcb31bf85d79bc4dd0eff36b7c4265db81e70c58403dc3d2b5609453aad0b8e026428a6466905801f961b8267f111dee082b2ca00020f5dc305fbf2edd9e SHA512 4d285ff4ded925df8611f4e1882b4f29f4853aa8077892cfbbda245d455eea7bbf0969299dc65fd2a793655e69bf66463c330dfe7736a8f234f330b5dd4ab751
-DIST pipes-4.3.14.tar.gz 42576 BLAKE2B 2d14d39f615965eb27d8c2a1bc92bc6e306bf5604760939121de74bd7752825f646e0f55e3c044f31b937357e97a2a1633f7fea6434b1a12522618d77df08559 SHA512 4dac195772876c62d187a123c99ec2c624ce9f5b4c8ea8de9621d01c4eaaaf99a2f856a2c9faf94ec35c531df29f0e82aa9015ad8dd4eb2b2d7478a0da4bacf5
diff --git a/dev-haskell/pipes/metadata.xml b/dev-haskell/pipes/metadata.xml
deleted file mode 100644
index 04e0c63037a8..000000000000
--- a/dev-haskell/pipes/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		\"Coroutines done right\".  This library generalizes iteratees and coroutines
-		simply and elegantly.
-		
-		Advantages over traditional iteratee\/coroutine implementations:
-		
-		* /Concise API/: Use three simple commands: ('&gt;-&gt;'), 'request', and 'respond'
-		
-		* /Bidirectionality/: Implement duplex channels
-		
-		* /Blazing fast/: Implementation tuned for speed
-		
-		* /Elegant semantics/: Use practical category theory
-		
-		* /Extension Framework/: Mix and match extensions and create your own
-		
-		* /ListT/: Correct implementation of ListT that interconverts with pipes
-		
-		* /Lightweight Dependency/: @pipes@ depends only on @transformers@ and
-		@mmorph@ and compiles rapidly
-		
-		* /Extensive Documentation/: Second to none!
-		
-		Import "Control.Proxy" to use the library.
-		
-		Read "Control.Proxy.Tutorial" for an extensive tutorial.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pipes/pipes-4.1.7.ebuild b/dev-haskell/pipes/pipes-4.1.7.ebuild
deleted file mode 100644
index 6b9dc6688fbd..000000000000
--- a/dev-haskell/pipes/pipes-4.1.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compositional pipelines"
-HOMEPAGE="https://hackage.haskell.org/package/pipes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1
-		>=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pipes/pipes-4.1.9.ebuild b/dev-haskell/pipes/pipes-4.1.9.ebuild
deleted file mode 100644
index 1172e74c3948..000000000000
--- a/dev-haskell/pipes/pipes-4.1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compositional pipelines"
-HOMEPAGE="https://hackage.haskell.org/package/pipes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mmorph-1.0.0:=[profile?] <dev-haskell/mmorph-1.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1
-		>=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pipes/pipes-4.3.14.ebuild b/dev-haskell/pipes/pipes-4.3.14.ebuild
deleted file mode 100644
index ed93c1e1aa96..000000000000
--- a/dev-haskell/pipes/pipes-4.3.14.ebuild
+++ /dev/null
@@ -1,33 +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.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Compositional pipelines"
-HOMEPAGE="http://hackage.haskell.org/package/pipes"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.4:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mmorph-1.0.4:=[profile?] <dev-haskell/mmorph-1.2:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-1
-		>=dev-haskell/test-framework-quickcheck2-0.2.0 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pointed/Manifest b/dev-haskell/pointed/Manifest
deleted file mode 100644
index 133713ac8984..000000000000
--- a/dev-haskell/pointed/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pointed-4.0.tar.gz 3123 BLAKE2B dc99ed4dcb4421ae2aa677493edae00682e36dca5d8ab51d65aa046414a88e3379199dc5062805155b4d0e3b47757d3d788294ef016b4048c0e2c230b17a16f8 SHA512 08aa3753b2d642c4ab72bef0baa2a80daa30b5f545b74536601f1353b9ea22ba17622ff86aafa5351de7dd1edbc89e79bf58ea63b500133aedd48626a9ba7290
-DIST pointed-4.1.1.tar.gz 3253 BLAKE2B 65d3d89dab2a6982623b195b8dd15ee119b1af58da50cb878500d73a58de2269dc4d68a062b71627fc5185bdbe1106eb0586899f873348f1b29155ea814ac206 SHA512 8106c82a3011644ea1bcb18d592e40fa372298e4f7d81a9f23b57b38905f6733377822c574c17630c55c4f91eda77b020f33e1a603f2c2aa22431eedb3677e8c
-DIST pointed-4.2.0.2.tar.gz 4333 BLAKE2B 314f6b05eab009c2c3608ea99b39635509ecfe283247e565aab93f5ff07527d3ca124ad9e8ee9c09eb7b47094f56b032a0b3bbdf17973c4ec857271292fa844f SHA512 bf493138c54d7fef6524d01ee84709d0ab6378870f7e801df62b0ac425899c6113cf9ba93776a1693d544d8d14d553dfa26a0194997a19c80931c5500ef2ee7c
-DIST pointed-5.0.1.tar.gz 7020 BLAKE2B 33ec035004a047c3244f2444239d28a63c85f9e9f7a1c0056e589b6ce7e917a238fe0b8e3b6a41930029d978e635f7fcd5db8df42e050f2806fb6c6f2310d236 SHA512 65958628c983a2c2866b1a1a615c7a7f2f516068c667ce9b93f4214b863632b40eba4915d49e07388c52ced8868bb308b24e7b38a6f50563c68954696748c99b
-DIST pointed-5.tar.gz 4873 BLAKE2B a2dadf1f386d8751334c19a1e8a525001a9907ccce912bd0b3bef5e9fafc7d4e62139fd2e34426d995ad72eefe6843ac37959e0ff889f4c40d0bb8c0ab9ad227 SHA512 940a0c30845cb39238a0056f12da4debb488bec9bfac11a384320c79102e92dbd949526188eca46a2e543dfe612f5ee335955413e4f81eb1c1c9bc321805b598
diff --git a/dev-haskell/pointed/metadata.xml b/dev-haskell/pointed/metadata.xml
deleted file mode 100644
index 111317520feb..000000000000
--- a/dev-haskell/pointed/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="comonad">optional instances</flag>
-		<flag name="containers">optional instances</flag>
-		<flag name="kan-extensions">optional instances</flag>
-		<flag name="semigroupoids">optional instances</flag>
-		<flag name="semigroups">optional instances</flag>
-		<flag name="stm">optional instances</flag>
-		<flag name="tagged">optional instances</flag>
-		<flag name="transformers">optional instances</flag>
-		<flag name="unordered-containers">optional instances</flag>
-	</use>
-	<longdescription>
-		Haskell 98 pointed and copointed data
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/pointed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pointed/pointed-4.0.ebuild b/dev-haskell/pointed/pointed-4.0.ebuild
deleted file mode 100644
index 63ae2203e9bb..000000000000
--- a/dev-haskell/pointed/pointed-4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
diff --git a/dev-haskell/pointed/pointed-4.1.1.ebuild b/dev-haskell/pointed/pointed-4.1.1.ebuild
deleted file mode 100644
index 1814a3b98eb9..000000000000
--- a/dev-haskell/pointed/pointed-4.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pointed/pointed-4.2.0.2.ebuild b/dev-haskell/pointed/pointed-4.2.0.2.ebuild
deleted file mode 100644
index 912d89374160..000000000000
--- a/dev-haskell/pointed/pointed-4.2.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/kan-extensions-4.2:=[profile?] <dev-haskell/kan-extensions-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pointed/pointed-5-r1.ebuild b/dev-haskell/pointed/pointed-5-r1.ebuild
deleted file mode 100644
index 9b2628470c30..000000000000
--- a/dev-haskell/pointed/pointed-5-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers"
-
-RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] )
-	kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] )
-	semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] )
-	semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-	transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-			>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
-	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-				>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'data-default-class >= 0.0.1 && < 0.1' 'data-default-class >= 0.0.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag kan-extensions kan-extensions) \
-		$(cabal_flag semigroupoids semigroupoids) \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag stm stm) \
-		$(cabal_flag tagged tagged) \
-		$(cabal_flag transformers transformers) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/pointed/pointed-5.0.1-r1.ebuild b/dev-haskell/pointed/pointed-5.0.1-r1.ebuild
deleted file mode 100644
index 8418d1ddd1c3..000000000000
--- a/dev-haskell/pointed/pointed-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pointed and copointed data"
-HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers"
-
-RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] )
-	kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] )
-	semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] )
-	semigroups? ( >=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
-	stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-	transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
-	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-				>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'containers >= 0.4 && < 0.6' 'containers >= 0.4' \
-		'stm >= 2.1.2.1 && < 2.5' 'stm >= 2.1.2.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag kan-extensions kan-extensions) \
-		$(cabal_flag semigroupoids semigroupoids) \
-		$(cabal_flag semigroups semigroups) \
-		$(cabal_flag stm stm) \
-		$(cabal_flag tagged tagged) \
-		$(cabal_flag transformers transformers) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/polyparse/Manifest b/dev-haskell/polyparse/Manifest
deleted file mode 100644
index 5f47d615a133..000000000000
--- a/dev-haskell/polyparse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST polyparse-1.11.tar.gz 22978 BLAKE2B 22154655fb090234223189f9f25e871c73f478ee3681313654d737930d594c9a378fa1d259ff4cdbe93d2df5a8ac79104ee12b9efed7e9fdf1caf6ad269ab988 SHA512 b2cecc633596caaa2b8a00ceb16f141cd69de9ec697ce53cd827a17c82cac70ffaf10bc1d8669156ed4d28589b11ac56820b5c02905c8a6bdcae65112126fa5e
-DIST polyparse-1.13.tar.gz 33144 BLAKE2B 0b142e4e82df045d838861124b204c06bfc62e642ea8a6a88697be0312df2a33998984a7e85ded35e4a0bb5eec304447b66a0d61dab196db32e63843a4b3e1cc SHA512 3b66a73f97d6b5b6628193f87cae1ae1a68d63df0058532b2ac9a62af82dabe28e15fe1464075a2f436e70a7d20b57e72fdd7831f8b11035ff8117becb08d18e
-DIST polyparse-1.9.tar.gz 22256 BLAKE2B 01f2280db5d966d86450b4a3ae352e1ba911c1d7b116e6e94cd182c6d49c4b43e6d52f264097b4e8c87867bd535140b18c04a445ee9ab60f9296e1a15bcdeb0f SHA512 80f7cc269c7082d256aa273ce668a8fd9f58b4827fa69e390d749a622d667d5c01b7ede3719d52408d3efa35de66928a3fa659f3798826a2d53222d8a8d9d7e6
diff --git a/dev-haskell/polyparse/metadata.xml b/dev-haskell/polyparse/metadata.xml
deleted file mode 100644
index c662f542cdfb..000000000000
--- a/dev-haskell/polyparse/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A variety of alternative parser combinator libraries, including
-		the original HuttonMeijer set.  The Poly sets have features like
-		good error reporting, arbitrary token type, running state, lazy
-		parsing, and so on.  Finally, Text.Parse is a proposed
-		replacement for the standard Read class, for better
-		deserialisation of Haskell values from Strings.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/polyparse/polyparse-1.11.ebuild b/dev-haskell/polyparse/polyparse-1.11.ebuild
deleted file mode 100644
index 2e22ff00fd55..000000000000
--- a/dev-haskell/polyparse/polyparse-1.11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A variety of alternative parser combinator libraries"
-HOMEPAGE="http://code.haskell.org/~malcolm/polyparse/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/polyparse/polyparse-1.13.ebuild b/dev-haskell/polyparse/polyparse-1.13.ebuild
deleted file mode 100644
index 56e5391cec99..000000000000
--- a/dev-haskell/polyparse/polyparse-1.13.ebuild
+++ /dev/null
@@ -1,33 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A variety of alternative parser combinator libraries"
-HOMEPAGE="http://code.haskell.org/~malcolm/polyparse/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.3.1.0 && < 4.14' 'base >= 4.3.1.0'
-}
diff --git a/dev-haskell/polyparse/polyparse-1.9.ebuild b/dev-haskell/polyparse/polyparse-1.9.ebuild
deleted file mode 100644
index 4ee88b42f7eb..000000000000
--- a/dev-haskell/polyparse/polyparse-1.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A variety of alternative parser combinator libraries"
-HOMEPAGE="http://code.haskell.org/~malcolm/polyparse/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/pqueue/Manifest b/dev-haskell/pqueue/Manifest
deleted file mode 100644
index 2b3f358bd722..000000000000
--- a/dev-haskell/pqueue/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pqueue-1.3.2.tar.gz 22880 BLAKE2B cb486d83e8e293031871206e083d2d9bc1ea7066a8c7bb62703073abc55bb0f272a79890c7a480aefe7b56ce8fa19e3ccfc603d105fbfda965ba1d2854b88266 SHA512 1b3123083717de071593d0223ed1ba2d041b60acdf2e4effe6d337adcdaec26b5327b511f6d8e03cdfd365e81fe2b2856ece0e2e4e7c761c6b54e41896fe0fec
-DIST pqueue-1.4.1.3.tar.gz 23396 BLAKE2B 13b745070d8102ecbcf5fc74ad8adfa8fd470915567b85db80498c2e241a2a31edb2645adfd2a11a6644e257085be1421f26034f47a85443718060ba597f1160 SHA512 e1d77cdb034530891d03e44bb4aa02e3383e5659c61637c8821a94983f7ce42e0a10aa7480cb12774ac4dec4ff93a55f1a6f8baf4f4604ac52b1135d0c055163
diff --git a/dev-haskell/pqueue/metadata.xml b/dev-haskell/pqueue/metadata.xml
deleted file mode 100644
index e91b1155edc7..000000000000
--- a/dev-haskell/pqueue/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A fast, reliable priority queue implementation based on a binomial heap.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pqueue/pqueue-1.3.2.ebuild b/dev-haskell/pqueue/pqueue-1.3.2.ebuild
deleted file mode 100644
index 408fce4c266f..000000000000
--- a/dev-haskell/pqueue/pqueue-1.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reliable, persistent, fast priority queues"
-HOMEPAGE="https://hackage.haskell.org/package/pqueue"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pqueue/pqueue-1.4.1.3.ebuild b/dev-haskell/pqueue/pqueue-1.4.1.3.ebuild
deleted file mode 100644
index dcf18b5bc265..000000000000
--- a/dev-haskell/pqueue/pqueue-1.4.1.3.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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reliable, persistent, fast priority queues"
-HOMEPAGE="http://hackage.haskell.org/package/pqueue"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3 )
-"
diff --git a/dev-haskell/prelude-extras/Manifest b/dev-haskell/prelude-extras/Manifest
deleted file mode 100644
index 1164933580e1..000000000000
--- a/dev-haskell/prelude-extras/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prelude-extras-0.4.0.3.tar.gz 8141 BLAKE2B 3889146248c758595ccc4dc3a63b31154ee1c412c9f6112b6362fa57aa456184f6121c153553f909436f782c1f6bcea7650f0b5e0c4f72cd18423ebf7a5e041c SHA512 a8a934166ede50654035075978fbd7406245c38d38c2bc90b9349522f93ba2d6a1bd77d8bba3ac47d819c767d15a3f3f6b663defba7a108f8e2f494709b8f76b
diff --git a/dev-haskell/prelude-extras/metadata.xml b/dev-haskell/prelude-extras/metadata.xml
deleted file mode 100644
index 56725aa37ca5..000000000000
--- a/dev-haskell/prelude-extras/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Haskell 98 - higher order versions of Prelude classes to ease programming with polymorphic recursion and reduce UndecidableInstances
-		
-		See &lt;http://flint.cs.yale.edu/trifonov/papers/sqcc.pdf&gt; for further discussion of the approach taken here.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/prelude-extras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild b/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
deleted file mode 100644
index 5883be8779dc..000000000000
--- a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Higher order versions of Prelude classes"
-HOMEPAGE="https://github.com/ekmett/prelude-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/preprocessor-tools/Manifest b/dev-haskell/preprocessor-tools/Manifest
deleted file mode 100644
index 32663e9ecd1e..000000000000
--- a/dev-haskell/preprocessor-tools/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST preprocessor-tools-1.0.1.tar.gz 9895 BLAKE2B 5ca349188749a776ff203645f14f46d4f613d30c0ba48833426735cc27642b0f7bd85ffa3937396b5cb49df4a3b569388c304c6ea8942764fbc269da3f3fa5d1 SHA512 b039c763eda293950a73c089903bbc2f447b92740077c042a764c2523db581450c96e3fda7ae177336d96626283283843c93006eca73d02951ca9067a3b12665
-DIST preprocessor-tools-2.0.2.tar.gz 9892 BLAKE2B bebe957c2c312a166bda3b973eede491a6604cedcd1a82e78455298f9074701324b98b4b8c0c469299cd69829167e1c05535db2f7328f2f6fe6c5eb32d14b9d7 SHA512 7a88f62aa06cca5234e6e6eae68ddfb8790023f0f090412164eb1728dd6c3c409c665498e00f5b19f2e6765a3e4eaca205590605c4b88bf7164890e449edb1fa
diff --git a/dev-haskell/preprocessor-tools/metadata.xml b/dev-haskell/preprocessor-tools/metadata.xml
deleted file mode 100644
index eacaa677fc98..000000000000
--- a/dev-haskell/preprocessor-tools/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides a quick-and-dirty (but often effective)
-		method for extending Haskell's syntax using a custom
-		preprocessor.  It parses Haskell into a bare-bones AST with just
-		enough knowledge of the syntax to preserve nesting, and then
-		allows transformations on the AST.
-		
-		See the package ixdopp
-		(&lt;http://hackage.haskell.org/cgi-bin/hackage-scripts/package/ixdopp&gt;)
-		for an example of how to do this.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild b/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
deleted file mode 100644
index e1e9949785f3..000000000000
--- a/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A framework for extending Haskell's syntax via quick-and-dirty preprocessors"
-HOMEPAGE="https://hackage.haskell.org/package/preprocessor-tools"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
diff --git a/dev-haskell/preprocessor-tools/preprocessor-tools-2.0.2.ebuild b/dev-haskell/preprocessor-tools/preprocessor-tools-2.0.2.ebuild
deleted file mode 100644
index 9a9a7e2627a0..000000000000
--- a/dev-haskell/preprocessor-tools/preprocessor-tools-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A framework for extending Haskell's syntax via quick-and-dirty preprocessors"
-HOMEPAGE="https://github.com/tov/preprocessor-tools-hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc 8.4
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/syb-0:=[profile?] <dev-haskell/syb-1:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-"
diff --git a/dev-haskell/pretty-hex/Manifest b/dev-haskell/pretty-hex/Manifest
index 7afc93878430..040fbe7fccf6 100644
--- a/dev-haskell/pretty-hex/Manifest
+++ b/dev-haskell/pretty-hex/Manifest
@@ -1 +1,2 @@
 DIST pretty-hex-1.0.tar.gz 2950 BLAKE2B 7fd2049eb42e4e596a54207820d66874620554e72d8f3dae48f5f42b7be089e2b9fe9c9e318a5b13fa4448630a54a7aab3eff593882e6e8df1ed2466a502f35e SHA512 a5ffdecf56b586a23b1243bcace040c7043cc67ced07c5f94d459a2e6a00cade98c70e1480be763ef75946d2aedf87e00d2b653a6f8f23d21cd8e9ab198ea45d
+DIST pretty-hex-1.1.tar.gz 3305 BLAKE2B 833b6056cd8b3ecf0601757cb5b51284e80af613afb81b50a6329fb690d0b8d7d67a263d96ab67794e5bbb17b8dac5b36e39e08e0f1a2b47038f216033f94e66 SHA512 e61223ea492d179e21dd0b26626e6dd32cc24e9e895e27ecedcdc20f70e7ca1db8ef69754a4273a4776d0574570c1d85de6e240f9d3ca0af003bd45416df7c3c
diff --git a/dev-haskell/pretty-hex/metadata.xml b/dev-haskell/pretty-hex/metadata.xml
index 97a6d93130aa..937381521944 100644
--- a/dev-haskell/pretty-hex/metadata.xml
+++ b/dev-haskell/pretty-hex/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library generates pretty hex dumps of ByteStrings in the
-		style of other common *nix hex dump tools.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild b/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
index d6afaf57bcb8..563b7c3e4a57 100644
--- a/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
+++ b/dev-haskell/pretty-hex/pretty-hex-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/pretty-hex/pretty-hex-1.1.ebuild b/dev-haskell/pretty-hex/pretty-hex-1.1.ebuild
new file mode 100644
index 000000000000..ef4d96251f2e
--- /dev/null
+++ b/dev-haskell/pretty-hex/pretty-hex-1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for hex dumps of ByteStrings"
+HOMEPAGE="https://hackage.haskell.org/package/pretty-hex"
+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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/pretty-show/Manifest b/dev-haskell/pretty-show/Manifest
index be81f85d182f..562698bebdf2 100644
--- a/dev-haskell/pretty-show/Manifest
+++ b/dev-haskell/pretty-show/Manifest
@@ -1,4 +1 @@
-DIST pretty-show-1.6.12.tar.gz 133535 BLAKE2B 401ddd8dd47759ad4c1d07249e991ce0843c31cf19f63697a4a042dcc02e1790cbe32f499d2b7f5684658c32185c46d84cd6cae52dad5ba8cf8e0b6ca136378a SHA512 849eeb2d939bad7ea38f706ae69beccb9e033135d152f7ff0e8b214c0ea89cd7c1c9c1ccafa1025d098c145ddaff6c82a36b9e899bb7b8ae549d52d178a59e23
-DIST pretty-show-1.6.8.2.tar.gz 133160 BLAKE2B 2e24b32f3e9c303b2cfbd3bb8ce210365f1f4c2494ec4c3ad1d833367bcd9d6f20995eec448e0bcdf570b0300d9449563d41ec29c7c3cfa097ec516547d3bdf5 SHA512 673b1fe7745e299cd9c547aec90daaf870d13e52c7d78b472a71e5b86e22bcc3cf3ee8a4f0a88826ade20ed59fcbc623254b71485e928fe8f283d28edd7b4a6e
-DIST pretty-show-1.6.9.tar.gz 126196 BLAKE2B 70c14fc324b1c9ec54eafd0e44f5a93b6ee3f37958a10be8129811c65124801915d189f4c5bcea72ce8cda91572f4d7706daddb7ae70304ad1a0d13631916505 SHA512 8205182584a03777cb04b83b8ebe2e92bdb17ee801ff9ff2947a860175f7415375ca1fb7b433448b14898addcd0e86bf0f9e0a53a37254322625698bed9952be
-DIST pretty-show-1.9.5.tar.gz 42378 BLAKE2B 3d8fb41c00aa95049b88c75f0b2c107b6000d837e3761c74bc888b561fcd36b1da21c502cbf8e905b601eda3ed5c2a242a710945cf5aee5e2c4413581ba3788e SHA512 7bf382ad3531227588a82d7bcff3a795df0c425b27d7f4448a94fd617fbc8a4fb6087eb859480fe4702771bf560a353a3a3d5079cd6576c620d5258686c41193
+DIST pretty-show-1.10.tar.gz 42233 BLAKE2B 55a84a5224b61560f0cf527c103393e590d107c1a08ffc76fc9ad1070f60acedeea97630f9a30a04c620604e9912aa22629705c3297785f73a7c00666b197325 SHA512 90ecf41790246c85ee7c738de2bb1a23a56a0a1d547cee627cb0a5f6c2691adfc73851ca0ebc928f3584912bc2b1148b115db03eea271e67f55d6a1466db8711
diff --git a/dev-haskell/pretty-show/metadata.xml b/dev-haskell/pretty-show/metadata.xml
index 9efae39dd8c0..52d472789714 100644
--- a/dev-haskell/pretty-show/metadata.xml
+++ b/dev-haskell/pretty-show/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -12,4 +12,7 @@
 		human-readable versions of 'Show' instances, which can be quite handy for
 		debugging Haskell programs.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">yav/pretty-show</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/pretty-show/pretty-show-1.10.ebuild b/dev-haskell/pretty-show/pretty-show-1.10.ebuild
new file mode 100644
index 000000000000..f0577eb5a34b
--- /dev/null
+++ b/dev-haskell/pretty-show/pretty-show-1.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
+HOMEPAGE="https://github.com/yav/pretty-show"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/haskell-lexer-1.1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	dev-haskell/happy
+"
diff --git a/dev-haskell/pretty-show/pretty-show-1.6.12.ebuild b/dev-haskell/pretty-show/pretty-show-1.6.12.ebuild
deleted file mode 100644
index 1b9b88933c6e..000000000000
--- a/dev-haskell/pretty-show/pretty-show-1.6.12.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
-HOMEPAGE="http://wiki.github.com/yav/pretty-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
diff --git a/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild b/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild
deleted file mode 100644
index 19668aa3ceca..000000000000
--- a/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
-HOMEPAGE="https://wiki.github.com/yav/pretty-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
diff --git a/dev-haskell/pretty-show/pretty-show-1.6.9.ebuild b/dev-haskell/pretty-show/pretty-show-1.6.9.ebuild
deleted file mode 100644
index 1dfa39ef4416..000000000000
--- a/dev-haskell/pretty-show/pretty-show-1.6.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
-HOMEPAGE="http://wiki.github.com/yav/pretty-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
diff --git a/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild b/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild
deleted file mode 100644
index 11370d8d5e0c..000000000000
--- a/dev-haskell/pretty-show/pretty-show-1.9.5.ebuild
+++ /dev/null
@@ -1,27 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Tools for working with derived 'Show' instances and generic inspection of values"
-HOMEPAGE="https://wiki.github.com/yav/pretty-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-"
diff --git a/dev-haskell/prettyclass/Manifest b/dev-haskell/prettyclass/Manifest
deleted file mode 100644
index a1ce5c1b1397..000000000000
--- a/dev-haskell/prettyclass/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prettyclass-1.0.0.0.tar.gz 1542 BLAKE2B b1497565728b2a580f4ff9117a62a2e2013888a07a9893ee207e0392a014373cb17eb9eeff3ce3d30a69dc7d2f5ff6d136e4a00b8bdae3533c8f240658bf6bf4 SHA512 f0785e7780f71ee0f8f6b6ca5db6a82f030f75b34f618ff9ee0025032516114769f4cd4e6094b5fefd13e645a7eece9d87b82c2d4c144dddf5093bc2c600af4a
diff --git a/dev-haskell/prettyclass/metadata.xml b/dev-haskell/prettyclass/metadata.xml
deleted file mode 100644
index 0ca938268b7c..000000000000
--- a/dev-haskell/prettyclass/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Pretty printing class similar to Show, based on the HughesPJ
-		pretty printing library.  Provides the pretty printing class
-		and instances for the Prelude types.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild b/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
deleted file mode 100644
index f4770ed4a2c1..000000000000
--- a/dev-haskell/prettyclass/prettyclass-1.0.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pretty printing class similar to Show"
-HOMEPAGE="https://hackage.haskell.org/package/prettyclass"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
diff --git a/dev-haskell/prettyprinter-ansi-terminal/Manifest b/dev-haskell/prettyprinter-ansi-terminal/Manifest
index de0fdbb50de2..80bf8dc5fc10 100644
--- a/dev-haskell/prettyprinter-ansi-terminal/Manifest
+++ b/dev-haskell/prettyprinter-ansi-terminal/Manifest
@@ -1 +1,2 @@
-DIST prettyprinter-ansi-terminal-1.1.1.2.tar.gz 6378 BLAKE2B 5c8c4a224bb2832f31ce8a52b8cdc35ee84b3e288a38f507f7bec22beb5fa2877c6ea178a60bcf189bca75be1afa35903582614f0a209f4d6f5d8072b3683bda SHA512 b2ac6c76ce6570b285370c9b1a466272aa5a3ba86a9f1de996392d750d212ff62a743e9c3c28f7de7951c9b270d64c97cb695166b65d642751942d682ff1a71b
+DIST prettyprinter-ansi-terminal-1.1.2.tar.gz 8836 BLAKE2B f1220169d02db0927468ba7af922e2631c5a18780edd786d37e0c273043cb3c1c653f70af70ca963a093cf7936284c73f6131d94f8ffaef1f60125e6ab574846 SHA512 6f3f077f3f171b6a2c1ca811d267f5311328cd3538ace0c174dd87960fd2617a6543e4bfe239f231ef68c6cce87ce563d0f2068631c084a1faa56a3e051f3fae
+DIST prettyprinter-ansi-terminal-1.1.3.tar.gz 8879 BLAKE2B 64d796a28cf3ce3930bc2de87643c173ca1b7e26837be1e47807e0eef13be54e830328a18515183cd21544836776f92798606e48007591e01c5fcd22f59f6a2b SHA512 985e965f78c767234b9f30e9cc1590d037e00d211385ebfa833b96f9b9aa092840e2587236d848c66ff1c58c97748f6ae9bd5cc02ea5175aa66d2654392ea1b6
diff --git a/dev-haskell/prettyprinter-ansi-terminal/metadata.xml b/dev-haskell/prettyprinter-ansi-terminal/metadata.xml
index b7878815d80d..7beb07893938 100644
--- a/dev-haskell/prettyprinter-ansi-terminal/metadata.xml
+++ b/dev-haskell/prettyprinter-ansi-terminal/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">prettyprinter-ansi-terminal</remote-id>
+		<remote-id type="github">quchen/prettyprinter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild
deleted file mode 100644
index 726d4606f861..000000000000
--- a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="ANSI terminal backend for the \"prettyprinter\" package"
-HOMEPAGE="https://github.com/quchen/prettyprinter"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
-	>=dev-haskell/prettyprinter-1.1.1:=[profile?]
-	>=dev-haskell/semigroups-0.1:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/doctest-0.9 )
-"
diff --git a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild
new file mode 100644
index 000000000000..fe6d4dbccc86
--- /dev/null
+++ b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ANSI terminal backend for the \"prettyprinter\" package"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
+	>=dev-haskell/prettyprinter-1.1.1:=[profile?]
+	>=dev-haskell/semigroups-0.1:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.3.ebuild b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.3.ebuild
new file mode 100644
index 000000000000..c28dd6963b7c
--- /dev/null
+++ b/dev-haskell/prettyprinter-ansi-terminal/prettyprinter-ansi-terminal-1.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="ANSI terminal backend for the »prettyprinter« package"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
+	>=dev-haskell/prettyprinter-1.7.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/doctest-0.9 )
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/prettyprinter-compat-ansi-wl-pprint/Manifest b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/Manifest
new file mode 100644
index 000000000000..629384f46251
--- /dev/null
+++ b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/Manifest
@@ -0,0 +1 @@
+DIST prettyprinter-compat-ansi-wl-pprint-1.0.2.tar.gz 3894 BLAKE2B 4683b62a44e021a19859c0deb45685b3c93feb17cce81dd5d924882e4e5175b758919188497fa6b3a3b0d4129227392f60d8fd4d9fd51a2ddbc6b80ce2a6ba11 SHA512 06f9f2380e85ed392173fa459e650153d9965346fc39fbfaa09e358150015ab99a8ad529c456b35c4c7e5350242f9c9db11bc1296e384b5f7a5e0de7e93a4300
diff --git a/dev-haskell/prettyprinter-compat-ansi-wl-pprint/metadata.xml b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/metadata.xml
new file mode 100644
index 000000000000..5b373e016290
--- /dev/null
+++ b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">prettyprinter-compat-ansi-wl-pprint</remote-id>
+		<remote-id type="github">quchen/prettyprinter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint-1.0.2.ebuild b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint-1.0.2.ebuild
new file mode 100644
index 000000000000..5979258f7d51
--- /dev/null
+++ b/dev-haskell/prettyprinter-compat-ansi-wl-pprint/prettyprinter-compat-ansi-wl-pprint-1.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Drop-in compatibility package from ansi-wl-pprint to prettyprinter"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/prettyprinter-1.7.0:=[profile?]
+	>=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/prettyprinter/Manifest b/dev-haskell/prettyprinter/Manifest
index 4a538b99a7f5..965b137ff7da 100644
--- a/dev-haskell/prettyprinter/Manifest
+++ b/dev-haskell/prettyprinter/Manifest
@@ -1,2 +1,2 @@
-DIST prettyprinter-1.2.0.1.tar.gz 46373 BLAKE2B 8d71f9dceffd40a228e2911397ecd8cce1ed141f16fbca287b3005693f448c4fb43a974b5ddb7e60d2f33ceed58d69ccd3c6fb4490bff477e3598f414cdc46c6 SHA512 f51e546915d799a07f7b7a60c53f1cd1491535bcad6199341c14aeb96250da85f5527b94ad19e2c297fcf4b02d4561c2eaad1458c4b9c870fb0dcfeb142d9771
-DIST prettyprinter-1.6.1.tar.gz 52818 BLAKE2B 171667a7483802a6e55f599af89831ac4e13931f4ce203313ab5126c975963de13c39dba124d81cef29bbeb1a98f1f2001dd9beb02b00dfe1d34160dd8167d30 SHA512 4623cec5c2034f08bce57320d9cedce4c893977868e2c98191c060d6442c2c19c946a07dc8dc2a31dd03c726f392dfff6509ca837d9c75974637e7ffc5099496
+DIST prettyprinter-1.7.0.tar.gz 55569 BLAKE2B fbcdad5485f8139c71f5e34a438adbe59822ef1eb77ae55f9f86228c934e7c751947dcae0900250ea2cfd8638493352759b40c68d91d6b4887289cc475c08163 SHA512 4f1b756b3284a0319bb73229e8445f6d92c3d3d12a879f651df5624389bd6c449b2d9bc440dbf70d8752a6ba574d0539f91950d4bafbe7f9d3fd79d0d30ec95d
+DIST prettyprinter-1.7.1.tar.gz 56907 BLAKE2B a05d9153b8b0eccd84b110d8e785c758b407757f54424d37b17ba5452e4b34fbfe4b4d7a6238d8a6b73d65cb23dc51ca3af320b577ae645fdf63190159f2e695 SHA512 26289e579cc1a2826dc11daedbdfd5ce31acf4a2382f827c20194d910f05201e3f332a6544aa0c3f941188d9eaee8d6dee3cf3d319dc3c5a7bfe4f35d77b4dd9
diff --git a/dev-haskell/prettyprinter/metadata.xml b/dev-haskell/prettyprinter/metadata.xml
index 7759ad5057c1..fcd7bf78e975 100644
--- a/dev-haskell/prettyprinter/metadata.xml
+++ b/dev-haskell/prettyprinter/metadata.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		A prettyprinter/text rendering engine. Easy to use, well-documented, ANSI terminal backend exists, HTML backend is trivial to implement, no name clashes, Text-based, extensible.
-	</longdescription>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="buildreadme">Build the readme generator</flag>
+		<flag name="text">While it&#39;s a core value of @prettyprinter@ to use @Text@, there are rare
+circumstances (mostly when @prettyprinter@ arises as a dependency of
+test suites of packages like @bytestring@ or @text@ themselves) when
+this is inconvenient. In this case one can disable this flag, so that
+@prettyprinter@ fallbacks to @String@.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">prettyprinter</remote-id>
+		<remote-id type="github">quchen/prettyprinter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild
deleted file mode 100644
index a5f21371d256..000000000000
--- a/dev-haskell/prettyprinter/prettyprinter-1.2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A modern, easy to use, well-documented, extensible prettyprinter"
-HOMEPAGE="https://github.com/quchen/prettyprinter"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-haskell/semigroups-0.1:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	dev-haskell/void:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/doctest-0.9
-		>=dev-haskell/pgp-wordlist-0.1
-		>=dev-haskell/semigroups-0.6
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag doc buildreadme)
-}
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild
deleted file mode 100644
index 41a7db096c72..000000000000
--- a/dev-haskell/prettyprinter/prettyprinter-1.6.1.ebuild
+++ /dev/null
@@ -1,33 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A modern, easy to use, well-documented, extensible pretty-printer"
-HOMEPAGE="https://github.com/quchen/prettyprinter"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/semigroups-0.16.1:=[profile?]
-	>=dev-haskell/text-1.2:=[profile?]
-	>=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/pgp-wordlist-0.1
-		>=dev-haskell/quickcheck-instances-0.3
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild
new file mode 100644
index 000000000000..a8b3dbd4dbbd
--- /dev/null
+++ b/dev-haskell/prettyprinter/prettyprinter-1.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern, easy to use, well-documented, extensible pretty-printer"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-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/semigroups-0.17:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/pgp-wordlist-0.1
+		>=dev-haskell/quickcheck-instances-0.3
+		>=dev-haskell/tasty-0.10
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/tasty-quickcheck-0.8 )
+"
diff --git a/dev-haskell/prettyprinter/prettyprinter-1.7.1.ebuild b/dev-haskell/prettyprinter/prettyprinter-1.7.1.ebuild
new file mode 100644
index 000000000000..02d35e6a2de1
--- /dev/null
+++ b/dev-haskell/prettyprinter/prettyprinter-1.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern, easy to use, well-documented, extensible pretty-printer"
+HOMEPAGE="https://github.com/quchen/prettyprinter"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="buildreadme +text"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/doctest-0.9
+		>=dev-haskell/quickcheck-2.5
+		text? ( >=dev-haskell/pgp-wordlist-0.1
+			>=dev-haskell/quickcheck-instances-0.3
+			>=dev-haskell/tasty-0.10
+			>=dev-haskell/tasty-hunit-0.9
+			>=dev-haskell/tasty-quickcheck-0.8 ) )
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag buildreadme buildreadme) \
+		$(cabal_flag text text)
+}
diff --git a/dev-haskell/primitive-addr/Manifest b/dev-haskell/primitive-addr/Manifest
new file mode 100644
index 000000000000..72e9f8ed73e2
--- /dev/null
+++ b/dev-haskell/primitive-addr/Manifest
@@ -0,0 +1 @@
+DIST primitive-addr-0.1.0.2.tar.gz 2983 BLAKE2B c272cbbdc874f8a297170b363e2b3ea0ab374b6ecc02fddfa1e82eed5a9b75c52e53aa3ca782027cf1d14d91ad826818c71752a778dcd9080994970284ac2c28 SHA512 e025238791271793e91faecba337d04e0cfc1e6b4dd130bd590247e961ef541ac81beca511ef117130eaf5665abb06b73e1985b1ed87705fa4c2704641d60ae4
diff --git a/dev-haskell/primitive-addr/metadata.xml b/dev-haskell/primitive-addr/metadata.xml
new file mode 100644
index 000000000000..e937f72e52d3
--- /dev/null
+++ b/dev-haskell/primitive-addr/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">byteverse/primitive-addr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild b/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild
new file mode 100644
index 000000000000..1040356e724b
--- /dev/null
+++ b/dev-haskell/primitive-addr/primitive-addr-0.1.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Addresses to unmanaged memory"
+HOMEPAGE="https://github.com/andrewthad/primitive-addr"
+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/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+"
diff --git a/dev-haskell/primitive/Manifest b/dev-haskell/primitive/Manifest
index 1f3a946caf1e..26738b0d4919 100644
--- a/dev-haskell/primitive/Manifest
+++ b/dev-haskell/primitive/Manifest
@@ -1,5 +1,4 @@
-DIST primitive-0.5.0.1.tar.gz 10372 BLAKE2B c8b3feb5228db084b0fd41d06ecbabc31fa4d4d09449e6c0798fdab49ca6d1f9030dca3e77ff5993bdf299361d38bbc57d39228d987aa5ee8c203276ce65fe53 SHA512 f52ea7c3b3c8e01949dfb55e158b770375c718151bdd65b0123278334d21fe219711c0d207318d248958b4f39a93a62c66ca77737c7775e3fe3b053dc20b34a8
-DIST primitive-0.5.1.0.tar.gz 10482 BLAKE2B 2507da63606de91bb4f20db6db156fdb5ec16a065658f71b10a2f4a2e9ffa47b3ff1eaf65603064a904f6b52e6724a604459296011a445e4ca6ca0bf6727f2b2 SHA512 23d0d0afc80e2b1a674d93feb059d8b240a81793ffd53f496562b87d7b4abc605f66549ac7f23774d8c36fdf8a6768f02cf15b962c75b5052358a1c8cd1664de
-DIST primitive-0.5.4.0.tar.gz 11966 BLAKE2B e6127adaf508955903569c86fdb8e0a300645d61faee4f7fe31a51847e7d706fce368e4a94007a207c61bcc59c41d6d8a7480e02f06d04a1f3706a95de0083b6 SHA512 8d0203834f09be52aea6a8f46d556340583ec79f8490e240f660326d670ddd67510caef1c30ee7d7374d88b812a9f5761c1528152212e46b56cd7c744f7aa656
-DIST primitive-0.6.1.0.tar.gz 12857 BLAKE2B a18d7685279f13090284c8f6414e3844f2226a4db4e3bd1722f9e04a11cafb2debb431fb1f7181c77375290610a456bc7634837d8886c9e91638bf139d2768c2 SHA512 7d75602732aae7af4ea5fb6678f669b103c5c40035c2fa2cc27d940e911054722d20f1b53865cfd0b430785baa0843de89de7195bb2d72c5bc1e5aeb4fdc5f82
-DIST primitive-0.7.1.0.tar.gz 52184 BLAKE2B c99f4e3bb37981a1c290914636460304203083817be8e83c2d756820b139b185e9594042fa41b9cafce03ae849a55a58899a6787890f81e4d78f7f35c5057c15 SHA512 8ade11d0b2221cfdf042da0263b5b5367a7ca2a9b9e1141844e4a65bb0467df879c92cd3515440d715b59345860c1ec3cb3efd7a3d702269ea15e18692586367
+DIST primitive-0.7.3.0-rev2.cabal 3080 BLAKE2B eb2e4c196978ca8534801c62b09302d1426564047b740fce992e81eb22136c123e07ae7240b03fd6983c496da563e7e2ed0a60d038e436966db9771644b57736 SHA512 d2dabfa4e2833886ec4430fdb50b2b53eea4eb94ed77350d53fcbaaad74b3b673d9dd7b3a48c69dda596f77743c70b31c9f1a5b6dc19114f80bf148af894f04c
+DIST primitive-0.7.3.0.tar.gz 55161 BLAKE2B 2963b9cea320ebcceddc4760c8890636a8f99b3eb5bb944a40ec5e097d8d92c92a18618126e23d345cb072b8245d4979a4b4988c64e2eb5fe30c7182ac11d386 SHA512 7fe593c24d990ce113c7dd155479b30a1c74aa9cfd10d2f0903dc185fc00d725b36d340e5eea6f1af7547d47bbde27339c56e2949e7f518674a7306ed8e56342
+DIST primitive-0.7.4.0-rev1.cabal 2982 BLAKE2B c85ee94b899932b6d465c29aaab1b5f1ba31a7b7a6581ae6a05927b4bd1b471ba120c228142913a28bf3e4142621d7d1f95944d372e4d29c4166881c3615565f SHA512 25fb5d4292d6cff46d351a9ae4fba058448d1065b455ee09bb6085a8725d0b5abc0f30225d66d11da09ad4ba48321ff9677e5554fe6c236fd35b06c0ea2079af
+DIST primitive-0.7.4.0.tar.gz 56575 BLAKE2B 3ecfe44a0e043bb80e5875aa45cfe1e8b48daa88c6dcda942604f2eb9903d2656dd13dbda7abcae3bee35f38750c3bb57823200500522e64e882f48f000150e1 SHA512 5c01ea4fc509ccb8f00b7d282948e8fa120d2ee3abd09c4efa473496ce6a716e26a95994a30bb8e18754a6226cbcaf102264e263e517d4ff2cea2d67216eb6c7
diff --git a/dev-haskell/primitive/metadata.xml b/dev-haskell/primitive/metadata.xml
index cbe5aeac52b8..d5f01e1981ab 100644
--- a/dev-haskell/primitive/metadata.xml
+++ b/dev-haskell/primitive/metadata.xml
@@ -1,34 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides wrappers for primitive array operations from
-		GHC.Prim.
-		
-		Changes in version 0.4.0.1
-		
-		* Critical bug fix in @fillByteArray@
-		
-		Changes in version 0.4
-		
-		* Support for GHC 7.2 array copying primitives
-		
-		* New in "Data.Primitive.ByteArray": @copyByteArray@,
-		@copyMutableByteArray@, @moveByteArray@, @fillByteArray@
-		
-		* Deprecated in "Data.Primitive.ByteArray": @memcpyByteArray@,
-		@memcpyByteArray'@, @memmoveByteArray@, @memsetByteArray@
-		
-		* New in "Data.Primitive.Array": @copyArray@, @copyMutableByteArray@
-		
-		* New in "Data.Primitive.Addr": @copyAddr@, @moveAddr@
-		
-		* Deprecated in "Data.Primitive.Addr": @memcpyAddr@
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">primitive</remote-id>
 		<remote-id type="github">haskell/primitive</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/primitive/primitive-0.5.0.1.ebuild b/dev-haskell/primitive/primitive-0.5.0.1.ebuild
deleted file mode 100644
index e64f3129996f..000000000000
--- a/dev-haskell/primitive/primitive-0.5.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="http://code.haskell.org/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.3:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/primitive/primitive-0.5.1.0.ebuild b/dev-haskell/primitive/primitive-0.5.1.0.ebuild
deleted file mode 100644
index d25ee93a754a..000000000000
--- a/dev-haskell/primitive/primitive-0.5.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/primitive/primitive-0.5.4.0.ebuild b/dev-haskell/primitive/primitive-0.5.4.0.ebuild
deleted file mode 100644
index f7e82a2786fe..000000000000
--- a/dev-haskell/primitive/primitive-0.5.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'ghc-prim >= 0.2 && < 0.4' 'ghc-prim >= 0.2 && < 0.5'
-}
diff --git a/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild b/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
deleted file mode 100644
index 5d6b77839a12..000000000000
--- a/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.3 && < 4.9' 'base >= 4.3' \
-		'ghc-prim >= 0.2 && < 0.5' 'ghc-prim >= 0.2' \
-		'transformers >= 0.2 && < 0.5' 'transformers >= 0.2'
-}
diff --git a/dev-haskell/primitive/primitive-0.7.1.0.ebuild b/dev-haskell/primitive/primitive-0.7.1.0.ebuild
deleted file mode 100644
index 127196afe010..000000000000
--- a/dev-haskell/primitive/primitive-0.7.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite": circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Primitive memory-related operations"
-HOMEPAGE="https://github.com/haskell/primitive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # circular depends: primitive[test]->tasty->wcwidth->attoparsec->scientific->primitive
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-"
diff --git a/dev-haskell/primitive/primitive-0.7.3.0.ebuild b/dev-haskell/primitive/primitive-0.7.3.0.ebuild
new file mode 100644
index 000000000000..51483f7534cc
--- /dev/null
+++ b/dev-haskell/primitive/primitive-0.7.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Primitive memory-related operations"
+HOMEPAGE="https://github.com/haskell/primitive"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT=test # circular depends: primitive[test]->tasty->wcwidth->attoparsec->scientific->primitive
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/primitive/primitive-0.7.4.0.ebuild b/dev-haskell/primitive/primitive-0.7.4.0.ebuild
new file mode 100644
index 000000000000..1a4f19a9b655
--- /dev/null
+++ b/dev-haskell/primitive/primitive-0.7.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Primitive memory-related operations"
+HOMEPAGE="https://github.com/haskell/primitive"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+CABAL_CHDEPS=(
+	'tasty ^>= 1.2 || ^>= 1.3 || ^>= 1.4' 'tasty >= 1.2'
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/base-orphans
+		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-classes-base-0.6 <dev-haskell/quickcheck-classes-base-0.7
+		dev-haskell/tagged
+		>=dev-haskell/tasty-1.2
+		dev-haskell/tasty-quickcheck
+		dev-haskell/transformers-compat
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/process-conduit/Manifest b/dev-haskell/process-conduit/Manifest
deleted file mode 100644
index 88194d67a901..000000000000
--- a/dev-haskell/process-conduit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST process-conduit-1.1.0.0.tar.gz 3884 BLAKE2B 70792cc3ac8a65e591939782b8ef03e2d339cda469b40ed9858ede5a18a8ee6ab18d72b538fc3a265ebdfb9fcec05e4de020ac96826d2c8264da711e89ecfbdd SHA512 d7390a1083bc3bc5db2ce2bc0ec55f90e6c8bb8d224cc16b52a2e272baf3dceb18ee11eafd3cc306902945b04b2d746738f5a5e88bfd73e5ad0a9f5d4e5914dc
-DIST process-conduit-1.2.0.1.tar.gz 3958 BLAKE2B 5c9ca54c43b99032fea566cbd1b4693bceb8a07ed1121b7ce2e74c034adf7ec39b2874978335a59880f34eceae6dc299886b3e45c865eb16765677e955a26b04 SHA512 f58d37b04523007fcc447b865510f59559608df8c470456f5f5269d04e7104b018451ae260018cf04b03a253e7436ff0fc517c9f0d5cde705cbb8661a868b920
diff --git a/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch b/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch
deleted file mode 100644
index e829cc58de0f..000000000000
--- a/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- process-conduit-1.1.0.0-orig/process-conduit.cabal	2014-04-03 18:54:59.000000000 +1100
-+++ process-conduit-1.1.0.0/process-conduit.cabal	2014-07-02 09:45:32.738952743 +1000
-@@ -34,6 +34,7 @@
-                      , text             >= 0.11
-                      , process          >= 1.0
-                      , conduit          >= 1.1
-+                     , conduit-extra    >= 1.1
-                      , resourcet        >= 1.1
-                      , shakespeare-text >= 1.0
-                      , shakespeare
-@@ -48,4 +49,6 @@
-                      , bytestring
-                      , hspec           >= 1.3
-                      , conduit
-+                     , conduit-extra
-                      , process-conduit
-+                     , resourcet
---- process-conduit-1.1.0.0-orig/test.hs	2014-04-03 18:54:59.000000000 +1100
-+++ process-conduit-1.1.0.0/test.hs	2014-07-02 09:51:31.862391926 +1000
-@@ -7,6 +7,7 @@
- import Data.Conduit
- import qualified Data.Conduit.Binary as CB
- import Test.Hspec
-+import Control.Monad.Trans.Resource (runResourceT)
- 
- main :: IO ()
- main = hspec $ do
diff --git a/dev-haskell/process-conduit/metadata.xml b/dev-haskell/process-conduit/metadata.xml
deleted file mode 100644
index 476cab9249fe..000000000000
--- a/dev-haskell/process-conduit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Conduits for processes.
-		For more details: &lt;https://github.com/tanakh/process-conduit/blob/master/README.md&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/process-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild b/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild
deleted file mode 100644
index 16d6ac96635d..000000000000
--- a/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Conduits for processes"
-HOMEPAGE="https://github.com/tanakh/process-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=("${FILESDIR}/${PN}-1.1.0.0-conduit-1.1.patch")
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-text-1.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild b/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild
deleted file mode 100644
index efbdeb02c28c..000000000000
--- a/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conduits for processes (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/process-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-text-1.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/conduit-extra
-		>=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/process-extras/Manifest b/dev-haskell/process-extras/Manifest
deleted file mode 100644
index f8ab4b72e481..000000000000
--- a/dev-haskell/process-extras/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST process-extras-0.3.3.6.tar.gz 6282 BLAKE2B c68906f0ac7c873aa429cecba88505ee55150ef5b39a25a355ddabfac01ccb1072ea737a60ac2523300557b2e10811006cfe4ceb5273e5c7e8c4afb66f4b5317 SHA512 ea275a800da874c40f7dd184281908aa713c2085b528eef9384660f863bf01e7b56c6840a1ae9a06662f90979288172f09b39fb9453049d115f70fd2b4ecf510
diff --git a/dev-haskell/process-extras/metadata.xml b/dev-haskell/process-extras/metadata.xml
deleted file mode 100644
index 4b81f84c00dc..000000000000
--- a/dev-haskell/process-extras/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Extra functionality for the Process library
-		&lt;http://hackage.haskell.org/package/process&gt;.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">seereason/process-extras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/process-extras/process-extras-0.3.3.6.ebuild b/dev-haskell/process-extras/process-extras-0.3.3.6.ebuild
deleted file mode 100644
index f983cfdddf5d..000000000000
--- a/dev-haskell/process-extras/process-extras-0.3.3.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Process extras"
-HOMEPAGE="https://github.com/seereason/process-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/listlike-4:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/profunctor-extras/Manifest b/dev-haskell/profunctor-extras/Manifest
deleted file mode 100644
index 7e5935064479..000000000000
--- a/dev-haskell/profunctor-extras/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST profunctor-extras-3.3.3.1.tar.gz 6493 BLAKE2B e0cedc49c90f91b0dd9f1d44a75824c83e0b4ee8d055cba9bb132c3e4cbfde02a7a850323db3386b883fa299d874c58a2500099dc0dcf51f51f6318025be8896 SHA512 78dc345cf1c7be7846d9c39775c6f0e71251a447461180e54239f406f8583524cf034139e57ca3d9054461c103432220c50f7c2f21403b4f5e3f4878b55788d8
-DIST profunctor-extras-4.0.tar.gz 2588 BLAKE2B 1bee159f740c3e49797756a54ed5e14053d43458316f19e9f9f0e6882f2f07766b6d5aad915f096a8bfc6d1b08269cd349cf5f56a31c1ba8a1f28f9ea9c59857 SHA512 0bf2000b18ccc5d85be28d48199f1e64c6fc8813b0e08b9e1c7bab756ebfe432c3e3c1e2ae87da81e54b1dac183776348a80f089f595ff318f9447d75ff7e358
diff --git a/dev-haskell/profunctor-extras/metadata.xml b/dev-haskell/profunctor-extras/metadata.xml
deleted file mode 100644
index 41640f988c20..000000000000
--- a/dev-haskell/profunctor-extras/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides a number of utilities and constructions that arise
-		when working with profunctors that require minor extensions to Haskell 98.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/profunctor-extras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild b/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild
deleted file mode 100644
index 1af47c6b0d7d..000000000000
--- a/dev-haskell/profunctor-extras/profunctor-extras-3.3.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Profunctor extras"
-HOMEPAGE="https://github.com/ekmett/profunctor-extras/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3:=[profile?]
-		>=dev-haskell/profunctors-3.2:=[profile?]
-		>=dev-haskell/semigroupoid-extras-3:=[profile?]
-		>=dev-haskell/semigroupoids-3:=[profile?]
-		>=dev-haskell/tagged-0.4.4:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild b/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild
deleted file mode 100644
index 371cdb56d019..000000000000
--- a/dev-haskell/profunctor-extras/profunctor-extras-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been absorbed into profunctors 4.0"
-HOMEPAGE="https://github.com/ekmett/profunctor-extras/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/profunctors-4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/profunctors/Manifest b/dev-haskell/profunctors/Manifest
index 003833b1826d..70b9fb352a7f 100644
--- a/dev-haskell/profunctors/Manifest
+++ b/dev-haskell/profunctors/Manifest
@@ -1,7 +1,2 @@
-DIST profunctors-3.3.0.1.tar.gz 6480 BLAKE2B 11589d6b9368d571d10f82c366829dd36012dc0cc738db20d4658c978416b94b937a0a9b11a6971dbb5c1db298de7ba7dd9e61eee3954c5541b6f451796fb970 SHA512 113d96a635e0644dd097bace3a5b2e58892a8fe47fbe614f3178ffa554486f177b4c512ad2301a75d0651156b976e43d545a596bc2a9b1763b1ef96f270bbeff
-DIST profunctors-4.0.4.tar.gz 10516 BLAKE2B 8aa3cbdc5b30eeb933a7197539c7f0d959156c300198cd2d1fe65107d79c9118d21515afcf753e7e86520509583a59b6676910de14713cac742d58806dcf2a62 SHA512 c282052ca8d59a99303c0ac4b55c3634cb496bb70738699d179d35683d8fab1a7d60e6027221ca534b946d23424b932c7a6280247b09d79d34da8f6465ed86e3
-DIST profunctors-4.3.2.tar.gz 15816 BLAKE2B e898cf6ef1814755bfad4e89b38df1b5692b3da0dd0966a9aa7a584b7515a6f1ec06fc3d290c8766aa7b673c68576c115e0453ed3cf99b1e6b008c93d650655d SHA512 42fbed0bbe39adfb1092d92559c79224d950ddec03acb2400686d0aee5a2ddd1a978c379202435afce5e9e124bc769a0baa407d4e77e4bea82f5694aa8559e27
-DIST profunctors-4.4.1.tar.gz 16997 BLAKE2B 576fcc51a5d06369e4a6eb546b0762acc043f21112cc742fbf15c1b17c2a5de8de91f673024db95912da45bef1ed6d25df9dca8998735e2d9b16fccf1f3726c7 SHA512 66c6a81e2109f7c2f755063b06f54444bd932c679c701880c0ec1a8ee8a50c63b4bab67f7341af745c0a77e362ff74de9da8116e2641d5f99dd59250657b7f50
-DIST profunctors-5.1.2.tar.gz 18845 BLAKE2B 7495e7897dfa191dec2c1b62381f4488c37222d4e989f99a6f69e41ee8852dee6161a0df1f959637b6fa1e3c5434629c87c809b904b69d74065163220df4069d SHA512 420c3c7beeb17ec42354fd805045bbcd26d406cf4b37a5f70f1f2fd5185f309b97138008959b5a028ff79144562316221c1605917a1d784315d618c1d61b37a2
-DIST profunctors-5.2.tar.gz 23236 BLAKE2B f81d0a08c8172cae7566710dd33d183dbbe92eec5a8589c649315c3103c82c97099d5c23a0eebcaecc39fb487d73aa453bc426a054ff875e4749782933ce8e12 SHA512 e158bfdc681913c131daa766138474654b56ec8e58944995b614ebeb11460458ae8409cfaf9a7398beb759e0f88b2e5139f9a53deffd3592bed859faa5b695fa
-DIST profunctors-5.5.1.tar.gz 29825 BLAKE2B 6a2fb21790e7ad7edc1cced8fb14cd02dab080ad832926edbd81a1aaf95c3aa9590c8c6b6216265103d1be9977ed64bbefe49000d1fa350d26af29a850c98333 SHA512 6f2b3cfe7ab629dd224319eef020bf92068a0b6b66019ab11dacb0e3540a2581605849037a9f2c0e1bca4330a4bce63266c9378cdb1bd612cdce52e7dae53481
+DIST profunctors-5.6.2-rev3.cabal 2484 BLAKE2B bbc95a6ce16d9740b7ff65000743e5dd9cbd036f2638b1678161fc304f7edcbb7044fde7c9c74d13b4cc2e15588f3b7563cbaeedcb840cb8dcd6863341217b86 SHA512 4996281dd2f69d065bd8dc49ed02407f882937885a1b6260014820e4ff0084ee19d82a1e0a6af6fe75f9704383f0f0943439ccf7f8b1d87d693c853e4e6f2d3d
+DIST profunctors-5.6.2.tar.gz 28522 BLAKE2B 812692b257caf7443ff03bf0e9268df8b4b7cd6af4ce95addb7bba6a2fa198b52a98121f63847a4402719a50c95535f379a111f4e943aa9937840920466a04b5 SHA512 ddf33426fdf52dbe0ffea5c9124e1d35b79696564b8e88bcd7a015b8361634566e5d35135cee69c6dc2fa2bbb870d9f624710f98e122078f7f3a82bbdacad690
diff --git a/dev-haskell/profunctors/metadata.xml b/dev-haskell/profunctors/metadata.xml
index 1bdbce48abbb..19c6c8c12b75 100644
--- a/dev-haskell/profunctors/metadata.xml
+++ b/dev-haskell/profunctors/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haskell 98 Profunctors
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">profunctors</remote-id>
 		<remote-id type="github">ekmett/profunctors</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/profunctors/profunctors-3.3.0.1.ebuild b/dev-haskell/profunctors/profunctors-3.3.0.1.ebuild
deleted file mode 100644
index fe14e8ff8c09..000000000000
--- a/dev-haskell/profunctors/profunctors-3.3.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/comonad-3*:=[profile?]
-		>=dev-haskell/tagged-0.4.4:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/profunctors/profunctors-4.0.4.ebuild b/dev-haskell/profunctors/profunctors-4.0.4.ebuild
deleted file mode 100644
index ed89c62ed3e3..000000000000
--- a/dev-haskell/profunctors/profunctors-4.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/profunctors/profunctors-4.3.2.ebuild b/dev-haskell/profunctors/profunctors-4.3.2.ebuild
deleted file mode 100644
index 68198aee9905..000000000000
--- a/dev-haskell/profunctors/profunctors-4.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/profunctors/profunctors-4.4.1.ebuild b/dev-haskell/profunctors/profunctors-4.4.1.ebuild
deleted file mode 100644
index 68198aee9905..000000000000
--- a/dev-haskell/profunctors/profunctors-4.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/profunctors/profunctors-5.1.2.ebuild b/dev-haskell/profunctors/profunctors-5.1.2.ebuild
deleted file mode 100644
index f9af8718ed9b..000000000000
--- a/dev-haskell/profunctors/profunctors-5.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/profunctors/profunctors-5.2.ebuild b/dev-haskell/profunctors/profunctors-5.2.ebuild
deleted file mode 100644
index ccbe6434f49d..000000000000
--- a/dev-haskell/profunctors/profunctors-5.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 Profunctors"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.6:=[profile?]
-	>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/profunctors/profunctors-5.5.1.ebuild b/dev-haskell/profunctors/profunctors-5.5.1.ebuild
deleted file mode 100644
index af45db76dac3..000000000000
--- a/dev-haskell/profunctors/profunctors-5.5.1.ebuild
+++ /dev/null
@@ -1,31 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell98 profunctors package"
-HOMEPAGE="https://github.com/ekmett/profunctors/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
-	>=dev-haskell/bifunctors-5.2:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/contravariant-1:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/distributive-0.4.4:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/profunctors/profunctors-5.6.2-r1.ebuild b/dev-haskell/profunctors/profunctors-5.6.2-r1.ebuild
new file mode 100644
index 000000000000..a653eff5be86
--- /dev/null
+++ b/dev-haskell/profunctors/profunctors-5.6.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Profunctors package, authored by Edward Kmett"
+HOMEPAGE="https://github.com/ekmett/profunctors/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+	>=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/project-template/Manifest b/dev-haskell/project-template/Manifest
deleted file mode 100644
index f858dafdcc4a..000000000000
--- a/dev-haskell/project-template/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST project-template-0.2.0.1.tar.gz 8321 BLAKE2B 30bc962a82cff1a6c48c74265de6a2e074e255e84508ec3d0e868a418e2941ddb6cc90b1f5e13e1f65518efaeee918aad4f78d38e4c5f546f9ef0bc9dbf34459 SHA512 bc5824086ba8dfaff4ff64c5115d37ea5e496d7692f1120b11c2a878e522119d362c7d119ccf7b9cc064c58f9ce6382b5e24a69cdac5ac5d683c4d616e2c66ea
-DIST project-template-0.2.0.tar.gz 8251 BLAKE2B d8f15dbb5ffb221dbcfff8152ecbba1701cca7c70a4e5c1c62a4603de15ea028b78035d8b0a97550aed6a4eba0fe8f213b0fe3d957cb259da79f73dbb90d3dfa SHA512 923c0d9e5cac14c05474adc743cfb8030ed8e08e69c4eb35b77c2cb1c64b44f10058693d1a5880ba983040ea9dbf1f28f815cd274a75de302f3afdb928210cad
diff --git a/dev-haskell/project-template/metadata.xml b/dev-haskell/project-template/metadata.xml
deleted file mode 100644
index 7d1ebfc1027f..000000000000
--- a/dev-haskell/project-template/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		See initial blog post for explanation: &lt;http://www.yesodweb.com/blog/2012/09/project-templates&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/haskell-ide</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/project-template/project-template-0.2.0.1.ebuild b/dev-haskell/project-template/project-template-0.2.0.1.ebuild
deleted file mode 100644
index dc702ce20bff..000000000000
--- a/dev-haskell/project-template/project-template-0.2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Specify Haskell project templates and generate files"
-HOMEPAGE="https://github.com/fpco/haskell-ide"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-0.4.3:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/project-template/project-template-0.2.0.ebuild b/dev-haskell/project-template/project-template-0.2.0.ebuild
deleted file mode 100644
index 0caa221c6d11..000000000000
--- a/dev-haskell/project-template/project-template-0.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Specify Haskell project templates and generate files"
-HOMEPAGE="https://github.com/fpco/haskell-ide"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-0.4.3:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/psqueue/Manifest b/dev-haskell/psqueue/Manifest
deleted file mode 100644
index 1415dcc438f8..000000000000
--- a/dev-haskell/psqueue/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST PSQueue-1.1.0.1.tar.gz 6408 BLAKE2B 5852064aabcea6e9495234cf16d4292878ed5b645fa822aaafb5d1bc869ba2fc30ce83ef4b5fa009faae4616b814cc776f796b38f51bae877324194755ab5bcb SHA512 76d5cd09d7955c4d7500b7e68fd4776b84d5cbbcc6eb1a101549119e11fdd8a452bc87cb473eef37655a18f5a5e616d126e020edb907901feae77a0b10b86eb9
-DIST PSQueue-1.1.tar.gz 6280 BLAKE2B 5810404fa4cb93814987215b8ab4177540647ddb4e2d8678d53529e2539edb441fcc25cff26e9037ca6fb37c709b9dfd4e34a19d0d716e10270849ea297fda81 SHA512 34fbd599b7fc47aef8952db79c848f4b50716d2d900b1d8274733ad4c7382d41a0407159e89af9828355c618412c626e4384f2e7461396b51cf866d9b8cfdb0d
diff --git a/dev-haskell/psqueue/metadata.xml b/dev-haskell/psqueue/metadata.xml
deleted file mode 100644
index 63915bdba3bc..000000000000
--- a/dev-haskell/psqueue/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A /priority search queue/ efficiently supports the
-		opperations of both a search tree and a priority queue. A
-		'Binding' is a product of a key and a priority.  Bindings
-		can be inserted, deleted, modified and queried in
-		logarithmic time, and the binding with the least priority
-		can be retrieved in constant time.  A queue can be built
-		from a list of bindings, sorted by keys, in linear time.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/psqueue/psqueue-1.1-r1.ebuild b/dev-haskell/psqueue/psqueue-1.1-r1.ebuild
deleted file mode 100644
index 8175af87b85b..000000000000
--- a/dev-haskell/psqueue/psqueue-1.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="PSQueue"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Priority Search Queue"
-HOMEPAGE="https://hackage.haskell.org/package/PSQueue"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/psqueue/psqueue-1.1.0.1.ebuild b/dev-haskell/psqueue/psqueue-1.1.0.1.ebuild
deleted file mode 100644
index 5ae6c9add7b8..000000000000
--- a/dev-haskell/psqueue/psqueue-1.1.0.1.ebuild
+++ /dev/null
@@ -1,36 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="PSQueue"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Priority Search Queue"
-HOMEPAGE="http://hackage.haskell.org/package/PSQueue"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.3 && < 4.13' 'base >= 4.3'
-}
diff --git a/dev-haskell/psqueues/Manifest b/dev-haskell/psqueues/Manifest
index a229679b8021..cd01ec5f836e 100644
--- a/dev-haskell/psqueues/Manifest
+++ b/dev-haskell/psqueues/Manifest
@@ -1,5 +1 @@
-DIST psqueues-0.2.0.3.tar.gz 23782 BLAKE2B 4f756e1c394d9e88381f22fa61e27a9ca38054e124022d78a7433af85a8694b77a8a91dd44b9566ec7fcc8c2b47aa51a82dab2808a7c50db2017bea6c67543ad SHA512 2af3fef2786ce61289f806fd483d1995a29f1a7f85eb918ae69e4873450c4b19e8c76f0e6f86f9e6fe7065b9cfb4672f48af2366bc2a537ed42b0e5dacb8a5a0
-DIST psqueues-0.2.2.1.tar.gz 25605 BLAKE2B 3bcece8b6652045ddbdba3a2a0ae78324c1c54d67f39fb63f1915e32878e913c1e86f44959ee8867b1b2c8f5ad588fc6aaf98aac7975e8c032adb36b9e85be86 SHA512 b34ea7301a61760e6487441bf3251ca1f31be88489cf75bbf81049bb74a79e31e9933e1ad5378dc3715e763a1ac4ccd6130e03b877a4ceebcde9f4a3be6fcc8c
-DIST psqueues-0.2.2.2.tar.gz 25622 BLAKE2B 71db99c8fdc93c243f1aacc2fafc1fafa7d8b9192baed25487107f9025e80cb297821c150e5300444d722ed4516e2eef15558da801e1d478f896a899576e71c0 SHA512 0ecaea1fa9e4546f39b3e936422a3fc3c24f3a5f4a5a70c2503038102dc7f7586add40b4efcd3c26e1ded6df6dd368f161664e7ce7790d74da13165c2684582a
-DIST psqueues-0.2.2.3.tar.gz 25624 BLAKE2B 26be1d6c592c1ee41b95a81143253b95143cb2e8ec86344f370ba23be1099ae94d4eede42db65a51b58d92dff0f46f54d8fd9550b3fd5eb1f1aa736231899edb SHA512 7753f5beeccf32841f6be1294f9ddf8627fafddcae5d09784077b41864016247d8fc4bcb901056ea804ecbe3ab93a15d9de221e5623aeafd9107edc2b402121b
-DIST psqueues-0.2.7.2.tar.gz 27455 BLAKE2B b9d69b445173c4b8972e3f4a0a601c2e1c9d96c02b4426c5fbdba7220274ddd4c45138bfe94b23744b99cc0b538d114fb045095c1e9d2cf1d7e1f3295466662c SHA512 cc70bc22568d24b8618d43be7a2261ab7b55005e7e68a49a4d09b323e03954c05fe8d4de2c344760cdfef26b04bc6937bc331f7e310e1bc9b6b512068eed3be3
+DIST psqueues-0.2.7.3.tar.gz 27328 BLAKE2B f237482c54cdbe7bdd69c119bca0ff159efa3a242e06bb503a62ae453a1445cd1c6216aa426fd7ae752f88c77e26401516b06f5a9b30a99e548b8a48dbeb1bf2 SHA512 7a089a68f8b99f93780cc05e1b3454c266077f47a453f139bbe368cdca889e8b7098aa2770c86fcb32eddcb15837a7d60c70da946ad5a234a72bf01fff017fff
diff --git a/dev-haskell/psqueues/metadata.xml b/dev-haskell/psqueues/metadata.xml
index 4860915e4a9d..3be0a53c99f6 100644
--- a/dev-haskell/psqueues/metadata.xml
+++ b/dev-haskell/psqueues/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/psqueues/psqueues-0.2.0.3.ebuild b/dev-haskell/psqueues/psqueues-0.2.0.3.ebuild
deleted file mode 100644
index ee8e147b73b4..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="https://hackage.haskell.org/package/psqueues"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9
-		dev-haskell/tagged
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/psqueues/psqueues-0.2.2.1.ebuild b/dev-haskell/psqueues/psqueues-0.2.2.1.ebuild
deleted file mode 100644
index 026f6e683d87..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="https://hackage.haskell.org/package/psqueues"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9
-		dev-haskell/tagged
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/psqueues/psqueues-0.2.2.2.ebuild b/dev-haskell/psqueues/psqueues-0.2.2.2.ebuild
deleted file mode 100644
index 196e11613672..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="https://hackage.haskell.org/package/psqueues"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10
-		dev-haskell/tagged
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/psqueues/psqueues-0.2.2.3.ebuild b/dev-haskell/psqueues/psqueues-0.2.2.3.ebuild
deleted file mode 100644
index 8f93a3dbca03..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="https://hackage.haskell.org/package/psqueues"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10
-		dev-haskell/tagged
-		>=dev-haskell/test-framework-0.8 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild b/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild
deleted file mode 100644
index 99369e84cd07..000000000000
--- a/dev-haskell/psqueues/psqueues-0.2.7.2.ebuild
+++ /dev/null
@@ -1,31 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure priority search queues"
-HOMEPAGE="http://hackage.haskell.org/package/psqueues"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.14
-		dev-haskell/tagged
-		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
diff --git a/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild b/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild
new file mode 100644
index 000000000000..f8145482f182
--- /dev/null
+++ b/dev-haskell/psqueues/psqueues-0.2.7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure priority search queues"
+HOMEPAGE="https://hackage.haskell.org/package/psqueues"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
+		dev-haskell/tagged
+		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
diff --git a/dev-haskell/publicsuffixlist/Manifest b/dev-haskell/publicsuffixlist/Manifest
deleted file mode 100644
index 893508697e0d..000000000000
--- a/dev-haskell/publicsuffixlist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST publicsuffixlist-0.1.tar.gz 72704 BLAKE2B e8cf5ec65eccc7a7b335d753057a3ccd877691cd760cabf6b9fdbea5bb595d2051021799756f93048a9b144cae6f2721370df7d869c7cb38fbf00f3d7b6ed6d3 SHA512 ca9035f33eaeb222684574e3be2dfb25d60fb840cf5e7684d816cbf696f90782e86caaf7d39b826e00b444739624432a0c02b23890a17864c416afb2bbcd7dc3
diff --git a/dev-haskell/publicsuffixlist/metadata.xml b/dev-haskell/publicsuffixlist/metadata.xml
deleted file mode 100644
index f774b8c7dfc7..000000000000
--- a/dev-haskell/publicsuffixlist/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Is a given string a domain suffix?
-	</longdescription>
-	<use>
-		<flag name="create">export Network.PublicSuffixList.Create module</flag>
-		<flag name="runtimelist">read suffix list from dist at startup instead of embedding list into library</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">litherum/publicsuffixlist</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild b/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
deleted file mode 100644
index 6be6c2e78c2d..000000000000
--- a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Is a given string a domain suffix?"
-HOMEPAGE="https://hackage.haskell.org/package/publicsuffixlist"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="create runtimelist"
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	create? ( >=dev-haskell/conduit-1.0.0:=[profile?] <dev-haskell/conduit-2.0.0:=[profile?]
-			>=dev-haskell/idna-0.1.2:=[profile?] <dev-haskell/idna-1.0:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		!create? ( >=dev-haskell/idna-0.1.1 <dev-haskell/idna-1.0 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag create create) \
-		$(cabal_flag runtimelist runtimelist)
-}
diff --git a/dev-haskell/punycode/Manifest b/dev-haskell/punycode/Manifest
deleted file mode 100644
index 973e104d3890..000000000000
--- a/dev-haskell/punycode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST punycode-2.0.tar.gz 6243 BLAKE2B b6a0b5123ea3dbd8b8c28ea56b4cf7425962011224549ece1c3c2c5b6a951e7e8c76c46f33a548f43ec650a42ef98f373769f623b4094ab6e222f5e2b91ce621 SHA512 106ee29667582f0341b993b8fd888046e70aff02bf9a31fb883488ed0f1fe346ae6dacd60ceacf088c056b50cb99d633322f066be391585af9c37fd8e5e4ff44
diff --git a/dev-haskell/punycode/metadata.xml b/dev-haskell/punycode/metadata.xml
deleted file mode 100644
index 73a13817ca69..000000000000
--- a/dev-haskell/punycode/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Encode unicode strings to ascii forms according to RFC 3492. It is written in pure Haskell, as opposed to gnuidn's Data.Text.IDN.Punycode. Please note that Data.Encoding.BootString from the 'encoding' package also contains an implementation of the Punycode algorithm.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">litherum/punycode</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/punycode/punycode-2.0.ebuild b/dev-haskell/punycode/punycode-2.0.ebuild
deleted file mode 100644
index 1868a53af40f..000000000000
--- a/dev-haskell/punycode/punycode-2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Encode unicode strings to ascii forms according to RFC 3492"
-HOMEPAGE="https://github.com/litherum/punycode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # runs slow, finds error
-
-RDEPEND="dev-haskell/cereal:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/text:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/encoding
-			dev-haskell/hunit
-			dev-haskell/quickcheck
-		)"
diff --git a/dev-haskell/puremd5/Manifest b/dev-haskell/puremd5/Manifest
index 5b574c9325ca..c70d73e44577 100644
--- a/dev-haskell/puremd5/Manifest
+++ b/dev-haskell/puremd5/Manifest
@@ -1,2 +1 @@
-DIST pureMD5-2.1.2.1.tar.gz 5824 BLAKE2B f8fba14301bc4aa12c8c8628cc368ea0cc63e8d0888a7c5d9a1d669f8a2944192ad74c2a4c7ee82cb30787fa463c24cb6e6a4822eab95e9b803dd49a81c37eaf SHA512 8a9e8957e4fcea2ec7db014f1dfd153bc00589caf63fa12546b0594a35bbd7bd800decee1a990106515c817dd30f2565454d1e53f2bef87dcf606cc191a0e428
 DIST pureMD5-2.1.3.tar.gz 6719 BLAKE2B 7b315ee2d475e3c4d393bf02615162f04481c266af5a0d165bc1808cb446248cbae02c5b9b40e69b8027490201a92c39f8882634f3291e606e90136659a0b4a1 SHA512 4be26ab8383bc51aaefb2e22cd758945eab00d1ca9612fc0a1b6ba1a581ea7dca55580f50c11dd60c72aeb1f3c418c73c52df34a1be168d878602540394201dc
diff --git a/dev-haskell/puremd5/metadata.xml b/dev-haskell/puremd5/metadata.xml
index caefc9e8d1cc..609b6226c4bc 100644
--- a/dev-haskell/puremd5/metadata.xml
+++ b/dev-haskell/puremd5/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild b/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
deleted file mode 100644
index 838e79386e84..000000000000
--- a/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="pureMD5"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Haskell-only implementation of the MD5 digest (hash) algorithm"
-HOMEPAGE="https://hackage.haskell.org/package/pureMD5"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4.0[profile?]
-		>=dev-haskell/cereal-0.2[profile?]
-		dev-haskell/crypto-api[profile?]
-		dev-haskell/tagged[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/puremd5/puremd5-2.1.3.ebuild b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
index e091f73b7454..74fce8964f80 100644
--- a/dev-haskell/puremd5/puremd5-2.1.3.ebuild
+++ b/dev-haskell/puremd5/puremd5-2.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.9999
 
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/pwstore-fast/Manifest b/dev-haskell/pwstore-fast/Manifest
deleted file mode 100644
index 8712c78af2e2..000000000000
--- a/dev-haskell/pwstore-fast/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pwstore-fast-2.4.4.tar.gz 8901 BLAKE2B 27e26a1c934264ea18797c6e5c9bd91dacd00e02ee67a0ec7e39dd51fa10c37b9999b1698800ffdfc7954aced9f3d076a94cc5d423b022af5d0168862e81415a SHA512 707381466d22b9d4cb45884be1df0c1567b11c1ed698b19c968f72b0b68898aa384df5f7c12fb5944ebc2bbcf28fd22c4cefed696d37503ac8b39ab9cdebb0f1
diff --git a/dev-haskell/pwstore-fast/metadata.xml b/dev-haskell/pwstore-fast/metadata.xml
deleted file mode 100644
index cdbf6fd8bacc..000000000000
--- a/dev-haskell/pwstore-fast/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		To store passwords securely, they should be salted,
-		then hashed with a slow hash function. This library
-		uses PBKDF1-SHA256, and handles all the details.
-		It uses the cryptohash package for speed; if you need
-		a pure Haskell library, pwstore-purehaskell has the
-		exact same API, but uses only pure Haskell. It is
-		about 25 times slower than this package, but still
-		quite usable.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">PeterScott/pwstore</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild b/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild
deleted file mode 100644
index c285f1a28c89..000000000000
--- a/dev-haskell/pwstore-fast/pwstore-fast-2.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Secure password storage"
-HOMEPAGE="https://github.com/PeterScott/pwstore"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/binary-0.5:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/cryptohash-0.6:=[profile?]
-	>=dev-haskell/random-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/quickcheck-classes-base/Manifest b/dev-haskell/quickcheck-classes-base/Manifest
new file mode 100644
index 000000000000..9b3a83da17ba
--- /dev/null
+++ b/dev-haskell/quickcheck-classes-base/Manifest
@@ -0,0 +1 @@
+DIST quickcheck-classes-base-0.6.2.0.tar.gz 26732 BLAKE2B aa3b7be411c66b72eb07c81e9fe2c1accdde254ae8e510080d7b0ea93df0148317a61633f96fe459ab329af112eee3d8243fb728f5416d95d258b90a40d1d9cf SHA512 730255f74582081e65fa8c6b36ab8a2c26991a8e7d8140361151614e7a9619f178e50820cdfc3bf5771f1688dce369f9d71de683bc89481a20f8d2382ae4b58d
diff --git a/dev-haskell/quickcheck-classes-base/files/quickcheck-classes-base-0.6.2.0-laws.patch b/dev-haskell/quickcheck-classes-base/files/quickcheck-classes-base-0.6.2.0-laws.patch
new file mode 100644
index 000000000000..f806f226a06d
--- /dev/null
+++ b/dev-haskell/quickcheck-classes-base/files/quickcheck-classes-base-0.6.2.0-laws.patch
@@ -0,0 +1,51 @@
+From b59ab822c261283004c2e87cffc653dc2b35c030 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Fri, 30 Jul 2021 23:23:19 +0100
+Subject: [PATCH] quickcheck-classes-base: move qe1_q under UNARY_LAWS define
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In https://bugs.gentoo.org/804870 Toralf noticed a build failure:
+
+```
+    $ cabal build --flags=binary-laws --flags=-unary-laws
+    Configuring quickcheck-classes-base-0.6.2.0...
+    Preprocessing library for quickcheck-classes-base-0.6.2.0..
+    Building library for quickcheck-classes-base-0.6.2.0..
+    [ 1 of 30] Compiling Test.QuickCheck.Classes.Internal ( src/Test/QuickCheck/Classes/Internal.hs, dist/build/Test/QuickCheck/Classes/Internal.o, dist/build/Test/QuickCheck/Classes/Internal.dyn_o )
+
+    src/Test/QuickCheck/Classes/Internal.hs:79:5: error:
+        Not in scope: ‘eq1_2’
+       |
+    79 |   , eq1_2
+       |     ^^^^^
+```
+
+In happens due to a mismatch between export and definition #ifdef guards.
+The change fised declaration to match definition.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/804870
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ quickcheck-classes-base/src/Test/QuickCheck/Classes/Internal.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/Test/QuickCheck/Classes/Internal.hs
++++ b/src/Test/QuickCheck/Classes/Internal.hs
+@@ -73,10 +73,10 @@ module Test.QuickCheck.Classes.Internal
+   , isTrue#
+ #if HAVE_UNARY_LAWS
+   , eq1
++  , eq1_2
+ #endif
+ #if HAVE_BINARY_LAWS
+   , eq2
+-  , eq1_2
+ #endif
+   , readMaybe
+   ) where
+-- 
+2.32.0
+
diff --git a/dev-haskell/quickcheck-classes-base/metadata.xml b/dev-haskell/quickcheck-classes-base/metadata.xml
new file mode 100644
index 000000000000..f4b1db0172f8
--- /dev/null
+++ b/dev-haskell/quickcheck-classes-base/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<use>
+		<flag name="binary-laws">Include infrastructure for testing class laws of binary type constructors. Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported configuration.</flag>
+		<flag name="unary-laws">Include infrastructure for testing class laws of unary type constructors.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">andrewthad/quickcheck-classes</remote-id>
+	</upstream>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..ec6966e5a141
--- /dev/null
+++ b/dev-haskell/quickcheck-classes-base/quickcheck-classes-base-0.6.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck common typeclasses from 'base'"
+HOMEPAGE="https://github.com/andrewthad/quickcheck-classes#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+binary-laws +unary-laws"
+
+RDEPEND="dev-haskell/contravariant:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	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
+"
+
+PATCHES=("${FILESDIR}"/${P}-laws.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag binary-laws binary-laws) \
+		$(cabal_flag unary-laws unary-laws)
+}
diff --git a/dev-haskell/quickcheck-classes/Manifest b/dev-haskell/quickcheck-classes/Manifest
new file mode 100644
index 000000000000..7ff6ea58d8da
--- /dev/null
+++ b/dev-haskell/quickcheck-classes/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/dev-haskell/quickcheck-classes/metadata.xml b/dev-haskell/quickcheck-classes/metadata.xml
new file mode 100644
index 000000000000..b5d22a614586
--- /dev/null
+++ b/dev-haskell/quickcheck-classes/metadata.xml
@@ -0,0 +1,19 @@
+<?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>
+	<use>
+		<flag name="aeson">You can disable the use of the `aeson` package using `-f-aeson`.  This may be useful for accelerating builds in sandboxes for expert users.</flag>
+		<flag name="binary-laws">Include infrastructure for testing class laws of binary type constructors. It is required that this flag match the value that the `unary-laws` flag was given when building `quickcheck-classes-base`. Disabling `unary-laws` while keeping `binary-laws` enabled is an unsupported configuration.</flag>
+		<flag name="semigroupoids">You can disable the use of the `semigroupoids` package using `-f-semigroupoids`.  This may be useful for accelerating builds in sandboxes for expert users.</flag>
+		<flag name="semirings">You can disable the use of the `semirings` package using `-f-semirings`.  This may be useful for accelerating builds in sandboxes for expert users.</flag>
+		<flag name="unary-laws">Include infrastructure for testing class laws of unary type constructors. It is required that this flag match the value that the `unary-laws` flag was given when building `quickcheck-classes-base`.</flag>
+		<flag name="vector">You can disable the use of the `vector` package using `-f-vector`.  This may be useful for accelerating builds in sandboxes for expert users.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">andrewthad/quickcheck-classes</remote-id>
+	</upstream>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..1ff3c61eeb83
--- /dev/null
+++ b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck common typeclasses"
+HOMEPAGE="https://github.com/andrewthad/quickcheck-classes#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+aeson +binary-laws +semigroupoids +semirings +unary-laws +vector"
+
+RDEPEND=">=dev-haskell/base-orphans-0.1:=[profile?]
+	dev-haskell/bifunctors:=[profile?]
+	dev-haskell/contravariant:=[profile?]
+	dev-haskell/fail:=[profile?]
+	>=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/primitive-addr-0.1.0.2:=[profile?] <dev-haskell/primitive-addr-0.2:=[profile?]
+	>=dev-haskell/quickcheck-classes-base-0.6:=[profile?] <dev-haskell/quickcheck-classes-base-0.7:=[profile?]
+	>=dev-haskell/semigroups-0.17:=[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:=[profile?] )
+	semigroupoids? ( dev-haskell/semigroupoids:=[profile?] )
+	semirings? ( >=dev-haskell/semirings-0.4.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}
+	>=dev-haskell/cabal-1.24.0.0
+	test? ( >=dev-haskell/base-orphans-0.5
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck
+		!vector? ( dev-haskell/vector ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag aeson aeson) \
+		$(cabal_flag binary-laws binary-laws) \
+		$(cabal_flag semigroupoids semigroupoids) \
+		$(cabal_flag semirings semirings) \
+		$(cabal_flag unary-laws unary-laws) \
+		$(cabal_flag vector vector)
+}
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
new file mode 100644
index 000000000000..451810b4b4c0
--- /dev/null
+++ b/dev-haskell/quickcheck-classes/quickcheck-classes-0.6.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck common typeclasses"
+HOMEPAGE="https://github.com/andrewthad/quickcheck-classes#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+aeson +binary-laws +semigroupoids +semirings +unary-laws +vector"
+
+RDEPEND=">=dev-haskell/primitive-0.6.4:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/primitive-addr-0.1.0.2:=[profile?] <dev-haskell/primitive-addr-0.2:=[profile?]
+	>=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:=[profile?] )
+	semigroupoids? ( dev-haskell/semigroupoids:=[profile?] )
+	semirings? ( >=dev-haskell/semirings-0.4.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}
+	>=dev-haskell/cabal-2.4
+	test? ( >=dev-haskell/base-orphans-0.5
+		dev-haskell/tagged
+		!vector? ( dev-haskell/vector ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag aeson aeson) \
+		$(cabal_flag binary-laws binary-laws) \
+		$(cabal_flag semigroupoids semigroupoids) \
+		$(cabal_flag semirings semirings) \
+		$(cabal_flag unary-laws unary-laws) \
+		$(cabal_flag vector vector)
+}
diff --git a/dev-haskell/quickcheck-instances/Manifest b/dev-haskell/quickcheck-instances/Manifest
index 5459a6aa7e29..0efd0b6aa0d2 100644
--- a/dev-haskell/quickcheck-instances/Manifest
+++ b/dev-haskell/quickcheck-instances/Manifest
@@ -1,3 +1,4 @@
-DIST quickcheck-instances-0.3.11.tar.gz 6024 BLAKE2B 72b1b2eed0906aa79f557ef158de922714ab80433fe9b6659a80287de3899e935933f35d23d28dfa7b63333084a1cf4907c4fe8718a14636bd155814ad8bf258 SHA512 a19c97810df7a028af5c6190f62bd9c858444ba210bd016eeb37b402aa9ff942a3538263b80d89a9c156189220ce32058fb81b384c1317f96df527654cb59818
-DIST quickcheck-instances-0.3.12.tar.gz 6437 BLAKE2B 28df5a7872e549f55bb09daf9983a0a447e7730babb4ded4b439acd9cb1166c5a57853197438a9acebce926c0bac87f4a737fcf927799748457737db43afb84d SHA512 471e9e4324ca6d655283d8ed149587bdad981684dce9dc5db5db417fb7614d3a1b6d41388af228e4d600b989d2e14e0496af63c09275cce3f132db7d71c35f98
-DIST quickcheck-instances-0.3.22.tar.gz 9939 BLAKE2B 329117de28253bd6319b84a7e51c6428b90fed4ca4f49c7bb127ed1676d2438ce682a80fb819d60df300d6b56c005a9dd424e3b9d7c858119cb0e871d19c06f1 SHA512 cd36e6833752fbc5501a4fe8459381fe3c07f73b706a438effee06bd1b5e17ecb12b1347fdacb65556e339de58ca8ac32480dc1339cb43b1416c4aeb4f714f8c
+DIST quickcheck-instances-0.3.27.cabal 4710 BLAKE2B 591e79f2435e7ae7d7f179b8b7f4cda7fd1f96cfdbf573e48e17393e2f2d47a44b0e86745128fb5be396d5736bf8ce7d70eeee3f735409f5e5697e412cdbceb6 SHA512 653e5b249d0138db38df962fc061c2df089de8ba43f2a13d2dc47282e35b9221844af8beb9d01bdb474e99e9736464b929a27c35a12fcbbc6a6ab3359cd78586
+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
diff --git a/dev-haskell/quickcheck-instances/metadata.xml b/dev-haskell/quickcheck-instances/metadata.xml
index 210e6b2ee28f..080d41cb81f3 100644
--- a/dev-haskell/quickcheck-instances/metadata.xml
+++ b/dev-haskell/quickcheck-instances/metadata.xml
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		QuickCheck instances.
-		
-		The goal is to supply QuickCheck instances for
-		types provided by the Haskell Platform.
-		
-		Since all of these instances are provided as
-		orphans, I recommend that you do not use this library
-		within another library module, so that you don't
-		impose these instances on down-stream consumers of
-		your code.
-		
-		For information on writing a test-suite with Cabal
-		see &lt;http://www.haskell.org/cabal/users-guide/#test-suites&gt;
-	</longdescription>
 	<upstream>
-		<remote-id type="github">aslatter/qc-instances</remote-id>
+		<remote-id type="hackage">quickcheck-instances</remote-id>
+		<remote-id type="github">haskellari/qc-instances</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild
deleted file mode 100644
index 67017a36101f..000000000000
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Common quickcheck instances"
-HOMEPAGE="https://github.com/aslatter/qc-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild
deleted file mode 100644
index 77d2e606e87d..000000000000
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Common quickcheck instances"
-HOMEPAGE="https://github.com/aslatter/qc-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >= 2.1 && < 2.9' 'QuickCheck >= 2.1'
-}
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild
deleted file mode 100644
index f3d30611fe8d..000000000000
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Common quickcheck instances"
-HOMEPAGE="https://github.com/aslatter/qc-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?]
-	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild
deleted file mode 100644
index 57aaeb77b538..000000000000
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.22.ebuild
+++ /dev/null
@@ -1,49 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common quickcheck instances"
-HOMEPAGE="https://github.com/phadej/qc-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.9.3:=[profile?]
-	>=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/hashable-1.2.5.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-	>=dev-haskell/old-time-1.1.0.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/quickcheck-2.13.2:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
-	>=dev-haskell/scientific-0.2.0.0:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/splitmix-0.0.2:=[profile?] <dev-haskell/splitmix-0.1:=[profile?]
-	>=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/time-compat-1.9.2.2:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.7.2:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >=4.5    && <4.13' 'base       >=4.5' \
-		'base-compat          >=0.9.3   && <0.11' 'base-compat          >=0.9.3'
-}
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
new file mode 100644
index 000000000000..9356b57ae4e2
--- /dev/null
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.27.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 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 test-suite"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+DESCRIPTION="Common quickcheck instances"
+HOMEPAGE="https://github.com/haskellari/qc-instances"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/data-fix-0.3:=[profile?] <dev-haskell/data-fix-0.4:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=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:=[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?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-short-0.1.3:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+	>=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/transformers-compat-0.6.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
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
new file mode 100644
index 000000000000..3460fbf27534
--- /dev/null
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.29.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Common quickcheck instances"
+HOMEPAGE="https://github.com/haskellari/qc-instances"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/data-array-byte-0.1.0.1:=[profile?] <dev-haskell/data-array-byte-0.2:=[profile?]
+	>=dev-haskell/data-fix-0.3:=[profile?] <dev-haskell/data-fix-0.4:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=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.5:=[profile?]
+	>=dev-haskell/primitive-0.6.4.0:=[profile?] <dev-haskell/primitive-0.9:=[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?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-short-0.1.3:=[profile?] <dev-haskell/text-short-0.2:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.3:=[profile?]
+	>=dev-haskell/time-compat-1.9.4:=[profile?] <dev-haskell/time-compat-1.10:=[profile?]
+	>=dev-haskell/transformers-compat-0.6.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.2.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.12.3.1:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/quickcheck-io/Manifest b/dev-haskell/quickcheck-io/Manifest
index c3d08e82f50e..e8155dc11f37 100644
--- a/dev-haskell/quickcheck-io/Manifest
+++ b/dev-haskell/quickcheck-io/Manifest
@@ -1,4 +1 @@
-DIST quickcheck-io-0.1.1.tar.gz 1646 BLAKE2B 5265db0739e4d2b5fdc06b7d087b0d04870046feafd52cbfe87a458578ea93cf0d19359ff05e3aab1f676c890d5f9a05dccfda44176a4d0c2b1f19befc1969a2 SHA512 440e15d8600f7b0f662cacf176dfb1c00371add4204fad3ffcf56e092d92b3405a2e5a0a6e03b265c83dbc2ff18f3f47213e8086164840d5c8da35b575ebb007
-DIST quickcheck-io-0.1.2.tar.gz 1784 BLAKE2B dc3360c61cb5c6e8f69b9a7e92dc99590cf55c0ab68b4af82cadd3e128abd8e2d902d5958bc7f9cf50a2e058be4c72ff334eedc50c49b65470cee00d9e9e50d4 SHA512 3a3f1ff1bb8fc4924396cc6ba7dc827f41f2d7186707c78325eca3fea5bafa0257cad4d69debae0d7847c10dff88281fa3c9bd63e1882a1fad7c1f3448132835
-DIST quickcheck-io-0.1.4.tar.gz 1808 BLAKE2B 02772839b9934f0a98d7cec02d34b6280adf73440881ee03a6546707547f68cc25a844525a247419144ea96a51d7630c36cb55a36c7fffbfb5c0729e2f638618 SHA512 791e9ddaf973238adb7049163682e3ca7caee3f676f2534e68c0dd84ad9059eebfa3e6544531cb346e2c114586fde6d81247d867e101a8017d48bfaf58841380
 DIST quickcheck-io-0.2.0.tar.gz 1843 BLAKE2B ee6179ed912313a17d0506c35ae79853aba4e31fab90c1f6727b59879bf3b172f739eb6be5186af1aea47342aa8a357bb4565299a820beaf104e642338db01e9 SHA512 02e1f40bac8f31f27c21d1d2df9f226816f9da871092b09f0451a8321e250c9e94887f94889be421c9d0034e0a27b02c907d16eb7da5a4376df42c7c1fbd01df
diff --git a/dev-haskell/quickcheck-io/metadata.xml b/dev-haskell/quickcheck-io/metadata.xml
index 601e4db9c3b8..6a2d9c17070d 100644
--- a/dev-haskell/quickcheck-io/metadata.xml
+++ b/dev-haskell/quickcheck-io/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
deleted file mode 100644
index 7cb38a7e6eb8..000000000000
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use HUnit assertions as QuickCheck properties"
-HOMEPAGE="https://hackage.haskell.org/package/quickcheck-io"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild
deleted file mode 100644
index b3f70afa9efc..000000000000
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use HUnit assertions as QuickCheck properties"
-HOMEPAGE="https://github.com/hspec/quickcheck-io#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild
deleted file mode 100644
index 15a75829ac09..000000000000
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use HUnit assertions as QuickCheck properties"
-HOMEPAGE="https://github.com/hspec/quickcheck-io#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
-	>=dev-haskell/quickcheck-2.5.1:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
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 9e063340a407..d0d77abef81c 100644
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.3.9999
 
@@ -14,11 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+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 4286230ad142..afefe6541d27 100644
--- a/dev-haskell/quickcheck-unicode/Manifest
+++ b/dev-haskell/quickcheck-unicode/Manifest
@@ -1,2 +1 @@
-DIST quickcheck-unicode-1.0.0.1.tar.gz 3145 BLAKE2B 04c87c9deee25a9eca10b916f0073ea91a348ba901ad0b85d6b5e82f915f003d1260d91271571f6ada077933683df8a3aec8109d4423f92fe4175f3f7e7b9ce9 SHA512 93ca26350243f509027c41279474b45679af445f19a2454ca4c4e980d0ba76f8ea5a6091197d575093af67e08461d6ca436270496d985d1a33fb6d958fcae371
 DIST quickcheck-unicode-1.0.1.0.tar.gz 3216 BLAKE2B 29a0736759a4b17b7623a14ffc13048fd7d516275918ce61d6fa5c546999b24f2a763bd4b91993f3609c32a16558f38c24c019ff13a8120982e1c02e42bee83a SHA512 4762d9cdf7624e28586ed18ad05f273b600bf664cb3f3f76d9e33dd217181f49f5835ac6276da8d5302dbf89fe65cec4e9d3c1e57dfc457ee3b3748467672c15
diff --git a/dev-haskell/quickcheck-unicode/metadata.xml b/dev-haskell/quickcheck-unicode/metadata.xml
index ab1e4f216a15..0efb136df64e 100644
--- a/dev-haskell/quickcheck-unicode/metadata.xml
+++ b/dev-haskell/quickcheck-unicode/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Generator and shrink functions for testing
-		Unicode-related software.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">quickcheck-unicode</remote-id>
 		<remote-id type="github">bos/quickcheck-unicode</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild
deleted file mode 100644
index 242646a1e8ba..000000000000
--- a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generator and shrink functions for testing Unicode-related software"
-HOMEPAGE="https://github.com/bos/quickcheck-unicode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
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 2b9116dc605a..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
@@ -1,25 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-# ebuild generated by hackport 0.5.2.9999
+# ebuild generated by hackport 0.8.4.0.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Generator and shrink functions for testing Unicode-related software"
 HOMEPAGE="https://github.com/bos/quickcheck-unicode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
-RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+RDEPEND=">=dev-haskell/quickcheck-2.7:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-3.2.1.0
 "
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index e20d07005e36..337abbc91663 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -1,6 +1,2 @@
-DIST QuickCheck-2.13.2.tar.gz 70427 BLAKE2B a2676dfd98f8aafa2ccc2e0dbe32d23d70d811e940ec8f6ae7e85b65feef07094d8edd66548961b6217b05eba30e19b6a76eed3b15cdd0293591d97252c9662a SHA512 d2c92caec8bdf9089483b1f256f17f3d50e066f57eddb630f1831a232c4e33a0d4f55a0f927aa433cd3379283fa2615fd2937941e6847b234ea00b0fbeb46b98
-DIST QuickCheck-2.6.tar.gz 26466 BLAKE2B e8b4ba40cb403fe487fe483a133be8b951e36ab1ebe748a32dc22eb490e7f9b5e15da010353777651e65668e8cf5cc4c9919d28becde28238a0ff3ed8292779f SHA512 17cfa7b9ee2fa3e31b48ed3609d5e3bb2316b99251e45e56d377a198d8cb429696e25ecb35ef1bf5cac7e313381274c646393697604f1feefe225fc692e01166
-DIST QuickCheck-2.7.6.tar.gz 34513 BLAKE2B e8f8252655426896f899162f374f447960c95ec5d57ec08d23f64fa3ac59040864a13bd455e14d58940c4015e0ca537e08723602a6114ba6aed1f7aafe5a01a7 SHA512 21e17fbe6dfc2425a948c789ac7d519cfb21c48df68b63de68e6af192d9642d24e1e46ba0b356767e2a10461a3032a4742a6608248574ae458fd2f03649f0451
-DIST QuickCheck-2.8.1.tar.gz 38999 BLAKE2B 6c53c760cfe9ac686f9b41a3a440b25cf84f52246bf4a42652eaf1cb3938586566cb597d2ee8f2ed632b4e31d0fa45ce2479e1573cef30e64ef19f06349fc6b8 SHA512 def1f7141b80be5b508e396c069f6f270c9b890b0ce03df41e058092e6dad28ed8c838734814066307777e6b8b93f154d1b0bf9b4a7052318ec018ef0901c1ef
-DIST QuickCheck-2.8.2.tar.gz 39725 BLAKE2B a817a03677fd44fe9554e54b86ba71ba32338845c397e1debd9bc128200f1351acc6262deb1e2b2d26a9c75811b688220c2a02813e7f4ea898953679caa6ba9a SHA512 661b9e5285f56f69f8807ad0679ca4e18d0ac648233d5f6cbcfda548fcfcf3bc1b790c409f66fdf67cc4a3b769a248b43b0cd1abd103ae6d9a596978c5af4aba
-DIST QuickCheck-2.9.2.tar.gz 43417 BLAKE2B e4721bdee29b2e6d4f349758c6355a633fa60574c34fe59a6f7698a4e59ebeec4ad9d01ecd9324723f9495b2819606588c235c74f6243e688d96c4380fec09a9 SHA512 7b8bad1995e6ce5484f627f9edab91cb8d124b63444e9f62b613b0d1558c2639101dd30d6c455e7f66ffa613f704aeead89faceea56eb411ba8ed15472edb917
+DIST QuickCheck-2.14.2.tar.gz 75246 BLAKE2B a64ad51f3daa858a224c00fb785979460b638d76f20c7a19d95a6303cd5da61adaa40cb52e154dd15218adbf54fff184f16ab3b932895294cf37f24982a2b9cc SHA512 84decd354e6093bc72afd125410499dd4be3ae8fdbf0a3b466011b4dbcb5c5657e51ab75cfe22790e22bf4ac54cbb1203ff7a0d108e872ce60f4831be827a6e5
+DIST quickcheck-2.14.3.tar.gz 76849 BLAKE2B e3a0eefaebd27fe5e11c4ed8dd7120b42e688be1cd249ee88a8b6b25a248376fae6d3f2f0506f675040314e019baeb60eac993421a0a7d87f821cdab01e93be5 SHA512 d00499fcdbe66d384a40c66a0d01dfe80f0622599f2f19ab569b45ef13c8d726c855b4687c7a1be022ea22df4bc66c48cf12fc156fadc558714fccc5a3deef7e
diff --git a/dev-haskell/quickcheck/metadata.xml b/dev-haskell/quickcheck/metadata.xml
index 120011b0413e..6d0a1dba3e0c 100644
--- a/dev-haskell/quickcheck/metadata.xml
+++ b/dev-haskell/quickcheck/metadata.xml
@@ -1,28 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="template-haskell">Enable additional test modules requiring Template Haskell support.</flag>
+		<flag name="template-haskell">Build Test.QuickCheck.All, which uses Template Haskell.</flag>
 	</use>
-	<longdescription>
-		QuickCheck is a library for random testing of program properties.
-		
-		The programmer provides a specification of the program, in
-		the form of properties which functions should satisfy, and
-		QuickCheck then tests that the properties hold in a large number
-		of randomly generated cases.
-		
-		Specifications are expressed in
-		Haskell, using combinators defined in the QuickCheck library.
-		QuickCheck provides combinators to define properties, observe
-		the distribution of test data, and define test
-		data generators.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">QuickCheck</remote-id>
 		<remote-id type="github">nick8325/quickcheck</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild
deleted file mode 100644
index b22abf4396ab..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.13.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: +base4,-base3,templatehaskell:template-haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/random-1.0.1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/splitmix-0.0.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template-haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
new file mode 100644
index 000000000000..ab6efc03e6ab
--- /dev/null
+++ b/dev-haskell/quickcheck/quickcheck-2.14.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +base4,-base3,-old-random,templatehaskell:template-haskell
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="QuickCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Automatic testing of Haskell programs"
+HOMEPAGE="https://github.com/nick8325/quickcheck"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	>=dev-haskell/random-1.2.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-base3 \
+		--flag=base4 \
+		--flag=-old-random \
+		$(cabal_flag template-haskell templatehaskell)
+}
diff --git a/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
new file mode 100644
index 000000000000..6af1c5d02f8f
--- /dev/null
+++ b/dev-haskell/quickcheck/quickcheck-2.14.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +base4,-base3,-old-random,templatehaskell:template-haskell
+
+CABAL_PN="QuickCheck"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatic testing of Haskell programs"
+HOMEPAGE="https://github.com/nick8325/quickcheck"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="+template-haskell"
+
+RDEPEND=">=dev-haskell/random-1.2.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-base3 \
+		--flag=base4 \
+		--flag=-old-random \
+		$(cabal_flag template-haskell templatehaskell)
+}
diff --git a/dev-haskell/quickcheck/quickcheck-2.6.ebuild b/dev-haskell/quickcheck/quickcheck-2.6.ebuild
deleted file mode 100644
index 21e335966b81..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+template-haskell"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag template-haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild b/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
deleted file mode 100644
index 0cf65a19c507..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: +base4,-base3,templatehaskell:template-haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+template-haskell"
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-haskell/tf-random-0.4:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template-haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
deleted file mode 100644
index 546644688800..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +base4,-base3,templatehaskell:template-haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+template-haskell"
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-haskell/tf-random-0.4:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template-haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
deleted file mode 100644
index bd5b90e9d991..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4,-base3,templatehaskell:template-haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+template-haskell"
-
-RESTRICT=test # to avoid test circular depends
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-haskell/tf-random-0.4:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template-haskell templatehaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild
deleted file mode 100644
index da927a6a25b4..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +base4,-base3,templatehaskell:template-haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+template-haskell"
-
-RESTRICT=test # to avoid test circular depends
-
-RDEPEND=">=dev-haskell/nats-1:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/semigroups-0.9:=[profile?]
-	>=dev-haskell/tf-random-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( template-haskell? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template-haskell templatehaskell)
-}
diff --git a/dev-haskell/random-bytestring/Manifest b/dev-haskell/random-bytestring/Manifest
new file mode 100644
index 000000000000..b01268cee054
--- /dev/null
+++ b/dev-haskell/random-bytestring/Manifest
@@ -0,0 +1 @@
+DIST random-bytestring-0.1.4.tar.gz 79911 BLAKE2B 2d4eb685a231a891a04050a6c2c71c6088b77220872b1aebc02e8db77fd12ab01aeed30f724207f1a544206eb79fab3499222d9997e4ea7ed967a4ea34922492 SHA512 17d7a2a758fbfc88ef1bcf6231f28276ecc5e363521b5fab38b539cf191c80c2dedeefe6d59346b7dff2def87b1e18657f13db8f43cf3c447142909fb3012ed5
diff --git a/dev-haskell/random-bytestring/metadata.xml b/dev-haskell/random-bytestring/metadata.xml
new file mode 100644
index 000000000000..20123659e2c8
--- /dev/null
+++ b/dev-haskell/random-bytestring/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+	<use>
+		<flag name="pcg">compile with support for PCG from pcg-random</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">larskuhtz/random-bytestring</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/random-bytestring/random-bytestring-0.1.4.ebuild b/dev-haskell/random-bytestring/random-bytestring-0.1.4.ebuild
new file mode 100644
index 000000000000..77e5d04ff939
--- /dev/null
+++ b/dev-haskell/random-bytestring/random-bytestring-0.1.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient generation of random bytestrings"
+HOMEPAGE="https://www.github.com/larskuhtz/random-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+pcg"
+
+RDEPEND=">=dev-haskell/mwc-random-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	pcg? ( >=dev-haskell/pcg-random-0.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag pcg with-pcg)
+}
diff --git a/dev-haskell/random/Manifest b/dev-haskell/random/Manifest
index dd142166b4b6..5075de49a7fd 100644
--- a/dev-haskell/random/Manifest
+++ b/dev-haskell/random/Manifest
@@ -1,2 +1,2 @@
-DIST random-1.0.1.1.tar.gz 8699 BLAKE2B 0a17331887ff1b16cf86ba914984581daaf38ba51daf51382393254b1d9ab77849c8f428088cc97128b02eee35074dfa29ae1cf077f4ad29cee726ec5319202a SHA512 dc2f76e87a497d6f5196a8829027d5a9f0eaa2907995f432e26a1594c287c90884253a994fc4a325b0c05c97816e3c3b940a97ccb50d31917a87a99200f1ebff
-DIST random-1.1.tar.gz 10870 BLAKE2B e26794bf5dd05b39bdd92afb55abde54d35ff4f7116753ff8b901c8cc18ea71a73fbcb5fc7c1c4a2d35f33ebcf1a3dbbdc0018cb2f8fb1978c35960b95e90606 SHA512 7f128b1c88adfe7ee6405578d3c999bb77e9e3c21e16f82a5197c0ad1d6731851e99e08d8169c6a8b1068ad8a1614c1c0ef8c04c1958337a6e325f1de0c718a3
+DIST random-1.2.1.1.tar.gz 47109 BLAKE2B a7234569569cfd87c04e9f294390cb8f6be1a068d56f1fc5b19b098474d66b8b82211c688d07570de23f2bd6379adf4869b0444af237bf95017abeb3f3c1a42a SHA512 4d5565390849cf85b2f307cd93f284a1f9094cfcd692beb5dd5f3ec917dd69ad7158fb52b1faa581eb573af25beee1f6c2830472ebb6553da6cfa01a4e954326
+DIST random-1.2.1.tar.gz 47143 BLAKE2B 861a216b063aa893a9de645cca231fb1a1914609ea4dd8ec222b35db6ee9cc60760a613896e979f731d3e1a55ea792a294d380313e78549c6effc21b77d57564 SHA512 b130a90981de53b4fc3e7cf660224268d24bcceb9498d33827d9f43dc705c9a724c23999c4cf0222127f4c69daebf0d049d963abbea0a860135d661f9cc55731
diff --git a/dev-haskell/random/metadata.xml b/dev-haskell/random/metadata.xml
index 1d905554c62c..937381521944 100644
--- a/dev-haskell/random/metadata.xml
+++ b/dev-haskell/random/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a random number library.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/random/random-1.0.1.1-r1.ebuild b/dev-haskell/random/random-1.0.1.1-r1.ebuild
deleted file mode 100644
index 5b10459d84a1..000000000000
--- a/dev-haskell/random/random-1.0.1.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="random number library"
-HOMEPAGE="https://hackage.haskell.org/package/random"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/random/random-1.1.ebuild b/dev-haskell/random/random-1.1.ebuild
deleted file mode 100644
index 9a6055fcd458..000000000000
--- a/dev-haskell/random/random-1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="random number library"
-HOMEPAGE="https://hackage.haskell.org/package/random"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/random/random-1.2.1.1.ebuild b/dev-haskell/random/random-1.2.1.1.ebuild
new file mode 100644
index 000000000000..b0f7e3246305
--- /dev/null
+++ b/dev-haskell/random/random-1.2.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 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" # test-suite circular depend
+inherit haskell-cabal
+
+DESCRIPTION="Pseudo-random number generation"
+HOMEPAGE="https://hackage.haskell.org/package/random"
+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"
+
+# circular depend: random[test]->mwc-random->math-functions[test]->vector-th-unbox->vector->random
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
+# 	test? ( >=dev-haskell/doctest-0.15 <dev-haskell/doctest-0.21
+# 		>=dev-haskell/mwc-random-0.13 <dev-haskell/mwc-random-0.16
+# 		>=dev-haskell/primitive-0.6 <dev-haskell/primitive-0.8
+# 		>=dev-haskell/smallcheck-1.2 <dev-haskell/smallcheck-1.3
+# 		dev-haskell/stm
+# 		>=dev-haskell/tasty-1.0 <dev-haskell/tasty-1.5
+# 		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+# 		dev-haskell/tasty-inspection-testing
+# 		>=dev-haskell/tasty-smallcheck-0.8 <dev-haskell/tasty-smallcheck-0.9
+# 		>=dev-haskell/unliftio-0.2 <dev-haskell/unliftio-0.3
+# 		>=dev-haskell/vector-0.10 <dev-haskell/vector-0.14 )
+# "
diff --git a/dev-haskell/random/random-1.2.1.ebuild b/dev-haskell/random/random-1.2.1.ebuild
new file mode 100644
index 000000000000..f0b36315ebd3
--- /dev/null
+++ b/dev-haskell/random/random-1.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite circular depend
+inherit haskell-cabal
+
+DESCRIPTION="Pseudo-random number generation"
+HOMEPAGE="https://hackage.haskell.org/package/random"
+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"
+
+# circular depend: random[test]->mwc-random->math-functions[test]->vector-th-unbox->vector->random
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/splitmix-0.1:=[profile?] <dev-haskell/splitmix-0.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
diff --git a/dev-haskell/ranges/Manifest b/dev-haskell/ranges/Manifest
deleted file mode 100644
index 14b3599c4140..000000000000
--- a/dev-haskell/ranges/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ranges-0.2.4.tar.gz 2244 BLAKE2B 5aa880d0dd101924ecdf1f5c6e22ed71b795ac3d7f07155e49c3a462437527e4d3bce279b02758940257bc14de8cd9a6bee69c62a7d6b67820a92882e8d03778 SHA512 384982a7a3d9a2cf5e8cd525a4175671258869ed9bf676e607e02158daa5e658b5924559a9e223d121039efe9f097516d04703d39dba9cdf6bd53bf7b240f18e
diff --git a/dev-haskell/ranges/metadata.xml b/dev-haskell/ranges/metadata.xml
deleted file mode 100644
index 7436202fba1d..000000000000
--- a/dev-haskell/ranges/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Ranges and some functions allowing things like fast membership
-		lookup on ranges with holes in them and so on.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/ranges/ranges-0.2.4-r1.ebuild b/dev-haskell/ranges/ranges-0.2.4-r1.ebuild
deleted file mode 100644
index f89a848f76bd..000000000000
--- a/dev-haskell/ranges/ranges-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Ranges and various functions on them"
-HOMEPAGE="https://hackage.haskell.org/package/ranges"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
diff --git a/dev-haskell/raw-strings-qq/metadata.xml b/dev-haskell/raw-strings-qq/metadata.xml
index 5ad95befed52..222aa0dca204 100644
--- a/dev-haskell/raw-strings-qq/metadata.xml
+++ b/dev-haskell/raw-strings-qq/metadata.xml
@@ -1,19 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		A quasiquoter for raw string literals - that is, string literals that don't
-		recognise the standard escape sequences (such as @\'\\n\'@). Basically, they
-		make your code more readable by freeing you from the responsibility to
-		escape backslashes. They are useful when working with regular expressions,
-		DOS/Windows paths and markup languages (such as XML).
-		
-		See @examples/RawRegex.hs@ for a usage example.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">23Skidoo/raw-strings-qq</remote-id>
 	</upstream>
diff --git a/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild b/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
index 58b87fc62146..c96364a9b776 100644
--- a/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
+++ b/dev-haskell/raw-strings-qq/raw-strings-qq-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/readable/Manifest b/dev-haskell/readable/Manifest
deleted file mode 100644
index f8a74eb7a162..000000000000
--- a/dev-haskell/readable/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST readable-0.3.1.tar.gz 2907 BLAKE2B af3dab05bb8eba05bca049cb8991e3b46c38e8a4bab73f81c4c2fd4fb62f9e4134071eac0f69d4354be6b02df70ddfe1bd2a7bf59407434ba265371d0006c979 SHA512 237467c4b6dfef9fe090c53e45a1f4261e34fc947b16878575c2b1d2b93400a67678bfde3ad8500f82c56a4b87c5b45e561304c9936572a033d7b295740fb3be
diff --git a/dev-haskell/readable/metadata.xml b/dev-haskell/readable/metadata.xml
deleted file mode 100644
index f4857ab56a2a..000000000000
--- a/dev-haskell/readable/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides a Readable type class for reading data types from ByteString and
-		Text.  Also includes efficient implementations for common data types.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mightybyte/readable</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/readable/readable-0.3.1.ebuild b/dev-haskell/readable/readable-0.3.1.ebuild
deleted file mode 100644
index 50080957c397..000000000000
--- a/dev-haskell/readable/readable-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reading from Text and ByteString"
-HOMEPAGE="https://github.com/mightybyte/readable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/readargs/Manifest b/dev-haskell/readargs/Manifest
deleted file mode 100644
index 1f6ba42d2141..000000000000
--- a/dev-haskell/readargs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ReadArgs-1.2.2.tar.gz 5102 BLAKE2B 4c1cefa9bc207d8e8473fb0e02aa5cdfef66c8b5135227ef83071325fc11f391226a15ff66e8adfa4ac6b83ebe276139a22e60df9a380c174cfb51ca0680aa5f SHA512 d6a50b4f3b97932f2edb67eb5d2af01f057b17f991f499c01c5005738cf96a55dc08453250e61a1dbbebad9c0a75c53e1caf0fbce00da5eb6c00e214595c331b
-DIST ReadArgs-1.2.3.tar.gz 5100 BLAKE2B 8d0ee19cb417a0159b9a0488f30d11319c7ce278713bbf6c0531385b6c337c2aad5f85a3d22e8559c8b13b3a89a9f42174cb53fe6e4ae2190740845c9c70002b SHA512 6fd78b26c6c0d7d2f40f1b4eef248eb55d8dc91668b578b2cf88132a364dd7741f6f4d389aeb0c80bdca7cb5dfc1524228113495a2ea3595b888eb27fb8d2dff
diff --git a/dev-haskell/readargs/metadata.xml b/dev-haskell/readargs/metadata.xml
deleted file mode 100644
index f863232f251c..000000000000
--- a/dev-haskell/readargs/metadata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		ReadArgs provides the @readArgs@ IO action, which lets you tell the compiler
-		to parse the command line arguments to fit the type signature you give.
-		
-		For example @(a :: Int, b :: String, c :: Float) &lt;- readArgs@ would
-		parse the first runtime argument as an @Int@, the second as a @String@ (no
-		quotes required) and the third as a @Float@.
-		
-		If the runtime arguments are incompatible with the type signature,
-		then a simple usage statement is given of the types needed.
-		
-		Continuing the previous example, if it was used in a
-		program named @Example@, the error message for the above
-		action would be:
-		
-		@
-		usage: Example Int String Float
-		@
-		
-		Any type that has both @Typeable@ and @Read@ instances
-		can be used. @Char@, @String@, and @Text@ are handled specially so that
-		command line arguments for both do not require quotes (as their
-		@Read@ instances do). A special instance is provided for @FilePath@ so
-		that no constructor or quotes are required.
-		
-		@readArgs@ also supports optional arguments and variadic arguments.
-		Optional arguments are specified using @Maybe@, and variadic arguments
-		using a list.  @(a :: Int, b :: Maybe String, c :: [Float]) &lt;- readArgs@
-		would successfully parse any of the following sets of command line arguments:
-		
-		@
-		Example 1
-		Example 1 2 3 4
-		Example 1 foo
-		Example 1 foo 2 3 4
-		@
-		
-		But not
-		
-		@
-		Example
-		Example foo
-		Example 1.0
-		@
-		
-		Usage statements for optional and variadic arguments use command-line
-		parlance:
-		
-		@
-		usage: Example Int [String] [Float..]
-		@
-		
-		Note that both optional and variadic parsers are greedy by default
-		(so @Example 1 2 3 4@ was parsed as @(1, "2", [3.0,4.0])@.  They
-		may both be made non-greedy through use of the @NonGreedy@ constructor:
-		
-		@
-		( a :: Int
-		, NonGreedy b :: NonGreedy Maybe String
-		, NonGreedy c :: NonGreedy [] Float
-		) &lt;- readArgs
-		@
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rampion/ReadArgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/readargs/readargs-1.2.2.ebuild b/dev-haskell/readargs/readargs-1.2.2.ebuild
deleted file mode 100644
index 348a5522d553..000000000000
--- a/dev-haskell/readargs/readargs-1.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ReadArgs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple command line argument parsing"
-HOMEPAGE="https://github.com/rampion/ReadArgs"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		'hspec >= 1.3 && < 2.1' 'hspec >= 1.3'
-}
diff --git a/dev-haskell/readargs/readargs-1.2.3.ebuild b/dev-haskell/readargs/readargs-1.2.3.ebuild
deleted file mode 100644
index 3c69dcd1e438..000000000000
--- a/dev-haskell/readargs/readargs-1.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ReadArgs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple command line argument parsing"
-HOMEPAGE="https://github.com/rampion/ReadArgs"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.11.1.13:=[profile?] <dev-haskell/text-12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 <dev-haskell/hspec-3 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/readline/Manifest b/dev-haskell/readline/Manifest
deleted file mode 100644
index 5014cfbe8f5a..000000000000
--- a/dev-haskell/readline/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST readline-1.0.3.0.tar.gz 52261 BLAKE2B 2b474efd091be91c46f121b144de719531943aba17d7cf845b2960b3f3dea77905a5838c8b7ab26975628763041321c0cd1aa8c34114205228466fb41c357e8e SHA512 30a8705323fe0185cadccd8ddf7069ce70007a8fc29761f31d0a4d585a5f3b622c9ae71d41577a7eec3a1c6f78949f9c56695df3a7986abef228e7ceb7375520
diff --git a/dev-haskell/readline/files/readline-1.0.3.0-tinfo.patch b/dev-haskell/readline/files/readline-1.0.3.0-tinfo.patch
deleted file mode 100644
index d6055164bab2..000000000000
--- a/dev-haskell/readline/files/readline-1.0.3.0-tinfo.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-https://bugs.gentoo.org/690268
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,3 +57,4 @@ else
-       AC_CHECK_LIB(curses, tputs, HaveLibTermcap=YES; LibTermcap=curses,
--        HaveLibTermcap=NO; LibTermcap=not-installed)))
-+        AC_CHECK_LIB(tinfo, tputs, HaveLibTermcap=YES; LibTermcap=tinfo,
-+          HaveLibTermcap=NO; LibTermcap=not-installed))))
- 
diff --git a/dev-haskell/readline/metadata.xml b/dev-haskell/readline/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/readline/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/readline/readline-1.0.3.0-r1.ebuild b/dev-haskell/readline/readline-1.0.3.0-r1.ebuild
deleted file mode 100644
index 397dd859a5f4..000000000000
--- a/dev-haskell/readline/readline-1.0.3.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit autotools haskell-cabal
-
-DESCRIPTION="An interface to the GNU readline library"
-HOMEPAGE="https://hackage.haskell.org/package/readline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-PATCHES=("${FILESDIR}"/${P}-tinfo.patch)
-
-src_prepare() {
-	default
-
-	# Default setup is not compatible to cabal-3
-	rm Setup.hs || die
-
-	eautoconf
-}
diff --git a/dev-haskell/readline/readline-1.0.3.0.ebuild b/dev-haskell/readline/readline-1.0.3.0.ebuild
deleted file mode 100644
index 488b3507405c..000000000000
--- a/dev-haskell/readline/readline-1.0.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An interface to the GNU readline library"
-HOMEPAGE="https://hackage.haskell.org/package/readline"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/rebase/Manifest b/dev-haskell/rebase/Manifest
deleted file mode 100644
index 2f24e814cad4..000000000000
--- a/dev-haskell/rebase/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rebase-1.4.1.tar.gz 19413 BLAKE2B 965f5633496df14611e496150e3fed91324df7189fd1e6c8ec6c2bf7492287b97c716c7da60f61e36740a9e535daf8ee3f7f6349615055a3ec093e167c825605 SHA512 70bb6513e6ea6a1cd3adf077fe454cf4f1a3b220224fc76e3d63050f17c22cc2d218efa8803f269a3605cb0b95e7ea11b3e8b55ec80cd7fb2db4dbf330739a18
diff --git a/dev-haskell/rebase/metadata.xml b/dev-haskell/rebase/metadata.xml
deleted file mode 100644
index f74069f161de..000000000000
--- a/dev-haskell/rebase/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package is intended for those who are tired of keeping
-		long lists of dependencies to the same essential libraries in each package
-		as well as the endless imports of the same APIs all over again.
-		It also supports the modern tendencies in the language.
-		
-		To solve those problems this package does the following:
-		
-		* Reexport the original APIs under the \&quot;Rebase\&quot; namespace.
-		
-		* Export all the possible non-conflicting symbols from the \&quot;Rebase.Prelude\&quot; module.
-		
-		* Give priority to the modern practices in the conflicting cases.
-		
-		The policy behind the package is only to reexport the non-ambiguous
-		and non-controversial APIs, which the community has obviously settled on.
-		The package is intended to rapidly evolve with the contribution from the community,
-		with the missing features being added with pull-requests.
-	</longdescription>
-</pkgmetadata>
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/recaptcha/Manifest b/dev-haskell/recaptcha/Manifest
deleted file mode 100644
index 1f0fe2bfbfa8..000000000000
--- a/dev-haskell/recaptcha/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST recaptcha-0.1.0.3.tar.gz 2742 BLAKE2B 574c4f96fd3a1994f8aef67ebf472b49461d9231d787e5e7cc61a659fbbf9f3306147bcd89d2c371fc1ba28accb98cddc81281e1e11314ede59f9ecdaa8ea3ef SHA512 acfb3a14a48e068762fa5b6032dba298b0ac7a674753337c94f1665e6abb24a6761416a6a1cc35b6d05c71cf272e6b0f7c938678233eec33b61b4e053af17b2e
-DIST recaptcha-0.1.0.4.tar.gz 2724 BLAKE2B 21513aa79f74a8442deeb2355113cb545eef90392d1090ff1623ee094801f5d989d3d46e094c0a3af40bfb3ff294c4f0e611d5c4cb56cc4653945728d65e5a38 SHA512 e1827f03b70131dfdfe087f139c1ace6da8bd1849ea83ddf4fe7ee33e224369f9530cf6e9d93c38acdf92ff0470c42e79774ae3cddce3209210f597ddb82e41f
diff --git a/dev-haskell/recaptcha/metadata.xml b/dev-haskell/recaptcha/metadata.xml
deleted file mode 100644
index 2b52257bb2ec..000000000000
--- a/dev-haskell/recaptcha/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		reCAPTCHA (http://recaptcha.net/) is a service that provides
-		captchas for preventing automated spam in web applications.
-		recaptcha-hs provides functions for using reCAPTCHA in Haskell
-		web applications.
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jgm/recaptcha</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/recaptcha/recaptcha-0.1.0.3.ebuild b/dev-haskell/recaptcha/recaptcha-0.1.0.3.ebuild
deleted file mode 100644
index b4030a5312f0..000000000000
--- a/dev-haskell/recaptcha/recaptcha-0.1.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Functions for using the reCAPTCHA service in web applications"
-HOMEPAGE="https://github.com/jgm/recaptcha/tree/master"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/http-3001.1.4:=[profile?]
-	>=dev-haskell/xhtml-3000.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild b/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild
deleted file mode 100644
index 77661085baed..000000000000
--- a/dev-haskell/recaptcha/recaptcha-0.1.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Functions for using the reCAPTCHA service in web applications"
-HOMEPAGE="https://github.com/jgm/recaptcha/tree/master"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/http-3001.1.4:=[profile?]
-	>=dev-haskell/xhtml-3000.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/recv/Manifest b/dev-haskell/recv/Manifest
new file mode 100644
index 000000000000..fecfaff17093
--- /dev/null
+++ b/dev-haskell/recv/Manifest
@@ -0,0 +1 @@
+DIST recv-0.1.0.tar.gz 5158 BLAKE2B b0a935096b620c5b1026998d175ddfde2d775852d777b767a3aeea590b4ac7bcf64b9b3c42a2c1d791a49d8e36c6ae413480794cc1d05aed5842a3bd8fe3f592 SHA512 24fc55bac9e96da56328fa04901041330f9b89e36ec9c4663a6a66b57d38d16e4d374126ff634086449b71e3546d66dcbcfe69d4096d7a2f94fab42b5d35d49f
diff --git a/dev-haskell/recv/metadata.xml b/dev-haskell/recv/metadata.xml
new file mode 100644
index 000000000000..2073c88a22ff
--- /dev/null
+++ b/dev-haskell/recv/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">recv</remote-id>
+		<remote-id type="github">yesodweb/wai</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/recv/recv-0.1.0.ebuild b/dev-haskell/recv/recv-0.1.0.ebuild
new file mode 100644
index 000000000000..53bd8f3d0d2b
--- /dev/null
+++ b/dev-haskell/recv/recv-0.1.0.ebuild
@@ -0,0 +1,24 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient network recv"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/network-3.1.0:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/reducers/Manifest b/dev-haskell/reducers/Manifest
index 3897e35edde2..07ffc9485b1c 100644
--- a/dev-haskell/reducers/Manifest
+++ b/dev-haskell/reducers/Manifest
@@ -1,3 +1,3 @@
-DIST reducers-3.10.3.2.tar.gz 10934 BLAKE2B 012e849fa7b5a3d44ee26fe8c31dd8684df55dd9bbc4880978cbcfb6dfc05494be2663071f8c06005a90d91cf7737deadeff76728aec6166e989f3657810b7d5 SHA512 fb367dd45cd61ef9f4c0208c68b0b1f5a76fcb136730a5ba7a4a2e3feb56c8cfc3e6d8d4980f68fa466d63e2f65f08ff9305d01a10d581331045cf4ab0e24684
-DIST reducers-3.12.1.tar.gz 11538 BLAKE2B fbb5cc958084524cc1c00a8fc04afa4e052411f3c6b99e3961942354c35ad5df92e31510b4bc092ea5dbdfc4619ee2bcd3e1cf9c0fe85ccac38a6e62a0928cd9 SHA512 56ebaff2f10e8982e420d6f9cbdf1db1b4a75e609d5c5b629815b248b238b1ca1fd6039e47b784ca6555462f4977631b0d40b84c0454cfe19b0fe1c2f8dc96a6
 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
diff --git a/dev-haskell/reducers/metadata.xml b/dev-haskell/reducers/metadata.xml
index b1ef0981e965..d3d0c2bd801c 100644
--- a/dev-haskell/reducers/metadata.xml
+++ b/dev-haskell/reducers/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Semigroups, specialized containers and a general map/reduce framework
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">reducers</remote-id>
 		<remote-id type="github">ekmett/reducers</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/reducers/reducers-3.10.3.2.ebuild b/dev-haskell/reducers/reducers-3.10.3.2.ebuild
deleted file mode 100644
index 2c5409ee61b4..000000000000
--- a/dev-haskell/reducers/reducers-3.10.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroups, specialized containers and a general map/reduce framework"
-HOMEPAGE="https://github.com/ekmett/reducers/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/reducers/reducers-3.12.1-r1.ebuild b/dev-haskell/reducers/reducers-3.12.1-r1.ebuild
deleted file mode 100644
index 5a28a903b537..000000000000
--- a/dev-haskell/reducers/reducers-3.12.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroups, specialized containers and a general map/reduce framework"
-HOMEPAGE="https://github.com/ekmett/reducers/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=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/transformers-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers           >= 0.2      && < 0.5' 'transformers           >= 0.2'
-}
diff --git a/dev-haskell/reducers/reducers-3.12.3-r1.ebuild b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
new file mode 100644
index 000000000000..ff4a631e7b31
--- /dev/null
+++ b/dev-haskell/reducers/reducers-3.12.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Semigroups, specialized containers and a general map/reduce framework"
+HOMEPAGE="https://github.com/ekmett/reducers/"
+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/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
+	>=dev-haskell/hashable-1.1.2.1:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=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-9.1
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+CABAL_CHDEPS=(
+	'hashable               >= 1.1.2.1  && < 1.3' 'hashable >= 1.1.2.1'
+)
diff --git a/dev-haskell/reducers/reducers-3.12.3.ebuild b/dev-haskell/reducers/reducers-3.12.3.ebuild
deleted file mode 100644
index fe131aae38a7..000000000000
--- a/dev-haskell/reducers/reducers-3.12.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroups, specialized containers and a general map/reduce framework"
-HOMEPAGE="https://github.com/ekmett/reducers/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
-	>=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/reducers/reducers-3.12.4.ebuild b/dev-haskell/reducers/reducers-3.12.4.ebuild
new file mode 100644
index 000000000000..a57a5ba40ed0
--- /dev/null
+++ b/dev-haskell/reducers/reducers-3.12.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Semigroups, specialized containers and a general map/reduce framework"
+HOMEPAGE="https://github.com/ekmett/reducers/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
+	>=dev-haskell/hashable-1.1.2.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
+	>=dev-haskell/text-0.11.1.5:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/refact/Manifest b/dev-haskell/refact/Manifest
deleted file mode 100644
index b8d796e249ce..000000000000
--- a/dev-haskell/refact/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST refact-0.3.0.2.tar.gz 2345 BLAKE2B d92132b057030175eae17cf858349e6e8c86fa02c33651f74b385fe0a2ebec1260ec99993bbb38748af0dafb3bb46b61057195fc4883e93886cf39645d91dfc5 SHA512 18f35a3f563288815645c4ef8e557a08bd9038aca0b3d9af391f9f71b39bbf779b725f037fa682a23e38e31cf7b8e0f4ae412e2af2ec3639c4b2c47a05a45a6e
diff --git a/dev-haskell/refact/metadata.xml b/dev-haskell/refact/metadata.xml
deleted file mode 100644
index ddc3a11c7614..000000000000
--- a/dev-haskell/refact/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides a datatype which can be interpreted by apply-refact. It exists
-		as a seperate library so that applications can specify refactorings without depending on GHC.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/refact/refact-0.3.0.2.ebuild b/dev-haskell/refact/refact-0.3.0.2.ebuild
deleted file mode 100644
index 59d069732cb5..000000000000
--- a/dev-haskell/refact/refact-0.3.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Specify refactorings to perform with apply-refact"
-HOMEPAGE="https://hackage.haskell.org/package/refact"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/reflection/Manifest b/dev-haskell/reflection/Manifest
index 0c587bc0f5f1..e36a6080bc8b 100644
--- a/dev-haskell/reflection/Manifest
+++ b/dev-haskell/reflection/Manifest
@@ -1,5 +1 @@
-DIST reflection-1.3.2.tar.gz 8530 BLAKE2B c9ea1c0cb948596dc11d42191cf413280c821c162d1c9dd99eb2a19c355da9044b27614c0ea2691d46878e37ae6c9a1cd0e0045f7c5b327e90373967cad86a28 SHA512 bf055f9f3c9b8bfe3922dbd864cd027aa3f9a3bcd222eca7bd91b167bd5d3f7c3cbcc16d2dbed617de165769e62ce50a1185c538b8b821cdfbdd17c675f4d1e3
-DIST reflection-1.4.tar.gz 9123 BLAKE2B 7e1bb6fa2fe483a6e0dcc50e3720a594599cb5c3f5e909eb0a481fb15a9710f2254ba276bf3e3d325fe295c0388a4acdaec3257c77f8ba9f1a75bf5debadb8c0 SHA512 c4f64624da226d1fdce39380a691c6a9a159c6ff728367f386f5be718f38d3efe162af4d59d3fed76faf43ce8a72616617cb0460ddd5a8844b4369469c4b21a8
-DIST reflection-1.5.2.1.tar.gz 11199 BLAKE2B 3450c8ab831a0d56ba785b7804c411b21cbf1d216376dfd7e628bf63345700851371aa2a6105080ba4c0019f71a2b542b7a0d1cd2ade47653dfba1f348cdf6f1 SHA512 53db1e6a0143af9038d191d0329df4b88004eac1d04732e33acbab41efd9676946e0bcad14a658245e26095f5f560db9c051ba3db0930cb784bc228d51c24d3c
-DIST reflection-2.1.2.tar.gz 14334 BLAKE2B 8f565439e931c00f727dde18468faaaaaf73a61a68eb62fffb850667bd8ae8fe9680ca3009478bedc2871e4d39b2216b5651eda9c13f6b563da5ad3329dccaab SHA512 759ad3afa304adc1ca0509450429946d3f6f7a89c98344ba9bceedf2352e4c89a0d5ab00feb2e5f1e17d062c43c7673fe119e4f4ac61fcebb83f9b21c180e06d
-DIST reflection-2.1.4.tar.gz 18364 BLAKE2B 70cf5fc742deac5555be43a24b2b74930e54a7909e68dea53d8dba7b4547b99d97dbb361ae96776a54a7305069305ea085d8d988b70b86460bd476af6392c417 SHA512 3209bb44a07fedddbb2aeb5f2f09414e6672faff6c8fbdb78eaa8f61a1af4d9fba43be193854f8978ffdd82c0ce54bd79a5d875638a41b6a738bc489bd718295
+DIST reflection-2.1.6.tar.gz 19976 BLAKE2B 6e32e9300695b102be4039312b3df62bccce75a590eafa37d96d70cbf73acfc4be98bc716485235e4594548b8649b46bb554eacc230320abc2d92dd809f15176 SHA512 d7f615b6f361b2ca7266e8c4611c939d9f80684ca173080e9ad8227f04f2731899113dcb87ecb051d47b29fb860d7caa15c99c7d3d7493e7e73745d085518fdd
diff --git a/dev-haskell/reflection/metadata.xml b/dev-haskell/reflection/metadata.xml
index 0845fb397e13..e5d72eb2d266 100644
--- a/dev-haskell/reflection/metadata.xml
+++ b/dev-haskell/reflection/metadata.xml
@@ -1,54 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides an implementation of the ideas presented in the paper
-		\"Functional Pearl: Implicit Configurations\" by Oleg Kiselyov and
-		Chung-chieh Shan. However, the API has been streamlined to improve performance.
-		
-		The original paper can be obtained from
-		&lt;http://www.cs.rutgers.edu/~ccshan/prepose/prepose.pdf&gt;.
-		
-		/Changes in 1.1.6/:
-		
-		* Relaxed an unnecessary strictness annotation in the fast implementation
-		
-		/Changes in 1.1.5/:
-		
-		* Both implementations now work on Hugs; the fast implementation ascends
-		from the ranks of completely unportable black magic to being merely
-		/mostly/ unportable black magic.
-		
-		/Changes from 0.5 to 1.1/:
-		
-		* Much faster implementation available that is about 50 /times/ faster than
-		0.9 and which runs purely on black magic. This version is now used by
-		default. To turn it off install with the @slow@ flag. If you encounter a
-		problem with the implementation, please contact the author.
-		
-		* Removed @ReifiedNum@, @reflectNum@, and @reifyIntegral@; @reify@ and
-		@reflect@ are about 3 orders of magnitude faster than the special case
-		combinators were.
-		
-		/Changes in 0.5/:
-		
-		* Generalized the type signatures in reflect to allow you to pass any type
-		with kind @* -&gt; *@ wrapped around the desired type as the phantom type
-		argument rather than just a @Proxy@.
-		
-		/Changes in 0.4/:
-		
-		* Converted from `Data.Tagged` to using `Data.Proxy` for reflection. This
-		reduces the need for helper functions and scoped type variables in user
-		code.
-	</longdescription>
-	<use>
-		<flag name="template-haskell">Enable template haskell.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ekmett/reflection</remote-id>
 	</upstream>
diff --git a/dev-haskell/reflection/reflection-1.3.2.ebuild b/dev-haskell/reflection/reflection-1.3.2.ebuild
deleted file mode 100644
index a74884092269..000000000000
--- a/dev-haskell/reflection/reflection-1.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?]
-		<dev-haskell/tagged-1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/reflection/reflection-1.4.ebuild b/dev-haskell/reflection/reflection-1.4.ebuild
deleted file mode 100644
index 7308893a2b9c..000000000000
--- a/dev-haskell/reflection/reflection-1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: -slow
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-slow
-}
diff --git a/dev-haskell/reflection/reflection-1.5.2.1.ebuild b/dev-haskell/reflection/reflection-1.5.2.1.ebuild
deleted file mode 100644
index 771192b19a74..000000000000
--- a/dev-haskell/reflection/reflection-1.5.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -slow
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-slow \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/reflection/reflection-2.1.2.ebuild b/dev-haskell/reflection/reflection-2.1.2.ebuild
deleted file mode 100644
index 8431606b0af0..000000000000
--- a/dev-haskell/reflection/reflection-2.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -slow
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-slow \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/reflection/reflection-2.1.4.ebuild b/dev-haskell/reflection/reflection-2.1.4.ebuild
deleted file mode 100644
index e8245e111f6e..000000000000
--- a/dev-haskell/reflection/reflection-2.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -slow
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
-HOMEPAGE="https://github.com/ekmett/reflection"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template-haskell"
-
-RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-slow \
-		$(cabal_flag template-haskell template-haskell)
-}
diff --git a/dev-haskell/reflection/reflection-2.1.6.ebuild b/dev-haskell/reflection/reflection-2.1.6.ebuild
new file mode 100644
index 000000000000..04c4f57eb44c
--- /dev/null
+++ b/dev-haskell/reflection/reflection-2.1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -slow,+template-haskell
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Reifies arbitrary terms into types that can be reflected back into terms"
+HOMEPAGE="https://github.com/ekmett/reflection"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-slow \
+		--flag=template-haskell
+}
diff --git a/dev-haskell/regex-applicative-text/Manifest b/dev-haskell/regex-applicative-text/Manifest
deleted file mode 100644
index 2c5e54146212..000000000000
--- a/dev-haskell/regex-applicative-text/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST regex-applicative-text-0.1.0.1.tar.gz 3975 BLAKE2B 87623f18720173712b8245c86902a30471779e27a5a2e8a938934f5a1b6cd8ec9f41e480f82cebd29db2c9e383e983a6f6ba03856e509fb30a67c51b158707a7 SHA512 8ee1d581498e047a7b759476ce98c43c19656b767790b0f12b8485bc212a71c7115cee5c3e5089392995bc71851025093c406bce9d8ac3c5962675ae06fa4339
diff --git a/dev-haskell/regex-applicative-text/metadata.xml b/dev-haskell/regex-applicative-text/metadata.xml
deleted file mode 100644
index f7c350d52710..000000000000
--- a/dev-haskell/regex-applicative-text/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Wrapped regex-applicative primitives to work with Text
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild b/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
deleted file mode 100644
index 5060f2bba01d..000000000000
--- a/dev-haskell/regex-applicative-text/regex-applicative-text-0.1.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="regex-applicative on text"
-HOMEPAGE="https://github.com/phadej/regex-applicative-text#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-applicative-0.3:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.3 && <4.10' 'base >= 4.3'
-}
diff --git a/dev-haskell/regex-applicative/Manifest b/dev-haskell/regex-applicative/Manifest
index 8479b2c40caa..63f4b4ee0fc7 100644
--- a/dev-haskell/regex-applicative/Manifest
+++ b/dev-haskell/regex-applicative/Manifest
@@ -1 +1 @@
-DIST regex-applicative-0.3.3.tar.gz 13834 BLAKE2B 690d9fe8b44d26cf2332f5474bd1faacec9bae68d72a9dd04836e7bf3519e2dad6a9277f96c9f3dd908091d90408a7dad8d654e60dbb29831267489169ef5192 SHA512 02358efaa912efd232654a404ef5f7cf825b8852bf2c59fd59122047044fcab5ae28bf26de6818b337d917c594fbe165eec917d88b02723e0b181fe2b57ffbe8
+DIST regex-applicative-0.3.3.1.tar.gz 14128 BLAKE2B 80488c86dc88b9299384ee6101693567185e4a97defd73398ca1316c813067bf40c4df366b6347628a2f2f40aa42ca6765aed1102a47ef083fd5c193ab78c1bf SHA512 6cef57ef228983b3662616221c6275ffa024bebee4dddf21041e9a8a4efc8b5e905bacdf31534078f9a34b3915a630e823bf0a910c27b11f8a961ee8f87cd9d3
diff --git a/dev-haskell/regex-applicative/metadata.xml b/dev-haskell/regex-applicative/metadata.xml
index ca093b1a6de5..8547830270cc 100644
--- a/dev-haskell/regex-applicative/metadata.xml
+++ b/dev-haskell/regex-applicative/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -10,6 +10,6 @@
 		Parsers can be built using Applicative interface.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">feuerbach/regex-applicative</remote-id>
+		<remote-id type="github">UnkindPartition/regex-applicative</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild b/dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild
new file mode 100644
index 000000000000..e6b190e94852
--- /dev/null
+++ b/dev-haskell/regex-applicative/regex-applicative-0.3.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Regex-based parsing with applicative interface"
+HOMEPAGE="https://github.com/feuerbach/regex-applicative"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/smallcheck-1.0
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-smallcheck )
+"
diff --git a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild b/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
deleted file mode 100644
index 394913aa91ae..000000000000
--- a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Regex-based parsing with applicative interface"
-HOMEPAGE="https://github.com/feuerbach/regex-applicative"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/smallcheck-1.0
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-smallcheck )
-"
diff --git a/dev-haskell/regex-base/Manifest b/dev-haskell/regex-base/Manifest
index e2941bf0a858..5cf943fe9b36 100644
--- a/dev-haskell/regex-base/Manifest
+++ b/dev-haskell/regex-base/Manifest
@@ -1,2 +1,4 @@
-DIST regex-base-0.93.2.tar.gz 9156 BLAKE2B 160f749c5c5e4c9911c18a4ad3dbe46865c9872f419457387e249747c5aade2cd2afae1f80757d3c0788398f332ea243f35e826f77f220517480ae4b42928a21 SHA512 4f6269cb1c1fefa2164d999e2e787118edc5fd88e356535e50f143d0b98de4fa1854959955e183aed27a77335b81063a2385bb6bdeb8cb80e7fdd812ab96d22a
-DIST regex-base-0.94.0.0.tar.gz 9679 BLAKE2B c998f856c51e3d3abfdc389ea6f8451198f6c6f2d0b3b56c79704febb53f9a3d54c7ed57ddabd10f97c465e1f591cd7f06a4b9c8aaebc6e67fd2741d26fc69b2 SHA512 4e7120e1a2b63fd3e4e15cefc540e82ab0949f51e19f495d4cf4edbe8428ffdf2f114df3504f66049fbb790d5310c59daaf0ed3a71c5acccfe205dccc4567045
+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
diff --git a/dev-haskell/regex-base/metadata.xml b/dev-haskell/regex-base/metadata.xml
index 5f096d14b333..21701273e298 100644
--- a/dev-haskell/regex-base/metadata.xml
+++ b/dev-haskell/regex-base/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">lazy-regex</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<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.93.2-r1.ebuild b/dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild
deleted file mode 100644
index 33fc6fae2795..000000000000
--- a/dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://sourceforge.net/projects/lazy-regex"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=splitbase \
-		--flag=newbase
-}
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
deleted file mode 100644
index 2714a28f0916..000000000000
--- a/dev-haskell/regex-base/regex-base-0.94.0.0.ebuild
+++ /dev/null
@@ -1,34 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
-}
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
new file mode 100644
index 000000000000..cdb10b0b9edd
--- /dev/null
+++ b/dev-haskell/regex-base/regex-base-0.94.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild b/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild
new file mode 100644
index 000000000000..8b827f831b00
--- /dev/null
+++ b/dev-haskell/regex-base/regex-base-0.94.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.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"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/regex-compat-tdfa/Manifest b/dev-haskell/regex-compat-tdfa/Manifest
deleted file mode 100644
index a48d51d6d258..000000000000
--- a/dev-haskell/regex-compat-tdfa/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST regex-compat-tdfa-0.95.1.4.tar.gz 4146 BLAKE2B 1749307b8a7bfb1f0a0137febf425191d225bcdfbb0517034ea31e11e648eac128f16cc1951f9471e9f22efeb296c1c32344a375c16381ef823e0fc4674e730f SHA512 7e387a7713ff8e43cfce4262b1288b85f8b60729162a842186bf6a7e1078dfb9e26013087ff7e9bcf81521f8c352926873bb280b9df57b016aef2ca4ce70aa14
diff --git a/dev-haskell/regex-compat-tdfa/metadata.xml b/dev-haskell/regex-compat-tdfa/metadata.xml
deleted file mode 100644
index a4dbf2954c3f..000000000000
--- a/dev-haskell/regex-compat-tdfa/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		One module layer over regex-tdfa to replace Text.Regex.
-		
-		regex-compat can't use Unicode characters correctly because
-		of using regex-posix. This is not good for Unicode users.
-		
-		I modified regex-compat to use regex-tdfa for solving today's
-		problem.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
deleted file mode 100644
index 2e51afb3c933..000000000000
--- a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode Support version of Text.Regex, using regex-tdfa"
-HOMEPAGE="https://hub.darcs.net/shelarcy/regex-compat-tdfa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
-	>=dev-haskell/regex-tdfa-1.1.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/regex-compat/Manifest b/dev-haskell/regex-compat/Manifest
index b093b0d53a05..08f1bff57313 100644
--- a/dev-haskell/regex-compat/Manifest
+++ b/dev-haskell/regex-compat/Manifest
@@ -1,2 +1,2 @@
-DIST regex-compat-0.95.1.tar.gz 3968 BLAKE2B 5c1bf6b9e7aa148cf7b033f08a9d32d7e508e73da88e7c6b2d27b2549dc7e44e287ca3010bffb37fd3fd1d7dbf4060a2772f64e1ecf531ffb5f18098db63b0d2 SHA512 9fb38b001a4cdca5b3630d88e8fcb2f359f6e8dd49fbe13d5e2a1c99b4978b33ce639b344445b27daf68abbae1cf2c9905d48ff68a81e02b4e54aa92dea956e2
-DIST regex-compat-0.95.2.0.tar.gz 4019 BLAKE2B 13825a59d2edaf5df3c4726f3b040d9354eaa95220cc907a74e5141aa95d2299107bfaa5037d327011bc3ccf3f0aeeb00ad9bd086e20b393eb898a19a46e5ca1 SHA512 8b1b421f5e7688a1d4a61711a255505a047e90e9f9283a8cf2ebfa9774631e8fb3a071d61877ab22548a0c63e30237603196f043dac9cb64da4df2fdc4422300
+DIST regex-compat-0.95.2.1-rev2.cabal 1705 BLAKE2B 99c4b12e120b2360edebe97899ce66e520ee05171cca7e2888fa2b0f30fbb0440a8d2d81c3bbf432d08de9ac10cbed3bead4a8ae20162711f6dd667be558e8b5 SHA512 4eb8c7a86268c7e5b834ff093e843cfb8bde1e72d51bd53346998a2743cc5999b1f8efd08e4b091dad662e5f1cc466eadf490af94d122e8b12799726a6824b85
+DIST regex-compat-0.95.2.1.tar.gz 4285 BLAKE2B 5b1b7adf71c2903bf6647cc0bfefae230f59dbd3ab655a03083f279e7557b533ab745c15e36c51dcd6c4da9239e49a85c64a37a50458ee1a20e0d33a5abecc38 SHA512 87a671729dcdb2c89ce079fbb124cd2f16407f2dca0ed5d0d898a9cf06f893b82c184566efe80d966afbc7dde2cab1693b81516adc4832a9c65283a65fecd919
diff --git a/dev-haskell/regex-compat/metadata.xml b/dev-haskell/regex-compat/metadata.xml
index 5f096d14b333..116bb696237e 100644
--- a/dev-haskell/regex-compat/metadata.xml
+++ b/dev-haskell/regex-compat/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">lazy-regex</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">regex-compat</remote-id>
+		<remote-id type="github">haskell-hvr/regex-compat</remote-id>
+		<remote-id type="sourceforge">lazy-regex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild
deleted file mode 100644
index 30720796f3d3..000000000000
--- a/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://sourceforge.net/projects/lazy-regex"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
-	>=dev-haskell/regex-posix-0.95.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=splitbase
-}
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild
deleted file mode 100644
index 43f773662051..000000000000
--- a/dev-haskell/regex-compat/regex-compat-0.95.2.0.ebuild
+++ /dev/null
@@ -1,40 +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.1
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://hackage.haskell.org/package/regex-compat"
-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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base        >= 4.3 && < 4.14' 'base        >= 4.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=splitbase
-}
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.2.1-r1.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.2.1-r1.ebuild
new file mode 100644
index 000000000000..a8b58590ce60
--- /dev/null
+++ b/dev-haskell/regex-compat/regex-compat-0.95.2.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: +newbase,+splitbase
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/enhances \"Text.Regex\""
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+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-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=newbase \
+		--flag=splitbase
+}
diff --git a/dev-haskell/regex-pcre-builtin/Manifest b/dev-haskell/regex-pcre-builtin/Manifest
deleted file mode 100644
index dd45051cbd70..000000000000
--- a/dev-haskell/regex-pcre-builtin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST regex-pcre-builtin-0.94.4.8.8.35.tar.gz 311974 BLAKE2B d1c6f7b1f981d09e661db37035142a0097954ab23792bfa666e6b000dbda1c8d30dda27fb25c56828a57d5a2721b2e15d6319919f04f9bf95581af9f137f55a9 SHA512 6248cfc151db709284d0218630787dbfee0763f8f94c0c8b1a51469dfe47cfe550f67546c04e1aefcd61ba3db412e2051795b88bdb025e7518feeae82ba7860c
-DIST regex-pcre-builtin-0.95.1.1.8.43.tar.gz 564650 BLAKE2B b8d2c39fde61b202eedbd8eead11685bbb1a1ebf1f4c8d6c59a2b9f87810e87df1a07356445582685778457570ff51db2d55786736e8302f7d9adf8144153dcd SHA512 229c863a32dd36707d130aac5dbda8bfbcfc33062232668f32c5ec7c2622257e8d07f1424727242a531ebaeff2b9fb6b40ed5ceab18b61feb6ec41fb8298d008
diff --git a/dev-haskell/regex-pcre-builtin/metadata.xml b/dev-haskell/regex-pcre-builtin/metadata.xml
deleted file mode 100644
index 7ab771da5d9b..000000000000
--- a/dev-haskell/regex-pcre-builtin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lazy-regex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild
deleted file mode 100644
index 4c4d58498a11..000000000000
--- a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-pcre-builtin"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=splitbase
-}
diff --git a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.1.8.43.ebuild b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.1.8.43.ebuild
deleted file mode 100644
index 5b5d05e16aaa..000000000000
--- a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.95.1.1.8.43.ebuild
+++ /dev/null
@@ -1,41 +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.1.9999
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-pcre-builtin"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-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?]
-	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=splitbase
-}
diff --git a/dev-haskell/regex-pcre/Manifest b/dev-haskell/regex-pcre/Manifest
deleted file mode 100644
index 5b507e4effa5..000000000000
--- a/dev-haskell/regex-pcre/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST regex-pcre-0.94.4.tar.gz 10814 BLAKE2B c6d634e240194d1099b4b6126fedb00bafb9f6118c9b11fff87d862b45e84b87005c6b2337871b17687dc63d15a74203b820aa04dffbae9517af34cc27dce71f SHA512 b14db2fb88f9a70b60cfac0ecc242554929d03982b7ffef18e36a2a8ddbef3bbc3f7f1ccb549aa805aec43f30b3ca22856d2e4315dba15e9c22ed34638dba92e
-DIST regex-pcre-0.95.0.0.tar.gz 9766 BLAKE2B 05df9a80021d436fe1b7c6d6328cf23df96a481d55407f3e737ab70dd92a73f70a06eede4b3355c743cbdb813a1ae422c5aaa1faa30c16608fa04d513317d8ad SHA512 7c9ed0edd0c44d7118313c298c2658858117dd89eb7956566f5bb2fb75f2aaed70d201fda4102c46206b9951013bafee654ff39ed3c4bf9c5086f6c0cc217bdb
diff --git a/dev-haskell/regex-pcre/metadata.xml b/dev-haskell/regex-pcre/metadata.xml
deleted file mode 100644
index 5c2ed0938046..000000000000
--- a/dev-haskell/regex-pcre/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The PCRE backend to accompany regex-base, see www.pcre.org
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild b/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
deleted file mode 100644
index e01d87d20b49..000000000000
--- a/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: +newbase,+splitbase
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-pcre"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=splitbase
-}
diff --git a/dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild b/dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild
deleted file mode 100644
index 22d4937215bf..000000000000
--- a/dev-haskell/regex-pcre/regex-pcre-0.95.0.0.ebuild
+++ /dev/null
@@ -1,43 +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.1.9999
-#hackport: flags: +newbase,+splitbase,+pkg-config
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://hackage.haskell.org/package/regex-pcre"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=newbase \
-		--flag=pkg-config \
-		--flag=splitbase
-}
diff --git a/dev-haskell/regex-posix/Manifest b/dev-haskell/regex-posix/Manifest
index be0778ff3890..b9a93f01cf00 100644
--- a/dev-haskell/regex-posix/Manifest
+++ b/dev-haskell/regex-posix/Manifest
@@ -1,2 +1,4 @@
-DIST regex-posix-0.95.2.tar.gz 42916 BLAKE2B 3b0192bf2eac5cf2376a5cfd73be4f138be2074fd3b80fe43c659015a2a731a61f1cf6537dd207c36e8fa893737b30f61516f23e815a8da52dc8866b36fc58d0 SHA512 2d22951f0302de144483d2c11d0711dc2cbd2fc6a0eac0126011eaa6f577837ae8c2a9516badb4beed6c18311241458dd6ad9f82a11d6f3763891880ebbc8c41
+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
diff --git a/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch b/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch
deleted file mode 100644
index e0de5a751637..000000000000
--- a/dev-haskell/regex-posix/files/regex-posix-0.95.1-ghc-7.5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- regex-posix-0.95.1-orig/Text/Regex/Posix/Wrap.hsc	2011-05-10 01:55:41.000000000 +1000
-+++ regex-posix-0.95.1/Text/Regex/Posix/Wrap.hsc	2012-05-13 18:06:06.314466286 +1000
-@@ -133,6 +133,9 @@
- import Foreign.Marshal.Alloc(mallocBytes)
- import Foreign.C(CSize,CInt,CChar)
- import Foreign.C.String(peekCAString, CString)
-+#if (__GLASGOW_HASKELL__>=705)
-+import Foreign.C.Types(CInt(..), CSize(..))
-+#endif
- import Text.Regex.Base.RegexLike(RegexOptions(..),RegexMaker(..),RegexContext(..),MatchArray)
- import qualified System.IO.Error as IOERROR(try)
- 
diff --git a/dev-haskell/regex-posix/metadata.xml b/dev-haskell/regex-posix/metadata.xml
index 8bfefc76efaa..1287ec351796 100644
--- a/dev-haskell/regex-posix/metadata.xml
+++ b/dev-haskell/regex-posix/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The posix regex backend for regex-base
-	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">lazy-regex</remote-id>
+		<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.95.2.ebuild b/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
deleted file mode 100644
index c8c99fee867c..000000000000
--- a/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit base haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://sourceforge.net/projects/lazy-regex"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-haskell/regex-base-0.93[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-PATCHES=("${FILESDIR}/${PN}-0.95.1-ghc-7.5.patch")
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 bee82d920301..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
@@ -1,22 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.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="http://hackage.haskell.org/package/regex-posix"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+HOMEPAGE="https://hackage.haskell.org/package/regex-posix"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 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?]
@@ -26,12 +26,9 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.12
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.3 && < 4.14' 'base       >= 4.3'
-}
+CABAL_CHDEPS=(
+	'base       >= 4.3 && < 4.16' 'base >= 4.3'
+)
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild b/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild
new file mode 100644
index 000000000000..be58429a3bc1
--- /dev/null
+++ b/dev-haskell/regex-posix/regex-posix-0.96.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: +newbase,+splitbase,-_regex-posix-clib
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="POSIX Backend for \"Text.Regex\" (regex-base)"
+HOMEPAGE="https://hackage.haskell.org/package/regex-posix"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos"
+
+RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-_regex-posix-clib \
+		--flag=newbase \
+		--flag=splitbase
+}
diff --git a/dev-haskell/regex-tdfa-rc/Manifest b/dev-haskell/regex-tdfa-rc/Manifest
deleted file mode 100644
index 843a8406c27c..000000000000
--- a/dev-haskell/regex-tdfa-rc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST regex-tdfa-rc-1.1.8.3.tar.gz 65728 BLAKE2B 19d0147fbea30d2ffe595fb0e2108662b87f30d4d8321d362f5e043bc5b194efcc4a7ed6732b2f84b218fe945be1b841e363ae43c5f3d4e84301e4f9416a980a SHA512 2664e70029548704a2086759a3f05fa34cca1034493451175ee2264d91e9fcd10605c115c51d0bbab77143eb43a62ea6677fda1716d6f500e2ae881d5e9afc02
diff --git a/dev-haskell/regex-tdfa-rc/metadata.xml b/dev-haskell/regex-tdfa-rc/metadata.xml
deleted file mode 100644
index ef9adfc1fe9c..000000000000
--- a/dev-haskell/regex-tdfa-rc/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		A new all Haskell "tagged" DFA regex engine, inspired by libtre (fork by Roman Cheplyaka)
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild b/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
deleted file mode 100644
index a83bfb2f709e..000000000000
--- a/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex (fork by Roman Cheplyaka)"
-HOMEPAGE="https://hackage.haskell.org/package/regex-tdfa-rc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/regex-base-0.93.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
index 16e3a5357f3d..8e5ff0f84c27 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -1,4 +1,2 @@
-DIST regex-tdfa-1.2.0.tar.gz 66039 BLAKE2B dd9a0d00e9608968d9e3a95428bb934661c17847645d73f5c1c0a6a96f83df8d99520971b245f217ea0dc2634ab70c7b7fe027aeacd86190d9694a997f14d01b SHA512 d4419c5d5062dbe63ec5931bd9f11020b3aa3227abdb66cac0732417e34cac9a3a9d564bba8114a77570e3b1bacce404062ab04536dafe10b764886af8e491c9
-DIST regex-tdfa-1.2.1.tar.gz 66108 BLAKE2B 105b048e48b98197b776249d99b60ccdcf6c81c2fddf362b19751abebffee6bb8b41d5549724218adee5b56f1ba80bb78b9d646c20e91781afd2cdc4148ff2a5 SHA512 04d3c7235c126695ceaaef0bbd5e6ee6ebffe7c4fb96b9f5a3df28bebe02a680cda870f228bd2e0e30ed98f88eeed4b4d4cdf6dc5ccd0b8e45c8427b6d7fa85d
-DIST regex-tdfa-1.2.2.tar.gz 65969 BLAKE2B c533dd7fd39e973ccf73d1bced6c35e65ce3a57a543e3e6c15c191748c2073c7d4a230f995168a2c52f4eafe152961950edcb28fa72c064a70bd058a49a28896 SHA512 86241b9bfa27351302e4ef18fd2cdc8a58341d6a8fa12c92e3ebb11cca93e58e5a69b97b545c61ce704bd6e2ac0b7a7c1a3555f138ba5ee9cf9728175f43d26a
-DIST regex-tdfa-1.3.1.0.tar.gz 77767 BLAKE2B 2993a19f68ad167446ac8e7fbbd3552176de5cf35ca69627fd8e0d6be877986b90253dee13aae1f95f5328b6b30bb96c2ed594403c1bac1ef4d8cf0283675d5e SHA512 becac929003ea2c1a8fe1e890a53d3cb914eeb02090a23d014120d04ee144e24c2c7bdfaadd58a2dd70ed49df1e0059a3f8a94faa4ce0a6efd533ee6019c951f
+DIST regex-tdfa-1.3.2.2.tar.gz 83016 BLAKE2B 77f6698a5c42eece0eb9f2166017a6a9334f917ba2134e963d06a443088e6d594765e846083052d91fc7944b8fea776c5e188afcbad2b25ce57939255f5cc3b4 SHA512 be5d93b0e989a3232f9d0e37f002085d500d334ec554ade30177b22dd0d873321aa2a4f8b3cacb4156d002659f67b6d6f50d5f8c8b2da513a43be49572dc9c6c
+DIST regex-tdfa-1.3.2.tar.gz 82839 BLAKE2B e381bc951dfad53b0cd2c83f6c77e3a71fe6b1fd64988f75544e631f49a9d108f39e27bc5bb42fbccc4887321c7655d609c0c13cc58f7be3b93e8131059f4320 SHA512 88bbf8f4d7ac15fb85c899bdeb8f8556c7a284075bf2b600051f529f0e2109dcda6ba74fc95969b824cfb03f00a9eb47e9c375c70b1b9e17096c95acbe517168
diff --git a/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch
new file mode 100644
index 000000000000..c491fb877d05
--- /dev/null
+++ b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2-disable-doctests.patch
@@ -0,0 +1,18 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+doctest-parallel does not currently work with Setup.hs
+
+See: <martijnbastiaan/doctest-parallel#45>
+
+diff -urN regex-tdfa-1.3.2/regex-tdfa.cabal regex-tdfa-1.3.2-r1/regex-tdfa.cabal
+--- regex-tdfa-1.3.2/regex-tdfa.cabal	2022-08-14 00:42:54.578227087 -0600
++++ regex-tdfa-1.3.2-r1/regex-tdfa.cabal	2022-08-14 00:43:17.428227098 -0600
+@@ -175,6 +175,7 @@
+     ghc-options:        -O2
+ 
+ test-suite doc-test
++  buildable:      False
+   type:           exitcode-stdio-1.0
+   hs-source-dirs: test
+   main-is:        DocTestMain.hs
diff --git a/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch
new file mode 100644
index 000000000000..769ff7f34191
--- /dev/null
+++ b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch
@@ -0,0 +1,24 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+doctests don't seem to work with Setup.hs
+
+The hackage tarball doesn't include cabal.project which seems to be necessary
+for doctest-parallel to work. Even when this file is copied to $S, Setup.hs
+doesn't seem to recognize it.
+
+The necessary flag is not recognized by `./setup configure`:
+    --write-ghc-environment-files=always
+See: <https://cabal.readthedocs.io/en/3.4/cabal-project.html#cfg-field-write-ghc-environment-files>
+
+diff -urN regex-tdfa-1.3.2/regex-tdfa.cabal regex-tdfa-1.3.2-r1/regex-tdfa.cabal
+--- regex-tdfa-1.3.2/regex-tdfa.cabal	2022-08-14 00:42:54.578227087 -0600
++++ regex-tdfa-1.3.2-r1/regex-tdfa.cabal	2022-08-14 00:43:17.428227098 -0600
+@@ -175,6 +175,7 @@
+     ghc-options:        -O2
+ 
+ test-suite doctest
++  buildable:      False
+   type:           exitcode-stdio-1.0
+   hs-source-dirs: test
+   main-is:        DocTestMain.hs
diff --git a/dev-haskell/regex-tdfa/metadata.xml b/dev-haskell/regex-tdfa/metadata.xml
index ba8348877db0..1192b9e7aef1 100644
--- a/dev-haskell/regex-tdfa/metadata.xml
+++ b/dev-haskell/regex-tdfa/metadata.xml
@@ -1,14 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		A new all Haskell "tagged" DFA regex engine, inspired by libtre
-	</longdescription>
 	<upstream>
-		<remote-id type="github">ChrisKuklewicz/regex-tdfa</remote-id>
+		<remote-id type="hackage">regex-tdfa</remote-id>
+		<remote-id type="github">haskell-hvr/regex-tdfa</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
deleted file mode 100644
index 5c71a3f508a7..000000000000
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-tdfa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/regex-base-0.93.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-src_prepare() {
-	# too much load on compiler (~2GB RAM against ~500)
-	cabal_chdeps \
-		'-O2 ' ' '
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild
deleted file mode 100644
index a77bbc05879b..000000000000
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://hackage.haskell.org/package/regex-tdfa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/regex-base-0.93.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2.3
-"
-
-src_prepare() {
-	# too much load on compiler (~2GB RAM against ~500)
-	cabal_chdeps \
-		'-O2 ' ' '
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
deleted file mode 100644
index 111f440fcb00..000000000000
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -base4,-devel
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="https://github.com/ChrisKuklewicz/regex-tdfa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/regex-base-0.93.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base4 \
-		--flag=-devel
-}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.0.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.0.ebuild
deleted file mode 100644
index 123b86bbc5bc..000000000000
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.3.1.0.ebuild
+++ /dev/null
@@ -1,47 +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: +base4,-devel,+force-o2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Replaces/Enhances Text.Regex"
-HOMEPAGE="http://hackage.haskell.org/package/regex-tdfa"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.1.3:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
-	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( dev-haskell/semigroups
-		>=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base               >= 4.5 && < 4.14' 'base               >= 4.5'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4 \
-		--flag=-devel \
-		--flag=force-o2
-}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild
new file mode 100644
index 000000000000..a47592f6b41f
--- /dev/null
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +base4,-devel,+force-o2,-doctest
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-doctests.patch"
+)
+
+RDEPEND=">=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+	>=dev-haskell/text-1.2.3:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4 \
+		--flag=-devel \
+		--flag=force-o2
+}
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
new file mode 100644
index 000000000000..9d20edf4bf52
--- /dev/null
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: +base4,-devel,+force-o2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.2-disable-doctests.patch"
+)
+
+RDEPEND=">=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4 \
+		--flag=-devel \
+		--flag=force-o2
+}
diff --git a/dev-haskell/rerebase/Manifest b/dev-haskell/rerebase/Manifest
deleted file mode 100644
index 56c9eac9ea2a..000000000000
--- a/dev-haskell/rerebase/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rerebase-1.4.1.tar.gz 17185 BLAKE2B f474bc24f974698da9a9185a0ea2f352664a36628cf7f7a3483a6ddaebd2521498de1abeb6832e90c0810278a10c887aa9835bed6ed4a0ef93e6f5bda8081adc SHA512 102e88858f46d57a59c830a32f6bbd1644b5c36b7addf591b296ae5f1b7bc0d225d6ba6996d518dc0e67858b10863fcd561cdec0294fd798cb71cd3b8dd34c32
diff --git a/dev-haskell/rerebase/metadata.xml b/dev-haskell/rerebase/metadata.xml
deleted file mode 100644
index 2e10d5a26a21..000000000000
--- a/dev-haskell/rerebase/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A rich drop-in replacement for \&quot;base\&quot;.
-		For details and docs please visit
-		&lt;https://github.com/nikita-volkov/rerebase the project&#39;s GitHub page&gt;.
-	</longdescription>
-</pkgmetadata>
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/resolv/metadata.xml b/dev-haskell/resolv/metadata.xml
index 9990695ff28a..eb82a03f1bb1 100644
--- a/dev-haskell/resolv/metadata.xml
+++ b/dev-haskell/resolv/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild b/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
new file mode 100644
index 000000000000..a17699a7dd22
--- /dev/null
+++ b/dev-haskell/resolv/resolv-0.1.2.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: needs a port to new srcloc
+inherit haskell-cabal
+
+DESCRIPTION="Domain Name Service (DNS) lookup via the libresolv standard library routines"
+HOMEPAGE="https://hackage.haskell.org/package/resolv"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT=test # fails to build test suite
+
+RDEPEND=">=dev-haskell/base16-bytestring-0.1:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+"
+
+CABAL_CHDEPS=(
+	'base               >= 4.5 && <4.15' 'base               >= 4.5'
+	'base16-bytestring ^>= 0.1' 'base16-bytestring >= 0.1'
+	'bytestring        ^>=0.9.2 || ^>= 0.10' 'bytestring        >=0.9.2'
+)
diff --git a/dev-haskell/resolv/resolv-0.1.2.0.ebuild b/dev-haskell/resolv/resolv-0.1.2.0.ebuild
deleted file mode 100644
index f488bd337f9f..000000000000
--- a/dev-haskell/resolv/resolv-0.1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: needs a port to new srcloc
-inherit haskell-cabal
-
-DESCRIPTION="Domain Name Service (DNS) lookup via the libresolv standard library routines"
-HOMEPAGE="http://hackage.haskell.org/package/resolv"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # fails to build test suite
-
-RDEPEND=">=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2
-"
diff --git a/dev-haskell/resource-pool/Manifest b/dev-haskell/resource-pool/Manifest
index e7286464935a..2cb0993b2ec4 100644
--- a/dev-haskell/resource-pool/Manifest
+++ b/dev-haskell/resource-pool/Manifest
@@ -1 +1,2 @@
 DIST resource-pool-0.2.3.2.tar.gz 6527 BLAKE2B e57d2406a483f0252cc564de91f74c51b62b9c1e7b52ae147e5c60a647130c2803af469d5b33389a5ff618d259f110738a973580e7633d2ff2dc9e7d57cd82a7 SHA512 42b0bb6dea35c08884f65604acc0dd93707b8d4de780c584877e92fbfe534d4f754282e9c9f7257c203f1152d85ac8170f84ee9a95573343d02a774006c4118b
+DIST resource-pool-0.4.0.0.tar.gz 8128 BLAKE2B 2aff7704d00f352ab8972335223cd0e713de2be60c91a01020e39155c4666247313a73d88af2cb53227cba17ca23533219f25b0cd124536ac4c29043a4371345 SHA512 714db44aa41efbe684b589d20242a8fb3ad6112287fa797954e69c19432c83a2bc0c37bbcd9674ad2980a45ce6f38acea5393753caa05de609ac958e53057b92
diff --git a/dev-haskell/resource-pool/metadata.xml b/dev-haskell/resource-pool/metadata.xml
index ef1c76317bd9..11d1ddb06d9c 100644
--- a/dev-haskell/resource-pool/metadata.xml
+++ b/dev-haskell/resource-pool/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A high-performance striped pooling abstraction for managing
-		flexibly-sized collections of resources such as database
-		connections.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">bos/pool</remote-id>
+		<remote-id type="hackage">resource-pool</remote-id>
+		<remote-id type="github">scrive/pool</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild b/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
index 14df070eb761..1fe1025c6b36 100644
--- a/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
+++ b/dev-haskell/resource-pool/resource-pool-0.2.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.4.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: -developer
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
@@ -15,19 +15,18 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hashable:=[profile?]
 	>=dev-haskell/monad-control-0.2.0.1:=[profile?]
 	>=dev-haskell/stm-2.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
 	>=dev-haskell/transformers-base-0.4:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.18.1.3
 "
 
 src_configure() {
diff --git a/dev-haskell/resource-pool/resource-pool-0.4.0.0.ebuild b/dev-haskell/resource-pool/resource-pool-0.4.0.0.ebuild
new file mode 100644
index 000000000000..1bdf11331bcf
--- /dev/null
+++ b/dev-haskell/resource-pool/resource-pool-0.4.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A high-performance striped resource pooling implementation"
+HOMEPAGE="https://hackage.haskell.org/package/resource-pool"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hashable-1.1.0.0:=[profile?]
+	>=dev-haskell/primitive-0.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
diff --git a/dev-haskell/resourcet/Manifest b/dev-haskell/resourcet/Manifest
index 7b514196e601..cf8bfa3dbb92 100644
--- a/dev-haskell/resourcet/Manifest
+++ b/dev-haskell/resourcet/Manifest
@@ -1,7 +1,2 @@
-DIST resourcet-0.4.10.tar.gz 10455 BLAKE2B cb433337a4a9b9025a93a8229c02d2b3501b10c32ab0f997614bf7c239a52728ae3e08f58c2c528e079d9373bb8e2095006ba38966196451da28fa750075d7ac SHA512 34c97197b3651c45be1ab554d24651665f73cab560ccfaf4dd67413ff1945fe22c2aebc04e51e104475eadf436c3e9eea159737cc4f324658c510146a4045882
-DIST resourcet-0.4.9.tar.gz 9624 BLAKE2B af894f30ac4c3a953469d5bb4ab60f9f36ca1147426c62ab13360fe267290d2dd16c9d97575991dd7896cd74bb11b28e6eb830cf391ec46c790acd6ac71ff6d0 SHA512 7ec0f7c582d735d05bc793f5286d29d0578cf95784dc3e8d4e1f062687818bbac47637372192de7777045f121fc84e1eb716dfc817375b6c97526ff32a649c13
-DIST resourcet-1.1.2.2.tar.gz 10665 BLAKE2B dd7c24c11b6900a3a5e76c0590116bb6a9f802e736af43e2d6c09269827b0e6285d3d326870c790f66554269812e48aae177e53eec5a4a26f73b751e0d2a5d69 SHA512 10f80a7c9070c557ce30a30d132d483e5664cf72ebc0446ee2ab4280d80125a1445d87c931ca3124d8087f4972e6fde5dead73efcd90530e98cbb7744032cc90
-DIST resourcet-1.1.7.4.tar.gz 11674 BLAKE2B 97c9d36d1b7142a6ee36335279f9345f8ce25cd9847df490c143de03f1e34f15df87f57cbe0f77477737bc20f99a1b2ff75bd60dd6fa6809d11db7f749e28ddf SHA512 b61c117a12762b15be2de2676c4fdf9bf89b72ebc4875677a70f5b66358fb49ddd4753d6b1a541ae01dab41368b4e30cbd796caebdc4b8cce6ebf75c9cef08b5
-DIST resourcet-1.1.7.tar.gz 11627 BLAKE2B c0a01bcd14e5e4a988ec41ec6014eb8021217c8bb016f9198dfc5878071ffaebb44be9e56717090505dc710132fc984d9d0db61f198a0d065160c303540c0954 SHA512 27a348354fddfa348882217cb7a66987d843c87658c53f7d173276731e11cfc3438312028d4c35f7821db087a30227979a6d1018bc7e4ca516145c4f2a91a231
-DIST resourcet-1.1.9.tar.gz 15215 BLAKE2B 7ed72548d067e8c0382cb7e0fe423d14b3baf8df742d24375e0886f87e9df8ed480d3346f0f2b86e9660b0eea57cd5da07a7deda938e6a428d911773712a7b42 SHA512 e26e627c19198c1f25e368dda67ca15d52ad41eea70a81acf8ce244b30880b476d3d33b097199d12611bf80a3521196587d669684b18c47999e7abb5c00a7ab9
 DIST resourcet-1.2.4.2.tar.gz 16862 BLAKE2B 041997adc9db44e4e99d878f001191eff853fc2d473f544a107d3526924273bda32de9ff39ebd93ec6fddb81fa1dd1180f6a6e1c06361a33486bf7c56a98c750 SHA512 9f415a902261e64916e8c937a3d464eb29ff3a59fde511a17304aa4aa58c01f882d29c304375a0f23d87fa770763f09c84e428ed9f75c9b187fe2aabbbf4adf2
+DIST resourcet-1.2.6.tar.gz 17196 BLAKE2B e82da2b2cf2329182d46a331b1bbcd8437268a90501c38acc299b80377ccb3a7d53e9c97d07565830c9f993b8cf6e9189e930622d7ede7510e35350b07aa7883 SHA512 2b08c99ad102fd3bef1e1e9363c000f48f03d1ac3e5122c8c764c71f90905697a818a70391f0f67e5074b4cc0b030bd5cfecd3477930e3e4ec64049e10d8fa3a
diff --git a/dev-haskell/resourcet/metadata.xml b/dev-haskell/resourcet/metadata.xml
index 295089b914d3..ed3c0820e087 100644
--- a/dev-haskell/resourcet/metadata.xml
+++ b/dev-haskell/resourcet/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package was originally included with the conduit package, and has since been split off. For more information, please see &lt;http://www.yesodweb.com/book/conduits&gt;.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">snoyberg/conduit</remote-id>
 	</upstream>
diff --git a/dev-haskell/resourcet/resourcet-0.4.10.ebuild b/dev-haskell/resourcet/resourcet-0.4.10.ebuild
deleted file mode 100644
index 9b6b9a284eaa..000000000000
--- a/dev-haskell/resourcet/resourcet-0.4.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-0.4.9.ebuild b/dev-haskell/resourcet/resourcet-0.4.9.ebuild
deleted file mode 100644
index 35f6989bfa07..000000000000
--- a/dev-haskell/resourcet/resourcet-0.4.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild b/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild
deleted file mode 100644
index c234e8474196..000000000000
--- a/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild b/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild
deleted file mode 100644
index 102878ecb3c4..000000000000
--- a/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-1.1.7.ebuild b/dev-haskell/resourcet/resourcet-1.1.7.ebuild
deleted file mode 100644
index 5d4a831fb0a4..000000000000
--- a/dev-haskell/resourcet/resourcet-1.1.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-1.1.9.ebuild b/dev-haskell/resourcet/resourcet-1.1.9.ebuild
deleted file mode 100644
index c7ef6f9143b8..000000000000
--- a/dev-haskell/resourcet/resourcet-1.1.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deterministic allocation and freeing of scarce resources"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	dev-haskell/mmorph:=[profile?]
-	>=dev-haskell/monad-control-0.3.1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild b/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
index 79b84d5108fd..a55ca295082d 100644
--- a/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
+++ b/dev-haskell/resourcet/resourcet-1.2.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/resourcet/resourcet-1.2.6.ebuild b/dev-haskell/resourcet/resourcet-1.2.6.ebuild
new file mode 100644
index 000000000000..b13e58ee12aa
--- /dev/null
+++ b/dev-haskell/resourcet/resourcet-1.2.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Deterministic allocation and freeing of scarce resources"
+HOMEPAGE="https://github.com/snoyberg/conduit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/primitive:=[profile?]
+	>=dev-haskell/unliftio-core-0.1.1.0:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/hspec-1.3 )
+"
diff --git a/dev-haskell/retry/Manifest b/dev-haskell/retry/Manifest
index 0328d71aa28f..c2cac5759f82 100644
--- a/dev-haskell/retry/Manifest
+++ b/dev-haskell/retry/Manifest
@@ -1,2 +1,2 @@
-DIST retry-0.7.4.2.tar.gz 9721 BLAKE2B 419f36f128ff3c1977daf6aff15346a499a199c444f1867d08b4da6351465f28298f85e77801fa197c26844558111853abede237939bfdf22fe7f1d977620c3e SHA512 5caeb55225759eae466dc0b0a78ff2538380fda75fbd52758639c12c20e3194d2b272fb9286fbffaf70366418654f2e46088954921a9840720b590598314ba2b
-DIST retry-0.8.1.1.tar.gz 15800 BLAKE2B fa01f4e6df405d1f71bcb8c7cad6ba9b166222527c70b687feef7b6577446bf790681a189675995bfba3bb362257130bd74119e35893f4497a4f9f57fb37491d SHA512 6907d04314b10fbcbb6680608bbd5926ab56f5916fc032339d5793f2813983d5db3f40d4fc25f8e0befcb3649e753aec737a7ef3cf98fe05252a3a8c1bd546a1
+DIST retry-0.9.0.0.tar.gz 15863 BLAKE2B 2ebe8e71b700f0bedf19a43e08171f98219009dc9ff4f6069ada64945128839f5321c9a2f0602a976431cedbb0c77a56b01805005b8cb4c746b4d4d875b90921 SHA512 89c6ab55a5b0050f7132566d0c9d6ddbbdb927d21c5fcf8fe959fb04228398bc87aa9b51752a881f8a581e6030ac7d21d344dc2c3fea192b0330519e94b33269
+DIST retry-0.9.3.1.tar.gz 18717 BLAKE2B 6db19277fb92e9a12f68f8ce0bd0017426540ca8d842fce85d36c62f553afdc91019e0a8326d3f52e15762a6129192f69b73ab61954222bbe0f6d2171b6b133d SHA512 6ce93f69bffcc6a13da9878ea1ec9547dbd3ba5f84148b3ee408292138297329ded6e3aa0daf0cfa76a9b5e99696f66721e0abc711d0a92383c3ec6584de0861
diff --git a/dev-haskell/retry/metadata.xml b/dev-haskell/retry/metadata.xml
index 8df6740dd53a..8e465ebd89e3 100644
--- a/dev-haskell/retry/metadata.xml
+++ b/dev-haskell/retry/metadata.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package exposes combinators that can wrap arbitrary
-		monadic actions. They run the action and potentially retry
-		running it with some configurable delay for a configurable
-		number of times.
-		The purpose is to make it easier to work with IO and
-		especially network IO actions that often experience temporary
-		failure and warrant retrying of the original action. For
-		example, a database query may time out for a while, in which
-		case we should hang back for a bit and retry the query instead
-		of simply raising an exception.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">retry</remote-id>
+		<remote-id type="github">Soostone/retry</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/retry/retry-0.7.4.2.ebuild b/dev-haskell/retry/retry-0.7.4.2.ebuild
deleted file mode 100644
index 9ed4c7b73386..000000000000
--- a/dev-haskell/retry/retry-0.7.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Retry combinators for monadic actions that may fail"
-HOMEPAGE="https://github.com/Soostone/retry"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.9
-		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.6
-		dev-haskell/mtl
-		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.10
-		dev-haskell/stm )
-"
diff --git a/dev-haskell/retry/retry-0.8.1.1.ebuild b/dev-haskell/retry/retry-0.8.1.1.ebuild
deleted file mode 100644
index e6991bfb0f39..000000000000
--- a/dev-haskell/retry/retry-0.8.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-#hackport: flags: -lib-Werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Retry combinators for monadic actions that may fail"
-HOMEPAGE="https://github.com/Soostone/retry"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
-	>=dev-haskell/random-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hedgehog
-		>=dev-haskell/hunit-1.2.5.2
-		dev-haskell/mtl
-		dev-haskell/stm
-		dev-haskell/tasty
-		dev-haskell/tasty-hedgehog
-		dev-haskell/tasty-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-Werror
-}
diff --git a/dev-haskell/retry/retry-0.9.0.0.ebuild b/dev-haskell/retry/retry-0.9.0.0.ebuild
new file mode 100644
index 000000000000..206db31cacc8
--- /dev/null
+++ b/dev-haskell/retry/retry-0.9.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -lib-werror
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Retry combinators for monadic actions that may fail"
+HOMEPAGE="https://github.com/Soostone/retry"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
+	>=dev-haskell/random-1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hedgehog
+		>=dev-haskell/hunit-1.2.5.2
+		dev-haskell/mtl
+		dev-haskell/stm
+		dev-haskell/tasty
+		dev-haskell/tasty-hedgehog
+		dev-haskell/tasty-hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-lib-werror
+}
diff --git a/dev-haskell/retry/retry-0.9.3.1.ebuild b/dev-haskell/retry/retry-0.9.3.1.ebuild
new file mode 100644
index 000000000000..5ba3167745a0
--- /dev/null
+++ b/dev-haskell/retry/retry-0.9.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -lib-werror
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Retry combinators for monadic actions that may fail"
+HOMEPAGE="https://github.com/Soostone/retry"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-haskell/mtl-compat:=[profile?]
+	>=dev-haskell/random-1:=[profile?]
+	>=dev-haskell/unliftio-core-0.1.0.0:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/hedgehog-1.0
+		>=dev-haskell/hunit-1.2.5.2
+		dev-haskell/tasty
+		dev-haskell/tasty-hedgehog
+		dev-haskell/tasty-hunit
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-lib-werror
+}
diff --git a/dev-haskell/rfc5051/Manifest b/dev-haskell/rfc5051/Manifest
deleted file mode 100644
index 777748513b6e..000000000000
--- a/dev-haskell/rfc5051/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST rfc5051-0.1.0.3.tar.gz 217935 BLAKE2B 0957fd189a5d9560a790f9c8bc9ef7d6c839dcd2111471195c8b89ef1efbb448084b03498889e724095b5b0760138493a74d80026a478d0ba3a49cffa95be9a3 SHA512 aef601b6e42c3f4238e77452ef302f155ba7bc815d35cf680e2f260ce337644652ee4ac77ea03696a91563faaabd7c124b95a4c16661dd104ddc85be7d9dffa0
-DIST rfc5051-0.1.0.4.tar.gz 218105 BLAKE2B 456ab3fe7d1cffebaeaef0aea1b0867ef69729076af9317cdf8f0f802800552a5a1e6ce27e6684eee94457acc925ad9d7c750864b6098b687af576b5aa74d772 SHA512 5a8a3f3ccb846986242152c8c30a0069466072f2b3fb449565b7fb95615c7909be04a320b9215d313d8b8e442a01959ffead0d5076bc61ee7f33f5ff1d9dd67b
diff --git a/dev-haskell/rfc5051/metadata.xml b/dev-haskell/rfc5051/metadata.xml
deleted file mode 100644
index 1f536000f3b9..000000000000
--- a/dev-haskell/rfc5051/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="mkunicodedata">build codes generator itself</flag>
-	</use>
-	<longdescription>
-		This library implements @i;unicode-casemap@,
-		the simple, non locale-sensitive unicode collation
-		algorithm described in RFC 5051 (&lt;http://www.rfc-editor.org/rfc/rfc5051.txt&gt;).
-		Proper unicode collation can be done using text-icu, but that is a big
-		dependency that depends on a large C library, and rfc5051 might be better
-		for some purposes.
-		
-		Here is a list of strings sorted by the Prelude's @sort@ function:
-		
-		@Abe Oeb abe ab&amp;#233; oeb &amp;#193;be &amp;#196;be &amp;#212;eb &amp;#225;be &amp;#228;be &amp;#244;eb@
-		
-		Here is the same list sorted by @sortBy compareUnicode@:
-		
-		@Abe abe ab&amp;#233; &amp;#193;be &amp;#225;be &amp;#196;be &amp;#228;be Oeb oeb &amp;#212;eb &amp;#244;eb@
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild b/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild
deleted file mode 100644
index f92c38ed905d..000000000000
--- a/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple unicode collation as per RFC5051"
-HOMEPAGE="https://hackage.haskell.org/package/rfc5051"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mkunicodedata"
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mkunicodedata mkunicodedata)
-}
diff --git a/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild b/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild
deleted file mode 100644
index 62d9e8871b7f..000000000000
--- a/dev-haskell/rfc5051/rfc5051-0.1.0.4.ebuild
+++ /dev/null
@@ -1,29 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple unicode collation as per RFC5051"
-HOMEPAGE="https://hackage.haskell.org/package/rfc5051"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="mkunicodedata"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag mkunicodedata mkunicodedata)
-}
diff --git a/dev-haskell/riff/Manifest b/dev-haskell/riff/Manifest
deleted file mode 100644
index eda2bc50e266..000000000000
--- a/dev-haskell/riff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST riff-0.3.0.1.tar.gz 9420 BLAKE2B 28715306b6c6ff6e630da306606f2946f05a5b0470576eae46761d7c368c502084cb4dcae0ddd6af2525491f83f7eb54101645a9d05fce53e117ab0d16123f69 SHA512 9b488fa0853dec662109809627c451ec22766595e710a14d25598e1232bc1e286a649a9fd4933bf42737b68554f1a0401c0fee12e833d6fd79b9eb989a4d23b2
diff --git a/dev-haskell/riff/metadata.xml b/dev-haskell/riff/metadata.xml
deleted file mode 100644
index 9e39c9d11cc5..000000000000
--- a/dev-haskell/riff/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library provides a RIFF parser for Haskell for easy manipulation
-		of common file formats like WAVE and RIFF container AVI files.
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">robertmassaioli/riff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/riff/riff-0.3.0.1.ebuild b/dev-haskell/riff/riff-0.3.0.1.ebuild
deleted file mode 100644
index 69b9d3a46788..000000000000
--- a/dev-haskell/riff/riff-0.3.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="RIFF parser for Haskell"
-HOMEPAGE="https://bitbucket.org/robertmassaioli/riff/overview"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/either-4.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'binary >=0.7 && <0.8' 'binary >=0.7' \
-		'either == 4.3.*' 'either >= 4.3' \
-		'filepath >=1.3 && <1.4' 'filepath >=1.3' \
-		'transformers == 0.4.*' 'transformers >= 0.4'
-}
diff --git a/dev-haskell/rio-orphans/Manifest b/dev-haskell/rio-orphans/Manifest
deleted file mode 100644
index ac4e731f10f9..000000000000
--- a/dev-haskell/rio-orphans/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rio-orphans-0.1.1.0.tar.gz 3098 BLAKE2B 83308c4dc8c1306e8c00c6ef0365169e6787a159a17efff86a754eb2ba797328eb8358a6a83069b97389399a0416a45c945fc636c941bfc5930a76e25c6b41ff SHA512 2e415ebcc7341cf1c913de54de3218ac487e310c9556d1e1bdb349f4e7b9d041ea729c21e2bfdbcded9a214c84f483e32839a4fec87b2af9b986db5aaa18b42a
diff --git a/dev-haskell/rio-orphans/metadata.xml b/dev-haskell/rio-orphans/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/rio-orphans/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild b/dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild
deleted file mode 100644
index 0906c97f03f3..000000000000
--- a/dev-haskell/rio-orphans/rio-orphans-0.1.1.0.ebuild
+++ /dev/null
@@ -1,32 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for the RIO type in the rio package"
-HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
-	dev-haskell/fast-logger:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/rio:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/rio-prettyprint/Manifest b/dev-haskell/rio-prettyprint/Manifest
deleted file mode 100644
index 00be4394bce0..000000000000
--- a/dev-haskell/rio-prettyprint/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rio-prettyprint-0.1.1.0.tar.gz 11503 BLAKE2B a2056a98d28b3313beeef5487e1ee927d058326bba1ee758ce1d5e46b5a8709b1b53c788ce9d57a2c2f7496c097bad4960ac4b7429a553c5121043afcde51b30 SHA512 3f519fa0dd4ea51af565221504358ca5728b9ebe07df8a2b34b83198bb19d6653c048cd45701fed6d99b5204da05449f35c0be8e98df2da1c34ea99023f06bf4
diff --git a/dev-haskell/rio-prettyprint/metadata.xml b/dev-haskell/rio-prettyprint/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/rio-prettyprint/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/rio-prettyprint/rio-prettyprint-0.1.1.0.ebuild b/dev-haskell/rio-prettyprint/rio-prettyprint-0.1.1.0.ebuild
deleted file mode 100644
index fc95a6524cd1..000000000000
--- a/dev-haskell/rio-prettyprint/rio-prettyprint-0.1.1.0.ebuild
+++ /dev/null
@@ -1,33 +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.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Pretty-printing for RIO"
-HOMEPAGE="https://github.com/commercialhaskell/rio-prettyprint#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/annotated-wl-pprint:=[profile?]
-	>=dev-haskell/ansi-terminal-0.9:=[profile?]
-	dev-haskell/cabal:=[profile?]
-	dev-haskell/colour:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/path:=[profile?]
-	dev-haskell/rio:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/rio/Manifest b/dev-haskell/rio/Manifest
index a9592f041482..3a8fa2e9af75 100644
--- a/dev-haskell/rio/Manifest
+++ b/dev-haskell/rio/Manifest
@@ -1 +1,2 @@
-DIST rio-0.1.18.0.tar.gz 58618 BLAKE2B c249006fa7a04f7db39168cfd324f61bf01862e57cec272a0b9551b6db4345ba813ac07c595ce795b4d0be06fa950cdeb626a30bef11e8eb03e98e575c04a397 SHA512 dd5fcf3611289108c154fb77d2bba4132ef80943b5ffcf9aa76e0d93d37fe3b6992d9804a3815b3aca1cbfaa21cb09c693022032649b6d1bb0e5fbfc2e161ab1
+DIST rio-0.1.21.0.tar.gz 59157 BLAKE2B 5455a0056efc32f0120182a65adee665cfc33fbf2b6627bf420b26db7d472ca8b3d0797d996600f8538cc1dcfe34d87c0b6ce93f88dfc4c7e8b9516be334f25d SHA512 5a049c7af44f0811e402d641815453be0af1f437a89cada613940085ceb8b8bb66ab92753f31bf400ff16f72ff08a9e83ff422c988e434ffef0c64b4c1cc7224
+DIST rio-0.1.22.0.tar.gz 59262 BLAKE2B 1db8d70ab0d740c95d80db3bcb16a395ab1c2bed522f2ebb989821a73e091919967b23e6be57d2ab35ff2c661560463f80f278e4abf532ecb261bcabcd6ce617 SHA512 a324bdc62341f7da9300c429712963de3926d5585a5772d412ba50d75503fd1c08edb7e6712d9ddc5d825910a5d59e13d9f0c48a2dca98efe33fead44ec7f8bd
diff --git a/dev-haskell/rio/metadata.xml b/dev-haskell/rio/metadata.xml
index b7878815d80d..cc574ab28b0d 100644
--- a/dev-haskell/rio/metadata.xml
+++ b/dev-haskell/rio/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">rio</remote-id>
+		<remote-id type="github">commercialhaskell/rio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/rio/rio-0.1.18.0.ebuild b/dev-haskell/rio/rio-0.1.18.0.ebuild
deleted file mode 100644
index e8707658616b..000000000000
--- a/dev-haskell/rio/rio-0.1.18.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A standard library for Haskell"
-HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	dev-haskell/microlens:=[profile?]
-	dev-haskell/microlens-mtl:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/typed-process-0.2.5.0:=[profile?]
-	>=dev-haskell/unliftio-0.2.12:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/rio/rio-0.1.21.0.ebuild b/dev-haskell/rio/rio-0.1.21.0.ebuild
new file mode 100644
index 000000000000..5c2c3257095f
--- /dev/null
+++ b/dev-haskell/rio/rio-0.1.21.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A standard library for Haskell"
+HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/hashable:=[profile?]
+	dev-haskell/microlens:=[profile?]
+	dev-haskell/microlens-mtl:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	>=dev-haskell/typed-process-0.2.5.0:=[profile?]
+	>=dev-haskell/unliftio-0.2.14:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/rio/rio-0.1.22.0-r1.ebuild b/dev-haskell/rio/rio-0.1.22.0-r1.ebuild
new file mode 100644
index 000000000000..4e9a92cd357c
--- /dev/null
+++ b/dev-haskell/rio/rio-0.1.22.0-r1.ebuild
@@ -0,0 +1,36 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A standard library for Haskell"
+HOMEPAGE="https://github.com/commercialhaskell/rio#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-haskell/hashable:=[profile?]
+	dev-haskell/microlens:=[profile?]
+	dev-haskell/microlens-mtl:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	>=dev-haskell/typed-process-0.2.5.0:=[profile?]
+	>=dev-haskell/unliftio-0.2.14:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? (
+		dev-haskell/hspec
+		dev-haskell/quickcheck
+	)
+"
diff --git a/dev-haskell/rsa/Manifest b/dev-haskell/rsa/Manifest
deleted file mode 100644
index 86a9aca3dad7..000000000000
--- a/dev-haskell/rsa/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST RSA-2.3.1.tar.gz 14705 BLAKE2B 065341bd3360410ca1e2ae1057b6b8112bc6cf1253ef12733d9d9564666b7c97e8088d35e0736a76768ebc8d40f497536ec0bb84565d849285666c591f1df3c6 SHA512 b4d3f406cd7b97237c2b36e2ba659f35871e02a6144b6cb48482fdc7999d9822758472c25b9eaef9ef6aeb8c503fa49b424350a543897217f3aec3084dd7572f
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch
deleted file mode 100644
index 2c985b3b5f62..000000000000
--- a/dev-haskell/rsa/files/rsa-2.3.1-p1-ghc-8.8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 8d867a693f91406f9b45e24d79a0637013c0e272
-Author: Ollie Charles <ollie@ocharles.org.uk>
-Date:   Wed Sep 18 14:48:23 2019 +0100
-
-    Update Pure.hs
-
-diff --git a/src/Codec/Crypto/RSA/Pure.hs b/src/Codec/Crypto/RSA/Pure.hs
-index 8e0f483..a69907d 100644
---- a/src/Codec/Crypto/RSA/Pure.hs
-+++ b/src/Codec/Crypto/RSA/Pure.hs
-@@ -111,7 +111,7 @@ instance Binary PrivateKey where
-               d   <- os2ip `fmap` getLazyByteString (fromIntegral (public_size pub))
-               return (PrivateKey pub d 0 0 0 0 0)
- 
--failOnError :: (Monad m, Show a) => Either a b -> m b
-+failOnError :: (MonadFail m, Show a) => Either a b -> m b
- failOnError (Left e)  = fail (show e)
- failOnError (Right b) = return b
- 
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch
deleted file mode 100644
index e2c7348eb38c..000000000000
--- a/dev-haskell/rsa/files/rsa-2.3.1-p2-ghc-8.8.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit d621ae1603f27b3de867b46e5ad4d28460097dac
-Author: Ollie Charles <ollie@ocharles.org.uk>
-Date:   Wed Sep 18 14:52:34 2019 +0100
-
-    Update Pure.hs
-
-diff --git a/src/Codec/Crypto/RSA/Pure.hs b/src/Codec/Crypto/RSA/Pure.hs
-index a69907d..e3513a9 100644
---- a/src/Codec/Crypto/RSA/Pure.hs
-+++ b/src/Codec/Crypto/RSA/Pure.hs
-@@ -111,8 +111,8 @@ instance Binary PrivateKey where
-               d   <- os2ip `fmap` getLazyByteString (fromIntegral (public_size pub))
-               return (PrivateKey pub d 0 0 0 0 0)
- 
--failOnError :: (MonadFail m, Show a) => Either a b -> m b
--failOnError (Left e)  = fail (show e)
-+failOnError :: (Monad m, Show a) => Either a b -> m b
-+failOnError (Left e)  = error (show e)
- failOnError (Right b) = return b
- 
- -- ----------------------------------------------------------------------------
diff --git a/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch b/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch
deleted file mode 100644
index 6aebe6fab6ce..000000000000
--- a/dev-haskell/rsa/files/rsa-2.3.1-p3-ghc-8.8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit bb712862c868975ab033e1079751d9e3787d3a33
-Author: Ollie Charles <ollie@ocharles.org.uk>
-Date:   Wed Sep 18 14:54:22 2019 +0100
-
-    Update Test.hs
-
-diff --git a/Test.hs b/Test.hs
-index dd61302..4fa26ca 100644
---- a/Test.hs
-+++ b/Test.hs
-@@ -98,10 +98,10 @@ instance Arbitrary LargePrime where
-   arbitrary =
-     do seed <- BSS.pack `fmap` replicateM 4096 arbitrary
-        case newGen seed of
--        Left _ -> fail "DRBG initialization error."
-+        Left _ -> error "DRBG initialization error."
-         Right (g :: HashDRBG) ->
-           case largeRandomPrime g 64 of
--            Left _ -> fail "Large prime generation failure."
-+            Left _ -> error "Large prime generation failure."
-             Right (i, _) -> return (LP i)
- 
- data KeyPairIdx = KPI Int
diff --git a/dev-haskell/rsa/metadata.xml b/dev-haskell/rsa/metadata.xml
deleted file mode 100644
index 72836dbae97d..000000000000
--- a/dev-haskell/rsa/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library implements the RSA encryption and signature
-		algorithms for arbitrarily-sized ByteStrings. While the
-		implementations work, they are not necessarily the fastest ones
-		on the planet. Particularly key generation. The algorithms
-		included are based of RFC 3447, or the Public-Key Cryptography
-		Standard for RSA, version 2.1 (a.k.a, PKCS#1 v2.1).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/rsa/rsa-2.3.1.ebuild b/dev-haskell/rsa/rsa-2.3.1.ebuild
deleted file mode 100644
index aa735c7441d2..000000000000
--- a/dev-haskell/rsa/rsa-2.3.1.ebuild
+++ /dev/null
@@ -1,49 +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.9999
-#hackport: flags: -oldbase,-buildtestexecutable
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="RSA"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implementation of RSA, using the padding schemes of PKCS#1 v2.1"
-HOMEPAGE="http://hackage.haskell.org/package/RSA"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/crypto-api-0.10:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.2:=[profile?] <dev-haskell/crypto-pubkey-types-0.6:=[profile?]
-	>=dev-haskell/sha-1.6.4.1:=[profile?] <dev-haskell/sha-2.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/crypto-pubkey-types-0.4 <dev-haskell/crypto-pubkey-types-0.6
-		>=dev-haskell/drbg-0.5.2 <dev-haskell/drbg-0.7
-		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
-		>=dev-haskell/tagged-0.2 <dev-haskell/tagged-0.9
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.10
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-0.5 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}"/${P}-p1-ghc-8.8.patch
-		 "${FILESDIR}"/${P}-p2-ghc-8.8.patch
-		 "${FILESDIR}"/${P}-p3-ghc-8.8.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-buildtestexecutable \
-		--flag=-oldbase
-}
diff --git a/dev-haskell/safe-exceptions/Manifest b/dev-haskell/safe-exceptions/Manifest
index af4507830b89..41208c432ca3 100644
--- a/dev-haskell/safe-exceptions/Manifest
+++ b/dev-haskell/safe-exceptions/Manifest
@@ -1,2 +1,2 @@
-DIST safe-exceptions-0.1.4.0.tar.gz 12951 BLAKE2B afa5265d9674e1a88fa61cdf4c2356ffadeec3e922a52f418f88bdc1aaa22cf4378711b11a7679c99f933a515f53ca4338513fd4f2bf41f12159279d148a3131 SHA512 377559c3b35f48bd3baef4cb7bb19927bed36f34dfa531864a3565af9f7cb5ef9fc4cc9c92dcc9bb80037cb92f27dd0ba5805cc5941b8707bbc3d4185f0f40e1
 DIST safe-exceptions-0.1.7.0.tar.gz 13533 BLAKE2B 4dbf6ebdb5dcd2d1f691cac540fe4cdaf3557bfc90f702b7120b4b6a8d1e2be7ff4e6d22851be5d2650a35e074551e48643152c25a76a2ab0ffd3c37fab663b0 SHA512 05fc32ea80ce1f733a6ea09655fecccf813ea9b7736dbd1d8ef84f54e3fb58f1017756cc9eb507d381cb73f22f100e9166bef1b7198a1d9edbda21e38626e351
+DIST safe-exceptions-0.1.7.3.tar.gz 14169 BLAKE2B 96750575daec4deba15f0302381b17b7f63f77c6b671c34f14a7eb2e947b94419317c94a831e8361e65096f577e392343f6b2eba811b7a6d8d2c7640872ae328 SHA512 380165ad904868982fd1ae1c1eeafecb0458e837563e1279e35eb7865582b44d27b766c9d66695d1bf6fe5d4eb10897c114d79b35395ee89612b78b3eaa55208
diff --git a/dev-haskell/safe-exceptions/metadata.xml b/dev-haskell/safe-exceptions/metadata.xml
index cda61119fab2..32c35127060f 100644
--- a/dev-haskell/safe-exceptions/metadata.xml
+++ b/dev-haskell/safe-exceptions/metadata.xml
@@ -1,14 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		Please see README.md
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">safe-exceptions</remote-id>
 		<remote-id type="github">fpco/safe-exceptions</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/safe-exceptions/safe-exceptions-0.1.4.0.ebuild b/dev-haskell/safe-exceptions/safe-exceptions-0.1.4.0.ebuild
deleted file mode 100644
index c1b6ac8077a6..000000000000
--- a/dev-haskell/safe-exceptions/safe-exceptions-0.1.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Safe, consistent, and easy exception handling"
-HOMEPAGE="https://github.com/fpco/safe-exceptions#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.9:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/void )
-"
diff --git a/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild
index 9d53c5e08b7a..9957997ddc4c 100644
--- a/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild
+++ b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.8:=[profile?]
@@ -26,10 +26,7 @@ DEPEND="${RDEPEND}
 		dev-haskell/void )
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.7 && < 4.11' 'base >= 4.7' \
-		'exceptions >= 0.8 && < 0.9' 'exceptions >= 0.8'
-}
+CABAL_CHDEPS=(
+	'base >= 4.7 && < 4.11' 'base >= 4.7'
+	'exceptions >= 0.8 && < 0.9' 'exceptions >= 0.8'
+)
diff --git a/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.3.ebuild b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.3.ebuild
new file mode 100644
index 000000000000..c35b689b5b48
--- /dev/null
+++ b/dev-haskell/safe-exceptions/safe-exceptions-0.1.7.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Safe, consistent, and easy exception handling"
+HOMEPAGE="https://github.com/fpco/safe-exceptions#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( dev-haskell/hspec
+		dev-haskell/void )
+"
diff --git a/dev-haskell/safe/Manifest b/dev-haskell/safe/Manifest
index 6488336cbf61..2d6e8b2d117f 100644
--- a/dev-haskell/safe/Manifest
+++ b/dev-haskell/safe/Manifest
@@ -1,2 +1 @@
-DIST safe-0.3.17.tar.gz 10524 BLAKE2B 921f791f85ad4681c1c6a002b099699e0ca48fa3fe595734f02c3f27f812e9245dfedbb6cfa475ff6c791f2001afa979ca3c45f66dda314e8f8207072259b6f4 SHA512 7d9dc15f5694103b3734c262e893f94b6c27b8b1bf4525f2d6ea5ca73e2d66715c028259ede9e8064e3579dd63342dd088c4afa764bcaeda09434515435416ec
-DIST safe-0.3.9.tar.gz 6931 BLAKE2B 3aee0d7e8cedd0b196bb705b4a23f7679e40979f6b3b474a29fa27e4a684820707082979c5167d74fde1f763bd856659ca0c68e323c92fcfe08c1faa953bdac9 SHA512 7759ae8acf0348a3070cc47e78b224ac5a826ecf46302cbe413b52c53d8d6bb6ebd939b0fe3dbb47034e910876bd7c849609f008e44f09e5ccb99a9997d2f418
+DIST safe-0.3.19.tar.gz 11267 BLAKE2B cea32bc80101230f177c4bf44f8c3348a26637ecf334320c58e1b3e7ba02f6e3b80d7c287f5d4fac874ac5e01e54054a35cde4c39fb983bb1464d3fbb133c733 SHA512 9e987a895f0f888338bb2b0088732a404246a28ce32d73808ed6aa3b6d909da884ec54d5fe71fd190e287f108be1800bef2865acfcfac3bf6873dfb7c679cfea
diff --git a/dev-haskell/safe/metadata.xml b/dev-haskell/safe/metadata.xml
index 6f9afad8978c..b4273947bd00 100644
--- a/dev-haskell/safe/metadata.xml
+++ b/dev-haskell/safe/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/safe/safe-0.3.17.ebuild b/dev-haskell/safe/safe-0.3.17.ebuild
deleted file mode 100644
index ca1f1120a8a5..000000000000
--- a/dev-haskell/safe/safe-0.3.17.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library of safe (exception free) functions"
-HOMEPAGE="https://github.com/ndmitchell/safe#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18
-	test? ( dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/safe/safe-0.3.19.ebuild b/dev-haskell/safe/safe-0.3.19.ebuild
new file mode 100644
index 000000000000..6c0fffac4019
--- /dev/null
+++ b/dev-haskell/safe/safe-0.3.19.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library of safe (exception free) functions"
+HOMEPAGE="https://github.com/ndmitchell/safe#readme"
+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.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/safe/safe-0.3.9.ebuild b/dev-haskell/safe/safe-0.3.9.ebuild
deleted file mode 100644
index 5fcf70527756..000000000000
--- a/dev-haskell/safe/safe-0.3.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library of safe (exception free) functions"
-HOMEPAGE="https://github.com/ndmitchell/safe#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/safesemaphore/metadata.xml b/dev-haskell/safesemaphore/metadata.xml
index 59189077d61e..8020260c76d9 100644
--- a/dev-haskell/safesemaphore/metadata.xml
+++ b/dev-haskell/safesemaphore/metadata.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This provides a much safer semaphore than the QSem, QSemN, SampleVar in base.
-		Those base modules are not exception safe and can be broken by killThread.
-		See &lt;https://github.com/ChrisKuklewicz/SafeSemaphore&gt; for more details.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">ChrisKuklewicz/SafeSemaphore</remote-id>
 	</upstream>
diff --git a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
index f094d3f7db59..440e0ae96ec0 100644
--- a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
+++ b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/stm:=[profile?]
diff --git a/dev-haskell/sandi/Manifest b/dev-haskell/sandi/Manifest
index 74902e28724d..a09f877b5201 100644
--- a/dev-haskell/sandi/Manifest
+++ b/dev-haskell/sandi/Manifest
@@ -1,3 +1 @@
-DIST sandi-0.3.6.tar.gz 18463 BLAKE2B e480b127b08edf6d83504b06732f4565ee4e8c8438110a7fea6092f28a552ddda19b1fde93f021400272e9ebd1b5184cc09c902fdebb1fffc9bc2b1b426a736d SHA512 8a730f63e72fb648e2ae478a3785ab364b437a319735acda80558639cc0a43027639ff01dd2b630277348ebc31a4a5fe30ede8f4208229c1c8810f78d350bbf2
-DIST sandi-0.4.0.tar.gz 19319 BLAKE2B 87727c706832e4020f4e7794fa9c562415711766b5d37c4090f4f8ac3b71dfa840ae788b077b49c967ea885b2b915e16a7bd7845e62f46cc3c86fddcd1ca1005 SHA512 8d67d4630940b2bc75eba74e1aea169d604f27701015a19ecba6dfece9a2dc8a215a786991bc9ab1fc6de8c91c3b608144239b83c4cb01be0620b3ddb12ee8b6
 DIST sandi-0.5.tar.gz 19115 BLAKE2B e6fa5ba8757c2ff96a556cdad50217344eb188e5b258c770acc2228e0219f2259891789b4ef33d00a64a8f2d3f1b633d046517fc95792fa21b1dfea1dd2a19a7 SHA512 8abff3496d0d3f082f12416eea3189e06d1663fe78d996159396ab944389b2a816853c0191edced3b176fc506dac60e9ce84347ecaf2c255e5ec0d6b1590c012
diff --git a/dev-haskell/sandi/metadata.xml b/dev-haskell/sandi/metadata.xml
index 5c43ee36847c..72b28788a318 100644
--- a/dev-haskell/sandi/metadata.xml
+++ b/dev-haskell/sandi/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Reasonably fast data encoding library.
-	</longdescription>
 	<use>
-		<flag name="with-conduit">Build with conduit</flag>
 		<flag name="conduit">Build with conduit</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-haskell/sandi/sandi-0.3.6.ebuild b/dev-haskell/sandi/sandi-0.3.6.ebuild
deleted file mode 100644
index da48f1cfd188..000000000000
--- a/dev-haskell/sandi/sandi-0.3.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Data encoding library"
-HOMEPAGE="https://hackage.haskell.org/package/sandi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+with-conduit"
-
-RDEPEND=">=dev-lang/ghc-7.8.2:=
-	with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-			>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck
-		dev-haskell/tasty-th )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.7 && <4.9' 'base >= 4.7'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag with-conduit with-conduit)
-}
diff --git a/dev-haskell/sandi/sandi-0.4.0.ebuild b/dev-haskell/sandi/sandi-0.4.0.ebuild
deleted file mode 100644
index 200ffaa8d061..000000000000
--- a/dev-haskell/sandi/sandi-0.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Data encoding library"
-HOMEPAGE="https://hackage.haskell.org/package/sandi"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+with-conduit"
-
-RDEPEND=">=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	with-conduit? ( >=dev-haskell/conduit-1.2:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-			>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck
-		dev-haskell/tasty-th )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag with-conduit with-conduit)
-}
diff --git a/dev-haskell/sandi/sandi-0.5.ebuild b/dev-haskell/sandi/sandi-0.5.ebuild
index c432eafc7d45..f50b99738749 100644
--- a/dev-haskell/sandi/sandi-0.5.ebuild
+++ b/dev-haskell/sandi/sandi-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 #hackport: flags: with-conduit:conduit
@@ -10,12 +10,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Data encoding library"
-HOMEPAGE="http://hackage.haskell.org/package/sandi"
+HOMEPAGE="https://hackage.haskell.org/package/sandi"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+conduit"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/say/Manifest b/dev-haskell/say/Manifest
deleted file mode 100644
index 0d9ee47905d3..000000000000
--- a/dev-haskell/say/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST say-0.1.0.0.tar.gz 5728 BLAKE2B 0d0827a9b397a3b68b21bb1cd81b8303b81d17eb134704f2d54157194595ebfd43ca488b603514f8fcd9d4b69b0e8a8f74721637f2743fa1e3358c52479e3712 SHA512 8bbf2953e9b09e7f783688ccc7323ed0f91d1043db531844d875b5d12bdfbc0fa31148a9a193ea717b05704c25d56c66d8ad53376ba8b120d42f1173e5fde83c
diff --git a/dev-haskell/say/metadata.xml b/dev-haskell/say/metadata.xml
deleted file mode 100644
index b6159361b19d..000000000000
--- a/dev-haskell/say/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/say</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/say/say-0.1.0.0.ebuild b/dev-haskell/say/say-0.1.0.0.ebuild
deleted file mode 100644
index afbd9623e437..000000000000
--- a/dev-haskell/say/say-0.1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Initial project template from stack"
-HOMEPAGE="https://github.com/fpco/say#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index dabb52f52f71..db6ffb23739d 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -1,5 +1,2 @@
-DIST scientific-0.3.3.8.tar.gz 18543 BLAKE2B ae3a16163d830fe20f7e2705b9e99aa9156743287aa45e635a282f5369b9132f2b8de11596353a5c374b0e11e5a2219ab40de842f1a273f956032fd1908ce514 SHA512 ef77aa3490cbbc92ab71c1db7015ead24100a6230444b895c49bc4840a80dad04f4f8ff0c1bff27490f5c35b53a1f0c294177912492d1259e204bd4d874ea477
-DIST scientific-0.3.4.4.tar.gz 21646 BLAKE2B 9ca2e989cea77dc70a1ce26de4571b0ccdd1ec68c7ab84f00bbb32d7a121963feae9cdd4acb7d51e417a698222143fd4a34d838af21e6f86551fb5f9e097e05f SHA512 18c36036ffe15ef4203d391864c91d505a4a55c7da1b71556cbd6ebb7f83e71e0695789f8beaa4741ae4e21ae54bc1f795a26cd4e3208d08625d639519945217
-DIST scientific-0.3.4.6.tar.gz 21932 BLAKE2B 5d78b981d5627b172af677a35a9bde73bd96053f06cf5e7945957400d3b2b6455bdd6d5039dbf21df16a8bf5f68889a54d9ef71eaf977e0908e21e7792575744 SHA512 c4d3f3c166c45395aa420ff598671128faae130cf85f22b651e338dbbdbe9215ef3b75c58f6b495978a4dd36a49fa45de9a68c7b870151296dc09095e3c79e09
-DIST scientific-0.3.4.9.tar.gz 21932 BLAKE2B 5f0f900b5b51d8b4720bf73d4f2ec4911df7156c9bb5013995eec5f9ee0817be61ad8caf4cc41d07f4b022467de1c6e6943eb630e93cb1b1d9760b6b2b0b58ee SHA512 10b317f6d6aa39883891d4fafaad3a8bdcc8390705f981144f3fe040191ffc7364e0505fde07ab7a3fa9d0b03f97adf42be48fcea2d13ef521fb1031590c0db3
-DIST scientific-0.3.6.2.tar.gz 23510 BLAKE2B 096cd305cdbc4856f48e81de5387b229c4f23fdbfc641243ffa56a74422ec7b224fb2979f22cbdcf747d56c6073ce74ff6ca773093570a8d0a774e2b33d26697 SHA512 47a74524c8fb25d381adf868d823a6b6772f3f69b0b3cf9f9de015a03bc941857ef3fca1b4f8cbf23e998164e71a914e167221e753c6f32dc8644047d1ef57ee
+DIST scientific-0.3.7.0-rev5.cabal 4854 BLAKE2B b9490a11d6cea1395cf1cea0bc85627a097aeff7db397de045195b2d0a0db093a39861d5b50e447d98a4b96da3c61eb6d53dffba216c6257ec5b7a009290d6c2 SHA512 3a2c8babc65040692c95f5bbf033d31ec4a3e63382739dfa27a6c0920c96cbcebb982a05222983c796cb04ac81a7b641a742f1d6b9a657f3450bb07242859e90
+DIST scientific-0.3.7.0.tar.gz 24723 BLAKE2B b50d995f6b46d37011823cdd096b1166244c1ab453db490da61eefcf0913f28b9a0b70798aa4ec3c29e6b836d473800b556b6ff062e1e2bee6a25174cd18d52d SHA512 dbd13060a6d1d101138715b4106382a78d115cff247859cb6f83aca3cdb6f6caf8a2c52d7ae99be64845c5e4a7959940bbf31df6265b15079c236f193b087865
diff --git a/dev-haskell/scientific/metadata.xml b/dev-haskell/scientific/metadata.xml
index af4a88b17cb6..1b6ea2a6660c 100644
--- a/dev-haskell/scientific/metadata.xml
+++ b/dev-haskell/scientific/metadata.xml
@@ -1,31 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A @Scientific@ number is an arbitrary-precision floating-point number
-		represented using scientific notation.
-
-		A scientific number with 'coefficient' @c@ and
-		'base10Exponent' @e@ corresponds to the
-		'Fractional' number: @'fromInteger' c * 10 '^^' e@
-
-		Its primary use-case is to serve as the target of
-		parsing floating point numbers. Since the textual
-		representation of floating point numbers use
-		scientific notation they can be efficiently
-		parsed to a @Scientific@ number.
-	</longdescription>
-	<use>
-		<flag name="bytestring-builder">
-			Provide the Data.ByteString.Builder.Scientific
-			module (requires bytestring &gt;= 0.10).
-		</flag>
-	</use>
 	<upstream>
+		<remote-id type="hackage">scientific</remote-id>
 		<remote-id type="github">basvandijk/scientific</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/scientific/scientific-0.3.3.8.ebuild b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
deleted file mode 100644
index d7b467896092..000000000000
--- a/dev-haskell/scientific/scientific-0.3.3.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring-builder"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder)
-}
diff --git a/dev-haskell/scientific/scientific-0.3.4.4.ebuild b/dev-haskell/scientific/scientific-0.3.4.4.ebuild
deleted file mode 100644
index 63d0143a8536..000000000000
--- a/dev-haskell/scientific/scientific-0.3.4.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring-builder"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder)
-}
diff --git a/dev-haskell/scientific/scientific-0.3.4.6.ebuild b/dev-haskell/scientific/scientific-0.3.4.6.ebuild
deleted file mode 100644
index e812a36edaf3..000000000000
--- a/dev-haskell/scientific/scientific-0.3.4.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring-builder"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder)
-}
diff --git a/dev-haskell/scientific/scientific-0.3.4.9.ebuild b/dev-haskell/scientific/scientific-0.3.4.9.ebuild
deleted file mode 100644
index ae9daf6295fb..000000000000
--- a/dev-haskell/scientific/scientific-0.3.4.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
diff --git a/dev-haskell/scientific/scientific-0.3.6.2.ebuild b/dev-haskell/scientific/scientific-0.3.6.2.ebuild
deleted file mode 100644
index a65f4fad1a1a..000000000000
--- a/dev-haskell/scientific/scientific-0.3.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -integer-simple
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # disable test-suite: circular depends
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depends
-
-RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?]
-	>=dev-haskell/integer-logarithms-1:=[profile?]
-	>=dev-haskell/primitive-0.1:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flags=-integer-simple
-}
diff --git a/dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild b/dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild
new file mode 100644
index 000000000000..68dbd52ad020
--- /dev/null
+++ b/dev-haskell/scientific/scientific-0.3.7.0-r2.ebuild
@@ -0,0 +1,49 @@
+# 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: -integer-simple
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Numbers represented using scientific notation"
+HOMEPAGE="https://github.com/basvandijk/scientific"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/integer-logarithms-1.0.3.1:=[profile?] <dev-haskell/integer-logarithms-1.1:=[profile?]
+	>=dev-haskell/primitive-0.7.1.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/quickcheck-2.14.2
+		>=dev-haskell/smallcheck-1.0
+		>=dev-haskell/tasty-1.4.0.1
+		>=dev-haskell/tasty-hunit-0.8
+		>=dev-haskell/tasty-quickcheck-0.8
+		>=dev-haskell/tasty-smallcheck-0.2
+	)
+"
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-integer-simple
+}
diff --git a/dev-haskell/securemem/Manifest b/dev-haskell/securemem/Manifest
index d8a26ca5c732..7225ba08ca27 100644
--- a/dev-haskell/securemem/Manifest
+++ b/dev-haskell/securemem/Manifest
@@ -1,3 +1 @@
 DIST securemem-0.1.10.tar.gz 3801 BLAKE2B 726659761c4e53a5009c0539bfd07c340b72765c6cfcf946f0ac13fb5473df57eda16af7089867089cceba4f211ff7764900da5e3b176d90e5b892ccf4387102 SHA512 9f1428896a7b554244e42ac04a17c008cadce8102294b3249c172d84b20195325c48eadf15f7d26dabd766e4d45d171b0a26649e097d632a7fae596663a43096
-DIST securemem-0.1.3.tar.gz 4585 BLAKE2B e0be426122a732cc252d083400a5c2e0b6edb7bba162866d9d6d3a3a305c86e93ffa7a8880c5c45fc63c7efc6029a0c3ca01074b3fc325e59e449e5b85314b01 SHA512 a60b10e7d763d63d62de34685615592db6f6bb56a8bf57d7aa672956cfe5d98f0169436dcdad7694d1112eb80c59d98801266d78a061f93b320a0f4b27f8d2f6
-DIST securemem-0.1.9.tar.gz 4180 BLAKE2B faf24711bd6651ee162c189ad0ed005f013e3d66ccd940831ec6e17769487384aff206772d906ae7287d6eb4b0749857a0a79bf20f87f4dca6e3ddeb9b6aede8 SHA512 64623b5a695e0e946b5762fe47baea247e497c2f2add0887dc54300948d87088e8604eec58715f8b31642121100c63ead1c8db96ee7d6c60e1ce27b3da6d56e9
diff --git a/dev-haskell/securemem/metadata.xml b/dev-haskell/securemem/metadata.xml
index 62858a206ab3..e6abcddc504a 100644
--- a/dev-haskell/securemem/metadata.xml
+++ b/dev-haskell/securemem/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/securemem/securemem-0.1.10.ebuild b/dev-haskell/securemem/securemem-0.1.10.ebuild
index c2c45563c85f..f170c46ea720 100644
--- a/dev-haskell/securemem/securemem-0.1.10.ebuild
+++ b/dev-haskell/securemem/securemem-0.1.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
diff --git a/dev-haskell/securemem/securemem-0.1.3.ebuild b/dev-haskell/securemem/securemem-0.1.3.ebuild
deleted file mode 100644
index 4f482d2ab091..000000000000
--- a/dev-haskell/securemem/securemem-0.1.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="abstraction to an auto scrubbing and const time eq, memory chunk"
-HOMEPAGE="https://github.com/vincenthz/hs-securemem"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/securemem/securemem-0.1.9.ebuild b/dev-haskell/securemem/securemem-0.1.9.ebuild
deleted file mode 100644
index c446df8a6841..000000000000
--- a/dev-haskell/securemem/securemem-0.1.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="abstraction to an auto scrubbing and const time eq, memory chunk"
-HOMEPAGE="https://github.com/vincenthz/hs-securemem"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
-	>=dev-haskell/memory-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/selective/Manifest b/dev-haskell/selective/Manifest
deleted file mode 100644
index ed11e54467ae..000000000000
--- a/dev-haskell/selective/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST selective-0.3.tar.gz 29161 BLAKE2B 786df49e4c05a53537e34f4ab4ba56075166140cee721db1ff517dfcfea92889a97dc3c558877a4a4c91a390e1cbcf684ddb6c2287079cfabeb75f19f3be7c35 SHA512 ecc5777c4692680032c2b758c0447200df3f42d4c97de0aef3d732d38c0813f85fec2d6f9825b044cf20e918631ce649b6f6cc932580277f50692ff609973dc6
diff --git a/dev-haskell/selective/metadata.xml b/dev-haskell/selective/metadata.xml
deleted file mode 100644
index 3f13fa4c8a2a..000000000000
--- a/dev-haskell/selective/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Selective applicative functors: declare your effects statically,
-		select which to execute dynamically.
-		
-		This is a library for /selective applicative functors/, or just
-		/selective functors/ for short, an abstraction between
-		applicative functors and monads, introduced in
-		&lt;https://www.staff.ncl.ac.uk/andrey.mokhov/selective-functors.pdf this paper&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/selective/selective-0.3.ebuild b/dev-haskell/selective/selective-0.3.ebuild
deleted file mode 100644
index 86949794165c..000000000000
--- a/dev-haskell/selective/selective-0.3.ebuild
+++ /dev/null
@@ -1,29 +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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Selective applicative functors"
-HOMEPAGE="https://github.com/snowleopard/selective"
-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:=
-"
-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 )
-"
diff --git a/dev-haskell/semialign/Manifest b/dev-haskell/semialign/Manifest
new file mode 100644
index 000000000000..46466dd4dda7
--- /dev/null
+++ b/dev-haskell/semialign/Manifest
@@ -0,0 +1,3 @@
+DIST semialign-1.2.0.1.cabal 2836 BLAKE2B f637909d2c3e3d9a5b7c0e1dd06c9df1236f55fb353e32f944f7f9ba8140044b882b360e98139c2620a585f3a01820b89fcbea1785a9c5acadfa609d0e9c46c4 SHA512 fc97232dbbb35b3578572129fa52e8f9835ea4d9edc8d927db9b57a501c626acd1fd30ca70ab3a669905c36828f680c744f56873966cd1ec011cb8aa4a8298ad
+DIST semialign-1.2.0.1.tar.gz 10371 BLAKE2B ac77920eb72eb6d39798bb84d8ef5f1c52ae99ce2300e1db57a84f495796dbd120007abefae8d0a6be51b5625814682f7b9ae5c743dff77cfa3dcd8667882915 SHA512 ba4c680ec2f301c6b76e2198a422bd9c540915fd89a12cbb1787e95c0ccd1bb05abdf59ab1678f46141939673418c650d9624af2ddb7370f2b6bccf704ade83d
+DIST semialign-1.3.tar.gz 10543 BLAKE2B 27b5cf6071cced022d5122db550e172e25111cdf54d1d3ff339a1791064c582d0a0cc52d4b05031446ea3d3c67d588aa7c8b589931300a16f684cf7e460853f1 SHA512 4f8ce9c01a145e16f5b203c4ffc0131c42f1d348e2d9c812fc83107a8a4515507da335fa2690f3740d9c89d4d8f2c88fd3b9c9e1862f4726a0874f773a3569b3
diff --git a/dev-haskell/semialign/metadata.xml b/dev-haskell/semialign/metadata.xml
new file mode 100644
index 000000000000..23370b585b31
--- /dev/null
+++ b/dev-haskell/semialign/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<use>
+		<flag name="semigroupoids">Build with semigroupoids dependency</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">semialign</remote-id>
+		<remote-id type="github">haskellari/these</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/semialign/semialign-1.2.0.1.ebuild b/dev-haskell/semialign/semialign-1.2.0.1.ebuild
new file mode 100644
index 000000000000..dc93d459bd44
--- /dev/null
+++ b/dev-haskell/semialign/semialign-1.2.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +semigroupoids
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+DESCRIPTION="Align and Zip type-classes from the common Semialign ancestor"
+HOMEPAGE="https://github.com/haskellari/these"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+	>=dev-haskell/semigroupoids-5.3.2:=[profile?] <dev-haskell/semigroupoids-5.4:=[profile?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.12.0.2:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=semigroupoids
+}
diff --git a/dev-haskell/semialign/semialign-1.3.ebuild b/dev-haskell/semialign/semialign-1.3.ebuild
new file mode 100644
index 000000000000..6ded9ff887e3
--- /dev/null
+++ b/dev-haskell/semialign/semialign-1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Align and Zip type-classes from the common Semialign ancestor"
+HOMEPAGE="https://github.com/haskellari/these"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+semigroupoids"
+
+RDEPEND="
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/these-1.2:=[profile?] <dev-haskell/these-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.12.0.2:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	semigroupoids? (
+		>=dev-haskell/semigroupoids-5.3.2:=[profile?] <dev-haskell/semigroupoids-6.1:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag semigroupoids semigroupoids)
+}
diff --git a/dev-haskell/semigroupoid-extras/Manifest b/dev-haskell/semigroupoid-extras/Manifest
deleted file mode 100644
index c2b559eed850..000000000000
--- a/dev-haskell/semigroupoid-extras/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST semigroupoid-extras-3.0.1.tar.gz 5284 BLAKE2B 25337fde4ac14025634ff1f4dd0137ed2c2acddfa9a5fe43a88c72a0d8af3a452ea576fa54c1147049c827e1c0636ae387eb3f48af221a61628d9abeb4942458 SHA512 4794258e662b170db10499888aeaca5f4c31057227279befd173aaa412d45efdd7c6fa60398fb47addc382920f1c27da0fb30e4319d2395b20db756cf4315fd5
-DIST semigroupoid-extras-4.0.tar.gz 2052 BLAKE2B 591561f87a45c11c8f93f7a3c576246ca646d807a651c827186de3f938916230753f9f77cb800f12d30979689daa6bc2dc63e44e5d7033b64625040c5688ba00 SHA512 b439733eaadf41181e2bd4ef38ec4fc1bdeb8bf2ec9b13bf03217b14f31ad9bd08c2ed45dff3aa6e6ba046c0f675cdd5f047d4ddf010557947f5a384a4f979c9
-DIST semigroupoid-extras-5.tar.gz 6026 BLAKE2B e2dbde9a8495d80b61447d7091c682df1945f2ef9489abee3dac3c80a5f5c5b68b236bc52a038fc9c92c15805f8bd9d3afc640481253e158f48f51996d1065e3 SHA512 1eb8f12ee31b183038fd00705045b825c21b50dcafa58d8416315be99055d3c750dec59ce437b6f983c54237a889b150678dfa089559d361325a95b047cbd95d
diff --git a/dev-haskell/semigroupoid-extras/metadata.xml b/dev-haskell/semigroupoid-extras/metadata.xml
deleted file mode 100644
index 0ba1bc3ea5c9..000000000000
--- a/dev-haskell/semigroupoid-extras/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Semigroupoids and semigroupoid operations requiring Haskell extensions
-	</longdescription>
-	<use>
-		<flag name="profunctors">
-			You can disable the use of the
-			`profunctors` package using `-f-profunctors`. Disabing this is
-			an unsupported configuration, but it may be useful for
-			accelerating builds in sandboxes for expert users.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ekmett/semigroupoid-extras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/semigroupoid-extras/semigroupoid-extras-3.0.1.ebuild b/dev-haskell/semigroupoid-extras/semigroupoid-extras-3.0.1.ebuild
deleted file mode 100644
index fb8da71a3d6f..000000000000
--- a/dev-haskell/semigroupoid-extras/semigroupoid-extras-3.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids requiring Haskell extensions"
-HOMEPAGE="https://github.com/ekmett/semigroupoid-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3:=[profile?]
-		>=dev-haskell/distributive-0.2.2:=[profile?]
-		>=dev-haskell/groupoids-3:=[profile?]
-		>=dev-haskell/semigroupoids-3:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/semigroupoid-extras/semigroupoid-extras-4.0.ebuild b/dev-haskell/semigroupoid-extras/semigroupoid-extras-4.0.ebuild
deleted file mode 100644
index 3d1148ea62f0..000000000000
--- a/dev-haskell/semigroupoid-extras/semigroupoid-extras-4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="This package has been absorbed into semigroupoids 4.0"
-HOMEPAGE="https://github.com/ekmett/semigroupoid-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroupoids-4.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild b/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild
deleted file mode 100644
index 2fd125f0d64e..000000000000
--- a/dev-haskell/semigroupoid-extras/semigroupoid-extras-5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids that depend on PolyKinds"
-HOMEPAGE="https://github.com/ekmett/semigroupoid-extras"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+profunctors"
-
-RDEPEND=">=dev-haskell/semigroupoids-5:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-	profunctors? ( >=dev-haskell/profunctors-5:=[profile?] <dev-haskell/profunctors-6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag profunctors profunctors)
-}
diff --git a/dev-haskell/semigroupoids/Manifest b/dev-haskell/semigroupoids/Manifest
index 4d0d36a89c48..e02a30b623bc 100644
--- a/dev-haskell/semigroupoids/Manifest
+++ b/dev-haskell/semigroupoids/Manifest
@@ -1,7 +1 @@
-DIST semigroupoids-3.1.tar.gz 12317 BLAKE2B 9a2c419316c617d37aaf787c4b3f097bbe2d4c8f1f69829501173167e4a5cd9b34a675186401ca99a026f7662ddd27b446db493f919092843e005bff94e7b3ec SHA512 915425feb2f0d2c4c30a19b5823dd3377598b321835058202e623fe5f817f37d646ac1812192e570cd494ada5fb9df5784fa23bc38d39f95d8ed19b16f633755
-DIST semigroupoids-4.0.2.1.tar.gz 15805 BLAKE2B 9c8c36f5d01fee4da3cbcb44217c6b5090b704ac94598974e2861473f72e13dc09573124a84cdb5c802f505494f9d63946892cceaa5dbb0f0defa11f26398578 SHA512 9fe6c9b31013763d0581539f768ea608aa6990625a81307e4a665e1e9cdf47a225efa319489ac4a51c0237fab772bdd318fcc9f3d0d97221563bb8a885433815
-DIST semigroupoids-4.2.tar.gz 16395 BLAKE2B 92378cabf6fdd49ed31344ee181b5cfa7e8d787096ba482fb84b0f21361d101ed78d5af0dad794f32dbce5f555c6c29e28401c3023654b2798d52f6e7ece3019 SHA512 6de5f5d62215789c4ef2c5c20390991e5aa9c6106685daadfcc36f09b91483790d95458344f208e8582430fcaf1fba2f2531743e9a6f7353cec2024adafe10a9
-DIST semigroupoids-4.3.tar.gz 17190 BLAKE2B 6bdab910b519086dad7f98f78c6d0833d34151d0fdaec7acc359144f44269ad6af9cc5ca555f369a95f4beef7fa8b3d78502883b398cce7ff7141572ebda99dc SHA512 2c914071401e26f4c3aa312aab4dd6f5f3d232e0d3368b3c0dbef867bbc2fe1e75d574831994cb6d2b8dbf797b54b9b6573ed3a54392b300bb119779a0c5a961
-DIST semigroupoids-5.0.0.4.tar.gz 20795 BLAKE2B 349c25e8a660501ab5f87b609f12d2141e38f500d16c0ddf6c77c1e851531dbcf0990b83297fb987caae4d5e1efb6a80006d27532d7a24ab70b332ecb8ff4254 SHA512 f1d394a4a6b3f45f9d6cbd338245aa1b70162a91285900986376003799ab67e473a46339e986832ee40de525ef82f54a4766e1b29997425d94a42553e67e43fb
-DIST semigroupoids-5.1.tar.gz 21664 BLAKE2B 98e06a99dbaf2ab8425b3346cb2be2894c8b1839b56fde342471671759e5f4faa01b3cb681afcf3e900867b28050258e06c14d6cb0b6ee7476abb1b296bc4a19 SHA512 ffb02d3192f6a79dffad9cbd4f787484eeed6e49d9cfee412d1abdd4b552d151ca6d66711666f8448cc2c724383b5ff47e141088bdc69a2fb0d2122486fd4dc1
-DIST semigroupoids-5.3.4.tar.gz 26307 BLAKE2B ad22d061c6b5773c6717d00226a41f3b765513a50034d7a805605630314fd4d284b80d1eeb0f85829877ae9a51c8b5e0408e53c27d8dd206216d7eab893885ee SHA512 b4053a856e1c2d3f20f984216f008ff264cedd2ccc3cc39ca3b70bc296d81ea8c1e6dd655bb8a6d1b9a44084e02d74a26cd4eb7264e4732e98be3ec351dc6e3a
+DIST semigroupoids-5.3.7.tar.gz 35349 BLAKE2B c911fe203638714236211a9f40f638fd7e43255e57a4b1b3d0df0cf10a97cc93815776bb53c864a8a4c95fda74402f9a5f6003e3899c35015eacd9df8cc5b86b SHA512 5e908f3b1618cfeb45e03335284e8811ff443f3d7cd8013813337729da62570c052e854bde64c56535809340d0ba281e246d7d0cc8f14627deeb7b1047623849
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index 97b788ac85df..20ce9f7e06c1 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -1,79 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides a wide array of semigroupoids and operations for working with semigroupds.
-
-		A Semigroupoid is a Category without the requirement of identity arrows for every object in the category.
-
-		When working with comonads you often have the @\&lt;*\&gt;@ portion of an @Applicative@, but
-		not the @pure@. This was captured in Uustalu and Vene's \"Essence of Dataflow Programming\"
-		in the form of the @ComonadZip@ class in the days before @Applicative@. Apply provides a weaker invariant, but for the comonads used for data flow programming (found in the streams package), this invariant is preserved. Applicative function composition forms a semigroupoid.
-
-		Similarly many structures are nearly a comonad, but not quite, for instance lists provide a reasonable 'extend' operation in the form of 'tails', but do not always contain a value.
-
-
-		Ideally the following relationships would hold:
-
-		&gt; Traversable &lt;---- Foldable &lt;--- Functor ------&gt; Alt ---------&gt; Plus           Semigroupoid
-		&gt;      |               |            |                              |                  |
-		&gt;      v               v            v                              v                  v
-		&gt; Traversable1 &lt;--- Foldable1     Apply --------&gt; Applicative -&gt; Alternative      Category
-		&gt;                                   |               |              |                  |
-		&gt;                                   v               v              v                  v
-		&gt;                                 Bind ---------&gt; Monad -------&gt; MonadPlus          Arrow
-		&gt;
-
-		Apply, Bind, and Extract give rise the Static, Kleisli and Cokleisli semigroupoids respectively.
-
-		This lets us remove many of the restrictions from various monad transformers
-		as in many cases the binding operation or @\&lt;*\&gt;@ operation does not require them.
-
-		Finally, to work with these weaker structures it is beneficial to have containers
-		that can provide stronger guarantees about their contents, so versions of 'Traversable'
-		and 'Foldable' that can be folded with just a 'Semigroup' are added.
-	</longdescription>
-	<use>
-		<flag name="comonad">
-			You can disable the use of the `comonad` package using
-			`-f-comonad`. Disabling this is an unsupported configuration, but it may be
-			useful for accelerating builds in sandboxes for expert users. If disabled we
-			will not supply instances of `Comonad`
-		</flag>
-		<flag name="containers">
-			You can disable the use of the `containers` package
-			using `-f-containers`. Disabing this is an unsupported configuration, but it
-			may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="contravariant">
-			You can disable the use of the `contravariant`
-			package using `-f-contravariant`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Contravariant`
-		</flag>
-		<flag name="distributive">
-			You can disable the use of the `distributive`
-			package using `-f-distributive`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Distributive`
-		</flag>
-		<flag name="tagged">
-			You can disable the use of the `tagged` package
-			using `-f-tagged`. Disabing this is an unsupported
-			configuration, but it may be useful for accelerating builds in
-			sandboxes for expert users.
-		</flag>
-		<flag name="unordered-containers">
-			Enable the use of the `unordered-containers` package (and also its
-			dependency `hashable`). Disabling this is an unsupported configuration,
-			but it may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-
-	</use>
 	<upstream>
 		<remote-id type="github">ekmett/semigroupoids</remote-id>
 	</upstream>
diff --git a/dev-haskell/semigroupoids/semigroupoids-3.1.ebuild b/dev-haskell/semigroupoids/semigroupoids-3.1.ebuild
deleted file mode 100644
index a537f3a0525e..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="<dev-haskell/comonad-4:=[profile?]
-		>=dev-haskell/contravariant-0.2.0.1:=[profile?]
-		<dev-haskell/contravariant-1:=[profile?]
-		>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-		<dev-haskell/semigroups-1:=[profile?]
-		>=dev-haskell/transformers-0.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/semigroupoids/semigroupoids-4.0.2.1.ebuild b/dev-haskell/semigroupoids/semigroupoids-4.0.2.1.ebuild
deleted file mode 100644
index b109955e043b..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-4.0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
-	>=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-1:=[profile?]
-	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/semigroupoids/semigroupoids-4.2.ebuild b/dev-haskell/semigroupoids/semigroupoids-4.2.ebuild
deleted file mode 100644
index 357a9542d3bf..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +contravariant +distributive"
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive)
-}
diff --git a/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild b/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild
deleted file mode 100644
index 9b23ea30875c..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +contravariant +distributive"
-RESTRICT="test"
-
-RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive)
-}
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
deleted file mode 100644
index f72ec5733ede..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +doctests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +contravariant +distributive +tagged"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-5:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.1 <dev-haskell/doctest-0.11 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		--flag=doctests \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild
deleted file mode 100644
index 178149aceba0..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +doctests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +contravariant +distributive +tagged"
-
-RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.9.1 <dev-haskell/doctest-0.12 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		--flag=doctests \
-		$(cabal_flag tagged tagged)
-}
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
deleted file mode 100644
index 9ac5ac13aff1..000000000000
--- a/dev-haskell/semigroupoids/semigroupoids-5.3.4.ebuild
+++ /dev/null
@@ -1,50 +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.1.9999
-#hackport: flags: +doctests
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Semigroupoids: Category sans id"
-HOMEPAGE="https://github.com/ekmett/semigroupoids"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +contravariant +distributive +tagged +unordered-containers"
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/base-orphans-0.8:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
-	>=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	comonad? ( >=dev-haskell/comonad-4.2.6:=[profile?] <dev-haskell/comonad-6:=[profile?] )
-	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
-	tagged? ( >=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
-	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-				>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag contravariant contravariant) \
-		$(cabal_flag distributive distributive) \
-		--flag=doctests \
-		$(cabal_flag tagged tagged) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild
new file mode 100644
index 000000000000..9ce22936e45e
--- /dev/null
+++ b/dev-haskell/semigroupoids/semigroupoids-5.3.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: +doctests,+comonad,+containers,+contravariant,+distributive,+tagged,+unordered-containers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Semigroupoids: Category sans id"
+HOMEPAGE="https://github.com/ekmett/semigroupoids"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/bifunctors-5.5.9:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	>=dev-haskell/comonad-5.0.8:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/contravariant-1.5.3:=[profile?] <dev-haskell/contravariant-2:=[profile?]
+	>=dev-haskell/distributive-0.5.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/tagged-0.8.6.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-0.8:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=comonad \
+		--flag=containers \
+		--flag=contravariant \
+		--flag=distributive \
+		--flag=doctests \
+		--flag=tagged \
+		--flag=unordered-containers
+}
diff --git a/dev-haskell/semigroups/Manifest b/dev-haskell/semigroups/Manifest
index c61a511c2b2c..ebb0074b6109 100644
--- a/dev-haskell/semigroups/Manifest
+++ b/dev-haskell/semigroups/Manifest
@@ -1,8 +1 @@
-DIST semigroups-0.11.tar.gz 10152 BLAKE2B 9309b66982ca09e1985e7950f29d18f94f276018d57ed4dfb6e293baf13d7f320120ec835b3db3b19ed20dd7c7376b10adbec16cae608adca782a7fdd696901a SHA512 56eea20181fda3480c562230ff07e73dc5a1e163fb1da87717971cf95c672afc8c3e52fc9b6fbc98c29772f44245d2cd78d0bdf368bbefa84cefdbfe73c4f8e4
-DIST semigroups-0.12.1.tar.gz 10541 BLAKE2B b91cd8dcd00e2cbd82120c68a62cc72db94f70aaba58390c181f2e1629a52efda97c7d97fdc70d6732eff6bf8a5ed4bdcf2ce2f2a393d425c0c2f158c98a77b3 SHA512 309729b99d7912e8a07ef4d57c433e46233e77828c84a3c9ecabe6d17ed5ab28d7b23111c5d55f7324bbedfe512b1cd4a7e698b8177f631629159f6e72f9d4ca
-DIST semigroups-0.12.2.tar.gz 10546 BLAKE2B 65940addc7f040cc9e46a86c73ca821f3eb7b4dcb2f9e320ba8699bfcc1721e5980dc9a0ad4adf3549fa1c1989b08ccabb88cab9d669594a2c412333d060bcd1 SHA512 20bc7c2273752b6377d2aea662eeb62dbfc020f07767e4c822c8d5072c8803e4b525ca96a2fe02a0a4d28d9268f91d4f87735506ba4c4bccf5491b1f4da7a753
-DIST semigroups-0.15.1.tar.gz 11715 BLAKE2B 1c755b29b80663bc11c55c9f2b1863c7d62ffee88466a623181d7552ea4eeae5cc3f3481855197f738c59e21c50ddd527da268bde378d592a72d5ae947231c88 SHA512 416bbf402f2e928fae81ba955d48d0fa636f6451c1a7ff02bcca2ff44b4e34eb91d8f2bfa39316e646d8bf2c7829858d795bb93640e70be049b232d1ec74d886
-DIST semigroups-0.16.2.2.tar.gz 15159 BLAKE2B eda7050147fb9aaca8051922601a42e19e84282cf88958a60ab66eea2a544e32b6034272f3cf3f07109aa15df73e81b352c818f4b20d1be6b71e459f8c0b8c98 SHA512 c40d666ae14f0f1052db3887b9327282ef2c535becda8bf2aa4dd8688d1744a738a6e7227e69c1b99255433e0673d67efaea287e26236cca2b13c3db951c30b3
-DIST semigroups-0.18.2.tar.gz 17026 BLAKE2B 68112f907b9251656751987f476dee67fd4e2a31b4f2cc81071558f6298933bf8904442eda053eb520cf505d255ec256e54060182a2474d543c8044506ac5b59 SHA512 db43500859eb041eee800727f1606a96bb9367fa7032bb15ee02b7d34a9d5e46bd8d4ce991988058b05b75816351f837e180e1f8df7dda78548cf3fde7a57e45
-DIST semigroups-0.18.5.tar.gz 20162 BLAKE2B 6580b1f1ac5bf85aced9dfaea1fc8d6daf4a0536395428f629af651b3717d06d36a33b1d50e38e0b420937cead33fa986d060243a788d83e440dfd73b5413572 SHA512 c1a3376041ea32e9f4ddae79ad5ec649ff3a09c5e0a07ac4f731c05b7615ac2c33deadd24c5c9ee81a6747373ae928f3b3bcaa131dce7a7ff1e3efa56cf57db3
-DIST semigroups-0.9.2.tar.gz 9653 BLAKE2B b73901c69a6321ffc478f79a7fb7280074010e512955f7aed5dc4f91742b4838b0a821ebc7aca23d259b0fc38589ddfb18c27a2f163843f729d4c93f65487066 SHA512 43385abeed142425fe858632f0bab265e8dda078ab24b270c0b22f798270af502ccff28863200c330fc4e2bdf88fd625b60be25480a9879328e517b2db09c2e0
+DIST semigroups-0.20.tar.gz 18788 BLAKE2B 8cd5e82bc1af79a5c688e16c1d1c4aeec12923ed3be2fe9e1aa4f6a431a1e5be56f373ca952536054c2c7530da1adb579fccd8382ddc5031eddcce44815d73b3 SHA512 76e61ffb854276a7760619acd093df0c80c17a58a553ba9f9be3148998c4905784ca5840041a9afb800eab220c62b59567d1be95be478c21b4446021bab7b923
diff --git a/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch b/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch
deleted file mode 100644
index ff66afa91a6e..000000000000
--- a/dev-haskell/semigroups/files/semigroups-0.15.1-trust.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 118b29f5404014d0a627767a4c7e8de4f00f9fce
-Author: João Cristóvão <jmacristovao@gmail.com>
-Date:   Wed Jul 23 12:27:29 2014 +0100
-
-    If GHC >= 7.8 module is always Thrustworthy, never safe, due to GHC.Exts
-
-diff --git a/src/Data/List/NonEmpty.hs b/src/Data/List/NonEmpty.hs
-index 8a28020..f3c2db5 100644
---- a/src/Data/List/NonEmpty.hs
-+++ b/src/Data/List/NonEmpty.hs
-@@ -1,7 +1,7 @@
- {-# LANGUAGE CPP #-}
- 
- #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
--#ifdef MIN_VERSION_hashable
-+#if defined(MIN_VERSION_hashable) || __GLASGOW_HASKELL__ >= 708
- {-# LANGUAGE Trustworthy #-}
- #else
- {-# LANGUAGE Safe #-}
-diff --git a/src/Data/Semigroup.hs b/src/Data/Semigroup.hs
-index 7d41775..88fcbb0 100644
---- a/src/Data/Semigroup.hs
-+++ b/src/Data/Semigroup.hs
-@@ -8,7 +8,7 @@
- #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
- #define LANGUAGE_DefaultSignatures
- {-# LANGUAGE DefaultSignatures #-}
--#ifdef MIN_VERSION_hashable
-+#if defined(MIN_VERSION_hashable) || __GLASGOW_HASKELL__ >= 708
- {-# LANGUAGE Trustworthy #-}
- #else
- {-# LANGUAGE Safe #-}
diff --git a/dev-haskell/semigroups/metadata.xml b/dev-haskell/semigroups/metadata.xml
index ac1ccc6f6f92..084aeb7925f9 100644
--- a/dev-haskell/semigroups/metadata.xml
+++ b/dev-haskell/semigroups/metadata.xml
@@ -1,51 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haskell 98 semigroups
-		
-		In mathematics, a semigroup is an algebraic structure
-		consisting of a set together with an associative binary
-		operation. A semigroup generalizes a monoid in that there
-		might not exist an identity element. It also (originally)
-		generalized a group (a monoid with all inverses) to a type
-		where every element did not have to have an inverse, thus the
-		name semigroup.
-	</longdescription>
-	<use>
-		<flag name="hashable">You can disable the use of the
-		`hashable` package using USE=-hashable. Disabling this is an
-		unsupported configuration, but it may be useful for
-		accelerating builds in sandboxes for expert users. If set we
-		will not supply an instance of `Hashable`.</flag>
-		<flag name="bytestring">You can disable the use of the `bytestring`
-		package using USE=-bytestring. Disabling this is an
-		unsupported configuration, but it may be useful for
-		accelerating builds in sandboxes for expert users.</flag>
-		<flag name="containers">You can disable the use of the `containers`
-		package using USE=-containers. Disabing this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="deepseq">You can disable the use of the `deepseq`
-		package using `-f-deepseq`. Disabing this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="text">You can disable the use of the `text` package
-		using USE=-text. Disabling this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="unordered-containers">You can disable the use of the
-		`unordered-containers` package using
-		USE=-unordered-containers. Disabling this is an unsupported
-		configuration, but it may be useful for accelerating builds in
-		sandboxes for expert users.</flag>
-		<flag name="binary">provide instances for binary package</flag>
-		<flag name="transformers">provide instances for transformers package.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ekmett/semigroups</remote-id>
 	</upstream>
diff --git a/dev-haskell/semigroups/semigroups-0.11-r1.ebuild b/dev-haskell/semigroups/semigroups-0.11-r1.ebuild
deleted file mode 100644
index 3366842fce59..000000000000
--- a/dev-haskell/semigroups/semigroups-0.11-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'text                 >= 0.10 && < 0.12' 'text                 >= 0.10'
-}
diff --git a/dev-haskell/semigroups/semigroups-0.12.1.ebuild b/dev-haskell/semigroups/semigroups-0.12.1.ebuild
deleted file mode 100644
index c3c8d3f4b83f..000000000000
--- a/dev-haskell/semigroups/semigroups-0.12.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/semigroups/semigroups-0.12.2.ebuild b/dev-haskell/semigroups/semigroups-0.12.2.ebuild
deleted file mode 100644
index c633900ffcdd..000000000000
--- a/dev-haskell/semigroups/semigroups-0.12.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/semigroups/semigroups-0.15.1.ebuild b/dev-haskell/semigroups/semigroups-0.15.1.ebuild
deleted file mode 100644
index 4902b9c09fb5..000000000000
--- a/dev-haskell/semigroups/semigroups-0.15.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring +containers +hashable +text +unordered-containers"
-
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-			unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-	text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-trust.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring bytestring) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag text text) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild b/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
deleted file mode 100644
index 1c51b943602d..000000000000
--- a/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring +containers +deepseq +hashable +text +unordered-containers"
-
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-			unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-	text? ( >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring bytestring) \
-		$(cabal_flag containers containers) \
-		$(cabal_flag deepseq deepseq) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag text text) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semigroups/semigroups-0.18.2.ebuild b/dev-haskell/semigroups/semigroups-0.18.2.ebuild
deleted file mode 100644
index 77a736fb3043..000000000000
--- a/dev-haskell/semigroups/semigroups-0.18.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: +bytestring,+containers,+deepseq,+hashable,+tagged,+text,+unordered-containers
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+binary +transformers"
-
-RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	binary? ( dev-haskell/binary:=[profile?] )
-	transformers? ( >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag binary binary) \
-		--flag=bytestring \
-		--flag=containers \
-		--flag=deepseq \
-		--flag=hashable \
-		--flag=tagged \
-		--flag=text \
-		$(cabal_flag transformers transformers) \
-		--flag=unordered-containers
-}
diff --git a/dev-haskell/semigroups/semigroups-0.18.5.ebuild b/dev-haskell/semigroups/semigroups-0.18.5.ebuild
deleted file mode 100644
index bc5b5eb0796c..000000000000
--- a/dev-haskell/semigroups/semigroups-0.18.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: +bytestring,+containers,+deepseq,+hashable,+tagged,+text,+unordered-containers
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Anything that associates"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+binary +transformers"
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	transformers? ( >=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag binary binary) \
-		--flag=bytestring \
-		--flag=containers \
-		--flag=deepseq \
-		--flag=hashable \
-		--flag=tagged \
-		--flag=text \
-		$(cabal_flag transformers transformers) \
-		--flag=unordered-containers
-}
diff --git a/dev-haskell/semigroups/semigroups-0.20.ebuild b/dev-haskell/semigroups/semigroups-0.20.ebuild
new file mode 100644
index 000000000000..2e0d40dfe471
--- /dev/null
+++ b/dev-haskell/semigroups/semigroups-0.20.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +bytestring,+containers,+deepseq,+hashable,+tagged,+text,+unordered-containers,+binary,-bytestring-builder,+template-haskell,+transformers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Anything that associates"
+HOMEPAGE="https://github.com/ekmett/semigroups/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=binary \
+		--flag=bytestring \
+		--flag=-bytestring-builder \
+		--flag=containers \
+		--flag=deepseq \
+		--flag=hashable \
+		--flag=tagged \
+		--flag=template-haskell \
+		--flag=text \
+		--flag=transformers \
+		--flag=unordered-containers
+}
diff --git a/dev-haskell/semigroups/semigroups-0.9.2.ebuild b/dev-haskell/semigroups/semigroups-0.9.2.ebuild
deleted file mode 100644
index 2035f8ec7dde..000000000000
--- a/dev-haskell/semigroups/semigroups-0.9.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 semigroups"
-HOMEPAGE="https://github.com/ekmett/semigroups/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/nats-0.1:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/semirings/Manifest b/dev-haskell/semirings/Manifest
new file mode 100644
index 000000000000..d934fe605edf
--- /dev/null
+++ b/dev-haskell/semirings/Manifest
@@ -0,0 +1,2 @@
+DIST semirings-0.6-rev1.cabal 2668 BLAKE2B d1c1293a9f2ad63caf291bd1e409afef54815815ea3e750cc915a4872725f8d1f69fdf7097fd724f8f4762a98f9b36653b38df900a31c4fef775615c7031e838 SHA512 1b2afdf824ff308726b258b82cc9b18718da01795bcfae23c073dfb484faa1a44ee59af479a8719ed950e5811bbdce64bea4e7b7a0cf59986c24f89e256de156
+DIST semirings-0.6.tar.gz 19640 BLAKE2B 9cd6d17cfdc2fde31741a6db085d972fd8ed131ad003102c1b4991e8157f4b22a05508306c64b1a4f730ce1f99e3d40861b60332689d9b16e122c3ff59a80e0c SHA512 01675527d47b5283ae6beb6feb38b4a5527a46a780b75e4b712c0b1e4b57218fa8238ba100a20947a2e2b53c4a314ad4e1a71f989bd5194fe6378dba048c870c
diff --git a/dev-haskell/semirings/metadata.xml b/dev-haskell/semirings/metadata.xml
new file mode 100644
index 000000000000..bfc3eb60560a
--- /dev/null
+++ b/dev-haskell/semirings/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">semirings</remote-id>
+		<remote-id type="github">chessai/semirings</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/semirings/semirings-0.6-r2.ebuild b/dev-haskell/semirings/semirings-0.6-r2.ebuild
new file mode 100644
index 000000000000..1d556bcd783c
--- /dev/null
+++ b/dev-haskell/semirings/semirings-0.6-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +containers,+unordered-containers
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="two monoids as one, in holy haskimony"
+HOMEPAGE="https://github.com/chessai/semirings"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-haskell/base-compat-batteries:=[profile?]
+	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5
+	=dev-haskell/unordered-containers-0.2*:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=containers \
+		--flag=unordered-containers
+}
diff --git a/dev-haskell/sendfile/Manifest b/dev-haskell/sendfile/Manifest
deleted file mode 100644
index c9e848fddb7c..000000000000
--- a/dev-haskell/sendfile/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST sendfile-0.7.11.1.tar.gz 10678 BLAKE2B 492c9de894bf1150eb380ac1f2013600c1c473651fb91157a9599efabb2f25ef430e5b92f29113762c26fc39e5524ce6ea58fc83a3a02f55913b2a0897c0a711 SHA512 284b26bf210f2fc5e7c9e56bdff9f296fca0367c78b7a3ac1a2d2a86a76d0a1508480d9324825cd183d7b8e72c18d24eaa603f9e284fe7ba8d7d4b614e490094
-DIST sendfile-0.7.9.tar.gz 10656 BLAKE2B dd6092d6343037d413d162266545607844bb05a6a2abd810f1369bb06f9f15e8b6ee3690af85d5b5d9195f47f2b144a60a99b84c3bd1fd9aaa244d00cfbe41a7 SHA512 a7ba2e82c30b12e5b7f317e2f5cc31c32cb7f682403c3807afc15254d86c3ebb526a645234d191d5b43adc414704caa4cdf61e8083e0a3d53e1af676619f731e
diff --git a/dev-haskell/sendfile/metadata.xml b/dev-haskell/sendfile/metadata.xml
deleted file mode 100644
index a9df43fb18bf..000000000000
--- a/dev-haskell/sendfile/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library which exposes zero-copy sendfile functionality in a portable way. If a platform does not support sendfile, a fallback implementation in haskell is provided.
-		
-		Currently supported platforms: Windows 2000+ (Native), Linux 2.6+ (Native), FreeBSD (Native), OS-X 10.5+ (Native), Everything else (Portable Haskell code).
-	</longdescription>
-	<use>
-		<flag name="portable">Explicitly enable portable sendfile support (implemented in Haskell)</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild b/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild
deleted file mode 100644
index ed983e088680..000000000000
--- a/dev-haskell/sendfile/sendfile-0.7.11.1.ebuild
+++ /dev/null
@@ -1,30 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A portable sendfile library"
-HOMEPAGE="https://hub.darcs.net/stepcut/sendfile"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="portable"
-
-RDEPEND=">=dev-haskell/network-2:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/sendfile/sendfile-0.7.9.ebuild b/dev-haskell/sendfile/sendfile-0.7.9.ebuild
deleted file mode 100644
index 024feca91e47..000000000000
--- a/dev-haskell/sendfile/sendfile-0.7.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A portable sendfile library"
-HOMEPAGE="https://hub.darcs.net/stepcut/sendfile"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="portable"
-
-RDEPEND="=dev-haskell/network-2*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/servant-server/Manifest b/dev-haskell/servant-server/Manifest
new file mode 100644
index 000000000000..3d58affe3a12
--- /dev/null
+++ b/dev-haskell/servant-server/Manifest
@@ -0,0 +1,4 @@
+DIST servant-server-0.19.1-rev1.cabal 5695 BLAKE2B 949da62888d2d0a5e98e4b6c874ab3f6e0278e010e7ec22c355d7b01f53aa20f8020502e219f289cefb0f57ced891ac4a0cc9ae04ebd0f4c96468cb1bbf0675c SHA512 14d16cc02a765cfdbe28c024c07b857a40b91379c48a4418a24a4d0b8e23ffa563bbd14a794a5594a86288bf14d039152ade3783a572d8314a32a13bf7e17e9f
+DIST servant-server-0.19.1.tar.gz 53170 BLAKE2B 1e93a208995e78550b01a3cd417d427ac759e436b881a1ce38e3f171635798a9f24fb3ddfd94f3300ad79b6301cfbbf2a42df8f7e7a2928a5bcf8b85fa40e174 SHA512 1489455605b73b3ed40f4fd73c7891bf5af71cad39c36948ddef8aaf7f91c76d6d371e96cd2492923ca10ec6c0b5ace8c4d3538abef46be2fb491962e8fb8a04
+DIST servant-server-0.20-rev1.cabal 5739 BLAKE2B aafdedd66f6749c5bc48514830c19ecec2ac5d3ce1621cd1f847047fc8a4bf7629bc44b4bd181c13e03a975d281583446110258c7a929ff5191702cea32958ac SHA512 ad65c05a6880855555ca7e61fa9399f08a27b08203231bf25ca94f6f59743824540162ef914fad3fd8391e1661233e44b2720ecfb93e4bbad14c0c2a127c0f61
+DIST servant-server-0.20.tar.gz 55745 BLAKE2B bf2216382f7b1da7ac62554387a7341dbc8a276cc70014b38992e1e5927c909e5f046290904e9c46a36e7e920b4a0ea7dbc3e08bf78c1d7c01eb7140f5981f5d SHA512 4db1d8f6b08ce3af835cbc6232951a1fc6d5d8a5d63a713b33c70be1d587f1c4e6825fa3893e27056ab4635477444ebb5479add8825e3e50473833e586c0c397
diff --git a/dev-haskell/servant-server/files/servant-server-0.18.3-add-examples-flag.patch b/dev-haskell/servant-server/files/servant-server-0.18.3-add-examples-flag.patch
new file mode 100644
index 000000000000..4c85484dd6bc
--- /dev/null
+++ b/dev-haskell/servant-server/files/servant-server-0.18.3-add-examples-flag.patch
@@ -0,0 +1,31 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+Add 'examples' USE flag and rename the example executable from 'greet' to
+'servant-server-example'.
+
+diff -urN servant-server-0.18.3/servant-server.cabal servant-server-0.18.3-r1/servant-server.cabal
+--- servant-server-0.18.3/servant-server.cabal	2022-02-11 02:33:28.463223367 -0700
++++ servant-server-0.18.3-r1/servant-server.cabal	2022-02-11 02:35:38.242984376 -0700
+@@ -33,6 +33,10 @@
+   type: git
+   location: http://github.com/haskell-servant/servant.git
+ 
++flag examples
++  description: Build the servant-server-example executable
++  default: False
++
+ library
+   exposed-modules:
+     Servant
+@@ -99,7 +103,9 @@
+ 
+   ghc-options: -Wall -Wno-redundant-constraints
+ 
+-executable greet
++executable servant-server-example
++  if !flag(examples)
++    buildable: False
+   main-is: greet.hs
+   hs-source-dirs: example
+   ghc-options: -Wall
diff --git a/dev-haskell/servant-server/metadata.xml b/dev-haskell/servant-server/metadata.xml
new file mode 100644
index 000000000000..ed10557de666
--- /dev/null
+++ b/dev-haskell/servant-server/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">servant-server</remote-id>
+		<remote-id type="github">haskell-servant/servant</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/servant-server/servant-server-0.19.1.ebuild b/dev-haskell/servant-server/servant-server-0.19.1.ebuild
new file mode 100644
index 000000000000..3bccb542658e
--- /dev/null
+++ b/dev-haskell/servant-server/servant-server-0.19.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 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 test-suite"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="A family of combinators for defining webservices APIs and serving them"
+HOMEPAGE="https://docs.servant.dev/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+PATCHES=( "${FILESDIR}/${PN}-0.18.3-add-examples-flag.patch" )
+
+RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?]
+	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.14:=[profile?]
+	>=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.4.4:=[profile?]
+	>=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[profile?]
+	>=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/monad-control-1.0.2.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/network-2.8:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+	>=dev-haskell/resourcet-1.2.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/servant-0.19:=[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?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/wai-3.2.1.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-app-static-3.1.6.2:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?]
+	>=dev-haskell/word8-0.1.3:=[profile?] <dev-haskell/word8-0.2:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+	examples? ( >=dev-haskell/warp-3.2.25:=[profile?] <dev-haskell/warp-3.4:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/hspec-2.6.0 <dev-haskell/hspec-2.10
+		>=dev-haskell/hspec-wai-0.10.1 <dev-haskell/hspec-wai-0.12
+		>=dev-haskell/quickcheck-2.12.6.1 <dev-haskell/quickcheck-2.15
+		dev-haskell/safe
+		>=dev-haskell/should-not-typecheck-2.1.0 <dev-haskell/should-not-typecheck-2.2
+		>=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4
+		dev-haskell/transformers-compat
+		>=dev-haskell/wai-extra-3.0.24.3 <dev-haskell/wai-extra-3.2 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/servant-server/servant-server-0.20.ebuild b/dev-haskell/servant-server/servant-server-0.20.ebuild
new file mode 100644
index 000000000000..178b133e31cc
--- /dev/null
+++ b/dev-haskell/servant-server/servant-server-0.20.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="A family of combinators for defining webservices APIs and serving them"
+HOMEPAGE="https://docs.servant.dev/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?]
+	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.14:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0.0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/constraints-0.2:=[profile?] <dev-haskell/constraints-0.14:=[profile?]
+	>=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.6:=[profile?]
+	>=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[profile?]
+	>=dev-haskell/http-types-0.12.2:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/monad-control-1.0.2.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/network-2.8:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6.1.0:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
+	>=dev-haskell/resourcet-1.2.2:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+	>=dev-haskell/servant-0.20:=[profile?] <dev-haskell/servant-0.21:=[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?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/transformers-base-0.4.5.2:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+	>=dev-haskell/wai-3.2.2.1:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-app-static-3.1.6.2:=[profile?] <dev-haskell/wai-app-static-3.2:=[profile?]
+	>=dev-haskell/warp-3.2.25:=[profile?] <dev-haskell/warp-3.4:=[profile?]
+	>=dev-haskell/word8-0.1.3:=[profile?] <dev-haskell/word8-0.2:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( >=dev-haskell/hspec-2.6.0 <dev-haskell/hspec-2.12
+		>=dev-haskell/hspec-wai-0.10.1 <dev-haskell/hspec-wai-0.12
+		>=dev-haskell/quickcheck-2.12.6.1 <dev-haskell/quickcheck-2.15
+		dev-haskell/safe
+		>=dev-haskell/should-not-typecheck-2.1.0 <dev-haskell/should-not-typecheck-2.2
+		>=dev-haskell/temporary-1.3 <dev-haskell/temporary-1.4
+		dev-haskell/transformers-compat
+		>=dev-haskell/wai-extra-3.0.24.3 <dev-haskell/wai-extra-3.2 )
+"
diff --git a/dev-haskell/servant/Manifest b/dev-haskell/servant/Manifest
new file mode 100644
index 000000000000..c63b21440fad
--- /dev/null
+++ b/dev-haskell/servant/Manifest
@@ -0,0 +1,4 @@
+DIST servant-0.19-rev4.cabal 5562 BLAKE2B 317773458ecb9ffae30c5f16a478d3587db7e5dec1f578e670af51e3a5b73d5212f08cea18a7826b337d54266e3bb68aaf7ef0097b0c684748db69a2fb924ec3 SHA512 6d9c75d7b598f57a523c4e4c8b3cf5c3fa14cd542007a178cca4b206708a07797e689a82169deba9a76ccf670ec51836ad61a8cef1212c7f3b5a056b12e91864
+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
diff --git a/dev-haskell/servant/metadata.xml b/dev-haskell/servant/metadata.xml
new file mode 100644
index 000000000000..f7c1681a8eea
--- /dev/null
+++ b/dev-haskell/servant/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">servant</remote-id>
+		<remote-id type="github">haskell-servant/servant</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/servant/servant-0.19.ebuild b/dev-haskell/servant/servant-0.19.ebuild
new file mode 100644
index 000000000000..000cd5defb16
--- /dev/null
+++ b/dev-haskell/servant/servant-0.19.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 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 test-suite"
+CABAL_HACKAGE_REVISION="4"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="A family of combinators for defining webservices APIs"
+HOMEPAGE="https://docs.servant.dev/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?]
+	>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+	>=dev-haskell/bifunctors-5.5.3:=[profile?] <dev-haskell/bifunctors-5.6:=[profile?]
+	>=dev-haskell/case-insensitive-1.2.0.11:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/constraints-0.2:=[profile?]
+	>=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.4.4:=[profile?]
+	>=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[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:=[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?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/vault-0.3.1.2:=[profile?] <dev-haskell/vault-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2.6.0 <dev-haskell/hspec-2.10
+		>=dev-haskell/quickcheck-instances-0.3.19 <dev-haskell/quickcheck-instances-0.4 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/servant/servant-0.20.ebuild b/dev-haskell/servant/servant-0.20.ebuild
new file mode 100644
index 000000000000..e6badfc221b5
--- /dev/null
+++ b/dev-haskell/servant/servant-0.20.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="A family of combinators for defining webservices APIs"
+HOMEPAGE="https://docs.servant.dev/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.4.1.0:=[profile?] <dev-haskell/aeson-3:=[profile?]
+	>=dev-haskell/attoparsec-0.13.2.2:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.14:=[profile?]
+	>=dev-haskell/bifunctors-5.5.3:=[profile?] <dev-haskell/bifunctors-5.7:=[profile?]
+	>=dev-haskell/case-insensitive-1.2.0.11:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/constraints-0.2:=[profile?]
+	>=dev-haskell/http-api-data-0.4.1:=[profile?] <dev-haskell/http-api-data-0.6:=[profile?]
+	>=dev-haskell/http-media-0.7.1.3:=[profile?] <dev-haskell/http-media-0.9:=[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:=[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?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/vault-0.3.1.2:=[profile?] <dev-haskell/vault-0.4:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hspec-2.6.0 <dev-haskell/hspec-2.12
+		>=dev-haskell/quickcheck-instances-0.3.19 <dev-haskell/quickcheck-instances-0.4 )
+"
diff --git a/dev-haskell/setenv/Manifest b/dev-haskell/setenv/Manifest
index 4f3c440dd8bf..89a89b29c573 100644
--- a/dev-haskell/setenv/Manifest
+++ b/dev-haskell/setenv/Manifest
@@ -1,2 +1 @@
-DIST setenv-0.1.1.1.tar.gz 3019 BLAKE2B d09a0e17b9ee318d6c0b9dd9a5945983c8706cdef30b33b994f69559bcea42da8fe2f63429057cecbde76caae3831537e8289e90454a814be31de3d94ec78c57 SHA512 30819eafa006cd88239d892699d5a7c8f9889d080c3fe4f134b80eece8c192836239ee8b082cf694f353f6c35f07e9520d4860125b20daa151d94a506538269b
 DIST setenv-0.1.1.3.tar.gz 2710 BLAKE2B 16076d2a8694e15597b87358a81a4f0ed6b66eec89562c4be597ed7890924297b797fe22e391d62526bd5d1da75768a981b30565443a82433e82bb6965e1c1c1 SHA512 9cce617dcec2c870abed2ffadfc21bc2512b709791a15012f07246ce27fd749e125a16f72e6ef574ae390ecbc512c052c2630ca4c97606a20d11e25da5d2c14a
diff --git a/dev-haskell/setenv/metadata.xml b/dev-haskell/setenv/metadata.xml
index 01cdbb5563e6..937381521944 100644
--- a/dev-haskell/setenv/metadata.xml
+++ b/dev-haskell/setenv/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A cross-platform library for setting environment variables
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/setenv/setenv-0.1.1.1.ebuild b/dev-haskell/setenv/setenv-0.1.1.1.ebuild
deleted file mode 100644
index db22da332966..000000000000
--- a/dev-haskell/setenv/setenv-0.1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A cross-platform library for setting environment variables"
-HOMEPAGE="https://hackage.haskell.org/package/setenv"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/setenv/setenv-0.1.1.3.ebuild b/dev-haskell/setenv/setenv-0.1.1.3.ebuild
index 161f0fb26d6b..5319dd520b4c 100644
--- a/dev-haskell/setenv/setenv-0.1.1.3.ebuild
+++ b/dev-haskell/setenv/setenv-0.1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/setlocale/Manifest b/dev-haskell/setlocale/Manifest
index 61de3da1d17f..69105c7a04fd 100644
--- a/dev-haskell/setlocale/Manifest
+++ b/dev-haskell/setlocale/Manifest
@@ -1,3 +1,3 @@
-DIST setlocale-1.0.0.3.tar.gz 2136 BLAKE2B 16efaca6a8c0a67ab69af92da514330eddcb18aec4c18c0a693d202624f18282f21e7a0df1f0c765cb8a94252038f33980407f28ae0042159f67b9505991ef47 SHA512 a0bbb989572050e3e256e7b7e3782abfee74faf74eb81a99706c5ae88894694b6101a9725ad367b57f56ea5077dad41ca7a7988e292e4403d94f0a3cb5c40b49
-DIST setlocale-1.0.0.4.tar.gz 2138 BLAKE2B e6db87814e859db8ab774d4b1c268f5235ddec5535c5dc0834d835a4d3231bc22850e9bbc686329ace258a0db5722e9a4d47d4a1ba1c4afea0f8b6e15422b907 SHA512 e01451f31a332dd2e85c64c192c12388c35aed5e497408dbc5e587328f5900b8becea51b8df475f083d32bd69b094eca89c96b3f490ad139e58c075ce34e7b62
+DIST setlocale-1.0.0.10-rev3.cabal 869 BLAKE2B 41f9149bb87fa917abf4341a16d0b9682471324775b5a9effab759f50c1f807b62a8a390c23bad908695c1d55b4b6851b8bdee9c2803408e4b420950a2a8740e SHA512 6d75abe8592182b03479bcd035f91474baa377e2eef713312a6b7974e6452b5f589282615f1a91f41cbe7ed5bc2eefabef1527d9b86fa4866a3c62245ea5afcd
+DIST setlocale-1.0.0.10.tar.gz 2096 BLAKE2B 37451ba55f20e558dcdc766fca9f52dae0cda40ae48636ba780c6850a66c98c553d1ce2fab79d8691e424864e479c40680fe626065b67db5e8c2de02b5e2cf64 SHA512 ef05da7ed2acfa6f4b7acd988282d545897428272e5d5a9818563afc5138df32268f705946093ba33628ad42de2c19ed9cce139f0e1fa15e4a87c6cd18da02ef
 DIST setlocale-1.0.0.9.tar.gz 2098 BLAKE2B b12b847957807038da6fb7bb31a8a9dbeb55ce17062a3060ab66aae75d840f9fb44cfe51b3b2644361e457d21cca3f325e0bc09c6d453c5d28074efed56bd6c6 SHA512 32a0722c46b6db15b4566b78f418efe3c8a5d6e25181ebf275a47a68b12e4740479df6ef38070ec978eb109f5b1e2956262dcf4367869bec78dc41d6890632cd
diff --git a/dev-haskell/setlocale/metadata.xml b/dev-haskell/setlocale/metadata.xml
index b01248ad035c..130b364c7328 100644
--- a/dev-haskell/setlocale/metadata.xml
+++ b/dev-haskell/setlocale/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A Haskell interface to @setlocale()@.
-	</longdescription>
 	<upstream>
-		<remote-id type="bitbucket">IchUndNichtDu/haskell-setlocale</remote-id>
+		<remote-id type="hackage">setlocale</remote-id>
+		<remote-id type="gitlab">Kritzefitz/haskell-setlocale</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.10.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.10.ebuild
new file mode 100644
index 000000000000..4e056d4686db
--- /dev/null
+++ b/dev-haskell/setlocale/setlocale-1.0.0.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell bindings to setlocale"
+HOMEPAGE="https://gitlab.com/Kritzefitz/haskell-setlocale/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
deleted file mode 100644
index 133dad7180dd..000000000000
--- a/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to setlocale"
-HOMEPAGE="https://bitbucket.org/IchUndNichtDu/haskell-setlocale"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >=4.6 && <4.9' 'base >=4.6'
-}
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.4.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.4.ebuild
deleted file mode 100644
index cc9f808c9bfb..000000000000
--- a/dev-haskell/setlocale/setlocale-1.0.0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to setlocale"
-HOMEPAGE="https://bitbucket.org/IchUndNichtDu/haskell-setlocale"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
index ca5fc8991912..a5c23639b2f2 100644
--- a/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
+++ b/dev-haskell/setlocale/setlocale-1.0.0.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.6.1:=
@@ -22,3 +22,7 @@ RDEPEND=">=dev-lang/ghc-7.6.1:=
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.16.0
 "
+
+CABAL_CHDEPS=(
+	'base >=4.6 && <4.14' 'base >=4.6'
+)
diff --git a/dev-haskell/sha/Manifest b/dev-haskell/sha/Manifest
index 26b2f245ed3c..4b4f0bfb02d8 100644
--- a/dev-haskell/sha/Manifest
+++ b/dev-haskell/sha/Manifest
@@ -1,2 +1 @@
-DIST SHA-1.6.4.2.tar.gz 2715266 BLAKE2B bca07ae5bcb85431cfe5af047d1fc033a00c04ca5870dd81a283b80b00ff00dc04d43a3de2decc0123cfc3d1d7be53486120b1419a680683f6695d115a9bcd4a SHA512 aa1178f08ad3364c504ee790dac9b0774b7461fa7ea0a8f2c3ad82943d109602debcf4a8a83090815fef487ceac40019f8b5594ab0043f36e019d69bc5f76853
 DIST SHA-1.6.4.4.tar.gz 2715144 BLAKE2B 7bc6574d949be761c7cd029348e890e473dd7cd2525b3ef5460b4c0c70ec4586daaf162d4cb74c0f7dd979be916698cd205397e3c05cb5339753f08e356f92b7 SHA512 77a525cb9ef45a410595a2f9c11a848a3aaeb6c7cb9b0ff11395326a259c0bea0e75689e3c7fa410e25be7d4480887830e11c891801f03c439b6ae9f55e5c125
diff --git a/dev-haskell/sha/metadata.xml b/dev-haskell/sha/metadata.xml
index 485303c5f624..65e5d1ad075f 100644
--- a/dev-haskell/sha/metadata.xml
+++ b/dev-haskell/sha/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/sha/sha-1.6.4.2.ebuild b/dev-haskell/sha/sha-1.6.4.2.ebuild
deleted file mode 100644
index c0f3f43cdedd..000000000000
--- a/dev-haskell/sha/sha-1.6.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: +decoderinterface
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="SHA"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implementations of the SHA suite of message digest functions"
-HOMEPAGE="https://hackage.haskell.org/package/SHA"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="exe"
-
-RESTRICT=test # fails to build on ghc-7.6, https://ghc.haskell.org/trac/ghc/ticket/8657
-
-RDEPEND=">=dev-haskell/binary-0.7:=[profile?] <dev-haskell/binary-10000:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-10000
-		>=dev-haskell/test-framework-quickcheck2-0.3.0.2 <dev-haskell/test-framework-quickcheck2-10000 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cabal_chdeps \
-		' -O2' ' '
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=decoderinterface \
-		$(cabal_flag exe exe)
-}
diff --git a/dev-haskell/sha/sha-1.6.4.4.ebuild b/dev-haskell/sha/sha-1.6.4.4.ebuild
index db21d7591de2..a3e428f01d9e 100644
--- a/dev-haskell/sha/sha-1.6.4.4.ebuild
+++ b/dev-haskell/sha/sha-1.6.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6
 #hackport: flags: +decoderinterface
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE="exe"
 
 RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/shakespeare-css/Manifest b/dev-haskell/shakespeare-css/Manifest
deleted file mode 100644
index 222d317e1aec..000000000000
--- a/dev-haskell/shakespeare-css/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST shakespeare-css-1.0.6.6.tar.gz 17155 BLAKE2B 5394880732fea675b909ce1305efb9513586e7bf411204ef764f5b6b48170a0fecc874d31eb4d43bc8ab9e605bf732ddadf9da37c96e8a2bc6b4747c3ac3f033 SHA512 5f1c6191f425e81eb91376f97ec5e31e18d84dd3f40ec57d8f944047598d8e5187434b71dbf2c789258a34ce720fc1dbe8ac465eaa4067a13ddb59a3f8e0a08d
-DIST shakespeare-css-1.1.0.tar.gz 1572 BLAKE2B d9c15b65d24ac507c57d013bc440230fa3307e80b5a4a113e8fc7daebb81380c07c86fb18d019c2deed457e18ef6827e36d0d00bd1d2eec08056038b5d1fc2cb SHA512 e855c2be0af9d5d8ed8f9c0ec6e78305a75df983342ebf05300e16c858c28f6316e46cf435f3653c13316dcfbe07ab1fa80e428153a219696eb3de4afd8aacff
diff --git a/dev-haskell/shakespeare-css/metadata.xml b/dev-haskell/shakespeare-css/metadata.xml
deleted file mode 100644
index 5ed8cf4dd7ca..000000000000
--- a/dev-haskell/shakespeare-css/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		In this case, the variable type needs a ToCss instance.
-		
-		This package contains 2 css template languages. The Cassius language uses whitespace to avoid the need for closing brackets and semi-colons. Lucius does not care about whitespace and is a strict superset of css. There are also some significant conveniences added for css.
-		
-		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-css/shakespeare-css-1.0.6.6.ebuild b/dev-haskell/shakespeare-css/shakespeare-css-1.0.6.6.ebuild
deleted file mode 100644
index b6eab727ef17..000000000000
--- a/dev-haskell/shakespeare-css/shakespeare-css-1.0.6.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into css at compile time"
-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=""
-
-RDEPEND=">=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/text-0.11.1.1:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild b/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild
deleted file mode 100644
index 51666755db07..000000000000
--- a/dev-haskell/shakespeare-css/shakespeare-css-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into css at compile time. (deprecated)"
-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=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare-i18n/Manifest b/dev-haskell/shakespeare-i18n/Manifest
deleted file mode 100644
index 6cb9c978cacf..000000000000
--- a/dev-haskell/shakespeare-i18n/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST shakespeare-i18n-1.0.0.5.tar.gz 6678 BLAKE2B 415cf35d892fabd95c48642f0f7f4b828d73bee2455f8f2f1df305d72de40ce145f5856d3a0f6fe4198b64388e7e4890ae48b3e2d36dcc05cc16b4a7e36d6bba SHA512 21bdc445d60476fdb5ee1bc42bd302de78e21d07112352bf62feb130dfe4201ad407fe60b1454fdcedb61928db10e47c556d8750e8e6a6489e9b02b4e675a690
-DIST shakespeare-i18n-1.1.0.tar.gz 1440 BLAKE2B badf791117105ee280c73d334a4793a8b7e62accc80ae8615b3925458e1af00342452e4d576d50e49c2251ee52fea30dece9747b73e23e51e0df3ed425c5d6bf SHA512 3e6959a32e5c0cf85ca6875f87b7fcbc430df91750904045f29a7b95a2b26398cf1526daa6b33a7c941b2192c8e9238bdfe1673aa8b7dd2b7cb583a2d9fb0063
diff --git a/dev-haskell/shakespeare-i18n/metadata.xml b/dev-haskell/shakespeare-i18n/metadata.xml
deleted file mode 100644
index fa6233cb8c1b..000000000000
--- a/dev-haskell/shakespeare-i18n/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package uses the same approach of type-safe URLs to create translated content. It has a simple syntax for translators, while allowing the ful power of Haskell for applying complex grammar rules.
-		
-		This package was spun off from yesod-core, and therefore the Yesod documentation is a good place to start in understanding this package. Please see &lt;http://www.yesodweb.com/book/i18n&gt; for more information.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.0.0.5.ebuild b/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.0.0.5.ebuild
deleted file mode 100644
index 4d8f9d593b97..000000000000
--- a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.0.0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A type-based approach to internationalization"
-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=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.4 )
-"
diff --git a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild b/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild
deleted file mode 100644
index 6cb0953ecb6a..000000000000
--- a/dev-haskell/shakespeare-i18n/shakespeare-i18n-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="A type-based approach to internationalization. (deprecated)"
-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=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare-js/Manifest b/dev-haskell/shakespeare-js/Manifest
deleted file mode 100644
index de4b33f760d6..000000000000
--- a/dev-haskell/shakespeare-js/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST shakespeare-js-1.1.4.1.tar.gz 7942 BLAKE2B d7bcf9e4abf870b20fbf5e51245eecc20bf00374c33eea1f0ccbeb42b7781ba2213100550edb18bc5efd950708a08ed60fac538d10d34c8e0028e2914b1eda84 SHA512 da326b6c2a5f8147d3e0a74d7dae99fa4a9c10eb631e33f4a4641eb02874d30a4ea7826e917dccc7699fd700ee3537303f8dbb7631ce1a457e443d4365bfa48c
-DIST shakespeare-js-1.2.0.4.tar.gz 7964 BLAKE2B 3f4d3eb17092092a2ef0d4126d03d47e3b5471ae956c9cbcdd567c7547d56db468737a4bdbcd21984f4af72607135f58b8ffeee846684f184a7731ccd05c98ce SHA512 e45c1f434d4c97566d908ae7e1baefe37d4351c3b0716e3f0ab4b6e47b10fa994b2c0a806998500e6795dd54fb3d1ba417fa3838d609208e2dc69e963e7a045b
-DIST shakespeare-js-1.3.0.tar.gz 1625 BLAKE2B 4250b58fc0ef3f3052dad4eb46c4aa2309fe62a2a9cce06201b84364801807f303c13745f559decb1e8145d19c36abc626394f00fd506904576805d277a57a8d SHA512 73840c66a7dc287642a81c7f49a89974e68f924a3a57ba6ea85e51457363956e58030c01b64dd8dd5e81eecd25fe99cb4dcd0e0fdb2ccc52e4a257f63a0aeb6a
diff --git a/dev-haskell/shakespeare-js/metadata.xml b/dev-haskell/shakespeare-js/metadata.xml
deleted file mode 100644
index f6d4148d4d6e..000000000000
--- a/dev-haskell/shakespeare-js/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		In this case, the variable type needs a ToJavascript instance.
-
-		There is also shakespeare-coffeescript for coffeescript templates. Coffescript is a language that compiles down to javascript. It expects a coffeescript compiler in your path, and variable should be a ToCoffee instance.
-
-		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples
-
-		shakespeare-js was originally called julius, and shakespeare originated from the hamlet template package.
-	</longdescription>
-	<use>
-		<flag name="test-coffee">Test coffee.</flag>
-		<flag name="test-export">Test export.</flag>
-		<flag name="test-roy">Test roy.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-js/shakespeare-js-1.1.4.1.ebuild b/dev-haskell/shakespeare-js/shakespeare-js-1.1.4.1.ebuild
deleted file mode 100644
index 719046c2b18b..000000000000
--- a/dev-haskell/shakespeare-js/shakespeare-js-1.1.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into javascript/coffeescript at compile time"
-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=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-		>=dev-haskell/shakespeare-1.0.5:=[profile?]
-		<dev-haskell/shakespeare-1.1:=[profile?]
-		>=dev-haskell/text-0.7:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/hunit
-		)"
diff --git a/dev-haskell/shakespeare-js/shakespeare-js-1.2.0.4.ebuild b/dev-haskell/shakespeare-js/shakespeare-js-1.2.0.4.ebuild
deleted file mode 100644
index 09db3d7dc8f2..000000000000
--- a/dev-haskell/shakespeare-js/shakespeare-js-1.2.0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into javascript/coffeescript at compile time"
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	>=dev-haskell/shakespeare-1.2:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.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)
-}
diff --git a/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild b/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild
deleted file mode 100644
index 744b7342c285..000000000000
--- a/dev-haskell/shakespeare-js/shakespeare-js-1.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Stick your haskell variables into javascript/coffeescript at compile time"
-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=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare-text/Manifest b/dev-haskell/shakespeare-text/Manifest
deleted file mode 100644
index c5bd5d1386b8..000000000000
--- a/dev-haskell/shakespeare-text/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST shakespeare-text-1.0.2.tar.gz 4623 BLAKE2B 3e0b501cfffb883e0876d95424ab199bed46dcca24dae48622d79c2ab614b9ca93b03721e77860962c4118f8903060c43cf54a18e5657d632ac3bb3a37036898 SHA512 45ad9251e9aeda71c29b1350e0c3e6dd8ce7d3695d6be89fbcb82dc47aff6d9aaceaa00b514a885691c546c709782f0f2318bb835fea711863c04f6f9c5798ea
-DIST shakespeare-text-1.1.0.tar.gz 1810 BLAKE2B a352a5efde2437233460a7aa3544f2c2f0d6bb6e68a8b3763fa49ece62e922a89cd8ee11baddff846467756014aa2e44df2fd1cee99ca97523226402bc5d1eef SHA512 45dce0a8ef5e0b45466110fdae3ce73fa6fa053d1c68afc0f7aab20726474b34e7ca3ddde6882e40cd2cd8d37ba2e0f7f4064260879c4dbb81ccd2dd5daadb5b
diff --git a/dev-haskell/shakespeare-text/metadata.xml b/dev-haskell/shakespeare-text/metadata.xml
deleted file mode 100644
index 3ce699212101..000000000000
--- a/dev-haskell/shakespeare-text/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		interpolation with quasi-quotation: stick haskell variables into haskell strings
-		
-		Note there is no dependency on haskell-src-extras. If you don't mind that dependency, you may want to look at using these packages: Interpolation, interpolatedstring-perl6, interpolatedstring-qq.
-		
-		This package has 1 other general feature that those others may not (but would be easy to duplicate): instead of using quasi-quoting you can also use an external file. It also has url/embeding interpolation, with \@ and \^, which are used in Yesod.
-		
-		This package also uses blaze-builder for efficiently constructing strings (I am not sure what the other packages use). This might be of interest to you for large templates or performance sensitive code, or otherwise having a nice interface to blaze-builder
-		
-		Shakespeare is a template family for type-safe, efficient templates with simple variable interpolation . Shakespeare templates can be used inline with a quasi-quoter or in an external file. Shakespeare interpolates variables according to the type being inserted.
-		In this case, the variable type needs a ToText instance.
-		
-		Please see http://docs.yesodweb.com/book/templates for a more thorough description and examples of the shakespeare family of template languages.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/shakespeare-text/shakespeare-text-1.0.2.ebuild b/dev-haskell/shakespeare-text/shakespeare-text-1.0.2.ebuild
deleted file mode 100644
index 7974588bc3d3..000000000000
--- a/dev-haskell/shakespeare-text/shakespeare-text-1.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Interpolation with quasi-quotation: put variables strings"
-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=""
-
-RDEPEND=">=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild b/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild
deleted file mode 100644
index fb40d066d48b..000000000000
--- a/dev-haskell/shakespeare-text/shakespeare-text-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Interpolation with quasi-quotation: put variables strings (deprecated)"
-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=""
-
-RDEPEND=">=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/shakespeare/Manifest b/dev-haskell/shakespeare/Manifest
index a7902fea5e77..c85cb1c3d6e7 100644
--- a/dev-haskell/shakespeare/Manifest
+++ b/dev-haskell/shakespeare/Manifest
@@ -1,5 +1 @@
-DIST shakespeare-1.0.5.1.tar.gz 10773 BLAKE2B 5a234732a88b390914936e635884ed9befe10fc4b42d72d034aaf0d96099a9f8d9f136a7669307eea60cec7d773f3e7cd02a5ff2a37c73336bd4a3927625d71f SHA512 1b012cdfc90c930365633868e9714793bbbdf2fd276c578459495fe57531f4d3fb401db930880ab96eecdc95c60383a52ec8aa0cfa08b17bc099acee241192e7
-DIST shakespeare-1.2.1.1.tar.gz 11053 BLAKE2B 7c2b43f260740ddd364831f8bb991f052be8df014869bf29a1839d43f6cdcaf184fdc691ee4cecbd349dc68b848910a90399b5a48d48ed639180e609df36ba0c SHA512 559e77735c96edb551d85127e68af1aebfba383a6c67999ed86d4a93dc5dd7cedc8b7ca841219c0b7912cfc8509150733a7ba34fcb71d8e7a080fe34527b49e5
-DIST shakespeare-2.0.12.1.tar.gz 65156 BLAKE2B 0351f9453331a6aea8a346759902256ee1424a92ae5b0e655ed71567b0351449eff1c45ce675abd16556d9f09a4d31c8fdf11b8b28784171f50292b30da4a677 SHA512 01591844b51ab93a8021646ad15350d9682aa3e12c5017c32b89ca3b8de1cc46a01eb0096a35585297558d25c7a641a43f2766ad04766b2e033e8d02bdbc330e
-DIST shakespeare-2.0.21.tar.gz 65752 BLAKE2B fdcaf27cc9f9346b93b3f1eb8b215ee75c4751427be279574c93929f4f5f521c01091bbff81a849bef3f98d97cf662b725ab99da709437b98ac85afc34f74d99 SHA512 ca796206aafffb5a96c75d305e90bad48f17d213b24dce8c8adcc9c94299ed78b0a2b48b5116d18b0ee26b413e845df53d387d3ca1b3d4c127e9b02b9f124af7
-DIST shakespeare-2.0.7.tar.gz 62913 BLAKE2B a1e4f7c05123ad28cec27d07e491af4a86847ca0cf9fc85cca821b3c80a246508370e7c985fd27339601a5a4b500ab2ef437852c4746481cfb00b5aa45e24946 SHA512 5d682c2a4c36b7c8b5c8b87a3d0e509eb84e9e0a0e00a691cb9687c6f335c9ad895b81115a4e6fe8f4087ac6febe3e3e26d39ec305267228b1c9f295f9cf6d16
+DIST shakespeare-2.0.30.tar.gz 71263 BLAKE2B a3ef788611b83d27d0e188cb11b45e54f5e7ce1ff215c3f62d643f5725022b8e7b3f94af7ce35fe5471311b01b9b6ff532fb6fec5ad4059a6d5be31f65f2b122 SHA512 8b278c712f0e914dee2cb2736f6d859e920ffdd3ffbeb2684eb45d3eafced4bf871cd5f960e31b9355d53f913fee29611f82494ec7b26d8711a2b33ef5a0aca0
diff --git a/dev-haskell/shakespeare/metadata.xml b/dev-haskell/shakespeare/metadata.xml
index 51b9253245db..937381521944 100644
--- a/dev-haskell/shakespeare/metadata.xml
+++ b/dev-haskell/shakespeare/metadata.xml
@@ -1,21 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<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-1.0.5.1.ebuild b/dev-haskell/shakespeare/shakespeare-1.0.5.1.ebuild
deleted file mode 100644
index 58e15a2721f7..000000000000
--- a/dev-haskell/shakespeare/shakespeare-1.0.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-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=""
-
-RDEPEND=">=dev-haskell/parsec-2:=[profile?]
-		<dev-haskell/parsec-4:=[profile?]
-		>=dev-haskell/system-fileio-0.3:=[profile?]
-		>=dev-haskell/system-filepath-0.4:=[profile?]
-		>=dev-haskell/text-0.7:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-		)"
diff --git a/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild b/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
deleted file mode 100644
index 03a6d544135d..000000000000
--- a/dev-haskell/shakespeare/shakespeare-1.2.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="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-export"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hspec-1.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test-export test_export)
-}
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
deleted file mode 100644
index d4caa18cff8f..000000000000
--- a/dev-haskell/shakespeare/shakespeare-2.0.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-haskell/aeson:=[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/scientific-0.3.0.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	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)
-}
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild
deleted file mode 100644
index 297ed80775c6..000000000000
--- a/dev-haskell/shakespeare/shakespeare-2.0.21.ebuild
+++ /dev/null
@@ -1,42 +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.9999
-
-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?]
-	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/scientific-0.3.0.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.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)
-}
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
new file mode 100644
index 000000000000..68013fe120da
--- /dev/null
+++ b/dev-haskell/shakespeare/shakespeare-2.0.30.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="<dev-haskell/aeson-3:=[profile?]
+	dev-haskell/blaze-html:=[profile?]
+	dev-haskell/blaze-markup:=[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/th-lift:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=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 test_coffee) \
+		$(cabal_flag test test_export) \
+		$(cabal_flag test test_roy)
+}
diff --git a/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild b/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
deleted file mode 100644
index f143a726ac13..000000000000
--- a/dev-haskell/shakespeare/shakespeare-2.0.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-haskell/aeson:=[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/scientific:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.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)
-}
diff --git a/dev-haskell/shell-escape/Manifest b/dev-haskell/shell-escape/Manifest
deleted file mode 100644
index c4ad16d27600..000000000000
--- a/dev-haskell/shell-escape/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shell-escape-0.2.0.tar.gz 6066 BLAKE2B 673e524c8914672fe9a5b955503ba66994a19edfbe1d46069c4a18053318fb731ac9e8949b2fee59ca517429f8b7f8631342d0cbea09a73b85d38f32003ecb9c SHA512 b2e8ae93b13619cd6801b0fb85e4783c2472a57f5162fb397d2cf00468290b0ca6189ba6a54b54efa68b2977d25ec02cdcf8d9c49f0d21cd6d6f1a030dd05db4
diff --git a/dev-haskell/shell-escape/metadata.xml b/dev-haskell/shell-escape/metadata.xml
deleted file mode 100644
index 48d4af45c12d..000000000000
--- a/dev-haskell/shell-escape/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Shell escaping library, offering both Bourne shell and Bash style escaping
-		of ByteStrings.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">solidsnack/shell-escape</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild b/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild
deleted file mode 100644
index 0a8d54b17322..000000000000
--- a/dev-haskell/shell-escape/shell-escape-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Shell escaping library"
-HOMEPAGE="https://github.com/solidsnack/shell-escape"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/vector-0.6.0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/shellish/Manifest b/dev-haskell/shellish/Manifest
deleted file mode 100644
index 573922da1791..000000000000
--- a/dev-haskell/shellish/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shellish-0.1.4.tar.gz 7268 BLAKE2B d315b956f64d6ebf9cd3728468b63775448fd6446fdbed8570ddc81885027884b2112c1377a457693463d42dc9f43c8088119f4fa09b8612dd830a504ffcb07b SHA512 4507ab92ca2db6a0e79d799ba303b3cb64fa887ec4581f0e1d191340fa7116db2c4bae069d6692c51d3d754ea0672b2d5c12b582d769b81b5b0e25c8c97c8a62
diff --git a/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch b/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
deleted file mode 100644
index c756635f6000..000000000000
--- a/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Shellish.hs b/Shellish.hs
-index 1e3c192..0ac20c2 100644
---- a/Shellish.hs
-+++ b/Shellish.hs
-@@ -1,3 +1,3 @@
- {-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, OverloadedStrings,
--             MultiParamTypeClasses, FlexibleInstances #-}
-+             MultiParamTypeClasses, FlexibleInstances, FlexibleContexts #-}
- 
diff --git a/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch b/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch
deleted file mode 100644
index 49525543acbd..000000000000
--- a/dev-haskell/shellish/files/shellish-0.1.4-ghc-8.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Shellish.hs b/Shellish.hs
-index 0ac20c2..7de0e11 100644
---- a/Shellish.hs
-+++ b/Shellish.hs
-@@ -180,3 +180,3 @@ test_s = path >=> liftIO . \f -> do
-   stat <- getSymbolicLinkStatus f
--  return $ isSymbolicLink stat
-+  return $ System.PosixCompat.Files.isSymbolicLink stat
- 
diff --git a/dev-haskell/shellish/metadata.xml b/dev-haskell/shellish/metadata.xml
deleted file mode 100644
index 220975e213d9..000000000000
--- a/dev-haskell/shellish/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The shellisg package provides a single module for convenient
-		\"systems\" programming in Haskell, similar in spirit to POSIX
-		shells or PERL.
-		
-		* Elegance and safety is sacrificed for conciseness and
-		swiss-army-knife-ness.
-		
-		* The interface exported by Shellish is thread-safe.
-		
-		Overall, the module should help you to get a job done quickly,
-		without getting too dirty.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/shellish/shellish-0.1.4.ebuild b/dev-haskell/shellish/shellish-0.1.4.ebuild
deleted file mode 100644
index b441415f3876..000000000000
--- a/dev-haskell/shellish/shellish-0.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="shell-/perl- like (systems) programming in Haskell"
-HOMEPAGE="http://repos.mornfall.net/shellish"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
-		dev-haskell/strict[profile?]
-		dev-haskell/unix-compat[profile?]
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-	epatch "${FILESDIR}"/${P}-ghc-8.patch
-}
diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
index 686e6e51a44f..e2d9257f7cd5 100644
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -1,5 +1,3 @@
-DIST shelly-1.5.6.tar.gz 28264 BLAKE2B ec1a51e8799a7d0e37f31f737cfcf50bb780636094365991693b19f89ba5c72dbf7c40ed922352d76294ca8a07fcb73ba2359613ff2a244831b6fe82d6457b94 SHA512 522aa76454211b9f31dc92f052703e3f9f4a103c134da063ff5c4c04e209a1f881dc10c0f8589c557ad179a8dc319951b897b8ff401dd8f9a371f69f1def6022
-DIST shelly-1.6.5.tar.gz 97274 BLAKE2B 0cb2ef6482f509e9547dc6571b8d7e2eaf61fb0ceca2be5ed5ab423118ff69032205711b697a539e45c27551149ec79fc95e176f5b6afe7d8ccdf3c8b1f46208 SHA512 6a5b418987392d755e7faf60206a3e9283e98f56a4d9d9f956c0385074ff8909fb6bddceb050b00dbd0f8eda55eeb4897d9afd2f8dd2d510367567336a7a6770
-DIST shelly-1.6.6.tar.gz 97529 BLAKE2B a171ceba324ca8775604d7ddedb0bb26697d1161231f5b0fed5611fb9f035e2db61011891f4be9bf8fcc7df1b4d3d50b89f7fed15b48f5bc1a5bfb1c6b891802 SHA512 1b78cb84d126f6bb67db3a3d5e669759e71811e2770831af41a4867d094f89b32c3cf39363cc39c808e71019d6e7eca18d25e854bbf4160bd3388c6769a8665c
-DIST shelly-1.6.8.1.tar.gz 97802 BLAKE2B 08f0f5d7e86b803804f6fae7c66fccf2cd5ae044dd8cb164f49254e311644bee4d103cf04ca9c7b20fb4d29e742ed9480d6c714205bdebb07656b5f925491b4e SHA512 76ab37289a9b6c51ecb6d5326161b326a4015ed27f6c61cd889d4dbf8f6417e6629d0059fdf65ec40f4093cb921ea3b4871105ccd77c94f863c2a087e3c2fab6
+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
diff --git a/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch b/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
deleted file mode 100644
index a2ef39376c08..000000000000
--- a/dev-haskell/shelly/files/shelly-1.5.6-monad-control-1.1.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-commit 33b32439e7ef1ba60cc8d72ae0f0c53b6d01ae90
-Merge: d3aec33 b70a308
-Author: Greg Weber <greg@gregweber.info>
-Date:   Mon Dec 22 10:32:40 2014 -0800
-
-    Merge pull request #84 from yesodweb/monad-control-1.0
-    
-    monad-control 1.0
-
-commit d3aec338e23a03027c404aaf5a7b5790b3300ec5
-Author: Luite Stegeman <stegeman@gmail.com>
-Date:   Mon Dec 22 16:21:01 2014 +0100
-
-    bump time upper bound
-
-diff --git a/shelly.cabal b/shelly.cabal
-index ed0d086..3d3c46d 100644
---- a/shelly.cabal
-+++ b/shelly.cabal
-@@ -39,7 +39,7 @@ Library
- 
-   Build-depends:
-     containers                >= 0.4.2.0,
--    time                      >= 1.3 && < 1.5,
-+    time                      >= 1.3 && < 1.6,
-     directory                 >= 1.1.0.0 && < 1.3.0.0,
-     mtl                       >= 2,
-     process                   >= 1.0,
-
-commit c1da49fb0d59a56c9e4140a5cbf0700c9fc1ca5f
-Author: Luite Stegeman <stegeman@gmail.com>
-Date:   Mon Dec 22 16:20:18 2014 +0100
-
-    Add Alternative instance for Sh, since it's now a superclass of
-    MonadPlus.
-
-diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
-index a8d0182..f0a64ec 100644
---- a/src/Shelly/Pipe.hs
-+++ b/src/Shelly/Pipe.hs
-@@ -138,6 +138,10 @@ instance Applicative Sh where
-     pure = return
-     (<*>) = ap
- 
-+instance Alternative Sh where
-+    empty = mzero
-+    (<|>) = mplus
-+
- instance MonadPlus Sh where
-     mzero = Sh $ return []
-     mplus a b = Sh $ liftA2 (++) (unSh a) (unSh b)
-
-commit b70a308ad14af0b57bbdd9cf8441bdc30ff65c36
-Author: Michael Snoyman <michael@snoyman.com>
-Date:   Mon Dec 22 13:49:54 2014 +0200
-
-    monad-control 1.0
-
-diff --git a/shelly.cabal b/shelly.cabal
-index ed0d086..99a85d3 100644
---- a/shelly.cabal
-+++ b/shelly.cabal
-@@ -46,7 +46,7 @@ Library
-     unix-compat               < 0.5,
-     system-filepath           >= 0.4.7 && < 0.5,
-     system-fileio             < 0.4,
--    monad-control             >= 0.3.2 && < 0.4,
-+    monad-control             >= 0.3.2 && < 1.1,
-     lifted-base,
-     lifted-async,
-     exceptions                == 0.6.*,
-diff --git a/src/Shelly/Base.hs b/src/Shelly/Base.hs
-index e05ad43..3d6fe00 100644
---- a/src/Shelly/Base.hs
-+++ b/src/Shelly/Base.hs
-@@ -71,11 +71,19 @@ instance MonadBase IO Sh where
-     liftBase = Sh . ReaderT . const
- 
- instance MonadBaseControl IO Sh where
-+#if MIN_VERSION_monad_control(1,0,0)
-+    type StM Sh a = StM (ReaderT (IORef State) IO) a
-+    liftBaseWith f =
-+        Sh $ liftBaseWith $ \runInBase -> f $ \k ->
-+            runInBase $ unSh k
-+    restoreM = Sh . restoreM
-+#else
-     newtype StM Sh a = StMSh (StM (ReaderT (IORef State) IO) a)
-     liftBaseWith f =
-         Sh $ liftBaseWith $ \runInBase -> f $ \k ->
-             liftM StMSh $ runInBase $ unSh k
-     restoreM (StMSh m) = Sh . restoreM $ m
-+#endif
- 
- instance Catch.MonadThrow Sh where
-   throwM = liftIO . Catch.throwM
diff --git a/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch b/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch
deleted file mode 100644
index 75d56220e38c..000000000000
--- a/dev-haskell/shelly/files/shelly-1.6.5-ghc-8.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/Shelly/Lifted.hs b/src/Shelly/Lifted.hs
-index 825201d..cdca61b 100644
---- a/src/Shelly/Lifted.hs
-+++ b/src/Shelly/Lifted.hs
-@@ -2,4 +2,4 @@
-              FlexibleInstances, FlexibleContexts, IncoherentInstances,
--             TypeFamilies, ExistentialQuantification, RankNTypes,
--             ImpredicativeTypes #-}
-+             TypeFamilies, ExistentialQuantification, RankNTypes
-+  #-}
- {-# OPTIONS_GHC -fno-warn-orphans #-}
-@@ -299,3 +299,3 @@ instance (MonadShControl m, Monoid w)
- controlSh :: MonadShControl m => ((forall x. m x -> Sh (ShM m x)) -> Sh (ShM m a)) -> m a
--controlSh = liftShWith >=> restoreSh
-+controlSh r = liftShWith r >>= restoreSh
- {-# INLINE controlSh #-}
diff --git a/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch b/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 078f979fd013..000000000000
--- a/dev-haskell/shelly/files/shelly-1.6.8.1-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
-index 7fe7d98..cc5668d 100644
---- a/src/Shelly/Pipe.hs
-+++ b/src/Shelly/Pipe.hs
-@@ -121,3 +121,3 @@ import Data.Text as T hiding (concat, all, find, cons)
- 
--default (T.Text)
-+-- default (T.Text)
- 
diff --git a/dev-haskell/shelly/metadata.xml b/dev-haskell/shelly/metadata.xml
index 061239b47e2b..785c05c3d993 100644
--- a/dev-haskell/shelly/metadata.xml
+++ b/dev-haskell/shelly/metadata.xml
@@ -1,33 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Shelly provides convenient systems programming in Haskell,
-		similar in spirit to POSIX shells. Shelly:
-		
-		* is aimed at convenience and getting things done rather than
-		being a demonstration of elegance.
-		
-		* has detailed and useful error messages
-		
-		* maintains its own environment, making it thread-safe.
-		
-		* is modern, using Text and system-filepath/system-fileio
-		
-		Shelly is originally forked from the Shellish package.
-		
-		See the shelly-extra package for additional functionality.
-		
-		An overview is available in the README: &lt;https://github.com/yesodweb/Shelly.hs/blob/master/README.md&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/Shelly.hs</remote-id>
-	</upstream>
 	<use>
 		<flag name="lifted">run the tests against Shelly.Lifted</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">shelly</remote-id>
+		<remote-id type="github">yesodweb/Shelly.hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/shelly/shelly-1.12.1.ebuild b/dev-haskell/shelly/shelly-1.12.1.ebuild
new file mode 100644
index 000000000000..5cfdf4924b83
--- /dev/null
+++ b/dev-haskell/shelly/shelly-1.12.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: build-examples:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="shell-like (systems) programming in Haskell"
+HOMEPAGE="https://github.com/gregwebs/Shelly.hs"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples lifted"
+
+RDEPEND="
+	>=dev-haskell/async-2.2.3:=[profile?]
+	>=dev-haskell/enclosed-exceptions-1.0.1:=[profile?]
+	>=dev-haskell/lifted-async-0.10.2:=[profile?]
+	>=dev-haskell/lifted-base-0.2.3.2:=[profile?]
+	>=dev-haskell/monad-control-0.3.2:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+	>=dev-haskell/text-1.2.3.1:=[profile?]
+	>=dev-haskell/transformers-base-0.4.5:=[profile?]
+	>=dev-haskell/unix-compat-0.4.1.1:=[profile?] <dev-haskell/unix-compat-0.8:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/hspec-2.2.2
+		dev-haskell/hspec-contrib
+		>=dev-haskell/hunit-1.2.5.2
+	)
+"
+
+example_exes=(
+	"drain"
+	"run-handles"
+	"Color"
+)
+
+src_prepare() {
+	for e in "${example_exes[@]}"; do
+		export CABAL_CHDEPS=(
+			"${CABAL_CHDEPS[@]}"
+			"Executable ${e}"
+			"executable ${PN}-examples-${e}"
+		)
+	done
+
+	haskell-cabal_src_prepare
+}
+
+src_configure() {
+	config_flags=(
+		$(cabal_flag examples build-examples)
+		$(cabal_flag lifted lifted)
+	)
+
+	haskell-cabal_src_configure "${config_flags[@]}"
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+
+	elog "The following example executables installed with this package have been"
+	elog "renamed to help prevent name collisions:"
+	elog ""
+
+	for e in "${example_exes[@]}"; do
+		elog "${e} -> ${PN}-examples-${e}"
+	done
+}
diff --git a/dev-haskell/shelly/shelly-1.5.6-r1.ebuild b/dev-haskell/shelly/shelly-1.5.6-r1.ebuild
deleted file mode 100644
index 9620c6db8fd2..000000000000
--- a/dev-haskell/shelly/shelly-1.5.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.7:=[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/system-fileio-0.4:=[profile?]
-	>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	<dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-PATCHES=("${FILESDIR}/${PN}-1.5.6-monad-control-1.1.patch")
diff --git a/dev-haskell/shelly/shelly-1.6.5.ebuild b/dev-haskell/shelly/shelly-1.6.5.ebuild
deleted file mode 100644
index 8f5f1da427bd..000000000000
--- a/dev-haskell/shelly/shelly-1.6.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lifted"
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[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/system-fileio-0.4:=[profile?]
-	>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	<dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.5
-		>=dev-haskell/hunit-1.2
-		>=dev-haskell/text-0.11 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lifted lifted)
-}
diff --git a/dev-haskell/shelly/shelly-1.6.6.ebuild b/dev-haskell/shelly/shelly-1.6.6.ebuild
deleted file mode 100644
index fde63b698850..000000000000
--- a/dev-haskell/shelly/shelly-1.6.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="lifted"
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[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/system-fileio-0.4:=[profile?]
-	>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	<dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.5
-		>=dev-haskell/hunit-1.2
-		>=dev-haskell/text-0.11 )
-"
-
-PATCHES=("${FILESDIR}"/${PN}-1.6.5-ghc-8.patch)
-
-src_prepare() {
-	cabal_chdeps \
-		'time                      >= 1.3 && < 1.6' 'time                      >= 1.3'
-	default
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag lifted lifted)
-}
diff --git a/dev-haskell/shelly/shelly-1.6.8.1.ebuild b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
deleted file mode 100644
index 3a938c2007cc..000000000000
--- a/dev-haskell/shelly/shelly-1.6.8.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: build-examples:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="shell-like (systems) programming in Haskell"
-HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples lifted"
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?] <dev-haskell/exceptions-0.9:=[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/system-fileio-0.4:=[profile?]
-	>=dev-haskell/system-filepath-0.4.7:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	<dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.5
-		>=dev-haskell/hunit-1.2
-		>=dev-haskell/text-0.11 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory                 >= 1.1.0.0 && < 1.3.0.0' 'directory                 >= 1.1.0.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples build-examples) \
-		$(cabal_flag lifted lifted)
-}
diff --git a/dev-haskell/shelly/shelly-1.9.0.ebuild b/dev-haskell/shelly/shelly-1.9.0.ebuild
index 9d59c59b5930..e82add5aa2a4 100644
--- a/dev-haskell/shelly/shelly-1.9.0.ebuild
+++ b/dev-haskell/shelly/shelly-1.9.0.ebuild
@@ -1,45 +1,76 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.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
+inherit ghc-package haskell-cabal
 
 DESCRIPTION="shell-like (systems) programming in Haskell"
 HOMEPAGE="https://github.com/yesodweb/Shelly.hs"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+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/should-not-typecheck/Manifest b/dev-haskell/should-not-typecheck/Manifest
new file mode 100644
index 000000000000..751f92de99a5
--- /dev/null
+++ b/dev-haskell/should-not-typecheck/Manifest
@@ -0,0 +1 @@
+DIST should-not-typecheck-2.1.0.tar.gz 5229 BLAKE2B 66d08f52a72dc40ef549fdd724889937506d1836eb60fecd8d55801287504586718e14d91d5be8c0e49e6b382281e3eea32757001ba0f4dc446ef063fd024ec8 SHA512 46ba4435a4408e23dfe6e04f827a7efcfd3c94a4a53a0562061d5cd40c11fcbae7569e695329fe98f9d9ecea1999ac68da6594d2ca60c2efccdac2d6d674d65d
diff --git a/dev-haskell/should-not-typecheck/metadata.xml b/dev-haskell/should-not-typecheck/metadata.xml
new file mode 100644
index 000000000000..3358bf72024c
--- /dev/null
+++ b/dev-haskell/should-not-typecheck/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+	<longdescription>
+		For examples and an introduction to the library please take a look at the &lt;https://github.com/CRogers/should-not-typecheck#should-not-typecheck- README&gt; on github.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">CRogers/should-not-typecheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild b/dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild
new file mode 100644
index 000000000000..3830e5599182
--- /dev/null
+++ b/dev-haskell/should-not-typecheck/should-not-typecheck-2.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A HUnit/hspec assertion library to verify that an expression does not typecheck"
+HOMEPAGE="https://github.com/CRogers/should-not-typecheck"
+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/hunit-1.2:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/hspec-2.1
+		>=dev-haskell/hspec-expectations-0.6 )
+"
diff --git a/dev-haskell/shuffle/Manifest b/dev-haskell/shuffle/Manifest
deleted file mode 100644
index 8983bbbd48a7..000000000000
--- a/dev-haskell/shuffle/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shuffle-0.1.3.3.tar.gz 31685 BLAKE2B 007f91bedca1cd7b7a7d40b3425f528b3e76e5636447b509bfa30ba09894267c51a759ca512a39c8c3c296765b816df28ad6952085e5135f24b6169dfab8d519 SHA512 44fcb34a3a9c251970c132c5a504aa4fe30befbc2829ff8b4f788e797c8a35373c5ed4325fb3e5d5846caf0f566b84c398f53be0c7d33d4392343e4f8655a096
diff --git a/dev-haskell/shuffle/metadata.xml b/dev-haskell/shuffle/metadata.xml
deleted file mode 100644
index 6988c173b587..000000000000
--- a/dev-haskell/shuffle/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Shuffle tool used by UHC (Utrecht Haskell Compiler)
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">UU-ComputerScience/shuffle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild b/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild
deleted file mode 100644
index e0fb30c2e64c..000000000000
--- a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Shuffle tool for UHC"
-HOMEPAGE="https://github.com/UU-ComputerScience/shuffle"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/cabal-1.14:=[profile?]
-	>=dev-haskell/uhc-util-0.1.5.5:=[profile?]
-	>=dev-haskell/uuagc-0.9.40.3:=[profile?]
-	>=dev-haskell/uuagc-cabal-1.0.3.0:=[profile?]
-	>=dev-haskell/uulib-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/silently/Manifest b/dev-haskell/silently/Manifest
index 0c6351cc652b..0927f9627cf3 100644
--- a/dev-haskell/silently/Manifest
+++ b/dev-haskell/silently/Manifest
@@ -1,3 +1,2 @@
-DIST silently-1.2.4.1.tar.gz 3199 BLAKE2B f3d05403e8fc9cab5b83808526cb957c0bc030d88b6c4249c61223f7dc3b5a5ccf10a8268aed492e48895e9ff4321282e8626439bcc19052cbd8904fc57dbc4a SHA512 ab8fea9c15a2061e3c3fd6970422a2cdea67aac3614991a8135f19a2f075de52f923fd0e78b5a45a91f2523f6263eb626efea2e89ed94277e03a132410862e19
 DIST silently-1.2.5.1.tar.gz 3358 BLAKE2B 2e7927bf663b015a52ef62266c07b30ad66e0bee2122b1a75faf9e13756e3e15bb2a15d16189d75fd9b46749ce0b1ffc66a76cb8e395e5639627356f9dab405c SHA512 1347a1da5082ca015ca609ef313ad04c253d12ab7b08f8f714b4c70282d3c01ba753f278bef4111fd8a0cc25bd3be37908b7e565d99d4b7c2a2fcc019febb8d6
-DIST silently-1.2.5.tar.gz 3364 BLAKE2B b5f248bc50c4a85268cf6709a8984307b40524763304cf8aacab64d0ba3949c2fccc104157a848a15841ee6cad6c56fb54d7b7003c13a300aaedc77a12fce9d7 SHA512 f28075e064561fffaa85dc88e7feef543411abc453e76d1ef90d3a7e617d9d9e8fc3ce053da391f0c8d78c7e27fb1e5dcda6a022f43f95491339366362f02acc
+DIST silently-1.2.5.3.tar.gz 4430 BLAKE2B 1c3ee240e99684b1a83306885e8d567ad75e35158c2c41b0d4c897093e0d2344ec3367b84f2a3ed60efa6ff303d7b030d299acaa472c8811f3a016e65427eef7 SHA512 1b05420e363ec763c08fb3767cde9b8c701a418ccdfba9b19731d87650f180955ae8affb0298d923a24b7354340945f973fdebdba7d91ac7aeb2cd904820afdb
diff --git a/dev-haskell/silently/metadata.xml b/dev-haskell/silently/metadata.xml
index ca55290ec73f..1f043a22f0ca 100644
--- a/dev-haskell/silently/metadata.xml
+++ b/dev-haskell/silently/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Prevent or capture writing to stdout and other handles.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">trystan/silently</remote-id>
+		<remote-id type="hackage">silently</remote-id>
+		<remote-id type="github">hspec/silently</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/silently/silently-1.2.4.1.ebuild b/dev-haskell/silently/silently-1.2.4.1.ebuild
deleted file mode 100644
index 28c9a86ca0ef..000000000000
--- a/dev-haskell/silently/silently-1.2.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Prevent or capture writing to stdout and other handles"
-HOMEPAGE="https://github.com/trystan/silently"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/nanospec )"
diff --git a/dev-haskell/silently/silently-1.2.5.1.ebuild b/dev-haskell/silently/silently-1.2.5.1.ebuild
index c987e9bc3bea..aada80e79137 100644
--- a/dev-haskell/silently/silently-1.2.5.1.ebuild
+++ b/dev-haskell/silently/silently-1.2.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/silently/silently-1.2.5.3.ebuild b/dev-haskell/silently/silently-1.2.5.3.ebuild
new file mode 100644
index 000000000000..e4021c430b0e
--- /dev/null
+++ b/dev-haskell/silently/silently-1.2.5.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Prevent or capture writing to stdout and other handles"
+HOMEPAGE="https://github.com/hspec/silently"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		dev-haskell/nanospec
+		dev-haskell/temporary
+	)
+"
diff --git a/dev-haskell/silently/silently-1.2.5.ebuild b/dev-haskell/silently/silently-1.2.5.ebuild
deleted file mode 100644
index f2cee41cdda6..000000000000
--- a/dev-haskell/silently/silently-1.2.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Prevent or capture writing to stdout and other handles"
-HOMEPAGE="https://github.com/hspec/silently"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/nanospec
-		dev-haskell/temporary )
-"
diff --git a/dev-haskell/simple-reflect/Manifest b/dev-haskell/simple-reflect/Manifest
index 522d85719f0f..dd69a37afe59 100644
--- a/dev-haskell/simple-reflect/Manifest
+++ b/dev-haskell/simple-reflect/Manifest
@@ -1,2 +1 @@
-DIST simple-reflect-0.3.2.tar.gz 4492 BLAKE2B 933f9d5902a18ad3e69aa8c9731c67eb4e35aec36f860d92876d8a7709f3ced259781979bf469ca5d547e21995b84e0a94aa599f4df6e3f5fa3cbc8337e0702f SHA512 0e8e9666b10fcebbb4fe421ca8a1102d2028d8a4b2b9c196400b15ceedaa0420160e1536fadf55fdc316e1a07fb11aa92e2933b2fe491d27a1f3c54b62f268a1
 DIST simple-reflect-0.3.3.tar.gz 4590 BLAKE2B a70fbf93615cad2351efb6070c78075c848541973d8b321734b5d675a4524396e81b3e3f6356bcd75c9378b5f0f328dc0057032c1b862699dadc36f71347217c SHA512 5a10c7696a6d92e5881b88d92427d5f62bb319cff69a093aa72404dd68d9bddcc2b4f5c5fb83374b5a0c71be78705053cdfce6947fc2046bb4e3bf99d85ddc3a
diff --git a/dev-haskell/simple-reflect/metadata.xml b/dev-haskell/simple-reflect/metadata.xml
index f910f43f15d1..f73d8626628c 100644
--- a/dev-haskell/simple-reflect/metadata.xml
+++ b/dev-haskell/simple-reflect/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild b/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild
deleted file mode 100644
index 93ade0265dee..000000000000
--- a/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple reflection of expressions containing variables"
-HOMEPAGE="https://twanvl.nl/blog/haskell/simple-reflection-of-expressions"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild b/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
index 8ff96477c01b..018caf020385 100644
--- a/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
+++ b/dev-haskell/simple-reflect/simple-reflect-0.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/simple-sendfile/Manifest b/dev-haskell/simple-sendfile/Manifest
index db4b2e4095eb..51b46f059757 100644
--- a/dev-haskell/simple-sendfile/Manifest
+++ b/dev-haskell/simple-sendfile/Manifest
@@ -1,4 +1,2 @@
-DIST simple-sendfile-0.2.13.tar.gz 7272 BLAKE2B 37b02f5062913df47c3099e65469a0d59fb01b9e7ae45bfc620f339ec0c4362f06ffabffc4529076ced2327375766c5e0ffa48f1226e576d9a4cbdaee5c1e004 SHA512 945ded7475b7c96869a806f70fba3704c98c1959e1665f20624dba1041f0d98ab50a0624ac3e27eb802f4ad9b20455cffd7a5aa35ddac2758a8164dddf63c2ff
-DIST simple-sendfile-0.2.21.tar.gz 7469 BLAKE2B 70040c0bcdbb63c8132ba55398b3ac5f1615f25e49b8f9492312ef63292d2e3150cc2bdd10d73e3d9e9ef0732b6fde40bffe8d98bce2916ef9b47e28748d6c02 SHA512 bf6c8d42eed99e31ea71dc2447a3ea30f80ca6573edb7b19d4881c1b9c8b39a9f9c23cf84427f30f2d13cea50930c674a32acea6dd1c7ef98071d259af0e44f7
-DIST simple-sendfile-0.2.25.tar.gz 343509 BLAKE2B ee0351e332d72f22ffb5236335fcff2bcbcfbf83a6c8793271027c00144afce3c9881d5ecc2f2dda7f6ede91dbc3962064c9c861520aca471f2c091ec102261e SHA512 4e31bd6843e74988b5f132e77557e4db0da833cd7f0e8ee6dfa460a495afa1de18325deddb0ca71b959b704f090292ca4eb4c2bf06cd96fd27fc78a4d3f79eeb
 DIST simple-sendfile-0.2.28.tar.gz 343120 BLAKE2B fd6a5e083707e113fe4637ee8242b6036f813deec2ad2adf7d9e91338b4d15ef950d35e6cfc69be569601272f8beb12b823e4528d6a9933f3bc04533835f9240 SHA512 9a08d4ba26cd05b1fff3e72bd0846260d4c04921a5ca1f86258c61e51ee5ccf8e14dd2aea0bee44590572feba1832b2562b75b5f71f004c705f02cd0a0f000d1
+DIST simple-sendfile-0.2.30.tar.gz 343470 BLAKE2B ed9ef76782ed310207aa3a04c78b92c11eb3d25e2df934216feeedde29a5963d04b38832b5604e987dc4ca8b83ec653000cb7298761e13e96f477e7fb5767e7d SHA512 ae624939d54bf5ed8aa2c0727a29696730ba6b1d520f28bdc5b42a8e4c4bc03980821639fb8e16702a360dbd0396aea8a997055d22812bef3d22ffaaac53f759
diff --git a/dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch b/dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch
new file mode 100644
index 000000000000..0dc669f7e697
--- /dev/null
+++ b/dev-haskell/simple-sendfile/files/simple-sendfile-0.2.30-musl-1.2.4.patch
@@ -0,0 +1,56 @@
+From c16550e29f6c6cbe35e133c347a82821fa67f284 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sun, 18 Jun 2023 21:52:42 +0000
+Subject: [PATCH] Fix build on musl 1.2.4
+
+Remove references to the deprecated LFS64 compatibility symbols, and
+replace them with the normal interfaces. All calls are automatically 64
+bit on musl, and define _FILE_OFFSET_BITS=64 to make sure calls on glibc
+are 64 bits.
+---
+ Network/Sendfile/Linux.hsc | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/Network/Sendfile/Linux.hsc b/Network/Sendfile/Linux.hsc
+index 4f7adab..96bfb04 100644
+--- a/Network/Sendfile/Linux.hsc
++++ b/Network/Sendfile/Linux.hsc
+@@ -1,6 +1,8 @@
+ {-# LANGUAGE ForeignFunctionInterface #-}
+ {-# LANGUAGE CPP #-}
+ 
++#define _FILE_OFFSET_BITS 64
++
+ module Network.Sendfile.Linux (
+     sendfile
+   , sendfile'
+@@ -34,9 +36,6 @@ import System.Posix.Types
+ #include <sys/sendfile.h>
+ #include <sys/socket.h>
+ 
+-isLargeOffset :: Bool
+-isLargeOffset = sizeOf (0 :: COff) == 8
+-
+ isLargeSize :: Bool
+ isLargeSize = sizeOf (0 :: CSize) == 8
+ 
+@@ -142,15 +141,7 @@ sendfileloop dst src offp len hook = do
+ 
+ -- Dst Src in order. take care
+ foreign import ccall unsafe "sendfile"
+-    c_sendfile32 :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+-
+-foreign import ccall unsafe "sendfile64"
+-    c_sendfile64 :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+-
+-c_sendfile :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+-c_sendfile
+-  | isLargeOffset = c_sendfile64
+-  | otherwise     = c_sendfile32
++    c_sendfile :: Fd -> Fd -> Ptr COff -> CSize -> IO CSsize
+ 
+ ----------------------------------------------------------------
+ 
+-- 
+2.41.0
+
diff --git a/dev-haskell/simple-sendfile/metadata.xml b/dev-haskell/simple-sendfile/metadata.xml
index c7a91a305795..382a399478bc 100644
--- a/dev-haskell/simple-sendfile/metadata.xml
+++ b/dev-haskell/simple-sendfile/metadata.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Cross platform library for the sendfile system call.
-		This library tries to call minimum system calls which
-		are the bottleneck of web servers.
-	</longdescription>
 	<use>
 		<flag name="allow-bsd">Allow use of BSD sendfile (disable on
 		GNU/kFreeBSD)</flag>
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild
deleted file mode 100644
index 7284a66f4287..000000000000
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for the sendfile system call"
-HOMEPAGE="https://hackage.haskell.org/package/simple-sendfile"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-bsd"
-
-RESTRICT=test # openBinaryFile: does not exist (No such file or directory)
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/conduit
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network-conduit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-bsd allow-bsd)
-}
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.21.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.21.ebuild
deleted file mode 100644
index e926f8ac55e8..000000000000
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.21.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for the sendfile system call"
-HOMEPAGE="https://hackage.haskell.org/package/simple-sendfile"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-bsd"
-
-RESTRICT="test" #missing files
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/conduit
-		dev-haskell/conduit-extra
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/resourcet )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-bsd allow-bsd)
-}
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.25.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.25.ebuild
deleted file mode 100644
index 41176c325b1d..000000000000
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.25.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Cross platform library for the sendfile system call"
-HOMEPAGE="https://hackage.haskell.org/package/simple-sendfile"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-bsd"
-
-RDEPEND="dev-haskell/network:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/conduit
-		dev-haskell/conduit-extra
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/resourcet )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-bsd allow-bsd)
-}
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
index 79bf38076b5a..cb3de660fcc8 100644
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
+++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.28.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+allow-bsd"
 
 RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild
new file mode 100644
index 000000000000..2e20703f9fe4
--- /dev/null
+++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.30-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Cross platform library for the sendfile system call"
+HOMEPAGE="https://hackage.haskell.org/package/simple-sendfile"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+allow-bsd"
+
+RDEPEND="dev-haskell/network:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( dev-haskell/conduit
+		dev-haskell/conduit-extra
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/resourcet )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.30-musl-1.2.4.patch"
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag allow-bsd allow-bsd)
+}
diff --git a/dev-haskell/singleton-bool/Manifest b/dev-haskell/singleton-bool/Manifest
index 29aa5b9a31e8..65e9ad557f19 100644
--- a/dev-haskell/singleton-bool/Manifest
+++ b/dev-haskell/singleton-bool/Manifest
@@ -1 +1,2 @@
 DIST singleton-bool-0.1.5.tar.gz 3598 BLAKE2B 3825990751089e403b8056e6f8d39714b19a06dd895e422bc04c7539131d63435ac351971a400310c2ee63ae745203f64d8edbe93487557108d0e9a9ed158c80 SHA512 a2b70137f598026d0b330a5ee8265f07056e2073544f62b60cba7fec2345796f5b0d295536a536877bcb01439401047a026d8234531e27431e38701711d5df1a
+DIST singleton-bool-0.1.7.tar.gz 3974 BLAKE2B 3552910a9a65bd00983e6b21265a03f3683f905dbe3d146df515ece7344ec8b36851bb06f0e5bc96fda74cde8ebdcaef6e01ef571645ecaa522f05debe1088c8 SHA512 b926b35fb82bf3d2f1bc216ce2e15e3a9908b4a39458c39f4b171282498fd6f645c3ef0c5b10c67f2ac93cab76d45be30a8ec2dfa36d52cdb263b25229d89d58
diff --git a/dev-haskell/singleton-bool/metadata.xml b/dev-haskell/singleton-bool/metadata.xml
index b7878815d80d..f42b2a304541 100644
--- a/dev-haskell/singleton-bool/metadata.xml
+++ b/dev-haskell/singleton-bool/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">singleton-bool</remote-id>
+		<remote-id type="github">phadej/singleton-bool</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild b/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild
index 933efdd4c828..898653281d56 100644
--- a/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild
+++ b/dev-haskell/singleton-bool/singleton-bool-0.1.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/tagged-0.8.5:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
@@ -25,8 +25,6 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.16.0
 "
 
-src_prepare() {
-	default
-	cabal_chdeps \
-		'base  >=4.6   && <4.13' 'base  >=4.6'
-}
+CABAL_CHDEPS=(
+	'base  >=4.6   && <4.13' 'base  >=4.6'
+)
diff --git a/dev-haskell/singleton-bool/singleton-bool-0.1.7.ebuild b/dev-haskell/singleton-bool/singleton-bool-0.1.7.ebuild
new file mode 100644
index 000000000000..804009abfd9b
--- /dev/null
+++ b/dev-haskell/singleton-bool/singleton-bool-0.1.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Type level booleans"
+HOMEPAGE="https://github.com/phadej/singleton-bool#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/boring-0.2.1:=[profile?] <dev-haskell/boring-0.3:=[profile?]
+	>=dev-haskell/dec-0.0.5:=[profile?] <dev-haskell/dec-0.1:=[profile?]
+	>=dev-haskell/some-1.0.4:=[profile?] <dev-haskell/some-1.1:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/skein/metadata.xml b/dev-haskell/skein/metadata.xml
index 155e664ff75c..44bd9a6c0975 100644
--- a/dev-haskell/skein/metadata.xml
+++ b/dev-haskell/skein/metadata.xml
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="big-endian">When manually selecting the endianness, use big-endian (default is little-endian).</flag>
+		<flag name="force-endianness">Use a manually selected endian when compiling (see flag 'big-endian').</flag>
+		<flag name="reference">Use the reference implementation instead of the optimized one.</flag>
+	</use>
 	<longdescription>
 		Skein (&lt;http://www.skein-hash.info/&gt;) is a family of fast
 		secure cryptographic hash functions designed by Niels
 		Ferguson, Stefan Lucks, Bruce Schneier, Doug Whiting, Mihir
 		Bellare, Tadayoshi Kohno, Jon Callas and Jesse Walker.
-
+		
 		This package uses bindings to the optimized C implementation
 		of Skein.  We provide a high-level interface (see module
 		"Crypto.Skein") to some of the Skein use cases.  We also
 		provide a low-level interface (see module
 		"Crypto.Skein.Internal") should you need to use Skein in a
 		different way.
-
+		
 		Currently we have support for Skein as cryptographic hash
 		function as Skein as a message authentication code
 		(Skein-MAC).  For examples of how to use this package, see
 		"Crypto.Skein" module documentation.
+		
+		This package includes Skein v1.3. Versions of this package
+		before 1.0.0 implemented Skein v1.1.
 	</longdescription>
-	<use>
-		<flag name="big-endian">When manually selecting the endianness, use big-endian (default is little-endian)</flag>
-		<flag name="force-endianness">Use a manually selected endian when compiling (see flag 'big-endian')</flag>
-		<flag name="reference">Use the reference implementation instead of the optimized one</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">meteficha/skein</remote-id>
 	</upstream>
diff --git a/dev-haskell/skein/skein-1.0.9.4.ebuild b/dev-haskell/skein/skein-1.0.9.4.ebuild
index 8a09b98425d1..a3f1621a6ea0 100644
--- a/dev-haskell/skein/skein-1.0.9.4.ebuild
+++ b/dev-haskell/skein/skein-1.0.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="big-endian force-endianness reference"
 
 RDEPEND=">=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
diff --git a/dev-haskell/skylighting-core/Manifest b/dev-haskell/skylighting-core/Manifest
index b0366c25c958..7e9136ec80c8 100644
--- a/dev-haskell/skylighting-core/Manifest
+++ b/dev-haskell/skylighting-core/Manifest
@@ -1 +1,2 @@
-DIST skylighting-core-0.8.5.tar.gz 675746 BLAKE2B 3a17423f5412228930df78e86b00b3d0339bced0a00e801a9986177f7099e9e5706b1858e3a4064db84eeec3b0fdde3f043b05b62de85d6a92d2d47a5cbb136d SHA512 ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257
+DIST skylighting-core-0.12.3.1.tar.gz 782536 BLAKE2B 21d908bd6f3584f7b4de91f5b61f06e9e0dffdeeb4f725f73520ae6bdfbdb482995a3453ba44db212e95585f8268aeb8535fb896f78707ab49c362675e605046 SHA512 85d005dc4fa6bf968f29a1721d669a310261052c68dbe889dc053400de751a8cda3a99a9aa7d19b3921fb81ea482637fd650140776d90207b876e639a736ef19
+DIST skylighting-core-0.14.tar.gz 864021 BLAKE2B 324b5f7e429c3f7c9ec01722c3243e811311b4d25fd3360252f84d391e981d31c5b9bfb20d1c26176a37aac0c4e6b345257e6d3135124f49f40ad38c5784e4a0 SHA512 7b1ae0160c656eb38b765b9d545b065aaa07bf02acddbf74bdff42914d74b07e556df7f33e67557870d4582a0f9e871b6f4ffad4cb17082ad91bb64e89569753
diff --git a/dev-haskell/skylighting-core/files/skylighting-increase-timeouts.patch b/dev-haskell/skylighting-core/files/skylighting-increase-timeouts.patch
new file mode 100644
index 000000000000..8dce65f4c855
--- /dev/null
+++ b/dev-haskell/skylighting-core/files/skylighting-increase-timeouts.patch
@@ -0,0 +1,39 @@
+https://github.com/jgm/skylighting/pull/154
+
+From 00af1d629c2f185fd3c8d3eee55857b1325f345b Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Fri, 16 Sep 2022 10:30:35 -0400
+Subject: [PATCH] Notch up core test timeout even further
+
+On very slow/embedded cpus, 25 seconds is not sufficient (even 50
+seconds is not); I had to notch the test timeout up to 75 seconds for
+everything to pass.
+
+This disables the test timeouts completely.
+---
+ test/test-skylighting.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test-skylighting.hs b/test/test-skylighting.hs
+index a3977e72..0f05e573 100644
+--- a/test/test-skylighting.hs
++++ b/test/test-skylighting.hs
+@@ -224,8 +224,7 @@ p_no_drop cfg syntax t =
+ 
+ noDropTest :: TokenizerConfig -> [Text] -> Syntax -> TestTree
+ noDropTest cfg inps syntax =
+-  localOption (mkTimeout 25000000)
+-  $ testCase (Text.unpack (sName syntax))
++  testCase (Text.unpack (sName syntax))
+   $ mapM_ go inps
+     where go inp =
+               case tokenize cfg syntax inp of
+@@ -238,7 +237,7 @@ noDropTest cfg inps syntax =
+                       assertFailure ("Unexpected error: " ++ e ++ "\ninput = " ++ show inp)
+ 
+ tokenizerTest :: TokenizerConfig -> SyntaxMap -> Bool -> FilePath -> TestTree
+-tokenizerTest cfg sMap regen inpFile = localOption (mkTimeout 25000000) $
++tokenizerTest cfg sMap regen inpFile =
+   goldenTest testname getExpected getActual
+       (compareValues referenceFile) updateGolden
+   where testname = lang ++ " tokenizing of " ++ inpFile
diff --git a/dev-haskell/skylighting-core/metadata.xml b/dev-haskell/skylighting-core/metadata.xml
index 4dccbfb7b1c7..0482b5459a92 100644
--- a/dev-haskell/skylighting-core/metadata.xml
+++ b/dev-haskell/skylighting-core/metadata.xml
@@ -1,25 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="executable">Build the skylighting executable.</flag>
+		<flag name="executable">Build skylighting-extract tool</flag>
 	</use>
-	<longdescription>
-		Skylighting is a syntax highlighting library.
-		It derives its tokenizers from XML syntax
-		definitions used by KDE&#39;s KSyntaxHighlighting
-		framework, so any syntax supported by that
-		framework can be added. An optional command-line
-		program is provided.
-		Skylighting is intended to be the successor to
-		highlighting-kate.
-		This package provides the core highlighting
-		functionality under a permissive license. It also
-		bundles XML parser definitions licensed under the
-		GPL.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">skylighting-core</remote-id>
+		<remote-id type="github">jgm/skylighting</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild
new file mode 100644
index 000000000000..ca6dec5bf5d9
--- /dev/null
+++ b/dev-haskell/skylighting-core/skylighting-core-0.12.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+PATCHES=( "${FILESDIR}/skylighting-increase-timeouts.patch" )
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	>=dev-haskell/ansi-terminal-0.7:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	dev-haskell/case-insensitive:=[profile?]
+	>=dev-haskell/colour-2.0:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/xml-conduit-1.9.1.0:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( dev-haskell/diff
+		dev-haskell/pretty-show
+		dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		--flag=system-pcre
+}
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.14.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.14.ebuild
new file mode 100644
index 000000000000..b0dddfad41b1
--- /dev/null
+++ b/dev-haskell/skylighting-core/skylighting-core-0.14.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	dev-haskell/attoparsec:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	dev-haskell/case-insensitive:=[profile?]
+	>=dev-haskell/colour-2.0:=[profile?]
+	dev-haskell/safe:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/xml-conduit-1.9.1.3:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( dev-haskell/diff
+		dev-haskell/pretty-show
+		dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		--flag=system-pcre
+}
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.8.5.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.8.5.ebuild
deleted file mode 100644
index 97378ef65296..000000000000
--- a/dev-haskell/skylighting-core/skylighting-core-0.8.5.ebuild
+++ /dev/null
@@ -1,53 +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.4.9999
-#hackport: flags: +system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
-	>=dev-haskell/ansi-terminal-0.7:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/colour-2.0:=[profile?]
-	dev-haskell/hxt:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-pcre:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/diff
-		dev-haskell/hunit
-		dev-haskell/pretty-show
-		dev-haskell/quickcheck
-		dev-haskell/random
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		--flag=system-pcre
-}
diff --git a/dev-haskell/skylighting-format-ansi/Manifest b/dev-haskell/skylighting-format-ansi/Manifest
new file mode 100644
index 000000000000..0089f06b478c
--- /dev/null
+++ b/dev-haskell/skylighting-format-ansi/Manifest
@@ -0,0 +1 @@
+DIST skylighting-format-ansi-0.1.tar.gz 5350 BLAKE2B fa766e78e71880b13bbd81727a1f96f0d9e027c1615a3e5a3868c5a2df1349e4d2e10bb8a5f07740fba7b25b59be7381035cdbefddb9c7a8157c421b9d986c95 SHA512 387af200df34dbd83854ee268a5fa4c157d803b8f766a6da4491b8f19faef88e226027d3906a8c72cab764e53cac12637b1c7ba11b6bbb318aa0ae4dd4910d37
diff --git a/dev-haskell/skylighting-format-ansi/metadata.xml b/dev-haskell/skylighting-format-ansi/metadata.xml
new file mode 100644
index 000000000000..74050c5c598a
--- /dev/null
+++ b/dev-haskell/skylighting-format-ansi/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">skylighting-format-ansi</remote-id>
+		<remote-id type="github">jgm/skylighting</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/skylighting-format-ansi/skylighting-format-ansi-0.1.ebuild b/dev-haskell/skylighting-format-ansi/skylighting-format-ansi-0.1.ebuild
new file mode 100644
index 000000000000..2b886fa847c6
--- /dev/null
+++ b/dev-haskell/skylighting-format-ansi/skylighting-format-ansi-0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ANSI formatter for skylighting syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.7:=[profile?]
+	>=dev-haskell/colour-2.0:=[profile?]
+	dev-haskell/skylighting-core:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/skylighting-format-blaze-html/Manifest b/dev-haskell/skylighting-format-blaze-html/Manifest
new file mode 100644
index 000000000000..811a745d658a
--- /dev/null
+++ b/dev-haskell/skylighting-format-blaze-html/Manifest
@@ -0,0 +1 @@
+DIST skylighting-format-blaze-html-0.1.1.1.tar.gz 4853 BLAKE2B 686b68bb04bcc923e66a075fbcdb33ab746846c9e330f349cf550405f61f9808177facb25f5c96c4d79b300f18cba99245462b15663513d5cbf518f03de0e9b1 SHA512 0401468113e144890b28c214d28a1bee8bb3f74c67503add09539759f7bdd5860a07d1544965391c5dd68ef1f7e30bcf7880133859a7f6f92792fa0d3ea7c55a
diff --git a/dev-haskell/skylighting-format-blaze-html/metadata.xml b/dev-haskell/skylighting-format-blaze-html/metadata.xml
new file mode 100644
index 000000000000..eada8b70077b
--- /dev/null
+++ b/dev-haskell/skylighting-format-blaze-html/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">skylighting-format-blaze-html</remote-id>
+		<remote-id type="github">jgm/skylighting</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/skylighting-format-blaze-html/skylighting-format-blaze-html-0.1.1.1.ebuild b/dev-haskell/skylighting-format-blaze-html/skylighting-format-blaze-html-0.1.1.1.ebuild
new file mode 100644
index 000000000000..0b60e2137a1b
--- /dev/null
+++ b/dev-haskell/skylighting-format-blaze-html/skylighting-format-blaze-html-0.1.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HTML formatter for skylighting syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
+	dev-haskell/skylighting-core:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/skylighting-format-context/Manifest b/dev-haskell/skylighting-format-context/Manifest
new file mode 100644
index 000000000000..1d7ef1411467
--- /dev/null
+++ b/dev-haskell/skylighting-format-context/Manifest
@@ -0,0 +1 @@
+DIST skylighting-format-context-0.1.0.1.tar.gz 3154 BLAKE2B 6606345118dd3daf1deed31e5dc1bd8ea15c579d9a09c73b34e0e527bf0e00455b9fadd1a0dc92def840983300131b7a0bb2c1807fdf3c325a783cdeab33d37c SHA512 b582277924a32af40a96db0f561566b8766ffc622156823567fbec7a0515e33392afef26b8316359edf45beee5bf0da1884ae380a6a9eeb3a8ad0bec3379f3a6
diff --git a/dev-haskell/skylighting-format-context/metadata.xml b/dev-haskell/skylighting-format-context/metadata.xml
new file mode 100644
index 000000000000..118ba6eb46bb
--- /dev/null
+++ b/dev-haskell/skylighting-format-context/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">skylighting-format-context</remote-id>
+		<remote-id type="github">jgm/skylighting</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/skylighting-format-context/skylighting-format-context-0.1.0.1.ebuild b/dev-haskell/skylighting-format-context/skylighting-format-context-0.1.0.1.ebuild
new file mode 100644
index 000000000000..2df578868ddf
--- /dev/null
+++ b/dev-haskell/skylighting-format-context/skylighting-format-context-0.1.0.1.ebuild
@@ -0,0 +1,23 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="ConTeXt formatter for skylighting syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/skylighting-core:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/skylighting-format-latex/Manifest b/dev-haskell/skylighting-format-latex/Manifest
new file mode 100644
index 000000000000..ef68f8a59a3e
--- /dev/null
+++ b/dev-haskell/skylighting-format-latex/Manifest
@@ -0,0 +1 @@
+DIST skylighting-format-latex-0.1.tar.gz 3777 BLAKE2B f8e0b8deaa2652ee6423002148ee4c8153d119dec603c71f7217329d27d32c006a0504474ce55ce5e7caf3753091f63d92feac6ac55579cb4d0f1b5f7a3d2a92 SHA512 e73d7ea817e16af8c234c5260bce898ba22932641c7faa5891f902bde39be8f3faa02d2e5185b5f833747bfc57ad70aa9158b3b0c3231e10d795ff6e2be520a7
diff --git a/dev-haskell/skylighting-format-latex/metadata.xml b/dev-haskell/skylighting-format-latex/metadata.xml
new file mode 100644
index 000000000000..bf343dc90530
--- /dev/null
+++ b/dev-haskell/skylighting-format-latex/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">skylighting-format-latex</remote-id>
+		<remote-id type="github">jgm/skylighting</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/skylighting-format-latex/skylighting-format-latex-0.1.ebuild b/dev-haskell/skylighting-format-latex/skylighting-format-latex-0.1.ebuild
new file mode 100644
index 000000000000..d76e9b6d6e10
--- /dev/null
+++ b/dev-haskell/skylighting-format-latex/skylighting-format-latex-0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="LaTeX formatter for skylighting syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/skylighting-core:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/skylighting/Manifest b/dev-haskell/skylighting/Manifest
index 67169a956c96..feed0d11c934 100644
--- a/dev-haskell/skylighting/Manifest
+++ b/dev-haskell/skylighting/Manifest
@@ -1,3 +1,2 @@
-DIST skylighting-0.1.1.5.tar.gz 584235 BLAKE2B 87226657d721b1491565f6003eb0d9087edd7f25a67549bc60b219f4c0ff5a5d799a9aa1c42b087a805af235434ea288f1f659711eeb2299395ce5f976a734b2 SHA512 2d430d2067d7694978620af0c63ce47240074055bf5179b968ac2a430b9968f445307347c8975e550823f509c05ab600f07c3d1cdc7f8909bf19506e0153e3ef
-DIST skylighting-0.3.tar.gz 537701 BLAKE2B 5589aed231b25bd33160a314b5924432fe2c508bc58fbe1567d0742e19ff46784069c3e33f68888751e1c5252ead8050c7895d6fd6a05efd9588b79aee74eecf SHA512 5ecff7f3fcf244d58fa21a83ebad9358661079cd559802a7b7b888bef7969f40587f2ca80aefae5b5424e05c1fe6bc168a6df034eb843b3613f7b3fc0abedc04
-DIST skylighting-0.8.5.tar.gz 621391 BLAKE2B f17c1e729b2f669950ffec8a84bd9018acbd407f1c8c05bcbe65d77986ce72cdf55b0e967ce4070cd72e5a12fe469ee55cc3782401cc15f19da213a5fa92d592 SHA512 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f
+DIST skylighting-0.12.3.1.tar.gz 1218260 BLAKE2B 78f26d3477a6327a8e3c99f31ffe3c1d1b57c86730c06f715d8b2db9d267526bf3d0605639679fc38e4faff06e81edc3d2c9d85e7ce3c557b73f47ae8e81b999 SHA512 3eb93400612992d5aed828ebe0c1b76dbfbd7ec9cd0d0d667b524df51968997ffd429bfdbecbaa32a6108903872e119614b16f8aedf00eaf6d9a7b79ccb06c58
+DIST skylighting-0.14.tar.gz 1393626 BLAKE2B 884f990b77d38c71287486ec0c2d652bf408a21878b11cac071053616b78ea759e83cd8f4c54befdffb2d4b32dbd352e2adc5db20bfacb1209866e1992c645b1 SHA512 33d36f7181c0a6b94d3319707d6ea68199239a7699c18c6392e8ae49d97d7249f57f4d42a9fb09fa9df643268aa57b8e42e2204a6a002f8222ef00284dfd25d4
diff --git a/dev-haskell/skylighting/metadata.xml b/dev-haskell/skylighting/metadata.xml
index 45342c91c5fd..bd25baabc366 100644
--- a/dev-haskell/skylighting/metadata.xml
+++ b/dev-haskell/skylighting/metadata.xml
@@ -1,24 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
 	<use>
-		<flag name="executable">Build the skylighting executable.</flag>
+		<flag name="executable">Whether to build the skylighting program</flag>
 	</use>
-	<longdescription>
-		Skylighting is a syntax highlighting library with
-		support for over one hundred languages.  It derives
-		its tokenizers from XML syntax definitions used
-		by KDE's KSyntaxHighlighting framework, so any
-		syntax supported by that framework can be added.
-		An optional command-line program is provided.
-		Skylighting is intended to be the successor to
-		highlighting-kate.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">skylighting</remote-id>
 		<remote-id type="github">jgm/skylighting</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/skylighting/skylighting-0.1.1.5.ebuild b/dev-haskell/skylighting/skylighting-0.1.1.5.ebuild
deleted file mode 100644
index 431d710c3c2f..000000000000
--- a/dev-haskell/skylighting/skylighting-0.1.1.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -bootstrap
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/hxt:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-pcre-builtin:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	executable? ( dev-haskell/pretty-show:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/diff
-		dev-haskell/hunit
-		dev-haskell/random
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		!executable? ( dev-haskell/pretty-show ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bootstrap \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild b/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild
new file mode 100644
index 000000000000..57ac6c98fc61
--- /dev/null
+++ b/dev-haskell/skylighting/skylighting-0.12.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -bootstrap,+system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND="~dev-haskell/skylighting-core-0.12.3.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
+			dev-haskell/pretty-show:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bootstrap \
+		$(cabal_flag executable executable) \
+		--flag=system-pcre
+}
diff --git a/dev-haskell/skylighting/skylighting-0.14.ebuild b/dev-haskell/skylighting/skylighting-0.14.ebuild
new file mode 100644
index 000000000000..a7b302f95c3b
--- /dev/null
+++ b/dev-haskell/skylighting/skylighting-0.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -bootstrap,+system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND="~dev-haskell/skylighting-core-0.14:=[profile?]
+	>=dev-haskell/skylighting-format-ansi-0.1:=[profile?] <dev-haskell/skylighting-format-ansi-0.2:=[profile?]
+	>=dev-haskell/skylighting-format-blaze-html-0.1:=[profile?] <dev-haskell/skylighting-format-blaze-html-0.2:=[profile?]
+	>=dev-haskell/skylighting-format-context-0.1:=[profile?] <dev-haskell/skylighting-format-context-0.2:=[profile?]
+	>=dev-haskell/skylighting-format-latex-0.1:=[profile?] <dev-haskell/skylighting-format-latex-0.2:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
+			dev-haskell/pretty-show:=[profile?]
+			dev-haskell/text:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bootstrap \
+		$(cabal_flag executable executable) \
+		--flag=system-pcre
+}
diff --git a/dev-haskell/skylighting/skylighting-0.3.ebuild b/dev-haskell/skylighting/skylighting-0.3.ebuild
deleted file mode 100644
index 5f3bfabca52d..000000000000
--- a/dev-haskell/skylighting/skylighting-0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -bootstrap,+system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/hxt:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/regex-pcre:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	executable? ( dev-haskell/pretty-show:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/diff
-		dev-haskell/hunit
-		dev-haskell/random
-		dev-haskell/tasty
-		dev-haskell/tasty-golden
-		dev-haskell/tasty-hunit
-		!executable? ( dev-haskell/pretty-show ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bootstrap \
-		$(cabal_flag executable executable) \
-		--flag=system-pcre
-}
diff --git a/dev-haskell/skylighting/skylighting-0.8.5.ebuild b/dev-haskell/skylighting/skylighting-0.8.5.ebuild
deleted file mode 100644
index d6f9599badda..000000000000
--- a/dev-haskell/skylighting/skylighting-0.8.5.ebuild
+++ /dev/null
@@ -1,36 +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.4.9999
-#hackport: flags: -bootstrap,+system-pcre
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="syntax highlighting library"
-HOMEPAGE="https://github.com/jgm/skylighting"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND="~dev-haskell/skylighting-core-0.8.5:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
-			dev-haskell/pretty-show:=[profile?]
-			dev-haskell/text:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bootstrap \
-		$(cabal_flag executable executable) \
-		--flag=system-pcre
-}
diff --git a/dev-haskell/smallcheck/Manifest b/dev-haskell/smallcheck/Manifest
index 481437e18439..542c73011ebd 100644
--- a/dev-haskell/smallcheck/Manifest
+++ b/dev-haskell/smallcheck/Manifest
@@ -1,2 +1,2 @@
-DIST smallcheck-1.1.1.tar.gz 15202 BLAKE2B 7963a39b9a08b3c28268b88a8177df7861011baeb4ba8a5dc879c95111c9d243cbe14f36b82715e80b237d04f5acedfaa7c72cc6d0fa2bd4d770158301f3626e SHA512 09aa5dcfca2bece6ac91803d38f2591d415c6e312c76cacb33d2e93e40e949acb788bc89ba6a4beb9dc60815e1f554cda4f68195269eedbfb45228415f1bca64
-DIST smallcheck-1.1.5.tar.gz 16338 BLAKE2B 823e2ae06f082f2f377e1520bb0886acd6bc133cc443cb10e8aa468a282ec0e19e2c31b8720c798c958d228784523cebfe692d945cbbf2123cec4542684c5945 SHA512 6d97f91308146031a16a405391ec2b283ad719c0acc2a0672c22cc880d91c3d72f845f65897e36945c45746d2d705a9f9f16b1ff5fef1f39c9abb60a4e57430c
+DIST smallcheck-1.2.0.tar.gz 19047 BLAKE2B 4ecd56b2e0680b4d4e7f80c1c13b9a3a621cae32ec4a8d0605c57fb2bc4882df5f3df05068caf76644286ccd4345fd49f26a73b81f399ca19d1e2200acf0912f SHA512 97c021f3efd6541de99854cb2e8511d4af17225cbcbe17ddfb2efd011d75bd10114b7c8312532bd1c5516e2980b7ad03feb571ec26b91f7258f43460c7bc39a8
+DIST smallcheck-1.2.1.tar.gz 18932 BLAKE2B df248fb94e06eccc1d95ca168a47ecc7ac2853b889b3e778ee36843e5f76caa14dc90182b228610c7a3a24993bb8464ad2ff80f33aa95725b125d54d7b59f6f2 SHA512 42706fb769423bd7f8c2fe7a52d23b8cb4a22bfaabf43b8c29db2923c6413191158801e43d5597258f42ce2430ec81546d172d90246c9d3cf0f9343694eb5eeb
diff --git a/dev-haskell/smallcheck/metadata.xml b/dev-haskell/smallcheck/metadata.xml
index ed9043f55a28..97abb8fcef64 100644
--- a/dev-haskell/smallcheck/metadata.xml
+++ b/dev-haskell/smallcheck/metadata.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		SmallCheck is similar to QuickCheck (Claessen and Hughes 2000-) but
-		instead of testing for a sample of randomly generated values, SmallCheck
-		tests properties for all the finitely many values up to some depth,
-		progressively increasing the depth used.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">feuerbach/smallcheck</remote-id>
+		<remote-id type="github">Bodigrim/smallcheck</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild b/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild
deleted file mode 100644
index 96be9215b79d..000000000000
--- a/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A property-based testing library"
-HOMEPAGE="https://github.com/feuerbach/smallcheck"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/logict:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/smallcheck/smallcheck-1.1.5.ebuild b/dev-haskell/smallcheck/smallcheck-1.1.5.ebuild
deleted file mode 100644
index 7400870c6b12..000000000000
--- a/dev-haskell/smallcheck/smallcheck-1.1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A property-based testing library"
-HOMEPAGE="https://github.com/feuerbach/smallcheck"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/logict:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/nats:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild b/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild
new file mode 100644
index 000000000000..af2f2cb6e783
--- /dev/null
+++ b/dev-haskell/smallcheck/smallcheck-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A property-based testing library"
+HOMEPAGE="https://github.com/Bodigrim/smallcheck"
+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/logict:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/nats:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/void:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/smallcheck/smallcheck-1.2.1.ebuild b/dev-haskell/smallcheck/smallcheck-1.2.1.ebuild
new file mode 100644
index 000000000000..439d74f19d08
--- /dev/null
+++ b/dev-haskell/smallcheck/smallcheck-1.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A property-based testing library"
+HOMEPAGE="https://github.com/Bodigrim/smallcheck"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/logict:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/nats:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/void:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/snap-core/Manifest b/dev-haskell/snap-core/Manifest
deleted file mode 100644
index 24e0c5754d89..000000000000
--- a/dev-haskell/snap-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST snap-core-1.0.1.0.tar.gz 139670 BLAKE2B 13c0839ef95b2260e1272dbf26c9ee1f8970094e3f9ffea728d760f4bf11a260ad73120495a39305e8d8d05cb39c230db08ae1e4094efcaf7879acf4680f61c3 SHA512 ed862530f235adca6f193c96d45b31705534089c58637bf8d0d9d8cd898db8f25494990e210151adc737c34e3cc59f5e0a47cc6b1e638dae9104e991e27dbe8b
-DIST snap-core-1.0.4.2.tar.gz 163146 BLAKE2B 2fc037fa239eed3771c84ede4ed247f34169fb45464f5724e7d770baa0992409eeff4b066a9eaea3cdebf46a9846dd8ac94dab42deb36047bb26654df5642f9b SHA512 42e710ac58a7d3cf58f9fdeca6c9c4880a94765ee0dc42fbcdaf68a6c2c337e1715f8b89863c7f911232af493bf5622b647d4c962237f211f97d731572fd94f5
diff --git a/dev-haskell/snap-core/metadata.xml b/dev-haskell/snap-core/metadata.xml
deleted file mode 100644
index f00884306e68..000000000000
--- a/dev-haskell/snap-core/metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="portable">No non-haskell unportable code.</flag>
-	</use>
-	<longdescription>
-		Snap is a simple and fast web development framework and server written in
-		Haskell. For more information or to download the latest version, you can
-		visit the Snap project website at &lt;http://snapframework.com/&gt;.
-		
-		This library contains the core definitions and types for the Snap framework,
-		including:
-		
-		1. Primitive types and functions for HTTP (requests, responses, cookies,
-		post/query parameters, etc)
-		
-		2. Type aliases and helper functions for Iteratee I/O
-		
-		3. A monad for programming web handlers called \"Snap\", inspired by
-		happstack's (&lt;http://happstack.com/index.html&gt;), which allows:
-		
-		* Stateful access to the HTTP request and response objects
-		
-		* Monadic failure (i.e. MonadPlus/Alternative instances) for declining
-		to handle requests and chaining handlers together
-		
-		* Early termination of the computation if you know early what you want
-		to return and want to prevent further monadic processing
-		
-		/Quick start/: The 'Snap' monad and HTTP definitions are in "Snap.Core",
-		some iteratee utilities are in "Snap.Iteratee".
-		
-		Higher-level facilities for building web applications (like user/session
-		management, component interfaces, data modeling, etc.) are planned but not
-		yet implemented, so this release will mostly be of interest for those who:
-		
-		* need a fast and minimal HTTP API at roughly the same level of abstraction
-		as Java servlets, or
-		
-		* are interested in contributing to the Snap Framework project.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild b/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild
deleted file mode 100644
index ef5432515143..000000000000
--- a/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
-	>=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?]
-	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
-	!portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hashable
-		>=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild b/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
deleted file mode 100644
index 0a9b8c777f02..000000000000
--- a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
+++ /dev/null
@@ -1,61 +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.5.9999
-#hackport: flags: +network-uri
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/hashable-1.2.0.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
-	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?]
-	>=dev-haskell/readable-0.1:=[profile?] <dev-haskell/readable-0.4:=[profile?]
-	>=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
-	>=dev-haskell/unix-compat-0.3:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
-	>=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] )
-	!portable? ( >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		--flag=network-uri \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-server/Manifest b/dev-haskell/snap-server/Manifest
deleted file mode 100644
index b85b75814252..000000000000
--- a/dev-haskell/snap-server/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST snap-server-1.0.1.1.tar.gz 73893 BLAKE2B 35b907d285c099059ec5d1f288252a5e4086d20cf0c81f6992e4d0977340474e2123e8c48cc416c9483f4dcc919a0acd37a73f286f8db84aec546e36912ac422 SHA512 bf3496123c07432cefedc6b03de5f335bb9b3a1e917bac45c0ee6b8d7529a3013d19d21433ce02d3f3caa2091abf0a4415b974470317804d70dfb8c9d46b33bd
-DIST snap-server-1.1.1.2.tar.gz 73645 BLAKE2B 29215ce7f542c56be40ce40711f04f7f0b2ccb568903483dbf99950b3ec7703505440cabcf70d0c6084991fe09931e6312b59b48da5511b407df02318b551600 SHA512 a11bb92ce8774269704ce8c045bddf4aad15816cfb447453e8010bfce7aff2a08b38d3c99a400ab3882cb9e0b2f0b1f9af69adc56c1b28df53dc3fdd44042e30
diff --git a/dev-haskell/snap-server/metadata.xml b/dev-haskell/snap-server/metadata.xml
deleted file mode 100644
index ebe4d9a5fb29..000000000000
--- a/dev-haskell/snap-server/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="build-pong">Build a server that just returns "PONG"</flag>
-		<flag name="openssl">enable https support using <pkg>dev-haskell/hsopenssl</pkg></flag>
-		<flag name="portable">no non-haskell unportable code.</flag>
-	</use>
-	<longdescription>
-		Snap is a simple and fast web development framework and server written in
-		Haskell. For more information or to download the latest version, you can
-		visit the Snap project website at &lt;http://snapframework.com/&gt;.
-		
-		The Snap HTTP server is a high performance, epoll-enabled, iteratee-based web
-		server library written in Haskell. Together with the @snap-core@ library upon
-		which it depends, it provides a clean and efficient Haskell programming
-		interface to the HTTP protocol.
-		
-		Higher-level facilities for building web applications (like user/session
-		management, component interfaces, data modeling, etc.) are planned but not
-		yet implemented, so this release will mostly be of interest for those who:
-		
-		* need a fast and minimal HTTP API at roughly the same level of abstraction
-		as Java servlets, or
-		
-		* are interested in contributing to the Snap Framework project.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild b/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
deleted file mode 100644
index d5722fa906b6..000000000000
--- a/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A web server for the Snap Framework"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-pong debug openssl portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.8:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
-			>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2
-		>=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9
-		>=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1
-		>=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/threads-0.5 <dev-haskell/threads-0.6
-		>=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory                           >= 1.0      && < 1.3' 'directory                           >= 1.0' \
-		'directory                           >= 1.1      && < 1.3' 'directory                           >= 1.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-pong build-pong) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag openssl openssl) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild b/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
deleted file mode 100644
index 4cebd1763301..000000000000
--- a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
+++ /dev/null
@@ -1,63 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, iteratee-based, epoll-enabled web server for the Snap Framework"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="build-pong debug openssl portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/case-insensitive-1.1:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
-	>=dev-haskell/clock-0.7.1:=[profile?] <dev-haskell/clock-0.9:=[profile?]
-	>=dev-haskell/io-streams-1.3:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
-	>=dev-haskell/io-streams-haproxy-1.0:=[profile?] <dev-haskell/io-streams-haproxy-1.1:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?] <dev-haskell/lifted-base-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/snap-core-1.0:=[profile?] <dev-haskell/snap-core-1.1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.6.2:=
-	openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
-			>=dev-haskell/openssl-streams-1.1:=[profile?] <dev-haskell/openssl-streams-1.3:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/base16-bytestring-0.1 <dev-haskell/base16-bytestring-0.2
-		>=dev-haskell/http-common-0.7 <dev-haskell/http-common-0.9
-		>=dev-haskell/http-streams-0.7 <dev-haskell/http-streams-0.9
-		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/monad-control-1.0 <dev-haskell/monad-control-1.1
-		>=dev-haskell/parallel-3 <dev-haskell/parallel-4
-		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
-		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/threads-0.5 <dev-haskell/threads-0.6
-		>=dev-haskell/transformers-0.3 <dev-haskell/transformers-0.6 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag build-pong build-pong) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag openssl openssl) \
-		$(cabal_flag portable portable)
-}
diff --git a/dev-haskell/socks/Manifest b/dev-haskell/socks/Manifest
index c9caa6a9b8d8..673703af5334 100644
--- a/dev-haskell/socks/Manifest
+++ b/dev-haskell/socks/Manifest
@@ -1,3 +1 @@
-DIST socks-0.5.4.tar.gz 8021 BLAKE2B 46496752c8ef776a3a54263a11f8c0ad5912af778ec2121ccda317334b597a9d33973fb81784d31e41ac9904cdeeee024cab2abcc9c5428fc42d923bd36bad26 SHA512 eba119e40e521f963ed779f8247832bd54db7c57267f433b89a57f72395eb212231d51fb5c56bb910185bc273aaee1044999fa781ad31da56e6d0ec03f07e783
-DIST socks-0.5.5.tar.gz 10159 BLAKE2B 36f9c43fe0f406bf88cc24a3a2d73205e7bd102a870dd2f02aa5c0301577e9fd97737571e362e34253bf25e813aa2cc5c7f618c0f4d7753e20eede82a098884a SHA512 cc811d0175d9a20c0aaec2eb593145908d25792f2ad5fb6b129564922bf8b64c3cda6b1424ac7e8ad2abfd1bcde7ece7ab717550266b75a5b360b4b729a768f5
 DIST socks-0.6.1.tar.gz 9759 BLAKE2B 6a7e14d87274b97bf709b6e154e6ec5835fd16e24fcde6857020139bc31553203c1eb24d244adfce54e34500df1e6d21b9f440160bbf0d992c885792b9443491 SHA512 ff56c1b356491e36888f9c1b4187fbd0d00485692960a27ec2f03dbd3c3fb961869d99da1f7a301578ab07df30739d8a0d4ae3c7559c83d0e2493d5de158175b
diff --git a/dev-haskell/socks/metadata.xml b/dev-haskell/socks/metadata.xml
index 79064c2dbc46..33d4399c05dc 100644
--- a/dev-haskell/socks/metadata.xml
+++ b/dev-haskell/socks/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Socks proxy (version 5) implementation.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/hs-socks</remote-id>
 	</upstream>
diff --git a/dev-haskell/socks/socks-0.5.4.ebuild b/dev-haskell/socks/socks-0.5.4.ebuild
deleted file mode 100644
index e983e17c91d6..000000000000
--- a/dev-haskell/socks/socks-0.5.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Socks proxy (version 5) implementation"
-HOMEPAGE="https://github.com/vincenthz/hs-socks"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/socks/socks-0.5.5.ebuild b/dev-haskell/socks/socks-0.5.5.ebuild
deleted file mode 100644
index 06a8481dd882..000000000000
--- a/dev-haskell/socks/socks-0.5.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Socks proxy (version 5) implementation"
-HOMEPAGE="https://github.com/vincenthz/hs-socks"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cereal-0.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/socks/socks-0.6.1.ebuild b/dev-haskell/socks/socks-0.6.1.ebuild
index 1ca6acd551eb..0b1614ba5f7d 100644
--- a/dev-haskell/socks/socks-0.6.1.ebuild
+++ b/dev-haskell/socks/socks-0.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/basement:=[profile?]
diff --git a/dev-haskell/some/Manifest b/dev-haskell/some/Manifest
new file mode 100644
index 000000000000..1a6a770766d0
--- /dev/null
+++ b/dev-haskell/some/Manifest
@@ -0,0 +1 @@
+DIST some-1.0.5.tar.gz 10917 BLAKE2B 3acf2a7fc75466a343f0d6030b7d5357de0a351b64f50556dab65ac618d1c3eaac6f5f2128f1c1a4becf11d45f70bee00f0214f79aa0495f2c309d13381b0bef SHA512 17b316d074c1afb755440c0284bb40e0f2ad9229ff10f991c28259786f97d214d271a05d1b603ccccbaab1e9fe6523091293773d14529bd5622c2f71e30d8763
diff --git a/dev-haskell/some/metadata.xml b/dev-haskell/some/metadata.xml
new file mode 100644
index 000000000000..e9b6d1f84d77
--- /dev/null
+++ b/dev-haskell/some/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<use>
+		<flag name="newtype-unsafe">Use implementation using @newtype@ and unsafe @Any@, instead of GADT</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">some</remote-id>
+		<remote-id type="github">haskellari/some</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/some/some-1.0.5.ebuild b/dev-haskell/some/some-1.0.5.ebuild
new file mode 100644
index 000000000000..e5083536c7cc
--- /dev/null
+++ b/dev-haskell/some/some-1.0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Existential type: Some"
+HOMEPAGE="https://github.com/haskellari/some"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+newtype-unsafe"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag newtype-unsafe newtype-unsafe)
+}
diff --git a/dev-haskell/sop-core/Manifest b/dev-haskell/sop-core/Manifest
index b0ee8f52ff3f..ad3be3650bb8 100644
--- a/dev-haskell/sop-core/Manifest
+++ b/dev-haskell/sop-core/Manifest
@@ -1 +1 @@
-DIST sop-core-0.5.0.1.tar.gz 28666 BLAKE2B 66e40ecddf994165a37c7aa6d6d06cff3a114b15ca380fadef135df6fd19e3aa31c8602b2e58fa794ce4dce0e10fe8fce17e8d9e1f06dd30f0610aec7e1f32d9 SHA512 2866e7c1a29a5585dabdbd6399e5df4003f21dd94d7b9a1b93681c53e1106af528cfd24dab0b918b36d73d0b05db6525201ea3213ab90575c242557ac41d80bd
+DIST sop-core-0.5.0.2.tar.gz 28505 BLAKE2B ec478dd47a6eae08a3b3a462c179fd867e592910dfac1b2d20a5a2f27f565fab15611a3b5a041b89c9284f8499fbafdb75ab1ce63dc7880afd76dbb78e11fc88 SHA512 bf71bc1823c567bc82c3a5a3166cbb4f4826149d66ec0871d11706512ce823b40ce6ce210cc5ba763a423a8d643b1819237e9b7f0950e901d445e05ccd78597b
diff --git a/dev-haskell/sop-core/metadata.xml b/dev-haskell/sop-core/metadata.xml
index 7e93c91ee66a..5e0ac283c468 100644
--- a/dev-haskell/sop-core/metadata.xml
+++ b/dev-haskell/sop-core/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild b/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild
deleted file mode 100644
index 3ac7fc12a23c..000000000000
--- a/dev-haskell/sop-core/sop-core-0.5.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="True Sums of Products"
-HOMEPAGE="http://hackage.haskell.org/package/sop-core"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/sop-core/sop-core-0.5.0.2.ebuild b/dev-haskell/sop-core/sop-core-0.5.0.2.ebuild
new file mode 100644
index 000000000000..62b32628feaa
--- /dev/null
+++ b/dev-haskell/sop-core/sop-core-0.5.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 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="True Sums of Products"
+HOMEPAGE="https://hackage.haskell.org/package/sop-core"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+CABAL_CHDEPS=(
+	'base                 >= 4.9  && < 4.17' 'base                 >= 4.9'
+)
diff --git a/dev-haskell/split/Manifest b/dev-haskell/split/Manifest
index 3fe4f885a311..0a9da7763ad1 100644
--- a/dev-haskell/split/Manifest
+++ b/dev-haskell/split/Manifest
@@ -1,5 +1,2 @@
-DIST split-0.2.2.tar.gz 14666 BLAKE2B 77ec6491edaff1e0de17567694e9b34bedf837462bd47e696b8f1e4f3c6610a4ea13e08fd7f11101d7a5941807cf82c260ea6ebff692a7811e696c02079fba68 SHA512 d3e1a0d875632d15b12c0e454188382b705f2b9d93cb99d64f0a2a150ee7b7458628eff95da7da5f51fe9ed4ef3bd8ef3640f925f66e8f6f61253f679326614e
-DIST split-0.2.3.1.tar.gz 15623 BLAKE2B aed85fbcb6e1c7aee14f3d4517fce632f3fa95bf63f13f46d454e3dc64f4c88d970e6253a891b184e79e981bd3a9c7eee08cacb9268b7dfb1624fbb4639113ac SHA512 7b56be09279c1279120631a75bb5305bfdd6c351d582174a326985a7a630933aab747f32dd9d4ef13c81528255fe95337488f6a9117c259fe967189651828fce
-DIST split-0.2.3.3.tar.gz 15681 BLAKE2B ef395e623527b07f11d8b13d330c301870bb4e7fc96af4fd10c1708c0639b67b0d0b501962464b22371e6cdfdeeaa6ef26c299176ec20581e3518d5376fe24fd SHA512 40283ee2f5e2ab56207b05a1a7bc7de114ae0da52dc37ed32bd4e1dd3a3baa8d3346fed04af979fa5fc263b931c0b830832c0cad69e98d151f5550542af6f475
 DIST split-0.2.3.4.tar.gz 15942 BLAKE2B a4133badeadcf172901756f23e73490dfc4dce5ac7dda348fc38e4d33c43edb0509262e16b88d5d81e192a5c3d842e3fd3e2c8c135607b2a19efd9d48715d45f SHA512 a60566106a5f285224b0d555d30b2af3315c707012f5c8e9384d4b8216894e6a6263e838b0e367418c4f8bfb5f4f2cc056ca14acb6b27a5ca3446576b057ca15
-DIST split-0.2.3.tar.gz 15545 BLAKE2B d0494d299a9d6d109bfcca3f5e2f86d80357abd68038595cb94873a1b0eb0fd11ccad5439b67dde611d11c45118168a56376ec074ee2a5080ba4257694f06ea2 SHA512 bd0181b419326219d6ebad1a45683c8ff55d5e485bd669ef76e76690ebdcceddab2b8bc98616b7034de9622d54c6825200aede99e37f376e67f71bf242b1cece
+DIST split-0.2.3.5.tar.gz 15746 BLAKE2B 2b96d16dd6128447d2f082930973e17d105515610e66ff2f8afbd0e92aa60b9836520240f0ba1d7b030a2e544ef0eba6ace6d87f430601dee270da0a1799082a SHA512 a88ff185d0e3ae4908911b70475831baa01ba6cce74fe187ed47dccb28a06b83ca9ec03fa980b77aced75c38fa1dede5166c839c3bfd7f30585ae9b45157a8b9
diff --git a/dev-haskell/split/metadata.xml b/dev-haskell/split/metadata.xml
index bb03bef0c0ef..0844e8f6396e 100644
--- a/dev-haskell/split/metadata.xml
+++ b/dev-haskell/split/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Combinator library and utility functions for splitting lists.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">split</remote-id>
+		<remote-id type="github">byorgey/split</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/split/split-0.2.2.ebuild b/dev-haskell/split/split-0.2.2.ebuild
deleted file mode 100644
index 7547c9fe3bbf..000000000000
--- a/dev-haskell/split/split-0.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="https://hackage.haskell.org/package/split"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		test? ( >=dev-haskell/quickcheck-2.4
-		)"
-
-src_prepare() {
-	cabal_chdeps \
-		'base <4.8' 'base'
-}
diff --git a/dev-haskell/split/split-0.2.3.1.ebuild b/dev-haskell/split/split-0.2.3.1.ebuild
deleted file mode 100644
index 73c2e6cb2829..000000000000
--- a/dev-haskell/split/split-0.2.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="https://hackage.haskell.org/package/split"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/split/split-0.2.3.3.ebuild b/dev-haskell/split/split-0.2.3.3.ebuild
deleted file mode 100644
index da1272b7eaef..000000000000
--- a/dev-haskell/split/split-0.2.3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="https://hackage.haskell.org/package/split"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base <4.12' 'base'
-}
diff --git a/dev-haskell/split/split-0.2.3.4.ebuild b/dev-haskell/split/split-0.2.3.4.ebuild
index 1025a9e0be4e..d220535d29ce 100644
--- a/dev-haskell/split/split-0.2.3.4.ebuild
+++ b/dev-haskell/split/split-0.2.3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="http://hackage.haskell.org/package/split"
+HOMEPAGE="https://hackage.haskell.org/package/split"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -24,9 +24,6 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-haskell/quickcheck-2.4 )
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base < 4.15' 'base < 5'
-}
+CABAL_CHDEPS=(
+	'base < 4.15' 'base < 5'
+)
diff --git a/dev-haskell/split/split-0.2.3.5.ebuild b/dev-haskell/split/split-0.2.3.5.ebuild
new file mode 100644
index 000000000000..53a618932e4d
--- /dev/null
+++ b/dev-haskell/split/split-0.2.3.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Combinator library for splitting lists"
+HOMEPAGE="https://hackage.haskell.org/package/split"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/quickcheck-2.4 )
+"
diff --git a/dev-haskell/split/split-0.2.3.ebuild b/dev-haskell/split/split-0.2.3.ebuild
deleted file mode 100644
index 735ea7d7d3c2..000000000000
--- a/dev-haskell/split/split-0.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Combinator library for splitting lists"
-HOMEPAGE="https://hackage.haskell.org/package/split"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RESTRICT=test # test fail when quickcheck exhausted search space
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.4 )
-"
diff --git a/dev-haskell/splitmix/Manifest b/dev-haskell/splitmix/Manifest
index e5d4f6bcb517..fa1b5e7322e8 100644
--- a/dev-haskell/splitmix/Manifest
+++ b/dev-haskell/splitmix/Manifest
@@ -1 +1,3 @@
-DIST splitmix-0.0.4.tar.gz 13821 BLAKE2B 15c2f3b783b98deccf31e2501ba6c67788047ad3bf5c29fbba965c1163506d0055e94bc02894f17df088e67921447893f42a85f5eece7828625d75c177837f43 SHA512 9b8c137067497b94a460d024e1f7c3269e27536f505649face85748a0aaea273d32893a806d9ecf551bd29532ed820004ed2dde47e1099afc3c31519ea5cdbac
+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
diff --git a/dev-haskell/splitmix/metadata.xml b/dev-haskell/splitmix/metadata.xml
index 07dd5f4f5b23..5dfa6c440d86 100644
--- a/dev-haskell/splitmix/metadata.xml
+++ b/dev-haskell/splitmix/metadata.xml
@@ -1,36 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name='optimised-mixer'>Use JavaScript for mix32</flag>
-		<flag name='random'>Providen RandomGen SMGen instance</flag>
+		<flag name="optimised-mixer">Use JavaScript for mix32</flag>
 	</use>
-	<longdescription>
-		Pure Haskell implementation of SplitMix described in
-		
-		Guy L. Steele, Jr., Doug Lea, and Christine H. Flood. 2014.
-		Fast splittable pseudorandom number generators. In Proceedings
-		of the 2014 ACM International Conference on Object Oriented
-		Programming Systems Languages &amp; Applications (OOPSLA &#39;14). ACM,
-		New York, NY, USA, 453-472. DOI:
-		&lt;https://doi.org/10.1145/2660193.2660195&gt;
-		
-		The paper describes a new algorithm /SplitMix/ for /splittable/
-		pseudorandom number generator that is quite fast: 9 64 bit arithmetic/logical
-		operations per 64 bits generated.
-		
-		/SplitMix/ is tested with two standard statistical test suites (DieHarder and
-		TestU01, this implementation only using the former) and it appears to be
-		adequate for &quot;everyday&quot; use, such as Monte Carlo algorithms and randomized
-		data structures where speed is important.
-		
-		In particular, it __should not be used for cryptographic or security applications__,
-		because generated sequences of pseudorandom values are too predictable
-		(the mixing functions are easily inverted, and two successive outputs
-		suffice to reconstruct the internal state).
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">splitmix</remote-id>
+		<remote-id type="github">haskellari/splitmix</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/splitmix/splitmix-0.0.4.ebuild b/dev-haskell/splitmix/splitmix-0.0.4.ebuild
deleted file mode 100644
index a64e70868908..000000000000
--- a/dev-haskell/splitmix/splitmix-0.0.4.ebuild
+++ /dev/null
@@ -1,33 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # circular deps: test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast Splittable PRNG"
-HOMEPAGE="http://hackage.haskell.org/package/splitmix"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimised-mixer +random"
-
-RESTRICT=test # circular deps: dev-haskell/splitmix[test]->dev-haskell/base-compat-batteries->dev-haskell/quickcheck->dev-haskell/splitmix
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	random? ( >=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag optimised-mixer optimised-mixer) \
-		$(cabal_flag random random)
-}
diff --git a/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
new file mode 100644
index 000000000000..dfc77b48ea85
--- /dev/null
+++ b/dev-haskell/splitmix/splitmix-0.1.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast Splittable PRNG"
+HOMEPAGE="https://hackage.haskell.org/package/splitmix"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+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}
+	>=dev-haskell/cabal-1.10"
+	# test? ( >=dev-haskell/async-2.2.1 <dev-haskell/async-2.3
+	# 	>=dev-haskell/base-compat-0.11.1 <dev-haskell/base-compat-0.12
+	# 	>=dev-haskell/base-compat-batteries-0.10.5 <dev-haskell/base-compat-batteries-0.12
+	# 	dev-haskell/random
+	# 	>=dev-haskell/test-framework-0.8.2.0 <dev-haskell/test-framework-0.9
+	# 	>=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
+	# 	>=dev-haskell/tf-random-0.5 <dev-haskell/tf-random-0.6
+	# 	>=dev-haskell/vector-0.11.0.0 <dev-haskell/vector-0.13
+	# 	|| ( ( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 )
+	# 		~dev-haskell/hunit-1.3.1.2 )
+	# 	|| ( ( >=dev-haskell/math-functions-0.3.3.0 <dev-haskell/math-functions-0.4 )
+	# 		~dev-haskell/math-functions-0.1.7.0 ) )
+#"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag optimised-mixer optimised-mixer)
+}
diff --git a/dev-haskell/splitmix/splitmix-0.1.0.4.ebuild b/dev-haskell/splitmix/splitmix-0.1.0.4.ebuild
new file mode 100644
index 000000000000..48d360d55c5c
--- /dev/null
+++ b/dev-haskell/splitmix/splitmix-0.1.0.4.ebuild
@@ -0,0 +1,52 @@
+# 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=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast Splittable PRNG"
+HOMEPAGE="https://hackage.haskell.org/package/splitmix"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="optimised-mixer"
+
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/async-2.2.1 <dev-haskell/async-2.3
+		>=dev-haskell/base-compat-0.11.1 <dev-haskell/base-compat-0.13
+		>=dev-haskell/base-compat-batteries-0.10.5 <dev-haskell/base-compat-batteries-0.13
+		>=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7
+		>=dev-haskell/math-functions-0.3.3.0 <dev-haskell/math-functions-0.4
+		|| ( dev-lang/ghc ( >=dev-haskell/process-1.0.1.5 <dev-haskell/process-1.7 ) )
+		dev-haskell/random
+		>=dev-haskell/test-framework-0.8.2.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/tf-random-0.5 <dev-haskell/tf-random-0.6
+		>=dev-haskell/vector-0.11.0.0 <dev-haskell/vector-0.13
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag optimised-mixer optimised-mixer)
+}
diff --git a/dev-haskell/stack-bin/Manifest b/dev-haskell/stack-bin/Manifest
deleted file mode 100644
index 856e6f072564..000000000000
--- a/dev-haskell/stack-bin/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST stack-1.5.1-linux-arm.tar.gz 16542317 BLAKE2B 73a5bd6d6b09b67fea3edaf1a37e31f26afca2026e5fa6fc00639f0fdfd30af39b947261abf9fd21d30627b803de2ccd181f87c5f0f2b8253537ba869c10be21 SHA512 efb3d8eff4b4f8381364ab397298c6879e4ef3f6cdba799306696f961031f31e301b68f140624f0b6e7a0cb5d2bba02eb953203c1b7ab4a6a42d6368c8b39a29
-DIST stack-1.5.1-linux-i386.tar.gz 11546331 BLAKE2B e49aa708887fcf94e7990b1a8a8dd0e3c4b9fdf7ebbf0ce787c8334d6f81886c3518e5d9c997ad0ecde558e210abcaed7c8471a5348eda16f0dcdf70000232c1 SHA512 f8b640d74ab013426a60d3bc6a8a190acad48439e7e80c33517c5904cf818e9d988e7b84dcd0fba15e24013887849c3d56ab7655a4bb549ee292058a00f14e12
-DIST stack-1.5.1-linux-x86_64.tar.gz 11788896 BLAKE2B 379c31e6afe179e23cca928f9c3163b57e8ef8dfd4f9ac77a7cb4f4f898c2d47d846adab1c35a2637eac04ca0a066ade805e34952e7da8afa2a0edd72238a782 SHA512 837190e769e33d95a7f7d105884b82fb1ace47d84534c017ba44019d8a5335728d13f1e6c5a3591ee542172734ae2ed49d2f9ab3f19b25963a01d001fc24f1b3
-DIST stack-1.6.1-linux-arm.tar.gz 16560843 BLAKE2B 863e519ba19dd59dd08485b377e42e73554de1d548f4e26d4ebf175ca1cc06ed4b75c66bc798a88b5086eaa5e3552994c054edc29de760b5b477c3123f508df4 SHA512 4db9d962af8765ede290b5ebdb6c66a164f513ebfc05db715cd4dca70cad79846e17a48027ecce008939ecbf645d643f9497a4d53fe4d76a82ca94876a800fae
-DIST stack-1.6.1-linux-i386.tar.gz 12623620 BLAKE2B 2db8c645ab6b8ff70a469c70cbf15d252c7d30d302c8dcc1f017129f297231e358a9764f188b03b7b914ba22a15339e72a6e639397879cd8a331ce44a047f112 SHA512 8f2998a6b2f9b4764f14520ecf0c02225513c4bda7d7442e97c5595bf09a6fc09c15a45de0d096a563b4a3705f4b2d1fbf6bf9b771db52991d61134319074642
-DIST stack-1.6.1-linux-x86_64.tar.gz 12989288 BLAKE2B 44625d81410bd80ea0879e639a5b49d369939e3e3e01751061f25a5ce516ef3938e7b44f367be6851c77ae562a6846328bc9708a698b4417e5d215bffa584944 SHA512 dbd07448fa06e2020651be1dcdb39b383dfa6d207fbc9c63ac7744f3055416020fbe6b26203c43668fad01a8036237da84778057486b1edeec32f7eb66b2239e
-DIST stack-1.7.1-linux-arm.tar.gz 15818359 BLAKE2B 3493a09f7685acfa7fe7930c2a33d24c36b74ed345a3877967154a5d48b1d65a19dfaea07b3d5db2e2cd23189eff64f5f2efb1777d5aac891c9d1254df431235 SHA512 aee7da80a8d061c5cc61ce33f138ccc14c4fa1a1f2e12f75fe0f0ef77afe1a33bc631eae4caacdb8c200793719655c588bd31a35a168480eb31bce89cd0e4db2
-DIST stack-1.7.1-linux-i386.tar.gz 13600712 BLAKE2B 1f5f2278f609aa5405b4be9726d1bd657bd3e409cb716ec07d7716bd1db4625283df708d84f465fb5a028c4467678c26fa0fb302d7e88c7d66b4e8f366481541 SHA512 02eeee457e5d62fe16cd610272ac504d226b680b944e1ab0cf03781838518f3afb41f486abdf254a042f931177ab4ecf01141b0d1cf1787ea938df113a51e5c7
-DIST stack-1.7.1-linux-x86_64.tar.gz 14025122 BLAKE2B ea7c62ef9c4dee85016ef6b1868da3aa51abac4ab1cafff2a15636d92d4ab8fc5d6bcf501bfb40db0bf5b80c791bef2d970e620a326547502821b44e2c93bf9d SHA512 5746548abbc06cc84bb053d236ce41319b5cacca75ac66507318670b9ebed51dcf891eabb74111cc4544c38f0d3716dfb6a02ba06019ddc6399b41d1378199c5
-DIST stack-2.1.3-linux-aarch64.tar.gz 17019580 BLAKE2B ac176c211d2b4975f7dc8d57731909efe244684f2e54ce478a9260040fece05ff4135c13e89f25e44b64b7c35d18c8647ab63b11bb471024de01be0cb1b8d9cb SHA512 bd60dddfbbf9be22a35b25c4db01503f86e561b5cf79fab8c6ad162d557a248f9553ccc97de4b94f51ec3d9f31c3744d7b291edab3cce25321d6f8af8f5ddcc6
-DIST stack-2.1.3-linux-arm.tar.gz 16124790 BLAKE2B cb6f42576e938b3838e7db26fbc00b9b0f87cda937a26841e50f5164a0c1a1f91f7f6b4d435e59fa6b8c35ad4c1541d6bcabd4ed294a0cd423cef657911d730f SHA512 005a508e003992af47ffc591598e69ccba3ed1e96ce271c9f7a369b238d7e8e4d4850b1d4fc13a63a147e56692622364b6ea3d5c97708acc82a895e55ccbf938
-DIST stack-2.1.3-linux-i386.tar.gz 14128095 BLAKE2B b48d8765d4a6930450dbfeea488fe7c41392984375100a730fee1824a983abf1f35058d880a5ea983495052987a733b9548e199e34282c49c81c545373893ff3 SHA512 a0911eb8aa73711ca314ad456f9e0e58696fa0b4e38619b8293c0971496735fe002d2271498888acce3d454c4da1c0d36727e0ca9a722a0757d1c2c4ddc17982
-DIST stack-2.1.3-linux-x86_64.tar.gz 14510392 BLAKE2B 0b5d229a006813abfa38bdaa963c1d3bb206508a49c177bdaa0d5028ab16973e706a44844161dae6ad2ee7eaccbc96d9f83c31f6da9e11243f1b2ef4a4bd98f0 SHA512 c6a26558316804df34e467601bc34cde11dcf9995727bd437933a38ce5b6cb1afb4f035415914c23b9a8ad36568e2f0b6ee17a7bb0f80af45e25b016a6b927e6
-DIST stack-2.3.1-linux-x86_64.tar.gz 14478645 BLAKE2B e49a4c47f9a2d03fcf9a8ddfac47ff89a39520799886878a824dd9fa1d636bbcb66bbca1ddb8d1b9b7308e4c828e510c0994fc90f3a44d3d344201d5e0af73ea SHA512 eef99b5a1f7593ca884708a05bcf6f7c3e8a5ade4f71b6a802c961bdc346aa560861762b238d8cd6b3c8b85e45334235ef5eaf97126df5970863dca701d83298
diff --git a/dev-haskell/stack-bin/metadata.xml b/dev-haskell/stack-bin/metadata.xml
deleted file mode 100644
index d702142876ff..000000000000
--- a/dev-haskell/stack-bin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see the README.md for usage information, and
-		the wiki on Github for more details.  Also, note that
-		the API for the library is not currently stable, and may
-		change significantly, even between minor releases. It is
-		currently only intended for use by the executable.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stack-bin/stack-bin-1.5.1.ebuild b/dev-haskell/stack-bin/stack-bin-1.5.1.ebuild
deleted file mode 100644
index 03911c2bac40..000000000000
--- a/dev-haskell/stack-bin/stack-bin-1.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Haskell Tool Stack (Binary)"
-HOMEPAGE="https://github.com/commercialhaskell/stack"
-
-uri() {
-	echo "https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-$1.tar.gz"
-}
-
-SRC_URI="
-	arm? ( $(uri arm) )
-	x86? ( $(uri i386) )
-	amd64? ( $(uri x86_64) )
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="symlink"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-libs/zlib
-	dev-libs/gmp:0
-"
-RDEPEND+=" symlink? ( !dev-haskell/stack )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/usr/bin/stack-bin"
-QA_PRESTRIPPED="/usr/bin/stack-bin"
-
-src_prepare() {
-	default
-
-	mv stack-${PV}-*/doc doc || die
-	mv stack-${PV}-*/stack stack-bin || die
-}
-
-src_install() {
-	dodoc doc/*
-	dobin stack-bin
-	use symlink && dosym stack-bin /usr/bin/stack
-}
diff --git a/dev-haskell/stack-bin/stack-bin-1.6.1.ebuild b/dev-haskell/stack-bin/stack-bin-1.6.1.ebuild
deleted file mode 100644
index 03911c2bac40..000000000000
--- a/dev-haskell/stack-bin/stack-bin-1.6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Haskell Tool Stack (Binary)"
-HOMEPAGE="https://github.com/commercialhaskell/stack"
-
-uri() {
-	echo "https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-$1.tar.gz"
-}
-
-SRC_URI="
-	arm? ( $(uri arm) )
-	x86? ( $(uri i386) )
-	amd64? ( $(uri x86_64) )
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="symlink"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-libs/zlib
-	dev-libs/gmp:0
-"
-RDEPEND+=" symlink? ( !dev-haskell/stack )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/usr/bin/stack-bin"
-QA_PRESTRIPPED="/usr/bin/stack-bin"
-
-src_prepare() {
-	default
-
-	mv stack-${PV}-*/doc doc || die
-	mv stack-${PV}-*/stack stack-bin || die
-}
-
-src_install() {
-	dodoc doc/*
-	dobin stack-bin
-	use symlink && dosym stack-bin /usr/bin/stack
-}
diff --git a/dev-haskell/stack-bin/stack-bin-1.7.1.ebuild b/dev-haskell/stack-bin/stack-bin-1.7.1.ebuild
deleted file mode 100644
index 9dedee632703..000000000000
--- a/dev-haskell/stack-bin/stack-bin-1.7.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The Haskell Tool Stack (Binary)"
-HOMEPAGE="https://github.com/commercialhaskell/stack"
-
-uri() {
-	echo "https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-$1.tar.gz"
-}
-
-SRC_URI="
-	arm? ( $(uri arm) )
-	x86? ( $(uri i386) )
-	amd64? ( $(uri x86_64) )
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="symlink"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-libs/zlib
-	dev-libs/gmp:0
-"
-RDEPEND+=" symlink? ( !dev-haskell/stack )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/usr/bin/stack-bin"
-QA_PRESTRIPPED="/usr/bin/stack-bin"
-
-src_prepare() {
-	default
-
-	mv stack-${PV}-*/doc doc || die
-	mv stack-${PV}-*/stack stack-bin || die
-}
-
-src_install() {
-	dodoc doc/*
-	dobin stack-bin
-	use symlink && dosym stack-bin /usr/bin/stack
-}
diff --git a/dev-haskell/stack-bin/stack-bin-2.1.3.ebuild b/dev-haskell/stack-bin/stack-bin-2.1.3.ebuild
deleted file mode 100644
index 189deee5218e..000000000000
--- a/dev-haskell/stack-bin/stack-bin-2.1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The Haskell Tool Stack (Binary)"
-HOMEPAGE="https://github.com/commercialhaskell/stack"
-
-uri() {
-	echo "https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-$1.tar.gz"
-}
-
-SRC_URI="
-	arm? ( $(uri arm) )
-	arm64? ( $(uri aarch64) )
-	x86? ( $(uri i386) )
-	amd64? ( $(uri x86_64) )
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="symlink"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-libs/zlib
-	dev-libs/gmp:0
-"
-RDEPEND+=" symlink? ( !dev-haskell/stack )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/usr/bin/stack-bin"
-QA_PRESTRIPPED="/usr/bin/stack-bin"
-
-src_prepare() {
-	default
-
-	mv stack-${PV}-*/doc doc || die
-	mv stack-${PV}-*/stack stack-bin || die
-}
-
-src_install() {
-	dodoc -r doc/*
-	dobin stack-bin
-	use symlink && dosym stack-bin /usr/bin/stack
-}
diff --git a/dev-haskell/stack-bin/stack-bin-2.3.1.ebuild b/dev-haskell/stack-bin/stack-bin-2.3.1.ebuild
deleted file mode 100644
index 525043e12021..000000000000
--- a/dev-haskell/stack-bin/stack-bin-2.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The Haskell Tool Stack (Binary)"
-HOMEPAGE="https://github.com/commercialhaskell/stack"
-
-SRC_URI="https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-x86_64.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="symlink"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-libs/zlib
-	dev-libs/gmp:0
-"
-RDEPEND+=" symlink? ( !dev-haskell/stack )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/usr/bin/stack-bin"
-QA_PRESTRIPPED="/usr/bin/stack-bin"
-
-src_prepare() {
-	default
-
-	mv stack-${PV}-*/doc doc || die
-	mv stack-${PV}-*/stack stack-bin || die
-}
-
-src_install() {
-	dodoc -r doc/*
-	dobin stack-bin
-	use symlink && dosym stack-bin /usr/bin/stack
-}
diff --git a/dev-haskell/stack/Manifest b/dev-haskell/stack/Manifest
deleted file mode 100644
index 5a39280ee928..000000000000
--- a/dev-haskell/stack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stack-2.3.3.tar.gz 572406 BLAKE2B 4b88614ede72ea3704e3bfad433a7931860c1c098bb65aeabca46d3abc5364ea132b8a7f0f559f1b07463d4b753b5501081841fa388a5d817389d91371214236 SHA512 cb93e3bcb8f92e01f374806f07f366ca318d66e3b7bd3cfa3fe3b72dce954d2bb371f51e3f79fca8aec19d1d3adef370bb09237bf29340a1bc851a9a103d77a3
diff --git a/dev-haskell/stack/metadata.xml b/dev-haskell/stack/metadata.xml
deleted file mode 100644
index 530923816ff9..000000000000
--- a/dev-haskell/stack/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="developer-mode">By default, should extra developer information be output?</flag>
-	</use>
-	<longdescription>
-		Please see the documentation at &lt;https://docs.haskellstack.org&gt;
-		for usage information.
-		
-		If building a &#39;stack&#39; executable for distribution, please download the
-		source code from &lt;https://github.com/commercialhaskell/stack/releases&gt;
-		and build it using Stack itself in order to ensure identical behaviour
-		to official binaries.  This package on Hackage is provided for convenience
-		and bootstrapping purposes.
-		
-		Note that the API for the library is not currently stable, and may
-		change significantly, even between minor releases. It is
-		currently only intended for use by the executable.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stack/stack-2.3.3.ebuild b/dev-haskell/stack/stack-2.3.3.ebuild
deleted file mode 100644
index 3b0a49f834fc..000000000000
--- a/dev-haskell/stack/stack-2.3.3.ebuild
+++ /dev/null
@@ -1,114 +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.6.9999
-#hackport: flags: -disable-git-info,-hide-dependency-versions,-integration-tests,-static,-supported-build
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="The Haskell Tool Stack"
-HOMEPAGE="https://haskellstack.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="developer-mode"
-
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/aeson-1.4.6.0:=[profile?]
-	>=dev-haskell/annotated-wl-pprint-0.7.0:=[profile?]
-	>=dev-haskell/ansi-terminal-0.9.1:=[profile?]
-	>=dev-haskell/async-2.2.2:=[profile?]
-	>=dev-haskell/attoparsec-0.13.2.3:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0.0.3:=[profile?]
-	>=dev-haskell/cabal-3.0.0.0:=[profile?]
-	>=dev-haskell/casa-client-0.0.1:=[profile?]
-	>=dev-haskell/casa-types-0.0.1:=[profile?]
-	>=dev-haskell/colour-2.3.5:=[profile?]
-	>=dev-haskell/conduit-1.3.1.2:=[profile?]
-	>=dev-haskell/conduit-extra-1.3.4:=[profile?]
-	>=dev-haskell/cryptonite-0.25:=[profile?]
-	>=dev-haskell/cryptonite-conduit-0.2.2:=[profile?]
-	>=dev-haskell/echo-0.1.3:=[profile?]
-	>=dev-haskell/exceptions-0.10.4:=[profile?]
-	>=dev-haskell/extra-1.6.19:=[profile?]
-	>=dev-haskell/file-embed-0.0.11.1:=[profile?]
-	>=dev-haskell/filelock-0.1.1.5:=[profile?]
-	>=dev-haskell/fsnotify-0.3.0.1:=[profile?]
-	>=dev-haskell/generic-deriving-1.12.4:=[profile?]
-	>=dev-haskell/githash-0.1.3.3:=[profile?]
-	>=dev-haskell/hackage-security-0.5.3.0:=[profile?]
-	>=dev-haskell/hashable-1.2.7.0:=[profile?]
-	>=dev-haskell/hi-file-parser-0.1.0.0:=[profile?]
-	>=dev-haskell/hpack-0.33.0:=[profile?]
-	>=dev-haskell/http-client-0.6.4:=[profile?]
-	>=dev-haskell/http-client-tls-0.3.5.3:=[profile?]
-	>=dev-haskell/http-conduit-2.3.7.3:=[profile?]
-	>=dev-haskell/http-download-0.2.0.0:=[profile?]
-	>=dev-haskell/http-types-0.12.3:=[profile?]
-	>=dev-haskell/memory-0.14.18:=[profile?]
-	>=dev-haskell/microlens-0.4.10:=[profile?]
-	>=dev-haskell/mintty-0.1.2:=[profile?]
-	>=dev-haskell/mono-traversable-1.0.15.1:=[profile?]
-	>=dev-haskell/mtl-2.2.2:=[profile?]
-	>=dev-haskell/mustache-2.3.1:=[profile?]
-	>=dev-haskell/neat-interpolation-0.3.2.6:=[profile?]
-	>=dev-haskell/network-uri-2.6.2.0:=[profile?]
-	>=dev-haskell/open-browser-0.2.1.0:=[profile?]
-	>=dev-haskell/optparse-applicative-0.14.3.0:=[profile?]
-	>=dev-haskell/optparse-simple-0.1.1.2:=[profile?]
-	>=dev-haskell/pantry-0.4:=[profile?] <dev-haskell/pantry-0.5:=[profile?]
-	>=dev-haskell/path-0.6.1:=[profile?]
-	>=dev-haskell/path-io-1.4.2:=[profile?]
-	>=dev-haskell/persistent-2.9.2:=[profile?]
-	>=dev-haskell/persistent-sqlite-2.9.3:=[profile?]
-	>=dev-haskell/persistent-template-2.6.0:=[profile?]
-	>=dev-haskell/primitive-0.6.4.0:=[profile?]
-	>=dev-haskell/project-template-0.2.0.1:=[profile?]
-	>=dev-haskell/regex-applicative-text-0.1.0.1:=[profile?]
-	>=dev-haskell/retry-0.8.1.0:=[profile?]
-	>=dev-haskell/rio-0.1.14.0:=[profile?]
-	>=dev-haskell/rio-prettyprint-0.1.0.0:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?]
-	>=dev-haskell/split-0.2.3.3:=[profile?]
-	>=dev-haskell/stm-2.5.0.0:=[profile?]
-	>=dev-haskell/streaming-commons-0.2.1.2:=[profile?]
-	>=dev-haskell/tar-0.5.1.1:=[profile?]
-	>=dev-haskell/temporary-1.3:=[profile?]
-	>=dev-haskell/text-1.2.3.1:=[profile?]
-	>=dev-haskell/text-metrics-0.3.0:=[profile?]
-	>=dev-haskell/th-reify-many-0.1.9:=[profile?]
-	>=dev-haskell/tls-1.4.1:=[profile?]
-	>=dev-haskell/typed-process-0.2.6.0:=[profile?]
-	>=dev-haskell/unicode-transforms-0.3.6:=[profile?]
-	>=dev-haskell/unix-compat-0.5.2:=[profile?]
-	>=dev-haskell/unliftio-0.2.12:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.10.0:=[profile?]
-	>=dev-haskell/vector-0.12.1.2:=[profile?]
-	>=dev-haskell/yaml-0.11.2.0:=[profile?]
-	>=dev-haskell/zip-archive-0.4.1:=[profile?]
-	>=dev-haskell/zlib-0.6.2.1:=[profile?]
-	>=dev-lang/ghc-8.6.5:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4.0.1
-	test? ( >=dev-haskell/hspec-2.7.1
-		>=dev-haskell/quickcheck-2.13.2
-		>=dev-haskell/raw-strings-qq-1.1
-		>=dev-haskell/smallcheck-1.1.5 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag developer-mode developer-mode) \
-		--flag=-disable-git-info \
-		--flag=-hide-dependency-versions \
-		--flag=-integration-tests \
-		--flag=-static \
-		--flag=-supported-build
-}
diff --git a/dev-haskell/statevar/Manifest b/dev-haskell/statevar/Manifest
index 9d70b4f526b8..072a384fd59e 100644
--- a/dev-haskell/statevar/Manifest
+++ b/dev-haskell/statevar/Manifest
@@ -1,5 +1,2 @@
-DIST StateVar-1.0.0.0.tar.gz 2728 BLAKE2B 03faf18cabf2d913f41254ec7ba2cd51b8e9c17a3cc31ce0ed3a80dabc529a6eb18142e07dfe02f4372536dbfdfa0c97a7ada74fa1b10383affd0ecdadcc03be SHA512 0196fc184e638fae736020fdc7139fa1a08adebcc495424316795e7e775c5d7ab1df89792ea088745854dbeb396bdf5f3c07942126b8227743fb2b7bd599b8c5
-DIST StateVar-1.0.1.0.tar.gz 2800 BLAKE2B 504a3afe5a3c93c98967ee00b9771f83aac143206f33ffd0bea1e14cdf5b68ab4b6f821c30025e4886e8aecb48115601cba1068a0b050bca6bf9d63fb9f9058c SHA512 4a3f35943d9a3670e8fd633b916fb0b800aabe98af2f4285a79ff40523ef49ee28ba83457a796f0e4d6f718a1cf9c57790f4124c42cede9a884360803a86b194
-DIST StateVar-1.1.0.3.tar.gz 4475 BLAKE2B d9ea1506c8173255fb9c4dd5e9c72fe09acc8972158c9f57622a43c9c6b6441ede8b1c6d6bfe1d0d17ebe219f9ddfb30b658a4f4a079ef8e4e211ea4b7695a64 SHA512 4be7a0d005bd1af713102100ece6c074f7c1835b356c40d6128152bd0b56fc4f0b29c3b7d5c2f5b5413d4cf3ca6f5118d0c5932d54aceec1eba1f835ee1dd64e
-DIST StateVar-1.1.0.4.tar.gz 4587 BLAKE2B 37172b221866e4fd276c0ea819e613d413ad7585efce5742fa9a7a1019d34e6aa0c7de0359061a1d18fcad2789a81d6c1bcac0633ea68f47deea0c121e10f25a SHA512 2d9f958dc2d1b749c5e2b661958cd38b58a1048603dc48a585a2f32ca386cef42db99e39c033194376f6f3de154444841de048dc39804d236f6e10c90c5e3f0b
-DIST StateVar-1.1.1.1.tar.gz 4762 BLAKE2B 17148fe888eaf0fafd73812cd9ca1c1eb6b61c3a555fff63608bdff14845320c433a49ec6680dd756c65dadacb9673ffefb74eabf0d38fd2393d9c601624210d SHA512 4b4d24dee812dafce1b5d08a6a7034edd005f2128012276cb8f43a413597a1303000ab625b3458a287840ea1d331d0659fbfde81bbf83933156870f107c31610
+DIST StateVar-1.2.1.tar.gz 5055 BLAKE2B 45a9e509deec9988debdf906bfcb3f3fcd04fbd42326ea5eb74b697fa761d2d4a696c84deb0d5634aac0a4d57af3ef56cf612b343afb53f00c2eec4b96d53801 SHA512 867e38b309a0cbb5a3aac1183b6388aab6e546cda799b0668f3e9534556df4b73558295a706b2859c1edb20e89dac7bf8c4f04f839d40ede2c36a2ae7eab6259
+DIST statevar-1.2.2.tar.gz 5048 BLAKE2B 937617e283038101ef8dea2ec62ba77af2f34868b99bbb41241fd07a897d51d31238eaae688239cc0b560d39f34873eeed9226e96b09d659350337e8dfd2ce02 SHA512 d4330b43471ed73e2c70e0686575f7987f617ae1c03d9d5b0ea89d5ec55be2470b6d917e4ecc6d52c4d46fc8afbeea16194667815ce0bbecb1f637d7277f86e6
diff --git a/dev-haskell/statevar/metadata.xml b/dev-haskell/statevar/metadata.xml
index afb1df96d2a4..a03fe8b48850 100644
--- a/dev-haskell/statevar/metadata.xml
+++ b/dev-haskell/statevar/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package contains state variables, which are references in the IO monad,
-		like IORefs or parts of the OpenGL state.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">StateVar</remote-id>
 		<remote-id type="github">haskell-opengl/StateVar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild b/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
deleted file mode 100644
index 4190eed22c19..000000000000
--- a/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="http://www.haskell.org/HOpenGL/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.0.1.0.ebuild b/dev-haskell/statevar/statevar-1.0.1.0.ebuild
deleted file mode 100644
index 9b0902925acd..000000000000
--- a/dev-haskell/statevar/statevar-1.0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="https://github.com/haskell-opengl/StateVar"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.1.0.3.ebuild b/dev-haskell/statevar/statevar-1.1.0.3.ebuild
deleted file mode 100644
index e5e5c404a1ed..000000000000
--- a/dev-haskell/statevar/statevar-1.1.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="https://github.com/haskell-opengl/StateVar"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.1.0.4.ebuild b/dev-haskell/statevar/statevar-1.1.0.4.ebuild
deleted file mode 100644
index c9be15ae569c..000000000000
--- a/dev-haskell/statevar/statevar-1.1.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="https://github.com/haskell-opengl/StateVar"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.1.1.1.ebuild b/dev-haskell/statevar/statevar-1.1.1.1.ebuild
deleted file mode 100644
index 7c6b07154712..000000000000
--- a/dev-haskell/statevar/statevar-1.1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="StateVar"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="State variables"
-HOMEPAGE="https://github.com/haskell-opengl/StateVar"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.2.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.2.1.ebuild b/dev-haskell/statevar/statevar-1.2.1.ebuild
new file mode 100644
index 000000000000..6bbe236e9dd6
--- /dev/null
+++ b/dev-haskell/statevar/statevar-1.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="StateVar"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="State variables"
+HOMEPAGE="https://github.com/haskell-opengl/StateVar"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/stm-2.3.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/statevar/statevar-1.2.2.ebuild b/dev-haskell/statevar/statevar-1.2.2.ebuild
new file mode 100644
index 000000000000..be0ecb11ce35
--- /dev/null
+++ b/dev-haskell/statevar/statevar-1.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_PN="StateVar"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="State variables"
+HOMEPAGE="https://github.com/haskell-opengl/StateVar"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/stm-2.3.0.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/statistics/Manifest b/dev-haskell/statistics/Manifest
index f9924e9c1fcb..4c1216e28321 100644
--- a/dev-haskell/statistics/Manifest
+++ b/dev-haskell/statistics/Manifest
@@ -1,4 +1,2 @@
-DIST statistics-0.10.5.2.tar.gz 67302 BLAKE2B 0c59041735e9f04eed0217357092ecf1aaf2935ad09872c81b15c326c96c8ecb168cc09065ad4a833106f94760559dd804939a27080d38f7465fa2858c1cc585 SHA512 92ca0852551d2f67b1a0d96d472952492422d0c35962c1c784baa4d28915b7938e588c6fd8eddab1071e4526b78181258dda79a1962312714d140ccaaf1367e1
-DIST statistics-0.11.0.3.tar.gz 69092 BLAKE2B 62d8a847e4384747ae5539319abfe046aa667bd6efbd3fcdd0403747ec04932b5b952a6260cf8ecf256b35f288464b1c73a3e95c769c6b30f8294fd69bfcbb8c SHA512 7715e5497a794d4706232372c63a83072a60a7ba25517bbecafcce5125d83ad13916755db83af0ece349a35a663447037fc0316cf841570fa3e6a83bb29457fb
-DIST statistics-0.13.2.3.tar.gz 79522 BLAKE2B 44a83b646fb5e97a210237421e5bdc88c18d87934cd026dff1d3171b51d5e7957ecff92ea4fa3256435a3c33c4bb1b196da944853139baca82b08340a2ecad84 SHA512 5fcc6f6889ed5b54d17d5d3f505bc6860d836f6f9784cf768a337db00179b68e16fc9d9a3a2336563c76cb24cb4faf9e705f14150fd6adb5c649760b63726b17
-DIST statistics-0.13.3.0.tar.gz 83534 BLAKE2B d2e05ab16966148a42fb6292b23c3ea222d1b04464069243ab0e6dda44f24d2a0cb17f3fe2f296b85c7a54d0ec731348e0ec2a312280c30ee6591612832c3217 SHA512 66eee4b6ea7f2ce6ac5fdcaf9e3f8185b0a4915e13f77474ab4709353692a95c99b15a00b52129d88a5fb35392f3e6795799335b1fa4a4e69208e94d81357715
+DIST statistics-0.15.2.0.tar.gz 98424 BLAKE2B 36a1b59e7db9e20ee9960f89794c2222ac8db7fa40f44b166e2d92a501b44d8d5ec06bab96b9e89bb7417852a98890bdf140f3b1a7fb27f0e034490615d84131 SHA512 7afa3e3edb15e02ff59c72601175d25f1a8baeaa1dd8561322e8e26781dbfbfcc03b2ade773269bab027d7399375f01595145fd2e2f252f3e73abc87f9baed41
+DIST statistics-0.16.2.0.tar.gz 107609 BLAKE2B c5a5fe29ec68600ecf5d15855537672432ba09edff26a36387224d1e295cbd6a57a6025b2774f47fd56c9809f4b8b1889bf7aa1240d83eecb4a4d82933ca6223 SHA512 934928e5f8f4f38fe1755a5d16d9a4653401a983d86b2f0fc7f9d4ba90b0b05cf19caec2f4e48874fc7995450a016fa9b45dadc0d6316807fbf19ed75d14c38b
diff --git a/dev-haskell/statistics/metadata.xml b/dev-haskell/statistics/metadata.xml
index a68564979679..e25f1d14aa33 100644
--- a/dev-haskell/statistics/metadata.xml
+++ b/dev-haskell/statistics/metadata.xml
@@ -1,105 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library provides a number of common functions and types useful
-		in statistics.  We focus on high performance, numerical robustness,
-		and use of good algorithms.  Where possible, we provide
-		references to the statistical literature.
-		
-		The library's facilities can be divided into four broad categories:
-		
-		* Working with widely used discrete and continuous probability
-		distributions.  (There are dozens of exotic distributions in use;
-		we focus on the most common.)
-		
-		* Computing with sample data: quantile estimation, kernel density
-		estimation, histograms, bootstrap methods, significance testing,
-		and autocorrelation analysis.
-		
-		* Random variate generation under several different distributions.
-		
-		* Common statistical tests for significant differences between
-		samples.
-		
-		Changes in 0.10.0.0:
-		
-		* The type classes @Mean@ and @Variance@ are split in two. This is
-		required for distributions which do not have finite variance or
-		mean.
-		
-		* The @S.Sample.KernelDensity@ module has been renamed, and
-		completely rewritten to be much more robust.  The older module
-		oversmoothed multi-modal data.  (The older module is still
-		available under the name @S.Sample.KernelDensity.Simple@).
-		
-		* Histogram computation is added, in @S.Sample.Histogram@.
-		
-		* Forward and inverse discrete Fourier and cosine transforms are
-		added, in @S.Transform@.
-		
-		* Root finding is added, in @S.Math.RootFinding@.
-		
-		* The @complCumulative@ function is added to the @Distribution@
-		class in order to accurately assess probalities P(X&gt;x) which are
-		used in one-tailed tests.
-		
-		* A @stdDev@ function is added to the @Variance@ class for
-		distributions.
-		
-		* The constructor @S.Distribution.normalDistr@ now takes standard
-		deviation instead of variance as its parameter.
-		
-		* A bug in @S.Quantile.weightedAvg@ is fixed. It produced a wrong
-		answer if a sample contained only one element.
-		
-		* Bugs in quantile estimations for chi-square and gamma distribution
-		are fixed.
-		
-		* Integer overlow in @mannWhitneyUCriticalValue@ is fixed. It
-		produced incorrect critical values for moderately large
-		samples. Something around 20 for 32-bit machines and 40 for 64-bit
-		ones.
-		
-		* A bug in @mannWhitneyUSignificant@ is fixed. If either sample was
-		larger than 20, it produced a completely incorrect answer.
-		
-		* One- and two-tailed tests in @S.Tests.NonParametric@ are selected
-		with sum types instead of @Bool@.
-		
-		* Test results returned as enumeration instead of @Bool@.
-		
-		* Performance improvements for Mann-Whitney U and Wilcoxon tests.
-		
-		* Module @S.Tests.NonParamtric@ is split into @S.Tests.MannWhitneyU@
-		and @S.Tests.WilcoxonT@
-		
-		* @sortBy@ is added to @S.Function@.
-		
-		* Mean and variance for gamma distribution are fixed.
-		
-		* Much faster cumulative probablity functions for Poisson and
-		hypergeometric distributions.
-		
-		* Better density functions for gamma and Poisson distributions.
-		
-		* Student-T, Fisher-Snedecor F-distributions and Cauchy-Lorentz
-		distrbution are added.
-		
-		* The function @S.Function.create@ is removed. Use @generateM@ from
-		the @vector@ package instead.
-		
-		* Function to perform approximate comparion of doubles is added to
-		@S.Function.Comparison@
-		
-		* Regularized incomplete beta function and its inverse are added to
-		@S.Function@.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">bos/statistics</remote-id>
+		<remote-id type="hackage">statistics</remote-id>
+		<remote-id type="github">haskell/statistics</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/statistics/statistics-0.10.5.2.ebuild b/dev-haskell/statistics/statistics-0.10.5.2.ebuild
deleted file mode 100644
index 0833b46fdb04..000000000000
--- a/dev-haskell/statistics/statistics-0.10.5.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library of statistical types, data, and functions"
-HOMEPAGE="https://github.com/bos/statistics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # likes to fail under a load
-
-RDEPEND=">=dev-haskell/binary-0.6.3.0:=[profile?]
-	dev-haskell/erf:=[profile?]
-	>=dev-haskell/math-functions-0.1.2:=[profile?]
-	>=dev-haskell/monad-par-0.3.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.0.0:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/statistics/statistics-0.11.0.3.ebuild b/dev-haskell/statistics/statistics-0.11.0.3.ebuild
deleted file mode 100644
index e25c8ba99bfb..000000000000
--- a/dev-haskell/statistics/statistics-0.11.0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library of statistical types, data, and functions"
-HOMEPAGE="https://github.com/bos/statistics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # likes to fail under a load
-
-RDEPEND=">=dev-haskell/binary-0.5.1.0:=[profile?]
-	dev-haskell/erf:=[profile?]
-	>=dev-haskell/math-functions-0.1.5.2:=[profile?]
-	>=dev-haskell/monad-par-0.3.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.0.0:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?]
-	>=dev-haskell/vector-0.7.1:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/statistics/statistics-0.13.2.3.ebuild b/dev-haskell/statistics/statistics-0.13.2.3.ebuild
deleted file mode 100644
index e3ac14633984..000000000000
--- a/dev-haskell/statistics/statistics-0.13.2.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library of statistical types, data, and functions"
-HOMEPAGE="https://github.com/bos/statistics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # likes to fail under a load
-
-RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	dev-haskell/erf:=[profile?]
-	>=dev-haskell/math-functions-0.1.5.2:=[profile?]
-	>=dev-haskell/monad-par-0.3.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.0.0:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.7.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/statistics/statistics-0.13.3.0.ebuild b/dev-haskell/statistics/statistics-0.13.3.0.ebuild
deleted file mode 100644
index 95662780b792..000000000000
--- a/dev-haskell/statistics/statistics-0.13.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A library of statistical types, data, and functions"
-HOMEPAGE="https://github.com/bos/statistics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # likes to fail under a load
-
-RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
-	>=dev-haskell/binary-0.5.1.0:=[profile?]
-	dev-haskell/erf:=[profile?]
-	>=dev-haskell/math-functions-0.1.5.2:=[profile?]
-	>=dev-haskell/monad-par-0.3.4:=[profile?]
-	>=dev-haskell/mwc-random-0.13.0.0:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-haskell/vector-algorithms-0.4:=[profile?]
-	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/ieee754-0.7.3
-		>=dev-haskell/quickcheck-2.7.5
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/statistics/statistics-0.15.2.0.ebuild b/dev-haskell/statistics/statistics-0.15.2.0.ebuild
new file mode 100644
index 000000000000..5c22ef2c859e
--- /dev/null
+++ b/dev-haskell/statistics/statistics-0.15.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library of statistical types, data, and functions"
+HOMEPAGE="https://github.com/bos/statistics"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
+	>=dev-haskell/async-2.2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/base-orphans-0.6:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
+	>=dev-haskell/data-default-class-0.1.2:=[profile?]
+	>=dev-haskell/dense-linear-algebra-0.1:=[profile?] <dev-haskell/dense-linear-algebra-0.2:=[profile?]
+	>=dev-haskell/math-functions-0.3:=[profile?]
+	>=dev-haskell/monad-par-0.3.4:=[profile?]
+	>=dev-haskell/mwc-random-0.13.0.0:=[profile?]
+	>=dev-haskell/primitive-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-haskell/vector-algorithms-0.4:=[profile?]
+	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
+	dev-haskell/vector-th-unbox:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/erf
+		>=dev-haskell/ieee754-0.7.3
+		>=dev-haskell/quickcheck-2.7.5
+		dev-haskell/tasty
+		dev-haskell/tasty-expected-failure
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/statistics/statistics-0.16.2.0.ebuild b/dev-haskell/statistics/statistics-0.16.2.0.ebuild
new file mode 100644
index 000000000000..d9f0ecac3978
--- /dev/null
+++ b/dev-haskell/statistics/statistics-0.16.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library of statistical types, data, and functions"
+HOMEPAGE="https://github.com/haskell/statistics"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # likes to fail under a load
+
+RDEPEND=">=dev-haskell/aeson-0.6.0.0:=[profile?]
+	>=dev-haskell/async-2.2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/data-default-class-0.1.2:=[profile?]
+	>=dev-haskell/dense-linear-algebra-0.1:=[profile?] <dev-haskell/dense-linear-algebra-0.2:=[profile?]
+	>=dev-haskell/math-functions-0.3.4.1:=[profile?]
+	>=dev-haskell/mwc-random-0.15.0.0:=[profile?]
+	>=dev-haskell/parallel-3.2.2.0:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
+	>=dev-haskell/primitive-0.3:=[profile?]
+	>=dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?]
+	>=dev-haskell/vector-algorithms-0.4:=[profile?]
+	>=dev-haskell/vector-binary-instances-0.2.1:=[profile?]
+	dev-haskell/vector-th-unbox:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/erf
+		>=dev-haskell/ieee754-0.7.3
+		>=dev-haskell/quickcheck-2.7.5
+		dev-haskell/tasty
+		dev-haskell/tasty-expected-failure
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/stm-chans/metadata.xml b/dev-haskell/stm-chans/metadata.xml
index 89a51c39cb0f..937381521944 100644
--- a/dev-haskell/stm-chans/metadata.xml
+++ b/dev-haskell/stm-chans/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Additional types of channels for STM.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild b/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
index 87ed362b9e61..7bf5b2d8bfbe 100644
--- a/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
+++ b/dev-haskell/stm-chans/stm-chans-3.0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.4:=[profile?]
diff --git a/dev-haskell/stm/Manifest b/dev-haskell/stm/Manifest
index d0bbac412093..23f180d2f8eb 100644
--- a/dev-haskell/stm/Manifest
+++ b/dev-haskell/stm/Manifest
@@ -1,3 +1,3 @@
-DIST stm-2.4.2.tar.gz 9635 BLAKE2B 4a1c394d1308619b409dfeaad0af1209a0317dca70943d57b62be34fd48983ce214de23b3c8e1b8341f2d2a1fb0b6e0af5f5ac8acdb462fe6e6734dfc0fb8d8b SHA512 ed1f58f7b08262d4afa683fde16ad79670bb111f0cfc22fdce81614358e903698e6b1bd410428661b1c7d5af50b10dbcf688d8ce5e7ddae86cc55d6d1c5598da
-DIST stm-2.4.4.1.tar.gz 10367 BLAKE2B 63cba3b6097d32f9740eea6a2a62f2ae7c642ed27905e62af4f0d7fb7100c1372357bf5626654a2f6c188743b944e73747206227f8790b367a61803ef583e245 SHA512 12a8edb7489995245fb21d9f0782cad87e992f56343d4492eef788370ebc2dcb934193d8602b85b5f3935c4bdb4c9426717b6149437cd7b0bb5311bda4b237eb
-DIST stm-2.5.0.0.tar.gz 12335 BLAKE2B 4b29efdb620e0528a42a34e0b98e2ba5a7e90f83009e1129f923a77abc427a5f0e3a32255f908d9771406983bbdfab6b9887b031cee7c1a98c99a7d810cccd0d SHA512 64516ff5eba42a469046af51f12cb55afca795c7a897b9ac16c3446d547ad3894d9b80be3716e86291825e8fa91335ee89e9c9c6738c95f3cbd8ee0739236651
+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
diff --git a/dev-haskell/stm/metadata.xml b/dev-haskell/stm/metadata.xml
index 522384de8446..ff92e67e5ed6 100644
--- a/dev-haskell/stm/metadata.xml
+++ b/dev-haskell/stm/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">stm</remote-id>
+		<remote-id type="github">haskell/stm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/stm/stm-2.4.2.ebuild b/dev-haskell/stm/stm-2.4.2.ebuild
deleted file mode 100644
index 1e07f385d244..000000000000
--- a/dev-haskell/stm/stm-2.4.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Software Transactional Memory"
-HOMEPAGE="https://hackage.haskell.org/package/stm"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/stm/stm-2.4.4.1.ebuild b/dev-haskell/stm/stm-2.4.4.1.ebuild
deleted file mode 100644
index 46f2aea2a305..000000000000
--- a/dev-haskell/stm/stm-2.4.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Software Transactional Memory"
-HOMEPAGE="https://hackage.haskell.org/package/stm"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/stm/stm-2.5.0.0.ebuild b/dev-haskell/stm/stm-2.5.0.0.ebuild
deleted file mode 100644
index cfec29428a9a..000000000000
--- a/dev-haskell/stm/stm-2.5.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Software Transactional Memory"
-HOMEPAGE="https://wiki.haskell.org/Software_transactional_memory"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.6
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/nats-0.1.3:=[profile?] <dev-haskell/nats-1.2:=[profile?]
-"
-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:9999"
diff --git a/dev-haskell/stm/stm-2.5.0.1-r1.ebuild b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
new file mode 100644
index 000000000000..8119160c2899
--- /dev/null
+++ b/dev-haskell/stm/stm-2.5.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Software Transactional Memory"
+HOMEPAGE="https://wiki.haskell.org/Software_transactional_memory"
+
+LICENSE="BSD"
+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-9.1
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+# ghc-9.0.1 and ghc-9.0.2 actually bundles stm-2.5.0.0, but downgrades can be messy.
+# Mark as bundled as a workaround.
+CABAL_CORE_LIB_GHC_PV="8.10.6 9.0.2"
diff --git a/dev-haskell/stm/stm-2.5.0.2-r1.ebuild b/dev-haskell/stm/stm-2.5.0.2-r1.ebuild
new file mode 100644
index 000000000000..46353f326a3f
--- /dev/null
+++ b/dev-haskell/stm/stm-2.5.0.2-r1.ebuild
@@ -0,0 +1,28 @@
+# 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="Software Transactional Memory"
+HOMEPAGE="https://wiki.haskell.org/Software_transactional_memory"
+
+LICENSE="BSD"
+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"
+
+RDEPEND="
+	>=dev-lang/ghc-9.2.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+CABAL_CORE_LIB_GHC_PV="9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/stmonadtrans/Manifest b/dev-haskell/stmonadtrans/Manifest
deleted file mode 100644
index 634b08c7d414..000000000000
--- a/dev-haskell/stmonadtrans/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST STMonadTrans-0.3.3.tar.gz 4820 BLAKE2B 5406412f362f9b5cb63aaae759510c5bd36b376a90b60b93849c4af42630b2a2266b708cc624b99726d49a80de9cd5c86cbf2a0ce05cd38250acc2864593dfbf SHA512 5395dfac66abcf75593b5c62252b452e4935b85e294a1f9b4a40424b29be76109b89b0cc35eaa15bd448a4d51ae0500bfe72924db854e02e949685fd9180d847
-DIST STMonadTrans-0.3.4.tar.gz 5442 BLAKE2B 748d95bc1f14e38220d2b2342a939a1a2df428c1eed11c40558eeac21566e552b1d43653a4bcb2f4c1dcdabe35352ed526cdd9a86c20acd54778154bcc71e1b2 SHA512 3799af190af51276d3cbd03908275d539dd8c290b9a48e2e9e3e41b1ea1c7d966ecddd86b93466e2fe7e63c4776e10912fa349f12aaf698a403d2e3effe59eab
-DIST STMonadTrans-0.4.4.tar.gz 6298 BLAKE2B dd24c28605f92626abe90b32f6633c353289d96f84caebd0422e0ee46b9a97f4a656a3a5f10d7e9f04c8d1fbe9f27ea8d7e0965c9525145c9b3b45007b2d623f SHA512 3ab7ff50223f975066cde1227fb23e00263786fa8c5b9d0276fdcc265bb1ac2e5cea97f3fb7fd51aaf25872b126645312c4c622084947dea430d214eac44938b
diff --git a/dev-haskell/stmonadtrans/metadata.xml b/dev-haskell/stmonadtrans/metadata.xml
deleted file mode 100644
index f224e9002210..000000000000
--- a/dev-haskell/stmonadtrans/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A monad transformer version of the ST monad
-		Warning! This monad transformer should not be used with monads that
-		can contain multiple answers, like the list monad. The reason is that
-		the will be duplicated across the different answers and this cause
-		Bad Things to happen (such as loss of referential transparency). Safe
-		monads include the monads State, Reader, Writer, Maybe and
-		combinations of their corresponding monad transformers.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stmonadtrans/stmonadtrans-0.3.3.ebuild b/dev-haskell/stmonadtrans/stmonadtrans-0.3.3.ebuild
deleted file mode 100644
index 7f1103cec3dc..000000000000
--- a/dev-haskell/stmonadtrans/stmonadtrans-0.3.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="STMonadTrans"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A monad transformer version of the ST monad"
-HOMEPAGE="https://hackage.haskell.org/package/STMonadTrans"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/stmonadtrans/stmonadtrans-0.3.4.ebuild b/dev-haskell/stmonadtrans/stmonadtrans-0.3.4.ebuild
deleted file mode 100644
index f2e40460f701..000000000000
--- a/dev-haskell/stmonadtrans/stmonadtrans-0.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="STMonadTrans"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A monad transformer version of the ST monad"
-HOMEPAGE="https://hackage.haskell.org/package/STMonadTrans"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # uses detailed-0.9 test suite, cabal fails it
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/stmonadtrans/stmonadtrans-0.4.4.ebuild b/dev-haskell/stmonadtrans/stmonadtrans-0.4.4.ebuild
deleted file mode 100644
index 1fd9f348fd40..000000000000
--- a/dev-haskell/stmonadtrans/stmonadtrans-0.4.4.ebuild
+++ /dev/null
@@ -1,35 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="STMonadTrans"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A monad transformer version of the ST monad"
-HOMEPAGE="http://hackage.haskell.org/package/STMonadTrans"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fail:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/tasty-0.11.0.4 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-hunit-0.9.2 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.8.4 <dev-haskell/tasty-quickcheck-0.11
-		>=dev-haskell/transformers-0.4 <dev-haskell/transformers-0.6 )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/store-core/Manifest b/dev-haskell/store-core/Manifest
deleted file mode 100644
index dcfd5ad8664e..000000000000
--- a/dev-haskell/store-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST store-core-0.4.4.3.tar.gz 7785 BLAKE2B e2608a41200476f74087ae20c5dadccfb20d07715207ab7356f6f386846d3ea7acdd7173df6842c9fadf4ccb9a6beaf797f61d89e660bfc4fb3dcc875b751957 SHA512 b425a5e9dadac42868c2180c46bccca36fbab483d168196a23ae975d9b6d27a6965884b69e3b3aa0a47942e910a7a35315085aabc9185602786ac7fc4e705d64
diff --git a/dev-haskell/store-core/metadata.xml b/dev-haskell/store-core/metadata.xml
deleted file mode 100644
index c956a8f57460..000000000000
--- a/dev-haskell/store-core/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="force-alignment">No description</flag>
-	</use>
-	<longdescription>
-		Fast and lightweight binary serialization
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/store-core/store-core-0.4.4.3.ebuild b/dev-haskell/store-core/store-core-0.4.4.3.ebuild
deleted file mode 100644
index 80786149abd5..000000000000
--- a/dev-haskell/store-core/store-core-0.4.4.3.ebuild
+++ /dev/null
@@ -1,32 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast and lightweight binary serialization"
-HOMEPAGE="https://github.com/fpco/store#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="force-alignment"
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?]
-	>=dev-haskell/primitive-0.6:=[profile?] <dev-haskell/primitive-1.0:=[profile?]
-	>=dev-haskell/text-1.2.0.4:=[profile?] <dev-haskell/text-2.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag force-alignment force-alignment)
-}
diff --git a/dev-haskell/store/Manifest b/dev-haskell/store/Manifest
deleted file mode 100644
index e4b47fad5ba1..000000000000
--- a/dev-haskell/store/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST store-0.7.6.tar.gz 43198 BLAKE2B 9246dabb2222c42096b001db327e60821d8d7142e4f7cc6818b3ef8e8743ea0185ae5fa68beaf02eeb1ec3254d95010625f56714b639730ca29fc4269c1cec2d SHA512 c1bf63b76e300aabce656e06899de9b95fa5a3d9b08be47b6ed640f5ae2a63d5dbb08e8058bb334af6a771a2dc8eeb700bf7162b806481e47e08d22bbb83b674
diff --git a/dev-haskell/store/metadata.xml b/dev-haskell/store/metadata.xml
deleted file mode 100644
index 61d4d499fa23..000000000000
--- a/dev-haskell/store/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Fast binary serialization
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/store/store-0.7.6.ebuild b/dev-haskell/store/store-0.7.6.ebuild
deleted file mode 100644
index 69fa5368d78f..000000000000
--- a/dev-haskell/store/store-0.7.6.ebuild
+++ /dev/null
@@ -1,64 +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.6
-#hackport: flags: -small-bench,-comparison-bench,-integer-simple
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast binary serialization"
-HOMEPAGE="https://github.com/fpco/store#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/async-2.0.2:=[profile?]
-	>=dev-haskell/base-orphans-0.4.3:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.1:=[profile?]
-	>=dev-haskell/bifunctors-4.0:=[profile?]
-	>=dev-haskell/contravariant-1.3:=[profile?]
-	>=dev-haskell/cryptohash-0.11.6:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?]
-	>=dev-haskell/free-4.11:=[profile?]
-	>=dev-haskell/hashable-1.2.3.1:=[profile?]
-	>=dev-haskell/hspec-2.1.2:=[profile?]
-	>=dev-haskell/hspec-smallcheck-0.3.0:=[profile?]
-	>=dev-haskell/lifted-base-0.2.3.3:=[profile?]
-	>=dev-haskell/monad-control-0.3.3.0:=[profile?]
-	>=dev-haskell/mono-traversable-0.7.0:=[profile?]
-	>=dev-haskell/network-2.6.0.2:=[profile?]
-	>=dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/resourcet-1.1.3.3:=[profile?]
-	>=dev-haskell/safe-0.3.8:=[profile?]
-	>=dev-haskell/semigroups-0.8:=[profile?]
-	>=dev-haskell/smallcheck-1.1.1:=[profile?]
-	>=dev-haskell/store-core-0.4:=[profile?] <dev-haskell/store-core-0.5:=[profile?]
-	>=dev-haskell/syb-0.4.4:=[profile?]
-	>=dev-haskell/text-1.2.0.4:=[profile?]
-	>=dev-haskell/th-lift-0.7.1:=[profile?]
-	>=dev-haskell/th-lift-instances-0.1.4:=[profile?]
-	>=dev-haskell/th-orphans-0.13.2:=[profile?]
-	>=dev-haskell/th-reify-many-0.1.6:=[profile?]
-	>=dev-haskell/th-utilities-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?]
-	>=dev-haskell/vector-0.10.12.3:=[profile?]
-	>=dev-haskell/void-0.5.11:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/clock-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-comparison-bench \
-		--flag=-integer-simple \
-		--flag=-small-bench
-}
diff --git a/dev-haskell/stream/Manifest b/dev-haskell/stream/Manifest
deleted file mode 100644
index 47a1b467b771..000000000000
--- a/dev-haskell/stream/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Stream-0.4.7.2.tar.gz 6543 BLAKE2B 5e399aa6fc8fcdd0616d5349f5919f7b620d33651e12dfe8fbc9f9f3ad2d25021b369e7b0fa8a0d7bde1d68efd0fcc8a2b2f25a82fe49f93526eb6b7ac98329a SHA512 ff0b8c51d11cb4d4ed9d07af272bcf63fc4e4e1b4eaa76dce9c80234ba989c5690c41014e5e9bd3acc9faaea048a899f11d350459fc68d93c67f1e62e1fe6504
diff --git a/dev-haskell/stream/metadata.xml b/dev-haskell/stream/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/stream/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/stream/stream-0.4.7.2.ebuild b/dev-haskell/stream/stream-0.4.7.2.ebuild
deleted file mode 100644
index dae773845bad..000000000000
--- a/dev-haskell/stream/stream-0.4.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Stream"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for manipulating infinite lists"
-HOMEPAGE="https://hackage.haskell.org/package/Stream"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/lazysmallcheck-0.3:=[profile?]
-	>=dev-haskell/quickcheck-2.0:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/streaming-commons/Manifest b/dev-haskell/streaming-commons/Manifest
index be8271ae99d3..f4f4a82f11ae 100644
--- a/dev-haskell/streaming-commons/Manifest
+++ b/dev-haskell/streaming-commons/Manifest
@@ -1,5 +1,2 @@
-DIST streaming-commons-0.1.12.1.tar.gz 86864 BLAKE2B 636fde763da8f24e395b5fab2b9901b8b81d0a7fa0eab4d1c4cc5d87c225d3592677d465d49184cf84737f2a65d857fe17da082b73f67b2655c8b2949c08f963 SHA512 43f30a7cacdcec178885cb424a7fd0380682482130ba4019d116468bb87bb187244ff480fc169a27de8192e17c9f17fe38396df1b83827f5dd578112765aa64e
-DIST streaming-commons-0.1.15.4.tar.gz 90218 BLAKE2B c4402ce5caa8dfdcad405e2e0d7bf3666b5ff6e14539794bbd75fe675343993afcca04b125d85c7abd38d7e748f8f8621a2caef07d14be76cfe77a41d2f961ba SHA512 d67548810e1ce06709f3e92345a18f60600a8754879aa348df8f8e4caae9075f155343f01dbdeccf992d20915df959a122a0cf84739efbff73e4048b8e4b60d2
-DIST streaming-commons-0.1.15.tar.gz 87625 BLAKE2B 154eb93235be6198c4e4fe9001be1ed9c88464a8365ba8555890ce582450d2f0341979b9d33007433d78bcf5a292a701656446c7abc4ca817fecc4036dbf9e48 SHA512 2391e0b667f2f011b3d1b09f72f9cba41f69fb16977804465fe4cb6217c1fa2d3461d93d76e3afced283f5ea8b06c57a6ae86a108bd167ed1c9f4bc28f03b053
-DIST streaming-commons-0.1.16.tar.gz 88494 BLAKE2B 6b3a8bd03e0d362c17d28a0066696ddcf23d45dfc543599baf3bd2a81d5603396a51ea24a8cc4690272172f8373a1956c8ba2facb565f56c7239fb8fc37724f0 SHA512 8833a6aadc7b7de9f1e51ceb2c1a6f3761a26dfad9f889a147a0c9f31f14ea6eceb8a6efed30e069e97582f7f5f9eb976aeaba2e5c2e7fd7e173edc163a5f712
-DIST streaming-commons-0.2.1.2.tar.gz 86776 BLAKE2B 01f4a88fb87055bb315278e0391880025b38765faa27e788d3b184c4942af0b8c26e147639e4413a029ae30e03991d083adf49aac89759b2fe2c058e945acd70 SHA512 7b6f39237f9ac13ca2d8205a43fee17c6edfe6609a1119903f8648aed151ef92779af7a8dfdfb108dea679cd26c83dfb5d21285d51f91dec0ad10debd100b8e7
+DIST streaming-commons-0.2.2.4.tar.gz 84330 BLAKE2B 08b729471b3fdc9c5508ffca0e9ce52f38a33b25855f027ae5924e28387e80b369e8c41a33fae49bbb6d5845985954377c2067d56b26995336faa51cb792f83d SHA512 e552bba766e5b816cbd448d1cec86c5c7593f3f13c6da42c74ebf2c9698be3a3174dd922cf70de1b4940b53e580f396a51cebff6b62db305fb0fb48a5c7658bb
+DIST streaming-commons-0.2.2.5.tar.gz 84415 BLAKE2B 0dfe677b3d07e1d125d6b7cd0d55f4e916323b9f9e86a167eb57cd1d149d33b7a860e315ae271efb8a1ba432b9d7c48434151e9cb806f1f77eb286b81e99a115 SHA512 e2e5f401af9c8eefe37596015f8af42225daaf7f0134add1a375b54e30e5b87212943bfa5da3e2f46953eb6942f3efe753e4565e52eb5ba45fef90743708c89d
diff --git a/dev-haskell/streaming-commons/metadata.xml b/dev-haskell/streaming-commons/metadata.xml
index 4be5bac40765..93054479d7ec 100644
--- a/dev-haskell/streaming-commons/metadata.xml
+++ b/dev-haskell/streaming-commons/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides low-dependency functionality commonly needed by various streaming data libraries, such as conduit and pipes.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">streaming-commons</remote-id>
 		<remote-id type="github">fpco/streaming-commons</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild
deleted file mode 100644
index d8be447b7d45..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.15.4.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.15.4.ebuild
deleted file mode 100644
index cce59de078dd..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.1.15.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild
deleted file mode 100644
index d8be447b7d45..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.1.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.16.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.16.ebuild
deleted file mode 100644
index ce0e321781d1..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.1.16.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/network-2.4.0.0:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild
deleted file mode 100644
index 37b8e60c8f39..000000000000
--- a/dev-haskell/streaming-commons/streaming-commons-0.2.1.2.ebuild
+++ /dev/null
@@ -1,34 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
-HOMEPAGE="https://github.com/fpco/streaming-commons"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires network
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/network-2.4.0.0:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-1.8
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild
new file mode 100644
index 000000000000..985d42f2d53a
--- /dev/null
+++ b/dev-haskell/streaming-commons/streaming-commons-0.2.2.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
+HOMEPAGE="https://github.com/fpco/streaming-commons"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/network-2.4.0.0:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( >=dev-haskell/hspec-1.8
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.2.2.5.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.2.2.5.ebuild
new file mode 100644
index 000000000000..a923bb975e81
--- /dev/null
+++ b/dev-haskell/streaming-commons/streaming-commons-0.2.2.5.ebuild
@@ -0,0 +1,33 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Common lower-level functions needed by various streaming data libraries"
+HOMEPAGE="https://github.com/fpco/streaming-commons"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-haskell/async:=[profile?]
+	>=dev-haskell/network-2.4.0.0:=[profile?]
+	|| ( dev-lang/ghc dev-haskell/process[profile?] )
+	dev-haskell/random:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? (
+		>=dev-haskell/hspec-1.8
+		dev-haskell/quickcheck
+	)
+"
diff --git a/dev-haskell/strict/Manifest b/dev-haskell/strict/Manifest
index d1633fdbbbfc..f016b51ca97d 100644
--- a/dev-haskell/strict/Manifest
+++ b/dev-haskell/strict/Manifest
@@ -1 +1,3 @@
-DIST strict-0.3.2.tar.gz 3948 BLAKE2B f882834fdd7b6df5c1f7c56e93f895380ff291096feb73b627ba26c7d6f41555ef6a135d7d5fdac19f28c48869f9987bd510530300f968482538c79fe1842286 SHA512 ca27ee2b557669c409c0417b2005ceb612ad95040fd4a798535cdbc83b8b7a51a36bb66bc2e7bff04b5b965313894a51910a274d67a891530ed119c831bcd686
+DIST strict-0.4.0.1.cabal 4187 BLAKE2B 23e7e19b4688a29ee88ee126b7b8d6a7b0176e49bb1ede058690c5ede987f414461a9335a6d5f2f82fc3db46e7c2a62c1773fa6933edd52ed5f09352a2744357 SHA512 f9c98f54d281905ba6f35df31344a4d210a091def005f076f8f613397dc2fb662199f85159a8b513ff1cb28fcc2ccce31449cb51c3cff476232bb43642587621
+DIST strict-0.4.0.1.tar.gz 12488 BLAKE2B f652ffa4778d2ed50917730848d469f4a6a3ed2ba0973ccc929891c59b7edecf6492cce807eb5bbc3188f4d21799193e43f3fb34b6230f4da1860d31315b153f SHA512 e0c37396fa507ad4d03e46ce4a02ec5bacbd7add75ca551433671871d3e7dde0eb0c620182904d1bdeb7b80e1b311a70f36030cbeae63d8776059150fef30235
+DIST strict-0.5.tar.gz 12564 BLAKE2B 66cca7f7abaa8262602b602e11ebbeb3b14bd4b2608596c9a01a47a1bf2b6dd7d6bb99f4d1b7892f24db6c4407137b3f1aa0825a5bd1b1e6180ede0090dfe212 SHA512 dba8bb370aaea6107d9ea5ff8bd69a84212eaf0f6440189906bf6d3581282b88ae56142958ab041d9ecd06efee7c51dde9d6bafa89b95e666bf1d48d1249c3ed
diff --git a/dev-haskell/strict/metadata.xml b/dev-haskell/strict/metadata.xml
index 3e475704a457..3227376340a4 100644
--- a/dev-haskell/strict/metadata.xml
+++ b/dev-haskell/strict/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides strict versions of some standard Haskell data
-		types (pairs, Maybe and Either). It also contains strict IO
-		operations.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">strict</remote-id>
+		<remote-id type="github">haskell-strict/strict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/strict/strict-0.3.2.ebuild b/dev-haskell/strict/strict-0.3.2.ebuild
deleted file mode 100644
index f79deb0e946c..000000000000
--- a/dev-haskell/strict/strict-0.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Strict data types and String IO"
-HOMEPAGE="http://www.cse.unsw.edu.au/~rl/code/strict.html"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/strict/strict-0.4.0.1.ebuild b/dev-haskell/strict/strict-0.4.0.1.ebuild
new file mode 100644
index 000000000000..30e32e8d884a
--- /dev/null
+++ b/dev-haskell/strict/strict-0.4.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +assoc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="4"
+inherit haskell-cabal
+
+DESCRIPTION="Strict data types and String IO"
+HOMEPAGE="https://github.com/haskellari/strict"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/assoc-1.0.1:=[profile?] <dev-haskell/assoc-1.1:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=assoc
+}
diff --git a/dev-haskell/strict/strict-0.5.ebuild b/dev-haskell/strict/strict-0.5.ebuild
new file mode 100644
index 000000000000..eebc629b95ad
--- /dev/null
+++ b/dev-haskell/strict/strict-0.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: +assoc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Strict data types and String IO"
+HOMEPAGE="https://github.com/haskell-strict/strict"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/assoc-1.1:=[profile?] <dev-haskell/assoc-1.2:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/these-1.2:=[profile?] <dev-haskell/these-1.3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	|| (
+		( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
+		( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+	)
+	dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=assoc
+}
diff --git a/dev-haskell/string-conversions/Manifest b/dev-haskell/string-conversions/Manifest
new file mode 100644
index 000000000000..bccffadc3185
--- /dev/null
+++ b/dev-haskell/string-conversions/Manifest
@@ -0,0 +1 @@
+DIST string-conversions-0.4.0.1.tar.gz 3759 BLAKE2B d43272aa7c275f34d8735950f922607509e402eeec2b847bd96ddc80e6b4fcbe25885d1a81d2d2aa89f6c8ef4eaf9368c7c9b6caf78d2a4a7c9177b8411fd971 SHA512 8bd015215d1a8a48f01abf95f53bd75f67c83dc48c5b4c4f0731e9da924f99c18e9c6de46fdebdd497f5dc577311db1aa31f5144dfc5b1de539e201b9fc1c9f6
diff --git a/dev-haskell/string-conversions/metadata.xml b/dev-haskell/string-conversions/metadata.xml
new file mode 100644
index 000000000000..f2e697c128ab
--- /dev/null
+++ b/dev-haskell/string-conversions/metadata.xml
@@ -0,0 +1,16 @@
+<?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>
+	<longdescription>
+		Provides a simple type class for converting values
+		of different string types
+		into values of other string types.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">soenkehahn/string-conversions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild b/dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild
new file mode 100644
index 000000000000..da01b7b48a6a
--- /dev/null
+++ b/dev-haskell/string-conversions/string-conversions-0.4.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Simplifies dealing with different types for strings"
+HOMEPAGE="https://github.com/soenkehahn/string-conversions#readme"
+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/text-0.11:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck
+		dev-haskell/quickcheck-instances )
+"
diff --git a/dev-haskell/string-qq/Manifest b/dev-haskell/string-qq/Manifest
index d8eeb1b8015b..7a8c4b585a8b 100644
--- a/dev-haskell/string-qq/Manifest
+++ b/dev-haskell/string-qq/Manifest
@@ -1,2 +1 @@
-DIST string-qq-0.0.2.tar.gz 1775 BLAKE2B cd1271b32323439a2f8119a56c469b724c4bf0b8f44a435696e057c7a6b5ff7b2218c8b035176563c4b19b703d7df7ea63778a21562429eaf9aade15c984a517 SHA512 3394f2e129726e5f317693cf145ab91723e9b0352a04e42eeb770e6b5bfcade2c3c8da772f61425641b7c4e48e98542cf1a7544d48cd7f67e21f930236dae9ba
 DIST string-qq-0.0.4.tar.gz 1784 BLAKE2B f52baf9e4635444545276a0609b4231ab87be9e6b1e75bec232910a282f1153bc1fd18e03eeeca03b0b2eac9c41941b2303239df693c9f884f4125722253834c SHA512 1e533afccc4e246da8fb0d76aaa63560c4b936490c002e466bcc0d08aabc0e66f393f935e0f5d93284fcd12a590e7fbe12e88175ac3599183f633eec04bf22b4
diff --git a/dev-haskell/string-qq/metadata.xml b/dev-haskell/string-qq/metadata.xml
index 7f083d78583b..9a37700a12e3 100644
--- a/dev-haskell/string-qq/metadata.xml
+++ b/dev-haskell/string-qq/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		QuasiQuoter for non-interpolated strings, texts and bytestrings.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">string-qq</remote-id>
+		<remote-id type="github">audreyt/string-qq</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/string-qq/string-qq-0.0.2.ebuild b/dev-haskell/string-qq/string-qq-0.0.2.ebuild
deleted file mode 100644
index f4b6202c8279..000000000000
--- a/dev-haskell/string-qq/string-qq-0.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuasiQuoter for non-interpolated strings, texts and bytestrings"
-HOMEPAGE="https://hackage.haskell.org/package/string-qq"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/string-qq/string-qq-0.0.4-r1.ebuild b/dev-haskell/string-qq/string-qq-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..e91d09d195dc
--- /dev/null
+++ b/dev-haskell/string-qq/string-qq-0.0.4-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuasiQuoter for non-interpolated strings, texts and bytestrings"
+HOMEPAGE="https://hackage.haskell.org/package/string-qq"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+CABAL_CHDEPS=(
+	'text >=1.2 && <1.3' 'text >=1.2'
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7
+		>=dev-haskell/text-1.2
+	)
+"
diff --git a/dev-haskell/string-qq/string-qq-0.0.4.ebuild b/dev-haskell/string-qq/string-qq-0.0.4.ebuild
deleted file mode 100644
index 875cc6e1f9c3..000000000000
--- a/dev-haskell/string-qq/string-qq-0.0.4.ebuild
+++ /dev/null
@@ -1,26 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuasiQuoter for non-interpolated strings, texts and bytestrings"
-HOMEPAGE="http://hackage.haskell.org/package/string-qq"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7
-		>=dev-haskell/text-1.2 <dev-haskell/text-1.3 )
-"
diff --git a/dev-haskell/stringable/Manifest b/dev-haskell/stringable/Manifest
deleted file mode 100644
index 82eaa6aff402..000000000000
--- a/dev-haskell/stringable/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stringable-0.1.3.tar.gz 2665 BLAKE2B c50780ce134872b3adf8adec6e3d5c80030033431330e5e76db87ae5aa15cd5897b5c7b39d8c9f3f88d138b94ff5f771ab3e1fff53730863e5e267b34891556c SHA512 f55ac3b1ef18ed9f219da7d7146d625e347d4bc6690e0daf1624692765f06950a3ef4b31a47cb519da519413b36baef2fa9074b04809ef81f9fd2aa7e5c9bfe1
diff --git a/dev-haskell/stringable/metadata.xml b/dev-haskell/stringable/metadata.xml
deleted file mode 100644
index 6a22462afb29..000000000000
--- a/dev-haskell/stringable/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		'Data.Stringable' provides a type class with a set of functions for
-		converting to and from the most often used string-linke types in
-		Haskell.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stringable/stringable-0.1.3.ebuild b/dev-haskell/stringable/stringable-0.1.3.ebuild
deleted file mode 100644
index 19ce797a1565..000000000000
--- a/dev-haskell/stringable/stringable-0.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Stringable type class, in the spirit of Foldable and Traversable"
-HOMEPAGE="https://hackage.haskell.org/package/stringable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?]
-	>=dev-haskell/text-0.11.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/stringbuilder/Manifest b/dev-haskell/stringbuilder/Manifest
index 3eea96f873e8..91ee054a8308 100644
--- a/dev-haskell/stringbuilder/Manifest
+++ b/dev-haskell/stringbuilder/Manifest
@@ -1,3 +1 @@
-DIST stringbuilder-0.4.0.tar.gz 1981 BLAKE2B b92d9c98fd7fd03ab07a5296b0a05acc8ae8b4ee41fe33cc07607e65a42f8cf964a7a97c0d95e0f4c483842a44ac5a58aa9f71c314171e74aca343dd80e94226 SHA512 fead3cedc1851b4b66d443eff50659328c4b5005c2095151ac848314c8eb55fe7061f725d594a792594e7ffe939eb3ef69770e79947a28549b1a4254144ab251
-DIST stringbuilder-0.5.0.tar.gz 2104 BLAKE2B 61ebdfa87153e9725620dfd01d7ee578c5dbc35ca62b1ac607a54ae5cfcce71d2afd73e273cad9eac079f2f06418895f7982998a9bab993bf8c1672953440ece SHA512 39c461a753c1e494b66021e5e277154e3f7aa642414a6848658b30b6ce5d0ca02e6ea9d946361be0ecefe948138f83cc16a5d04341f088666cc131f7a73a38c6
 DIST stringbuilder-0.5.1.tar.gz 2149 BLAKE2B a157b91bc850b3551745537ae7af55cbe51ece2f69001117c116e903cc4c82fa6f9bd96facfe85eeae6dd2090e075a8ae35aea4564aa63c8b121eec8e024d8af SHA512 09cbf01dce82b325393c0d6f0264792695d528a184052f5e1d5dbd3fc181fd11c280e77ba445f1e44c6a8dabc0b267aa90f4a9f1fc34135f1b741d2a5dca9369
diff --git a/dev-haskell/stringbuilder/metadata.xml b/dev-haskell/stringbuilder/metadata.xml
index 7851dd538ce9..937381521944 100644
--- a/dev-haskell/stringbuilder/metadata.xml
+++ b/dev-haskell/stringbuilder/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		&lt;https://github.com/sol/stringbuilder#readme&gt;
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild b/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
deleted file mode 100644
index 406f827437be..000000000000
--- a/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A writer monad for multi-line string literals"
-HOMEPAGE="https://hackage.haskell.org/package/stringbuilder"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild b/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild
deleted file mode 100644
index f447ed19751f..000000000000
--- a/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A writer monad for multi-line string literals"
-HOMEPAGE="https://hackage.haskell.org/package/stringbuilder"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild b/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild
index e211fd85436a..9e8de09b67c1 100644
--- a/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild
+++ b/dev-haskell/stringbuilder/stringbuilder-0.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.5.6.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A writer monad for multi-line string literals"
-HOMEPAGE="http://hackage.haskell.org/package/stringbuilder"
+HOMEPAGE="https://hackage.haskell.org/package/stringbuilder"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/stringprep/Manifest b/dev-haskell/stringprep/Manifest
deleted file mode 100644
index ac565c3458b9..000000000000
--- a/dev-haskell/stringprep/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST stringprep-0.1.5.tar.gz 82062 BLAKE2B 29453e17b56c1c3bc94d87ac29b78cd7c63da4227c34d0d8a2e11a8e381b976cbde71e1498a2a469fbbb330da1cf6004c57620bcf30f166e8e85989cb6ef8c86 SHA512 7899905037927ae4c7d490f56fdf5a7a051daf39324adcb0f4d9a1ad35b06f05b914f3b706ff61c77f694b654e85db7866a7cfc5c8982ccfbbbe6224874a735e
-DIST stringprep-1.0.0.tar.gz 17166 BLAKE2B 14089c667d95f8e4e91450c9990832855857e1f617f1964688adae28c044e3a5668e686eaabdd64cf7eb5cf4b0522fccd33bd3ccc012afce6fc3a25aa0a0b6e5 SHA512 0b6fc990124ccf12fe9a604b0f27a5b99a3d3a5fab7e938390fa9130ed3713cf4a7a610c1ac3b9e8f6138eb7e06a94c23f6bd9be132d1350607fe5abd010ee33
diff --git a/dev-haskell/stringprep/metadata.xml b/dev-haskell/stringprep/metadata.xml
deleted file mode 100644
index 1ef55c7236ac..000000000000
--- a/dev-haskell/stringprep/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Implements the "StringPrep" algorithm
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/stringprep/stringprep-0.1.5.ebuild b/dev-haskell/stringprep/stringprep-0.1.5.ebuild
deleted file mode 100644
index 35a99475661e..000000000000
--- a/dev-haskell/stringprep/stringprep-0.1.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Implements the "StringPrep" algorithm"
-HOMEPAGE="https://hackage.haskell.org/package/stringprep"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ranges-0.2.2:=[profile?]
-		>=dev-haskell/text-0.9:=[profile?]
-		>=dev-haskell/text-icu-0.6:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/stringprep/stringprep-1.0.0.ebuild b/dev-haskell/stringprep/stringprep-1.0.0.ebuild
deleted file mode 100644
index a7c0eed41d39..000000000000
--- a/dev-haskell/stringprep/stringprep-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Implements the "StringPrep" algorithm"
-HOMEPAGE="https://hackage.haskell.org/package/stringprep"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/text-icu-0.6:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck
-		dev-haskell/tasty-th )
-"
diff --git a/dev-haskell/stringsearch/Manifest b/dev-haskell/stringsearch/Manifest
deleted file mode 100644
index 9183882e2ee7..000000000000
--- a/dev-haskell/stringsearch/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST stringsearch-0.3.6.5.tar.gz 38994 BLAKE2B 3e20c83315f2bbff08f4117e4741e30e1f196a6329813be68f48fc0a990733bfeb852294843d210f1d50daeacf2351a76f959fd7a78053bcca0db966f76b7107 SHA512 73f41f09d589f737e79b22d62c034bb9ebb5145ba0179fd4a9885c345ff8bf296e3d2f624a888aa8cd481d3f3c90c7b8a8380e345b8e710bcc83a2c3f821cd27
-DIST stringsearch-0.3.6.6.tar.gz 39679 BLAKE2B 78302abf1f7eba7c3eff4452b0f0187b43954001d7be868ad952e6fb58b80d84b5e08b369a9721e06708d0b7fca49ee39dc2cca3a31ccf151f0ce8a5a86bd905 SHA512 a642934981318b399a7fcfbf0134d5d02d8d072591bcfed7abc57bf6474b86d6c7bc6cf11f44ace6db579a0297877850fd9049be69b61f4f9964cd72455b14e0
diff --git a/dev-haskell/stringsearch/metadata.xml b/dev-haskell/stringsearch/metadata.xml
deleted file mode 100644
index 4ee3843e445d..000000000000
--- a/dev-haskell/stringsearch/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides several functions to quickly
-		search for substrings in strict or lazy ByteStrings.
-		It also provides functions for breaking or splitting
-		on substrings and replacing all occurrences of a
-		substring (the first in case of overlaps) with another.
-		GHC before 6.10 are no longer supported, other compilers
-		only if they support BangPatterns. If you need it to
-		work with other compilers, send a feature request.
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">dafis/stringsearch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
deleted file mode 100644
index 851e2b936708..000000000000
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast searching, splitting and replacing of ByteStrings"
-HOMEPAGE="https://bitbucket.org/dafis/stringsearch"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild
deleted file mode 100644
index 54844c0941cb..000000000000
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -base3,+base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast searching, splitting and replacing of ByteStrings"
-HOMEPAGE="https://bitbucket.org/dafis/stringsearch"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'containers >= 0.3 && < 0.6' 'containers >= 0.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4
-}
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
deleted file mode 100644
index cafc7fcc16eb..000000000000
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -base3,+base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Fast searching, splitting and replacing of ByteStrings"
-HOMEPAGE="https://bitbucket.org/dafis/stringsearch"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4
-}
diff --git a/dev-haskell/syb-with-class/Manifest b/dev-haskell/syb-with-class/Manifest
deleted file mode 100644
index cb7b8e4a76dc..000000000000
--- a/dev-haskell/syb-with-class/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST syb-with-class-0.6.1.11.tar.gz 13225 BLAKE2B 3c7f25fb942025284bbfba49edc7b16ae04716e42337e8668188a80a193b05a06252a29ac2244a35fa25992bc23d7fa998ddaadb85f017112f903cffb89d4fba SHA512 962eb1bcb63ce7cc1789996ad7191e3ab7c20f3c90828fb3535306ca8509ac210e70f42ebd6ac6fc075d50cc5c5e1c15bb735b5d6040c6348dc82453809330f9
-DIST syb-with-class-0.6.1.6.tar.gz 12515 BLAKE2B 77e91af42166d35fddd142244d85c645cfbc1acb889fd2023d7d1cc75970e26742385a6a2a1b4411eb3f550f37b5f5f4ede4d0aeed2ff02ff4a693bf3fdca164 SHA512 4d022ace484780fab85f604d216856e9d122f9a0c98f5d14059866162e2a81f4c8366b0fb2df535089e7cdc76411c2be6b97edee90f27849d3809c7a994a9d02
-DIST syb-with-class-0.6.1.7.tar.gz 12524 BLAKE2B c38ac8d3282a4851be2d65c8f6bcbe7684009ed8a935080047af59bd6f21084b5e61692761d81c0ea0d1f8b7f2e1f38c3957d1cab2d4c258f84724c75f4b1ca4 SHA512 fadb4ff87b7cb1c8332551e62332254d241f50b2a93e5ca71bf1469fd6a7d50399571138810f311b127f0813260687c55543a42384335a44dffeb3f5e29ef1a1
diff --git a/dev-haskell/syb-with-class/metadata.xml b/dev-haskell/syb-with-class/metadata.xml
deleted file mode 100644
index 76c589281b27..000000000000
--- a/dev-haskell/syb-with-class/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Classes, and Template Haskell code to generate instances, for the
-		Scrap Your Boilerplate With Class system.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild
deleted file mode 100644
index 68a24fb717be..000000000000
--- a/dev-haskell/syb-with-class/syb-with-class-0.6.1.11.ebuild
+++ /dev/null
@@ -1,32 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate With Class"
-HOMEPAGE="https://hackage.haskell.org/package/syb-with-class"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'template-haskell >= 2.4 && < 2.15' 'template-haskell >= 2.4 && < 2.16'
-}
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.6.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.6.ebuild
deleted file mode 100644
index c72fc81646da..000000000000
--- a/dev-haskell/syb-with-class/syb-with-class-0.6.1.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate With Class"
-HOMEPAGE="https://hackage.haskell.org/package/syb-with-class"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.7.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.7.ebuild
deleted file mode 100644
index 5303af5e0cd3..000000000000
--- a/dev-haskell/syb-with-class/syb-with-class-0.6.1.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate With Class"
-HOMEPAGE="https://hackage.haskell.org/package/syb-with-class"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/syb/Manifest b/dev-haskell/syb/Manifest
index 5d727a4f3ebc..bb13dfcba431 100644
--- a/dev-haskell/syb/Manifest
+++ b/dev-haskell/syb/Manifest
@@ -1,4 +1,2 @@
-DIST syb-0.4.3.tar.gz 38860 BLAKE2B a4587047b9fbf9a33b9f9e1c94afd4abe87e4f284d91255c9e02863cd1efed9bf4e59fe8441e433adf0aaf81556cfdba2988746f37b6b672d604749f57669035 SHA512 d351eb020dba7c257904b81504cacc233b33864bcc54aad48267db313755243206a2dc4a89d473062d5ca4eff09dd57f0610e99f944717a8e3bbd724775fd6b3
-DIST syb-0.4.4.tar.gz 39215 BLAKE2B 5ef855075b5516ec1c3504ce54a997877873dcb32d6b3050eb7768ded0e10e6b4ef1f652bcb332d3823afb04ffd05724baa9d0e32cdbc271528467e0666d2b93 SHA512 fc916ec2ad4c76c7aa979f2b5040df5088b0a75b1e33e3b2325e2212b59d22db5773fe0803beb1b8b2e0a0a292f5620bcb23201dce8b790b8f4fa2252bd64a33
-DIST syb-0.5.1.tar.gz 39469 BLAKE2B d69ba87a733bc81eb8e4cb24c5a2b6ac3f90a67f6da576f7fdb3a9191b7301805af8029847a578b3750fd672ae238697f7c5e91d34ca4ac1f7046684dc5f4184 SHA512 087bf9a51abe0a09edc0b920f9b91733016701d6ed24184d8f82da87d3b1912b96af4845a3b0ddb41868efede48f90b52d1940633cf0d366559e176cc7771257
-DIST syb-0.7.1.tar.gz 39594 BLAKE2B c7304aac08dde400d26bb296b2f9d5c5d148949d8d5469daadd83110d63f1c3865c21fc187494f5fc11f21708717d917f26fee1bca611d2ea4c998dc0fdfa62a SHA512 63a3138f7f824a9bc611b9d025d4e7adc2da8d420d260b66d56190db683a0afac58e4794e94b13d4aa7b423d949e55a1ed0220c99d368973117b5056fd0f4e65
+DIST syb-0.7.2.1.tar.gz 39768 BLAKE2B 347070741b2ad623fb4e1bfa349ddea475c2c846119d5418ad67dc2d8441a7cfdb4d4557efa2fa9ffa229ae83a1e6a8175423259695417a238c34a128b6fcf71 SHA512 6c356af3cc72f29c362b2859292a96b8107dd3241cff79d717f361e517edf478295f477c0f426fb8d0ae0952cd5c7521114cf1cac1f3faf2b0c96d3b8a335e69
+DIST syb-0.7.2.4.tar.gz 41809 BLAKE2B fe495ebd3b7297c4e3b207cca6d8823b0b264d4310e19d661dc5dc537322721e7d57021e3c3207c5a93b9bc74d4c9cb561e1222e1f487faaf816a1fbecf8a02e SHA512 7a29ee78fe23e4f6eac6b85326b0ffaa62337703ed4ebbd464598bace1fac5c7ad180e1ed95561be957bba41adcd2bb8fd36a88e482b789290a171d2b7a59f85
diff --git a/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch b/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch
deleted file mode 100644
index 2773bdc5a631..000000000000
--- a/dev-haskell/syb/files/syb-0.4.3-ghc-7.10.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- syb-0.4.3-orig/tests/XML.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/XML.hs	2015-01-02 12:47:10.082782760 +1100
-@@ -13,6 +13,7 @@
- 

- import Test.HUnit

- 

-+import Control.Applicative (Alternative(..), Applicative(..))

- import Control.Monad

- import Data.Maybe

- import Data.Generics

-@@ -157,6 +158,17 @@
-                         else Just (tail x, head x)

-                )

- 

-+instance Functor ReadX where

-+  fmap  = liftM

-+

-+instance Applicative ReadX where

-+  pure  = return

-+  (<*>) = ap

-+

-+instance Alternative ReadX where

-+  (<|>) = mplus

-+  empty = mzero

-+

- -- ReadX is a monad!

- instance Monad ReadX where

-   return x = ReadX (\y -> Just (y,x))

---- syb-0.4.3-orig/tests/Perm.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/Perm.hs	2015-01-02 12:47:02.751422866 +1100
-@@ -11,6 +11,7 @@
- 

- import Test.HUnit

- 

-+import Control.Applicative (Alternative(..), Applicative(..))

- import Control.Monad

- import Data.Generics

- 

-@@ -44,6 +45,17 @@
-                         else Just (tail x, head x)

-                )

- 

-+instance Functor ReadT where

-+  fmap  = liftM

-+

-+instance Applicative ReadT where

-+  pure  = return

-+  (<*>) = ap

-+

-+instance Alternative ReadT where

-+  (<|>) = mplus

-+  empty = mzero

-+

- -- ReadT is a monad!

- instance Monad ReadT where

-   return x = ReadT (\y -> Just (y,x))

---- syb-0.4.3-orig/tests/Bits.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/Bits.hs	2015-01-02 12:46:37.842839944 +1100
-@@ -39,6 +39,7 @@
- import Data.Generics

- import Data.Char

- import Data.Maybe

-+import Control.Applicative (Alternative(..), Applicative(..))

- import Control.Monad

- import CompanyDatatypes

- 

-@@ -129,6 +130,16 @@
- data ReadB a = ReadB (Bin -> (Maybe a, Bin))

- unReadB (ReadB f) = f

- 

-+instance Functor ReadB where

-+  fmap  = liftM

-+

-+instance Applicative ReadB where

-+  pure  = return

-+  (<*>) = ap

-+

-+instance Alternative ReadB where

-+  (<|>) = mplus

-+  empty = mzero

- 

- -- It's a monad.

- instance Monad ReadB where

---- syb-0.4.3-orig/tests/Encode.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/Encode.hs	2015-01-02 12:51:48.500949407 +1100
-@@ -6,6 +6,8 @@
- 

- module Encode () where

- 

-+import Control.Applicative (Applicative(..))

-+import Control.Monad (ap, liftM)

- import Data.Generics

- 

- data Bit = Zero | One

-@@ -62,6 +64,11 @@
- -- Sec. 3.3 cont'd

- 

- data EncM a   -- The encoder monad

-+instance Functor EncM where

-+  fmap  = liftM

-+instance Applicative EncM where

-+  pure  = return

-+  (<*>) = ap

- instance Monad EncM

-  where

-   return  = undefined

---- syb-0.4.3-orig/tests/GRead2.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/GRead2.hs	2015-01-02 12:51:27.524567019 +1100
-@@ -10,6 +10,8 @@
- 

- -}

- 

-+import Control.Applicative (Applicative(..))

-+import Control.Monad (ap, liftM)

- import Data.Generics

- 

- gread :: Data a => String -> Maybe a

-@@ -18,6 +20,13 @@
- -- The decoder monad

- newtype DecM a = D (String -> Maybe (String, a))

- 

-+instance Functor DecM where

-+    fmap  = liftM

-+

-+instance Applicative DecM where

-+    pure  = return

-+    (<*>) = ap

-+

- instance Monad DecM where

-     return a = D (\s -> Just (s,a))

-     (D m) >>= k = D (\s ->

---- syb-0.4.3-orig/tests/Ext1.hs	2014-12-31 19:40:41.000000000 +1100
-+++ syb-0.4.3/tests/Ext1.hs	2015-01-02 10:30:39.396517984 +1100
-@@ -1,4 +1,5 @@
- {-# OPTIONS -fglasgow-exts #-}

-+{-# LANGUAGE CPP #-}

- 

- module Ext1 (tests) where

- 

-@@ -11,8 +12,11 @@
- import Test.HUnit

- 

- import Data.Generics

-+#if MIN_VERSION_base(4,8,0)

-+import GHC.Base hiding(foldr)

-+#else

- import GHC.Base

--

-+#endif

- 

- -- Unsafe coerce

- unsafeCoerce :: a -> b

diff --git a/dev-haskell/syb/metadata.xml b/dev-haskell/syb/metadata.xml
index 61d88fcab472..303b3bd841dc 100644
--- a/dev-haskell/syb/metadata.xml
+++ b/dev-haskell/syb/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package contains the generics system described in the
-		"Scrap Your Boilerplate" papers (see http://www.cs.uu.nl/wiki/GenericProgramming/SYB).
-		It defines the 'Data' class of types permitting folding and unfolding
-		of constructor applications, instances of this class for primitive
-		types, and a variety of traversals.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">syb</remote-id>
+		<remote-id type="github">dreixel/syb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/syb/syb-0.4.3.ebuild b/dev-haskell/syb/syb-0.4.3.ebuild
deleted file mode 100644
index 5855cae4653a..000000000000
--- a/dev-haskell/syb/syb-0.4.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl )
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.4.3-ghc-7.10.patch")
diff --git a/dev-haskell/syb/syb-0.4.4.ebuild b/dev-haskell/syb/syb-0.4.4.ebuild
deleted file mode 100644
index 5322ff374d17..000000000000
--- a/dev-haskell/syb/syb-0.4.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RESTRICT=test # ghc-7.10 slightly changed namespacing
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl )
-"
diff --git a/dev-haskell/syb/syb-0.5.1.ebuild b/dev-haskell/syb/syb-0.5.1.ebuild
deleted file mode 100644
index dc0a47b9316c..000000000000
--- a/dev-haskell/syb/syb-0.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RESTRICT=test # ghc-7.10 slightly changed namespacing
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl )
-"
diff --git a/dev-haskell/syb/syb-0.7.1.ebuild b/dev-haskell/syb/syb-0.7.1.ebuild
deleted file mode 100644
index 38f3f4c8007e..000000000000
--- a/dev-haskell/syb/syb-0.7.1.ebuild
+++ /dev/null
@@ -1,26 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Scrap Your Boilerplate"
-HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/mtl )
-"
diff --git a/dev-haskell/syb/syb-0.7.2.1.ebuild b/dev-haskell/syb/syb-0.7.2.1.ebuild
new file mode 100644
index 000000000000..03f6081203ea
--- /dev/null
+++ b/dev-haskell/syb/syb-0.7.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate"
+HOMEPAGE="https://www.cs.uu.nl/wiki/GenericProgramming/SYB"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/mtl
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/syb/syb-0.7.2.4.ebuild b/dev-haskell/syb/syb-0.7.2.4.ebuild
new file mode 100644
index 000000000000..4908a67d58a4
--- /dev/null
+++ b/dev-haskell/syb/syb-0.7.2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate"
+HOMEPAGE="https://github.com/dreixel/syb"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/system-fileio/Manifest b/dev-haskell/system-fileio/Manifest
index 4bf50fab806a..833cc9256604 100644
--- a/dev-haskell/system-fileio/Manifest
+++ b/dev-haskell/system-fileio/Manifest
@@ -1,2 +1 @@
-DIST system-fileio-0.3.16.3.tar.gz 15296 BLAKE2B 18a48c74794f9b2fbe33a181ce007984fdfab61202832a1bab395a3b3c1ba25aa5f45649f2b33e7608d422ad92a42719e6997ed9ab3ca4370e055d366476d779 SHA512 74ee4028caa77194120d66316677cc0f184fd4af5c4feaa7d713145b97dab8bcebc2f4b971464f9a68f8e304021d0fe5c52272bb282db0925559ff0ff6937842
 DIST system-fileio-0.3.16.4.tar.gz 15632 BLAKE2B 88c773cd78cf21a445c45a7b1548b77ed3624af54f54d0a0388b9c41ffe4595299e32ba4ffa5dad1234f810de73b07f47b16e8e2ad1b490f63811d193523abdb SHA512 68530cd11b25aa8a05967d3f51091ea57a5be138b672bd5373918163281c55a91b60dea03bdd22bcd4ba1d6bb26e2ed14660ce55bbdaf2737d2dd2b7e608d698
diff --git a/dev-haskell/system-fileio/metadata.xml b/dev-haskell/system-fileio/metadata.xml
index b1faa3826194..985c161da6a5 100644
--- a/dev-haskell/system-fileio/metadata.xml
+++ b/dev-haskell/system-fileio/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild b/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild
deleted file mode 100644
index 41043e3c92cd..000000000000
--- a/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Consistent filesystem interaction across GHC versions (deprecated)"
-HOMEPAGE="https://github.com/fpco/haskell-filesystem"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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
-		>=dev-haskell/temporary-1.1 <dev-haskell/temporary-2.0
-		>=dev-haskell/transformers-0.2 )
-"
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 d8f114feb58c..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
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6.9999
 
@@ -14,16 +14,20 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+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/system-filepath/Manifest b/dev-haskell/system-filepath/Manifest
index 6df8593bb0f0..ec4300bf5c0a 100644
--- a/dev-haskell/system-filepath/Manifest
+++ b/dev-haskell/system-filepath/Manifest
@@ -1,3 +1 @@
-DIST system-filepath-0.4.13.4.tar.gz 16590 BLAKE2B de9203bb34bb885a9b08fa7fa3f5ac977698fd9edf6af9ebb4db512e04ea352d1770ce1ea75f80da546dac707d4627d940f176177eac497b74d47f7e5dc07696 SHA512 81df3ed7bee9ae8b568533361d1b6574cc26c24218922005f03d70828624b6fd279342753c571921c62f69b6dadce4eb6c88cf4ef5cb76c536c5113c37f5cc38
 DIST system-filepath-0.4.14.tar.gz 16663 BLAKE2B 2a05dfcb1a7dace3d194e1d137d5d52ffc52eb96b1c43b4b9e6a97fce17db06ffac2a923537af0607451042d1ffa582567573a7f581a10a06971c4d1bddaf5ee SHA512 d858b077516ecb76e27d032fd123aadbbbb154afea87fab93f148aa8a0007587c1fb04d87217cf0b51a80e9a81ab20357dcc5e345899e1c2b6513900da1e6768
-DIST system-filepath-0.4.8.tar.gz 14497 BLAKE2B 4e61d45f384043da31b32b64eaa522274da66801c13bd81370cdd777b18861b2812e297766252acae43aac36e7bcf82b53061609d9f457853d8c1730b8591edc SHA512 ee23a468186f1e709ec8b39d3b6855038a9f5a7fa4b37b37407b8dbed7668ddb4efe21e877a51b94b20bc3d9a59dd9a525b7378783ac9a0c7a4183ba615b01be
diff --git a/dev-haskell/system-filepath/metadata.xml b/dev-haskell/system-filepath/metadata.xml
index ffc4e58c8540..ca1506132078 100644
--- a/dev-haskell/system-filepath/metadata.xml
+++ b/dev-haskell/system-filepath/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		High-level, byte-based file and directory path manipulations
-	</longdescription>
 	<upstream>
 		<remote-id type="github">fpco/haskell-filesystem</remote-id>
 	</upstream>
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.13.4.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.13.4.ebuild
deleted file mode 100644
index f0bc4522f532..000000000000
--- a/dev-haskell/system-filepath/system-filepath-0.4.13.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations (deprecated)"
-HOMEPAGE="https://github.com/fpco/haskell-filesystem"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11.0.6:=[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
-		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild
new file mode 100644
index 000000000000..241a70be2a1b
--- /dev/null
+++ b/dev-haskell/system-filepath/system-filepath-0.4.14-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: uses dev-haskell/chell-quickcheck
+inherit haskell-cabal
+
+DESCRIPTION="High-level, byte-based file and directory path manipulations (deprecated)"
+HOMEPAGE="https://github.com/fpco/haskell-filesystem"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/text-0.11.0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild
deleted file mode 100644
index fbc18bba4e40..000000000000
--- a/dev-haskell/system-filepath/system-filepath-0.4.14.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Drop test-suite: uses dev-haskell/chell-quickcheck
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations (deprecated)"
-HOMEPAGE="https://github.com/fpco/haskell-filesystem"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test
-
-RDEPEND=">=dev-haskell/semigroups-0.11:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
deleted file mode 100644
index 9eb658a75a95..000000000000
--- a/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="High-level, byte-based file and directory path manipulations"
-HOMEPAGE="https://john-millikin.com/software/haskell-filesystem/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'deepseq >= 1.1 && < 1.4' 'deepseq >= 1.1' \
-		'text >= 0.7.1 && < 0.12' 'text >= 0.7.1'
-}
diff --git a/dev-haskell/system-posix-redirect/Manifest b/dev-haskell/system-posix-redirect/Manifest
deleted file mode 100644
index 2ac12aba5b8c..000000000000
--- a/dev-haskell/system-posix-redirect/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST system-posix-redirect-1.1.0.1.tar.gz 3581 BLAKE2B d93a0ec31e8ad900871469e501feccbd0094f5b8be7671f44282e26a7a2a72d7f8b74294af57d13d9658aa1fa6ec0e73e26e6e85d967254dc38ed462599edbdd SHA512 3a41668540ebff5ce706db331bb3c736895bd6a8fc11926884ff3e96622bb047c5b715468f4db81d0ac6acd15144ae9dbb71f087173244e29ba5b2a242f43c95
diff --git a/dev-haskell/system-posix-redirect/metadata.xml b/dev-haskell/system-posix-redirect/metadata.xml
deleted file mode 100644
index 01dac7da10fe..000000000000
--- a/dev-haskell/system-posix-redirect/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Due to the design of POSIX, it is possible to temporarily overload the
-		file descriptors corresponding to stdout and stderr to point to an
-		arbitrary pipe. It is, however, tricky to get right. This module gets
-		it right, as far as such a terrible hack can be made right. It can be
-		used to make misbehaving third-party C libraries stop spewing to
-		standard output. Warning: the module author has concluded that due to
-		lack of portability, this module should not be used in any serious
-		sytem. But, for those who like living dangerously...
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild b/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
deleted file mode 100644
index d8aeab1a8c21..000000000000
--- a/dev-haskell/system-posix-redirect/system-posix-redirect-1.1.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A toy module to temporarily redirect a program's stdout"
-HOMEPAGE="https://hackage.haskell.org/package/system-posix-redirect"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/tagged/Manifest b/dev-haskell/tagged/Manifest
index 7ceed96ba3c3..885373ffc2eb 100644
--- a/dev-haskell/tagged/Manifest
+++ b/dev-haskell/tagged/Manifest
@@ -1,5 +1,3 @@
-DIST tagged-0.6.1.tar.gz 5238 BLAKE2B 0b1e294948a91d65fadd532f88acaa6d039133e7a3792d3dba80c31e6829c4b9c093fcbecf70f0927a453c3e4b529ee166d5db9d81572a6d7e7aea8ef310bf84 SHA512 36dc032297214123c2f1785a71b54f6427b91a1be254e16add864475fc8853de9a3112cd205244975d9d8ff2fae71941d9ea5cb23d9c759225bae56cb338532a
-DIST tagged-0.7.3.tar.gz 5634 BLAKE2B 38c5e6864cbfd38e5105368703eab45034206a7ce654ad233347a8f81b53b8bcc1097a1e976e022845c507ce30a1bfeb8ccac2f79744c32f3dbeca82fae76440 SHA512 10122b49b7ac0a87243f7fd577fe799046099f1121c912e752d34400a0991e541a3fb9e565235b5335a65617cc7c56519f20922f47e5f1afb8cf8bc67f620b66
-DIST tagged-0.8.2.tar.gz 8957 BLAKE2B 100d00dc4a1e34eca0110e390b3e6d14365031fc14881e6bddbeb5c8765dffd939092036431a3d03a6d304ede020cf5cb5604b996d06b3c706efdfd0e87dedef SHA512 3511d7564e87b853c6514e0f89b2ec617eac175d58dc7de770987dd8f51a3747c191b7bc9ad3003edb433751940dd4c06b8e4082cf0e8c0409eda70a7c486765
-DIST tagged-0.8.4.tar.gz 10055 BLAKE2B 30cb546f6e65b7606c2630eee1ef1585d5d2ee88cdfb691ece3fd5edf64dec0f2a00311b4d489cd12094333b400853302f1761937fc8863f94ee27019db83a9f SHA512 ea11f6fa0658dbf9f40770316873b5bd5a815437cb51b39fbc223f2e26509042feaaefbee815a0f7473fb6b4bd8f8a941f27daf0bfbac08ff1a912937e7328fc
-DIST tagged-0.8.6.tar.gz 11759 BLAKE2B 6461a8489d782c1d5d49454a662c64a2cd3108ca7c0fcbe598cb8f11c7792736a61855d3c830234e31d8de900b2a191d7529557711d4724c51d38a88a7948637 SHA512 8cec49ea6f54ba84109ec6068cce209321bfa4662d5acdf75e4019087e2890e3056bf13a237cb5caf3fec597b05b710ebbfb74e06b736b7fb2f87941defeb814
+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
diff --git a/dev-haskell/tagged/metadata.xml b/dev-haskell/tagged/metadata.xml
index 01417b693725..af4a3d0086cc 100644
--- a/dev-haskell/tagged/metadata.xml
+++ b/dev-haskell/tagged/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">tagged</remote-id>
 		<remote-id type="github">ekmett/tagged</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tagged/tagged-0.6.1.ebuild b/dev-haskell/tagged/tagged-0.6.1.ebuild
deleted file mode 100644
index 0becf2c32f00..000000000000
--- a/dev-haskell/tagged/tagged-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell 98 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 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/tagged/tagged-0.7.3.ebuild b/dev-haskell/tagged/tagged-0.7.3.ebuild
deleted file mode 100644
index d90a6f92f763..000000000000
--- a/dev-haskell/tagged/tagged-0.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-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 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tagged/tagged-0.8.2.ebuild b/dev-haskell/tagged/tagged-0.8.2.ebuild
deleted file mode 100644
index ba216bb17ee5..000000000000
--- a/dev-haskell/tagged/tagged-0.8.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-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 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=deepseq
-}
diff --git a/dev-haskell/tagged/tagged-0.8.4.ebuild b/dev-haskell/tagged/tagged-0.8.4.ebuild
deleted file mode 100644
index 81d3872ce798..000000000000
--- a/dev-haskell/tagged/tagged-0.8.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +deepseq
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=deepseq
-}
diff --git a/dev-haskell/tagged/tagged-0.8.6.1.ebuild b/dev-haskell/tagged/tagged-0.8.6.1.ebuild
new file mode 100644
index 000000000000..64c32b886599
--- /dev/null
+++ b/dev-haskell/tagged/tagged-0.8.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
+HOMEPAGE="https://github.com/ekmett/tagged"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=deepseq \
+		--flag=transformers
+}
diff --git a/dev-haskell/tagged/tagged-0.8.6.ebuild b/dev-haskell/tagged/tagged-0.8.6.ebuild
deleted file mode 100644
index 780f35eefe27..000000000000
--- a/dev-haskell/tagged/tagged-0.8.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: +deepseq,+transformers
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-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 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'template-haskell >= 2.8 && < 2.15' 'template-haskell >= 2.8'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=deepseq \
-		--flag=transformers
-}
diff --git a/dev-haskell/tagged/tagged-0.8.7.ebuild b/dev-haskell/tagged/tagged-0.8.7.ebuild
new file mode 100644
index 000000000000..790521347b67
--- /dev/null
+++ b/dev-haskell/tagged/tagged-0.8.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +deepseq,+transformers
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell 98 phantom types to avoid unsafely passing dummy arguments"
+HOMEPAGE="https://github.com/ekmett/tagged"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=deepseq \
+		--flag=transformers
+}
diff --git a/dev-haskell/tagshare/Manifest b/dev-haskell/tagshare/Manifest
deleted file mode 100644
index c538835f9a77..000000000000
--- a/dev-haskell/tagshare/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tagshare-0.0.tar.gz 2127 BLAKE2B f03fa580c08c45fe26f40cea2490f29a76e88f57d0af85c77c955b420476c28ea518e7ff873e9f8074993f103c5326de897b73fe575917c3b1d1877f65742586 SHA512 872592757bba6b21846888aeec1b36cc4f7c9cd602a299bb493763bd1c38d52d84419319a6761f5019e565081aceedc343cc1e52fcf5449a78e709da6164051f
diff --git a/dev-haskell/tagshare/metadata.xml b/dev-haskell/tagshare/metadata.xml
deleted file mode 100644
index 5938819251da..000000000000
--- a/dev-haskell/tagshare/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		TagShare supplies a monad for sharing values based on tags
-		and types. Each tag and type is bound to at most one value
-		in a dynamic map.
-		
-		The principal use of this package is to ensure that
-		constant class members or other overloaded values are
-		shared.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/tagshare/tagshare-0.0.ebuild b/dev-haskell/tagshare/tagshare-0.0.ebuild
deleted file mode 100644
index 0d5716ef946f..000000000000
--- a/dev-haskell/tagshare/tagshare-0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="TagShare - explicit sharing with tags"
-HOMEPAGE="https://hackage.haskell.org/package/tagshare"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1:=[profile?]
-		<dev-haskell/mtl-3:=[profile?]
-		>=dev-lang/ghc-7.4.2:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/tagsoup/Manifest b/dev-haskell/tagsoup/Manifest
index a1c41868c2d7..15fce4574a59 100644
--- a/dev-haskell/tagsoup/Manifest
+++ b/dev-haskell/tagsoup/Manifest
@@ -1,4 +1 @@
-DIST tagsoup-0.13.10.tar.gz 44587 BLAKE2B cae2de2bd1edadee09033969afbc3bd7b35eb22474a4d4f54ba58eb38525d222606b3d1bf2984379cdf93c69fbc78ef4333842a1221aae69db610cf87f301e54 SHA512 96a3ebd9864279e67ccf2a0c05a37d2dbf4719eb3ef0fba753bf4bb11f9161fb895ed8f8cf86e04e790f8fbe277450379fe517c59ecc068c4586d3ced316b781
-DIST tagsoup-0.13.3.tar.gz 42279 BLAKE2B c4b394e6c60a6e4f7d6964ca63da4dbfdf26b4f14b4adb99aa7121011c1435c1f4af7235301df34d4c4e2ca5a459577a14866c518ea4e76c32771b0381e95b15 SHA512 ee6e7c2459f395facfdf9c28c0903e5279c781d8a5cd0745c2e3648c8eed7fdc84c372b271febce13b8b433ecded5cd7c97a3f169121908f23bb28c2b2f104b0
-DIST tagsoup-0.13.8.tar.gz 43676 BLAKE2B 4b275ab4921934187c62f85013b7f4d452e5412b2c1891678cfe8174395a1b8535d42f7db1686cd3ffc3949bdf4790db5483e9788b409edf9317c047f6915af8 SHA512 e05325090380950467f5327c4988c31d8c1cb9fd45668e6926c428d5ad33d589c2dc5c6b7e38c5349a980587823709b60a49c242d5ffdf76b1a58264217083c5
 DIST tagsoup-0.14.8.tar.gz 43894 BLAKE2B 68688af3ef280058f51b35a99f654af53d1b90a2303ebb8a95b0d936e7c68aed70dd6624d2c14fdcfc9a8cfb221ef1cad3768fa770ab19e65cba3adb1d0d3442 SHA512 2fc0adfc43402e537dac043682d876cae29834ebe9bcec7b53cc26ba769324b987be9cd86f9174f52344635342b7ff8f6cc2186be92c5bf4b359968f3cdd17e4
diff --git a/dev-haskell/tagsoup/metadata.xml b/dev-haskell/tagsoup/metadata.xml
index 773bfa6c800f..1163f7241ef4 100644
--- a/dev-haskell/tagsoup/metadata.xml
+++ b/dev-haskell/tagsoup/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
@@ -13,10 +13,6 @@
 		
 		Users should start from the "Text.HTML.TagSoup" module.
 	</longdescription>
-	<use>
-		<flag name="download">Build with Download module.</flag>
-		<flag name="testprog">Build the test program.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">ndmitchell/tagsoup</remote-id>
 	</upstream>
diff --git a/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild b/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild
deleted file mode 100644
index 5336220bc374..000000000000
--- a/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and extracting information from (possibly malformed) HTML/XML documents"
-HOMEPAGE="https://github.com/ndmitchell/tagsoup#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="download testprog"
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	download? ( dev-haskell/network:=[profile?] )
-	testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag download download) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild b/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild
deleted file mode 100644
index 547ac95f1b42..000000000000
--- a/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and extracting information from (possibly malformed) HTML/XML documents"
-HOMEPAGE="http://community.haskell.org/~ndm/tagsoup/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="download testprog"
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	download? ( dev-haskell/network:=[profile?] )
-	testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'executable tagsoup' 'executable haskell-tagsoup'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag download download) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/tagsoup/tagsoup-0.13.8.ebuild b/dev-haskell/tagsoup/tagsoup-0.13.8.ebuild
deleted file mode 100644
index 82d8c767daef..000000000000
--- a/dev-haskell/tagsoup/tagsoup-0.13.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Parsing and extracting information from (possibly malformed) HTML/XML documents"
-HOMEPAGE="https://github.com/ndmitchell/tagsoup#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="download testprog"
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	download? ( dev-haskell/network:=[profile?] )
-	testprog? ( >=dev-haskell/quickcheck-2.4:2=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag download download) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild b/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
index 7be66e504539..86194d738e59 100644
--- a/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
+++ b/dev-haskell/tagsoup/tagsoup-0.14.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/tagstream-conduit/Manifest b/dev-haskell/tagstream-conduit/Manifest
deleted file mode 100644
index f2b550e40824..000000000000
--- a/dev-haskell/tagstream-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tagstream-conduit-0.5.5.3.tar.gz 9813 BLAKE2B efacae2982642e61470312a1374b522ae5d7c2d4e2b4e115c13b246a42c910604e9d51dc9bfee6163730b4dfd35bc7f87c8e3c522b36cb7a7bcafbcbb34bf392 SHA512 84625975df6c6c315011ebfd63d551b22c00927fa9add390d9e723bc104d4a7881743aaf6bceae0ff42efc6056a314baddb594fd5e344449333ea7ff6cbcf154
diff --git a/dev-haskell/tagstream-conduit/metadata.xml b/dev-haskell/tagstream-conduit/metadata.xml
deleted file mode 100644
index a3fa2f565a21..000000000000
--- a/dev-haskell/tagstream-conduit/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Tag-stream is a library for parsing HTML//XML to a token stream.
-		It can parse unstructured and malformed HTML from the web.
-		It also provides an Enumeratee which can parse streamline html, which means it consumes constant memory.
-		You can start from the `tests/Tests.hs` module to see what it can do.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yihuang/tagstream-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.5.3.ebuild b/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.5.3.ebuild
deleted file mode 100644
index b7003ee0d08a..000000000000
--- a/dev-haskell/tagstream-conduit/tagstream-conduit-0.5.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="streamlined html tag parser"
-HOMEPAGE="https://github.com/yihuang/tagstream-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.0:=[profile?]
-	>=dev-haskell/data-default-0.5.0:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/xml-conduit-1.1.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/tar-conduit/Manifest b/dev-haskell/tar-conduit/Manifest
deleted file mode 100644
index 9ee9b6e98f87..000000000000
--- a/dev-haskell/tar-conduit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tar-conduit-0.3.2.tar.gz 44525 BLAKE2B 2e978f73fa78b3254106bdcbd7c2a5d6d6b7d624c717267b5f95cb69497675e64d9367f0dd5ea18575cc9574143baecc9e4f84b29600708b3660fd7d7b15477d SHA512 18efa362953641092ee5b4f65b32a3337af077608487e02421cf6427209592654b3b2d15f9b21835f4596434b65aa9a1f80b9f3408050c09b57f6be5cd2c73f7
diff --git a/dev-haskell/tar-conduit/metadata.xml b/dev-haskell/tar-conduit/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/tar-conduit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild b/dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild
deleted file mode 100644
index 05f37b9e9fbc..000000000000
--- a/dev-haskell/tar-conduit/tar-conduit-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,31 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Extract and create tar files using conduit for streaming"
-HOMEPAGE="https://github.com/snoyberg/tar-conduit#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-combinators-1.0.8.1
-	>=dev-haskell/conduit-1.3
-	dev-haskell/safe-exceptions
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	test? ( dev-haskell/conduit-extra
-		dev-haskell/hspec
-		dev-haskell/quickcheck
-		dev-haskell/weigh )
-"
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index 5f25d79fba39..0ef9757a471c 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -1,5 +1,2 @@
-DIST tar-0.4.0.1.tar.gz 17875 BLAKE2B c8de1ee0a04df64327f2464ac25b5d13c188aea0dcd84e7efa9487cce7af8bc30dd644771420773e80183a8be1503716c6fba5c8560bf27e63d17bc1202bd2b7 SHA512 7cb042f77dc70b856b4dfd5d0a06620f669f9260a84800ad27e1803ec24a50932bb3775b35a6cc91cefb30ea4cd2b453dd6566007d586327acea0edccc0dee47
-DIST tar-0.4.2.1.tar.gz 29825 BLAKE2B 0a23f3742eaf7b4958dce1669d7be40a73f58eadf6c9c9a6926c10d2b0728d2e73a1343eb5e188e12634bc0ff9aa989d654536af39619c28c0d8914f603b8afe SHA512 8684f20fd31a1d4c83fd6b74e6662eac8f8b0075856b47105c5dc72f39eee5ef3ddbf1b45d2cc730f924b385df4e74ff82a03ec45489662dac1b8b91170397f0
-DIST tar-0.5.0.3.tar.gz 38764 BLAKE2B 3761544917248f02c08e48b00c10975e622b6ef1b296fd57449edec95ba6bde509429259baae55c9a7139afa27e671e15bafcb4b93079e01d4edf7041367aa5e SHA512 f90899e3a5fe097645e29b143cbf25ccf131f8b794bfea655e5b562369e4d7d492df78e53710d3ca4776233f07ace9335242eafbd3b4ba8d0e1d4664fd24a27d
-DIST tar-0.5.1.0.tar.gz 39271 BLAKE2B 7867fb111bd5f7efe93899116fa9f36dd52e61089bfb3431a9297521c36f8c9a1c051cb141073d14a9aaa74fd95f2a695ea1a5f057162886b40dafa79ddd104e SHA512 60992ef69be64430d7d322816940182ce91669cb31b6612789abf0fca42e8fa292b2f96f284b1857d82e58e159bc5bebdefef97f7c8e3edb85be4836f0b5eb1c
+DIST tar-0.5.1.1-rev6.cabal 5459 BLAKE2B 5d5d32a2273b470406f0c373114108587657d560d1f75b30419af15a32bc2e6af5d210bd478ca2625f75027f0fdab824f9d4436a4815588eb94183d637b4a601 SHA512 53bacac3b92d359faab5b9a2124c6d95e03493063065a44dd4609267e27c055231fdd35ef48e4b0b494ea9bc973132b15c76f78bf86cf1ce189d7755e45d8d3e
 DIST tar-0.5.1.1.tar.gz 39155 BLAKE2B 8e85489e3b43044dab8ec4405413873c2be4d50cfd4a5adc80e3ec231428a120db1faa033d2e57643dad40f18a934a381f3d5657838aad42d2aa7eea951c1faf SHA512 8d0a8d3ae178570e0842a2321a7fc86a6bba28c471ec27bafbc07fc4ac0e4183f8113c99ebc7126dc71759c33083791122be32563fb0d5a2b2d39cb3b36171f2
diff --git a/dev-haskell/tar/metadata.xml b/dev-haskell/tar/metadata.xml
index b45e7c641aae..dde923e3418a 100644
--- a/dev-haskell/tar/metadata.xml
+++ b/dev-haskell/tar/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library is for working with .tar@ archive files. It
-		can read and write a range of common variations of archive
-		format including V7, USTAR, POSIX and GNU formats. It provides
-		support for packing and unpacking portable archives. This
-		makes it suitable for distribution but not backup because
-		details like file ownership and exact permissions are not
-		preserved.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">tar</remote-id>
+		<remote-id type="github">haskell/tar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tar/tar-0.4.0.1.ebuild b/dev-haskell/tar/tar-0.4.0.1.ebuild
deleted file mode 100644
index 60eaf61342a5..000000000000
--- a/dev-haskell/tar/tar-0.4.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Reading, writing and manipulating '.tar' archive files"
-HOMEPAGE="https://hackage.haskell.org/package/tar"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/tar/tar-0.4.2.1.ebuild b/dev-haskell/tar/tar-0.4.2.1.ebuild
deleted file mode 100644
index d2e9fb32e6a4..000000000000
--- a/dev-haskell/tar/tar-0.4.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reading, writing and manipulating '.tar' archive files"
-HOMEPAGE="https://hackage.haskell.org/package/tar"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/old-time
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
diff --git a/dev-haskell/tar/tar-0.5.0.3.ebuild b/dev-haskell/tar/tar-0.5.0.3.ebuild
deleted file mode 100644
index e478bb4e3d1c..000000000000
--- a/dev-haskell/tar/tar-0.5.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reading, writing and manipulating '.tar' archive files"
-HOMEPAGE="https://hackage.haskell.org/package/tar"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/bytestring-handle
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
diff --git a/dev-haskell/tar/tar-0.5.1.0.ebuild b/dev-haskell/tar/tar-0.5.1.0.ebuild
deleted file mode 100644
index bf3187f27982..000000000000
--- a/dev-haskell/tar/tar-0.5.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reading, writing and manipulating '.tar' archive files"
-HOMEPAGE="https://hackage.haskell.org/package/tar"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-#gienah: tests pass for me with QC-2.10.1
-#RESTRICT=test # QC-2.10 manages to generate counterexamples
-
-RDEPEND=">=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	<dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/bytestring-handle
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'tasty            >= 0.10 && <0.12' 'tasty            >= 0.10' \
-		'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
-}
diff --git a/dev-haskell/tar/tar-0.5.1.1-r3.ebuild b/dev-haskell/tar/tar-0.5.1.1-r3.ebuild
new file mode 100644
index 000000000000..d4debed42063
--- /dev/null
+++ b/dev-haskell/tar/tar-0.5.1.1-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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
+RESTRICT="test" # Test deps need porting
+
+DESCRIPTION="Reading, writing and manipulating \".tar\" archive files"
+HOMEPAGE="https://hackage.haskell.org/package/tar"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+#	test? (
+#		dev-haskell/bytestring-handle
+#		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+#		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.5
+#		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11
+#	)
diff --git a/dev-haskell/tar/tar-0.5.1.1.ebuild b/dev-haskell/tar/tar-0.5.1.1.ebuild
deleted file mode 100644
index 0c341acd6d27..000000000000
--- a/dev-haskell/tar/tar-0.5.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Reading, writing and manipulating tar files"
-HOMEPAGE="https://hackage.haskell.org/package/tar"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bytestring-builder-0.10.4.0.2:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	<dev-haskell/old-time-1.2:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( dev-haskell/bytestring-handle
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'tasty            >= 0.10 && <0.12' 'tasty            >= 0.10' \
-		'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8'
-}
diff --git a/dev-haskell/tasty-ant-xml/Manifest b/dev-haskell/tasty-ant-xml/Manifest
deleted file mode 100644
index c9279c03dc67..000000000000
--- a/dev-haskell/tasty-ant-xml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tasty-ant-xml-1.0.1.tar.gz 3935 BLAKE2B dcbbd5e38e387f4300097dc1c4ac98d1b8493a1cddce286c71aeaea3e8f13cfeeaf2f4d1c8cc48ebcc629324e9e7fcd0496a895a888bfea524ebcc199476fd81 SHA512 37ee0731984990e2ab1a6b166c289e85a3b9f37fac2b997fdc4f85934f0108bbc5b3e12e2ae119f2456649f0eb54e8620e38bdc1fc6b95bd5b3ffe889ea763a1
-DIST tasty-ant-xml-1.0.2.tar.gz 3940 BLAKE2B 3ebe898064bd07c8d6323cdbc8bfd19540488bdb9a464f7508def40501ad9b06d205bb021070073f30d302b2c2d5bc39173e63af9fa87a7fe7801a599c7a7227 SHA512 034e6201413096f2f714287375325d7bd2e716e3cac4c8af68a294925db655ee9c5802bb5a0bc4c32778fc7e121036f56f76b892fe965376e4ded721860c302b
-DIST tasty-ant-xml-1.1.6.tar.gz 4831 BLAKE2B 25ffbfb3a5873d5cda24049d39dc5ad814805b63a7f1cadd2ff5e6eb2ab9ee9aa4997bde49fc0d5949780543a05f0fe1b29946852f436f0c1ccc34c7a1850c59 SHA512 e4a2d665d05acfd4e996a0568ccaacf61db4452e3720701874b1469ff39ef1f9646ab91780633c7c18bdf53bad28e72a63aa2a1cb82cbc879bd3e382fe9099ff
diff --git a/dev-haskell/tasty-ant-xml/metadata.xml b/dev-haskell/tasty-ant-xml/metadata.xml
deleted file mode 100644
index bb5cb7a5bcc1..000000000000
--- a/dev-haskell/tasty-ant-xml/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ocharles/tasty-ant-xml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild
deleted file mode 100644
index 5f3f3b07b9f4..000000000000
--- a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Render tasty output to XML for Jenkins"
-HOMEPAGE="https://github.com/ocharles/tasty-ant-xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/generic-deriving-1.6.2:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.11:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-haskell/xml-1.3.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild
deleted file mode 100644
index 6e9902d89825..000000000000
--- a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Render tasty output to XML for Jenkins"
-HOMEPAGE="https://github.com/ocharles/tasty-ant-xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/generic-deriving-1.6.2:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-haskell/xml-1.3.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.1.6.ebuild b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.1.6.ebuild
deleted file mode 100644
index 289f2280ebd9..000000000000
--- a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.1.6.ebuild
+++ /dev/null
@@ -1,30 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Render tasty output to XML for Jenkins"
-HOMEPAGE="https://github.com/ocharles/tasty-ant-xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/generic-deriving-1.6.2:=[profile?]
-	>=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-1.3:=[profile?]
-	>=dev-haskell/xml-1.3.13:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/tasty-expected-failure/Manifest b/dev-haskell/tasty-expected-failure/Manifest
index 68cb8ad5cc9f..e2030edfda58 100644
--- a/dev-haskell/tasty-expected-failure/Manifest
+++ b/dev-haskell/tasty-expected-failure/Manifest
@@ -1 +1,2 @@
 DIST tasty-expected-failure-0.11.1.2.tar.gz 3781 BLAKE2B 04101b477457747abbf1a90fed80ab8692e3f771f27fae8310c0451839b38efadf1751ae302a1bac0f020e01533030563c45a2c0d75b03f9cda88ee23d1d8e12 SHA512 31f89d64a1f700a2563b291d287f559e023b0b1059cf5ad35eb9a8b2d4a7d90b2ffced828017b3e86d7ece0b125787f7512e9f4745c75d38bbc688e09031aae5
+DIST tasty-expected-failure-0.12.3.tar.gz 6016 BLAKE2B 2e3b61686aa45c0bdcc593e77a6fed358f526aac5e0abd93b6894a6ab64637ec7ed0e0b94cd979ba8cbe4aaa3d41b80eb748c0cb3eccdd5f8e096055acac9c20 SHA512 38a38a6b918355b341ac52fbbd63312fbc44f2071785401dc667bb50b030e8c1963c5eb8f890c36daa0987d2fb4748effa543076429e0c8dea58f2fb0bf29f0c
diff --git a/dev-haskell/tasty-expected-failure/metadata.xml b/dev-haskell/tasty-expected-failure/metadata.xml
index 38e4a3a924f5..ba8a08351743 100644
--- a/dev-haskell/tasty-expected-failure/metadata.xml
+++ b/dev-haskell/tasty-expected-failure/metadata.xml
@@ -1,25 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		With the function &#39;Test.Tasty.ExpectedFailure.expectFail&#39; in the provided module
-		&quot;Test.Tasty.ExpectedFailure&quot;, you can mark that you expect test cases to fail,
-		and not to pass.
-		
-		This can for example be used for test-driven development: Create the tests,
-		mark them with &#39;Test.Tasty.ExpectedFailure.expectFail&#39;, and you can still push
-		to the main branch, without your continuous integration branch failing.
-		
-		Once someone implements the feature or fixes the bug (maybe unknowingly), the
-		test suite will tell him so, due to the now unexpectedly passing test, and he
-		can remove the &#39;Test.Tasty.ExpectedFailure.expectFail&#39; marker.
-		
-		The module also provides &#39;Test.Tasty.ExpectedFailure.ignoreTest&#39; to avoid
-		running a test. Both funtions are implemented via the more general
-		&#39;Test.Tasty.ExpectedFailure.warpTest&#39;, which is also provided.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">tasty-expected-failure</remote-id>
+		<remote-id type="github">nomeata/tasty-expected-failure</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild
index 8da7513fe22d..d630f6b17fe1 100644
--- a/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild
+++ b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.11.1.2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
 inherit haskell-cabal
+RESTRICT="test" # circular dependencies
 
 DESCRIPTION="Mark tasty tests as failure expected"
 HOMEPAGE="https://github.com/nomeata/tasty-expected-failure"
@@ -14,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
@@ -25,8 +26,6 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
 
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.5 && <4.14' 'base >= 4.5'
-	default
-}
+CABAL_CHDEPS=(
+	'base >= 4.5 && <4.14' 'base >= 4.5'
+)
diff --git a/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.12.3.ebuild b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.12.3.ebuild
new file mode 100644
index 000000000000..fb62f9a5e2d8
--- /dev/null
+++ b/dev-haskell/tasty-expected-failure/tasty-expected-failure-0.12.3.ebuild
@@ -0,0 +1,40 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Mark tasty tests as failure expected"
+HOMEPAGE="https://github.com/nomeata/tasty-expected-failure"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/tasty-0.11:=[profile?]
+	<dev-haskell/unbounded-delays-0.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/hedgehog
+		dev-haskell/tasty-golden
+		dev-haskell/tasty-hedgehog
+		dev-haskell/tasty-hunit
+	)
+"
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}
diff --git a/dev-haskell/tasty-golden/Manifest b/dev-haskell/tasty-golden/Manifest
index 5287084336ae..c17d8d304d02 100644
--- a/dev-haskell/tasty-golden/Manifest
+++ b/dev-haskell/tasty-golden/Manifest
@@ -1,3 +1,2 @@
-DIST tasty-golden-2.2.2.4.tar.gz 7102 BLAKE2B 110f89128827e83371eb5178831b3cf8b1054132322d5dde8da55f17d931a27236985f8629c1b3c3ac96b1d8548ef787304b586fb352db6694dc7c0185632567 SHA512 7674f0003595a9569ecf05c7b68608887f815361c9c7b234cba3a0af4eda855a1131fbafcfb15cff19c584dd4f9888e3cc001deea8ac110c648d66a9fe1c7237
 DIST tasty-golden-2.3.1.1.tar.gz 7219 BLAKE2B c6160ece4ce5a35d7acc6f390a15fd83c8a13951d5bf243576aca5c65b05b8de9f57ea6227745da57c4527bcbef093dc53c955c547bb5a1c909b195a9ee9ca77 SHA512 b7871d2ddcf7f45e0f1df52982b6370308dd0c48588318985977cb88f93f4b759b1f2bdff44e31ec86f230f04304bcee14286f62c2d2ae01a6105b8a3250e5fb
-DIST tasty-golden-2.3.1.tar.gz 7193 BLAKE2B 65086434b3ff22478c70a1e0fb32f600f4d9bd057340217d2772cfa7f0277f3972284387f7fbcdc4746b06c2615b71c62d3c6f79cf2ad0c6ef78f949573bc908 SHA512 3c729edf394db6eaa94dc606d146599ef00d1bcdbb49482a52fc248e61b3ab236000ce2779cbf59c1cc458738cff5b51a4ff5bf79384e4479db93a1ea88bb6c2
+DIST tasty-golden-2.3.5.tar.gz 15179 BLAKE2B 43d4749bca69b7be0b6cfa3f0c5e3fcbe503b6cd39912306656ccd80c71c2fd2fccbd0d4c56414a07717781e3a885856211c8b283ef51449286924cdd36d945b SHA512 e98935654b0df84a5bbfe36d772c0895b4bb50a6fcc30d305261c3845f7c8a5ab0c0d2297157809cb61fd230d567dadcd763b953d79d9fadeb8e6edb9af5980f
diff --git a/dev-haskell/tasty-golden/files/tasty-golden-2.3.5-fix-tests.patch b/dev-haskell/tasty-golden/files/tasty-golden-2.3.5-fix-tests.patch
new file mode 100644
index 000000000000..bfdb79277ae9
--- /dev/null
+++ b/dev-haskell/tasty-golden/files/tasty-golden-2.3.5-fix-tests.patch
@@ -0,0 +1,76 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+* There was a slight discrepency between the expected and actual results
+  of the "before-golden" test, likely due to a change in tasty's output.
+
+* The example executable is renamed to tasty-golden-example in the ebuild
+  to prevent possible name collisions.
+
+diff -urN tasty-golden-2.3.5/tests/golden/before-accept.golden tasty-golden-2.3.5-r1/tests/golden/before-accept.golden
+--- tasty-golden-2.3.5/tests/golden/before-accept.golden	2020-02-21 05:21:09.000000000 -0700
++++ tasty-golden-2.3.5-r1/tests/golden/before-accept.golden	2022-11-04 13:15:02.987564783 -0600
+@@ -7,6 +7,7 @@
+   Failing tests
+     goldenVsFile:       FAIL
+       Files 'example/golden/fail/goldenVsFile.golden' and 'example/golden/fail/goldenVsFile.actual' differ
++      Use -p '$0=="Tests.Failing tests.goldenVsFile"' to rerun this test only.
+     goldenVsFileDiff:   FAIL
+       1d0
+       < 1
+@@ -35,6 +36,7 @@
+       169d156
+       <<truncated>
+       Use --accept or increase --size-cutoff to see full output.
++      Use -p '/Failing tests.goldenVsFileDiff/' to rerun this test only.
+     goldenVsString:     FAIL
+       Test output was different from 'example/golden/fail/goldenVsString.golden'. It was:
+       2
+@@ -87,8 +89,9 @@
+       55
+       56<truncated>
+       Use --accept or increase --size-cutoff to see full output.
++      Use -p '$0=="Tests.Failing tests.goldenVsString"' to rerun this test only.
+     goldenVsStringDiff: FAIL
+-      Test output was different from 'example/golden/fail/goldenVsStringDiff.golden'. Output of ["diff","example/golden/fail/goldenVsStringDiff.golden","/tmp/goldenVsStringDiff.actual"]:
++      Test output was different from 'example/golden/fail/goldenVsStringDiff.golden'. Output of ["diff","example/golden/fail/goldenVsStringDiff.golden","/var/tmp/portage/dev-haskell/tasty-golden-2.3.5/temp/goldenVsStringDiff.actual"]:
+       1d0
+       < 1
+       4d2
+@@ -116,5 +119,6 @@
+       169d156
+       <<truncated>
+       Use --accept or increase --size-cutoff to see full output.
++      Use -p '/Failing tests.goldenVsStringDiff/' to rerun this test only.
+ 
+ 4 out of 8 tests failed
+diff -urN tasty-golden-2.3.5/tests/test.hs tasty-golden-2.3.5-r1/tests/test.hs
+--- tasty-golden-2.3.5/tests/test.hs	2021-02-24 06:27:55.000000000 -0700
++++ tasty-golden-2.3.5-r1/tests/test.hs	2022-11-04 13:04:13.007572500 -0600
+@@ -89,7 +89,7 @@
+           -- timings.
+           --
+           -- NB: cannot use multiline literals because of CPP.
+-          let cmd = shell ("cd " ++ tmp ++ " && example | " ++
++          let cmd = shell ("cd " ++ tmp ++ " && tasty-golden-example | " ++
+                       "sed -Ee 's/[[:digit:]-]+\\.actual/.actual/g; s/ \\([[:digit:].]+s\\)//' > " ++
+                       our</>"tests/golden/before-accept.actual || true")
+           runProcess_ cmd
+@@ -102,7 +102,7 @@
+         (do
+           tmp <- tmpIO
+           our <- getCurrentDirectory
+-          let cmd = shell ("cd " ++ tmp ++ " && example --accept | sed -Ee 's/ \\([[:digit:].]+s\\)//' > " ++
++          let cmd = shell ("cd " ++ tmp ++ " && tasty-golden-example --accept | sed -Ee 's/ \\([[:digit:].]+s\\)//' > " ++
+                           our </>"tests/golden/with-accept.actual")
+           runProcess_ cmd
+         )
+@@ -114,7 +114,7 @@
+         (do
+           tmp <- tmpIO
+           our <- getCurrentDirectory
+-          let cmd = shell ("cd " ++ tmp ++ " && example | sed -Ee 's/ \\([[:digit:].]+s\\)//' > " ++
++          let cmd = shell ("cd " ++ tmp ++ " && tasty-golden-example | sed -Ee 's/ \\([[:digit:].]+s\\)//' > " ++
+                           our</>"tests/golden/after-accept.actual")
+           runProcess_ cmd
+         )
diff --git a/dev-haskell/tasty-golden/metadata.xml b/dev-haskell/tasty-golden/metadata.xml
index d60b944caaf3..eeae1e3d3b3f 100644
--- a/dev-haskell/tasty-golden/metadata.xml
+++ b/dev-haskell/tasty-golden/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides support for «golden testing».
-		A golden test is an IO action that writes its result to a file.
-		To pass the test, this output file should be identical to the corresponding
-		'golden' file, which contains the correct result for the test.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">feuerbach/tasty-golden</remote-id>
+		<remote-id type="hackage">tasty-golden</remote-id>
+		<remote-id type="github">UnkindPartition/tasty-golden</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild
deleted file mode 100644
index 1d1a6ffa294b..000000000000
--- a/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Golden tests support for tasty"
-HOMEPAGE="https://github.com/feuerbach/tasty-golden"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	dev-haskell/temporary-rc:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.14
-	test? ( dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
index a0477e796d34..6d5baa4e0d98 100644
--- a/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
+++ b/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Golden tests support for tasty"
-HOMEPAGE="https://github.com/feuerbach/tasty-golden"
+HOMEPAGE="https://github.com/UnkindPartition/tasty-golden"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.3.1.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.3.1.ebuild
deleted file mode 100644
index 70120655a495..000000000000
--- a/dev-haskell/tasty-golden/tasty-golden-2.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Golden tests support for tasty"
-HOMEPAGE="https://github.com/feuerbach/tasty-golden"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/tasty-hunit
-		dev-haskell/temporary-rc )
-"
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.3.5.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.3.5.ebuild
new file mode 100644
index 000000000000..95bcf980ebb6
--- /dev/null
+++ b/dev-haskell/tasty-golden/tasty-golden-2.3.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: build-example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Golden tests support for tasty"
+HOMEPAGE="https://github.com/UnkindPartition/tasty-golden"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.5-fix-tests.patch"
+)
+
+CABAL_CHDEPS=(
+	'executable example' "executable ${PN}-example"
+)
+
+CABAL_TEST_REQUIRED_BINS=(
+	"${PN}-example"
+)
+
+RDEPEND="
+	dev-haskell/async:=[profile?]
+	>=dev-haskell/optparse-applicative-0.3.1:=[profile?]
+	dev-haskell/tagged:=[profile?]
+	>=dev-haskell/tasty-1.3:=[profile?]
+	dev-haskell/temporary:=[profile?]
+	dev-haskell/typed-process:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/tasty-hunit
+	)
+"
+
+src_configure() {
+	if use examples || use test; then
+		local example_flag=build-example
+	else
+		local example_flag=-build-example
+	fi
+
+	haskell-cabal_src_configure \
+		--flag="${example_flag}"
+}
+
+src_install() {
+	local components=(
+		"lib:${PN}"
+	)
+
+	if use examples; then
+		components+=(
+			"exe:${PN}-example"
+		)
+	fi
+
+	haskell-cabal_src_install "${components[@]}"
+}
+
+pkg_postinst() {
+	if use examples; then
+		elog "The example executable installed with this package (normally named 'example')"
+		elog "has been renamed to '${PN}-example' to help prevent name collisions."
+	fi
+
+	haskell-cabal_pkg_postinst
+}
diff --git a/dev-haskell/tasty-hedgehog/Manifest b/dev-haskell/tasty-hedgehog/Manifest
index dc65e49e6cc3..7d4ce814ef8f 100644
--- a/dev-haskell/tasty-hedgehog/Manifest
+++ b/dev-haskell/tasty-hedgehog/Manifest
@@ -1 +1,2 @@
-DIST tasty-hedgehog-1.0.0.2.tar.gz 4387 BLAKE2B 3681115e233a1ff73b026caf18862825dfe1b94bcab1f4f48fd8aee619b1e263eab412ec0820cdf0929cd2d5a66bb6beb19be0a39ba59183c540316ec1e5cd4d SHA512 56ac4db27b97bc6902633ec398bdbae28f6121d818a29fde62ddea4a4619af0fe7b058b55479414a627119a0014f2c84d6b795c86e9e36d21fd25bf1033a9c4b
+DIST tasty-hedgehog-1.1.0.0.tar.gz 4610 BLAKE2B c0cd4e99531d8425381e2aebb62a407674226bfe205874a0a512bc65383e237a4bbfdf6be4d65b30893212e09dcf68d42f11e89b349c6db535a359fa845e18aa SHA512 48dda3dda14241f8d8dc77acf61a0fe77887c835ae9de6182c9fe580bb79e98f2480a14c282ff49b1438ffab197812262529e90dcec2af3785713f218490bce2
+DIST tasty-hedgehog-1.4.0.2.tar.gz 5505 BLAKE2B c11950686d4a16825f8773f4f045c6327758c9c04b50889cd423bae88c99cadd9153b07df4e8d0c65ee4e086e1bd0338e79b4604c3a10c789a28cc70476701b4 SHA512 ea995eff179fcecd40c1b346a5c8405090f7a7542848f3d4d591e83bb8d1f9bce51e6fc2f8fd1182b7b5eade0a64e6605ff88b878acf5f79dde2838b0781b760
diff --git a/dev-haskell/tasty-hedgehog/metadata.xml b/dev-haskell/tasty-hedgehog/metadata.xml
index b7878815d80d..cc1800d54bd1 100644
--- a/dev-haskell/tasty-hedgehog/metadata.xml
+++ b/dev-haskell/tasty-hedgehog/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">tasty-hedgehog</remote-id>
+		<remote-id type="github">qfpl/tasty-hedgehog</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2.ebuild b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2.ebuild
deleted file mode 100644
index e02a9847ed19..000000000000
--- a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.0.0.2.ebuild
+++ /dev/null
@@ -1,35 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Integration for tasty and hedgehog"
-HOMEPAGE="https://github.com/qfpl/tasty-hedgehog"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hedgehog-1.0.2:=[profile?] <dev-haskell/hedgehog-1.0.3:=[profile?]
-	>=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.12 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.8 && <4.14' 'base >= 4.8'
-}
diff --git a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild
new file mode 100644
index 000000000000..7910a47136e5
--- /dev/null
+++ b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Integration for tasty and hedgehog"
+HOMEPAGE="https://github.com/qfpl/tasty-hedgehog"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hedgehog-1.0.2:=[profile?]
+	>=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.13 )
+"
+
+CABAL_CHDEPS=(
+	'base >= 4.8 && <4.16' 'base >= 4.8'
+	'hedgehog >= 1.0.2 && < 1.0.6' 'hedgehog >= 1.0.2'
+)
diff --git a/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.4.0.2.ebuild b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.4.0.2.ebuild
new file mode 100644
index 000000000000..0c15aa0aa45d
--- /dev/null
+++ b/dev-haskell/tasty-hedgehog/tasty-hedgehog-1.4.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Integration for tasty and hedgehog"
+HOMEPAGE="https://github.com/qfpl/tasty-hedgehog"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/hedgehog-1.4:=[profile?] <dev-haskell/hedgehog-1.5:=[profile?]
+	>=dev-haskell/tagged-0.8:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/tasty-0.11:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? (
+		>=dev-haskell/tasty-expected-failure-0.11 <dev-haskell/tasty-expected-failure-0.13
+	)
+"
diff --git a/dev-haskell/tasty-hslua/Manifest b/dev-haskell/tasty-hslua/Manifest
new file mode 100644
index 000000000000..a134aebad824
--- /dev/null
+++ b/dev-haskell/tasty-hslua/Manifest
@@ -0,0 +1,2 @@
+DIST tasty-hslua-1.0.2.tar.gz 3099 BLAKE2B 712c04ffa8bfb309473c01ea7d01a1dd3483649520c38b78f180792fdedadf6953394dea37e7dcf2468f3e0a0e8ad9bdc16912dec70f765d4fa0a0745e5eac01 SHA512 397a8dce3eef50cac8a770c4b0471f454f62ead5fc8a5a08b9b01d97465016815d8e04730df5e79977393815dfa09bda6e0a6f334d479c17fb93940c0d5f27de
+DIST tasty-hslua-1.1.0.tar.gz 3090 BLAKE2B b5f64c46f78bc8ed7aaf6c080db547f28dd4764360017331e6885648070acd25eec431287ef3c8ba0f462572a6def3dbb00ef33351d43501fe61435d989e72bd SHA512 367a991ae317ba664e27a0685dc576bc555c627dc0ccac43ca52c25c51cb27777ba3230924cbc39edbc18587fbf9ab3f7019bdf9e2dfbbcb9513730523417cb8
diff --git a/dev-haskell/tasty-hslua/metadata.xml b/dev-haskell/tasty-hslua/metadata.xml
new file mode 100644
index 000000000000..61739e68e885
--- /dev/null
+++ b/dev-haskell/tasty-hslua/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">tasty-hslua</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild b/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild
new file mode 100644
index 000000000000..83c93ad2c72a
--- /dev/null
+++ b/dev-haskell/tasty-hslua/tasty-hslua-1.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 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="Tasty helpers to test HsLua"
+HOMEPAGE="https://hslua.org/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.0:=[profile?] <dev-haskell/hslua-core-2.3:=[profile?]
+	>=dev-haskell/tasty-0.11:=[profile?]
+	>=dev-haskell/tasty-hunit-0.9:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/tasty-hslua/tasty-hslua-1.1.0.ebuild b/dev-haskell/tasty-hslua/tasty-hslua-1.1.0.ebuild
new file mode 100644
index 000000000000..c32fc6b2b2c1
--- /dev/null
+++ b/dev-haskell/tasty-hslua/tasty-hslua-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Tasty helpers to test HsLua"
+HOMEPAGE="https://hslua.org/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hslua-core-2.3:=[profile?] <dev-haskell/hslua-core-2.4:=[profile?]
+	>=dev-haskell/tasty-0.11:=[profile?]
+	>=dev-haskell/tasty-hunit-0.9:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/tasty-hunit/Manifest b/dev-haskell/tasty-hunit/Manifest
index 906e0d08c155..0a5a9c5fdac1 100644
--- a/dev-haskell/tasty-hunit/Manifest
+++ b/dev-haskell/tasty-hunit/Manifest
@@ -1,5 +1 @@
-DIST tasty-hunit-0.10.0.2.tar.gz 7403 BLAKE2B 04813c3d35635ee296e28e19d76136f59e3d196a8e6a9c4410f6a7ee20996178f4c10aacdf985a73b989914099a86b1b1ab930e21584e714150e041b401e3179 SHA512 82f70cd7813affeb756de89842a77070e688169eb35a386fbc4db36b65d8c960bca7b923294918e10b65281d3265820f9592398550af8af92027960d48562fd0
-DIST tasty-hunit-0.2.tar.gz 1832 BLAKE2B 329ff8f7e5078e92412f2ed0325bf11ac8563b9bc33b91893e786724f7a7f3256983b1c2dfec89d3a4f69b3e933796ee69a364f67a868f1f5ea687aa0e27c58c SHA512 0622cc120b40108cbb3d0af3f0593e17cf7ae9d27524b095bf05870c1b85b02a7acd8f0bef1788e32ac2ec64a081e4ade2ad627bd444b442cedc2464f6c60e35
-DIST tasty-hunit-0.4.1.tar.gz 1840 BLAKE2B e115e10605f101f875698f2bfc99fef1becb2f8b16eff0ab9e1c5c9ca81e25bbb12fc75049ef6a15246761f8adba0cbdbf31e4410b292eea4dba052d2581666e SHA512 6a1bcecd3b9889eff1296e2ba77810d4421fd570101a4db5e9d8095afbdc3174e5fcfdaa61f51f391237330c97c824f201e368eebc13e2a6ed9015716f8baaae
-DIST tasty-hunit-0.8.0.1.tar.gz 2100 BLAKE2B 4d35a3f92487394d79969a847511b76024604ce2b5baa33f66ff896dd997d956c4edc1eafde3bea04ed33b5b6857dc2719fd044561ab167841dafdd701119e1f SHA512 133a38d3e6e4d19fe7f0f91080a30a0d3212fc17416669710dea78b5d646aab0d2ab67959c6cd4517e74da795327fbb87fcade335161b67e9967f577a9730898
-DIST tasty-hunit-0.9.2.tar.gz 5765 BLAKE2B 94463efe14eba2c5a35a1658a60d29965ed3f7845bc064174447604fe08bec1738ec81912caf7850a0336edbb0c8fa7fc20ccbdfa814aca0ca9ea5360792ad1c SHA512 f7af615938d8cb9ec40114fc27f196a8bc9991b0aefca9c5de72bdb6872073b6d771f276472f831b8c583eade3d2d1413aee8f194befa450631bdf3ed50ed439
+DIST tasty-hunit-0.10.0.3.tar.gz 7885 BLAKE2B a8e8af2b1fcf575646620ccb4d822e6cbf688372dacf0686a7c3760ad693f2a7d88f280ef9e43eb9cd757f89d2771368adf567a9390b1a35f9b1db5aae7c5d81 SHA512 29adbf499b8079c12c756e031c3bebffa1c312cf623ff77d4fb2e85d3462ac6e71aa8a13c3e161ef04ad5bbf910c3bb5f4b62bc3825a030b690a90eea812b85a
diff --git a/dev-haskell/tasty-hunit/metadata.xml b/dev-haskell/tasty-hunit/metadata.xml
index 797bb94b356d..d1c3114a5e36 100644
--- a/dev-haskell/tasty-hunit/metadata.xml
+++ b/dev-haskell/tasty-hunit/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		HUnit support for the Tasty test framework.
-	</longdescription>
+	<upstream>
+		<remote-id type="github">UnkindPartition/tasty</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild
deleted file mode 100644
index 0049ea0f53d2..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.2.ebuild
+++ /dev/null
@@ -1,26 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/call-stack:=[profile?]
-	>=dev-haskell/tasty-1.2.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild
new file mode 100644
index 000000000000..7cc0177c5470
--- /dev/null
+++ b/dev-haskell/tasty-hunit/tasty-hunit-0.10.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HUnit support for the Tasty test framework"
+HOMEPAGE="https://github.com/UnkindPartition/tasty"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/call-stack:=[profile?]
+	>=dev-haskell/tasty-1.2.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.2.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.2.ebuild
deleted file mode 100644
index ddb7a5a1218a..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="https://hackage.haskell.org/package/tasty-hunit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/tasty:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10"
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.4.1.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.4.1.ebuild
deleted file mode 100644
index 523e72fe52ae..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="https://hackage.haskell.org/package/tasty-hunit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/tasty:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.8.0.1.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.8.0.1.ebuild
deleted file mode 100644
index 50726853f35f..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.8.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="https://hackage.haskell.org/package/tasty-hunit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild
deleted file mode 100644
index 0993d7c4eb58..000000000000
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the Tasty test framework"
-HOMEPAGE="https://documentup.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/tasty-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-kat/metadata.xml b/dev-haskell/tasty-kat/metadata.xml
index 574039e45f07..0897747e1fa4 100644
--- a/dev-haskell/tasty-kat/metadata.xml
+++ b/dev-haskell/tasty-kat/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Tests running from simple KATs file (different formats/helper supported)
-	</longdescription>
 	<upstream>
 		<remote-id type="github">vincenthz/tasty-kat</remote-id>
 	</upstream>
diff --git a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild b/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
index cda78beb62e7..e1120434146a 100644
--- a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
+++ b/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.3
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/tasty:=[profile?]
diff --git a/dev-haskell/tasty-lua/Manifest b/dev-haskell/tasty-lua/Manifest
index c4ed8546099c..47e2ad2ef58d 100644
--- a/dev-haskell/tasty-lua/Manifest
+++ b/dev-haskell/tasty-lua/Manifest
@@ -1 +1,2 @@
-DIST tasty-lua-0.2.0.1.tar.gz 6830 BLAKE2B f32d0e593a54071aac5b12e9c8b0461e122864994bc43c5d8c2039dfec5cb67a9e22ab91ec2c74926fe1f45bc5811ea47a98f635c1c22c3e364c0fe781e5c97d SHA512 25981f483b1d890b74f5b0f16b273413de2dc2a2da1a0443014e605e41c93d276bca325717aca58d194c68e580dbfde8c1dee166c1974f4f2e544887e0ed0d12
+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
diff --git a/dev-haskell/tasty-lua/metadata.xml b/dev-haskell/tasty-lua/metadata.xml
index b7878815d80d..01584748d5c0 100644
--- a/dev-haskell/tasty-lua/metadata.xml
+++ b/dev-haskell/tasty-lua/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">tasty-lua</remote-id>
+		<remote-id type="github">hslua/hslua</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild b/dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild
deleted file mode 100644
index 061ac8454e35..000000000000
--- a/dev-haskell/tasty-lua/tasty-lua-0.2.0.1.ebuild
+++ /dev/null
@@ -1,29 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Write tests in Lua, integrate into tasty"
-HOMEPAGE="https://github.com/hslua/tasty-lua"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
-	>=dev-haskell/hslua-1.0.3:=[profile?] <dev-haskell/hslua-1.2:=[profile?]
-	>=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.3:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
new file mode 100644
index 000000000000..e364bb18fefb
--- /dev/null
+++ b/dev-haskell/tasty-lua/tasty-lua-1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Write tests in Lua, integrate into tasty"
+HOMEPAGE="https://github.com/hslua/hslua"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+	>=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:=[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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild b/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild
new file mode 100644
index 000000000000..787f5539f844
--- /dev/null
+++ b/dev-haskell/tasty-lua/tasty-lua-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Write tests in Lua, integrate into tasty"
+HOMEPAGE="https://github.com/hslua/hslua"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+	>=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:=[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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/tasty-quickcheck/Manifest b/dev-haskell/tasty-quickcheck/Manifest
index 2e8670c5fde6..233c20edb3c6 100644
--- a/dev-haskell/tasty-quickcheck/Manifest
+++ b/dev-haskell/tasty-quickcheck/Manifest
@@ -1,4 +1,2 @@
 DIST tasty-quickcheck-0.10.1.1.tar.gz 5539 BLAKE2B 688675aa15f2790d147d34dbeca8d42e556b8a2d3fe52c7687e149f271a0ddcbb6fb21ac6be4065fdf1b8dcb82aa10a8f533e77da0111c140bb9ef807e48c222 SHA512 13cfcc99eb9988d4842327d96f0e58f5ba6c653d3027a4adb307d4101bc2f7deee0033197b4358a837ace0d03423bdafe2197b029da6a64d8b650ee2f5bd958d
-DIST tasty-quickcheck-0.3.1.tar.gz 2643 BLAKE2B e98ce801f560fc9513387fd4fdd1ac2540d774cc8395059661e6f15ebcd40a15e01902bfd3f389c6f5c42437530bb98fe21c1d7cad76edc367efc19cb4653516 SHA512 b6f4ffcc01e9a25a54616cb85a95901010e04c05e59743621b86d57dcfdb820285881c4a39a95e255fcdab6a33b7ee866e585a26c9628649c344c3b2ae4500af
-DIST tasty-quickcheck-0.8.3.2.tar.gz 4438 BLAKE2B 6d22a2155597cf9d981ac0ac290bb65f03b50e8d7fa92092955b74630f5c3c60a8c8fa9ae4928588e8633d527f2614295d636a57c547e15ea02e8ee6f07de35a SHA512 6930e602d0b3b60f13df509191b1d6affc430a408f3536bcc4e749ca87324962ae75414a2e33cd4f49b84296740528a840c1f7ca9295220dfae28b6f2946df57
-DIST tasty-quickcheck-0.8.4.tar.gz 4560 BLAKE2B 5f1ab71b75bb2a7f2384dac024d65514f45b9741e59c260116d4e7b4ad483456c6d2a224c96eb642ee9f5c2b6d985e1c81052312fb5fa725209106a210045aba SHA512 5e503604412af686d24957e111ac369dedc568ad7075374acfdef93bad35342af6e1bdfa5a33aa8eec16bdf7cc3e0e2539d5a92e7eaf8a6cb325bac2149a0ce7
+DIST tasty-quickcheck-0.10.2.tar.gz 5868 BLAKE2B 74a4870c547f716378fee7aae7e628ca69d3364f22cd62710ed0321abcbc2a94f48fe8a0c89e0aab62bf380247422ee5f0cb5fa122ab3e33219981a6e8ce4142 SHA512 78b223fc54428e71b1a8b3afba1128764e61703be4dea95541e0661d2fbe3006b77ef15200577e40bf3bf78a557f66f13a77288c8fe87dc19eb343c9fdff9d89
diff --git a/dev-haskell/tasty-quickcheck/metadata.xml b/dev-haskell/tasty-quickcheck/metadata.xml
index 788d4f1313c5..e9cd653d1c03 100644
--- a/dev-haskell/tasty-quickcheck/metadata.xml
+++ b/dev-haskell/tasty-quickcheck/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		QuickCheck support for the Tasty test framework.
-	</longdescription>
-	<use>
-		<flag name="old-quickcheck">Use Quick-Check &lt; 2.7.</flag>
-	</use>
+	<upstream>
+		<remote-id type="hackage">tasty-quickcheck</remote-id>
+		<remote-id type="github">UnkindPartition/tasty</remote-id>
+	</upstream>
 </pkgmetadata>
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 c5e7fb3b375a..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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4.9999
 
@@ -9,16 +9,16 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="QuickCheck support for the Tasty test framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
+HOMEPAGE="https://github.com/UnkindPartition/tasty"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+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
new file mode 100644
index 000000000000..f9bb7b4d7cf9
--- /dev/null
+++ b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.10.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck support for the Tasty test framework"
+HOMEPAGE="https://github.com/UnkindPartition/tasty"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/optparse-applicative:=[profile?]
+	>=dev-haskell/quickcheck-2.10:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/tagged:=[profile?]
+	>=dev-haskell/tasty-1.0.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/pcre-light
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.3.1.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.3.1.ebuild
deleted file mode 100644
index 716e9525fb34..000000000000
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Tasty test framework"
-HOMEPAGE="https://hackage.haskell.org/package/tasty-quickcheck"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/quickcheck-2.5:=[profile?] <dev-haskell/quickcheck-3:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	dev-haskell/tasty:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild
deleted file mode 100644
index ce9b9cc0abfb..000000000000
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Tasty test framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="old-quickcheck"
-
-RDEPEND="dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.10.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	old-quickcheck? ( >=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-2.7:2=[profile?]
-				dev-haskell/random:=[profile?] )
-	!old-quickcheck? ( >=dev-haskell/quickcheck-2.7:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/pcre-light
-		dev-haskell/tasty-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-quickcheck old-quickcheck)
-}
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.4.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.4.ebuild
deleted file mode 100644
index b051bb5d01f3..000000000000
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck support for the Tasty test framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.10.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/quickcheck-2.5:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/pcre-light
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/tasty-rerun/Manifest b/dev-haskell/tasty-rerun/Manifest
index 7ebc57d86f03..d9b0274482d1 100644
--- a/dev-haskell/tasty-rerun/Manifest
+++ b/dev-haskell/tasty-rerun/Manifest
@@ -1,3 +1 @@
-DIST tasty-rerun-1.1.13.tar.gz 5438 BLAKE2B acccd1774900d1e3ff74362224b54d80b2b5d105f909e03750f211bd9e92305a6c52999e655b63ff5c17e33af1a7a4eb6da932a03ebaa7ce9645b7c296f8c72b SHA512 43e5e5e23ebf50d5292ae95ca69a6669188a018934e451799ae14292bc88a3186534bb10e23c74178911089dee0379b3f782f9a14ff02c5e462478b1b3a19238
-DIST tasty-rerun-1.1.5.tar.gz 5376 BLAKE2B fe3723004d07e2836b83e85406580a5a74706c5f3cb6b445f575623c8ae1cd659ce8143e11891c4dbdf9b0b9f487b53d8ce64be61b16ba324a0d565bc6e25979 SHA512 becee5c62b425e57666c3cc9b65a7342b1af46e44212ade1360f0cd255cb909cfd9b049d88ff8238940760534479ce077f0e24526359545fff0ab849a0c0d7b7
-DIST tasty-rerun-1.1.6.tar.gz 5399 BLAKE2B 48e329b4f188d618b4a3a2b8eb94723fe0a3a883c64668ed36b7a099bcc86228eb3a0fe42173e8564f14942ab73a2637831b9da4ebf3a4dd4b312bda870fd860 SHA512 dc4db9a4dba424d9d948a4e44d4402b17ab363554493a68035ec0d94bfb6e9e2965e8c9c4b519a071707c70eabd7ea70a4f265f32983e35bf0ee64cd67948808
+DIST tasty-rerun-1.1.18.tar.gz 6388 BLAKE2B 795cfa825ae49e5a91e8b25ebb1910092f2927484b52500048740b95c2511981a16bc5202182cd18e8d85676d21a8f956183508be2c9eb1257427c6328fee550 SHA512 82672a8d2f37a56e9867bb6fa2b8c79dc40869262a1853b51067e9cf463aef78c4aa3d69cda32a06c3d226ef18c951789845e57a82cbad880f29d5415a659ced
diff --git a/dev-haskell/tasty-rerun/metadata.xml b/dev-haskell/tasty-rerun/metadata.xml
index 452f659c0580..85653aa0d6de 100644
--- a/dev-haskell/tasty-rerun/metadata.xml
+++ b/dev-haskell/tasty-rerun/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild
deleted file mode 100644
index 6fca3bdcd24f..000000000000
--- a/dev-haskell/tasty-rerun/tasty-rerun-1.1.13-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Run tests by filtering the tests depending on the result of previous runs"
-HOMEPAGE="https://github.com/ocharles/tasty-rerun"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	>=dev-haskell/reducers-3.10.1:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.6 && <4.13' 'base >=4.6' \
-		'tasty >=0.10 && <1.2' 'tasty >=0.10'
-}
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild
new file mode 100644
index 000000000000..6396f90026b0
--- /dev/null
+++ b/dev-haskell/tasty-rerun/tasty-rerun-1.1.18.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Rerun only tests which failed in a previous test run"
+HOMEPAGE="https://github.com/ocharles/tasty-rerun"
+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/mtl-2.1.2:=[profile?]
+	>=dev-haskell/optparse-applicative-0.6:=[profile?]
+	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
+	>=dev-haskell/stm-2.4.2:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/tasty-1.2:=[profile?] <dev-haskell/tasty-1.5:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
+
+CABAL_CHDEPS=(
+	'base >=4.6 && <4.15' 'base >=4.6'
+)
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.5.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.5.ebuild
deleted file mode 100644
index 134e29980c17..000000000000
--- a/dev-haskell/tasty-rerun/tasty-rerun-1.1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Run tests by filtering the tests depending on the result of previous runs"
-HOMEPAGE="https://github.com/ocharles/tasty-rerun"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	>=dev-haskell/reducers-3.10.1:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/tasty-rerun/tasty-rerun-1.1.6.ebuild b/dev-haskell/tasty-rerun/tasty-rerun-1.1.6.ebuild
deleted file mode 100644
index 1c5c7a841211..000000000000
--- a/dev-haskell/tasty-rerun/tasty-rerun-1.1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Run tests by filtering the tests depending on the result of previous runs"
-HOMEPAGE="https://github.com/ocharles/tasty-rerun"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-2.1.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	>=dev-haskell/reducers-3.10.1:=[profile?]
-	>=dev-haskell/split-0.1:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/stm-2.4.2:=[profile?]
-	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/tasty-0.10:=[profile?] <dev-haskell/tasty-0.12:=[profile?]
-	>=dev-haskell/transformers-0.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/tasty-smallcheck/Manifest b/dev-haskell/tasty-smallcheck/Manifest
index ff86f131e769..82d3fb672238 100644
--- a/dev-haskell/tasty-smallcheck/Manifest
+++ b/dev-haskell/tasty-smallcheck/Manifest
@@ -1,3 +1,2 @@
-DIST tasty-smallcheck-0.2.tar.gz 2341 BLAKE2B 6b91fd77b4ec66ba571cd3c6b9703c37708590f8679e9ff4e6949b36ba92892cd083776934877f694742fae1e8d66c8c4f3344ee30ce550aacecf9b2e57d362c SHA512 5a97592878c9814057cc6448591c3ba1e7a0027d45bbdbe76db1249fc656d66ae4a4b0992e42d101945630e07f6f622c644f9fa3a3abc7fdba472278dda38be1
 DIST tasty-smallcheck-0.8.1.tar.gz 2690 BLAKE2B e6ccfca50577edc27da4d8f77041e5eeb80c28574a5d0d9cfa20154e557a9893242456a4875e72d616e70f477bf1b7c6a1911c7d3a863b71e8481ff387815a00 SHA512 26ed0d75559c2da2f4296af6e9b02f8d0a19043b0ef154674eb782703fcd3ad7f4863b7b07dbaae27440078b4b00a9272cd9d5da23089993018e933577be5893
-DIST tasty-smallcheck-0.8.tar.gz 2426 BLAKE2B c11b53a2a4f9f26375db2b8300520b464e4b46f0b2119a18c3f0957ee45fcc3cce8ae0eb5360c4d105e937dfe58f7c91f52f88e8a166224ff6a1241379d08927 SHA512 8ef5e49647843fece659e21ec8b76fc63a43e82bd60d406b68e2fece18ba81368bea8e9accec36cfd80836f407343fcf3da1507bee60802033b8f2147a16e75c
+DIST tasty-smallcheck-0.8.2.tar.gz 3041 BLAKE2B bb13e2253699f1f064276788254671f74b9e193a35ded683ba6cdd2f3f2e4770a8d78825991ad1d20426adb2437f7c120208aed1c77726d7e1c0969748b98c4c SHA512 ff816280315e26d20210f0dcbf55e32780aa9ef455d8d00b146d9daeed6afec5b6593cd8a8dc0b7c0bc7ff77da75f065f9c7253494f2c47150e2b7a6aa29fc6a
diff --git a/dev-haskell/tasty-smallcheck/metadata.xml b/dev-haskell/tasty-smallcheck/metadata.xml
index 6ed62ea42470..d1c3114a5e36 100644
--- a/dev-haskell/tasty-smallcheck/metadata.xml
+++ b/dev-haskell/tasty-smallcheck/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		SmallCheck support for the Tasty test framework.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">feuerbach/tasty</remote-id>
+		<remote-id type="github">UnkindPartition/tasty</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild
deleted file mode 100644
index 9795e430cee1..000000000000
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="SmallCheck support for the Tasty test framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-		>=dev-haskell/smallcheck-1.0:=[profile?]
-		dev-haskell/tagged:=[profile?]
-		dev-haskell/tasty:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
index 973abb681765..17b99b75f742 100644
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
+++ b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.2.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.2.ebuild
new file mode 100644
index 000000000000..6d00a7e0f504
--- /dev/null
+++ b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="SmallCheck support for the Tasty test framework"
+HOMEPAGE="https://github.com/feuerbach/tasty"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/optparse-applicative:=[profile?]
+	>=dev-haskell/smallcheck-1.0:=[profile?]
+	dev-haskell/tagged:=[profile?]
+	>=dev-haskell/tasty-0.8:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild
deleted file mode 100644
index 120bc0786607..000000000000
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="SmallCheck support for the Tasty test framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/smallcheck-1.0:=[profile?]
-	dev-haskell/tagged:=[profile?]
-	>=dev-haskell/tasty-0.8:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/tasty-th/Manifest b/dev-haskell/tasty-th/Manifest
index e512b5ea8cc6..8daae251f2a9 100644
--- a/dev-haskell/tasty-th/Manifest
+++ b/dev-haskell/tasty-th/Manifest
@@ -1,2 +1 @@
-DIST tasty-th-0.1.3.tar.gz 2636 BLAKE2B 73624c11b93e2cd5b0eb6069d8c44e41a70264b998e6633dc0ed20c1ba12b767027c862f9cfda711d39bdabdbfbc3091901744b87e5a9634aaaa51db8b074082 SHA512 47b2f9a5d471943b78e66e3082186a6b42901d57a5333a2142d211370be35354cddce12c5926490e945d6dc8b35d9ab2527c6b36ad457b79f30a2e88fa538d9a
-DIST tasty-th-0.1.4.tar.gz 3016 BLAKE2B cab6b8734dd8664e760d901b05074c84469381c3cb1e4a793a505b2a973fb0c1d32471847ef1c39fab199c1a16de3351cd0d839b5ab78bcf96515233e09c6fcf SHA512 0bddde5ea5cc0ea8ba502b88ec52fe0d46d9c6bcd107e4e3b6bb675d930752df103308b61589ce3de3302c7ac40eed9911f803542262246a43a867beee942aa6
+DIST tasty-th-0.1.7.tar.gz 4467 BLAKE2B 62a79152f5655e70f046fab56bb735387e973b339ec551fbdd60195a35d8c24c2adb97766394bee3feae532f5179ad4a32f9ccb464f0d52ddad27542f778d96f SHA512 7302220ab27aaed22e064518e915610fd5dc7033a931f862fbc63e8a0b1cadcf9306ab3d54d48a10a200c8c8a62b9259462f513a6350df5a02836c6a29f51aef
diff --git a/dev-haskell/tasty-th/metadata.xml b/dev-haskell/tasty-th/metadata.xml
index 98dfd3808c9f..0054652a2ce4 100644
--- a/dev-haskell/tasty-th/metadata.xml
+++ b/dev-haskell/tasty-th/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A fork of of test-framework-th modified to use tasty instead of test-framework.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">bennofs/tasty-th</remote-id>
 	</upstream>
diff --git a/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild b/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild
deleted file mode 100644
index b523ea59093e..000000000000
--- a/dev-haskell/tasty-th/tasty-th-0.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Automatic tasty test case discovery using TH"
-HOMEPAGE="https://github.com/bennofs/tasty-th"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/language-haskell-extract-0.2:=[profile?]
-	dev-haskell/tasty:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild b/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild
deleted file mode 100644
index 30f5e8d729d6..000000000000
--- a/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Automatic tasty test case discovery using TH"
-HOMEPAGE="https://github.com/bennofs/tasty-th"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/tasty:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild b/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild
new file mode 100644
index 000000000000..5fb50fc26a63
--- /dev/null
+++ b/dev-haskell/tasty-th/tasty-th-0.1.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Automatic tasty test case discovery using TH"
+HOMEPAGE="https://github.com/bennofs/tasty-th"
+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/haskell-src-exts-1.18.0:=[profile?]
+	dev-haskell/tasty:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/tasty/Manifest b/dev-haskell/tasty/Manifest
index 5f48362247af..a5ce647a6428 100644
--- a/dev-haskell/tasty/Manifest
+++ b/dev-haskell/tasty/Manifest
@@ -1,6 +1 @@
-DIST tasty-0.10.1.2.tar.gz 26285 BLAKE2B 0a1ef58c8cf95bbcc87ccd2d2416861d79ee9a8c74c147b4e4dd18c9c37e2e12121ad4ba1771b6068dedec512b6a2fafad53ef5c278cbee041551f0bdeb5e62f SHA512 11171cb42b0c88cee04fc3c42c6003c6e501a16734f86ca4dcb33b7e28bc282fd4af56e88d398f6508ce9bd3da666a954fd3b50b8c89cf27906ea8694d753d3e
-DIST tasty-0.11.0.4.tar.gz 26612 BLAKE2B e6058ec9a3e4442e822b4db17d79b464a98ceb021625281de47179bf6aa768bbb33f2024ba7b4bee2e6a61996769de2270357e7111ba6e8f7719dd3e7e9bc797 SHA512 8ccf7701829fdb42e367ac1e5805363d7489c770139f6e608d1240cec9e54517230166783a857480b70ca424f40f9ab83313e03e893d6d21503706a4c2e84e95
-DIST tasty-0.3.1.tar.gz 12145 BLAKE2B 338417c955c2b6e5072253d93c4e591c5f91f00292e845c6b50ca797376ec89ef4e42bc063c7774042d4e45274140c6d693f03a4ddbb783d2d4d215a0a8180c4 SHA512 aa727d8fcab7cbde07f721ad8eafc957f3fb6f01827a8ffc329bd1dba86bb40dbeb9e17c86becdd44aba592d57e29d07a5435ffbc8fabaa3c92fa0d0fa544e39
-DIST tasty-0.5.2.tar.gz 15369 BLAKE2B 857b844f04b1c14011e7b441334cc180b66817a523e0ea0373271e8eb0c0be7028394638cca8344b124a32ef190907be025fe8dc49ae9ad646e66473040b5434 SHA512 94116a4a12b842c4c136dfb5fff75e3843aa27c05fbad64e1752bd29b60691dbf12d093c5480e9c93d97ec1adbb98d579e63dd13921323e32e9127fb75bb3d37
-DIST tasty-0.8.1.2.tar.gz 23234 BLAKE2B 2bce9e12edc57d0ba769a3d10617d33233a378f6e9c686c9ce41b7c4e5153e67943ee9d6908000d8bb334aeda2e522877a209c18f7b5cbd6c9c93dfd5cc3cd20 SHA512 110c605cd8dae769a4ddd75f5940df5681eb1f38e005eaba72a4a9109637e3e8dedda7389dbac5a11fa8874da1f0551b7601cb7740efb8c6c6726e7a6ed10287
-DIST tasty-1.2.3.tar.gz 49148 BLAKE2B 8de7436bca740e55a6592e833326b03f001823c74c8678ae5d38c2c836249a9af08321df6245573e5d060a25e9512c1f601a62978f2b3f22ee846d3cef72a829 SHA512 3922fc19c3ed74b1a39f8e6dc5fe243a955ab55d2e9d08d68b0932dfa0d16cb1efbc73bb2d793c1226d56986141494ce0490c9af70e7e612d07da64d5e2ee472
+DIST tasty-1.4.2.3.tar.gz 58549 BLAKE2B 7e806ef62a455a9bd71782800e0a53b327963ea12e7dff7bc508560457dc84c6b94aa8a8b67524b3ea8b7629d5d78bd63a56790e9bbdb356393f306b271b97a8 SHA512 c5f03406e4a7b0c8ff98de285cc778a7751c535d62bb69da962f78ad4eadaf76a74d3bd2c81b1c7553b5de4a527be964c568a8311929a0dce44389c3fcaf521e
diff --git a/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch b/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch
deleted file mode 100644
index ad265fdff295..000000000000
--- a/dev-haskell/tasty/files/tasty-0.11.0.4-unbounded-delays.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/702906
-
-From 74e87fff6a4a830dc64d59f4baa1a5f6759c007c Mon Sep 17 00:00:00 2001
-From: Roman Cheplyaka <roma@ro-che.info>
-Date: Fri, 5 May 2017 08:54:28 +0300
-Subject: [PATCH] Fix compatibility with the latest unbounded-delays
-
-Fixes #166
----
- core/Test/Tasty/Run.hs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Test/Tasty/Run.hs
-+++ b/Test/Tasty/Run.hs
-@@ -15,7 +15,7 @@ import Control.Monad.State
- import Control.Monad.Writer
- import Control.Monad.Reader
- import Control.Concurrent.STM
--import Control.Concurrent.Timeout
-+import Control.Concurrent.Timeout (timeout)
- import Control.Concurrent.Async
- import Control.Exception as E
- import Control.Applicative
--- 
-2.24.1
-
diff --git a/dev-haskell/tasty/metadata.xml b/dev-haskell/tasty/metadata.xml
index ab7ff66b4e9f..aa6c85f01596 100644
--- a/dev-haskell/tasty/metadata.xml
+++ b/dev-haskell/tasty/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		See &lt;http://documentup.com/feuerbach/tasty&gt;
-	</longdescription>
 	<use>
-		<flag name="colors">Enable colorful output</flag>
+		<flag name="clock">Depend on the clock package for more accurate time measurement</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">tasty</remote-id>
+		<remote-id type="github">UnkindPartition/tasty</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tasty/tasty-0.10.1.2.ebuild b/dev-haskell/tasty/tasty-0.10.1.2.ebuild
deleted file mode 100644
index 0880ee7ea464..000000000000
--- a/dev-haskell/tasty/tasty-0.10.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/regex-tdfa-rc-1.1.8.2:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty/tasty-0.11.0.4.ebuild b/dev-haskell/tasty/tasty-0.11.0.4.ebuild
deleted file mode 100644
index e90ded228495..000000000000
--- a/dev-haskell/tasty/tasty-0.11.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=("${FILESDIR}"/${P}-unbounded-delays.patch)
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?]
-	>=dev-haskell/clock-0.4.4.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.11:=[profile?]
-	>=dev-haskell/regex-tdfa-1.1.8.2:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty/tasty-0.3.1.ebuild b/dev-haskell/tasty/tasty-0.3.1.ebuild
deleted file mode 100644
index 78242c8f3fbd..000000000000
--- a/dev-haskell/tasty/tasty-0.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="https://hackage.haskell.org/package/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colors"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	dev-haskell/regex-posix:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	colors? ( dev-haskell/ansi-terminal:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag colors colors)
-}
diff --git a/dev-haskell/tasty/tasty-0.5.2.ebuild b/dev-haskell/tasty/tasty-0.5.2.ebuild
deleted file mode 100644
index 8a665e605788..000000000000
--- a/dev-haskell/tasty/tasty-0.5.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="https://hackage.haskell.org/package/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colors"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	dev-haskell/regex-posix:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	colors? ( dev-haskell/ansi-terminal:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag colors colors)
-}
diff --git a/dev-haskell/tasty/tasty-0.8.1.2.ebuild b/dev-haskell/tasty/tasty-0.8.1.2.ebuild
deleted file mode 100644
index 42dba237037f..000000000000
--- a/dev-haskell/tasty/tasty-0.8.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="http://documentup.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.1:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.6:=[profile?]
-	>=dev-haskell/regex-tdfa-1.2:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/tasty/tasty-1.2.3.ebuild b/dev-haskell/tasty/tasty-1.2.3.ebuild
deleted file mode 100644
index bfe4addf2901..000000000000
--- a/dev-haskell/tasty/tasty-1.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: clock
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Modern and extensible testing framework"
-HOMEPAGE="https://github.com/feuerbach/tasty"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.9:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?]
-	>=dev-haskell/mtl-2.1.3.1:=[profile?]
-	>=dev-haskell/optparse-applicative-0.14:=[profile?]
-	>=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/tagged-0.5:=[profile?]
-	>=dev-haskell/unbounded-delays-0.1:=[profile?]
-	dev-haskell/wcwidth:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/clock-0.4.4.0:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=clock
-}
diff --git a/dev-haskell/tasty/tasty-1.4.2.3.ebuild b/dev-haskell/tasty/tasty-1.4.2.3.ebuild
new file mode 100644
index 000000000000..b53097c063f3
--- /dev/null
+++ b/dev-haskell/tasty/tasty-1.4.2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: +unix
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Modern and extensible testing framework"
+HOMEPAGE="https://github.com/UnkindPartition/tasty"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+clock"
+
+RDEPEND="
+	>=dev-haskell/ansi-terminal-0.9:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14:=[profile?]
+	>=dev-haskell/stm-2.3:=[profile?]
+	>=dev-haskell/tagged-0.5:=[profile?]
+	>=dev-haskell/unbounded-delays-0.1:=[profile?]
+	dev-haskell/wcwidth:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	clock? (
+		>=dev-haskell/clock-0.4.4.0:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag clock clock) \
+		--flag=unix
+}
diff --git a/dev-haskell/template-haskell-compat-v0208/Manifest b/dev-haskell/template-haskell-compat-v0208/Manifest
deleted file mode 100644
index d562aaaecd20..000000000000
--- a/dev-haskell/template-haskell-compat-v0208/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST template-haskell-compat-v0208-0.1.2.1.tar.gz 2892 BLAKE2B a4d941c715115a1e4bf01ad5bd9b935162407cfb697d2442838682e59183b67fa9e2168c8d0675572911fb2a473862790204e03632c64b5674b766a521db08ea SHA512 864cfb6a9fdd24f9a17d6e9ed2dcf8b00c6dc289165b2f34fb90384a90c03f554705437e15f87d53cd532c78243bf89f141d93a880aaeb7c6af9dc51e85ac96f
diff --git a/dev-haskell/template-haskell-compat-v0208/metadata.xml b/dev-haskell/template-haskell-compat-v0208/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/template-haskell-compat-v0208/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.2.1.ebuild b/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.2.1.ebuild
deleted file mode 100644
index 347654e921ce..000000000000
--- a/dev-haskell/template-haskell-compat-v0208/template-haskell-compat-v0208-0.1.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A backwards compatibility layer for Template Haskell newer than 2.8"
-HOMEPAGE="https://github.com/nikita-volkov/template-haskell-compat-v0208"
-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.6.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
diff --git a/dev-haskell/temporary-rc/metadata.xml b/dev-haskell/temporary-rc/metadata.xml
index bbe5b0a30e4e..3c32ab877a53 100644
--- a/dev-haskell/temporary-rc/metadata.xml
+++ b/dev-haskell/temporary-rc/metadata.xml
@@ -1,18 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
-		package contains some good ones, but they aren't portable to Windows.
-		This library just repackages the Cabal implementations of its own temporary file and folder functions so that
-		you can use them without linking against Cabal or depending on it being installed.
-		This is a better maintained fork of the "temporary" package.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">feuerbach/temporary</remote-id>
+		<remote-id type="github">UnkindPartition/temporary</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild b/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
index 98648f12f2e5..6c43ae9c9c59 100644
--- a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
+++ b/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://github.com/feuerbach/temporary"
+HOMEPAGE="https://github.com/UnkindPartition/temporary"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.18.1.3
 "
diff --git a/dev-haskell/temporary/Manifest b/dev-haskell/temporary/Manifest
index 07539175700b..7ab639b8eb2b 100644
--- a/dev-haskell/temporary/Manifest
+++ b/dev-haskell/temporary/Manifest
@@ -1,4 +1 @@
-DIST temporary-1.1.2.4.tar.gz 5220 BLAKE2B dc5744b92fb2b20a878becbc4c4a5274e8d6ae9d827abfa30333f5f30ba0ac8141c7cf8805de532e241d7379f3fdbe8900a18c471d0405cbedf85c817d1f026c SHA512 ebd2221ed75deba8c411ef4e4c6c45de41beaa1d26521f488b4ab16ee731839cd6193ce987701a224110451138c4eeb1b40d01a65a20b4508bc9fbd2a87e7313
-DIST temporary-1.2.0.3.tar.gz 5308 BLAKE2B 5c570641d27bbda5f28a1f0eac65a89377310cf10f1188b3bb90f5ec0aba67c466f3518a69dc4f1e446031c3e6f6fa6fce65f705db0185401d0986b385072d60 SHA512 ceada89c2166c315b2a54cae0a636eb0b38e6e89481ef32d3d1e4305d4e601305b4cb88fba3069493e8fe2014e3d237348a37567aba61e617c69707f0a16dd34
-DIST temporary-1.2.0.4.tar.gz 5347 BLAKE2B bf1d5740510248d993159aa4e1fba4c023efe1f64e8160c4a6ed33c2f8529907a406600c096f9ea0954f8f635955d2ba47968346f4c62eb3037f6748c862a9f7 SHA512 cc8ba1c43d3e75f13450cbbbea081b5dd42d4a8c0fd33dd4ca9cec636aa91c2cd5c6edbcd86bf7895d6672a46c3e2c8edc57bb2ce88f61fdc05ec75e62c9373f
 DIST temporary-1.3.tar.gz 5686 BLAKE2B 7769c471a8fe3f2a73291b53633c9d4ec785bff9dfa93874f46bdac50b7e16a5fea918848645132593d2d0c0aeda2479777e04b1adf8fa501306bace89fdfdcd SHA512 e3078caf54da95c4efa9e9c936b35a98b62296ecce2242cd4e103605a9d29e8a9d6c7027dbf50d02b6a893bea558ea5b07dbb1df7c59bf26d86db76ccf112f25
diff --git a/dev-haskell/temporary/files/temporary-1.3-smp-flag.patch b/dev-haskell/temporary/files/temporary-1.3-smp-flag.patch
new file mode 100644
index 000000000000..22832a87777a
--- /dev/null
+++ b/dev-haskell/temporary/files/temporary-1.3-smp-flag.patch
@@ -0,0 +1,46 @@
+From 7f448b41589fccd3ac883c6fb3865f8dbedcb14d Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sun, 30 Oct 2022 12:45:29 -0600
+Bug: https://github.com/UnkindPartition/temporary/pull/15
+Subject: [PATCH] Add smp flag
+
+This flag will toggle the use of some `ghc-options` in the  test suite.
+It is set to `default: True`.
+
+This is needed for tests to run on some GHC builds which do not support
+a threaded runtime.
+
+Reported-by: matoro <https://github.com/matoro>
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ temporary.cabal | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/temporary.cabal b/temporary.cabal
+index 67163d1..ca54604 100644
+--- a/temporary.cabal
++++ b/temporary.cabal
+@@ -15,6 +15,11 @@ source-repository head
+   type:     git
+   location: git://github.com/feuerbach/temporary.git
+ 
++flag smp
++  description: Use flags that depend on GHC supporting a multicore runtime (tests only)
++  manual: True
++  default: True
++
+ Library
+     default-language:
+       Haskell2010
+@@ -37,7 +42,10 @@ test-suite test
+     tests
+   main-is:
+     test.hs
+-  ghc-options: -threaded -with-rtsopts=-N2
++  if flag(smp)
++    ghc-options: -threaded -with-rtsopts=-N2
++  else
++    ghc-options: -threaded
+   build-depends:
+       base >= 4.3 && < 5
+     , directory
diff --git a/dev-haskell/temporary/metadata.xml b/dev-haskell/temporary/metadata.xml
index dd1a1cb7cec3..5a2f1de5b5d4 100644
--- a/dev-haskell/temporary/metadata.xml
+++ b/dev-haskell/temporary/metadata.xml
@@ -1,17 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
-		package contains some good ones, but they aren't portable to Windows.
-		This library just repackages the Cabal implementations of its own temporary file and folder functions so that
-		you can use them without linking against Cabal or depending on it being installed.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">batterseapower/temporary</remote-id>
+		<remote-id type="hackage">temporary</remote-id>
+		<remote-id type="github">feuerbach/temporary</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/temporary/temporary-1.1.2.4.ebuild b/dev-haskell/temporary/temporary-1.1.2.4.ebuild
deleted file mode 100644
index c0bbd705484e..000000000000
--- a/dev-haskell/temporary/temporary-1.1.2.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://github.com/batterseapower/temporary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	cabal_chdeps \
-		'unix >= 2.3 && < 2.7' 'unix >= 2.3'
-}
diff --git a/dev-haskell/temporary/temporary-1.2.0.3.ebuild b/dev-haskell/temporary/temporary-1.2.0.3.ebuild
deleted file mode 100644
index 18c1ee7e611c..000000000000
--- a/dev-haskell/temporary/temporary-1.2.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://github.com/batterseapower/temporary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/temporary/temporary-1.2.0.4.ebuild b/dev-haskell/temporary/temporary-1.2.0.4.ebuild
deleted file mode 100644
index 4f76a17ee7cd..000000000000
--- a/dev-haskell/temporary/temporary-1.2.0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="http://www.github.com/feuerbach/temporary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/transformers-0.2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/temporary/temporary-1.3-r1.ebuild b/dev-haskell/temporary/temporary-1.3-r1.ebuild
new file mode 100644
index 000000000000..604644669b27
--- /dev/null
+++ b/dev-haskell/temporary/temporary-1.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="Portable temporary file and directory support"
+HOMEPAGE="https://github.com/feuerbach/temporary"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3-smp-flag.patch"
+)
+
+RDEPEND="
+	>=dev-haskell/random-1.1:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? (
+		dev-haskell/base-compat
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+	)
+"
+
+src_configure() {
+	if ghc-supports-smp; then
+		local smp_flag=smp
+	else
+		local smp_flag=-smp
+	fi
+
+	haskell-cabal_src_configure \
+		--flag="${smp_flag}"
+}
diff --git a/dev-haskell/temporary/temporary-1.3.ebuild b/dev-haskell/temporary/temporary-1.3.ebuild
index 1557b635b0ea..3bbb3ee7db6b 100644
--- a/dev-haskell/temporary/temporary-1.3.ebuild
+++ b/dev-haskell/temporary/temporary-1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Portable temporary file and directory support for Windows and Unix"
-HOMEPAGE="https://github.com/feuerbach/temporary"
+HOMEPAGE="https://github.com/UnkindPartition/temporary"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/tensor/Manifest b/dev-haskell/tensor/Manifest
deleted file mode 100644
index 9d9f1342c078..000000000000
--- a/dev-haskell/tensor/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Tensor-1.0.0.1.tar.gz 3314 BLAKE2B 6863127d023ef0cdc449f1a0a79c902f59b8e88892bf8bc2205a6b3239d81ee2bd6e2896732702c75cc180941882cd00cf8f5386206dd706a3800dea9e5da0c0 SHA512 8808d71cb3a3d19991a07c2652751f35bf6c4a4d5dc4090b1ce4835c4cabe29d04b968555663ec7facd93fbb3239031b6540d8afd0661fa4d7b4652a1bf2fd96
-DIST Tensor-1.1.0.1.tar.gz 3281 BLAKE2B 768bf8ab52c17ef8825f83dfa7a7f2e8854305aa2afcdc0a13aa336b20fb6841c470b637d2b29b2acc988669f2ef13d079a667102be1e2d1d03cb981a078937c SHA512 000086bcf160a1ea0a9a3f1aea39ea87979db97203511549e62c5b5161ae178aab0a1e7e0a091e82e66e319dd86c90e8f07ca473027fe7d363f18bfc584c30f3
diff --git a/dev-haskell/tensor/files/tensor-1.0.0.1-ghc-7.8.patch b/dev-haskell/tensor/files/tensor-1.0.0.1-ghc-7.8.patch
deleted file mode 100644
index 7ef3ed758676..000000000000
--- a/dev-haskell/tensor/files/tensor-1.0.0.1-ghc-7.8.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff --git a/src/Data/Tensor.hs b/src/Data/Tensor.hs
-index a5042df..0ba41f0 100644
---- a/src/Data/Tensor.hs
-+++ b/src/Data/Tensor.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DeriveDataTypeable #-}
- --------------------------------------------------------------------------------
- -- |
- -- Module      :  Data.Tensor
-@@ -32,7 +33,7 @@ import Foreign.Storable
- 
- -- | A vertex with /y/=0, /z/=0 and /w/=1.
- newtype Vertex1 a = Vertex1 a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex1 where
-    fmap f (Vertex1 x) = Vertex1 (f x)
-@@ -53,12 +54,6 @@ instance Traversable Vertex1 where
-    mapM f (Vertex1 x) = return Vertex1 `ap` f x
-    sequence (Vertex1 x) = return Vertex1 `ap` x
- 
--instance Typeable1 Vertex1 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex1") []
--
--instance Typeable a => Typeable (Vertex1 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex1 a) where
-    sizeOf    ~(Vertex1 s) = sizeOf s
-    alignment ~(Vertex1 s) = alignment s
-@@ -69,7 +64,7 @@ instance Storable a => Storable (Vertex1 a) where
- 
- -- | A vertex with /z/=0 and /w/=1.
- data Vertex2 a = Vertex2 !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex2 where
-    fmap f (Vertex2 x y) = Vertex2 (f x) (f y)
-@@ -90,12 +85,6 @@ instance Traversable Vertex2 where
-    mapM f (Vertex2 x y) = return Vertex2 `ap` f x `ap` f y
-    sequence (Vertex2 x y) = return Vertex2 `ap` x `ap` y
- 
--instance Typeable1 Vertex2 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex2") []
--
--instance Typeable a => Typeable (Vertex2 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex2 a) where
-    sizeOf ~(Vertex2 x _) = 2 * sizeOf x
-    alignment ~(Vertex2 x _) = alignment x
-@@ -106,7 +95,7 @@ instance Storable a => Storable (Vertex2 a) where
- 
- -- | A vertex with /w/=1.
- data Vertex3 a = Vertex3 !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex3 where
-    fmap f (Vertex3 x y z) = Vertex3 (f x) (f y) (f z)
-@@ -127,12 +116,6 @@ instance Traversable Vertex3 where
-    mapM f (Vertex3 x y z) = return Vertex3 `ap` f x `ap` f y `ap` f z
-    sequence (Vertex3 x y z) = return Vertex3 `ap` x `ap` y `ap` z
- 
--instance Typeable1 Vertex3 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex3") []
--
--instance Typeable a => Typeable (Vertex3 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex3 a) where
-    sizeOf ~(Vertex3 x _ _) = 3 * sizeOf x
-    alignment ~(Vertex3 x _ _) = alignment x
-@@ -143,7 +126,7 @@ instance Storable a => Storable (Vertex3 a) where
- 
- -- | A fully-fledged four-dimensional vertex.
- data Vertex4 a = Vertex4 !a !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vertex4 where
-    fmap f (Vertex4 x y z w) = Vertex4 (f x) (f y) (f z) (f w)
-@@ -164,12 +147,6 @@ instance Traversable Vertex4 where
-    mapM f (Vertex4 x y z w) = return Vertex4 `ap` f x `ap` f y `ap` f z `ap` f w
-    sequence (Vertex4 x y z w) = return Vertex4 `ap` x `ap` y `ap` z `ap` w
- 
--instance Typeable1 Vertex4 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vertex4") []
--
--instance Typeable a => Typeable (Vertex4 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vertex4 a) where
-    sizeOf ~(Vertex4 x _ _ _) = 4 * sizeOf x
-    alignment ~(Vertex4 x _ _ _) = alignment x
-@@ -180,7 +157,7 @@ instance Storable a => Storable (Vertex4 a) where
- 
- -- | A one-dimensional vector.
- newtype Vector1 a = Vector1 a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector1 where
-    fmap f (Vector1 x) = Vector1 (f x)
-@@ -201,12 +178,6 @@ instance Traversable Vector1 where
-    mapM f (Vector1 x) = return Vector1 `ap` f x
-    sequence (Vector1 x) = return Vector1 `ap` x
- 
--instance Typeable1 Vector1 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector1") []
--
--instance Typeable a => Typeable (Vector1 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector1 a) where
-    sizeOf    ~(Vector1 s) = sizeOf s
-    alignment ~(Vector1 s) = alignment s
-@@ -217,7 +188,7 @@ instance Storable a => Storable (Vector1 a) where
- 
- -- | A two-dimensional vector.
- data Vector2 a = Vector2 !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector2 where
-    fmap f (Vector2 x y) = Vector2 (f x) (f y)
-@@ -238,12 +209,6 @@ instance Traversable Vector2 where
-    mapM f (Vector2 x y) = return Vector2 `ap` f x `ap` f y
-    sequence (Vector2 x y) = return Vector2 `ap` x `ap` y
- 
--instance Typeable1 Vector2 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector2") []
--
--instance Typeable a => Typeable (Vector2 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector2 a) where
-    sizeOf ~(Vector2 x _) = 2 * sizeOf x
-    alignment ~(Vector2 x _) = alignment x
-@@ -254,7 +219,7 @@ instance Storable a => Storable (Vector2 a) where
- 
- -- | A three-dimensional vector.
- data Vector3 a = Vector3 !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector3 where
-    fmap f (Vector3 x y z) = Vector3 (f x) (f y) (f z)
-@@ -275,12 +240,6 @@ instance Traversable Vector3 where
-    mapM f (Vector3 x y z) = return Vector3 `ap` f x `ap` f y `ap` f z
-    sequence (Vector3 x y z) = return Vector3 `ap` x `ap` y `ap` z
- 
--instance Typeable1 Vector3 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector3") []
--
--instance Typeable a => Typeable (Vector3 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector3 a) where
-    sizeOf ~(Vector3 x _ _) = 3 * sizeOf x
-    alignment ~(Vector3 x _ _) = alignment x
-@@ -291,7 +250,7 @@ instance Storable a => Storable (Vector3 a) where
- 
- -- | A four-dimensional vector.
- data Vector4 a = Vector4 !a !a !a !a
--   deriving (Eq, Ord, Ix, Bounded, Show, Read)
-+   deriving (Eq, Ord, Ix, Bounded, Show, Read, Typeable)
- 
- instance Functor Vector4 where
-    fmap f (Vector4 x y z w) = Vector4 (f x) (f y) (f z) (f w)
-@@ -312,12 +271,6 @@ instance Traversable Vector4 where
-    mapM f (Vector4 x y z w) = return Vector4 `ap` f x `ap` f y `ap` f z `ap` f w
-    sequence (Vector4 x y z w) = return Vector4 `ap` x `ap` y `ap` z `ap` w
- 
--instance Typeable1 Vector4 where
--   typeOf1 _ = mkTyConApp (mkTyCon "Vector4") []
--
--instance Typeable a => Typeable (Vector4 a) where
--   typeOf = typeOfDefault
--
- instance Storable a => Storable (Vector4 a) where
-    sizeOf ~(Vector4 x _ _ _) = 4 * sizeOf x
-    alignment ~(Vector4 x _ _ _) = alignment x
diff --git a/dev-haskell/tensor/metadata.xml b/dev-haskell/tensor/metadata.xml
deleted file mode 100644
index 5a39796adcf0..000000000000
--- a/dev-haskell/tensor/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package contains tensor data types and their instances for some basic
-		type classes.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/tensor/tensor-1.0.0.1.ebuild b/dev-haskell/tensor/tensor-1.0.0.1.ebuild
deleted file mode 100644
index ad79307206fa..000000000000
--- a/dev-haskell/tensor/tensor-1.0.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-MY_PN="Tensor"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tensor data types"
-HOMEPAGE="http://www.haskell.org/HOpenGL/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/cabal
-"
-PATCHES=("${FILESDIR}"/${PN}-1.0.0.1-ghc-7.8.patch)
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/tensor/tensor-1.1.0.1.ebuild b/dev-haskell/tensor/tensor-1.1.0.1.ebuild
deleted file mode 100644
index dc43edc60914..000000000000
--- a/dev-haskell/tensor/tensor-1.1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Tensor"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tensor data types"
-HOMEPAGE="https://github.com/svenpanne/Tensor"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/terminal-size/Manifest b/dev-haskell/terminal-size/Manifest
index d3a1b1e53b97..5d153d90f850 100644
--- a/dev-haskell/terminal-size/Manifest
+++ b/dev-haskell/terminal-size/Manifest
@@ -1 +1,2 @@
 DIST terminal-size-0.3.2.1.tar.gz 4175 BLAKE2B d6a2b54298217dfae26e3fccb5aca6813c23b1bdef5c2e22236b6285222ade53842acd0283e862c86f25f94c1b5ce9f990ad583e0f498b57795d6d59bafdd920 SHA512 1e04705dda8ade9a06f8b369f1033a93ffb94a1b959a556e11f2373b25924adbbab4be0f3e077394e1023e0054044739df13406b69153c1542f4083be82a1584
+DIST terminal-size-0.3.3.tar.gz 4291 BLAKE2B 71c378683772654a6e598a6ff3fcafdc3e8737044c8cb4afa0dd4093e9978854d24bf97fae28d3fc8e585daa5a999a268b428d0e8698ee25fbe87d57224fb8ea SHA512 eff444205905337503e208ae2ce925713c4ebdf1a92bdd915feef2f85a8d936d74c727b01e570aed64c151797b23800220460d520a0df0830b5419ad51d7f310
diff --git a/dev-haskell/terminal-size/metadata.xml b/dev-haskell/terminal-size/metadata.xml
index 079464cfab42..c97bfab3cc30 100644
--- a/dev-haskell/terminal-size/metadata.xml
+++ b/dev-haskell/terminal-size/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Get terminal window height and width without ncurses dependency
-		
-		Only tested to work on GNU/Linux systems
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">terminal-size</remote-id>
+		<remote-id type="github">biegunka/terminal-size</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild b/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
index f9d8d31768b3..6bf55f9285ca 100644
--- a/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
+++ b/dev-haskell/terminal-size/terminal-size-0.3.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/terminal-size/terminal-size-0.3.3.ebuild b/dev-haskell/terminal-size/terminal-size-0.3.3.ebuild
new file mode 100644
index 000000000000..f4e514a61744
--- /dev/null
+++ b/dev-haskell/terminal-size/terminal-size-0.3.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Get terminal window height and width"
+HOMEPAGE="https://hackage.haskell.org/package/terminal-size"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
deleted file mode 100644
index 257038e15b43..000000000000
--- a/dev-haskell/terminfo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST terminfo-0.4.0.0.tar.gz 45591 BLAKE2B 94986d3301b73458eb83daa99c6a45b631fb83bee2a38724f2ae76b466abe52569529744ffaad014035947358f34761f18c5d1a734f5f2375b80fcfc2b1c4a8b SHA512 ba52ddd60ef899ca0a696813d613d12964b5e73b6450f013f4545cafa1ccd99b6f86916f0d369b4562ece0fa3f9280a7bba8160363cbc6cae93cedc3992fbf70
-DIST terminfo-0.4.0.1.tar.gz 45615 BLAKE2B e763301621d9d55e250ac822b2dbf1a9b652d8f99a205de9e17572f99c3b576424bb555e00d26654ef0acdd06c4ac16ed9c5fb7c207f0eb5aea19325f51eedb5 SHA512 4b21621f4f7ebf656fbfd4278fa970d0211e2b66632b5251cdcd659a71df04294ba334ede97582b5b7f403e15552f3b6c4b5f0cb9ec6453aace502109eaeff46
-DIST terminfo-0.4.0.2.tar.gz 45511 BLAKE2B edf4fae3dc4d6550941f60c2e87bfd2a81757e54e4198cd39751a651b6a09671d5dc8e8199bc25c5a06ae5644d7c30a299cf3aaa1b6256850ea24f64002f038f SHA512 eda799218ee1b1a765d909e9723fbf7e2de33b2946fdaeb92141bbf056a20a66bebc4b72359d1f5bdd5d188a10a3701d73818cee65170e0660daccf8c295897e
-DIST terminfo-0.4.1.4.tar.gz 42234 BLAKE2B d20920290bb865982d3dac1647a7bad8d75dc7782db249286fa0fcd70ba1bf532da174bc0925f13c6870a2949c7d3b033656c13f5906f09000ba7d89ace4102e SHA512 3006b7c4a0628cb0f28cfb9af8172410a194ee9dc24e1bd121a94d5c5bfbba09ea0b232412eacc7f6705495511077a427ef2aeb7fff2af7cb80e25823aa1667c
diff --git a/dev-haskell/terminfo/metadata.xml b/dev-haskell/terminfo/metadata.xml
deleted file mode 100644
index b148b282e3ce..000000000000
--- a/dev-haskell/terminfo/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">judah/terminfo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
deleted file mode 100644
index 2174f08d3c56..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-	sys-libs/ncurses
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-
-CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
deleted file mode 100644
index b89f2a5e62a0..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3"
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
deleted file mode 100644
index 0349e6b96492..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1_rc2 PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2 PM:9999"
diff --git a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild b/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
deleted file mode 100644
index c179dc6ec011..000000000000
--- a/dev-haskell/terminfo/terminfo-0.4.1.4.ebuild
+++ /dev/null
@@ -1,27 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library"
-HOMEPAGE="https://github.com/judah/terminfo"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8 and ghc 8.10
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-8.0.1:=
-"
-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:9999"
diff --git a/dev-haskell/test-framework-hunit/Manifest b/dev-haskell/test-framework-hunit/Manifest
index 48b99007a55d..5378ed32d7c2 100644
--- a/dev-haskell/test-framework-hunit/Manifest
+++ b/dev-haskell/test-framework-hunit/Manifest
@@ -1,2 +1 @@
 DIST test-framework-hunit-0.3.0.2.tar.gz 2770 BLAKE2B 48d5d90f215a27402c77967e4656e99cf74740775a98b3fbbd6d3ecd90ec1dc8d31cf462df6f7ba2939b40dd524d5f13a4cde01ce0d03aeb2829726393ef39de SHA512 068ca4326935746769aa4023076e9bd85d1753073c6e67d88daa6ccf2a69f3bafb87c3b03fd5ada612f6ddbdf2447b06ef8f853675cf0efe9eafd80606c40e32
-DIST test-framework-hunit-0.3.0.tar.gz 2679 BLAKE2B 8e224ed1c05d8812b8fad8427350a725926ce150c9381c1f76e10deff0d5f818f3ab672b1e4dc5cbc4e6cdd61496a9d7c95d73ddfc110e263f0e17bbf37dd835 SHA512 39a537a56d3fa7f6a996b58a40971265acf4103608f10386af2c7d8d941cc416afa504af2f2f70b91e43616dac1231d384e2fc14835f5a13e41fd27d42f708ed
diff --git a/dev-haskell/test-framework-hunit/metadata.xml b/dev-haskell/test-framework-hunit/metadata.xml
index 522384de8446..937381521944 100644
--- a/dev-haskell/test-framework-hunit/metadata.xml
+++ b/dev-haskell/test-framework-hunit/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
index 4fe663a8a4a7..ce749f2dee58 100644
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.4.6.9999
 #hackport: flags: +base4
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
@@ -27,11 +27,9 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6
 "
 
-src_prepare() {
-	cabal_chdeps \
-		'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2'
-	default
-}
+CABAL_CHDEPS=(
+	'HUnit >= 1.2 && < 1.4' 'HUnit >= 1.2'
+)
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
deleted file mode 100644
index 8b461241552f..000000000000
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-1.4:=[profile?]
-	>=dev-haskell/test-framework-0.2.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild
deleted file mode 100644
index 78f662c4163a..000000000000
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HUnit support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.com/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?]
-		<dev-haskell/extensible-exceptions-0.2.0:=[profile?]
-		>=dev-haskell/hunit-1.2:=[profile?]
-		<dev-haskell/hunit-2:=[profile?]
-		>=dev-haskell/test-framework-0.2.0:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3"
diff --git a/dev-haskell/test-framework-leancheck/Manifest b/dev-haskell/test-framework-leancheck/Manifest
new file mode 100644
index 000000000000..f26a266eca50
--- /dev/null
+++ b/dev-haskell/test-framework-leancheck/Manifest
@@ -0,0 +1 @@
+DIST test-framework-leancheck-0.0.1.tar.gz 8743 BLAKE2B 73c5e42f448d57a0d07c3a21751875f8b97a43aac2ba9c97e0f334d86b3a7e0afea6a753bdfa3253796340d77c12e251316a99f985e3f6166feedbd574cf466a SHA512 51a446c8650b375b893e762ed6d7683540788a57a7f968173556d93d811e7c039251c26e1086ba74546d9b2c834c278c75bc791ce8bacf38c381b01d3875371a
diff --git a/dev-haskell/test-framework-leancheck/metadata.xml b/dev-haskell/test-framework-leancheck/metadata.xml
new file mode 100644
index 000000000000..85f1049380c1
--- /dev/null
+++ b/dev-haskell/test-framework-leancheck/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">rudymatela/test-framework-leancheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/test-framework-leancheck/test-framework-leancheck-0.0.1.ebuild b/dev-haskell/test-framework-leancheck/test-framework-leancheck-0.0.1.ebuild
new file mode 100644
index 000000000000..dbbe77a31e06
--- /dev/null
+++ b/dev-haskell/test-framework-leancheck/test-framework-leancheck-0.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="LeanCheck support for test-framework"
+HOMEPAGE="https://github.com/rudymatela/test-framework-leancheck#readme"
+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/leancheck:=[profile?]
+	dev-haskell/test-framework:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+"
diff --git a/dev-haskell/test-framework-quickcheck2/Manifest b/dev-haskell/test-framework-quickcheck2/Manifest
index 5411b38f1c53..f5afd1ff1ca2 100644
--- a/dev-haskell/test-framework-quickcheck2/Manifest
+++ b/dev-haskell/test-framework-quickcheck2/Manifest
@@ -1,3 +1 @@
-DIST test-framework-quickcheck2-0.3.0.2.tar.gz 3413 BLAKE2B 5dcc3d4e6705ade01dbf6a4da3d8473da87ad1ac53c54b3f164cc40fbe6b56dc91e975376f7c793eb7b1e6ac7ce849e0b7a35ec787b82643fdef8f2f9b5964d6 SHA512 83b3c324edaa0e8809b76dd077b79dc75a0ad26febaecdb824e86bee41dedda422ff2674e1c0e3ea6da5ff1710baad4ae162efd6005a085a88ef4616c66dfea9
-DIST test-framework-quickcheck2-0.3.0.3.tar.gz 3518 BLAKE2B 7eceb9b2860c8918a6391b9ea53fdd2e03db17f4ee470234cb41e960b55c705126eb1f5a4c588f27e67096795b3d513d4f4cd8ee7abb6b8eb1db4cd7d68f8704 SHA512 a61ae17391e66109719ee4da0b0d469f0173a29aec8a9c5f9a4d6d5069c91903d3b3c0d9daa5ec5d611b5654dd25b9a9839f7501df24b489d069511eb7f6eedf
 DIST test-framework-quickcheck2-0.3.0.5.tar.gz 3844 BLAKE2B 1c7ace7b85200d3ce1bcf6a48dc10d912c4cfa255eaf100b37d018128a4e014703cf378b2fee74355c1731d9062c68b164da96f6f672a10af460d41ed2b2d2ca SHA512 58c6177d52829ba1ea1858a11101e5b21ae4e4543f8f829779f62208ad16083b41e9f3b2275392693698ef3d46912096c368d90db0d67ff136af4fa73d5e1d43
diff --git a/dev-haskell/test-framework-quickcheck2/metadata.xml b/dev-haskell/test-framework-quickcheck2/metadata.xml
index 0ab08206ed27..937381521944 100644
--- a/dev-haskell/test-framework-quickcheck2/metadata.xml
+++ b/dev-haskell/test-framework-quickcheck2/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		QuickCheck2 support for the test-framework package.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
deleted file mode 100644
index c3388ec987b1..000000000000
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck2 support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-#hackport: ignore-flag base3 : we don't support base3
-#hackport: ignore-flag base4 : we don't support base4
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
-	>=dev-haskell/quickcheck-2.4:=[profile?] <dev-haskell/quickcheck-2.7:=[profile?]
-	>=dev-haskell/random-1:=[profile?]
-	>=dev-haskell/test-framework-0.7.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild
deleted file mode 100644
index 04b60cd7be7b..000000000000
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck2 support for the test-framework package"
-HOMEPAGE="https://batterseapower.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/random-1:=[profile?]
-	>=dev-haskell/test-framework-0.7.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.4 && < 2.8' 'QuickCheck >= 2.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
deleted file mode 100644
index 17814ed154f8..000000000000
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: +base4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="QuickCheck2 support for the test-framework package"
-HOMEPAGE="http://haskell.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~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/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/test-framework-0.8:=[profile?] <dev-haskell/test-framework-0.9:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck            >= 2.4    && < 2.13' 'QuickCheck            >= 2.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=base4
-}
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
new file mode 100644
index 000000000000..3dce34339afa
--- /dev/null
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.5-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: +base4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck2 support for the test-framework package"
+HOMEPAGE="http://haskell.github.io/test-framework/"
+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/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+CABAL_CHDEPS=(
+	'QuickCheck            >= 2.4    && < 2.13' 'QuickCheck            >= 2.4' \
+	'random                >= 1      && < 1.2' 'random                >= 1'
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4
+}
diff --git a/dev-haskell/test-framework-th-prime/Manifest b/dev-haskell/test-framework-th-prime/Manifest
deleted file mode 100644
index 0dfa27f9fce1..000000000000
--- a/dev-haskell/test-framework-th-prime/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST test-framework-th-prime-0.0.7.tar.gz 3832 BLAKE2B 47a4f4cc6884e71e4029290577c4c989fc881b506626ea41ce5598ccef84886b5af755a74f8a92ba68063cf2eaa94de71e098c308edd4c8df4f7a718e27bd8d1 SHA512 724b4de8cfdf10341bc95a6f437359fe0210ab0b7bef63761912d85d71ae552cef230f20bd50a723cf7aafcd45c30def6dc80b37c876986418db6072193f0daa
-DIST test-framework-th-prime-0.0.8.tar.gz 3836 BLAKE2B 7ffa24ed45109319ab111d9b29dfb3beda6624c126eb2c308a5c7b7e0fa36cc5b67564c30220df14ec0db46bf82484446916cb78e0201e1cf995636a53d32b69 SHA512 f988c4c4a1329d9b6f1dc98a840b51787ecc3d2648e8093871970d9a79931cb56cbbef718f052773cb62867c7f0b084e15fa3dfc75c7443d1a94c4df65b8b71e
-DIST test-framework-th-prime-0.0.9.tar.gz 3908 BLAKE2B 4c8794bf66081ffd6eee2b6f0e9d8fd5f2218a90c2522398b13f440aade1244a62e91c3c1e11367f109babd2e78722d94beaac95555be356ce55f25d118adfa3 SHA512 52f64b1705d51f45512da4270d8a80c93602d62a2c33eb3a0146f10a3f737395c9d0294af62cc3ff859dc8292338df892c0262216349109bb4f7b0beb09d3601
diff --git a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch
deleted file mode 100644
index a638dcd10106..000000000000
--- a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test-framework-th-prime-0.0.7-orig/Test/Framework/TH/Prime/Parser.hs	2014-10-08 12:01:25.000000000 +1100
-+++ test-framework-th-prime-0.0.7/Test/Framework/TH/Prime/Parser.hs	2015-04-04 23:46:56.120211323 +1100
-@@ -10,7 +10,7 @@
- import Language.Haskell.Exts.Parser
- import Language.Haskell.Exts.Syntax hiding (VarName, Exp)
- import Language.Haskell.TH hiding (Match)
--import Language.Preprocessor.Cpphs
-+import Language.Preprocessor.Cpphs (cppIfdef, defaultBoolOptions)
- 
- ----------------------------------------------------------------
- 
diff --git a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.8-ghc-8.patch b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.8-ghc-8.patch
deleted file mode 100644
index b3cbf27a28fe..000000000000
--- a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.8-ghc-8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Test/Framework/TH/Prime.hs b/Test/Framework/TH/Prime.hs
-index 75b0798..0bed643 100644
---- a/Test/Framework/TH/Prime.hs
-+++ b/Test/Framework/TH/Prime.hs
-@@ -1,2 +1,3 @@
- {-# LANGUAGE QuasiQuotes, TemplateHaskell #-}
-+{-# LANGUAGE CPP #-}
- 
-@@ -119,3 +120,7 @@ isDefined :: String -> Q Bool
- isDefined n = return False `recover` do
-+#if MIN_VERSION_template_haskell(2,11,0)
-+    VarI (Name _ flavour) _ _ <- reify (mkName n)
-+#else
-     VarI (Name _ flavour) _ _ _ <- reify (mkName n)
-+#endif
-     modul <- loc_module <$> location
-diff --git a/Test/Framework/TH/Prime/Parser.hs b/Test/Framework/TH/Prime/Parser.hs
-index 7f541c4..fef60f1 100644
---- a/Test/Framework/TH/Prime/Parser.hs
-+++ b/Test/Framework/TH/Prime/Parser.hs
-@@ -78,3 +78,3 @@ parseTest file = do
- #if MIN_VERSION_haskell_src_exts(1, 14, 0)
--        extensions = nub $ EnableExtension TemplateHaskell : exts raw
-+        extensions = nub $ EnableExtension Language.Haskell.Exts.Extension.TemplateHaskell : exts raw
- #else
diff --git a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch
deleted file mode 100644
index 359d5ea4f6a9..000000000000
--- a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.9-hse-1.18.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/Test/Framework/TH/Prime/Parser.hs b/Test/Framework/TH/Prime/Parser.hs
-index 87553a6..f188390 100644
---- a/Test/Framework/TH/Prime/Parser.hs
-+++ b/Test/Framework/TH/Prime/Parser.hs
-@@ -10,2 +10,5 @@ import Language.Haskell.Exts.Extension
- import Language.Haskell.Exts.Parser
-+#if MIN_VERSION_haskell_src_exts(1, 18, 0)
-+import Language.Haskell.Exts.SrcLoc
-+#endif
- import Language.Haskell.Exts.Syntax hiding (VarName, Exp)
-@@ -14,2 +17,11 @@ import Language.Preprocessor.Cpphs hiding (Ident)
- 
-+#if MIN_VERSION_haskell_src_exts(1, 18, 0)
-+-- location field for haskell-src-exts-1.18
-+#define L SrcSpanInfo
-+#define loc _
-+#else
-+#define L
-+#define loc
-+#endif
-+
- ----------------------------------------------------------------
-@@ -45,3 +57,7 @@ getTests :: FilePath -> IO ([String], [String])
- getTests file = do
-+#if MIN_VERSION_haskell_src_exts(1, 18, 0)
-+    ParseOk (Module _ _ _ _ decls) <- parseTest file
-+#else
-     ParseOk (Module _ _ _ _ _ _ decls) <- parseTest file
-+#endif
-     let funs = map fromFunBind $ filter isFunBind decls
-@@ -54,3 +70,3 @@ getTests file = do
- 
--parseTest :: FilePath -> IO (ParseResult Module)
-+parseTest :: FilePath -> IO (ParseResult (Module L))
- parseTest file = do
-@@ -74,4 +90,4 @@ parseTest file = do
- #endif
--        toStr (Ident str) = str
--        toStr (Symbol str) = str
-+        toStr (Ident loc str) = str
-+        toStr (Symbol loc str) = str
-     opt raw = defaultParseMode {
-@@ -88,7 +104,7 @@ parseTest file = do
- 
--isFunBind :: Decl -> Bool
--isFunBind (FunBind _) = True
--isFunBind _           = False
-+isFunBind :: Decl L -> Bool
-+isFunBind (FunBind loc _) = True
-+isFunBind _               = False
- 
--isPatBind :: Decl -> Bool
-+isPatBind :: Decl L -> Bool
- isPatBind PatBind{} = True
-@@ -96,6 +112,6 @@ isPatBind _                   = False
- 
--fromPatBind :: Decl -> String
-+fromPatBind :: Decl L -> String
- #if MIN_VERSION_haskell_src_exts(1, 16, 0)
--fromPatBind (PatBind _ (PVar (Ident  name)) _ _) = name
--fromPatBind (PatBind _ (PVar (Symbol name)) _ _) = name
-+fromPatBind (PatBind _ (PVar loc (Ident  loc name)) _ _) = name
-+fromPatBind (PatBind _ (PVar loc (Symbol loc name)) _ _) = name
- #else
-@@ -106,5 +122,10 @@ fromPatBind _ = error "fromPatBind"
- 
--fromFunBind :: Decl -> String
-+fromFunBind :: Decl L -> String
-+#if MIN_VERSION_haskell_src_exts(1, 18, 0)
-+fromFunBind (FunBind _floc (Match _ (Ident  _iloc name) _ _ _:_)) = name
-+fromFunBind (FunBind _floc (Match _ (Symbol _sloc name) _ _ _:_)) = name
-+#else
- fromFunBind (FunBind (Match _ (Ident  name) _ _ _ _:_)) = name
- fromFunBind (FunBind (Match _ (Symbol name) _ _ _ _:_)) = name
-+#endif
- fromFunBind _ = error "fromFunBind"
diff --git a/dev-haskell/test-framework-th-prime/metadata.xml b/dev-haskell/test-framework-th-prime/metadata.xml
deleted file mode 100644
index cdcb0fe22e29..000000000000
--- a/dev-haskell/test-framework-th-prime/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Automatically generates a Test list for
-		HUnit, doctest and QuickCheck2.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
deleted file mode 100644
index 8450659e5091..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
-	dev-haskell/haskell-src-exts:=[profile?]
-	dev-haskell/test-framework:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}/${PN}-0.0.7-cpphs-1.19.patch")
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild
deleted file mode 100644
index 179b247b23d0..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
-	dev-haskell/haskell-src-exts:=[profile?]
-	dev-haskell/test-framework:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
deleted file mode 100644
index 4a84d5c176be..000000000000
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Template Haskell for test framework"
-HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
-	dev-haskell/haskell-src-exts:=[profile?]
-	dev-haskell/test-framework:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-hse-1.18.patch)
diff --git a/dev-haskell/test-framework-th/metadata.xml b/dev-haskell/test-framework-th/metadata.xml
index a8fce2d224aa..da19a33e5a76 100644
--- a/dev-haskell/test-framework-th/metadata.xml
+++ b/dev-haskell/test-framework-th/metadata.xml
@@ -1,56 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		@test-framework-th@ contains two interesting functions: @defaultMainGenerator@ and @testGroupGenerator@.
-		
-		@defaultMainGenerator@ will extract all functions beginning with case_ or prop_ in the module and put them in a testGroup.
-		
-		&gt; -- file SomeModule.hs
-		&gt; ( -# LANGUAGE TemplateHaskell #- )
-		&gt; module SomeModule where
-		&gt; import Test.Framework.TH
-		&gt; import Test.Framework
-		&gt; import Test.HUnit
-		&gt; import Test.Framework.Providers.HUnit
-		&gt; import Test.Framework.Providers.QuickCheck2
-		&gt;
-		&gt; -- observe this line!
-		&gt; main = $(defaultMainGenerator)
-		&gt; case_1 = do 1 @=? 1
-		&gt; case_2 = do 2 @=? 2
-		&gt; prop_reverse xs = reverse (reverse xs) == xs
-		&gt;    where types = xs::[Int]
-		
-		is the same as
-		
-		&gt; -- file SomeModule.hs
-		&gt; ( -# LANGUAGE TemplateHaskell #- )
-		&gt; module SomeModule where
-		&gt; import Test.Framework.TH
-		&gt; import Test.Framework
-		&gt; import Test.HUnit
-		&gt; import Test.Framework.Providers.HUnit
-		&gt; import Test.Framework.Providers.QuickCheck2
-		&gt;
-		&gt; -- observe this line!
-		&gt; main =
-		&gt;   defaultMain [
-		&gt;     testGroup "SomeModule" [ testCase "1" case_1, testCase "2" case_2, testProperty "reverse" prop_reverse]
-		&gt;     ]
-		&gt;
-		&gt; case_1 = do 1 @=? 1
-		&gt; case_2 = do 2 @=? 2
-		&gt; prop_reverse xs = reverse (reverse xs) == xs
-		&gt;    where types = xs::[Int]
-		
-		@testGroupGenerator@ is like @defaultMainGenerator@ but without @defaultMain@. It is useful if you need a function for the testgroup
-		(e.g. if you want to be able to call the testgroup from another module).
-	</longdescription>
 	<upstream>
 		<remote-id type="github">finnsson/test-generator</remote-id>
 	</upstream>
diff --git a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
index 812e3653792f..98606fff1283 100644
--- a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
+++ b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.1.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Automagically generate the HUnit and Quickcheck code using Template Haskell"
+DESCRIPTION="Automagically generate the HUnit and Quickcheck using Template Haskell"
 HOMEPAGE="https://github.com/finnsson/test-generator"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/haskell-src-exts:=[profile?]
-		>=dev-haskell/language-haskell-extract-0.2:=[profile?]
-		dev-haskell/regex-posix:=[profile?]
-		dev-haskell/test-framework:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
+	>=dev-haskell/language-haskell-extract-0.2:=[profile?]
+	dev-haskell/regex-posix:=[profile?]
+	dev-haskell/test-framework:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/test-framework/Manifest b/dev-haskell/test-framework/Manifest
index 0d877d13bb46..f8cca506a6ce 100644
--- a/dev-haskell/test-framework/Manifest
+++ b/dev-haskell/test-framework/Manifest
@@ -1,3 +1,2 @@
-DIST test-framework-0.8.1.1.tar.gz 20900 BLAKE2B 4046a76825e645e82c5c2de7d098233b8bd93acbe8c932fe53d67c56350e87a623ffb2b379f95fce567cd4d8ed4459ea883e49d633f6e18c9ebefe058f74906d SHA512 7fd6015a0469623d2738c2a8d14c6b3a356c9463084a1b471f1c1b7b75bd33796ae8a0c01731e7b87dfa345be16bbeb262fcb1cdd4d8f1fdabd79c45f3570cbd
+DIST test-framework-0.8.2.0-rev10.cabal 6551 BLAKE2B ce6ea4314af3636960aa38714641cb79f83ccb3da89e2f95921c7f2e05da1ef3085d5cdeba3eb92c1a57245f38660994ec19478f0ce11489e952a55197debf9d SHA512 bf7a78811a6f7d25df23e79577b58c7af693f9615f631e69524d2bee144d8288f68d89416fc5ad4ae4c576093ea12ed7c8706dc096e6f758ce039f6c103fa184
 DIST test-framework-0.8.2.0.tar.gz 21317 BLAKE2B 80065ad3d87188a8310e93b9caaaca73c3176e150b254fe29dd3e08d38f7a7066119b132f6c747a35a87a13764d115fe83b131a023667a3919c0f1c0963c770a SHA512 d8e7ea274819a1b49b9f938df527d22c808f456d25b84f03173ed57dddd39c230fb037a57ce90c38f571801ee38e86bed6826df1c93f184e4a803c72ce5f41e4
-DIST test-framework-0.8.tar.gz 20253 BLAKE2B 2dc4d0926e529a22776f370bf673c797c77cec97f4d7cf02da85ffcaf245496c2d19159481b2c88a00a04b5f850bd4acffe050c8abf58525f5779799b83a5304 SHA512 5f2238b65d644faf14a1b057abd642c31bcfc337b345d155cd7b04d99589aa269b74ce9b5225b843db8fcab25454b677a05c498c873ee26635c206f6470a438b
diff --git a/dev-haskell/test-framework/metadata.xml b/dev-haskell/test-framework/metadata.xml
index 20be587629d7..f9659d324248 100644
--- a/dev-haskell/test-framework/metadata.xml
+++ b/dev-haskell/test-framework/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Allows tests such as QuickCheck properties and HUnit test cases to be assembled into test groups, run in
-		parallel (but reported in deterministic order, to aid diff interpretation) and filtered and controlled by
-		command line options. All of this comes with colored test output, progress reporting and test statistics output.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">test-framework</remote-id>
+		<remote-id type="github">haskell/test-framework</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild b/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild
deleted file mode 100644
index a8d3233010c3..000000000000
--- a/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
-HOMEPAGE="https://batterseapower.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # tests are missing
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?]
-	>=dev-haskell/hostname-1.0:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?]
-	>=dev-haskell/regex-posix-0.72:=[profile?]
-	>=dev-haskell/xml-1.3.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	test? ( >=dev-haskell/hunit-1.2:=[profile?]
-			>=dev-haskell/libxml-0.1.1:=[profile?]
-			>=dev-haskell/quickcheck-2.3:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >= 2.3 && < 2.5' 'QuickCheck >= 2.3 && < 2.9' \
-		'time >= 1.1.2 && < 1.6' 'time >= 1.1.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test tests)
-}
diff --git a/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild b/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
deleted file mode 100644
index 6b272d908245..000000000000
--- a/dev-haskell/test-framework/test-framework-0.8.2.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: missing modules
-inherit haskell-cabal
-
-DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
-HOMEPAGE="http://haskell.github.io/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test" # tests are missing
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/base-orphans-0.1:=[profile?]
-	>=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?]
-	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/regex-posix-0.72:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?]
-	>=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'ansi-terminal  >= 0.4.0  && < 0.9' 'ansi-terminal  >= 0.4.0' \
-		'base-orphans   >= 0.1    && < 0.5' 'base-orphans   >= 0.1' \
-		'containers     >= 0.1    && < 0.6' 'containers     >= 0.1' \
-		'semigroups     >= 0.18   && < 0.19' 'semigroups     >= 0.18' \
-		'QuickCheck     >= 2.3 && < 2.10' 'QuickCheck     >= 2.3' \
-		'regex-posix    >= 0.72   && < 0.96' 'regex-posix    >= 0.72' \
-		'time           >= 1.1.2  && < 1.9' 'time           >= 1.1.2'
-}
diff --git a/dev-haskell/test-framework/test-framework-0.8.2.0-r4.ebuild b/dev-haskell/test-framework/test-framework-0.8.2.0-r4.ebuild
new file mode 100644
index 000000000000..d209613f3de7
--- /dev/null
+++ b/dev-haskell/test-framework/test-framework-0.8.2.0-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=10
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # tests are missing
+
+DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
+HOMEPAGE="https://haskell.github.io/test-framework/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+	>=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] <dev-haskell/ansi-wl-pprint-1.1:=[profile?]
+	>=dev-haskell/hostname-1.0:=[profile?] <dev-haskell/hostname-1.1:=[profile?]
+	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/regex-posix-0.72:=[profile?] <dev-haskell/regex-posix-0.97:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
+#	test? (
+#		>=dev-haskell/hunit-1.2
+#		>=dev-haskell/libxml-0.1.1
+#		>=dev-haskell/quickcheck-2.3 <dev-haskell/quickcheck-2.15
+#		>=dev-haskell/semigroups-0.18
+#	)
diff --git a/dev-haskell/test-framework/test-framework-0.8.ebuild b/dev-haskell/test-framework/test-framework-0.8.ebuild
deleted file mode 100644
index 9c1d7a40fea7..000000000000
--- a/dev-haskell/test-framework/test-framework-0.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.1.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
-HOMEPAGE="https://batterseapower.github.com/test-framework/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
-		>=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?]
-		>=dev-haskell/extensible-exceptions-0.1.1:=[profile?]
-		>=dev-haskell/hostname-1.0:=[profile?]
-		>=dev-haskell/random-1.0:=[profile?]
-		>=dev-haskell/regex-posix-0.72:=[profile?]
-		>=dev-haskell/xml-1.3.5:=[profile?]
-		>=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2.3"
diff --git a/dev-haskell/testing-feat/Manifest b/dev-haskell/testing-feat/Manifest
deleted file mode 100644
index 79cc2777616e..000000000000
--- a/dev-haskell/testing-feat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST testing-feat-0.4.0.3.tar.gz 17864 BLAKE2B ff57b181e3ed34a5e9794b9c3830122e2bd36a8199a641e2025cd5a2e467dae15cfc5d9cb4e21f198cdb667d7b9b6a5f88850f68c69d00da016200c5a12c33ce SHA512 0dabd9129472d9cf91b87a31aec9265369cdf58ec47fe74997df08097d4e93edb4f4bf52050bbca0c345e5993c12d0fcf755b94dd80093a33ba8fef366b08516
diff --git a/dev-haskell/testing-feat/metadata.xml b/dev-haskell/testing-feat/metadata.xml
deleted file mode 100644
index 665eeb0f74e3..000000000000
--- a/dev-haskell/testing-feat/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Feat (Functional Enumeration of Abstract Types) provides
-		enumerations as functions from natural numbers to values
-		(similar to @toEnum@ but for any algebraic data type). This
-		can be used for SmallCheck-style systematic testing,
-		QuickCheck style random testing, and hybrids of the two.
-		
-		The enumerators are defined in a very boilerplate manner
-		and there is a Template Haskell script for deriving the
-		class instance for most types.
-		"Test.Feat" contain a subset of the other modules that
-		should be sufficient for most test usage. There
-		are some small and large example in the tar
-		ball.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/testing-feat/testing-feat-0.4.0.3.ebuild b/dev-haskell/testing-feat/testing-feat-0.4.0.3.ebuild
deleted file mode 100644
index c68813325e1e..000000000000
--- a/dev-haskell/testing-feat/testing-feat-0.4.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Functional Enumeration of Algebraic Types"
-HOMEPAGE="https://hackage.haskell.org/package/testing-feat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
-	>dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?]
-	<dev-haskell/tagshare-0.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/testpack/Manifest b/dev-haskell/testpack/Manifest
deleted file mode 100644
index e3229fd7382b..000000000000
--- a/dev-haskell/testpack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST testpack-2.1.3.0.tar.gz 15466 BLAKE2B 309d3f6681f7e72522ad7411e9d90c4d02b13ccb4dd6d463bc0c5ec298c94ddd4eb25c71feb839e01aec343ab415ac22a03e14714d4fe69716530835eb0f87d8 SHA512 4e9d08a8065c7f2354445e2e81f07d47a7aabead66a4d474728dc3e6bd6244b9d61fa00f8519fd0d10edea54f232e3f7f45ba67d568daccc128bc317597b4ee8
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch
deleted file mode 100644
index 599615a8e5fb..000000000000
--- a/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
-index a24a510..6b8a25e 100644
---- a/src/Test/HUnit/Tools.hs
-+++ b/src/Test/HUnit/Tools.hs
-@@ -97,3 +97,7 @@ runVerbTestText (HU.PutText put us) t = do
-   reportFailure = reportProblem "Failure:" "Failure in: "
--  reportProblem p0 p1 msg ss us = put line True us
-+  reportProblem p0 p1
-+#if MIN_VERSION_HUnit(1,3,0)
-+                      _loc
-+#endif
-+                           msg ss us = put line True us
-    where line  = "### " ++ kind ++ path' ++ '\n' : msg
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch
deleted file mode 100644
index 9ea5f8dfe4d5..000000000000
--- a/dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Test/QuickCheck/Instances.hs b/src/Test/QuickCheck/Instances.hs
-index 98367b7..f65eb37 100644
---- a/src/Test/QuickCheck/Instances.hs
-+++ b/src/Test/QuickCheck/Instances.hs
-@@ -30,2 +30,3 @@ import Data.Word
- 
-+#if ! MIN_VERSION_QuickCheck(2,8,2)
- instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (Map.Map k v) where
-@@ -37,2 +38,3 @@ instance (CoArbitrary k, CoArbitrary v, Eq k, Ord k) => CoArbitrary (Map.Map k v
-     coarbitrary = coarbitrary . Map.keys
-+#endif
- 
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch
deleted file mode 100644
index c1971b29b461..000000000000
--- a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
-index 2b66548..a24a510 100644
---- a/src/Test/HUnit/Tools.hs
-+++ b/src/Test/HUnit/Tools.hs
-@@ -18,9 +18,9 @@ module Test.HUnit.Tools (assertRaises, mapassertEqual,
-     where
- import Test.QuickCheck as QC
- import Test.QuickCheck.Text
--import Test.QuickCheck.Test
-+import Test.QuickCheck.Test as TQT
- import Test.QuickCheck.Gen
--import Test.QuickCheck.State
-+import Test.QuickCheck.State as TQS
- import qualified Test.QuickCheck.Property as P
- import Test.QuickCheck.Property hiding (Result(reason))
- import qualified Control.Exception
-@@ -33,6 +33,9 @@ import System.Random (newStdGen, StdGen(..), split)
- #define newStdGen newQCGen
- #define StdGen QCGen
- #endif
-+#if MIN_VERSION_QuickCheck(2,8,0)
-+import qualified Data.Map as Map
-+#endif
- import System.IO
- import Text.Printf
- 
-@@ -205,6 +208,9 @@ localquickCheckWithResult args p =
-                                          Just (_,s) -> \_ _ -> s
-                  , numSuccessTests   = 0
-                  , numDiscardedTests = 0
-+#if MIN_VERSION_QuickCheck(2,8,0)
-+                 , TQS.labels        = Map.empty
-+#endif
-                  , collected         = []
-                  , expectedFailure   = False
-                  , randomSeed        = rnd
-@@ -236,14 +242,14 @@ localquickCheckWithResult args p =
-         theOutput <- terminalOutput (terminal st)
- #endif
-         if expectedFailure st then
--           return Success{ labels = summary st
-+           return Success{ TQT.labels = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                          , numTests = numSuccessTests st
-                          , output = theOutput 
- #endif
-                          }
-            else
--           return NoExpectedFailure{ labels = summary st
-+           return NoExpectedFailure{ TQT.labels = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                                    , numTests = numSuccessTests st
-                                    , output = theOutput 
-@@ -257,7 +263,7 @@ localquickCheckWithResult args p =
-         theOutput <- terminalOutput (terminal st)
- #endif
-         return GaveUp{ numTests = numSuccessTests st
--                     , labels   = summary st
-+                     , TQT.labels   = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                      , output   = theOutput
- #endif
-@@ -306,7 +312,7 @@ localquickCheckWithResult args p =
-                foundFailure st res ts
- #endif
-                if not (expect res) then
--                 return Success{ labels = summary st
-+                 return Success{ TQT.labels = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                                , numTests = numSuccessTests st+1
-                                , output = theOutput
-@@ -316,7 +322,7 @@ localquickCheckWithResult args p =
-                  return Failure{ usedSeed   = randomSeed st -- correct! (this will be split first)
-                                , usedSize   = size
-                                , reason     = P.reason res
--                               , labels     = summary st
-+                               , TQT.labels     = summary st
- #if MIN_VERSION_QuickCheck(2,3,0)
-                                , numTests   = numSuccessTests st + 1
-                                , numShrinks = numShrinks
-diff --git a/src/Test/QuickCheck/Tools.hs b/src/Test/QuickCheck/Tools.hs
-index 712c9bf..506686f 100644
---- a/src/Test/QuickCheck/Tools.hs
-+++ b/src/Test/QuickCheck/Tools.hs
-@@ -20,34 +20,18 @@ Written by John Goerzen, jgoerzen\@complete.org
- module Test.QuickCheck.Tools (-- * Comparisons
-                               (@=?),
-                               (@?=)
--                              
-                              )
- where
--#if MIN_VERSION_QuickCheck(2,6,0)
--import Test.QuickCheck.Property (Result(..), callbacks, expect, theException, ok, reason, stamp)
--#if MIN_VERSION_QuickCheck(2,7,0)
--#else
--import Test.QuickCheck.Property (Result(..), callbacks, expect, interrupted, ok, reason, stamp)
--#endif
--#else
--import Test.QuickCheck hiding (Result, reason)
--import Test.QuickCheck.Property
--#endif
-+
-+import qualified Test.QuickCheck.Property as P
- 
- {- | Compare two values.  If same, the test passes.  If different, the result indicates
- what was expected and what was received as part of the error. -}
--(@=?) :: (Eq a, Show a) => a -> a -> Result
-+(@=?) :: (Eq a, Show a) => a -> a -> P.Result
- expected @=? actual = 
--        MkResult {ok = Just (expected == actual), 
--#if MIN_VERSION_QuickCheck(2,7,0)
--                  expect = True, theException = Nothing,
--#else
--                  expect = True, interrupted = False,
--#endif
--                  reason = "Result: expected " ++ show expected ++ ", got " ++ show actual,
--                  stamp = [], callbacks = []}
--    
-+        P.failed { P.ok = Just (expected == actual)
-+                 , P.reason = "Result: expected " ++ show expected ++ ", got " ++ show actual
-+                 }
- {- | Like '@=?', but with args in a different order. -}
--(@?=) :: (Eq a, Show a) => a -> a -> Result
-+(@?=) :: (Eq a, Show a) => a -> a -> P.Result
- (@?=) = flip (@=?)
--
-diff --git a/testpack.cabal b/testpack.cabal
-index 0873b33..dab77d9 100644
---- a/testpack.cabal
-+++ b/testpack.cabal
-@@ -46,7 +46,7 @@ Library
- 
-  Build-Depends: base >= 3 && < 5,
-                mtl, HUnit,
--               QuickCheck >= 2.1.0.3 && < 2.8
-+               QuickCheck >= 2.1.0.3
- 
-  If flag(splitBase)
-    Build-Depends: base >= 3 && < 5, containers, random
diff --git a/dev-haskell/testpack/metadata.xml b/dev-haskell/testpack/metadata.xml
deleted file mode 100644
index 528469d3e207..000000000000
--- a/dev-haskell/testpack/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Testpack provides utilities for both HUnit and QuickCheck.  These include
-		tools for running QuickCheck properties as HUnit test cases, allowing you to
-		combine both approaches in a single program.  It also includes tools for more
-		helpful displays of running progress in both HUnit and QuickCheck, additional
-		generators for other types for QuickCheck, and shortcuts for quickly defining new.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">jgoerzen/testpack</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
deleted file mode 100644
index fdf8e0ff38d2..000000000000
--- a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Test Utililty Pack for HUnit and QuickCheck (unmaintained)"
-HOMEPAGE="https://github.com/jgoerzen/testpack"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/quickcheck-2.1.0.3:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qc28.patch
-	epatch "${FILESDIR}"/${P}-HUnit-1.3.patch
-	epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
-}
diff --git a/dev-haskell/texmath/Manifest b/dev-haskell/texmath/Manifest
index 026f84289d83..111adeb33102 100644
--- a/dev-haskell/texmath/Manifest
+++ b/dev-haskell/texmath/Manifest
@@ -1,7 +1,2 @@
-DIST texmath-0.12.0.2.tar.gz 1792597 BLAKE2B 17981e435d870a4640f6a773be02e99dbaee295a420b11f90f357b9b483e9b8f5ff3b0363178b9fc57afbf7ff99328454af9c6ae8606a194a57d72ddbef968e0 SHA512 d5b3418492495f59b493bc418e68f4e66f7d2b4eb1293b540b1eb00312a7cded7eb4dba9b178224d311a1999fefac49b5cbb5caa50a85296292cb35d5806dfc6
-DIST texmath-0.6.4.tar.gz 45075 BLAKE2B 3272642b243d693d0cad77b71c1caa9cb3131ca90ea3e047b8944e931885cb778571c25da25ad5f0bad70ee9cbfb029ae3dff1a25a2722f311e300960b8601a5 SHA512 b6d1ff64cd7c758687efd656a8e0efdc9b6a1eac9f0dde5cd5d7d07fe6b3c8fd1a62145413b950b443cddd2a434151bc490148631b75fc853bdaadab2b5b0640
-DIST texmath-0.6.6.3.tar.gz 46983 BLAKE2B ceb6881b7dacd496d252c6a911407d30194254b157d6e84a640dd447646849cfd8ac24f78ecdc848e1cc280cc2084b73403d12ab809f1abbd6b12f8a826a2f5d SHA512 f6e41b28445751a2d296c9d0effaa95bc4962bb7af037ce277a4b59c0eb8e83caf7389cc420e4839b3737764c2bd7c15277771afdadfbb4310112e9ba5477210
-DIST texmath-0.8.2.2.tar.gz 1599187 BLAKE2B f65be60aee417cea0ec9d8e20e257a39de3f64a0288376914f63980c3f13def3473820f0b696f5eb11f210dec80f6d7ceae7c7eced8a64bbd42af712717271fc SHA512 2c8806ab0386acec6ed963a4574a5a24a07eb49a833a51021fef48e3a975012a083bd43fc4172399265430d9599b79f3ce1e5edfe785e80e92f259efc9dc674e
-DIST texmath-0.8.6.3.tar.gz 1605299 BLAKE2B 89f9272b5a19cec18996e0b39f9e39c3f47e21a6990cf8c4467b5d0315d18e37aef506b06b12d470992117d87299972820c15bb1282d22d993936bdbfe3ab80d SHA512 d4ca9f6b6b94f491b2e6a9c110f7f8130047691b62266e6c0c928e3a7aed6c289484d93a9b69b9c3e7454a6bb404e48c5ac09d37f98f7d538d2a2825b96c7478
-DIST texmath-0.8.6.7.tar.gz 1595061 BLAKE2B 9b41f35efd528e924ac8d6c56a8403599ac7ce35954fc6c7e39f38fb26c0fcb153c19a93a4b4b3969102b87156784c19372049d2a68d8431fed5d023011a012e SHA512 792e81395d092b7606d2f4c4cb59afd03f4226e611ca4e7a9b2a087c507345c709a92853cbc5d780729ea47c849cdf3727528bdafcb2b9217b4032041c937202
-DIST texmath-0.9.1.tar.gz 1596703 BLAKE2B 94fae6b9b3d1dec548d8e1b929c355d1cecd2cef638f7cfe5dc4d1e6a96bfb23a56535ee717fc59b18afd7144778666cc1ba6dfcd3211343f6fe9b5d9117a7a0 SHA512 6aba502dfb9f5163115f229ca9484ef1df72e712494b95e6e050a2e655684addec564bfe0a261db2efb45d0a6a0ef4547a856ff85031a9954c04e0fbe7131269
+DIST texmath-0.12.5.1.tar.gz 1606982 BLAKE2B a58e033176a6a9ba136590b8403d577c24c84cab983a6ee53ba2ae4564c05b681a31859aa066a3cb5aa3b18b07eaee9266964018abc8c30cc9288df15160d8f4 SHA512 77f3b008b82a8a1946108f8bb948d5d43121bffe2b2e22220cc8eb404884fa4c960bff07d7c8a5c75d5cce53d4039a8e6edd190fc69f5ad4da5b41212751f897
+DIST texmath-0.12.8.3.tar.gz 1480545 BLAKE2B 2a33a82f70b73aebae27c694b9d8e942f3c8ff8a5e0f2ad03ca8d71d2b346ae302c628441174922fca092ebadce8963a4dfdb35b2369fa168ca9eb13e34774bf SHA512 f90639a65a768245323a5b98e8ab3408f7d00bddfc3a1a66ce4cbedd25a7f8cf3555cae6912d60d00784887839f61562072912e3e2143553d377bee09176dace
diff --git a/dev-haskell/texmath/files/texmath-0.8.6.3-build-deps.patch b/dev-haskell/texmath/files/texmath-0.8.6.3-build-deps.patch
deleted file mode 100644
index e5bb521239cf..000000000000
--- a/dev-haskell/texmath/files/texmath-0.8.6.3-build-deps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/texmath.cabal b/texmath.cabal
-index 16f4410..ba61859 100644
---- a/texmath.cabal
-+++ b/texmath.cabal
-@@ -135,8 +135,8 @@ Executable texmath
-                          split, aeson, bytestring, text
-+      if flag(network-uri)
-+        Build-Depends:     network-uri >= 2.6
-+      else
-+        Build-Depends:     network < 2.6
-     else
-       Buildable:         False
--    if flag(network-uri)
--      Build-Depends:     network-uri >= 2.6
--    else
--      Build-Depends:     network < 2.6
- 
diff --git a/dev-haskell/texmath/metadata.xml b/dev-haskell/texmath/metadata.xml
index 71fb7e7299c4..5b65dbf8acd8 100644
--- a/dev-haskell/texmath/metadata.xml
+++ b/dev-haskell/texmath/metadata.xml
@@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The texmathml library provides functions to convert LaTeX
-		math formulas to presentation MathML. It supports
-		basic LaTeX and AMS extensions, and it can parse and
-		apply LaTeX macros.
-		
-		Use the @test@ flag to install a standalone executable,
-		@texmath@, that reads a LaTeX formula from @stdin@ and
-		writes MathML to @stdout@.
-		
-		Use the @cgi@ flag to install a cgi script,
-		@texmath-cgi@.
-	</longdescription>
 	<use>
 		<flag name="executable">Compile test executable.</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="server">Compile webserver.</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">texmath</remote-id>
 		<remote-id type="github">jgm/texmath</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/texmath/texmath-0.12.0.2.ebuild b/dev-haskell/texmath/texmath-0.12.0.2.ebuild
deleted file mode 100644
index c116e53f3dc8..000000000000
--- a/dev-haskell/texmath/texmath-0.12.0.2.ebuild
+++ /dev/null
@@ -1,41 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.22:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	>=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-8.8.1:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/texmath/texmath-0.12.5.1.ebuild b/dev-haskell/texmath/texmath-0.12.5.1.ebuild
new file mode 100644
index 000000000000..956d16b67efc
--- /dev/null
+++ b/dev-haskell/texmath/texmath-0.12.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between math formats"
+HOMEPAGE="https://github.com/jgm/texmath"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable server"
+
+RDEPEND=">=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+	dev-haskell/split:=[profile?]
+	>=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	dev-haskell/xml:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	executable? ( dev-haskell/aeson:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?]
+			dev-haskell/pretty-show:=[profile?] )
+	!executable? ( server? ( dev-haskell/aeson:=[profile?] ) )
+	server? ( dev-haskell/optparse-applicative:=[profile?]
+			dev-haskell/safe:=[profile?]
+			dev-haskell/servant-server:=[profile?]
+			dev-haskell/wai:=[profile?]
+			dev-haskell/wai-logger:=[profile?]
+			dev-haskell/warp:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tagged
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		!executable? ( dev-haskell/pretty-show ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		--flag=network-uri \
+		$(cabal_flag server server)
+}
diff --git a/dev-haskell/texmath/texmath-0.12.8.3.ebuild b/dev-haskell/texmath/texmath-0.12.8.3.ebuild
new file mode 100644
index 000000000000..1a760eec83bc
--- /dev/null
+++ b/dev-haskell/texmath/texmath-0.12.8.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between math formats"
+HOMEPAGE="https://github.com/jgm/texmath"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable server"
+
+RDEPEND=">=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.24:=[profile?]
+	>=dev-haskell/parsec-3:=[profile?]
+	dev-haskell/split:=[profile?]
+	>=dev-haskell/syb-0.4.2:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/typst-symbols-0.1.4:=[profile?] <dev-haskell/typst-symbols-0.1.5:=[profile?]
+	dev-haskell/xml:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	executable? ( dev-haskell/aeson:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?]
+			dev-haskell/pretty-show:=[profile?] )
+	!executable? ( server? ( dev-haskell/aeson:=[profile?] ) )
+	server? ( dev-haskell/optparse-applicative:=[profile?]
+			dev-haskell/safe:=[profile?]
+			dev-haskell/servant-server:=[profile?]
+			dev-haskell/wai:=[profile?]
+			dev-haskell/wai-logger:=[profile?]
+			dev-haskell/warp:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( dev-haskell/tagged
+		dev-haskell/tasty
+		dev-haskell/tasty-golden
+		!executable? ( dev-haskell/pretty-show ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		--flag=network-uri \
+		$(cabal_flag server server)
+}
diff --git a/dev-haskell/texmath/texmath-0.6.4.ebuild b/dev-haskell/texmath/texmath-0.6.4.ebuild
deleted file mode 100644
index 25b0afa900ef..000000000000
--- a/dev-haskell/texmath/texmath-0.6.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion of LaTeX math formulas to MathML or OMML"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cgi test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-haskell/pandoc-types:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	cgi? ( dev-haskell/cgi:=[profile?]
-		dev-haskell/json:=[profile?]
-		dev-haskell/utf8-string:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cgi cgi) \
-		$(cabal_flag test test)
-}
-
-src_install() {
-	cabal_src_install
-
-	# remove test and it's data
-	rm -f  "${ED}/usr/bin/texmath" 2> /dev/null
-	rm -rf "${ED}/usr/share/${P}"/ghc-*/tests 2> /dev/null
-}
diff --git a/dev-haskell/texmath/texmath-0.6.6.3.ebuild b/dev-haskell/texmath/texmath-0.6.6.3.ebuild
deleted file mode 100644
index 309597d081f7..000000000000
--- a/dev-haskell/texmath/texmath-0.6.6.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion of LaTeX math formulas to MathML or OMML"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="cgi test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-haskell/pandoc-types:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	cgi? ( dev-haskell/cgi:=[profile?]
-		dev-haskell/json:=[profile?]
-		dev-haskell/utf8-string:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cgi cgi) \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/texmath/texmath-0.8.2.2.ebuild b/dev-haskell/texmath/texmath-0.8.2.2.ebuild
deleted file mode 100644
index 271539749295..000000000000
--- a/dev-haskell/texmath/texmath-0.8.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			dev-haskell/split:=[profile?]
-			dev-haskell/text:=[profile?] )
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string
-		!executable? ( dev-haskell/split
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/texmath/texmath-0.8.6.3.ebuild b/dev-haskell/texmath/texmath-0.8.6.3.ebuild
deleted file mode 100644
index 3d98e1ab4142..000000000000
--- a/dev-haskell/texmath/texmath-0.8.6.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.17:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			dev-haskell/split:=[profile?]
-			dev-haskell/text:=[profile?]
-			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string
-		!executable? ( dev-haskell/split
-				dev-haskell/text ) )
-"
-
-PATCHES=("${FILESDIR}"/${P}-build-deps.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/texmath/texmath-0.8.6.7.ebuild b/dev-haskell/texmath/texmath-0.8.6.7.ebuild
deleted file mode 100644
index 949c7c0e6672..000000000000
--- a/dev-haskell/texmath/texmath-0.8.6.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			dev-haskell/split:=[profile?]
-			dev-haskell/text:=[profile?]
-			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string
-		!executable? ( dev-haskell/split
-				dev-haskell/text ) )
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.8.6.3-build-deps.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/texmath/texmath-0.9.1.ebuild b/dev-haskell/texmath/texmath-0.9.1.ebuild
deleted file mode 100644
index 32063f3a1aea..000000000000
--- a/dev-haskell/texmath/texmath-0.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between formats used to represent mathematics"
-HOMEPAGE="https://github.com/jgm/texmath"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable +network-uri"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	>=dev-haskell/parsec-3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/xml:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	executable? ( dev-haskell/aeson:=[profile?]
-			dev-haskell/split:=[profile?]
-			dev-haskell/text:=[profile?]
-			network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-			!network-uri? ( <dev-haskell/network-2.6:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/temporary
-		dev-haskell/utf8-string
-		!executable? ( dev-haskell/split
-				dev-haskell/text ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/text-binary/Manifest b/dev-haskell/text-binary/Manifest
deleted file mode 100644
index ef0eabacf5c9..000000000000
--- a/dev-haskell/text-binary/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST text-binary-0.2.1.1.tar.gz 1729 BLAKE2B fb69d6b86e18a86ac9b49074e662afe0205e2ea8253ebbefb4c9dbee51ed8126ce7ad1d1f5f8c7ef3c94e1a4778f68750d7889a75a930a20b5733cb0093d58f1 SHA512 eea91648ddc63f2997432abd2cc3d78efa27e3745c199eeccd01114df6a67dae948a16a6f784e09ba380047101fefab802f1812b0833d3e02deb45b6292c34a1
diff --git a/dev-haskell/text-binary/metadata.xml b/dev-haskell/text-binary/metadata.xml
deleted file mode 100644
index 1845f50353d3..000000000000
--- a/dev-haskell/text-binary/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A compatibility layer providing Binary instances for strict
-		and lazy text types for versions older than 1.2.1 of
-		&lt;https://hackage.haskell.org/package/text&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild b/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild
deleted file mode 100644
index e7a1b07cf94c..000000000000
--- a/dev-haskell/text-binary/text-binary-0.2.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binary instances for text types"
-HOMEPAGE="https://github.com/kawu/text-binary"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/text-conversions/Manifest b/dev-haskell/text-conversions/Manifest
index 245c5eeb144f..5260b1f058b2 100644
--- a/dev-haskell/text-conversions/Manifest
+++ b/dev-haskell/text-conversions/Manifest
@@ -1 +1,2 @@
-DIST text-conversions-0.3.0.tar.gz 5232 BLAKE2B d06232313990941dba2c300703a1b6b9b65c68583b8e8a77d6f8536104e39af2d7fb5529e52fc39b1c554fe50efc5df9fb4397305bf4e763b3fa5425b8b72189 SHA512 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec
+DIST text-conversions-0.3.1.1.tar.gz 5258 BLAKE2B 6003575dad1a5b743fad46a1434f83eed22a4d9f2bb99bdf65cc84b7e9929324c7227eb3a9887ac07716da24b1144e65dda01f7c2b5eb1b939f052c5d6b99867 SHA512 b04fff74f2541120718c377ff820a9e882c3e49e3423f581113ebcf02b13c58b3360be82fdd5e7a039da0077219d9ff64d02ef523b1a16fae89cfab0ac86a4ac
+DIST text-conversions-0.3.1.tar.gz 5571 BLAKE2B bf98228ac5c308d306ed12b1ce3cb4c9a7e4bca218b249c8b0e996204d2431e081fa8917428c3ceffa897b9968f6fee3e8c3665b3a651746b339601fb1e06367 SHA512 4c0fe08024a56e326b632a67b945fa869a798b00fa45b56f4f181a0075ed5cd6802edec0f0e38c0f4b5cc4b81c6f6bd98e3382b968cec6ad884d24ee31dbf600
diff --git a/dev-haskell/text-conversions/metadata.xml b/dev-haskell/text-conversions/metadata.xml
index b7878815d80d..cc111d378977 100644
--- a/dev-haskell/text-conversions/metadata.xml
+++ b/dev-haskell/text-conversions/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">text-conversions</remote-id>
+		<remote-id type="github">cjdev/text-conversions</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/text-conversions/text-conversions-0.3.0.ebuild b/dev-haskell/text-conversions/text-conversions-0.3.0.ebuild
deleted file mode 100644
index c44a2a92df24..000000000000
--- a/dev-haskell/text-conversions/text-conversions-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Safe conversions between textual types"
-HOMEPAGE="https://github.com/cjdev/text-conversions#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/errors:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/hspec-discover )
-"
diff --git a/dev-haskell/text-conversions/text-conversions-0.3.1.1.ebuild b/dev-haskell/text-conversions/text-conversions-0.3.1.1.ebuild
new file mode 100644
index 000000000000..7ff675e86cf2
--- /dev/null
+++ b/dev-haskell/text-conversions/text-conversions-0.3.1.1.ebuild
@@ -0,0 +1,25 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Safe conversions between textual types"
+HOMEPAGE="https://github.com/cjdev/text-conversions"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="<dev-haskell/base16-bytestring-2:=[profile?]
+	<dev-haskell/base64-bytestring-2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild b/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild
new file mode 100644
index 000000000000..22d22e0701a6
--- /dev/null
+++ b/dev-haskell/text-conversions/text-conversions-0.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Safe conversions between textual types"
+HOMEPAGE="https://github.com/cjdev/text-conversions#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="<dev-haskell/base16-bytestring-2:=[profile?]
+	<dev-haskell/base64-bytestring-2:=[profile?]
+	<dev-haskell/errors-3:=[profile?]
+	<dev-haskell/text-2:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/text-icu/Manifest b/dev-haskell/text-icu/Manifest
index 0df5a1bc5c46..20e70edf5b7f 100644
--- a/dev-haskell/text-icu/Manifest
+++ b/dev-haskell/text-icu/Manifest
@@ -1 +1,2 @@
-DIST text-icu-0.7.0.1.tar.gz 45533 BLAKE2B 1eda34ad7a8bcaa26814cb4fdb864e67531aca5dc80ece9a71dd770022ec7729e7e2960729c707ab9b5d4e8ad3b112e50572d26a2f2a573ffd6f3c914a0b5545 SHA512 54551ce0d629bffcca32fc855bfcdf2e24282359ce3a32578a98de4f4ad15378fa7df98c59d73323549a2ac873b10a10202bda02f5be83fbe1ab945aac5e50a9
+DIST text-icu-0.7.1.0.tar.gz 52490 BLAKE2B fb66502b0a18d8d2a0f1dcb2240e9c939b04b157acac31b62fbe65a6d5edd6244a4713d712e6b78dc54451b52d3e78d9cd8bc803e7bddb319fa8ed016c162123 SHA512 807a1385b7601edcfa6142a8e107df1b3c2820974218e2bafadb8a42eda3b68a0a16d222d75120b422e5ca9f4cd4f52f39d2b7938a541692ed4d633d5750089a
+DIST text-icu-0.8.0.2.tar.gz 85213 BLAKE2B 68fe194da996b33de5c8ea3b3bb3daec1181a35a1f528328fdcfd38ca89857df2966b38d05b8c0aaf070e081040678a521a6f591c0af36a78b716cb19f4a08f7 SHA512 c70b014200678b19d763347dce021970062cdbee024c93bfd09b084615f1734283d0d6eb17db64901a83e9a293c79ff8fbf7d45e8a67eb812ce5bcc85b72b9e6
diff --git a/dev-haskell/text-icu/metadata.xml b/dev-haskell/text-icu/metadata.xml
index bf8841a2a444..33f4332f7eab 100644
--- a/dev-haskell/text-icu/metadata.xml
+++ b/dev-haskell/text-icu/metadata.xml
@@ -1,39 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haskell bindings to the International Components for Unicode (ICU)
-		libraries.  These libraries provide robust and full-featured Unicode
-		services on a wide variety of platforms.
-		
-		Features include:
-		
-		* Both pure and impure bindings, to allow for fine control over efficiency
-		and ease of use.
-		
-		* Breaking of strings on character, word, sentence, and line boundaries.
-		
-		* Access to the Unicode Character Database (UCD) of character metadata.
-		
-		* String collation functions, for locales where the conventions for
-		lexicographic ordering differ from the simple numeric ordering of
-		character codes.
-		
-		* Character set conversion functions, allowing conversion between
-		Unicode and over 220 character encodings.
-		
-		* Unicode normalization.  (When implementations keep strings in a
-		normalized form, they can be assured that equivalent strings have a
-		unique binary representation.)
-		
-		* Regular expression search and replace.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">bos/text-icu</remote-id>
-		<remote-id type="bitbucket">bos/text-icu</remote-id>
+		<remote-id type="hackage">text-icu</remote-id>
+		<remote-id type="github">haskell/text-icu</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
deleted file mode 100644
index 8a80dc6427ad..000000000000
--- a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Bindings to the ICU library"
-HOMEPAGE="https://github.com/bos/text-icu"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/icu:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4
-		dev-haskell/random
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
diff --git a/dev-haskell/text-icu/text-icu-0.7.1.0.ebuild b/dev-haskell/text-icu/text-icu-0.7.1.0.ebuild
new file mode 100644
index 000000000000..3feb5bb77c04
--- /dev/null
+++ b/dev-haskell/text-icu/text-icu-0.7.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to the ICU library"
+HOMEPAGE="https://github.com/haskell/text-icu"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # QuickCheck occasionally finds counterexamples
+# and fails to build: Duplicate instance declarations: instance NFData Ordering
+
+RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	dev-libs/icu
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+# test? ( >=dev-haskell/hunit-1.2
+# 		>=dev-haskell/quickcheck-2.4
+# 		dev-haskell/random
+# 		>=dev-haskell/test-framework-0.4
+# 		>=dev-haskell/test-framework-hunit-0.2
+# 		>=dev-haskell/test-framework-quickcheck2-0.2 )
+# "
diff --git a/dev-haskell/text-icu/text-icu-0.8.0.2.ebuild b/dev-haskell/text-icu/text-icu-0.8.0.2.ebuild
new file mode 100644
index 000000000000..502b75b161bb
--- /dev/null
+++ b/dev-haskell/text-icu/text-icu-0.8.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to the ICU library"
+HOMEPAGE="https://github.com/haskell/text-icu"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # QuickCheck occasionally finds counterexamples
+# and fails to build: Duplicate instance declarations: instance NFData Ordering
+
+RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	dev-libs/icu
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+# test? ( >=dev-haskell/hunit-1.2
+# 		>=dev-haskell/quickcheck-2.4
+# 		dev-haskell/random
+# 		>=dev-haskell/test-framework-0.4
+# 		>=dev-haskell/test-framework-hunit-0.2
+# 		>=dev-haskell/test-framework-quickcheck2-0.2
+# 		dev-haskell/text )
+# "
diff --git a/dev-haskell/text-metrics/Manifest b/dev-haskell/text-metrics/Manifest
deleted file mode 100644
index 08373f22e38c..000000000000
--- a/dev-haskell/text-metrics/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST text-metrics-0.2.0.tar.gz 8660 BLAKE2B 4b849422bb7b9ebad240037295e6ba5dc5a9f427436ca844dce02ba64d142ea559f2a4a10ed1dc8a0fee0aa3ef6d7d0c05dc33eca87286e2aaedfdc99d7524fd SHA512 6a7a2b78fcb7efd03e32bf093b2820837f5b9997574d724fd6e67b789a8fcb166ed1396e49d925c55c278e0e72615ba99e40f630092e961871a7821e5b513d70
-DIST text-metrics-0.3.0.tar.gz 8248 BLAKE2B c700cb94e3b9934c723e6893d90523c5876c64b663dd77a36be963dff2bc5f65d0db30db39177014b062dde1dca0865b893de8324359ca9bcec3340d5ca7e21c SHA512 fa005ad7aeb5fd96ce121c5eab9e83e5826eec288a269f6ce258b3f6aff408c8ca98b8131b6cd14fa8e56f8568eb5a63beb63935335b7c695a3f6e09a979eccf
diff --git a/dev-haskell/text-metrics/metadata.xml b/dev-haskell/text-metrics/metadata.xml
deleted file mode 100644
index a94b82566b9e..000000000000
--- a/dev-haskell/text-metrics/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Calculate various string metrics efficiently.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/text-metrics/text-metrics-0.2.0.ebuild b/dev-haskell/text-metrics/text-metrics-0.2.0.ebuild
deleted file mode 100644
index ecbd64e3a0ae..000000000000
--- a/dev-haskell/text-metrics/text-metrics-0.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Calculate various string metrics efficiently"
-HOMEPAGE="https://github.com/mrkkrp/text-metrics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-3.0 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/text-metrics/text-metrics-0.3.0.ebuild b/dev-haskell/text-metrics/text-metrics-0.3.0.ebuild
deleted file mode 100644
index 8fa40c3a6f12..000000000000
--- a/dev-haskell/text-metrics/text-metrics-0.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: -dev
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Calculate various string metrics efficiently"
-HOMEPAGE="https://github.com/mrkkrp/text-metrics"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # does not pass tests on non-ascii symbols
-
-RDEPEND=">=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3.0
-		>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-3.0 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'containers       >= 0.5.6.2 && < 0.6' 'containers       >= 0.5.6.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev
-}
diff --git a/dev-haskell/text-short/Manifest b/dev-haskell/text-short/Manifest
index e9a005829d2c..ccc44f1f626d 100644
--- a/dev-haskell/text-short/Manifest
+++ b/dev-haskell/text-short/Manifest
@@ -1 +1,2 @@
-DIST text-short-0.1.3.tar.gz 24435 BLAKE2B f0d571f2c84ca47ee2d4f0aef0a98812880f68d9971e73abd40f2b8d27cce50052a67f6f2a5d19d683093fabed490082df72e29bc8e43123b53b388b9962018c SHA512 6d7a5379dbaf28a201dd44229959a293acb5ff57c4659a6a34af37e46b2e6fc5eb61a00ba26d36dd08795456246429ec20236af8e342fd0d03bfcf6d06d69428
+DIST text-short-0.1.5-rev2.cabal 3202 BLAKE2B 92985f445d522e0e26e85d86d4bf4ab1d517ea066f062097cc58b276a5d845fbb53e86ae7c97c33de16b0a9f061f9ba4485a151f41f7351771dff044cd761190 SHA512 337e7e557691aaed379658069a1dc50116a247c86133e219a1f4ec0f468f1f6cdde9461365424dfc1900f6676bc15c75c46a241148414512d7da81e766b11662
+DIST text-short-0.1.5.tar.gz 25113 BLAKE2B a3ed468d60d4a351ad86600f5d6e7241ae88b987746fabc8ff79f6e0f0c687a9d5d5e0f4fcabb2fbf7c48ce2e3a37b798e478d6c8239760974e7a55835cab1aa SHA512 32f09a1abc37ddb3f85921d80629355f68b2e68531f14318907e792a8eeb7d4a258bfcf7d45710dcb67f85fadfbad2bb9ffdac27a912aefc4296dc1818585125
diff --git a/dev-haskell/text-short/metadata.xml b/dev-haskell/text-short/metadata.xml
index 02b8c54225a2..0573ab12c9a2 100644
--- a/dev-haskell/text-short/metadata.xml
+++ b/dev-haskell/text-short/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="asserts">Enable runtime-checks via 'assert'</flag>
+		<flag name="debug">Enable runtime-checks via 'assert'</flag>
 	</use>
-	<longdescription>
-		This package provides the &#39;ShortText&#39; type which is suitable for keeping many short strings in memory. This is similiar to how &#39;ShortByteString&#39; relates to &#39;ByteString&#39;.
-		
-		The main difference between &#39;Text&#39; and &#39;ShortText&#39; is that &#39;ShortText&#39; uses UTF-8 instead of UTF-16 internally and also doesn&#39;t support zero-copy slicing (thereby saving 2 words). Consequently, the memory footprint of a (boxed) &#39;ShortText&#39; value is 4 words (2 words when unboxed) plus the length of the UTF-8 encoded payload.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">text-short</remote-id>
+		<remote-id type="github">hvr/text-short</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/text-short/text-short-0.1.3.ebuild b/dev-haskell/text-short/text-short-0.1.3.ebuild
deleted file mode 100644
index 794540cc2fdf..000000000000
--- a/dev-haskell/text-short/text-short-0.1.3.ebuild
+++ /dev/null
@@ -1,44 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Memory-efficient representation of Unicode text strings"
-HOMEPAGE="http://hackage.haskell.org/package/text-short"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="asserts"
-
-RDEPEND=">=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.2:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/quickcheck-instances-0.3.14 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tasty-1.0.0 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-hunit-0.10.0 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base        >= 4.7    && < 4.13' 'base        >= 4.7' \
-		'ghc-prim    >= 0.3.1  && < 0.6' 'ghc-prim    >= 0.3.1'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag asserts asserts)
-}
diff --git a/dev-haskell/text-short/text-short-0.1.5-r1.ebuild b/dev-haskell/text-short/text-short-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..a91116ad98e5
--- /dev/null
+++ b/dev-haskell/text-short/text-short-0.1.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: asserts:debug
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Memory-efficient representation of Unicode text strings"
+HOMEPAGE="https://hackage.haskell.org/package/text-short"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug"
+
+RDEPEND="
+	>=dev-haskell/hashable-1.2.6:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	|| (
+		( >=dev-haskell/text-1.0 <dev-haskell/text-1.3 )
+		( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+	)
+	dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/tasty-1.4 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.10.0 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug asserts)
+}
diff --git a/dev-haskell/text-show/Manifest b/dev-haskell/text-show/Manifest
index 283448e73244..5e88ab12a7fa 100644
--- a/dev-haskell/text-show/Manifest
+++ b/dev-haskell/text-show/Manifest
@@ -1 +1,2 @@
-DIST text-show-3.4.tar.gz 105127 BLAKE2B 4ea8f7cddaaad4630f0c8317dbe4d5505f27f3008c5e17117d9100f94bb49439edd2761acef60696ef8a97dc8412964d0a9750353f91b30257b025c9e88fd054 SHA512 48b7fdd801c4fc31e12f14a9ba0589e0971481a2f8562d00c697a9fd48f6420e73df0a7318ff4579a786cd606a1fda2287eab3f8c423810c0d00919c68eeebed
+DIST text-show-3.10.4.tar.gz 101876 BLAKE2B a51a0a536dab520c924516171703ebe6a71cfdb22a46b4f4aaccab7f69b78aa3d07c14a2b7226f14ffa89ffff84adcc7abcb1646d3add7f2ff0fa7a494175ea3 SHA512 f74eec545cd2994b3ebde9552e15e8b26c60ff00f6438f0c7bc2d92148a34fa85d41b8c04de0a960d468bc928346a5a8cd676a604f9dd81fc14d2ad5667a9d7f
+DIST text-show-3.9.7.tar.gz 96683 BLAKE2B 402b41fe0ea539fb2bc98f5271dda37605e86751622dda6136bca8b8ec92917b15ab69e606c4b8fbb6e055f1ee14aed2cd5d446be4c6f494662a0ce153075328 SHA512 d32c2c5c9ea833ac2b996ef299bc7fa2736dfb0ccd86117cd964512ccc25af5eda126fc6dee0537d4740bd38fa9a73ea899e1dd73a30bec775f9966f2121a748
diff --git a/dev-haskell/text-show/metadata.xml b/dev-haskell/text-show/metadata.xml
index a6729c09cb4b..4f3fc546038a 100644
--- a/dev-haskell/text-show/metadata.xml
+++ b/dev-haskell/text-show/metadata.xml
@@ -1,47 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		@text-show@ offers a replacement for the @Show@ typeclass intended
-		for use with @Text@ instead of @String@s. This package was created
-		in the spirit of
-		@&lt;http://hackage.haskell.org/package/bytestring-show bytestring-show&gt;@.
-		
-		At the moment, @text-show@ provides instances for most data
-		types in the @&lt;http://hackage.haskell.org/package/array array&gt;@,
-		@&lt;http://hackage.haskell.org/package/base base&gt;@,
-		@&lt;http://hackage.haskell.org/package/bytestring bytestring&gt;@, and
-		@&lt;http://hackage.haskell.org/package/text text&gt;@ packages.
-		Therefore, much of the source code for @text-show@ consists of
-		borrowed code from those packages in order to ensure that the
-		behaviors of @Show@ and @TextShow@ coincide.
-		
-		For most uses, simply importing "TextShow"
-		will suffice:
-		
-		@
-		module Main where
-		
-		import TextShow
-		
-		main :: IO ()
-		main = printT (Just \"Hello, World!\")
-		@
-		
-		If you desire it, there are also monomorphic versions of the @showb@
-		function available in the submodules of "TextShow". See the
-		&lt;https://github.com/RyanGlScott/text-show/wiki/Naming-conventions naming conventions&gt;
-		page for more information.
-		
-		Support for automatically deriving @TextShow@ instances can be found
-		in the "TextShow.TH" and "TextShow.Generic" modules. If you don't
-		know which one to use, use "TextShow.TH".
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">text-show</remote-id>
 		<remote-id type="github">RyanGlScott/text-show</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/text-show/text-show-3.10.4.ebuild b/dev-haskell/text-show/text-show-3.10.4.ebuild
new file mode 100644
index 000000000000..c40812157058
--- /dev/null
+++ b/dev-haskell/text-show/text-show-3.10.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -developer,-integer-gmp
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient conversion of values into Text"
+HOMEPAGE="https://github.com/RyanGlScott/text-show"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.14:=[profile?]
+	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	dev-haskell/bytestring-builder:=[profile?]
+	>=dev-haskell/generic-deriving-1.14.1:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
+	>=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/base-orphans-0.8.5 <dev-haskell/base-orphans-0.10
+		>=dev-haskell/deriving-compat-0.6.5 <dev-haskell/deriving-compat-1
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2.14.3 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.28 <dev-haskell/quickcheck-instances-0.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer \
+		--flag=-integer-gmp
+}
diff --git a/dev-haskell/text-show/text-show-3.4.ebuild b/dev-haskell/text-show/text-show-3.4.ebuild
deleted file mode 100644
index 3e0806d71e12..000000000000
--- a/dev-haskell/text-show/text-show-3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient conversion of values into Text"
-HOMEPAGE="https://github.com/RyanGlScott/text-show"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.8.1:=[profile?] <dev-haskell/base-compat-1:=[profile?]
-	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/contravariant-0.5:=[profile?] <dev-haskell/contravariant-2:=[profile?]
-	>=dev-haskell/generic-deriving-1.11:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/semigroups-0.17:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
-	>=dev-haskell/text-0.11.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
-	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?] <dev-haskell/void-1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-compat-0.8.2 <dev-haskell/base-compat-1
-		>=dev-haskell/base-orphans-0.5.2 <dev-haskell/base-orphans-1
-		>=dev-haskell/deriving-compat-0.3 <dev-haskell/deriving-compat-1
-		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-3
-		>=dev-haskell/quickcheck-instances-0.1 <dev-haskell/quickcheck-instances-0.4
-		>=dev-haskell/tagged-0.8.3 <dev-haskell/tagged-1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text-show/text-show-3.9.7.ebuild b/dev-haskell/text-show/text-show-3.9.7.ebuild
new file mode 100644
index 000000000000..42ba33badfa2
--- /dev/null
+++ b/dev-haskell/text-show/text-show-3.9.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -developer,-integer-gmp
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient conversion of values into Text"
+HOMEPAGE="https://github.com/RyanGlScott/text-show"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-compat-batteries-0.11:=[profile?] <dev-haskell/base-compat-batteries-0.13:=[profile?]
+	>=dev-haskell/bifunctors-5.1:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
+	dev-haskell/bytestring-builder:=[profile?]
+	>=dev-haskell/generic-deriving-1.14.1:=[profile?] <dev-haskell/generic-deriving-2:=[profile?]
+	>=dev-haskell/th-abstraction-0.4:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-haskell/th-lift-0.7.6:=[profile?] <dev-haskell/th-lift-1:=[profile?]
+	>=dev-haskell/transformers-compat-0.5:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/base-orphans-0.8.5 <dev-haskell/base-orphans-0.9
+		>=dev-haskell/deriving-compat-0.6 <dev-haskell/deriving-compat-1
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2.12 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/quickcheck-instances-0.3.26 <dev-haskell/quickcheck-instances-0.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer \
+		--flag=-integer-gmp
+}
diff --git a/dev-haskell/text-stream-decode/Manifest b/dev-haskell/text-stream-decode/Manifest
deleted file mode 100644
index b868effb9484..000000000000
--- a/dev-haskell/text-stream-decode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST text-stream-decode-0.1.0.5.tar.gz 12335 BLAKE2B 68c52959743e76b167f968817f128ea6e8c7d91ed091a4a19e75e7965b4dfa9d6374b21e8e68d69ccab9db95e7c431bf5736494c3923d24a1d00ea796f7eced4 SHA512 9005cc7013f56809cb0a86fa57aa6bbe97936095d100e35d86ae7e9013e0bbcced3f5522da08f5fe76585fda1e8f55b364a1ad787f9c7c7be30fae6555083a5d
diff --git a/dev-haskell/text-stream-decode/metadata.xml b/dev-haskell/text-stream-decode/metadata.xml
deleted file mode 100644
index 9b39024523a5..000000000000
--- a/dev-haskell/text-stream-decode/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		The @text@ package provides high performance functions for decoding strict and lazy @ByteString@s into @Text@. However, these functions present two issues for streaming data libraries: they throw exceptions from pure code, and are not designed for incremental consumption. This library addresses both issues with a unified API for UTF-8, -16LE, -16BE, -32LE, and -32BE. It is intended for use by high level streaming data libraries, such as conduit, enumerator, iteratee, and pipes.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/text-stream-decode</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild b/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
deleted file mode 100644
index 7cfa633e38e3..000000000000
--- a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: +text11
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming decoding functions for UTF encodings. (deprecated)"
-HOMEPAGE="https://github.com/fpco/text-stream-decode"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.8 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=text11
-}
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index d297203e0536..cbb47e707196 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1,6 +1 @@
-DIST text-0.11.3.1.tar.gz 126477 BLAKE2B 27c135a5815eeeabd5791e4f0a16cce12def262d427096d7656a8932d59c4fdab91a7b196951b917ff8bd731034d8015e75d8016be1f3f9300fd3d29511a7634 SHA512 78e9b795ebcb4e43be42b34c3f5829e0f5030d93cb6dad59ca2eb4c7df3a5e338f65dc9f90da7b752cf2b1c15e8d973a25293a6418a4abed6e0ddac9222fb3e6
-DIST text-1.1.1.3.tar.gz 138063 BLAKE2B 150151cd991c2e905d75087dde7b889850a5b51bb1d95838c1969dd851f64af5d8594c333d49e4e1fe269479d8e59bf17bca33ad64e7ff36fcf45f529354bd99 SHA512 bfa5301827c72cbb3346fdb485e10094326a7cac71e01bba700ca0344bd4069c5b16c590dd7c38ee85969be06a2d3fcd760b34ff6f98eef176e7e8c325739490
-DIST text-1.2.2.0.tar.gz 148894 BLAKE2B 9a3e2d72f38f10b9e1e021ad7cf5cf182657a32f98fe5889befe1bf9fbd8da5a2a1e405177805774fca911b57279e3db73cd7e0ee22315210cb3c0f728633ad7 SHA512 832b0430581a06cfdfa2a5c83fa2720e3f4825ee0aa9c6b12ff6ccd424a9e3a061c9ae7eeda48fe7a9f077c50e379abe2eee3fb05bdbdec4d38115b5e3695f20
-DIST text-1.2.2.1.tar.gz 149888 BLAKE2B 6ef907f42f89f0d1a0b109ef3f277cb3a653fae9564e35a772945f88eca64b3250d7db1d5124d73358046f6c729c0b7f345b4e747383f305af8a66f9f55acae1 SHA512 f0615f7614127d86dbfb3fba5dd1753af3d0774c46e11ee4a99d4510f73b59cf1bd8c73ca0387dba4fbcea3936aaaf0e92561cf6aab1a98d08fcad481d3795e4
-DIST text-1.2.3.1.tar.gz 157382 BLAKE2B 551012a6b7bfc1b1ad838f977d67981a35b9d13f1cd1b568ce0beed3583c50887cf1ceb1033fbeab215806c5a0d0c5ca39ce2f1aa20fd06365440c3324e8a6bc SHA512 643eb3306761c3e29e05dcd7d64abc505789cd00c60f7a4562e5747f63bcc0ae6f0cc54bb5ed92cc85dbf6406942bf40289baf30aca91bf92ac5215af5eddc98
-DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3 SHA512 a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3
+DIST text-1.2.5.0.tar.gz 155890 BLAKE2B aaf7206dad552ff98a465914ad8183ec1ccd57e56504496a5b8d11645b0f0fb395dd801c9b6fe32b51ed3902658eb5e5fb92187de668d32801597b4eb904b820 SHA512 dbda65180fc012324fe45467b63e0f53e7e0fa2da3b11875e458ba6bd31d0ee7634121967d2aa6853ed5c907c0661dcc59b8c68fb55edab2923490d8b50722d6
diff --git a/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch b/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch
deleted file mode 100644
index 524ebac371ed..000000000000
--- a/dev-haskell/text/files/text-1.1.1.3-deepseq-1.4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 4115e196bde073d5deaa3759807a8647f3f3c6fa
-Author: Herbert Valerio Riedel <hvr@gnu.org>
-Date:   Mon Nov 17 09:53:24 2014 +0100
-
-    Add support for `deepseq-1.4.0.0` (addresses #100)
-    
-    The default method implementation has changed in `deepseq-1.4.0.0`.
-    (see haskell/deepseq#1 for details). This simply sets the `rnf`
-    implementation explicitly to avoid relying on the default method's
-    semantics.
-
-diff --git a/Data/Text.hs b/Data/Text.hs
-index 3bd34a7..b826acd 100644
---- a/Data/Text.hs
-+++ b/Data/Text.hs
-@@ -199,7 +199,7 @@ import Prelude (Char, Bool(..), Int, Maybe(..), String,
-                 (&&), (||), (+), (-), (.), ($), ($!), (>>),
-                 not, return, otherwise, quot)
- #if defined(HAVE_DEEPSEQ)
--import Control.DeepSeq (NFData)
-+import Control.DeepSeq (NFData(rnf))
- #endif
- #if defined(ASSERTS)
- import Control.Exception (assert)
-@@ -346,7 +346,7 @@ instance Exts.IsList Text where
- #endif
- 
- #if defined(HAVE_DEEPSEQ)
--instance NFData Text
-+instance NFData Text where rnf !_ = ()
- #endif
- 
- -- | This instance preserves data abstraction at the cost of inefficiency.
diff --git a/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch b/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch
deleted file mode 100644
index 349fd79f8b37..000000000000
--- a/dev-haskell/text/files/text-1.2.2.0-integer-simple.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://bugs.gentoo.org/575120
-https://github.com/bos/text/issues/138
-
-commit 6c69034c81974b3fab9dba2993f22cc0a80f1b9e
-Author: Herbert Valerio Riedel <hvr@gnu.org>
-Date:   Sat Feb 13 12:44:20 2016 +0100
-
-    Revert "Rename integer-simple to integer-pure (gh-138)"
-    
-    This basically reverts commit b806d9491c740dfcbf172d2936f1eeb3b72d3492.
-    and therefore resolve #138
-
-diff --git a/Data/Text/Lazy/Builder/Int.hs b/Data/Text/Lazy/Builder/Int.hs
-index 6d26ecd..1cb0651 100644
---- a/Data/Text/Lazy/Builder/Int.hs
-+++ b/Data/Text/Lazy/Builder/Int.hs
-@@ -36,14 +36,14 @@ import Control.Monad.ST
- #ifdef  __GLASGOW_HASKELL__
- # if defined(INTEGER_GMP)
- import GHC.Integer.GMP.Internals (Integer(S#))
--# elif defined(INTEGER_PURE)
-+# elif defined(INTEGER_SIMPLE)
- import GHC.Integer
- # else
--# error "You need to use either GMP or integer-pure."
-+# error "You need to use either GMP or integer-simple."
- # endif
- #endif
- 
--#if defined(INTEGER_GMP) || defined(INTEGER_PURE)
-+#if defined(INTEGER_GMP) || defined(INTEGER_SIMPLE)
- # define PAIR(a,b) (# a,b #)
- #else
- # define PAIR(a,b) (a,b)
-diff --git a/text.cabal b/text.cabal
-index ffb92cf..5fa1be0 100644
---- a/text.cabal
-+++ b/text.cabal
-@@ -69,10 +69,10 @@ flag developer
-   default: False
-   manual: True
- 
--flag integer-pure
--  description: Use the pure-Haskell integer library instead of GMP
-+flag integer-simple
-+  description: Use the simple integer library instead of GMP
-   default: False
--  manual: True
-+  manual: False
- 
- library
-   c-sources:    cbits/cbits.c
-@@ -145,9 +145,9 @@ library
-     ghc-options: -Werror
-     cpp-options: -DASSERTS
- 
--  if flag(integer-pure)
--    cpp-options: -DINTEGER_PURE
--    build-depends: integer-pure >= 1.0
-+  if flag(integer-simple)
-+    cpp-options: -DINTEGER_SIMPLE
-+    build-depends: integer-simple >= 0.1 && < 0.5
-   else
-     cpp-options: -DINTEGER_GMP
-     build-depends: integer-gmp >= 0.2
-@@ -181,9 +181,9 @@ test-suite tests
-     test-framework-hunit >= 0.2,
-     test-framework-quickcheck2 >= 0.2
- 
--  if flag(integer-pure)
--    cpp-options: -DINTEGER_PURE
--    build-depends: integer-pure >= 0.1 && < 0.5
-+  if flag(integer-simple)
-+    cpp-options: -DINTEGER_SIMPLE
-+    build-depends: integer-simple >= 0.1 && < 0.5
-   else
-     cpp-options: -DINTEGER_GMP
-     build-depends: integer-gmp >= 0.2
diff --git a/dev-haskell/text/metadata.xml b/dev-haskell/text/metadata.xml
index 707e40e47f20..31b80dba2fcc 100644
--- a/dev-haskell/text/metadata.xml
+++ b/dev-haskell/text/metadata.xml
@@ -1,43 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		
-		An efficient packed, immutable Unicode text type (both strict and
-		lazy), with a powerful loop fusion optimization framework.
-		
-		The 'Text' type represents Unicode character strings, in a time and
-		space-efficient manner. This package provides text processing
-		capabilities that are optimized for performance critical use, both
-		in terms of large data quantities and high speed.
-		
-		The 'Text' type provides character-encoding, type-safe case
-		conversion via whole-string case conversion functions. It also
-		provides a range of functions for converting 'Text' values to and from
-		'ByteStrings', using several standard encodings.
-		
-		Efficient locale-sensitive support for text IO is also supported.
-		
-		These modules are intended to be imported qualified, to avoid name
-		clashes with Prelude functions, e.g.
-		
-		&gt; import qualified Data.Text as T
-		
-		To use an extended and very rich family of functions for working
-		with Unicode text (including normalization, regular expressions,
-		non-standard encodings, text breaking, and locales), see
-		the @text-icu@ package:
-		&lt;http://hackage.haskell.org/package/text-icu&gt;
-		
-	</longdescription>
-	<use>
-		<flag name="developer">operate in developer mode</flag>
-	</use>
 	<upstream>
-		<remote-id type="github">bos/text</remote-id>
+		<remote-id type="hackage">text</remote-id>
+		<remote-id type="github">haskell/text</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/text/text-0.11.3.1.ebuild b/dev-haskell/text/text-0.11.3.1.ebuild
deleted file mode 100644
index a4c523cde5ca..000000000000
--- a/dev-haskell/text/text-0.11.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="developer"
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hunit-1.2
-			>=dev-haskell/quickcheck-2.4
-			dev-haskell/random
-			>=dev-haskell/test-framework-0.4
-			>=dev-haskell/test-framework-hunit-0.2
-			>=dev-haskell/test-framework-quickcheck2-0.2
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag developer developer)
-}
diff --git a/dev-haskell/text/text-1.1.1.3.ebuild b/dev-haskell/text/text-1.1.1.3.ebuild
deleted file mode 100644
index 2a662dc2b6b5..000000000000
--- a/dev-haskell/text/text-1.1.1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-RESTRICT="test" # quickcheck-2.7 is missing keywords due to new tf-random dep
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-#	test? ( >=dev-haskell/hunit-1.2
-#		>=dev-haskell/quickcheck-2.7
-#		dev-haskell/random
-#		>=dev-haskell/test-framework-0.4
-#		>=dev-haskell/test-framework-hunit-0.2
-#		>=dev-haskell/test-framework-quickcheck2-0.2 )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-deepseq-1.4.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.2.0.ebuild b/dev-haskell/text/text-1.2.2.0.ebuild
deleted file mode 100644
index c8fb1a9fc74a..000000000000
--- a/dev-haskell/text/text-1.2.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -developer,-integer-pure
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # break cyclic dependencies
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		dev-haskell/random
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-integer-simple.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.2.1.ebuild b/dev-haskell/text/text-1.2.2.1.ebuild
deleted file mode 100644
index 5b0c55ef8dac..000000000000
--- a/dev-haskell/text/text-1.2.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/bos/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # break cyclic dependencies
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/quickcheck-unicode
-		dev-haskell/random
-		>=dev-haskell/test-framework-0.4
-		>=dev-haskell/test-framework-hunit-0.2
-		>=dev-haskell/test-framework-quickcheck2-0.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-developer
-}
diff --git a/dev-haskell/text/text-1.2.3.1.ebuild b/dev-haskell/text/text-1.2.3.1.ebuild
deleted file mode 100644
index 9bc3d4248bb2..000000000000
--- a/dev-haskell/text/text-1.2.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-#hackport: flags: -bytestring-builder,-developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/haskell/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.6
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-# break cyclic dependencies, test suite requires porting to >=QC-2.11
-RESTRICT=test
-
-RDEPEND=">=dev-lang/ghc-7.8.2:="
-
-DEPEND="${RDEPEND}
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:9999"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bytestring-builder \
-		--flag=-developer \
-		--flag=-integer-simple
-}
diff --git a/dev-haskell/text/text-1.2.4.0.ebuild b/dev-haskell/text/text-1.2.4.0.ebuild
deleted file mode 100644
index ea35335337f4..000000000000
--- a/dev-haskell/text/text-1.2.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -bytestring-builder,-developer
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="An efficient packed Unicode text type"
-HOMEPAGE="https://github.com/haskell/text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# keep in sync with ghc-8.8
-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.1:="
-
-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"
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bytestring-builder \
-		--flag=-developer \
-		--flag=-integer-simple
-}
diff --git a/dev-haskell/text/text-1.2.5.0-r1.ebuild b/dev-haskell/text/text-1.2.5.0-r1.ebuild
new file mode 100644
index 000000000000..12b2e313de16
--- /dev/null
+++ b/dev-haskell/text/text-1.2.5.0-r1.ebuild
@@ -0,0 +1,48 @@
+# 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" # circular deps in 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 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# break cyclic dependencies:
+RESTRICT=test
+
+RDEPEND="
+	>=dev-lang/ghc-9.0.2:=
+"
+DEPEND="${RDEPEND}
+"
+#	test? (
+#		>=dev-haskell/quickcheck-2.14.1 <dev-haskell/quickcheck-2.15
+#		>=dev-haskell/quickcheck-unicode-1.0.1.0
+#		dev-haskell/random
+#		dev-haskell/tasty
+#		dev-haskell/tasty-hunit
+#		dev-haskell/tasty-inspection-testing
+#		dev-haskell/tasty-quickcheck
+#	)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-bytestring-builder \
+		--flag=-developer \
+		--flag=-integer-simple
+}
+
+CABAL_CORE_LIB_GHC_PV="9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8"
diff --git a/dev-haskell/tf-random/metadata.xml b/dev-haskell/tf-random/metadata.xml
index 5635c16285eb..6170b1e9ad43 100644
--- a/dev-haskell/tf-random/metadata.xml
+++ b/dev-haskell/tf-random/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/tf-random/tf-random-0.5.ebuild b/dev-haskell/tf-random/tf-random-0.5.ebuild
index f13b4354541d..69ad3707e39e 100644
--- a/dev-haskell/tf-random/tf-random-0.5.ebuild
+++ b/dev-haskell/tf-random/tf-random-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.4.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/primitive-0.3:=[profile?]
diff --git a/dev-haskell/th-abstraction/Manifest b/dev-haskell/th-abstraction/Manifest
index d27153b169ce..c5ad98e57509 100644
--- a/dev-haskell/th-abstraction/Manifest
+++ b/dev-haskell/th-abstraction/Manifest
@@ -1 +1,3 @@
-DIST th-abstraction-0.3.2.0.tar.gz 35111 BLAKE2B 18fc993256f6d49ec1e7911d152896cb7e62c3397030fdfb8179879d8b98a666f3f2bf73c3783276f92911698da94338cf5cc6b71df3631d9588d3022085a414 SHA512 d03087e52c51f6038d41a35fbfd0c6ab8b890c6d0aa91bc1a42c46f746f60d3c19c41766006977e0ebee4517bab5aab0f0439a2ed2434e5d41a7086eeb3ecea3
+DIST th-abstraction-0.4.3.0.tar.gz 38595 BLAKE2B 62e3a3b34997ae5190fe534138c2632b9de104dbc33f38fca8a762e0a2b89bf359bcb0e4c5e711d5a703f7220b8cf362d11772ad31bb4a04cee3091134356367 SHA512 a474bd042721efb83db5f707537589faa320f0e4ccf6bc839c450ff8d0970d3835003c134fc59f88e692d47264b1717bbd053543623dd40aa591155531a31003
+DIST th-abstraction-0.4.5.0-rev1.cabal 2212 BLAKE2B 1cdb39cf49921404efb6ddda76549fa169a2cdc3b3120480fd61736e6b73284d293f831d661b904a6bafd6372ac65ea0c3fe0299f9f99778a25c689023daa665 SHA512 7aeb8b2fcf10fa7ec7d2073d0713ed428b2faa0593424d5ec2e806efc4a808b4d79a9296b26789a25a032d40b1dd4c0eed251703b8826eb4eff66e7c1d0203ad
+DIST th-abstraction-0.4.5.0.tar.gz 39515 BLAKE2B ac66cb096dd55b1f4ec4b8cfacc4b920a00bef5490a88ddc5cda3c2ff3159ed82e5b5a04c5e13860ecacbc51ab40254832f62dbccd6f932cfbea8372ede3c8ae SHA512 eaea551b54d40bbd6056e6f7b14e662e7302cb016fe082b9715e248e05988197deebe6108e2adcb7709046a8a326e417fddd1899af3f810c2faa444da5cf4a41
diff --git a/dev-haskell/th-abstraction/metadata.xml b/dev-haskell/th-abstraction/metadata.xml
index c95ee5398149..993ce3b7088f 100644
--- a/dev-haskell/th-abstraction/metadata.xml
+++ b/dev-haskell/th-abstraction/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package normalizes variations in the interface for
-		inspecting datatype information via Template Haskell
-		so that packages and support a single, easier to use
-		informational datatype while supporting many versions
-		of Template Haskell.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">th-abstraction</remote-id>
+		<remote-id type="github">glguy/th-abstraction</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild b/dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild
deleted file mode 100644
index 3e84fd2704a6..000000000000
--- a/dev-haskell/th-abstraction/th-abstraction-0.3.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Nicer interface for reified information about data types"
-HOMEPAGE="https://github.com/glguy/th-abstraction"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild b/dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild
new file mode 100644
index 000000000000..c5d50fae96e8
--- /dev/null
+++ b/dev-haskell/th-abstraction/th-abstraction-0.4.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Nicer interface for reified information about data types"
+HOMEPAGE="https://github.com/glguy/th-abstraction"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/th-abstraction/th-abstraction-0.4.5.0.ebuild b/dev-haskell/th-abstraction/th-abstraction-0.4.5.0.ebuild
new file mode 100644
index 000000000000..0fb793af0eb5
--- /dev/null
+++ b/dev-haskell/th-abstraction/th-abstraction-0.4.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Nicer interface for reified information about data types"
+HOMEPAGE="https://github.com/glguy/th-abstraction"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/th-compat/Manifest b/dev-haskell/th-compat/Manifest
new file mode 100644
index 000000000000..817ab6fe7663
--- /dev/null
+++ b/dev-haskell/th-compat/Manifest
@@ -0,0 +1,3 @@
+DIST th-compat-0.1.3.tar.gz 13718 BLAKE2B ff925a0bd1f5a1de8008ce136cdd2c5e49aa6a58543df99d7179edaef65cea7d3ed3265ec5bdc31b5d5c01e65be25ddb1b393732d3b1f62a830a44f8c287554f SHA512 acb64eebf22093568fde29e7e5b78a8bce04d74b96a197a1c1f3383890b876c8d2e0a52206bbbc9708e3bf78a05f48e9bd3ea4929cbf6a7e712a4444917c1269
+DIST th-compat-0.1.4-rev2.cabal 3224 BLAKE2B 004c486fa4039444740af5ed883690ac754a5c9b06dbe54251d8e06990ca2e8e72184460d8a08cbf10140680c867e6b2a72a3bafa221616981e1671b85f7e9c3 SHA512 43540c5886eb07f32c8945d77c11af9132606b753640445ec264c1509339ebaaa958087ebfaa0b3dd1b46fca9f7b938b2846cd9df5ad1742e83dc4e377b469df
+DIST th-compat-0.1.4.tar.gz 14838 BLAKE2B 1c6a18b9199596db0d837804fa0c5d02ce86c8c2b26ccf357a2d68594ebe7ba49fa3162b34c8d54efa6e0e9b5c8d7c26a31c001e634b0a778fb4d7bb7b3342ef SHA512 2c9999343f33b2a74ca2439fdd111d038ae760c427fe1cb2c5778c4debdc49436c259f512a37e2bf4d765b83e925757bb23a48449ba5899586d409d5e15603ed
diff --git a/dev-haskell/th-compat/metadata.xml b/dev-haskell/th-compat/metadata.xml
new file mode 100644
index 000000000000..d21f5e1a8260
--- /dev/null
+++ b/dev-haskell/th-compat/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">th-compat</remote-id>
+		<remote-id type="github">haskell-compat/th-compat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/th-compat/th-compat-0.1.3.ebuild b/dev-haskell/th-compat/th-compat-0.1.3.ebuild
new file mode 100644
index 000000000000..8f0b7a203122
--- /dev/null
+++ b/dev-haskell/th-compat/th-compat-0.1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backward- (and forward-)compatible Quote and Code types"
+HOMEPAGE="https://github.com/haskell-compat/th-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/base-compat-0.6 <dev-haskell/base-compat-0.13
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+		>=dev-haskell/mtl-2.1 <dev-haskell/mtl-2.3 )
+"
diff --git a/dev-haskell/th-compat/th-compat-0.1.4.ebuild b/dev-haskell/th-compat/th-compat-0.1.4.ebuild
new file mode 100644
index 000000000000..306e0b5a0863
--- /dev/null
+++ b/dev-haskell/th-compat/th-compat-0.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backward- (and forward-)compatible Quote and Code types"
+HOMEPAGE="https://github.com/haskell-compat/th-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/base-compat-0.6 <dev-haskell/base-compat-0.14
+		>=dev-haskell/hspec-2 <dev-haskell/hspec-3
+	)
+"
diff --git a/dev-haskell/th-expand-syns/Manifest b/dev-haskell/th-expand-syns/Manifest
deleted file mode 100644
index b52bfd1a2c5f..000000000000
--- a/dev-haskell/th-expand-syns/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST th-expand-syns-0.3.0.6.tar.gz 6395 BLAKE2B 2a5e4c94b6e9c5f129c36c16c2259c36691e0795d8997a6917c39ba0c958e92dda2c670798761db1af4616493c2ae79306cb3ce489e8b7473046b3ee10dfb25e SHA512 ffface5d571b6af659e37910c22aaca93c04dac3a58483b53a8c197389ef94173027b3e446f96e7de7239c9139f7901aa85a2e990f9d2a2d83a5e641d7f37365
-DIST th-expand-syns-0.4.2.0.tar.gz 7237 BLAKE2B c8179e95c870f601fb862756f0861e1b519d1c4d1378f3af5d78bc5381dae92190c8acbd3451dd51a701ed5935baf4a140026722a012a2731d7d90951e486159 SHA512 c0af0f38793cad2ddf96b75fb19641f791dab51f053b4d8c68c6081f0cd2e29f1d76fd2436b596c10718dfd84e4715740499cf95675e22013c7ce3a1655ba8b9
-DIST th-expand-syns-0.4.5.0.tar.gz 8112 BLAKE2B 9a4572993f309144e70adb2967c699c06871246a00eea97e551d79cb1117970d12bc9c7594e8908f9b6a59550ba4fcef8e3e9888375136c4fccd3dc53d7e1857 SHA512 4e72ec26dbe875c3d664b94d7892001af835794f04bec83ff05952c3b9ea9b9de242cee5c713671213479bce4cfae3d0d6172a581e7fff58923688624dd493bd
diff --git a/dev-haskell/th-expand-syns/metadata.xml b/dev-haskell/th-expand-syns/metadata.xml
deleted file mode 100644
index 23320d5b348f..000000000000
--- a/dev-haskell/th-expand-syns/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Expands type synonyms in Template Haskell ASTs
-	</longdescription>
-	<upstream>
-		<remote-id type="github">DanielSchuessler/th-expand-syns</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
deleted file mode 100644
index a0772b36c709..000000000000
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Expands type synonyms in Template Haskell ASTs"
-HOMEPAGE="https://hackage.haskell.org/package/th-expand-syns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild
deleted file mode 100644
index b877da13fc37..000000000000
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Expands type synonyms in Template Haskell ASTs"
-HOMEPAGE="https://github.com/DanielSchuessler/th-expand-syns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild
deleted file mode 100644
index c4a8b84b5ab0..000000000000
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.4.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Expands type synonyms in Template Haskell ASTs"
-HOMEPAGE="https://github.com/DanielSchuessler/th-expand-syns"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift-instances/Manifest b/dev-haskell/th-lift-instances/Manifest
index 8e6e47dfe4cb..af5ed5344418 100644
--- a/dev-haskell/th-lift-instances/Manifest
+++ b/dev-haskell/th-lift-instances/Manifest
@@ -1,2 +1,2 @@
-DIST th-lift-instances-0.1.11.tar.gz 4477 BLAKE2B 22816020076245c154003ddb5a1523176368ceea47ba8d4e5c1f428227a2268079db59aae204c0a9012c565ae6c87991c6ede112926d12804d9a40efed5d4f35 SHA512 e4e443637c10cd21d9b6159f29ad8eb61a65bda2b625dff48ccbf1310c9abdbb1f48ff0c7e74974b78e0517db6af2889abb3c5cfeaed202c7b3efbe1c83dbc7a
-DIST th-lift-instances-0.1.14.tar.gz 5712 BLAKE2B 02fd3b2b1073a49c58625237514bd898d0fe7147225b52ba11658d9fea5fc6c6d6f392c92315fe5bbf529c11a263964a2bd3310d7b451452fc548212e44b3bcb SHA512 b0050866a250c7a5f55f47307e6482c49373d1cd09372c38b3c5c58883662f794a0e5210b9ba7e5a60536fd20262aa14cb7e94edf576cc69be5d2b33f21d21be
+DIST th-lift-instances-0.1.19.tar.gz 6113 BLAKE2B 75cfd2a7f8c80fe3cd03e66c8c6fa104f79167de1ed75db9b46e94d27c93c5650be13068c3273fa7d9e401f6017306796acb8806a055a856176be0a88bb0d5ba SHA512 d8a38531a9a61dce426c43807e3764abbe22102e8886d9d23e76d27735bace672e10472b77b27dbe2fbb74bf6e32a5d528d690a608a81d8dce9963721fad6349
+DIST th-lift-instances-0.1.20.tar.gz 6721 BLAKE2B 178c00ffa942787aef063f87e1714f0625e68c9cdb6aad113da04db4113fd39813ed3082bbc6f5db774dd33833602464c73151bb1485d80593427d4347bb33eb SHA512 bb43b13df8fb939a79a3fc1099900fcaa8741eb61b8f5574b7d7b68c220acc0cbb9fa7517b22ad34f006da7a1c25c08d1237309f8f98d79ca4d00dad345b28cb
diff --git a/dev-haskell/th-lift-instances/metadata.xml b/dev-haskell/th-lift-instances/metadata.xml
index 0d764dc95edd..817b6339b275 100644
--- a/dev-haskell/th-lift-instances/metadata.xml
+++ b/dev-haskell/th-lift-instances/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Most data types in haskell platform do not have Lift instances. This package provides orphan instances
-		for containers, text, bytestring and vector.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">th-lift-instances</remote-id>
+		<remote-id type="github">bennofs/th-lift-instances</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild
deleted file mode 100644
index 0cc806977f81..000000000000
--- a/dev-haskell/th-lift-instances/th-lift-instances-0.1.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lift instances for template-haskell for common data types"
-HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	dev-haskell/th-lift:=[profile?]
-	>=dev-haskell/vector-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.6 )
-"
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild
deleted file mode 100644
index 6cf4d601a7da..000000000000
--- a/dev-haskell/th-lift-instances/th-lift-instances-0.1.14.ebuild
+++ /dev/null
@@ -1,30 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Lift instances for template-haskell for common data types"
-HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-haskell/th-lift-0.8:=[profile?]
-	>=dev-haskell/vector-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/nats-1.1.2 <dev-haskell/nats-1.2
-		>=dev-haskell/quickcheck-2.6
-		>=dev-haskell/semigroups-0.18.5 <dev-haskell/semigroups-0.19 )
-"
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild
new file mode 100644
index 000000000000..3decff11a531
--- /dev/null
+++ b/dev-haskell/th-lift-instances/th-lift-instances-0.1.19.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lift instances for template-haskell for common data types"
+HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-haskell/th-lift-0.8:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/quickcheck-2.6 )
+"
diff --git a/dev-haskell/th-lift-instances/th-lift-instances-0.1.20.ebuild b/dev-haskell/th-lift-instances/th-lift-instances-0.1.20.ebuild
new file mode 100644
index 000000000000..e42707a54751
--- /dev/null
+++ b/dev-haskell/th-lift-instances/th-lift-instances-0.1.20.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lift instances for template-haskell for common data types"
+HOMEPAGE="https://github.com/bennofs/th-lift-instances/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-lift-0.8:=[profile?]
+	>=dev-haskell/vector-0.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/quickcheck-2.6 )
+"
diff --git a/dev-haskell/th-lift/Manifest b/dev-haskell/th-lift/Manifest
index ea9ace1d5aed..788e4fe41faa 100644
--- a/dev-haskell/th-lift/Manifest
+++ b/dev-haskell/th-lift/Manifest
@@ -1,5 +1,3 @@
-DIST th-lift-0.7.2.tar.gz 10980 BLAKE2B b430d5730447332fffe56722a51aac7c8e113d9504e375ed4389b7702bf8ec03e4dd049ee11afa6029b318a3dcd225d544c0bbe93d3ac019d749d0bfb6b35d07 SHA512 a560d9b7737a1b8a9ebb656edea035dd452349e4dc95af92bc152843b50960ebe498a1577a5c16eecaf6cb937fa72b67d7eff19aaa70293904adaa10e99e4f50
-DIST th-lift-0.7.5.tar.gz 12147 BLAKE2B 4751beec45d3f0af90644946682b75a9490ef403d6fbef8ad9d6f5a3c367e8a37b7727f629db5a6d92d6be2f938e9eeecb26a79a0dfd977f34e108d17dab8069 SHA512 79d01b50d424206602c810d2cd2c810b85a098737926f343c47c818bd43b2dd09c32964b52fa6fe4acc2462be16bcb4142b386337207321352f3e6d450158589
-DIST th-lift-0.7.6.tar.gz 12390 BLAKE2B e038e75631f3dac943b3baff060259c8daaeb0d7d7f0d62e081d85d0d2da7f49223b3106438ec8b01edbb4ed0911ab8312c214a5c7bee7ee2ce6ff8f5a97c1a0 SHA512 701d0064ab55414706e664ce8d8fa006329b3db6d04647204e1039ca267a5e5a2f7bbce477c4530070ccc1e2b23ac1653da24b765ea6340cafc696a077cdaf83
-DIST th-lift-0.7.7.tar.gz 12399 BLAKE2B 1dda0ef48694ea9d9f25b6f44ef7c7e3b16f2492d78de04b0d16a0b1cb7d2f36987ce92578df1286e869158cadd778cff92813638ea13be0c6710fa4d92f3cc5 SHA512 490d349ef2985defcf58eb49686c89ab79f8f9a3e29f3edb195440fe7995ecec6b2538767855ae0a5b9f43e5b00fe0bee167513486be99c111776ab7855d37d2
-DIST th-lift-0.8.1.tar.gz 13816 BLAKE2B 4e8a8231a77c3b98ab05a9a3ed0c682a09f61558483c832bdcfce42391199a8fd27c092252e130a5bb5d481bd364627254abac87f701ae8dde015ddc545168dd SHA512 21fb31f23aa41ec2c1979b7ad9ce467d9ed555237f7d4236b1400cb00bb7531832b269c1248062fe478876e9f8e4a2968171999a4c8264756ad10aa7e5983fa7
+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
diff --git a/dev-haskell/th-lift/metadata.xml b/dev-haskell/th-lift/metadata.xml
index 1d3597389241..f399f27a117a 100644
--- a/dev-haskell/th-lift/metadata.xml
+++ b/dev-haskell/th-lift/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Derive Template Haskell's Lift class for datatypes.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">mboes/th-lift</remote-id>
+		<remote-id type="hackage">th-lift</remote-id>
+		<remote-id type="github">RyanGlScott/th-lift</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/th-lift/th-lift-0.7.2.ebuild b/dev-haskell/th-lift/th-lift-0.7.2.ebuild
deleted file mode 100644
index f274ca49f2de..000000000000
--- a/dev-haskell/th-lift/th-lift-0.7.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-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/mboes/th-lift"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift/th-lift-0.7.5.ebuild b/dev-haskell/th-lift/th-lift-0.7.5.ebuild
deleted file mode 100644
index af7c8f71eab6..000000000000
--- a/dev-haskell/th-lift/th-lift-0.7.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-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/mboes/th-lift"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift/th-lift-0.7.6.ebuild b/dev-haskell/th-lift/th-lift-0.7.6.ebuild
deleted file mode 100644
index af7c8f71eab6..000000000000
--- a/dev-haskell/th-lift/th-lift-0.7.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-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/mboes/th-lift"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift/th-lift-0.7.7.ebuild b/dev-haskell/th-lift/th-lift-0.7.7.ebuild
deleted file mode 100644
index fcd279e4613d..000000000000
--- a/dev-haskell/th-lift/th-lift-0.7.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-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/mboes/th-lift"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/th-lift/th-lift-0.8.1.ebuild b/dev-haskell/th-lift/th-lift-0.8.1.ebuild
deleted file mode 100644
index 3277d4a608c6..000000000000
--- a/dev-haskell/th-lift/th-lift-0.8.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.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 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-"
diff --git a/dev-haskell/th-lift/th-lift-0.8.2.ebuild b/dev-haskell/th-lift/th-lift-0.8.2.ebuild
new file mode 100644
index 000000000000..ad13c913e8fb
--- /dev/null
+++ b/dev-haskell/th-lift/th-lift-0.8.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.2.3:=[profile?] <dev-haskell/th-abstraction-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+"
diff --git a/dev-haskell/th-lift/th-lift-0.8.4.ebuild b/dev-haskell/th-lift/th-lift-0.8.4.ebuild
new file mode 100644
index 000000000000..37c03e9073f0
--- /dev/null
+++ b/dev-haskell/th-lift/th-lift-0.8.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+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"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] <dev-haskell/th-abstraction-0.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/th-orphans/Manifest b/dev-haskell/th-orphans/Manifest
deleted file mode 100644
index 2b83fd32e82c..000000000000
--- a/dev-haskell/th-orphans/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST th-orphans-0.11.1.tar.gz 5511 BLAKE2B 0849cc48fbce6cc8d73e1089fc3a7b0d0f89319ec920d5373b93103071f190843df4758e7aff2353174e194c286e4a10e75c9551a304bbe706f3499548ffd3d8 SHA512 49f3467ed2a8365ccd3ab2f3a7281e04a4b42fb81b6411f0553b1770974710df6005ecd3e3e41724ac02602c47150daad51010c107564d330d7b08cf52320503
-DIST th-orphans-0.13.3.tar.gz 6549 BLAKE2B 1a23b345fd5cf43715deac8c1f21df56bb75e6d683b7d8ab2b28ce3c72ece178e0a0096d970f04e947d0977ce4a7062c4f47616e0c56e046e0deb8f621dec60f SHA512 5adc55392c2575d885365631ec90c6f26186fcb5ccc42f0e53cace064f1bf5ce389519aa78939a6390054a3ce144484de09205147fe06cbecbc0663898b0371d
-DIST th-orphans-0.8.2.tar.gz 4116 BLAKE2B 643ba6bc66d4096c21cbefcc5120836886b1158eb5f6f2f9d14a486dee7e738c25ca237ccadebbd8a4d87be6c4d1109983aaddf3d6f556a7682ac2a5bb85ac33 SHA512 d0cad737caebcf943a7289fd5ba771530553ff57d40dd3ac7dc7fb4ffe949ab04d7af660a3b84491366119ffdcf607819135bfd160c94a1f8401376d2b7b49a7
diff --git a/dev-haskell/th-orphans/metadata.xml b/dev-haskell/th-orphans/metadata.xml
deleted file mode 100644
index 68da81290c55..000000000000
--- a/dev-haskell/th-orphans/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Orphan instances for TH datatypes.  In particular, instances
-		for Ord and Lift, as well as a few missing Show / Eq.  These
-		instances used to live in haskell-src-meta, and that's where
-		the version number started.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild b/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
deleted file mode 100644
index d340c393caf4..000000000000
--- a/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for TH datatypes"
-HOMEPAGE="https://hackage.haskell.org/package/th-orphans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
-	>=dev-haskell/th-lift-0.7.1:=[profile?]
-	>=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild b/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild
deleted file mode 100644
index 3442e255996e..000000000000
--- a/dev-haskell/th-orphans/th-orphans-0.13.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for TH datatypes"
-HOMEPAGE="https://hackage.haskell.org/package/th-orphans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/generic-deriving-1.9:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/th-lift-0.7.1:=[profile?]
-	dev-haskell/th-lift-instances:=[profile?]
-	>=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/th-orphans/th-orphans-0.8.2.ebuild b/dev-haskell/th-orphans/th-orphans-0.8.2.ebuild
deleted file mode 100644
index ad189bb16d50..000000000000
--- a/dev-haskell/th-orphans/th-orphans-0.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan instances for TH datatypes"
-HOMEPAGE="https://hackage.haskell.org/package/th-orphans"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/th-lift-0.5:=[profile?]
-	>=dev-haskell/th-reify-many-0.1:=[profile?] <dev-haskell/th-reify-many-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/th-reify-many/Manifest b/dev-haskell/th-reify-many/Manifest
deleted file mode 100644
index 79337bafa0c7..000000000000
--- a/dev-haskell/th-reify-many/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST th-reify-many-0.1.3.tar.gz 5481 BLAKE2B dbc554fbf805fc4b63a51ec17dfc8f11008072d22372ee6a52899b242fe3f138aef11ad379141a37df3cbc4c13ff0e1792edc39a16a8cad22b5641291005acb7 SHA512 1e258d9d9ae28537ce3b7eca2de2434ad1a84a474de131bc307a74d3cb6527c70ce2fa23987896e5c3804404acdfc515d08437fbdf9940b4fdab3374574a93ed
-DIST th-reify-many-0.1.6.tar.gz 5651 BLAKE2B 33a29ed0e860888d00c9d05f742c20e54916980f5e572b839b611d7ee8bae8f3e7d584fce361aa4cb8ef4107e9871513ddf07070f30f6f613326f3493c7a4d6f SHA512 dccd91f4767e29a69ad81b754085040f45a6a8ce627c435f3ca3b14cd723e390df27a462f7ba74f3d652b239c2383d84305c947ccf4fb1906ddda52f9069b589
-DIST th-reify-many-0.1.9.tar.gz 5693 BLAKE2B c70b758a843b3d76982d89564a9cfe5fdc55d97ff05f3622e86b5160e06be22dd8fb870978b8da093ea5642bc1879ff7f5900fca4ff1cffe5f078ac8ec347155 SHA512 6d6f3cb939c172869e88a14ee800aa7760e090df55e0105f41ddc501c0a4bb60d59a66fafd890475fc3074a4fb25d7583570e2cfe32ce69f43c8db9663b0f110
diff --git a/dev-haskell/th-reify-many/metadata.xml b/dev-haskell/th-reify-many/metadata.xml
deleted file mode 100644
index c5a39e2ffbb7..000000000000
--- a/dev-haskell/th-reify-many/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		@th-reify-many@ provides functions for recursively reifying top
-		level declarations.  The main intended use case is for enumerating
-		the names of datatypes reachable from an initial datatype, and
-		passing these names to some function which generates instances.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">mgsloan/th-reify-many</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
deleted file mode 100644
index 1b7e8dcfe88d..000000000000
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Recurseively reify template haskell datatype info"
-HOMEPAGE="https://github.com/mgsloan/th-reify-many"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/th-expand-syns:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild
deleted file mode 100644
index ebc4f3ccb06c..000000000000
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Recurseively reify template haskell datatype info"
-HOMEPAGE="https://github.com/mgsloan/th-reify-many"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/th-expand-syns:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild
deleted file mode 100644
index c1bfcb59111e..000000000000
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Recurseively reify template haskell datatype info"
-HOMEPAGE="https://github.com/mgsloan/th-reify-many"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/th-expand-syns:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/th-utilities/Manifest b/dev-haskell/th-utilities/Manifest
deleted file mode 100644
index 532c09f9604d..000000000000
--- a/dev-haskell/th-utilities/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST th-utilities-0.2.0.1.tar.gz 14996 BLAKE2B dc39e7f282a2b5cc4ae2442f76080e042bc0fd3fc28e29ef7e6313bd4685ed33c855c10fa9313e5b7d3c6e9fd3c8cfbe4a64d8131a156b34eabd0f437b99b850 SHA512 30cb5c09071beb1f8e029d217fefc6e58aa6eaa8a28994990d1549091fc174195b04a10e7873b1ac5f894cb4a528bf9764256ff1ad5c969493fbf5f872f1749f
-DIST th-utilities-0.2.3.0.tar.gz 15577 BLAKE2B fad72515936ba6b7876ff731c7a1e12246014e191282028fc1bd1846dc704d4d1408e82e82a394a1f58350f961c5b7b7f5b9ae0cfbf09551fc5964433d42b113 SHA512 edddde2ea3a9da44bd34cbf51d9f4ea14510eac9527f2f1a199390566e24f10ed84403f5450e47244b0cbfc4b5dc3a5c3f64ec596255f191d8bad83d9043a3ba
diff --git a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch b/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
deleted file mode 100644
index 8a3795430b1f..000000000000
--- a/dev-haskell/th-utilities/files/th-utilities-0.2.3.0-ghc-8.8.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5e510f6a6ed24b98d143e5baeb156a8901bf3faa
-Author: Ryan Scott <ryan.gl.scott@gmail.com>
-Date:   Mon Dec 10 15:12:47 2018 -0500
-
-    Allow building with template-haskell-2.15.0.0
-
-diff --git a/src/TH/ReifySimple.hs b/src/TH/ReifySimple.hs
-index d179829..70b929e 100644
---- a/src/TH/ReifySimple.hs
-+++ b/src/TH/ReifySimple.hs
-@@ -233,18 +233,24 @@ infoToDataFamily info = case info of
-         Just $ DataFamily name (map tyVarBndrName tvs) (map go insts)
-     _ -> Nothing
-   where
--#if MIN_VERSION_template_haskell(2,11,0)
--    go (NewtypeInstD preds name params _kind con _deriving) =
-+#if MIN_VERSION_template_haskell(2,15,0)
-+    go (NewtypeInstD preds _ lhs _kind con _deriving)
-+      | ConT name:params <- unAppsT lhs
-+#elif MIN_VERSION_template_haskell(2,11,0)
-+    go (NewtypeInstD preds name params _kind con _deriving)
- #else
--    go (NewtypeInstD preds name params       con _deriving) =
-+    go (NewtypeInstD preds name params       con _deriving)
- #endif
--        DataInst name preds params (conToDataCons con)
--#if MIN_VERSION_template_haskell(2,11,0)
--    go (DataInstD preds name params _kind cons _deriving) =
-+      = DataInst name preds params (conToDataCons con)
-+#if MIN_VERSION_template_haskell(2,15,0)
-+    go (DataInstD preds _ lhs _kind cons _deriving)
-+      | ConT name:params <- unAppsT lhs
-+#elif MIN_VERSION_template_haskell(2,11,0)
-+    go (DataInstD preds name params _kind cons _deriving)
- #else
--    go (DataInstD preds name params       cons _deriving) =
-+    go (DataInstD preds name params       cons _deriving)
- #endif
--        DataInst name preds params (concatMap conToDataCons cons)
-+      = DataInst name preds params (concatMap conToDataCons cons)
-     go info' = error $
-         "Unexpected instance in FamilyI in infoToDataInsts:\n" ++ pprint info'
- 
-@@ -263,8 +269,23 @@ infoToTypeFamily info = case info of
- #endif
-     _ -> Nothing
-   where
-+#if MIN_VERSION_template_haskell(2,15,0)
-+    goEqn _ (TySynEqn _ lhs ty)
-+      | ConT name:params <- unAppsT lhs
-+      = TypeInst name params ty
-+      | otherwise
-+      = error $ "Unexpected type family instance head: " ++ pprint lhs
-+#else
-     goEqn name (TySynEqn params ty) = TypeInst name params ty
-+#endif
-+
-+#if MIN_VERSION_template_haskell(2,15,0)
-+    go (TySynInstD (TySynEqn _ lhs ty))
-+      | ConT name:params <- unAppsT lhs
-+      = TypeInst name params ty
-+#else
-     go (TySynInstD name (TySynEqn params ty)) = TypeInst name params ty
-+#endif
-     go info' = error $
-         "Unexpected instance in FamilyI in infoToTypeInsts:\n" ++ pprint info'
- 
diff --git a/dev-haskell/th-utilities/metadata.xml b/dev-haskell/th-utilities/metadata.xml
deleted file mode 100644
index 93ba8d9ecc21..000000000000
--- a/dev-haskell/th-utilities/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Collection of useful functions for use with Template Haskell
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.0.1.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.0.1.ebuild
deleted file mode 100644
index 375b4679f79a..000000000000
--- a/dev-haskell/th-utilities/th-utilities-0.2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Collection of useful functions for use with Template Haskell"
-HOMEPAGE="https://github.com/fpco/th-utilities#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/th-orphans:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/vector )
-"
diff --git a/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
deleted file mode 100644
index ce7bbd312b27..000000000000
--- a/dev-haskell/th-utilities/th-utilities-0.2.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Collection of useful functions for use with Template Haskell"
-HOMEPAGE="https://github.com/fpco/th-utilities#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/th-orphans:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/vector )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.8.patch)
diff --git a/dev-haskell/these/Manifest b/dev-haskell/these/Manifest
new file mode 100644
index 000000000000..3ba4cb56f142
--- /dev/null
+++ b/dev-haskell/these/Manifest
@@ -0,0 +1,3 @@
+DIST these-1.1.1.1.cabal 2748 BLAKE2B 2c35a4da7a8afc378d8eff519493a5fff85bfc780f699cca7441b8afcae9af47e08f2ab0b639f216cf9777ed2b84d87572329d171040b0bc231844ef6f53e6cd SHA512 bfe6df1cdbe0286731e28d0ab3cf354fb55a6be4aa799de6af6ee5a132c383fb889a5828aa2b3645e4f59a5690461c9abc83ccb277a51ef5c4f98b10e6270a53
+DIST these-1.1.1.1.tar.gz 9804 BLAKE2B 1b42aeea439b31a07f9916771a496258c45d343dbebbce7b8d3d50f0b34075cc1b3dc8bfb24d71bda866f3e8ee1d4822b8a8509d84cb277a1c8d253341e5fe51 SHA512 23246164648bf4cb028719e7cb2e5f450ab55558af9e1dc7f0ddec323ca4ce124afbfd3bf367446c2d69ec91abe42daf77e11a26a13f2898275dafbc095637d5
+DIST these-1.2.tar.gz 10606 BLAKE2B 9ced606b96e2b42ed9122bf458f534e521173466b1779aad7392c61b1621ae599191fd6e00b34d622ab0ed313218113edfdc55d3e259d7f76447d549f89c8bd2 SHA512 f05210a9a4023638ed0eba7089466f9fb8475fb30bd61bfeb36ea2f7382ea27eb3103233473087a0384208b34903b04218e64d4482da8cb8010fb7342af53d1a
diff --git a/dev-haskell/these/metadata.xml b/dev-haskell/these/metadata.xml
new file mode 100644
index 000000000000..b8c9395b8440
--- /dev/null
+++ b/dev-haskell/these/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">these</remote-id>
+		<remote-id type="github">haskellari/these</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/these/these-1.1.1.1.ebuild b/dev-haskell/these/these-1.1.1.1.ebuild
new file mode 100644
index 000000000000..437cb4a16833
--- /dev/null
+++ b/dev-haskell/these/these-1.1.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: aeson,assoc,quickcheck,semigroupoids,+assoc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="5"
+inherit haskell-cabal
+
+DESCRIPTION="An either-or-both data type"
+HOMEPAGE="https://github.com/haskellari/these"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/assoc-1:=[profile?] <dev-haskell/assoc-1.1:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=assoc
+}
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/these/these-1.2.ebuild b/dev-haskell/these/these-1.2.ebuild
new file mode 100644
index 000000000000..e3a8caa81df4
--- /dev/null
+++ b/dev-haskell/these/these-1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+#hackport: flags: aeson,assoc,quickcheck,semigroupoids,+assoc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="An either-or-both data type"
+HOMEPAGE="https://github.com/haskellari/these"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/assoc-1.1:=[profile?] <dev-haskell/assoc-1.2:=[profile?]
+	>=dev-haskell/foldable1-classes-compat-0.1:=[profile?] <dev-haskell/foldable1-classes-compat-0.2:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=assoc
+}
diff --git a/dev-haskell/threads/Manifest b/dev-haskell/threads/Manifest
deleted file mode 100644
index 73fb2e626440..000000000000
--- a/dev-haskell/threads/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST threads-0.5.1.4.tar.gz 7395 BLAKE2B ca81e06509d5dd9603e6b8affb248eb397040845e0fff26adda91086e08eb2d78982a9342f0d6bb0b3b6aab4ead33b3b26500683e221db60f5833b3ff4c280bd SHA512 4fcce77d88bf5eeb0ef172efec8525327ae11739c89a7d31b775ed686ad943aecb53f8140539262fdc8992b338943e9f905ebf97bc7c01312a12a88ac4c08129
-DIST threads-0.5.1.6.tar.gz 7406 BLAKE2B f2676d616f09e571e08a5e53671997483dc05d633444456b4227d28c0433ccd99c5c5117e8122a6ba0f389338b165ffc18a90c51222f199d90b2f2a704ecd7f1 SHA512 d34d97e5614f23afc5d2bb671c3979d779a9d0e29147a8bf25059f35ed562264302a3242224b022388e554177aa34455cb59dc640b2fa19ec452f15afac10525
diff --git a/dev-haskell/threads/metadata.xml b/dev-haskell/threads/metadata.xml
deleted file mode 100644
index 2baf8cca4f23..000000000000
--- a/dev-haskell/threads/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides functions to fork threads and
-		wait for their result, whether it's an exception or a
-		normal value.
-		
-		Besides waiting for the termination of a single thread
-		this packages also provides functions to wait for a
-		group of threads to terminate.
-		
-		This package is similar to the
-		@threadmanager@, @async@ and @spawn@ packages.
-		The advantages of this package are:
-		
-		* Simpler API.
-		
-		* More efficient in both space and time.
-		
-		* No space-leak when forking a large number of threads.
-		
-		* Correct handling of asynchronous exceptions.
-		
-		* GHC specific functionality like @forkOn@ and @forkIOWithUnmask@.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">basvandijk/threads</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/threads/threads-0.5.1.4.ebuild b/dev-haskell/threads/threads-0.5.1.4.ebuild
deleted file mode 100644
index 7f58664950fe..000000000000
--- a/dev-haskell/threads/threads-0.5.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fork threads and wait for their result"
-HOMEPAGE="https://github.com/basvandijk/threads"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( >=dev-haskell/concurrent-extra-0.5.1 <dev-haskell/concurrent-extra-0.8
-		>=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
-"
diff --git a/dev-haskell/threads/threads-0.5.1.6.ebuild b/dev-haskell/threads/threads-0.5.1.6.ebuild
deleted file mode 100644
index a54bed773297..000000000000
--- a/dev-haskell/threads/threads-0.5.1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fork threads and wait for their result"
-HOMEPAGE="https://github.com/basvandijk/threads"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12
-	test? ( >=dev-haskell/concurrent-extra-0.5.1
-		>=dev-haskell/hunit-1.2.2
-		>=dev-haskell/test-framework-0.2.4
-		>=dev-haskell/test-framework-hunit-0.2.4 )
-"
diff --git a/dev-haskell/thyme/Manifest b/dev-haskell/thyme/Manifest
deleted file mode 100644
index 84fdcabc8008..000000000000
--- a/dev-haskell/thyme/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST thyme-0.3.5.5.tar.gz 37220 BLAKE2B 16c72f436d8587f5102458a9013f1244e223dd675e610cfb8216d95a2ff01ec1b90bacd23dd50440ac87f6a73e22b2580a0dd4c0da3ca2c336d8e521b31fe23f SHA512 2f8bb307a49e441b3fe2a0337a25ef9adc94d3fe2f04369759bbdfba9ee788568016e8e9ce6dde2ef1ba51c61f98621f4dd35b833cab1757b022bf43524174b5
diff --git a/dev-haskell/thyme/metadata.xml b/dev-haskell/thyme/metadata.xml
deleted file mode 100644
index 61acd72e3cce..000000000000
--- a/dev-haskell/thyme/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Thyme is a rewrite of the fine @time@ library, with a particular focus
-		on performance for applications that make heavy use of timestamps.
-		
-		See "Data.Thyme" for a full description.
-	</longdescription>
-	<use>
-		<flag name="bug-for-bug">bug-for-bug compatibility with time</flag>
-		<flag name="lens">use the full lens package</flag>
-		<flag name="show-internal">instance Show of internal representation</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">liyang/thyme</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/thyme/thyme-0.3.5.5.ebuild b/dev-haskell/thyme/thyme-0.3.5.5.ebuild
deleted file mode 100644
index cb2b61f3a9eb..000000000000
--- a/dev-haskell/thyme/thyme-0.3.5.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -werror,-hlint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A faster time library"
-HOMEPAGE="https://github.com/liyang/thyme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bug-for-bug lens show-internal"
-
-RESTRICT=test # optimization-dependent
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/mtl-1.1:=[profile?]
-	>=dev-haskell/quickcheck-2.4:2=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?]
-	>=dev-haskell/vector-space-0.8:=[profile?]
-	>=dev-haskell/vector-th-unbox-0.2.1.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	lens? ( >=dev-haskell/lens-3.9:=[profile?] )
-	!lens? ( >=dev-haskell/profunctors-3.1.2:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/system-posix-redirect-1.1 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bug-for-bug bug-for-bug) \
-		--flag=-hlint \
-		$(cabal_flag lens lens) \
-		$(cabal_flag show-internal show-internal) \
-		--flag=-werror
-}
diff --git a/dev-haskell/time-compat/Manifest b/dev-haskell/time-compat/Manifest
index d699e82ed1b9..d51aa4809fb5 100644
--- a/dev-haskell/time-compat/Manifest
+++ b/dev-haskell/time-compat/Manifest
@@ -1,2 +1,2 @@
-DIST time-compat-0.1.0.3.tar.gz 2256 BLAKE2B eb94a09bfa0f1feaf41272c2fc7825e88c557cbfc6a9946886e871a75adcacb3aec03eac970baa409dbec1d2a9c6dc637ef121a0ba26416b59263a08c70fe767 SHA512 d7034e47654c4d73b4a0f3a7b1d0d5d2bfcc1eb028f288b7ccd0baceae49a6436493bf8a7a8af34ef3668f59a8b6f6047809a448125607c8af4aaee01deacfa6
-DIST time-compat-1.9.3.tar.gz 50050 BLAKE2B 9c6f457945a975d88fe1784daf7dbf4a0b96c086cdd05af97a3b0d9d2379777c985b8b73dd592f588d4e09aee2fc987ed4b97efd4d4199841318114b379a8c5d SHA512 937020b42b739a9ee2da3d8105181adc45d80f7e8b5af81c7f43dfbf567f33c81caf0e34de8896bc139f1eb4e40efd0715e9f6e5a4d542a1a86c4ea53151cf2a
+DIST time-compat-1.9.6.1-rev5.cabal 5062 BLAKE2B be9fb65c60bc62b7b92ec552ef691121084b67d05f329f32a6cd9af8f57663e8be7b31510e5a5080db38d711a06a91a9de705fbd8e3ad6697b6451f95ddedb7b SHA512 6ab42c2ad2d53b4bb9e713886508691cfc0f13535524e2cf0311110b8bf991474b6efd030ec74dfda056d154cdbb409cc7caea087645e91d50a96e2a5c07a979
+DIST time-compat-1.9.6.1.tar.gz 59964 BLAKE2B 0a19a9692100d47f14643613539061104fead78056d37ff3aededf3d15ef00e23aa6875b77b56a92138818511b7681197ff55fb8adb6a0d6075c7e02bf0fe397 SHA512 ca0b19aa5e7948fd7d9fbd8ff5e1b0f93a2d8d410d515e7078b40370e7d9fc363c111d53551d57a0320efb0894bcc2210afa8fc04da9f003ded626f53b7e58ea
diff --git a/dev-haskell/time-compat/files/fix-resolution-test.patch b/dev-haskell/time-compat/files/fix-resolution-test.patch
new file mode 100644
index 000000000000..918bd488dbc9
--- /dev/null
+++ b/dev-haskell/time-compat/files/fix-resolution-test.patch
@@ -0,0 +1,49 @@
+https://github.com/haskellari/time-compat/pull/33
+
+From 9f7aa0a5937b800402359c3e82f4bee296ae8e06 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Fri, 16 Sep 2022 11:19:20 -0400
+Subject: [PATCH] Backport 6516a35 "fix resolution test" from time
+
+The upstream version of time was incorrect in newer versions until
+https://github.com/haskell/time/commit/6516a35b3d8cad14a21a559a5d2fc22ddda32fcc.
+Because the compat implementation was correct and the upstream version
+of time is now logically identical, simply replace both versions with
+the current upstream time implementation.
+
+See https://github.com/haskellari/time-compat/issues/31 for details on
+which platforms the distinction matters.  Does NOT close that issue
+though, because the original issue is for platforms on which the actual
+resolution is less precise than the expected, and this will only fix
+platforms on which the actual resolution is more precise.
+---
+ test/main/Test/Clock/Resolution.hs | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/test/main/Test/Clock/Resolution.hs b/test/main/Test/Clock/Resolution.hs
+index aab756b..4c0b1dd 100644
+--- a/test/main/Test/Clock/Resolution.hs
++++ b/test/main/Test/Clock/Resolution.hs
+@@ -25,7 +25,7 @@ gcdAll :: Real a => [a] -> a
+ gcdAll = foldr gcd' 0
+ 
+ testResolution :: (Show dt, Real dt) => String -> (at -> at -> dt) -> (dt, IO at) -> TestTree
+-testResolution name timeDiff (res, getTime) =
++testResolution name timeDiff (reportedRes, getTime) =
+     testCase name $ do
+         t0 <- getTime
+         times0 <-
+@@ -53,11 +53,8 @@ testResolution name timeDiff (res, getTime) =
+                 threadDelay 1000 -- 1ms
+                 getTime
+         let times = fmap (\t -> timeDiff t t0) $ times0 ++ times1 ++ times2 ++ times3 ++ times4
+-#if MIN_VERSION_time(1,8,0)
+-        assertEqual "resolution" res $ gcdAll times
+-#else
+-        assertBool ("resolution " ++ show (res, gcdAll times)) (res >= gcdAll times)
+-#endif
++            foundGrid = gcdAll times
++        assertBool ("resolution " ++ show (reportedRes, foundGrid)) (foundGrid <= reportedRes)
+ 
+ testResolutions :: TestTree
+ testResolutions =
diff --git a/dev-haskell/time-compat/metadata.xml b/dev-haskell/time-compat/metadata.xml
index e5927f581861..9eefe1548660 100644
--- a/dev-haskell/time-compat/metadata.xml
+++ b/dev-haskell/time-compat/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Compatibility with the &lt;old-time&gt; package for the \"new\"
-		&lt;time&gt; package.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">time-compat</remote-id>
+		<remote-id type="github">haskellari/time-compat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild b/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild
deleted file mode 100644
index 985a65c1d15a..000000000000
--- a/dev-haskell/time-compat/time-compat-0.1.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility with old-time for the time package"
-HOMEPAGE="https://hub.darcs.net/dag/time-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/time-compat/time-compat-1.9.3.ebuild b/dev-haskell/time-compat/time-compat-1.9.3.ebuild
deleted file mode 100644
index f6868dc7dfc5..000000000000
--- a/dev-haskell/time-compat/time-compat-1.9.3.ebuild
+++ /dev/null
@@ -1,38 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="This packages tries to compat as much of \\'time\\' features as possible"
-HOMEPAGE="https://github.com/phadej/time-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires quickcheck-2.13
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.1:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
-	>=dev-haskell/fail-4.9.0.0:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.12"
-# 	test? ( >=dev-haskell/base-compat-0.10.5 <dev-haskell/base-compat-0.12
-# 		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
-# 		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
-# 		>=dev-haskell/tasty-1.2.1 <dev-haskell/tasty-1.3
-# 		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
-# 		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
-# 		|| ( ( >=dev-haskell/hunit-1.3.1 <dev-haskell/hunit-1.3.2 )
-# 			( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 ) ) )
-# "
diff --git a/dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild b/dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild
new file mode 100644
index 000000000000..927540bc987f
--- /dev/null
+++ b/dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility package for time"
+HOMEPAGE="https://github.com/haskellari/time-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/fix-resolution-test.patch" )
+
+RDEPEND="
+	>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+	>=dev-haskell/hashable-1.3.2.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/base-compat-0.10.5 <dev-haskell/base-compat-0.14
+		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
+		>=dev-haskell/tasty-1.2.1 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+		|| (
+			( >=dev-haskell/hunit-1.3.1 <dev-haskell/hunit-1.3.2 )
+			( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 )
+		)
+	)
+"
diff --git a/dev-haskell/time-locale-compat/Manifest b/dev-haskell/time-locale-compat/Manifest
index e9b0c5730651..661ae8a98fcc 100644
--- a/dev-haskell/time-locale-compat/Manifest
+++ b/dev-haskell/time-locale-compat/Manifest
@@ -1,3 +1 @@
-DIST time-locale-compat-0.1.1.1.tar.gz 1861 BLAKE2B 526ec59b96310249b98a286a0e79934ca29460057cad3847780f0bff1b384c1491996000f26ed0aa68dc45cb910de990d94bbec1fe97039afff44bcb61fffd99 SHA512 69adcc66c933900768de5dc73a654aa226f074ce0dbe0c9db8773d31cc79753e5148145faaae198d4040cc6a23da6372fea6e3f48e1c8f6110a318591e9d6f48
-DIST time-locale-compat-0.1.1.3.tar.gz 1925 BLAKE2B a25ad359cf0fcba2375113d7b5e2f8f489865526261c6905b4f8435c454f7bda5e0fb92f0c86138b90edfe9f0217a37754af4cdd4ba0df00737ed83ab881b12a SHA512 62fd86d0b1f3707fb820a15dddc01d02fb701e942493e26927745556f19430706ae342a810942c511105cfa848f0d40e109aab471c8c0441caaf6ed4afb233a2
 DIST time-locale-compat-0.1.1.5.tar.gz 1956 BLAKE2B a0980c2ba140c0ba9fb78023b7339a391e7eee8a14e942b2a7ccae4abf2a5a671f15bcce4367b214ccb47ecd0f87aab00984bd598237012e4071ed11139ff3cf SHA512 a8a87b77f017ca7e4db98101b527016a39abe4f264b3684b887464c53b792f564d0bec3304d8ed5f5889a3e3cb7e41f4d049e61e5adab688363a3342608f695c
diff --git a/dev-haskell/time-locale-compat/metadata.xml b/dev-haskell/time-locale-compat/metadata.xml
index 1ab2ab0beca4..7ad259a466a7 100644
--- a/dev-haskell/time-locale-compat/metadata.xml
+++ b/dev-haskell/time-locale-compat/metadata.xml
@@ -1,13 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		This package contains wrapped name module for TimeLocale.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">khibino/haskell-time-locale-compat</remote-id>
 	</upstream>
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
deleted file mode 100644
index abc74da69ac4..000000000000
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility of TimeLocale between old-locale and time-1.5"
-HOMEPAGE="https://github.com/khibino/haskell-time-locale-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.3.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.3.ebuild
deleted file mode 100644
index f7cbca153469..000000000000
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility of TimeLocale between old-locale and time-1.5"
-HOMEPAGE="https://github.com/khibino/haskell-time-locale-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-locale:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
index ba760ada6bd3..d6a1b5250eb5 100644
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
+++ b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/old-locale:=[profile?]
diff --git a/dev-haskell/time-manager/metadata.xml b/dev-haskell/time-manager/metadata.xml
index b7878815d80d..6b5972c48ca4 100644
--- a/dev-haskell/time-manager/metadata.xml
+++ b/dev-haskell/time-manager/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">yesodweb/wai</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/time-manager/time-manager-0.0.0.ebuild b/dev-haskell/time-manager/time-manager-0.0.0.ebuild
index 2748b6dcb382..7effa15e0aa6 100644
--- a/dev-haskell/time-manager/time-manager-0.0.0.ebuild
+++ b/dev-haskell/time-manager/time-manager-0.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/auto-update:=[profile?]
diff --git a/dev-haskell/timeit/Manifest b/dev-haskell/timeit/Manifest
new file mode 100644
index 000000000000..6be26af01903
--- /dev/null
+++ b/dev-haskell/timeit/Manifest
@@ -0,0 +1 @@
+DIST timeit-2.0.tar.gz 2117 BLAKE2B 3cb601e87cd77af879572aca0fc495ce6e446d4c402c3e1010b114a18326254f94fc212985df722a47b0a6870d1789424b65620ebc471c177e22b18c6aa7c577 SHA512 3cbe554ddb17fbeb5f8be1f6459144921f8be4db0fa9571678980251ca397fca0700df61d0e5bd8466b0b2cdcedac8473ac53debbd9b4e9c239ebb37bec2845b
diff --git a/dev-haskell/timeit/metadata.xml b/dev-haskell/timeit/metadata.xml
new file mode 100644
index 000000000000..afb59c65e1bb
--- /dev/null
+++ b/dev-haskell/timeit/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">merijn/timeit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/timeit/timeit-2.0.ebuild b/dev-haskell/timeit/timeit-2.0.ebuild
new file mode 100644
index 000000000000..92d1f1133f5f
--- /dev/null
+++ b/dev-haskell/timeit/timeit-2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Time a computation"
+HOMEPAGE="https://github.com/merijn/timeit"
+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.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-haskell/timezone-olson/Manifest b/dev-haskell/timezone-olson/Manifest
index 1c712d1893dd..22bd93ad911f 100644
--- a/dev-haskell/timezone-olson/Manifest
+++ b/dev-haskell/timezone-olson/Manifest
@@ -1,2 +1,2 @@
-DIST timezone-olson-0.1.7.tar.gz 11313 BLAKE2B c2bb71f949beac730e9fe9ff6a5aacbe301ffb8012b6e622179a029523784d0f3a2745ff3dd8a86ecb109fed90f44a121a4b5e8f4766bf6061a7233429267221 SHA512 136bca829b40edd3c46f83e2d19b496da7b6e7268825ff017fa598f9dc8a9de5fd65101f417e9c22ae8b845c61c98347944971f8f41072be60d894ea148a4e0a
-DIST timezone-olson-0.1.9.tar.gz 11471 BLAKE2B 37ec5948b7584751ea3ed6e6aa0c11b78766d74969f6acd0813de08c36c78ddec58cc047eb5bca9fba26a692162985dbca25c6ba2d78172bb894edd4b7146c1c SHA512 1ad8f98ba3573f11154e18c5c0d2d7ee3b32f165d388318622195199da4765d1a0352b8a13fa38a6b2fb008de93f34d2a6aa35d2d7ada53e1ae8c5404d68b645
+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
diff --git a/dev-haskell/timezone-olson/metadata.xml b/dev-haskell/timezone-olson/metadata.xml
index dec7b007d319..d43bcd578ae6 100644
--- a/dev-haskell/timezone-olson/metadata.xml
+++ b/dev-haskell/timezone-olson/metadata.xml
@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A parser and renderer for binary Olson timezone
-		files whose format is specified by the tzfile(5)
-		man page on Unix-like systems. For more
-		information about this format, see
-		&lt;http://www.twinsun.com/tz/tz-link.htm&gt;. Functions
-		are provided for converting the parsed data into
-		'TimeZoneSeries' objects from the timezone-series
-		package. On many platforms, binary Olson timezone
-		files suitable for use with this package are
-		available in the directory /usr/share/zoneinfo
-		and its subdirectories on your computer.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">timezone-olson</remote-id>
+		<remote-id type="github">ygale/timezone-olson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild
deleted file mode 100644
index a0baf253e2c9..000000000000
--- a/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
-HOMEPAGE="http://projects.haskell.org/time-ng/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'binary >= 0.4.1 && < 0.8' 'binary >= 0.4.1' \
-		'time >= 1.1.4 && < 1.6' 'time >= 1.1.4'
-}
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild
deleted file mode 100644
index 261badce7128..000000000000
--- a/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
-HOMEPAGE="http://projects.haskell.org/time-ng/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=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-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild
deleted file mode 100644
index 8bf4ec391654..000000000000
--- a/dev-haskell/timezone-olson/timezone-olson-0.1.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
-HOMEPAGE="http://projects.haskell.org/time-ng/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
new file mode 100644
index 000000000000..45ce3705e5a2
--- /dev/null
+++ b/dev-haskell/timezone-olson/timezone-olson-0.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
+HOMEPAGE="http://projects.haskell.org/time-ng/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.2.1.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.2.1.ebuild
new file mode 100644
index 000000000000..8db772ad47f6
--- /dev/null
+++ b/dev-haskell/timezone-olson/timezone-olson-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A pure Haskell parser and renderer for binary Olson timezone files"
+HOMEPAGE="https://projects.haskell.org/time-ng/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+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.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/timezone-series/Manifest b/dev-haskell/timezone-series/Manifest
index 412ce140245f..0c0476aca0e1 100644
--- a/dev-haskell/timezone-series/Manifest
+++ b/dev-haskell/timezone-series/Manifest
@@ -1,3 +1,3 @@
-DIST timezone-series-0.1.5.1.tar.gz 5330 BLAKE2B a61ab72f91269485730255d80d51adf9aeed7ce52e524c722a827dcbc46df3888e1e6edfd3654be498e648682431ca348ce86c54be3755b88c6040e58d853196 SHA512 7f080455f58c8aefb8ac7e34e9b91724a294537069d8acf65865cc481fd3053816dd3e5ce3ef7a41c85f7d983764b7c472c13e47cc20d458c74a256c394f2d03
-DIST timezone-series-0.1.6.1.tar.gz 6021 BLAKE2B f830aae655c92aa444551840dd4ba41bbc60ad5a2dd8a1df6f053a419a9816cd4fcb7c0ceaa20a19c1ea4af4980b76441d2271cf904d09c7058cfbb29418c65a SHA512 d4cee3725651ad25174857ff4df1dd7ef0a8d15cbc6e4547b43c0499eea68e8ba2df45763975987184032bc1e17f6f39e21220bb102084633014ccb723b5ed74
+DIST timezone-series-0.1.13-rev1.cabal 1528 BLAKE2B 75c04c5c149cd7fcbc4670ab1f2fadc4091661642c7a411688528da5059df2ef2f3b44450bcb5f3774c8c04bd0522ed37c1c49bff35b66a5ef00c59b8a206b13 SHA512 11a8bd7b3cdd06622118d78767e5df7d4645a201e8b2c0fa7a3d3923852bd1d26c79b685e4e2bf9eb3a2eeadb6b6acde0dc0c8d2124903b52a50a15b33573d7e
+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
diff --git a/dev-haskell/timezone-series/metadata.xml b/dev-haskell/timezone-series/metadata.xml
index 2d2f96b3ebcc..d4b89ac92552 100644
--- a/dev-haskell/timezone-series/metadata.xml
+++ b/dev-haskell/timezone-series/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package endows Data.Time, from the time
-		package, with several data types and functions
-		for enhanced processing of timezones. For one way
-		to create timezone series, see the timezone-olson
-		package.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">timezone-series</remote-id>
+		<remote-id type="github">ygale/timezone-series</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.13.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.13.ebuild
new file mode 100644
index 000000000000..a4ddec0c2066
--- /dev/null
+++ b/dev-haskell/timezone-series/timezone-series-0.1.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Enhanced timezone handling for Data.Time"
+HOMEPAGE="https://projects.haskell.org/time-ng/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild
deleted file mode 100644
index 854aa0962448..000000000000
--- a/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enhanced timezone handling for Data.Time"
-HOMEPAGE="http://projects.haskell.org/time-ng/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild
deleted file mode 100644
index 342456a5cf7d..000000000000
--- a/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enhanced timezone handling for Data.Time"
-HOMEPAGE="http://projects.haskell.org/time-ng/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
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 2d4017b83783..e02ae7a01c97 100644
--- a/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
+++ b/dev-haskell/timezone-series/timezone-series-0.1.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6
 
@@ -14,9 +14,13 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+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/tls-session-manager/metadata.xml b/dev-haskell/tls-session-manager/metadata.xml
index b7878815d80d..937381521944 100644
--- a/dev-haskell/tls-session-manager/metadata.xml
+++ b/dev-haskell/tls-session-manager/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
diff --git a/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild b/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild
index e997913691cb..e021ab37a3f3 100644
--- a/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild
+++ b/dev-haskell/tls-session-manager/tls-session-manager-0.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.2
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="In-memory TLS session manager"
-HOMEPAGE="http://hackage.haskell.org/package/tls-session-manager"
+HOMEPAGE="https://hackage.haskell.org/package/tls-session-manager"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/auto-update:=[profile?]
diff --git a/dev-haskell/tls/Manifest b/dev-haskell/tls/Manifest
index 18747ebe8b5f..801ee54266fb 100644
--- a/dev-haskell/tls/Manifest
+++ b/dev-haskell/tls/Manifest
@@ -1,2 +1,2 @@
-DIST tls-1.3.9.tar.gz 88354 BLAKE2B 1d3d6be5ead5074c5583a2238a2f3352ba4b1f4398a891642e3ff2e5fc4375c669a81de64f9f10f1b13ade6c3a2e57e3b6507ea0d31bae0e6a218107558115c4 SHA512 bb7d573e44707121fef65c66b83086b0bd477d3fe526d0bcc9dfa0a59059d340eea6091bb0d6b36819bd2999d2ffa581d3591dbc4b2000bf5e1ba6dd40923446
-DIST tls-1.5.4.tar.gz 150171 BLAKE2B 03085bd5f0d20b27fd5ea31e5e6179a15ac5893cc585d5a274523444838e8e05e9f3f4028b44147d6bb20df2c37e293046255765c253b57d2be4584066f24f8b SHA512 fb95ab6012ed95d82a41810b83e6f779645fa56d46c57f34a954a6885c295737808edcdcdca9e88e5b3c663f5aee71f104fe1fdd9ab35fb6a8ade4a202376d4a
+DIST tls-1.5.8.tar.gz 157923 BLAKE2B b6b1259f6950e15fcba584690f59fd66a1a597490cbcb76e7199c48677f0df00e86f27f12e0c02210ba83cac110346aec6e7afb460f7e9721f275d146040cac5 SHA512 81d0046aeb6342c5dcd3827d9315793b68436a4eec7c9bcae50f4b5b5365248c7c874addca77a50a19689f535386330435b5914386306a3f12d699a5fad1107a
+DIST tls-1.8.0.tar.gz 159360 BLAKE2B 7d8a022e0a7f8953e47bf81eb923ad278f0b4350d537d35c2948532f082fe52d299076208083224252a0270698b2e76bc48e8c638edb5d2fe2a49f224e876c86 SHA512 23463ebbe331e02ed3b8d9c5a4e7dccc0b921898709c600e4a0a7b50575029c00ddbdbe6e3a44ffb094059cae377cb388b55be53ab847a1843989359200894b3
diff --git a/dev-haskell/tls/metadata.xml b/dev-haskell/tls/metadata.xml
index b95ef7b625de..bfcf2e4b1016 100644
--- a/dev-haskell/tls/metadata.xml
+++ b/dev-haskell/tls/metadata.xml
@@ -1,29 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?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>
-	<longdescription>
-		Native Haskell TLS and SSL protocol implementation for server and client.
-		
-		This provides a high-level implementation of a sensitive security protocol,
-		eliminating a common set of security issues through the use of the advanced
-		type system, high level constructions and common Haskell features.
-		
-		Currently implement the SSL3.0, TLS1.0, TLS1.1 and TLS1.2 protocol,
-		with only RSA supported for Key Exchange.
-		
-		Only core protocol available here, have a look at the
-		&lt;http://hackage.haskell.org/package/tls-extra/&gt; package for default
-		ciphers, compressions and certificates functions.
-	</longdescription>
 	<use>
-		<flag name="compat">Accept SSLv2 compatible handshake.</flag>
-		<flag name="network">Use the base network library.</flag>
+		<flag name="compat">Accept SSLv2 client hello for beginning SSLv3 / TLS handshake</flag>
+		<flag name="network">Use the base network library</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">vincenthz/hs-tls</remote-id>
+		<remote-id type="hackage">tls</remote-id>
+		<remote-id type="github">haskell-tls/hs-tls</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tls/tls-1.3.9.ebuild b/dev-haskell/tls/tls-1.3.9.ebuild
deleted file mode 100644
index c944cadc1b78..000000000000
--- a/dev-haskell/tls/tls-1.3.9.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat +network"
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
-	>=dev-haskell/asn1-types-0.2.0:=[profile?]
-	dev-haskell/async:=[profile?]
-	>=dev-haskell/cereal-0.4:=[profile?]
-	>=dev-haskell/cryptonite-0.21:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/x509-1.6.5:=[profile?] <dev-haskell/x509-1.7.0:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?]
-	>=dev-haskell/x509-validation-1.6.5:=[profile?] <dev-haskell/x509-validation-1.7.0:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network? ( dev-haskell/network:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hourglass
-		dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag compat compat) \
-		$(cabal_flag network network)
-}
diff --git a/dev-haskell/tls/tls-1.5.4.ebuild b/dev-haskell/tls/tls-1.5.4.ebuild
deleted file mode 100644
index e8454a5db2c0..000000000000
--- a/dev-haskell/tls/tls-1.5.4.ebuild
+++ /dev/null
@@ -1,47 +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.4
-#hackport: flags: -hans
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat +network"
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
-	>=dev-haskell/asn1-types-0.2.0:=[profile?]
-	>=dev-haskell/async-2.0:=[profile?]
-	>=dev-haskell/cereal-0.5.3:=[profile?]
-	>=dev-haskell/cryptonite-0.25:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	>=dev-haskell/memory-0.14.6:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/x509-1.7.5:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?]
-	>=dev-haskell/x509-validation-1.6.5:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-haskell/quickcheck
-		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag compat compat) \
-		--flag=-hans \
-		$(cabal_flag network network)
-}
diff --git a/dev-haskell/tls/tls-1.5.8.ebuild b/dev-haskell/tls/tls-1.5.8.ebuild
new file mode 100644
index 000000000000..a237085f3c83
--- /dev/null
+++ b/dev-haskell/tls/tls-1.5.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -hans
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
+HOMEPAGE="https://github.com/vincenthz/hs-tls"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+compat +network"
+
+RDEPEND="dev-haskell/asn1-encoding:=[profile?]
+	>=dev-haskell/asn1-types-0.2.0:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?]
+	>=dev-haskell/cereal-0.5.3:=[profile?]
+	>=dev-haskell/cryptonite-0.27:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	dev-haskell/hourglass:=[profile?]
+	>=dev-haskell/memory-0.14.6:=[profile?]
+	>=dev-haskell/x509-1.7.5:=[profile?]
+	>=dev-haskell/x509-store-1.6:=[profile?]
+	>=dev-haskell/x509-validation-1.6.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag compat compat) \
+		--flag=-hans \
+		$(cabal_flag network network)
+}
diff --git a/dev-haskell/tls/tls-1.8.0.ebuild b/dev-haskell/tls/tls-1.8.0.ebuild
new file mode 100644
index 000000000000..51e08cb1b176
--- /dev/null
+++ b/dev-haskell/tls/tls-1.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: -hans
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
+HOMEPAGE="https://github.com/haskell-tls/hs-tls"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+compat +network"
+
+RDEPEND="dev-haskell/asn1-encoding:=[profile?]
+	>=dev-haskell/asn1-types-0.2.0:=[profile?]
+	>=dev-haskell/async-2.0:=[profile?]
+	>=dev-haskell/cereal-0.5.3:=[profile?]
+	dev-haskell/crypton:=[profile?]
+	>=dev-haskell/crypton-x509-1.7.5:=[profile?]
+	>=dev-haskell/crypton-x509-store-1.6:=[profile?]
+	>=dev-haskell/crypton-x509-validation-1.6.5:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/memory-0.14.6:=[profile?]
+	dev-haskell/unix-time:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/hourglass
+		dev-haskell/quickcheck
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag compat compat) \
+		--flag=-hans \
+		$(cabal_flag network network)
+}
diff --git a/dev-haskell/toml-parser/Manifest b/dev-haskell/toml-parser/Manifest
new file mode 100644
index 000000000000..12ea09ab750d
--- /dev/null
+++ b/dev-haskell/toml-parser/Manifest
@@ -0,0 +1 @@
+DIST toml-parser-1.3.0.0.tar.gz 39211 BLAKE2B cb5a1504ddd9ec96039b00da5424b8cd2467336f7d9d9c1874633a8b3bf2a0c87d919d5ab7d6f45284dc4dce3ce98bc1e8b202ae1f8a7afc3df1e54ef2aff398 SHA512 95bed0702a8d00289063782a4387e43a1bbc4096a89311281451a4d88813040869740e8d57fb7de3c317256a7cdd7a53cd75b11dc96d599a7242ab0d14cecce8
diff --git a/dev-haskell/toml-parser/metadata.xml b/dev-haskell/toml-parser/metadata.xml
new file mode 100644
index 000000000000..a6bfd3e5edcf
--- /dev/null
+++ b/dev-haskell/toml-parser/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">toml-parser</remote-id>
+		<remote-id type="github">glguy/toml-parser</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/toml-parser/toml-parser-1.3.0.0.ebuild b/dev-haskell/toml-parser/toml-parser-1.3.0.0.ebuild
new file mode 100644
index 000000000000..f267f824e12f
--- /dev/null
+++ b/dev-haskell/toml-parser/toml-parser-1.3.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+DESCRIPTION="TOML 1.0.0 parser"
+HOMEPAGE="https://hackage.haskell.org/package/toml-parser"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # build log: 'ghc: could not execute: markdown-unlit'
+
+RDEPEND=">=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-1.8:=[profile?]
+	>=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-3:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/alex-3.2
+	>=dev-haskell/cabal-3.2.0.0
+	>=dev-haskell/happy-1.19
+"
+#	test? ( || ( ( >=dev-haskell/hspec-2.10 <dev-haskell/hspec-2.11 )
+#			( >=dev-haskell/hspec-2.11 <dev-haskell/hspec-2.12 ) ) )
+#"
diff --git a/dev-haskell/top/Manifest b/dev-haskell/top/Manifest
deleted file mode 100644
index 1fc7496525c5..000000000000
--- a/dev-haskell/top/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Top-1.7.tar.gz 70721 BLAKE2B 90ddda99ab4dac209712494c28e15e90ffd2996151ab7df0a57fb8162bec09da6b28fd52b36672e081d10fa0b79d25bb2da2fd58d220573cea006d70c61229f0 SHA512 90d5f1042c07101c35bc1722c18667f551fa4d9034e70a4b7466ff25906899053a054f1227fed8d6d534d04fe9a1c2420585143cde44badfe98e08bf9a6225b4
diff --git a/dev-haskell/top/files/top-1.7-ghc-7.10.patch b/dev-haskell/top/files/top-1.7-ghc-7.10.patch
deleted file mode 100644
index 3acbda19e171..000000000000
--- a/dev-haskell/top/files/top-1.7-ghc-7.10.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs b/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs
-index 2cc5210..faf4c8c 100644
---- a/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs
-+++ b/src/Top/Implementation/TypeGraph/DefaultHeuristics.hs
-@@ -1,2 +1,3 @@
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- | License      :  GPL
-diff --git a/src/Top/Monad/Select.hs b/src/Top/Monad/Select.hs
-index e5953cb..72276b4 100644
---- a/src/Top/Monad/Select.hs
-+++ b/src/Top/Monad/Select.hs
-@@ -16,4 +16,6 @@ module Top.Monad.Select
- import Top.Util.Embedding
- import Control.Monad.State
-+import Control.Monad
-+import Control.Applicative
- 
- --------------------------------------------------------
-@@ -22,4 +24,11 @@ import Control.Monad.State
- newtype Select t m a = Select (m a)
- 
-+instance Monad m => Functor (Select t m) where
-+    fmap  = liftM
-+
-+instance Monad m => Applicative (Select t m) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad m => Monad (Select t m) where
-    return a       = Select (return a) 
-@@ -43,4 +52,11 @@ select = Select
- data SelectFix (t :: (* -> *) -> *) (m :: * -> *) a = SelectFix (m a)
- 
-+instance Monad m => Functor (SelectFix t m) where
-+    fmap  = liftM
-+
-+instance Monad m => Applicative (SelectFix t m) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad m => Monad (SelectFix t m) where
-    return a          = SelectFix (return a)
-diff --git a/src/Top/Monad/StateFix.hs b/src/Top/Monad/StateFix.hs
-index d77919d..bd8fb76 100644
---- a/src/Top/Monad/StateFix.hs
-+++ b/src/Top/Monad/StateFix.hs
-@@ -16,4 +16,6 @@ import Control.Monad.State
- import Control.Monad.Identity
- import Control.Monad.Writer
-+import Control.Monad
-+import Control.Applicative
- 
- type StateFix s = StateFixT s Identity
-@@ -21,4 +23,11 @@ type StateFix s = StateFixT s Identity
- data StateFixT s m a = Fix { unFix :: StateT (s (StateFixT s m)) m a }
- 
-+instance Monad m => Functor (StateFixT s m) where
-+    fmap  = liftM
-+
-+instance Monad m => Applicative (StateFixT s m) where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad m => Monad (StateFixT s m) where 
-    return  = Fix . return
diff --git a/dev-haskell/top/files/top-1.7-ghc84.patch b/dev-haskell/top/files/top-1.7-ghc84.patch
deleted file mode 100644
index 58ed02d3ff2a..000000000000
--- a/dev-haskell/top/files/top-1.7-ghc84.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/Top/Solver.hs
-+++ b/src/Top/Solver.hs
-@@ -26,2 +26,3 @@ import Top.Constraint.Information
- import Control.Monad.Writer
-+import qualified Data.Semigroup as S
- 
-@@ -170,2 +171,5 @@ evalBasicMonad = runWriter . flip evalStateFixT empty
- 
-+instance S.Semigroup LogEntries where
-+   (<>) (LogEntries f) (LogEntries g) = LogEntries (f . g)
-+
- instance Monoid LogEntries where
diff --git a/dev-haskell/top/metadata.xml b/dev-haskell/top/metadata.xml
deleted file mode 100644
index 20445cc8ffae..000000000000
--- a/dev-haskell/top/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		At its most general, Top is a framework for constructing abstract interpretations
-		which focuses on giving good feedback on why an abstract interpretation does not give
-		any useful information. In a mathematical notation this is usually made explicit by
-		returning the top element of a (complete) lattice. This is also one of the reasons
-		for the name of the project.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/top/top-1.7.ebuild b/dev-haskell/top/top-1.7.ebuild
deleted file mode 100644
index f3d825ce4f66..000000000000
--- a/dev-haskell/top/top-1.7.ebuild
+++ /dev/null
@@ -1,36 +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.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-MY_PN="Top"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Constraint solving framework employed by the Helium Compiler"
-HOMEPAGE="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.1.0
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ghc-7.10.patch
-	"${FILESDIR}"/${P}-ghc84.patch
-)
diff --git a/dev-haskell/torrent/Manifest b/dev-haskell/torrent/Manifest
index 626368fc6866..a4ba3610a411 100644
--- a/dev-haskell/torrent/Manifest
+++ b/dev-haskell/torrent/Manifest
@@ -1,3 +1 @@
-DIST torrent-10000.0.0.tar.gz 3549 BLAKE2B 414547b6cd8a090a8da198dd82122fcdfe87af4db59ff06f558461550ee6c041de7f69758bae184961ff8772ccbd17523a8c0fa4dc6f6729db1293da90ee1c9a SHA512 361f7ca99196278dccdf4ac20dbe5d9861fd979ea1c84786a93928cc46e51f949618e34e55342f08e19ce935a8313526c580fed6413209a6365efc306b5165d5
-DIST torrent-10000.0.1.tar.gz 3819 BLAKE2B f2a1569c697bbd732fe4f801ff797e2cea6efa69bbd08779f36d729496dd1cd6ccc0d55dd2fca40a6c07f0e1b577213a93f13a1a2b92f9b90030037af5de481e SHA512 66b69a0bb2b7dc08fb738c60bf6402ad69a5e60c6ccc1002e9d394c9faf75e49f444ed690dd3d17c1de978d1ac85ac48f03b6dda143445019c698db83dea3fcb
 DIST torrent-10000.1.1.tar.gz 3977 BLAKE2B c1c487d6ef2d9da68cf3bbe24097824cd56a53276e8577a3dd28f949b818b8c396ce8d65eb721a3f9035969121ba4df9ca13a6f26ef085607f8b5e30d5ff1560 SHA512 db4c18ca8df4fd32c45d6fc01333a5ef083136dfd5833f13300161ca393b6f3ebb2a8ca2b2f7e2bbf7019eb9484e0b3b067677a63fd41311e3dc7a17111f5a6c
diff --git a/dev-haskell/torrent/metadata.xml b/dev-haskell/torrent/metadata.xml
index 93afc894883d..937381521944 100644
--- a/dev-haskell/torrent/metadata.xml
+++ b/dev-haskell/torrent/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		BitTorrent file parser and generater
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/torrent/torrent-10000.0.0.ebuild b/dev-haskell/torrent/torrent-10000.0.0.ebuild
deleted file mode 100644
index 6c485d6ac37b..000000000000
--- a/dev-haskell/torrent/torrent-10000.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="BitTorrent file parser and generater"
-HOMEPAGE="https://hackage.haskell.org/package/torrent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bencode-0.2:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/torrent/torrent-10000.0.1.ebuild b/dev-haskell/torrent/torrent-10000.0.1.ebuild
deleted file mode 100644
index 88bc0b6c8a04..000000000000
--- a/dev-haskell/torrent/torrent-10000.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="BitTorrent file parser and generater"
-HOMEPAGE="https://hackage.haskell.org/package/torrent"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bencode-0.2:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/torrent/torrent-10000.1.1.ebuild b/dev-haskell/torrent/torrent-10000.1.1.ebuild
index 391970bd8cdd..2d8bb505711f 100644
--- a/dev-haskell/torrent/torrent-10000.1.1.ebuild
+++ b/dev-haskell/torrent/torrent-10000.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.2.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/bencode-0.2:=[profile?]
diff --git a/dev-haskell/transformers-base/Manifest b/dev-haskell/transformers-base/Manifest
index f457b549ccd0..13068fdfbb39 100644
--- a/dev-haskell/transformers-base/Manifest
+++ b/dev-haskell/transformers-base/Manifest
@@ -1,2 +1,2 @@
-DIST transformers-base-0.4.4.tar.gz 2550 BLAKE2B 39bb717561d9cd44737787c6770fd3306726caf6fca50b74015f6b28b47ca330edcefbd3ab2f1131875b3d918d1df6d44890463119ada422fd84f735046c4cb5 SHA512 5dbcbb321c7dc07a70af426cf3426433e9000e94278449ecbea025b79ec14f49cd9c8c35ea56ffa2b18444798c088a9db05badc2c819739b6ddd583c04114ea5
 DIST transformers-base-0.4.5.2.tar.gz 2849 BLAKE2B 9e1f1aeb3ced732c4406e4636ded466bd2f26c253d80caf321441505d6ad24912f108d464b6d27b211a6ffc128ff6d85003162a9c4709574645754e97db94461 SHA512 5953d99fee3a02f825c096cf035a5ee825da17e154ca9847ddb215dee54a96a8b28af2b4adb639ef3548ea9aa8a2cb781563c7ffbb399bed5a35c056d03bcbd4
+DIST transformers-base-0.4.6.tar.gz 2902 BLAKE2B b03e7c4b4eaf41f07d2946324f2b062663b22f1ebdd65e9ff21b05d407b6958282ce02e5064e14fe7c53c3896355d8af1f17d5c845bf2bf2f1e0da139953feee SHA512 b056b01bd5b3d882cf08bc9977c518ed6231d7da529cee61f2f52de886da4b8ee57e4505c767f59205a75be755870254f7351358bfc2142170fb3f31f25d66b5
diff --git a/dev-haskell/transformers-base/metadata.xml b/dev-haskell/transformers-base/metadata.xml
index 64a0fc2d9473..c15107acbaa4 100644
--- a/dev-haskell/transformers-base/metadata.xml
+++ b/dev-haskell/transformers-base/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides a straightforward port of @monadLib@'s BaseM
-		typeclass to @transformers@.
-	</longdescription>
 	<use>
 		<flag name="orphaninstances">Build instances for orphan datatypes.</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">transformers-base</remote-id>
 		<remote-id type="github">mvv/transformers-base</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
deleted file mode 100644
index c5af30c488e6..000000000000
--- a/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift computations from the bottom of a transformer stack"
-HOMEPAGE="https://github.com/mvv/transformers-base"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+orphaninstances"
-
-RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/transformers-compat-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag orphaninstances orphaninstances)
-}
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
index 439235e06baf..40a6f8b70fbf 100644
--- a/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
+++ b/dev-haskell/transformers-base/transformers-base-0.4.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE="+orphaninstances"
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.6.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.6.ebuild
new file mode 100644
index 000000000000..da39d1d66a8b
--- /dev/null
+++ b/dev-haskell/transformers-base/transformers-base-0.4.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Lift computations from the bottom of a transformer stack"
+HOMEPAGE="https://github.com/mvv/transformers-base"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="+orphaninstances"
+
+RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.6.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	orphaninstances? ( >=dev-haskell/base-orphans-0.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag orphaninstances orphaninstances)
+}
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
index 6d23ac621250..60185e23f03c 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -1,5 +1,2 @@
-DIST transformers-compat-0.1.1.1.tar.gz 5221 BLAKE2B b8c050fb67bfe43529619bc14b6e035fb44626e276c36ba89d56a95fc4af91f887dd2612e21f668e9d36e4c8e231caa7144fb2555a7be2a35f79f554d61fc3fc SHA512 326873df4a316948d64ddbee351f0bf2855b5f2bac1913eed3ca490305363771fc031ff6cad1e6de5849ab375ace9364ffb18e56cb8a57f0406508377f521a54
-DIST transformers-compat-0.3.3.4.tar.gz 11143 BLAKE2B 3fd082d92945620acbe1cf043c73b9d22322581df782473a40b507260bd8c5eaaa6b475f9659863a2b922d4edff388d336946ff423cc9a99e934ec0a5a03d2ad SHA512 1f50ddeaec4ea2e17ec348194a6efcfab35c4b9d49f9eba9e70a0c1ebfdfd39387461c133fb99e6cdad234b7facae74fa73c99f604807d7f3ad7c31d0188d462
-DIST transformers-compat-0.4.0.4.tar.gz 12048 BLAKE2B a72513e0a5b482067ee912e467c29166bdebef75bf70cee9661b6f8e3a649cbdca57cd159483f4187e520425b46a8dd600e7f5b409705f67e851d9d11ec91c24 SHA512 5850fa8ed63684b3dc37897c22d1d32d7412374dcd892e42db7ed975d493fdc8e216630735813ed00203f83dcd17722484a6ec182ccffb6fc8794b4b82b6c951
-DIST transformers-compat-0.5.1.4.tar.gz 18574 BLAKE2B e08bbb9b6104a9e46b17478b156d4e5b9198ab9e93ecc1e0faec4402a8b403b19ee517bb81a1f4c0d8633ff6a74ec59470d6a27a3c3df947ee25ce11312a84a0 SHA512 7e4ff75cdae7afbf640b3ddbfc0a260be8bb3b06cdb1be803bfd7cdb333d289919164923ab4fcde4b270883548cce115643f908410ed394aec67efa389d5aeb2
-DIST transformers-compat-0.6.5.tar.gz 40421 BLAKE2B c3d4b55bef310f717cdf2069a4d8b58cc38ea037bbd982f21c11ddbfd3175689f681fed615f30f7026e826e90a0ee6bee51e7448ad2468a084ed00ad6311a643 SHA512 86ce6e81baf4e71cc4ac854066543a8777628ae67182e8059e582754608b279a053f7f98a539ec5cc07e1771d8173a6de6ebe5df4eee2b4c41278734774c3958
+DIST transformers-compat-0.6.6.tar.gz 41347 BLAKE2B e0d49ac7fdb035e6255f8124cf7a2e734bc9d36bcadded33e79e237603a5f9d1e4609fd50b673fc1f3353e20816a7c94a784bb0aa0feb3243c70151f8023d5b7 SHA512 1f34e40e17e7c19c889e58101f5ed6a019b5bb08be4c798a1f233158b27b6a2cd05b9260d2cf7065cd2bdfb4df4cbbda463abee69c4ba00b6f445392659e920d
+DIST transformers-compat-0.7.2.tar.gz 46485 BLAKE2B a0a26a91219e098f04fff32f2dfb5e860c4e62fc6d5111c9baaf7203ee19a19809a1b812721fcd110edf680be7665112a8e5e11e798f40e1912418f6a52c0b29 SHA512 9bcc4b5aebbc6ec0b05ac8499ec79102e766ae8c2c919343f7d20ebb451fedb3a00647dc0baff5e998dd0b67f1ffbe725a14e0abf299a6b2656c219f8330856e
diff --git a/dev-haskell/transformers-compat/metadata.xml b/dev-haskell/transformers-compat/metadata.xml
index 207a9e0eb759..c0d56bdf262d 100644
--- a/dev-haskell/transformers-compat/metadata.xml
+++ b/dev-haskell/transformers-compat/metadata.xml
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package includes backported versions of types that were added
-		to transformers in transformers 0.3 for users who need strict
-		transformers 0.2 compatibility to run on old versions of the
-		platform, but also need those types.
-		
-		Those users should be able to just depend on @transformers &gt;= 0.2@
-		and @transformers-compat@.
-		
-		Note: missing methods are not supplied
-		but this at least permits the types to be used.
-	</longdescription>
-	<use>
-		<flag name="three">Use transformers-0.3</flag>
-	</use>
 	<upstream>
+		<remote-id type="hackage">transformers-compat</remote-id>
 		<remote-id type="github">ekmett/transformers-compat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild
deleted file mode 100644
index 7218f3aa679a..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-		=dev-haskell/transformers-0.3*:=[profile?]
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild
deleted file mode 100644
index ee56569038bf..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -two
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="three"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	three? ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] )
-	!three? ( >=dev-haskell/transformers-0.4.1:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag three three) \
-		--flag=-two
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
deleted file mode 100644
index d2befc431ccb..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -two,+mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	local tf_arg=()
-
-	has_version '=dev-haskell/transformers-0.3*' && \
-		tf_arg+=(--flag=three)
-
-	has_version '=dev-haskell/transformers-0.4*' && \
-		tf_arg+=(--flag=-three)
-
-	haskell-cabal_src_configure \
-		--flag=mtl \
-		--flag=-two \
-		${tf_arg[@]}
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
deleted file mode 100644
index 94ceada31a79..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -two,+mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	local tf_arg=()
-
-	if has_version '=dev-haskell/transformers-0.3*'; then
-		tf_arg+=(--flag=three)
-	else
-		tf_arg+=(--flag=-three)
-	fi
-
-	haskell-cabal_src_configure \
-		--flag=mtl \
-		--flag=-two \
-		${tf_arg[@]}
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild
deleted file mode 100644
index 5ac53b6cbadc..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild
+++ /dev/null
@@ -1,66 +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.1.9999
-#hackport: flags: -two,+mtl,-generic-deriving"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local tf3_arg=()
-
-	if has_version '=dev-haskell/transformers-0.3*'; then
-		tf3_arg+=(--flag=three)
-	else
-		tf3_arg+=(--flag=-three)
-	fi
-
-	local tf4_arg=()
-
-	if has_version '=dev-haskell/transformers-0.4*'; then
-		tf4_arg+=(--flag=four)
-	else
-		tf4_arg+=(--flag=-four)
-	fi
-
-	local tf5_arg=()
-
-	if has_version '=dev-haskell/transformers-0.5*'; then
-		if has_version '>dev-haskell/transformers-0.5.3'; then
-			tf5_arg+=(--flag=-five)
-		else
-			tf5_arg+=(--flag=five)
-		fi
-	else
-		tf5_arg+=(--flag=-five)
-	fi
-
-	haskell-cabal_src_configure \
-		--flag=mtl \
-		--flag=-two \
-		${tf3_arg[@]} \
-		${tf4_arg[@]} \
-		${tf5_arg[@]}
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
new file mode 100644
index 000000000000..00d7d6e66cbe
--- /dev/null
+++ b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -two,+mtl,-generic-deriving
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="A small compatibility shim for the transformers library"
+HOMEPAGE="https://github.com/ekmett/transformers-compat/"
+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"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?]
+	>=dev-haskell/transformers-0.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+"
+
+src_configure() {
+	local tf3_arg=()
+
+	if has_version '=dev-haskell/transformers-0.3*'; then
+		tf3_arg+=(--flag=three)
+	else
+		tf3_arg+=(--flag=-three)
+	fi
+
+	local tf4_arg=()
+
+	if has_version '=dev-haskell/transformers-0.4*'; then
+		tf4_arg+=(--flag=four)
+	else
+		tf4_arg+=(--flag=-four)
+	fi
+
+	local tf5_arg=()
+
+	if has_version '=dev-haskell/transformers-0.5*'; then
+		if has_version '>dev-haskell/transformers-0.5.3'; then
+			tf5_arg+=(--flag=-five)
+		else
+			tf5_arg+=(--flag=five)
+		fi
+	else
+		tf5_arg+=(--flag=-five)
+	fi
+
+	haskell-cabal_src_configure \
+		--flag=-generic-deriving \
+		--flag=mtl \
+		--flag=-two \
+		${tf3_arg[@]} \
+		${tf4_arg[@]} \
+		${tf5_arg[@]}
+}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild
new file mode 100644
index 000000000000..36e1b3237168
--- /dev/null
+++ b/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -two,+mtl,-generic-deriving
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A small compatibility shim for the transformers library"
+HOMEPAGE="https://github.com/ekmett/transformers-compat/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-generic-deriving \
+		--flag=mtl \
+		--flag=-two
+}
diff --git a/dev-haskell/transformers/Manifest b/dev-haskell/transformers/Manifest
index f3162750df42..58cdde6443bd 100644
--- a/dev-haskell/transformers/Manifest
+++ b/dev-haskell/transformers/Manifest
@@ -1,6 +1 @@
-DIST transformers-0.3.0.0.tar.gz 20087 BLAKE2B f299971fcd23e6e41a8386371370490601b8736b66168885b0369679e023222fa828a9b03870b2de815a453177eb872ff587ac1792fc8d7a49a1fe84faccc443 SHA512 aa444d01ea2296f9a94908872f167f383b0299768b8599b7f488c1d7499b027a90ffd1ef56e250b474d7c547e0acd94ae91b1cc80cdbd4943b5dca2770e2ab93
-DIST transformers-0.4.1.0.tar.gz 27287 BLAKE2B 77ed52e3a8f8b9e2511044da19f3cb59c5398c0c36c380fa08bcd307aa6d094189342a1aae91eceee89de26e2926af523546ab35217c648382ba5e42d94f178a SHA512 bf6561e63e9e0108aa34d946f7e8ff4eb3b9a5539779dd064d27406d05997f038570b93fbbdd4bf7a1bbe9144c042ad5b89648896821e8c6527c619d02b074c3
-DIST transformers-0.4.2.0.tar.gz 27866 BLAKE2B 3501ef6fd01852e19f1e410f2990b8060f61e2dde4fe6f2bc3850344a08d97644e8f5a554ae2d0d8c4248d87331aecf7d0f66330811deb4ba1546065fb032433 SHA512 8b508731cbcbb3221ad6afa17b8ddb9b47db29bafe0fc4ee654538e20c2a0551394e8c7591f3b0abc01e02eaec271f44056629f0fbf26fb077c4499af1d6debf
-DIST transformers-0.4.3.0.tar.gz 28632 BLAKE2B 92cabcb654bb11854a3bffbb1262f5cd62eda1aff447157086a61ebc451ebf2fddec53b6a2cc058174f24f0f0e32df671d3717e30a542c8dc90cb87e327d990c SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780
-DIST transformers-0.5.2.0.tar.gz 34696 BLAKE2B 426a597c6a23358af72344b0809d9d6890ca8ec315344643853e2549efb47d80cf5008d99175b9352ac704c24a7fc02c4369901cd880190645e3fcd1a5213861 SHA512 4fcccab5cb3dce3430c64ff19705208a03ee993c872f7b2581b3c84d44a835f344f253d98cb371fbce4839b393eff67d95bf57e079fd75e347f1a37bc85c6c5b
 DIST transformers-0.5.6.2.tar.gz 42370 BLAKE2B 317c8f557e0e37503546323096a9e2c880dd9331708b80b3041d4caa325b1c863b147abb433c0cdc15b1650a7412cb8579d96a8f819a93223b8588bffb440d8d SHA512 f871a910a5c31af77a4b9711f01b5780b1f657bbce0fb37234c97b8245d8504c514950f9e8673a606405484ae175cdb84c0aee7a05df8712cea02299c652cdf8
diff --git a/dev-haskell/transformers/metadata.xml b/dev-haskell/transformers/metadata.xml
index 75455fdc5e9d..3b8937c54cfa 100644
--- a/dev-haskell/transformers/metadata.xml
+++ b/dev-haskell/transformers/metadata.xml
@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 	</maintainer>
-	<longdescription>
-		Haskell 98 part of a monad transformer library, inspired by the paper
-		\"Functional Programming with Overloading and Higher-Order Polymorphism\",
-		by Mark P Jones, in /Advanced School of Functional Programming/, 1995
-		(&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
-		
-		This part contains the monad transformer class, the concrete monad
-		transformers, operations and liftings.  It can be used on its own
-		in Haskell 98 code, or with the monad classes in the @monads-fd@ or
-		@monads-tf@ packages, which automatically lift operations introduced
-		by monad transformers through other transformers.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild b/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
deleted file mode 100644
index c7d83e23eaaa..000000000000
--- a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="7.8.1 7.8.2 7.8.3 7.8.3.20141119 7.8.4"
diff --git a/dev-haskell/transformers/transformers-0.4.1.0.ebuild b/dev-haskell/transformers/transformers-0.4.1.0.ebuild
deleted file mode 100644
index eec16954b099..000000000000
--- a/dev-haskell/transformers/transformers-0.4.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/transformers/transformers-0.4.2.0.ebuild b/dev-haskell/transformers/transformers-0.4.2.0.ebuild
deleted file mode 100644
index 414ae03b2fb9..000000000000
--- a/dev-haskell/transformers/transformers-0.4.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4-r1 PM:7.8.4-r2  PM:7.8.4-r3 PM:7.10.1_rc3 PM:7.10.1 7.11.2015*"
diff --git a/dev-haskell/transformers/transformers-0.4.3.0.ebuild b/dev-haskell/transformers/transformers-0.4.3.0.ebuild
deleted file mode 100644
index 08a8598a4077..000000000000
--- a/dev-haskell/transformers/transformers-0.4.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:7.8.4-r4 7.11.2015* PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3"
diff --git a/dev-haskell/transformers/transformers-0.5.2.0.ebuild b/dev-haskell/transformers/transformers-0.5.2.0.ebuild
deleted file mode 100644
index a02a4ea3db81..000000000000
--- a/dev-haskell/transformers/transformers-0.5.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-#keep in sync with ghc-8.0.2_rc2
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-CABAL_CORE_LIB_GHC_PV="PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2 PM:9999"
diff --git a/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild b/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild
new file mode 100644
index 000000000000..c8cfad0471af
--- /dev/null
+++ b/dev-haskell/transformers/transformers-0.5.6.2-r1.ebuild
@@ -0,0 +1,27 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Concrete functor and monad transformers"
+HOMEPAGE="https://hackage.haskell.org/package/transformers"
+
+LICENSE="BSD"
+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"
+
+RDEPEND="
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+"
+CABAL_CORE_LIB_GHC_PV="8.10.6 8.10.7 9.0.2 9.2.4 9.2.5 9.2.6 9.2.7 9.2.8 9.4.4 9.4.5"
diff --git a/dev-haskell/transformers/transformers-0.5.6.2.ebuild b/dev-haskell/transformers/transformers-0.5.6.2.ebuild
deleted file mode 100644
index f75a3f7a9ea6..000000000000
--- a/dev-haskell/transformers/transformers-0.5.6.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="https://hackage.haskell.org/package/transformers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-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:9999"
diff --git a/dev-haskell/tree-diff/Manifest b/dev-haskell/tree-diff/Manifest
index f091af93eab2..002d9d174793 100644
--- a/dev-haskell/tree-diff/Manifest
+++ b/dev-haskell/tree-diff/Manifest
@@ -1 +1,3 @@
-DIST tree-diff-0.1.tar.gz 21644 BLAKE2B 0cd1633970216a994100f852b0982d43b6f1d0dc1b0550e759009250e016d271c5358460ef3999267da597b4e58dd28c3094e0ba4f618ba5990e91740eb63881 SHA512 a4ee703e4b6a18055c7749020863a9571af4620dbb7ea05903693c752e10e3ffa4fee8da0dacc0e4bbf92173e34c9070251881597ca1cd9f7c8ed365e840563c
+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
diff --git a/dev-haskell/tree-diff/metadata.xml b/dev-haskell/tree-diff/metadata.xml
index 214ee1271465..98aeb21bca73 100644
--- a/dev-haskell/tree-diff/metadata.xml
+++ b/dev-haskell/tree-diff/metadata.xml
@@ -1,36 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Common diff algorithm works on list structures:
-		
-		@
-		diff :: Eq a =&gt; [a] -&gt; [a] -&gt; [Edit a]
-		@
-		
-		This package works on trees.
-		
-		@
-		treeDiff :: Eq a =&gt; Tree a -&gt; Tree a -&gt; Edit (EditTree a)
-		@
-		
-		This package also provides a way to diff arbitrary ADTs,
-		using @Generics@-derivable helpers.
-		
-		This package differs from &lt;http://hackage.haskell.org/package/gdiff gdiff&gt;,
-		in a two ways: @tree-diff@ doesn&#39;t have patch function,
-		and the &quot;edit-script&quot; is a tree itself, which is useful for pretty-printing.
-		
-		@
-		&gt;&gt;&gt; prettyEditExpr $ ediff (Foo 42 [True, False] &quot;old&quot;) (Foo 42 [False, False, True] &quot;new&quot;)
-		Foo
-		{fooBool = [-True, +False, False, +True],
-		fooInt = 42,
-		fooString = -&quot;old&quot; +&quot;new&quot;}
-		@
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">tree-diff</remote-id>
+		<remote-id type="github">phadej/tree-diff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tree-diff/tree-diff-0.1.ebuild b/dev-haskell/tree-diff/tree-diff-0.1.ebuild
deleted file mode 100644
index 36faec98079a..000000000000
--- a/dev-haskell/tree-diff/tree-diff-0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Diffing of (expression) trees"
-HOMEPAGE="https://github.com/phadej/tree-diff"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-1.4.0.0:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/ansi-terminal-0.8.1:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
-	>=dev-haskell/base-compat-0.9.3:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/generic-deriving-1.12.4:=[profile?] <dev-haskell/generic-deriving-1.14:=[profile?]
-	>=dev-haskell/generics-sop-0.3.1.0:=[profile?] <dev-haskell/generics-sop-0.6:=[profile?]
-	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/memotrie-0.6.8:=[profile?] <dev-haskell/memotrie-0.7:=[profile?]
-	>=dev-haskell/nats-1.1.2:=[profile?] <dev-haskell/nats-1.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.10.0.1:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
-	>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
-	>=dev-haskell/semigroups-0.18.5:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
-	>=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/void-0.7.3:=[profile?] <dev-haskell/void-0.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
-		>=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11
-		>=dev-haskell/trifecta-2.0 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'ansi-terminal         ^>=0.8.2 || ^>=0.9.1' 'ansi-terminal         >=0.8.2' \
-		'base        >=4.5      && <4.13' 'base        >=4.5' \
-		'time        ^>=1.4 || ^>=1.5.0.1 || ^>=1.6.0.1 || ^>=1.8.0.2' 'time        >=1.4' \
-		'base-compat           ^>=0.10.5' 'base-compat           >=0.10.5' \
-		'trifecta          ^>=2' 'trifecta          >=2'
-}
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
new file mode 100644
index 000000000000..a7aadab49bfa
--- /dev/null
+++ b/dev-haskell/tree-diff/tree-diff-0.2.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Diffing of (expression) trees"
+HOMEPAGE="https://github.com/haskellari/tree-diff"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.10:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?]
+	>=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
+	>=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:=[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?]
+	>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/aeson-1.5.6.0:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/base-compat
+		>=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
+		>=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11
+		>=dev-haskell/trifecta-2 <dev-haskell/trifecta-2.2
+		|| ( ( >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3 )
+			|| ( ( >=dev-haskell/tasty-1.3.1 <dev-haskell/tasty-1.4 )
+				( >=dev-haskell/tasty-1.4.2 <dev-haskell/tasty-1.5 ) ) ) )
+"
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
new file mode 100644
index 000000000000..8ea1fdbfe853
--- /dev/null
+++ b/dev-haskell/tree-diff/tree-diff-0.3.0.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Diffing of (expression) trees"
+HOMEPAGE="https://github.com/phadej/tree-diff"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+	>=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:=[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?]
+	>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	>=dev-haskell/aeson-1.4.6.0:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+	>=dev-haskell/ansi-terminal-0.10:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+	>=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-1.1:=[profile?]
+	<dev-haskell/base-compat-0.14:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/primitive-0.7.1.0:=[profile?] <dev-haskell/primitive-0.9:=[profile?]
+	>=dev-haskell/semialign-1.2.0.1:=[profile?] <dev-haskell/semialign-1.4:=[profile?]
+	>=dev-haskell/strict-0.4.0.1:=[profile?] <dev-haskell/strict-0.6:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.3:=[profile?]
+	>=dev-haskell/vector-0.12.0.0:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/ansi-terminal
+		dev-haskell/ansi-wl-pprint
+		dev-haskell/base-compat
+		dev-haskell/primitive
+		>=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
+		>=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11
+		>=dev-haskell/trifecta-2 <dev-haskell/trifecta-2.2
+		|| ( ( >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3 )
+			|| ( ( >=dev-haskell/tasty-1.3.1 <dev-haskell/tasty-1.4 )
+				( >=dev-haskell/tasty-1.4.2 <dev-haskell/tasty-1.5 ) ) ) )
+"
diff --git a/dev-haskell/trifecta/Manifest b/dev-haskell/trifecta/Manifest
index e2aef0f1696b..44f0dc641c54 100644
--- a/dev-haskell/trifecta/Manifest
+++ b/dev-haskell/trifecta/Manifest
@@ -1 +1,2 @@
-DIST trifecta-2.1.tar.gz 64406 BLAKE2B 31829c010ad48d9c506863138379d4694318235c3cea7f43ee46bdcb22fef4ccd9979990150486813a3b0f6297c34597888cd52e987f0fe8102882a217a85a7d SHA512 0929ee4a3d9a53c211b13a711814b4b6ea488ad40f373befdc7e8a479b2a95c4e97a19381873af54d377ff2af49782677fa2ea892ea69522c242e245debd3a25
+DIST trifecta-2.1.2.tar.gz 60393 BLAKE2B eeaa0fdb855b09f8aaea5ef9b1f4c2b465d8f07bc05ced926bfbbd43c256611336e7153edf7ad57853796d436930cf317fc9433462477ce37f5cc417b45f777d SHA512 33ee39932235d1963b44ce54a59c1b5f193db9f590f30ba272f4e10965582c3602f822328b7e6e98f09ff4d3e14a8e324375353246f3ff0815070a7d94916c2e
+DIST trifecta-2.1.3.tar.gz 60434 BLAKE2B 8b643e167e5e66ece6d38e5966a0d5494075ad6fd6a08d12c31009a2b6a9e62472b26ae9f2ac0190ba8035a9cc3a6992e847816f2c9c1c0e29a4c9cdb11116f7 SHA512 3794d521e3fc384b3e1cf1d2082270722271c1b6e8ed4802e834170c3e5df8236faf7b5eaf211c0b1215860b98fb0407563aeb77e5f052ad74f521f43a767e44
diff --git a/dev-haskell/trifecta/metadata.xml b/dev-haskell/trifecta/metadata.xml
index b7878815d80d..027d5925d891 100644
--- a/dev-haskell/trifecta/metadata.xml
+++ b/dev-haskell/trifecta/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">trifecta</remote-id>
+		<remote-id type="github">ekmett/trifecta</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/trifecta/trifecta-2.1.2.ebuild b/dev-haskell/trifecta/trifecta-2.1.2.ebuild
new file mode 100644
index 000000000000..584b17c65e6b
--- /dev/null
+++ b/dev-haskell/trifecta/trifecta-2.1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern parser combinator library with convenient diagnostics"
+HOMEPAGE="https://github.com/ekmett/trifecta/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.12:=[profile?]
+	>=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?]
+	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
+	>=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/lens-4.14:=[profile?] <dev-haskell/lens-6:=[profile?]
+	>=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?]
+	>=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-2:=[profile?]
+	>=dev-haskell/prettyprinter-ansi-terminal-1.1.2:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?]
+	>=dev-haskell/profunctors-5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/reducers-3.12.1:=[profile?] <dev-haskell/reducers-4:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/trifecta/trifecta-2.1.3.ebuild b/dev-haskell/trifecta/trifecta-2.1.3.ebuild
new file mode 100644
index 000000000000..49804c89384d
--- /dev/null
+++ b/dev-haskell/trifecta/trifecta-2.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A modern parser combinator library with convenient diagnostics"
+HOMEPAGE="https://github.com/ekmett/trifecta/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-1.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?]
+	>=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?]
+	>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
+	>=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/lens-4.14:=[profile?] <dev-haskell/lens-6:=[profile?]
+	>=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?]
+	>=dev-haskell/prettyprinter-1.7:=[profile?] <dev-haskell/prettyprinter-2:=[profile?]
+	>=dev-haskell/prettyprinter-ansi-terminal-1.1.2:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?]
+	>=dev-haskell/profunctors-5.2:=[profile?] <dev-haskell/profunctors-6:=[profile?]
+	>=dev-haskell/reducers-3.12.1:=[profile?] <dev-haskell/reducers-4:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/trifecta/trifecta-2.1.ebuild b/dev-haskell/trifecta/trifecta-2.1.ebuild
deleted file mode 100644
index f1145445332a..000000000000
--- a/dev-haskell/trifecta/trifecta-2.1.ebuild
+++ /dev/null
@@ -1,48 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A modern parser combinator library with convenient diagnostics"
-HOMEPAGE="https://github.com/ekmett/trifecta/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # broken on USE=doc
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6:=[profile?] <dev-haskell/ansi-terminal-0.11:=[profile?]
-	>=dev-haskell/blaze-builder-0.3.0.1:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
-	>=dev-haskell/charset-0.3.5.1:=[profile?] <dev-haskell/charset-1:=[profile?]
-	>=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/fingertree-0.1:=[profile?] <dev-haskell/fingertree-0.2:=[profile?]
-	>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/lens-4.0:=[profile?] <dev-haskell/lens-5:=[profile?]
-	>=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsers-0.12.1:=[profile?] <dev-haskell/parsers-1:=[profile?]
-	>=dev-haskell/prettyprinter-1.2:=[profile?] <dev-haskell/prettyprinter-2:=[profile?]
-	>=dev-haskell/prettyprinter-ansi-terminal-1.1:=[profile?] <dev-haskell/prettyprinter-ansi-terminal-2:=[profile?]
-	>=dev-haskell/profunctors-4.0:=[profile?] <dev-haskell/profunctors-6:=[profile?]
-	>=dev-haskell/reducers-3.10:=[profile?] <dev-haskell/reducers-4:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/type-equality/metadata.xml b/dev-haskell/type-equality/metadata.xml
index 5cf2771db560..1c5ebbe9daa9 100644
--- a/dev-haskell/type-equality/metadata.xml
+++ b/dev-haskell/type-equality/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -15,4 +15,7 @@
 		producing equality proofs, providing some form of
 		decidable equality on types.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">hesselink/type-equality</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/type-equality/type-equality-1.ebuild b/dev-haskell/type-equality/type-equality-1.ebuild
index c59698cbe1e1..b74e820629bd 100644
--- a/dev-haskell/type-equality/type-equality-1.ebuild
+++ b/dev-haskell/type-equality/type-equality-1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.3 && <4.14' 'base >=4.3'
-}
+CABAL_CHDEPS=(
+	'base >=4.3 && <4.14' 'base >=4.3'
+)
diff --git a/dev-haskell/typed-process/Manifest b/dev-haskell/typed-process/Manifest
index cd4d0143b3a0..2a158b0c3a82 100644
--- a/dev-haskell/typed-process/Manifest
+++ b/dev-haskell/typed-process/Manifest
@@ -1 +1,2 @@
+DIST typed-process-0.2.10.1.tar.gz 18264 BLAKE2B eef9769f018bd8702656b6d151fa1148b1991ca9d877b507542327881576dd5297ebac0d8b86d9f305d734e3f07413a7a23f8160752b34d896e2386026347aad SHA512 07ab11cc1554aeaf8980df5fbe105de71282424365be9e26e94b7cbad344d3d0d9d54fc492615e32ec0e6d3064a72c7996be03e7fbb81136df366511d7bd606d
 DIST typed-process-0.2.6.0.tar.gz 17363 BLAKE2B 033c1da191fcf10ca36b1215303793d26b3435e7241ee07e4c3389a9892be496779f70ae62b6bbad7f07704866473e16d4f15bfb6f22efa41243cba6ad72e941 SHA512 a40b8db4ef2179273943a3aab0200891bd3dffe584bcd51037ddf9cebae88d4d95292883a745a0c31900c7bf2eebe2c71175fbb86dc470b60660b443f8b1e3e0
diff --git a/dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch b/dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch
new file mode 100644
index 000000000000..fca0ea238d4c
--- /dev/null
+++ b/dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch
@@ -0,0 +1,62 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Bug: https://github.com/fpco/typed-process/pull/60
+
+This flag will toggle the use of some ghc-options in the typed-process-test
+test suite. It is set to default: True.
+
+This is needed for tests to run on some GHC builds which do not support SMP.
+
+diff -urN typed-process-0.2.10.1/typed-process.cabal typed-process-0.2.10.1-r1/typed-process.cabal
+--- typed-process-0.2.10.1/typed-process.cabal	2022-10-28 09:12:23.834918081 -0600
++++ typed-process-0.2.10.1-r1/typed-process.cabal	2022-10-28 09:12:42.724917857 -0600
+@@ -1,6 +1,6 @@
+ cabal-version: 1.12
+ 
+--- This file has been generated from package.yaml by hpack version 0.34.4.
++-- This file has been generated from package.yaml by hpack version 0.35.0.
+ --
+ -- see: https://github.com/sol/hpack
+ 
+@@ -24,6 +24,11 @@
+   type: git
+   location: https://github.com/fpco/typed-process
+ 
++flag smp
++  description: Use flags that depend on GHC supporting a multicore runtime (tests only)
++  manual: True
++  default: True
++
+ library
+   exposed-modules:
+       System.Process.Typed
+@@ -40,9 +45,9 @@
+     , stm
+     , transformers
+     , unliftio-core
++  default-language: Haskell2010
+   if os(windows)
+     cpp-options: -DWINDOWS
+-  default-language: Haskell2010
+ 
+ test-suite typed-process-test
+   type: exitcode-stdio-1.0
+@@ -52,7 +57,6 @@
+       Paths_typed_process
+   hs-source-dirs:
+       test
+-  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+   build-depends:
+       async >=2.0
+     , base >=4.12 && <5
+@@ -66,6 +70,10 @@
+     , typed-process
+     , unliftio-core
+   default-language: Haskell2010
++  if flag(smp)
++    ghc-options: -threaded -rtsopts -with-rtsopts=-N
++  else
++    ghc-options: -threaded
+ 
+ test-suite typed-process-test-single-threaded
+   type: exitcode-stdio-1.0
diff --git a/dev-haskell/typed-process/metadata.xml b/dev-haskell/typed-process/metadata.xml
index b7878815d80d..c387243a2d03 100644
--- a/dev-haskell/typed-process/metadata.xml
+++ b/dev-haskell/typed-process/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">typed-process</remote-id>
+		<remote-id type="github">fpco/typed-process</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild b/dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild
new file mode 100644
index 000000000000..3f70890a31fa
--- /dev/null
+++ b/dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild
@@ -0,0 +1,44 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="Run external processes, with strong typing of streams"
+HOMEPAGE="https://github.com/fpco/typed-process"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.10.1-smp-flag.patch"
+)
+
+RDEPEND="
+	>=dev-haskell/async-2.0:=[profile?]
+	dev-haskell/stm:=[profile?]
+	dev-haskell/unliftio-core:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? ( dev-haskell/base64-bytestring
+		dev-haskell/hspec
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	if ghc-supports-smp; then
+		local smp_flag=smp
+	else
+		local smp_flag=-smp
+	fi
+
+	haskell-cabal_src_configure \
+		--flag="${smp_flag}"
+}
diff --git a/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild b/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild
index c4120a966f73..0a8ace7c48a5 100644
--- a/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild
+++ b/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.9999
 
@@ -9,12 +9,12 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Run external processes, with strong typing of streams"
-HOMEPAGE="https://haskell-lang.org/library/typed-process"
+HOMEPAGE="https://github.com/fpco/typed-process"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/typst-symbols/Manifest b/dev-haskell/typst-symbols/Manifest
new file mode 100644
index 000000000000..5c88f7f1c628
--- /dev/null
+++ b/dev-haskell/typst-symbols/Manifest
@@ -0,0 +1 @@
+DIST typst-symbols-0.1.4.tar.gz 18688 BLAKE2B ffe4ed61ea5e71747f874622605011fd9d53d3bb4c04de8efb86cfdee970fb88f65e9c03775c49a340d0b146195913219c306b8d958356640692eb63b016fb5f SHA512 917e10b768751b50253f693726b49a27ee2cd8879f654aaac461df9a894d25ecd132a73cc6289a8684cd5dca982b65033757c1538e144413f2ddd3135f90db3e
diff --git a/dev-haskell/typst-symbols/metadata.xml b/dev-haskell/typst-symbols/metadata.xml
new file mode 100644
index 000000000000..f7247eb2f66d
--- /dev/null
+++ b/dev-haskell/typst-symbols/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">typst-symbols</remote-id>
+		<remote-id type="github">jgm/typst-symbols</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/typst-symbols/typst-symbols-0.1.4.ebuild b/dev-haskell/typst-symbols/typst-symbols-0.1.4.ebuild
new file mode 100644
index 000000000000..94f3ac9714ab
--- /dev/null
+++ b/dev-haskell/typst-symbols/typst-symbols-0.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Symbol and emoji lookup for typst language"
+HOMEPAGE="https://github.com/jgm/typst-symbols"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/typst/Manifest b/dev-haskell/typst/Manifest
new file mode 100644
index 000000000000..1f2ef09a5710
--- /dev/null
+++ b/dev-haskell/typst/Manifest
@@ -0,0 +1 @@
+DIST typst-0.3.2.0.tar.gz 6421514 BLAKE2B 622f49edd8fb362a07c2a81a59f227c82228bbf09b4708d2dc119deda66cb028838546f826e9729f350cb1ae20399e319b71fcdbd5707951e821b60c76e11a3b SHA512 1bb5dd8158c528d52c2411c3acb2ada2061ce5ef27eb387135e61140232815b15f5d3aaee3264ef3a11a09d8f4d10dfd3d246836f77d018ee0fcce8d37d3ccd5
diff --git a/dev-haskell/typst/metadata.xml b/dev-haskell/typst/metadata.xml
new file mode 100644
index 000000000000..faf481d753d0
--- /dev/null
+++ b/dev-haskell/typst/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<use>
+		<flag name="executable">Compile executable to be used in testing and development.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">typst</remote-id>
+		<remote-id type="github">jgm/typst-hs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/typst/typst-0.3.2.0.ebuild b/dev-haskell/typst/typst-0.3.2.0.ebuild
new file mode 100644
index 000000000000..8ac27b1ee400
--- /dev/null
+++ b/dev-haskell/typst/typst-0.3.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing and evaluating typst syntax"
+HOMEPAGE="https://hackage.haskell.org/package/typst"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RESTRICT=test # one test case fails
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/cassava:=[profile?]
+	dev-haskell/digits:=[profile?]
+	dev-haskell/ordered-containers:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	dev-haskell/scientific:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/toml-parser-1.3.0.0:=[profile?] <dev-haskell/toml-parser-1.4:=[profile?]
+	>=dev-haskell/typst-symbols-0.1.4:=[profile?] <dev-haskell/typst-symbols-0.1.5:=[profile?]
+	dev-haskell/vector:=[profile?]
+	dev-haskell/xml-conduit:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+	executable? ( dev-haskell/pretty-show:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-golden
+		!executable? ( dev-haskell/pretty-show ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/uhc-light/Manifest b/dev-haskell/uhc-light/Manifest
deleted file mode 100644
index d41eee427173..000000000000
--- a/dev-haskell/uhc-light/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uhc-light-1.1.9.5.tar.gz 4546645 BLAKE2B df1d0303af2ca9b59d508582a90a490204cb6dca4c5431e130c3551017d2c066b7fe93ee323ce765f6cededa77563de4dbf29a740e15e42193383fa9928a9cd5 SHA512 1d31cf2be92689dc0fd989db158623ba36455f33dad70905063cd0849e65cd3f2b78d29a6ed7a943a371e14afc45c95dc552c5a6c64109b192b9ca57cacc7fea
diff --git a/dev-haskell/uhc-light/metadata.xml b/dev-haskell/uhc-light/metadata.xml
deleted file mode 100644
index cd3392e2775f..000000000000
--- a/dev-haskell/uhc-light/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A 'light' variant of UHC including only an API and executables for compiling to Core representation (uhcl) and running CoreRun (uhcr). This version is just to test the infrastructure. Later versions will provide a fleshing out of the API and completion of the now rudimentary platform independent (Haskell) interpreted running etc..
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UU-ComputerScience/uhc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild b/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild
deleted file mode 100644
index ba85c126fd10..000000000000
--- a/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile" # broken markup: haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Part of UHC packaged as cabal/hackage installable library"
-HOMEPAGE="https://github.com/UU-ComputerScience/uhc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/fgl:=[profile?]
-	>=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/uulib-0.9.19:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/uhc-util/Manifest b/dev-haskell/uhc-util/Manifest
deleted file mode 100644
index 17e315af6992..000000000000
--- a/dev-haskell/uhc-util/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uhc-util-0.1.6.7.tar.gz 113857 BLAKE2B 3115383b3951c9dbe38dfb17248c59ef0f1af4857c9479e1164c7a64983748b2e937fb7669e70fa7c0369653e038cc739d4aaf50e7552d8e91e7a3af912f7a8b SHA512 02c8ce0af2aa19f2f9870aa03822860ec6285028867c5e0d7e28fc8bc3ec57cc308d428c8a48c7aa8c78301ac68d9e0ace0721eb35d91c5ae6caf3661236efad
diff --git a/dev-haskell/uhc-util/metadata.xml b/dev-haskell/uhc-util/metadata.xml
deleted file mode 100644
index 46a18af5a380..000000000000
--- a/dev-haskell/uhc-util/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		General purpose utilities for UHC and related tools
-	</longdescription>
-	<upstream>
-		<remote-id type="github">UU-ComputerScience/uhc-util</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild b/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild
deleted file mode 100644
index 1a84fd58be83..000000000000
--- a/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="UHC utilities"
-HOMEPAGE="https://github.com/UU-ComputerScience/uhc-util"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/fclabels-2.0.3:=[profile?]
-	>=dev-haskell/fgl-5.4:=[profile?]
-	>=dev-haskell/hashable-1.2.4:=[profile?]
-	>=dev-haskell/logict-state-0.1.0.2:=[profile?]
-	>=dev-haskell/mtl-2:=[profile?]
-	>=dev-haskell/pqueue-1.3.1:=[profile?]
-	>=dev-haskell/time-compat-0.1.0.1:=[profile?]
-	>=dev-haskell/uulib-0.9.19:=[profile?]
-	>=dev-lang/ghc-7.10.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.4.0
-"
diff --git a/dev-haskell/unbounded-delays/Manifest b/dev-haskell/unbounded-delays/Manifest
index 8b518dcca06f..c5907e424d62 100644
--- a/dev-haskell/unbounded-delays/Manifest
+++ b/dev-haskell/unbounded-delays/Manifest
@@ -1,2 +1,2 @@
-DIST unbounded-delays-0.1.0.9.tar.gz 4199 BLAKE2B 92d31c926c202f8bfe4323433ad365de57e507712b81ea65a3780c0b1321a739b72e24546e93770830996b970cb082098f2f3ac7556b5f20719a54856ae48704 SHA512 808d45b3123cc68ab1021f44b90c8a8f803ff8fa933c8e93cc241ba10e8b960281d96403ccd85b5f9af382becc9a05817c0de12ec483fa3e813c2ca78266b592
 DIST unbounded-delays-0.1.1.0.tar.gz 4166 BLAKE2B 158b05e35afd4c2b8f33caeea748466ee8cb6348f4505649c442f76777b41326128b84b8b7559e06d031c1486886e99e95bf69ac7e80eb16ec1c17cc5b5354e3 SHA512 70e26055abe40b38e20bc5dadc3ae32b699613698d0fc36bbd519fe011128fbdda7e963a69f25375b4e8a26b2ebfa2cdd4496d9d045e9f19672224654e5e7948
+DIST unbounded-delays-0.1.1.1.tar.gz 4114 BLAKE2B 97ffa71675906f9eef6ae297369f9668273ffcb4cc8d9d7efb43b152b5abbeae888ca67e1f77568636feeb3eb4d1bd8549a1446a4f56c7db5ef5570a43da7c57 SHA512 7439c8976498bd84e966b7e08e8d868d65debe3ffc7fd77dc6de345258b4532f2203415abf9530fdaa5feba0bfdc1031303b343502d1f3dc401058125babd41b
diff --git a/dev-haskell/unbounded-delays/metadata.xml b/dev-haskell/unbounded-delays/metadata.xml
index 4a5fd6aa060d..4bcd2e1d33cd 100644
--- a/dev-haskell/unbounded-delays/metadata.xml
+++ b/dev-haskell/unbounded-delays/metadata.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The @threadDelay@ and @timeout@ functions from the @base@ library
-		use the bounded @Int@ type for specifying the delay or timeout
-		period. This packages provides alternatives which use the
-		unbounded @Integer@ type.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">basvandijk/unbounded-delays</remote-id>
 	</upstream>
diff --git a/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild b/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild
deleted file mode 100644
index a83b309bd2b7..000000000000
--- a/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Unbounded thread delays and timeouts"
-HOMEPAGE="https://github.com/basvandijk/unbounded-delays"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
index 68645ff0c7fa..8862c17a68b9 100644
--- a/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
+++ b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.2.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.1.ebuild b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.1.ebuild
new file mode 100644
index 000000000000..5a8fc9f85dd2
--- /dev/null
+++ b/dev-haskell/unbounded-delays/unbounded-delays-0.1.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Unbounded thread delays and timeouts"
+HOMEPAGE="https://github.com/basvandijk/unbounded-delays"
+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:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/unexceptionalio/Manifest b/dev-haskell/unexceptionalio/Manifest
deleted file mode 100644
index 7965a8a3ff51..000000000000
--- a/dev-haskell/unexceptionalio/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST unexceptionalio-0.3.0.tar.gz 2335 BLAKE2B e2d3a7f63dece9631bcbe602d2f8c06b151d103f85ad3bb84de869b3194f20e2f8483523f15a828a8526af856fce53d7fa6f669c2a659c957b7ccca10466c878 SHA512 be6479cfdb39707473e07639b3a35c4e178571ec2b45a356e278c9bb20710775fe26c086239aa65c2d5f201730df223b5ca3e42ea61e1ffb9a285f384e62f4b6
-DIST unexceptionalio-0.5.1.tar.gz 5635 BLAKE2B 4a4190a32a306dd8406639d24e9cad2abbd93ad9e59d3ce2dc4c370386915bc366ff42ce3d6179f02a9d0523702fb283af07b6182cedf0c9106195e54d17fb76 SHA512 62c42e5c683cd05505971602fe4e64a50b5949d9540acefd8d4d66ec0bf57075cdb8e35e99f7e7c4b4fdf589b2af47aa31c0cd62d518b4ded5fc5f9f382008ba
diff --git a/dev-haskell/unexceptionalio/metadata.xml b/dev-haskell/unexceptionalio/metadata.xml
deleted file mode 100644
index 7e8b34c0ddcc..000000000000
--- a/dev-haskell/unexceptionalio/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		When you've caught all the exceptions that can be handled safely,
-		this is what you're left with.
-		
-		It is intended that you use qualified imports with this library.
-		
-		&gt; import UnexceptionalIO (UIO)
-		&gt; import qualified UnexceptionalIO as UIO
-	</longdescription>
-	<upstream>
-		<remote-id type="github">singpolyma/unexceptionalio</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/unexceptionalio/unexceptionalio-0.3.0.ebuild b/dev-haskell/unexceptionalio/unexceptionalio-0.3.0.ebuild
deleted file mode 100644
index 6b56b7036916..000000000000
--- a/dev-haskell/unexceptionalio/unexceptionalio-0.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="IO without any non-error, synchronous exceptions"
-HOMEPAGE="https://github.com/singpolyma/unexceptionalio"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/unexceptionalio/unexceptionalio-0.5.1.ebuild b/dev-haskell/unexceptionalio/unexceptionalio-0.5.1.ebuild
deleted file mode 100644
index 9c43479777a8..000000000000
--- a/dev-haskell/unexceptionalio/unexceptionalio-0.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="IO without any non-error, synchronous exceptions"
-HOMEPAGE="https://github.com/singpolyma/unexceptionalio"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
diff --git a/dev-haskell/unicode-collation/Manifest b/dev-haskell/unicode-collation/Manifest
new file mode 100644
index 000000000000..e5b667df1be1
--- /dev/null
+++ b/dev-haskell/unicode-collation/Manifest
@@ -0,0 +1,2 @@
+DIST unicode-collation-0.1.3.3.tar.gz 2056081 BLAKE2B 1b5d58b852ff457b4c794d6e8c87c0539a5987240c2cdb8329fbb00b792be1105c194b55a10b5abd9c59eac7262194065d460a18e994edd2d7f71f535acb4f41 SHA512 bbb8fb3d52fa4906ddb92fb605f49b4c726cfcffd1f950c8a78bc495594a2e7d85fa78e2009da850f0218fce09a57f829ce0f3d6a6000b9b6484754f8c8260e8
+DIST unicode-collation-0.1.3.4.tar.gz 2056084 BLAKE2B e960e740aacd61dfde76fd1ea6da0e50319f91a5b9ea97d3ab95514bf13fd35957ed1b9d3883b980e488d1ef19fce2efda83aad68bc9cd83c5de9d6f3c23519f SHA512 88017dd6d8a96b4248fe993385bad8a5fbe134bdaab05b1f8956bc53c8abba927e22233eed6e3a1760c5cee928a9b2fc74bdb5c0c2c7be7e98bda0049852aec0
diff --git a/dev-haskell/unicode-collation/metadata.xml b/dev-haskell/unicode-collation/metadata.xml
new file mode 100644
index 000000000000..dc3a9336a589
--- /dev/null
+++ b/dev-haskell/unicode-collation/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+	<use>
+		<flag name="doctests">Run doctests as part of test suite.
+Use with: @--write-ghc-environment-files=always@.</flag>
+		<flag name="executable">Build the unicode-collate executable.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">unicode-collation</remote-id>
+		<remote-id type="github">jgm/unicode-collation</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild b/dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild
new file mode 100644
index 000000000000..dcaaa9e2cc75
--- /dev/null
+++ b/dev-haskell/unicode-collation/unicode-collation-0.1.3.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell implementation of the Unicode Collation Algorithm"
+HOMEPAGE="https://github.com/jgm/unicode-collation"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doctests executable"
+
+RDEPEND="dev-haskell/th-lift-instances:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+		>=dev-haskell/unicode-transforms-0.3.7.1
+		doctests? ( >=dev-haskell/doctest-0.8 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag doctests doctests) \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/unicode-collation/unicode-collation-0.1.3.4.ebuild b/dev-haskell/unicode-collation/unicode-collation-0.1.3.4.ebuild
new file mode 100644
index 000000000000..de116d72f284
--- /dev/null
+++ b/dev-haskell/unicode-collation/unicode-collation-0.1.3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell implementation of the Unicode Collation Algorithm"
+HOMEPAGE="https://github.com/jgm/unicode-collation"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doctests executable"
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	dev-haskell/th-lift-instances:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+		>=dev-haskell/unicode-transforms-0.3.7.1
+		doctests? ( >=dev-haskell/doctest-0.8 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag doctests doctests) \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/unicode-data/Manifest b/dev-haskell/unicode-data/Manifest
new file mode 100644
index 000000000000..05be6db93b57
--- /dev/null
+++ b/dev-haskell/unicode-data/Manifest
@@ -0,0 +1,4 @@
+DIST unicode-data-0.3.0.cabal 5123 BLAKE2B 9166d0496d890a880d364aae56d48a0d1b6c474a708a8c59754f196f75d07278e8b27d8d0f1f68a6fdab475f039c4b7fa7ca35434efdeb891b016003ef4abb17 SHA512 45ca93bef8197394f5a04528169f269417a915ae550fd8c531826ae85707939666689a2fc33b954ce4cc053330f062fc123ffeae408790f9613181c14db1da05
+DIST unicode-data-0.3.0.tar.gz 142487 BLAKE2B 0e1dbe384957adb0ff53482fe65578a10d6753c3ab14e6e5aa5da60f5891fbe10ce4bd024f76ae5f213b53baef24c1ccf97a4a2cbd79de1595336db23fda64fc SHA512 6e96f9b93f8a37c8e17f6b20fbe5339fdfeeb75a9d0c6311b03e0bdc9a4a6aa87db6adbe2c3d7d4e7671635df1b32c5325d37815f48ae03ab3b27190a293896b
+DIST unicode-data-0.4.0.1-rev1.cabal 5624 BLAKE2B 3a094a77e3f60442b2cf0f3bb7945faee8b8115fa45dc313761b73e1700d3e55449f461efeddf41d7525d15432c496005c36091da6e7ba0e9340cca1558433cd SHA512 8c287812edbfa470fc610b765dba5e7600f6f3b0c0b5f748271226b946c25a9fb2e2a5564a55a126268fdaf447460334f0265987ea42b41dec348862c311659e
+DIST unicode-data-0.4.0.1.tar.gz 187381 BLAKE2B f59193571e7c6b0243c8df468f13f501a1114318af8cb7816b10aacbb4a1b0dc736c1ac763156c0c833eb17b85272bb15f147d4cd97254cfee3e16889743c9fb SHA512 ddbe70ccdb628673aa9276af3a59aa02c8038b3655fcf0bbf3b4d3db4bb92629d256512bb1ede2486f77138cda0a6595bbcd8e82f1dc57385c6a7b5e0edfae48
diff --git a/dev-haskell/unicode-data/metadata.xml b/dev-haskell/unicode-data/metadata.xml
new file mode 100644
index 000000000000..59edf12d1b34
--- /dev/null
+++ b/dev-haskell/unicode-data/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">unicode-data</remote-id>
+		<remote-id type="github">composewell/unicode-data</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild b/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild
new file mode 100644
index 000000000000..68e08acbb48b
--- /dev/null
+++ b/dev-haskell/unicode-data/unicode-data-0.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Access Unicode character database"
+HOMEPAGE="https://github.com/composewell/unicode-data"
+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="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-2.10 )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
diff --git a/dev-haskell/unicode-data/unicode-data-0.4.0.1.ebuild b/dev-haskell/unicode-data/unicode-data-0.4.0.1.ebuild
new file mode 100644
index 000000000000..c88802e6efc9
--- /dev/null
+++ b/dev-haskell/unicode-data/unicode-data-0.4.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Access Unicode Character Database (UCD)"
+HOMEPAGE="https://github.com/composewell/unicode-data"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-2.11 )
+"
diff --git a/dev-haskell/unicode-transforms/Manifest b/dev-haskell/unicode-transforms/Manifest
index e73f9d236689..b4f9361f82a0 100644
--- a/dev-haskell/unicode-transforms/Manifest
+++ b/dev-haskell/unicode-transforms/Manifest
@@ -1,2 +1,3 @@
-DIST unicode-transforms-0.2.1.tar.gz 714210 BLAKE2B b2ccc7273e9f37c990e48d06aaa83a353546b22722a575d1686de30bd5434ad8a24903fa5c9ddac1d3937c6f7b32b91fcd766666ed1c816ede322935626855c0 SHA512 9bdd7c6bb75ae6b71152371663e2c37a828574a782039f94059b3d68832680958749ab36df9eb4aca45a81d45ae91e791dc243b921dc24b4a8e8ad6337e6e082
-DIST unicode-transforms-0.3.6.tar.gz 722543 BLAKE2B afa61afa23387ce33f3ad56cd5c0123555f8f01d49e23965b8fa677dcd33de3346952091a2a44dc9570097e89bba075ff50d8f2edd7509ece50dc2f6bf607ca8 SHA512 f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b
+DIST unicode-transforms-0.3.7.1.tar.gz 717790 BLAKE2B aabdd2496ad686d203aa0d8f9c4d043e35c448b1cb83546858e487a6f0e6f05f2cd6467be8c0bedf1bac7fc0d45a711b7faa438c433b5a144ad2e7c3dc20df97 SHA512 a4e39b943bcea6c86ebb8df7253a39ecf2a7bf5a083d0cf2ee1e5720af4afe47111330a787353a5728793d02739448debae2fd73fe6ba2d0eb94cbbb4bfef30f
+DIST unicode-transforms-0.4.0.1-rev3.cabal 5923 BLAKE2B 40f63c4dbaa5f1b8a46b12ec4b07e766d394bc9b0b05ea441e8bd4d22c925e0299bed922f635a01b194d7f4b750ca0059dfca55c196655869a2ae8c025c76a70 SHA512 8f9b8cf6fe3a76a1940174cbb443e15bc63cf26cdce6e6eb0ef6d523d2dc99a65c708a48c7a90feac2b529c17c7a5ab2e2813f9fe603ab52581c5f8b353fb701
+DIST unicode-transforms-0.4.0.1.tar.gz 648836 BLAKE2B 46193776ed2e2f4cc20fe6304a4cf837b47d847d86869437efb4ffbbc06bec5d5b376ef4080676afdbb06c09b6d49dee10fc95f0597545ae4b531d56c42abacd SHA512 3d1347209d2b50fefac1b8bef3a4a82ab8e5f2addc361a338399225e37c933c1e5495f7a7c658c052d818dcc4bee20b48aa37c351fbfdaa926d98ae80f9dab14
diff --git a/dev-haskell/unicode-transforms/metadata.xml b/dev-haskell/unicode-transforms/metadata.xml
index 38ea7b682ea6..bd8630850590 100644
--- a/dev-haskell/unicode-transforms/metadata.xml
+++ b/dev-haskell/unicode-transforms/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Fast Unicode 8.0 normalization in Haskell (NFC, NFKC, NFD, NFKD).
-	</longdescription>
+	<upstream>
+		<remote-id type="github">composewell/unicode-transforms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild
deleted file mode 100644
index e8b83a75693f..000000000000
--- a/dev-haskell/unicode-transforms/unicode-transforms-0.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -dev,-has-icu,-has-llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode normalization"
-HOMEPAGE="https://github.com/harendra-kumar/unicode-transforms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?]
-	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
-		>=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev \
-		--flag=-has-icu \
-		--flag=-has-llvm
-}
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.3.6.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.3.6.ebuild
deleted file mode 100644
index 762415f3ac4d..000000000000
--- a/dev-haskell/unicode-transforms/unicode-transforms-0.3.6.ebuild
+++ /dev/null
@@ -1,37 +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.9999
-#hackport: flags: -dev,-has-icu,-has-llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unicode normalization"
-HOMEPAGE="https://github.com/harendra-kumar/unicode-transforms"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/bitarray-0.0.1:=[profile?] <dev-haskell/bitarray-0.1:=[profile?]
-	>=dev-haskell/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
-		>=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.14
-		>=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-dev \
-		--flag=-has-icu \
-		--flag=-has-llvm
-}
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild
new file mode 100644
index 000000000000..9da59741991d
--- /dev/null
+++ b/dev-haskell/unicode-transforms/unicode-transforms-0.3.7.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -dev,-has-icu,-has-llvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode normalization"
+HOMEPAGE="https://github.com/composewell/unicode-transforms"
+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/text-1.1.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2
+	test? ( >=dev-haskell/getopt-generics-0.11 <dev-haskell/getopt-generics-0.14
+		>=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/split-0.1 <dev-haskell/split-0.3 )
+"
+
+CABAL_CHDEPS=(
+	'ghc-prim >= 0.2 && < 0.7' 'ghc-prim >= 0.2'
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev \
+		--flag=-has-icu \
+		--flag=-has-llvm
+}
diff --git a/dev-haskell/unicode-transforms/unicode-transforms-0.4.0.1.ebuild b/dev-haskell/unicode-transforms/unicode-transforms-0.4.0.1.ebuild
new file mode 100644
index 000000000000..03b1d914b2d3
--- /dev/null
+++ b/dev-haskell/unicode-transforms/unicode-transforms-0.4.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2
+#hackport: flags: -dev,-has-icu,-has-llvm,-bench-show,-gauge
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="3"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode normalization"
+HOMEPAGE="https://github.com/composewell/unicode-transforms"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/unicode-data-0.2:=[profile?] <dev-haskell/unicode-data-0.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hspec-2.0 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2.1 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/split-0.2 <dev-haskell/split-0.3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-dev \
+		--flag=-has-icu \
+		--flag=-has-llvm \
+		--flag=-bench-show \
+		--flag=-gauge
+}
diff --git a/dev-haskell/uniplate/Manifest b/dev-haskell/uniplate/Manifest
index cb5afe6aa775..96b032dc9b91 100644
--- a/dev-haskell/uniplate/Manifest
+++ b/dev-haskell/uniplate/Manifest
@@ -1 +1 @@
-DIST uniplate-1.6.12.tar.gz 30055 BLAKE2B 557c3eeb14c0b292d4e0325a711babec39a76829822aee07e38ee49f7a4c3f82e72e6231c00fad1c7831864a7df4a9e12b3e913b60fe0e227d651d39c73300af SHA512 049b07e8a57db7e44d91fc9c8dcfb5c49b78a692a730061763cb8bcc4fbc3ed1065bd7a4c337e3d344693df882a0718b6d3bb6a6ea1e7d520a36d252d7038b07
+DIST uniplate-1.6.13.tar.gz 29787 BLAKE2B 345b5c523469ccc4d98ebdf7498fbdfe9ae183af46c4cc1e1fcdc0782d6dd31d40f53e5ee04d652beb048c62c0d0241d6336eefd87cbfc10d4c0d7bb647b29ad SHA512 8cab820d40b318c7483319de4174bdbd3637e1c93f42bc6b796c6a8a1fa93331c0a2ff3b7c77f6a2ec0509fb48bb922ef732c7d79e8e6bcf7987bde949459310
diff --git a/dev-haskell/uniplate/metadata.xml b/dev-haskell/uniplate/metadata.xml
index fd8349c40e4b..94d28760eb56 100644
--- a/dev-haskell/uniplate/metadata.xml
+++ b/dev-haskell/uniplate/metadata.xml
@@ -1,38 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Uniplate is library for writing simple and concise generic operations.
-		Uniplate has similar goals to the original Scrap Your Boilerplate work,
-		but is substantially simpler and faster. The Uniplate manual is available at
-		&lt;http://community.haskell.org/~ndm/darcs/uniplate/uniplate.htm&gt;.
-		
-		To get started with Uniplate you should import one of the three following
-		modules:
-		
-		* "Data.Generics.Uniplate.Data" - to quickly start writing generic functions.
-		Most users should start by importing this module.
-		
-		* "Data.Generics.Uniplate.Direct" - a replacement for "Data.Generics.Uniplate.Data"
-		with substantially higher performance (around 5 times), but requires writing
-		instance declarations.
-		
-		* "Data.Generics.Uniplate.Operations" - definitions of all the operations defined
-		by Uniplate. Both the above two modules re-export this module.
-		
-		In addition, some users may want to make use of the following modules:
-		
-		* "Data.Generics.Uniplate.Zipper" - a zipper built on top of Uniplate instances.
-		
-		* "Data.Generics.SYB" - users transitioning from the Scrap Your Boilerplate library.
-		
-		* "Data.Generics.Compos" - users transitioning from the Compos library.
-		
-		* "Data.Generics.Uniplate.DataOnly" - users making use of both @Data@ and @Direct@
-		to avoid getting instance conflicts.
-	</longdescription>
+	<upstream>
+		<remote-id type="github">ndmitchell/uniplate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/uniplate/uniplate-1.6.12.ebuild b/dev-haskell/uniplate/uniplate-1.6.12.ebuild
deleted file mode 100644
index 27ad0ebbe345..000000000000
--- a/dev-haskell/uniplate/uniplate-1.6.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-#hackport: flags: +separate_syb,+typeable_fingerprint
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Help writing simple, concise and fast generic operations"
-HOMEPAGE="http://community.haskell.org/~ndm/uniplate/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=separate_syb \
-		--flag=typeable_fingerprint
-}
diff --git a/dev-haskell/uniplate/uniplate-1.6.13.ebuild b/dev-haskell/uniplate/uniplate-1.6.13.ebuild
new file mode 100644
index 000000000000..dadfbb044a10
--- /dev/null
+++ b/dev-haskell/uniplate/uniplate-1.6.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +separate_syb,+typeable_fingerprint
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Help writing simple, concise and fast generic operations"
+HOMEPAGE="https://github.com/ndmitchell/uniplate#readme"
+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/hashable-1.1.2.3:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=separate_syb \
+		--flag=typeable_fingerprint
+}
diff --git a/dev-haskell/uniqueid/Manifest b/dev-haskell/uniqueid/Manifest
deleted file mode 100644
index a2b1a2b03278..000000000000
--- a/dev-haskell/uniqueid/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uniqueid-0.1.1.tar.gz 2779 BLAKE2B 73ad9af177f20575caaefb12261d58801a391bfcbaa6b8ef1596538fd7536ec8b6aa35997277a39454250bc779c4c6174b1b3e7853bad5cc21d9ed72764ce517 SHA512 4a1f753a320a5ddae8dd47c3e3729144cf28effaaa6f16a8cf13ad614e4aba3f720f82025f86d7c04ae5c28d03825b4d3442caa01cd534dfa05a70c6c9cadc68
diff --git a/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch b/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch
deleted file mode 100644
index a48815ecda0e..000000000000
--- a/dev-haskell/uniqueid/files/uniqueid-0.1.1-ghc-7.8.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Data/Unique/Id.hs b/Data/Unique/Id.hs
-index f41127e..56853d9 100644
---- a/Data/Unique/Id.hs
-+++ b/Data/Unique/Id.hs
-@@ -14,7 +14,7 @@ module Data.Unique.Id (
-  ) where
- 
- import GHC.Exts
--import GHC.IOBase ( unsafeDupableInterleaveIO )
-+import GHC.IO ( unsafeDupableInterleaveIO )
- 
- import Data.IORef
- import System.IO.Unsafe ( unsafePerformIO )
-@@ -55,15 +55,15 @@ splitIdSupplyL ids = ids1 : splitIdSupplyL ids2
- idFromSupply :: IdSupply -> Id
- idFromSupply (IdSupply n _ _) = Id (I# n)
- 
--instance Eq Id where Id (I# x) == Id (I# y) = x ==# y
-+instance Eq Id where Id (I# x) == Id (I# y) = isTrue# (x ==# y)
- 
- instance Ord Id
-  where
--  Id (I# x) <  Id (I# y) = x <#  y
--  Id (I# x) <= Id (I# y) = x <=# y
-+  Id (I# x) <  Id (I# y) = isTrue# (x <#  y)
-+  Id (I# x) <= Id (I# y) = isTrue# (x <=# y)
- 
-   compare (Id (I# x)) (Id (I# y)) =
--   if x ==# y then EQ else if x <# y then LT else GT
-+   if isTrue# (x ==# y) then EQ else if isTrue# (x <# y) then LT else GT
- 
- instance Show Id
-  where
-diff --git a/uniqueid.cabal b/uniqueid.cabal
-index 8099520..83aaa39 100644
---- a/uniqueid.cabal
-+++ b/uniqueid.cabal
-@@ -18,7 +18,7 @@ Build-Type:    Simple
- Stability:     experimental
- 
- Library
--  Build-Depends:   base >= 3 && < 5
-+  Build-Depends:   base >= 3 && < 5, ghc-prim
-   Exposed-Modules: Data.Unique.Id
-   Extensions:      MagicHash
-   Ghc-Options:     -Wall
diff --git a/dev-haskell/uniqueid/metadata.xml b/dev-haskell/uniqueid/metadata.xml
deleted file mode 100644
index 12547a354095..000000000000
--- a/dev-haskell/uniqueid/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package provides splittable supplies of unique
-		identifiers. The implementation mimics (only) essential
-		parts of the code that is used internally in GHC for
-		the same purpose. After improvements of the value-supply
-		package it is now deprecated.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sebfisch/uniqueid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild b/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
deleted file mode 100644
index 7bc6d5fbc8b2..000000000000
--- a/dev-haskell/uniqueid/uniqueid-0.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Splittable Unique Identifier Supply"
-HOMEPAGE="https://github.com/sebfisch/uniqueid/wikis"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.8.1:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.8.patch
-}
diff --git a/dev-haskell/unix-compat/Manifest b/dev-haskell/unix-compat/Manifest
index 59aa37d9a5e4..a8d26b41146f 100644
--- a/dev-haskell/unix-compat/Manifest
+++ b/dev-haskell/unix-compat/Manifest
@@ -1,5 +1,2 @@
-DIST unix-compat-0.4.1.3.tar.gz 12823 BLAKE2B 0cf1fa6c1b9f10c39fcbe8e0fa54085d7eb93d3177ba15d16e7f3a0f7b64178cea2f2be29e3b91f3611cc49528058e8f226febb941a57378c9156ee5eb609a2c SHA512 6065c2ec39e96ea8a7f91964a0e3ad93fa3a46625dfe831f0b4641e181e1ebbdac8cb5f954ee6a1fe8061896e97f437670605f0b4684183fc84f69725c3cf7a5
-DIST unix-compat-0.4.1.4.tar.gz 12830 BLAKE2B b3b94ff1733d8df2b7105ea6956db7d37d5af445373dad3dd4583a7c515d742835c781da106a7c7b8ecabc55b877f648892308aae9706e94365b4e8c5e50afca SHA512 bc2aa14231b294ada9006d18e54f353f9c5b4bde387f585fc6e3adc38efd18d81819295255f0e385a9cde0fcc423db556801c9285767781eeedf32123b7639af
-DIST unix-compat-0.4.2.0.tar.gz 12895 BLAKE2B df4f07a36b7371f658f533eabf4faa3880d1935371ae46fd05c3567e5f922b35999c7d71af2103c9b88b81ee4328aee6b002d54658e88422fa037c21a209939b SHA512 c3271dc7bbb35948cc2edb143ffe2ab0d14c53115668c257eeba8ccc148b586ee994f417ccfabb58fcd6533e786dcccac3062ece1923afaf20fcd05055fdad39
-DIST unix-compat-0.4.3.1.tar.gz 13152 BLAKE2B a2fc2d7ab23c0b26349181cfcfa98d864944c5347f7a8177fa467e8b963883c32c042dce3d36dfabd7008dda9efe632f7cf1edb6485178d8b2695ca8d73dc4a0 SHA512 ff6d7f52d1e0e21c3739831ae33b34b13815aadfce7f90efe2cfa10325b55aac982824d4cdaf112af03e8d51824d091d8781ff1caf529f02f8d251ada5c9e63b
 DIST unix-compat-0.5.2.tar.gz 13281 BLAKE2B 617e916badf79b76959ffcd542ad6fa1f1ea04c0bc741faace7614bc9e0fcae0cc34dabb06197fa8686dee26b0d890ee95d3f6e5f6258e543424a9d99498a0cf SHA512 0a0a98e03edb7c6ab4401a022c3e90f7598b24930cb22ba04711c3f57b8f87990c6669d5cda07196b61d36cb6e0fa8b281822fa99b199c3b78cfccd0bc3f70be
+DIST unix-compat-0.7.tar.gz 15210 BLAKE2B ccf771b729d98f29900dc79bd2e832c44ae06e3153eafadcd6aaff9fcb46cd74d78bc414988ef355e16d0d20ed11d5b82a3828c9c295b4d004b56ae4fefb3804 SHA512 2cac851106148a61c6c94742f6bf4862ce3409defd6b5478791ebabe538b53b4da35bdf552eed685117f72adcff2f16a920791705c734a7149d13184cf2ff549
diff --git a/dev-haskell/unix-compat/files/unix-compat-0.4.2.0-majmin.patch b/dev-haskell/unix-compat/files/unix-compat-0.4.2.0-majmin.patch
deleted file mode 100644
index 1a07b6883ad2..000000000000
--- a/dev-haskell/unix-compat/files/unix-compat-0.4.2.0-majmin.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/cbits/HsUnixCompat.c b/cbits/HsUnixCompat.c
-index 1f7f189..5de35f5 100644
---- a/cbits/HsUnixCompat.c
-+++ b/cbits/HsUnixCompat.c
-@@ -6,2 +6,4 @@
- 
-+#include <sys/sysmacros.h> /* TODO: glibc()-specific macro */
-+
- unsigned int unix_major(dev_t dev)
diff --git a/dev-haskell/unix-compat/metadata.xml b/dev-haskell/unix-compat/metadata.xml
index f5e70e297b55..312d969e96a6 100644
--- a/dev-haskell/unix-compat/metadata.xml
+++ b/dev-haskell/unix-compat/metadata.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides portable implementations of parts
-		of the unix package. This package re-exports the unix
-		package when available. When it isn't available,
-		portable implementations are used.
-	</longdescription>
 	<use>
 		<flag name="old-time">build against old-time package</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">jystic/unix-compat</remote-id>
+		<remote-id type="hackage">unix-compat</remote-id>
+		<remote-id type="github">haskell-pkg-janitors/unix-compat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
deleted file mode 100644
index c9c9920fca93..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="old-time"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-time old-time)
-}
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.1.4.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.1.4.ebuild
deleted file mode 100644
index 1e7aa65073c3..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.4.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="old-time"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-time old-time)
-}
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.2.0.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.2.0.ebuild
deleted file mode 100644
index 3ee81cf29a9a..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.4.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="old-time"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-time old-time)
-}
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
deleted file mode 100644
index d21861e67138..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="old-time"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.4.2.0-majmin.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag old-time old-time)
-}
diff --git a/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild b/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
index 4d2b34731609..18822313fae8 100644
--- a/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
+++ b/dev-haskell/unix-compat/unix-compat-0.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="old-time"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unix-compat/unix-compat-0.7.ebuild b/dev-haskell/unix-compat/unix-compat-0.7.ebuild
new file mode 100644
index 000000000000..ce0ef908850d
--- /dev/null
+++ b/dev-haskell/unix-compat/unix-compat-0.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Portable POSIX-compatibility layer"
+HOMEPAGE="https://github.com/haskell-pkg-janitors/unix-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="old-time"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( dev-haskell/extra
+		dev-haskell/hspec
+		dev-haskell/hunit
+		dev-haskell/monad-parallel
+		dev-haskell/temporary )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag old-time old-time)
+}
diff --git a/dev-haskell/unix-time/Manifest b/dev-haskell/unix-time/Manifest
index dfe82bea50ba..242d20534710 100644
--- a/dev-haskell/unix-time/Manifest
+++ b/dev-haskell/unix-time/Manifest
@@ -1,4 +1,2 @@
-DIST unix-time-0.3.5.tar.gz 40201 BLAKE2B 398b47f43b6b56131f42842ad691b45e7fe987478583d498ad44885d480b14068b1d956d035e371f48518d62bff70f1f7f0ea34e398355d37bde9d76c5442dcb SHA512 8da13cd8e9a32ee8ce4ab9430eab951d84350e4c459948f4e5e833444f1f266fbac6b6fc08876e326313eaf92e31500b325825b1b2c4fb22c551efdf6e5b9db5
-DIST unix-time-0.3.6.tar.gz 40180 BLAKE2B 0233c673459f967e78a4a8985b0951efd224c57b172739413cb41950abbae05d29c575e128020b2ca6b8f96595326073e45d1bf4e040c81db10d1da3304d3def SHA512 a7ca1086d2a2a15bebdaad80e3e31cc3be403548650d6c490dd7aa3af14b017ad2034320f82c3c7729661a046156e41bb50acf6a8fc1aa1db8dc8a62522c03a1
-DIST unix-time-0.3.7.tar.gz 40549 BLAKE2B 86aa4e6b9d4b7adf55f27491dff7d4197c9540b7390fbfb93ccde33f618892be6c21387812cf41481d5863cff24bdbc29d213edf6c9bb13bdc1ca95e12889f95 SHA512 d10335af434e79980fd4221ade86dafa71d2aa9b30d7aaa13da25b8e75114430a143be5b9c6c1fa885d6ba01f6e6677484b04cd9e2cb263c650a945e954c44bd
+DIST unix-time-0.4.10.tar.gz 52393 BLAKE2B 61966c1008006e64d7959d8c4ffbd99f482910c6276347d835ba24e6b28e4486d88f6af71f1fcdc33d0b6670814cc2e6f0860872a0613deb2c723aa0c9df318c SHA512 3f3a155cb17cafab450f5e2c31bddf328367c9e882174492c6d5b3db84a742fc3b1ed613e92f825df284ce9b6fa62fb2f2f506ef864280b80eb4dfd035f8c6ca
 DIST unix-time-0.4.7.tar.gz 52235 BLAKE2B ec885f79c7f2be3766528dca640e59709aa984f70523714614414f921a7c7808feed274b44bc33cf23d4acee49dc0d8e4e30e9016a372850dfa1695abf81f7d2 SHA512 a9e5b77cb9c93b9a20687406aaeeaff5277d05b95ee9d874f3e0292eca83574b2e842785e0a88f71be3e91610db228c68b5cec885c4b3ea15fc6ec1bb861c072
diff --git a/dev-haskell/unix-time/metadata.xml b/dev-haskell/unix-time/metadata.xml
index 382110aec947..73c121fe55bd 100644
--- a/dev-haskell/unix-time/metadata.xml
+++ b/dev-haskell/unix-time/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Fast parser\/formatter\/utilities for Unix time
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">unix-time</remote-id>
+		<remote-id type="github">kazu-yamamoto/unix-time</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/unix-time/unix-time-0.3.5.ebuild b/dev-haskell/unix-time/unix-time-0.3.5.ebuild
deleted file mode 100644
index 4bdffb75d5b8..000000000000
--- a/dev-haskell/unix-time/unix-time-0.3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="https://hackage.haskell.org/package/unix-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.5
-		dev-haskell/old-locale
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unix-time/unix-time-0.3.6.ebuild b/dev-haskell/unix-time/unix-time-0.3.6.ebuild
deleted file mode 100644
index a4e0f62c8ec5..000000000000
--- a/dev-haskell/unix-time/unix-time-0.3.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="https://hackage.haskell.org/package/unix-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.5
-		dev-haskell/old-locale
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unix-time/unix-time-0.3.7.ebuild b/dev-haskell/unix-time/unix-time-0.3.7.ebuild
deleted file mode 100644
index c1fa638a2f8b..000000000000
--- a/dev-haskell/unix-time/unix-time-0.3.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="https://hackage.haskell.org/package/unix-time"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.5
-		dev-haskell/old-locale
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unix-time/unix-time-0.4.10.ebuild b/dev-haskell/unix-time/unix-time-0.4.10.ebuild
new file mode 100644
index 000000000000..23dc8a11e0a8
--- /dev/null
+++ b/dev-haskell/unix-time/unix-time-0.4.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Unix time parser/formatter and utilities"
+HOMEPAGE="https://hackage.haskell.org/package/unix-time"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/old-time:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hspec-2.6
+		dev-haskell/old-locale
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/unix-time/unix-time-0.4.7.ebuild b/dev-haskell/unix-time/unix-time-0.4.7.ebuild
index 468a24708bd8..92ec06076d90 100644
--- a/dev-haskell/unix-time/unix-time-0.4.7.ebuild
+++ b/dev-haskell/unix-time/unix-time-0.4.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1
 
@@ -9,16 +9,16 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Unix time parser/formatter and utilities"
-HOMEPAGE="http://hackage.haskell.org/package/unix-time"
+HOMEPAGE="https://hackage.haskell.org/package/unix-time"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT=test # QuickCheck finds counterxamples:
-#  test/UnixTimeSpec.hs:53:9: 
+#  test/UnixTimeSpec.hs:53:9:
 #  1) UnixTime, parseUnixTimeGMT & formatUnixTimeGMT, inverses the result (2)
 #       Falsifiable (after 1 test):
 #         UnixTime {utSeconds = 747130527, utMicroSeconds = 819438}
diff --git a/dev-haskell/unixutils/Manifest b/dev-haskell/unixutils/Manifest
deleted file mode 100644
index 4153f8472577..000000000000
--- a/dev-haskell/unixutils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Unixutils-1.54.1.tar.gz 12177 BLAKE2B d330150c36ac3cdfb3b9eea4a26109cb76a96207c5db40d306479696082fe2017e1ae3892fa06571af96ae5cd4c3204e56860ab204ad9192fc5160d18f663bc3 SHA512 b8395cf6778c18a2f36a45a927d24042fd144ab70c6c092e1be36b22c59bbd1f0151cbe703d9db98dc769eba41ca9eb89cf60e87f5a6bbb32d6b64ef97c45665
diff --git a/dev-haskell/unixutils/metadata.xml b/dev-haskell/unixutils/metadata.xml
deleted file mode 100644
index 6d8b18715fc5..000000000000
--- a/dev-haskell/unixutils/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A collection of useful and mildly useful functions that you might
-		expect to find in System.* which a heavy bias towards Unix-type operating systems.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">seereason/haskell-unixutils.git</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/unixutils/unixutils-1.54.1.ebuild b/dev-haskell/unixutils/unixutils-1.54.1.ebuild
deleted file mode 100644
index 072b4333f783..000000000000
--- a/dev-haskell/unixutils/unixutils-1.54.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Unixutils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A crude interface between Haskell and Unix-like operating systems"
-HOMEPAGE="https://github.com/seereason/haskell-unixutils.git"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/exceptions:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/process-extras-0.3:=[profile?]
-	dev-haskell/puremd5:=[profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	virtual/libc
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/unliftio-core/Manifest b/dev-haskell/unliftio-core/Manifest
index dafac5b5da19..e5ef2b39bdb4 100644
--- a/dev-haskell/unliftio-core/Manifest
+++ b/dev-haskell/unliftio-core/Manifest
@@ -1 +1,3 @@
 DIST unliftio-core-0.1.2.0.tar.gz 3631 BLAKE2B 26829fb8d218fd1b73f1bc86b1d673cedef8894345a37c428d73875c0e1c4a47a7107c0a7d9818ee03e6abd75c7da5cd7afdf4c2be02845ff78527c80eb86351 SHA512 5bd46d40be031b398b3238a5170f45641861a30c8cf20ca5a202b47367f00bb52e7391a53301edd47f8d688c713c06ebfdc51b1528518e28f8e8d6ad619e10eb
+DIST unliftio-core-0.2.1.0-rev2.cabal 1004 BLAKE2B 9c71dbc173591ce86f6d09febec1f6d0ccc7d9cdb41b75ff969e5d28b52f880f2cdd10aea8c65ee79cfc92927e7876cfad5611d23af90aefb028f8255c0fa85e SHA512 e4ff0617b6f113b2281d689a2dab9cba67e8cba18c4fdecb3e881db5a52cdcdd939b715017cd440535408f9ae56e00c9230aa067bbbc4fe200382ebf6ef80295
+DIST unliftio-core-0.2.1.0.tar.gz 3865 BLAKE2B 8ee7595c0fe23dd287e4b75eb29909f777ea5798db777d574b928cc34227e1f8bc63f92c9404956d81afef9336c7d555dee4f18a785058b06ba195815a47c284 SHA512 dfc32895bc4410f017d86570c574fc9fbcf68434e4dc240904034c6e932051ee8015fba6a972ea8f0dc47ea5afb0d234208d5c66c21d40710b8bc469578cf976
diff --git a/dev-haskell/unliftio-core/metadata.xml b/dev-haskell/unliftio-core/metadata.xml
index b7878815d80d..8392ff4eed81 100644
--- a/dev-haskell/unliftio-core/metadata.xml
+++ b/dev-haskell/unliftio-core/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">unliftio-core</remote-id>
+		<remote-id type="github">fpco/unliftio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild b/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild
index ad322254c243..6ae836ac1998 100644
--- a/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild
+++ b/dev-haskell/unliftio-core/unliftio-core-0.1.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.8.2:=
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >=4.5 && <4.12' 'base >=4.5'
-}
+CABAL_CHDEPS=(
+	'base >=4.5 && <4.12' 'base >=4.5'
+)
diff --git a/dev-haskell/unliftio-core/unliftio-core-0.2.1.0.ebuild b/dev-haskell/unliftio-core/unliftio-core-0.2.1.0.ebuild
new file mode 100644
index 000000000000..7e12209996d8
--- /dev/null
+++ b/dev-haskell/unliftio-core/unliftio-core-0.2.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO"
+HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio-core#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-haskell/unliftio/Manifest b/dev-haskell/unliftio/Manifest
index 855bad213f2a..f138ee3ddeb0 100644
--- a/dev-haskell/unliftio/Manifest
+++ b/dev-haskell/unliftio/Manifest
@@ -1 +1,2 @@
-DIST unliftio-0.2.12.1.tar.gz 53520 BLAKE2B a8f1e044400a5cc49af3db66fe3e79f8441b2a742e11493eddb59bedba94a196591ef914c5ab1cf998f337751fcc931c92e20efc62ef7989d460072cb44abb96 SHA512 fb2814860cd2b59ae1a17dfb5892198666b59b737264e46e303909a9f5ce2377f92e70ab7d666fc7f927b9cad6593659dd2bb2168478021927b184e54ae4b44d
+DIST unliftio-0.2.18.tar.gz 56344 BLAKE2B 7e1ae3356ceef94bd50f9dc14c30ee980834cfecfb17ac36233a2e8da7d8564f8671c77b848726ebae5cfc5d81c9c65d6847015956298e2d9bb1aad9479303bd SHA512 baa90de754474bcd7e2116f4f2a5c98192f2cc62368895eda5995b528c193d07225f1f1409b0f24ce24f7ea396237563b2ff8182636b53618d4048d558d1a8fd
+DIST unliftio-0.2.23.0.tar.gz 57461 BLAKE2B 1dc1094e78a25940e0d978dcd723752e00d8f8bb5e8a3c0710fb5d59814c1cf67350f20b6e682644113ba993d9782eff63bfab507830adcebabfc707c8006dfc SHA512 24c06ab66c88a4f6d23376178d484da4a815f77f81b47ec4120b32a45f9d09ca1f4ee89c9ad35a538482aaf68a64155c129f4aef985960869b2dd7387693c449
diff --git a/dev-haskell/unliftio/metadata.xml b/dev-haskell/unliftio/metadata.xml
index b7878815d80d..1f69a776f334 100644
--- a/dev-haskell/unliftio/metadata.xml
+++ b/dev-haskell/unliftio/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">unliftio</remote-id>
+		<remote-id type="github">fpco/unliftio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/unliftio/unliftio-0.2.12.1.ebuild b/dev-haskell/unliftio/unliftio-0.2.12.1.ebuild
deleted file mode 100644
index 73a601914874..000000000000
--- a/dev-haskell/unliftio/unliftio-0.2.12.1.ebuild
+++ /dev/null
@@ -1,29 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"
-HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">dev-haskell/async-2.1.1:=[profile?]
-	>=dev-haskell/stm-2.4.3:=[profile?]
-	>=dev-haskell/unliftio-core-0.1.1.0:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/hspec
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/unliftio/unliftio-0.2.18.ebuild b/dev-haskell/unliftio/unliftio-0.2.18.ebuild
new file mode 100644
index 000000000000..3ec95dacdb6a
--- /dev/null
+++ b/dev-haskell/unliftio/unliftio-0.2.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"
+HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">dev-haskell/async-2.1.1:=[profile?]
+	>=dev-haskell/stm-2.4.3:=[profile?]
+	>=dev-haskell/unliftio-core-0.1.1.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hspec
+		dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/unliftio/unliftio-0.2.23.0-r1.ebuild b/dev-haskell/unliftio/unliftio-0.2.23.0-r1.ebuild
new file mode 100644
index 000000000000..2adc79694a80
--- /dev/null
+++ b/dev-haskell/unliftio/unliftio-0.2.23.0-r1.ebuild
@@ -0,0 +1,31 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"
+HOMEPAGE="https://github.com/fpco/unliftio/tree/master/unliftio#readme"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-haskell/async-2.1.1:=[profile?]
+	dev-haskell/safe-exceptions:=[profile?]
+	>=dev-haskell/stm-2.5:=[profile?]
+	>=dev-haskell/unliftio-core-0.1.1.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/hspec
+		dev-haskell/quickcheck
+	)
+"
diff --git a/dev-haskell/unordered-containers/Manifest b/dev-haskell/unordered-containers/Manifest
index e2ee9600b7b5..268e704aecbf 100644
--- a/dev-haskell/unordered-containers/Manifest
+++ b/dev-haskell/unordered-containers/Manifest
@@ -1 +1,3 @@
-DIST unordered-containers-0.2.12.0.tar.gz 53070 BLAKE2B 54bc9779382d4b83d6d6e1c352326f79da69ad75ec27a125ee3bf2cd784c8ffc3ed733fd3db285ff1c0dffce94653ec0bef4694eeefdce682f1c6abf7c828581 SHA512 516f45494c598e33301df08d2877fae2484b6574cb554def35ab3ef31e29424a140115be81b88cd7aa7a8c7fe7a77354a7379c62a65aa00cd8c5c674ee1dd00f
+DIST unordered-containers-0.2.17.0.tar.gz 54110 BLAKE2B 089317f81ce422b1ad54b20bf6c4724a13db855b34e6b4c634e36ed7e897927d2390559f32e8b1f1c38b206c0e8802e066d1f20b3b0a9c3c69a23a01ca993a1b SHA512 e0705e0ad9ec03ad192a8e4047aa5c8a1da6268075be28f423d3f3e7d330084ec02d8499b9f5ee8686c4dd36c67758822d58484155f3ce2cfd210e5bb1a3bb8b
+DIST unordered-containers-0.2.19.1-rev2.cabal 3822 BLAKE2B 57d1cd8fb19b60fc65ec2d89dae387fb9f3475f381507f78142724db810fdb72c706a41740f1e6ce2354dc7536d2dd020d65ef617765f87a9c4e10d9f4ae0ffd SHA512 83afdd11895a1bda7403efae0ff812befe88e26ee90b7098442946d257307bf6fd1eb977dc9b95fa69e24497318ceeb2afd3dfec8d3c0ce87e03a8ad2d5a2a25
+DIST unordered-containers-0.2.19.1.tar.gz 58030 BLAKE2B 52164edda0a384ec9286a5e931f0abb563fe10afc80dff604497d9f78f08ba334243fd0d4603c346d3d1af251e7a74c3962d2cd2592134544ecf79d856bf2236 SHA512 2ea49766210fcec1f8f8bd99c2bb296c4ffcb7ab00317b7663436b6ab0037f9b78cfa22631a1e2bc1f34b6c9b08614aa0ca98c5256ab18258645bfd72351b712
diff --git a/dev-haskell/unordered-containers/metadata.xml b/dev-haskell/unordered-containers/metadata.xml
index e77d777d75f5..8bc8285ce7a3 100644
--- a/dev-haskell/unordered-containers/metadata.xml
+++ b/dev-haskell/unordered-containers/metadata.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Efficient hashing-based container types.  The containers have been
-		optimized for performance critical use, both in terms of large data
-		quantities and high speed.
-		
-		The declared cost of each operation is either worst-case or
-		amortized, but remains valid even if structures are shared.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">tibbe/unordered-containers</remote-id>
+		<remote-id type="hackage">unordered-containers</remote-id>
+		<remote-id type="github">haskell-unordered-containers/unordered-containers</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild
deleted file mode 100644
index 37b3a71fc575..000000000000
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.12.0.ebuild
+++ /dev/null
@@ -1,43 +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.6
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-# break circular dependencies:
-# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
-CABAL_FEATURES+=" nocabaldep"
-
-inherit haskell-cabal
-
-DESCRIPTION="Efficient hashing-based container types"
-HOMEPAGE="https://github.com/haskell-unordered-containers/unordered-containers"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RESTRICT=test # circular deps: unordered-containers[test]->quickcheck->semigroups->unordered-containers
-
-RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-"
-# 	test? ( dev-haskell/chasingbottoms
-# 		dev-haskell/hunit
-# 		>=dev-haskell/quickcheck-2.4.0.1
-# 		dev-haskell/random
-# 		>=dev-haskell/test-framework-0.3.3
-# 		dev-haskell/test-framework-hunit
-# 		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-# "
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild
new file mode 100644
index 000000000000..09edb2d53b06
--- /dev/null
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.17.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -debug
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Circular dependencies
+
+DESCRIPTION="Efficient hashing-based container types"
+HOMEPAGE="https://github.com/haskell-unordered-containers/unordered-containers"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/hashable-1.2.5:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1"
+#	test? ( dev-haskell/chasingbottoms
+#		dev-haskell/hunit
+#		>=dev-haskell/quickcheck-2.4.0.1
+#		dev-haskell/random
+#		>=dev-haskell/tasty-1.4.0.3
+#		>=dev-haskell/tasty-hunit-0.10.0.3
+#		>=dev-haskell/tasty-quickcheck-0.10.1.2 )
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-debug
+}
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.19.1.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.19.1.ebuild
new file mode 100644
index 000000000000..c750b2627d64
--- /dev/null
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.19.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -debug
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient hashing-based container types"
+HOMEPAGE="https://github.com/haskell-unordered-containers/unordered-containers"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/hashable-1.2.5:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		dev-haskell/chasingbottoms
+		dev-haskell/hunit
+		>=dev-haskell/nothunks-0.1.3
+		>=dev-haskell/quickcheck-2.4.0.1
+		dev-haskell/random
+		>=dev-haskell/tasty-1.4.0.3
+		>=dev-haskell/tasty-hunit-0.10.0.3
+		>=dev-haskell/tasty-quickcheck-0.10.1.2
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-debug
+}
diff --git a/dev-haskell/uri-bytestring-aeson/Manifest b/dev-haskell/uri-bytestring-aeson/Manifest
deleted file mode 100644
index 54fed325d21a..000000000000
--- a/dev-haskell/uri-bytestring-aeson/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uri-bytestring-aeson-0.1.0.7.tar.gz 2034 BLAKE2B 192e5a077083ff1b8fa6ec85d2352d15ab613067949f41526f6828715311504ed650bef7729b359b2ac99fc0e3f76d6a16f5fe7a5fb75a0277f0ef05da996d04 SHA512 8327273af53e2d1124aa741b8a216c308c98435c2e74c46897dfec9a043dcfe7e7deec88cdf865da07e703ac8c57557439e3c4106479aec54f9b39a6fd4c5b2c
diff --git a/dev-haskell/uri-bytestring-aeson/metadata.xml b/dev-haskell/uri-bytestring-aeson/metadata.xml
deleted file mode 100644
index b7878815d80d..000000000000
--- a/dev-haskell/uri-bytestring-aeson/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild b/dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild
deleted file mode 100644
index ccad9643a5ed..000000000000
--- a/dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Aeson instances for URI Bytestring"
-HOMEPAGE="https://github.com/reactormonk/uri-bytestring-aeson"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.11:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/text-1.1.1.0:=[profile?]
-	>=dev-haskell/uri-bytestring-0.2:=[profile?] <dev-haskell/uri-bytestring-0.4:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-"
diff --git a/dev-haskell/uri-bytestring/Manifest b/dev-haskell/uri-bytestring/Manifest
deleted file mode 100644
index 69d2e4e2717b..000000000000
--- a/dev-haskell/uri-bytestring/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST uri-bytestring-0.2.2.1.tar.gz 20755 BLAKE2B a91e0de79e3493e342349dfb45d443bbed19265dc78fbd52f9c20e4ff66e2a64433d0dd4f0e3ccee280091ddb843392ae1e8fac15dd5eaa293ac9a80d55eb74a SHA512 d540722657b80039de25a6893067ea8fa50228420725ea22b95a6b7fb3e99803e41b18006b307973fd38fe5ba58d611d3115d1b677e3a36c38168b92289fee97
-DIST uri-bytestring-0.3.2.2.tar.gz 22743 BLAKE2B fc4a5e2421350bc71c07d7353a4934150b6fd46dcacb68ec77c516113c13324663fcf1d09a5b21303bb4c9d5f9587f52a3e0779db35f4c02eb1000744ad19932 SHA512 82565afbdb00b9b4a56f8eaa3ccd42732a16a79f894c950c67cede6346af5112dcb2d226f4b11bde135cf6cfacc687799d33f660d98556d031d262ffe65cf422
diff --git a/dev-haskell/uri-bytestring/metadata.xml b/dev-haskell/uri-bytestring/metadata.xml
deleted file mode 100644
index 16a771dc5920..000000000000
--- a/dev-haskell/uri-bytestring/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		uri-bytestring aims to be an RFC3986 compliant URI parser that uses efficient ByteStrings for parsing and representing the URI data.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">Soostone/uri-bytestring</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uri-bytestring/uri-bytestring-0.2.2.1.ebuild b/dev-haskell/uri-bytestring/uri-bytestring-0.2.2.1.ebuild
deleted file mode 100644
index 57e650b27102..000000000000
--- a/dev-haskell/uri-bytestring/uri-bytestring-0.2.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell URI parsing as ByteStrings"
-HOMEPAGE="https://github.com/Soostone/uri-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/blaze-builder-0.3.0.0:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/generics-sop-0.2
-		dev-haskell/hunit
-		dev-haskell/lens-simple
-		dev-haskell/quickcheck
-		dev-haskell/quickcheck-instances
-		dev-haskell/semigroups
-		dev-haskell/tasty
-		dev-haskell/tasty-hunit
-		dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-werror
-}
diff --git a/dev-haskell/uri-bytestring/uri-bytestring-0.3.2.2.ebuild b/dev-haskell/uri-bytestring/uri-bytestring-0.3.2.2.ebuild
deleted file mode 100644
index 05a82249e7a7..000000000000
--- a/dev-haskell/uri-bytestring/uri-bytestring-0.3.2.2.ebuild
+++ /dev/null
@@ -1,50 +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.1.9999
-#hackport: flags: -lib-werror
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell URI parsing as ByteStrings"
-HOMEPAGE="https://github.com/Soostone/uri-bytestring"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.13.1.0:=[profile?]
-	>=dev-haskell/blaze-builder-0.3.0.0:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-5:=[profile?]
-	>=dev-haskell/semigroups-0.16.2.2:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/th-lift-0.7.5:=[profile?]
-	>=dev-haskell/th-lift-instances-0.1.8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/base-compat-0.7.0
-		dev-haskell/hedgehog
-		dev-haskell/hunit
-		dev-haskell/safe
-		dev-haskell/tasty
-		dev-haskell/tasty-hedgehog
-		dev-haskell/tasty-hunit )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'th-lift >= 0.7.5 && < 0.8' 'th-lift >= 0.7.5'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-lib-werror
-}
diff --git a/dev-haskell/uri/Manifest b/dev-haskell/uri/Manifest
deleted file mode 100644
index 3f7ca5a48c16..000000000000
--- a/dev-haskell/uri/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uri-0.1.6.4.tar.gz 5343 BLAKE2B b2c55a9d8313bafad3e2fa74ddb350ebbb548f59b1174d741f6120724994ec1cf164bcbc0c42492b8ff1c844f36b6c9c4fa3bd4d7f82c976574691c5ec9a3634 SHA512 0daa5e03fa7a3b767b4c523bd334017116432898d04c2b3250e1335ac217ed0f9b915785b200f6eb73127d349954b50dae6b5f979a5ba9f39d4d1ae2589c2a07
diff --git a/dev-haskell/uri/metadata.xml b/dev-haskell/uri/metadata.xml
deleted file mode 100644
index 943153e6ae5b..000000000000
--- a/dev-haskell/uri/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Library for working with URIs, including parsing, rendering, merging, escaping
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/uri/uri-0.1.6.4.ebuild b/dev-haskell/uri/uri-0.1.6.4.ebuild
deleted file mode 100644
index ac482a0682ce..000000000000
--- a/dev-haskell/uri/uri-0.1.6.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Library for working with URIs"
-HOMEPAGE="https://hackage.haskell.org/package/uri"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/url/Manifest b/dev-haskell/url/Manifest
deleted file mode 100644
index 107b1cf3d992..000000000000
--- a/dev-haskell/url/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST url-2.1.3.tar.gz 4180 BLAKE2B 53dd6a8343cc394ea91b94d62d4dfcf0e8b5268c86058c8daf7a1de58e280eabea7fdb04a4b777bd853b5b35848df36aa67af5b1ae50ccc7a9b1149af41c33ce SHA512 53ee2aabc877c91d06c7e029ff807057f88bb4ce712ad02d47655d43869ad83af9032eea85d0ecddf3cad19839827bb723c9bf0a17b580ee7018f4b08c691cd8
diff --git a/dev-haskell/url/metadata.xml b/dev-haskell/url/metadata.xml
deleted file mode 100644
index 91744f242f48..000000000000
--- a/dev-haskell/url/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A library for working with URLs.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/url/url-2.1.3-r1.ebuild b/dev-haskell/url/url-2.1.3-r1.ebuild
deleted file mode 100644
index 42aa72cf9c7f..000000000000
--- a/dev-haskell/url/url-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A library for working with URLs"
-HOMEPAGE="https://www.haskell.org/haskellwiki/Url"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/utf8-string-0.3.4:=[profile?]
-		<dev-haskell/utf8-string-2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/utf8-light/Manifest b/dev-haskell/utf8-light/Manifest
index 2fff44a6a992..673638967f46 100644
--- a/dev-haskell/utf8-light/Manifest
+++ b/dev-haskell/utf8-light/Manifest
@@ -1 +1,2 @@
 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
diff --git a/dev-haskell/utf8-light/metadata.xml b/dev-haskell/utf8-light/metadata.xml
index 0971007ab134..71e7df66a6ab 100644
--- a/dev-haskell/utf8-light/metadata.xml
+++ b/dev-haskell/utf8-light/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Lightweight UTF8 handling.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">utf8-light</remote-id>
+		<remote-id type="gitlab">fffaaa/utf8-light</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
index 56a97c36c067..a664ac352d08 100644
--- a/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
+++ b/dev-haskell/utf8-light/utf8-light-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-# ebuild generated by hackport 0.3.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -14,11 +14,11 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ghc-6.10.4:=
+RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-9.1
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.6
 "
diff --git a/dev-haskell/utf8-light/utf8-light-0.4.4.0.ebuild b/dev-haskell/utf8-light/utf8-light-0.4.4.0.ebuild
new file mode 100644
index 000000000000..cc2b9d05c9f9
--- /dev/null
+++ b/dev-haskell/utf8-light/utf8-light-0.4.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Lightweight UTF8 handling"
+HOMEPAGE="https://hackage.haskell.org/package/utf8-light"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/hspec-2.3 <dev-haskell/hspec-2.11
+	)
+"
diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest
index e77451808a00..485b24aab2a8 100644
--- a/dev-haskell/utf8-string/Manifest
+++ b/dev-haskell/utf8-string/Manifest
@@ -1,2 +1,2 @@
-DIST utf8-string-0.3.8.tar.gz 9129 BLAKE2B 9ee624a9a1258b19134ac63e6b15fbb71a17e03e78be49c464c3c76eeaf2f052c65f8df360900a1e9badb31d7f27059aa33642e6244bd665e62519abe663065a SHA512 70f6ceaf4d9d6e6fe7b787facbb733f276ac5ba10c49c43e0da283b481f0579e0933f6343f5158973a6f0aac342f5b76258281dbd0c420bf652ad3c3787eb1fb
 DIST utf8-string-1.0.1.1.tar.gz 8667 BLAKE2B db2f899e0f78e44700cec859fd71982024e05f971ab5fef36071410c207a23dce1fa7430ce6cdeefdb5b2c28509eb5848946e2207e046ab7a4105c56e25fce16 SHA512 2dd647625478c9738b3af5e23e1e5ff92968449ad74e6d53dc308fa0f2b08b63c421a1cbe5491dd260b9b32770ec626843d320a09b80eb984211dba53934b965
+DIST utf8-string-1.0.2.tar.gz 10726 BLAKE2B 7790f2c3023944399d1110c90bf4b6ba5bf82db17f02d4b622343f559f2a88e96e590f306cfcb64baa27f5c63b86effbbb87b85ffc28b8d577355ac14b4fae37 SHA512 b20b61e942a77848d12f9105f88790b3f02e3e2835b87e0ce1900b5ea1e97c4b055003603e435415e7fbbc9586f9c6ca2402f86cf5d2b7b6ced2ddcae3968d24
diff --git a/dev-haskell/utf8-string/metadata.xml b/dev-haskell/utf8-string/metadata.xml
index 91873f17286f..08117f68631e 100644
--- a/dev-haskell/utf8-string/metadata.xml
+++ b/dev-haskell/utf8-string/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">glguy/utf8-string</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">glguy/utf8-string</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
deleted file mode 100644
index ebc25d83c0cf..000000000000
--- a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Support for reading and writing UTF8 Strings"
-HOMEPAGE="https://github.com/glguy/utf8-string/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 3 && < 4.8' 'base >= 3'
-}
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
index 104a89bac444..e0339d789d6d 100644
--- a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.4.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -23,7 +23,6 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.2
 "
 
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.3 && < 4.9' 'base >= 4.3'
-}
+CABAL_CHDEPS=(
+	'base >= 4.3 && < 4.9' 'base >= 4.3'
+)
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild
new file mode 100644
index 000000000000..41aad999e11e
--- /dev/null
+++ b/dev-haskell/utf8-string/utf8-string-1.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for reading and writing UTF8 Strings"
+HOMEPAGE="https://github.com/glguy/utf8-string/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7 )
+"
diff --git a/dev-haskell/uuagc-cabal/Manifest b/dev-haskell/uuagc-cabal/Manifest
deleted file mode 100644
index 4c827ddf8f51..000000000000
--- a/dev-haskell/uuagc-cabal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uuagc-cabal-1.0.6.0.tar.gz 14781 BLAKE2B 8c68bf07e6e5e579cf59968e887728080c9c4233069bdc253402a8eae5e124d17bf52b3acd0e0a01e64e7d31bb948ff61c210c5afb4a64a3b449c8c302dcea00 SHA512 778edb1c5d209836b38de93ecde8fe9bf37e2b5ececfe5a6d9c92ddac01b1dc1ee865fe861bacb07617a317f2dc1d0a2a967aa9ec2682270e0bf58efb85c27a7
diff --git a/dev-haskell/uuagc-cabal/metadata.xml b/dev-haskell/uuagc-cabal/metadata.xml
deleted file mode 100644
index 2ae6a4652d2a..000000000000
--- a/dev-haskell/uuagc-cabal/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Cabal plugin for UUAGC
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/uuagc-cabal/uuagc-cabal-1.0.6.0.ebuild b/dev-haskell/uuagc-cabal/uuagc-cabal-1.0.6.0.ebuild
deleted file mode 100644
index 06e29a3ecab2..000000000000
--- a/dev-haskell/uuagc-cabal/uuagc-cabal-1.0.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Cabal plugin for the Universiteit Utrecht Attribute Grammar System"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cabal-1.8.0.6:=[profile?]
-	>=dev-haskell/mtl-2.0.1.0:=[profile?]
-	>=dev-haskell/uulib-0.9.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/uuagc/Manifest b/dev-haskell/uuagc/Manifest
deleted file mode 100644
index 20a046fd83a9..000000000000
--- a/dev-haskell/uuagc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uuagc-0.9.52.1.tar.gz 795294 BLAKE2B 58dddafabd99d4b2a2d1adde26691f419a07c1882619258c2e327066d20d16640c00bfdf124fc5d245a2c39fb719580e0c3ea3c35279fd2ba39c5bcef075d456 SHA512 f5de27bb06a9453f1d9f4105f10b98636c0bebf351f69f122c420efdcff3dc0c25cbc9a69c8a804b8618f2ff1cb216acea8119b333a130a30a840cc00b268c8c
diff --git a/dev-haskell/uuagc/metadata.xml b/dev-haskell/uuagc/metadata.xml
deleted file mode 100644
index dd049f92501f..000000000000
--- a/dev-haskell/uuagc/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="with-loag">Use <pkg>dev-haskell/minisat</pkg> external SAT-solver to schedule all Linear Ordered AGs.</flag>
-	</use>
-	<longdescription>
-		Generates Haskell files from an attribute grammar specification
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/uuagc/uuagc-0.9.52.1.ebuild b/dev-haskell/uuagc/uuagc-0.9.52.1.ebuild
deleted file mode 100644
index fa5fc260b726..000000000000
--- a/dev-haskell/uuagc/uuagc-0.9.52.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.5.5.9999
-#hackport: flags: -bootstrap_external
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Attribute Grammar System of Universiteit Utrecht"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="with-loag"
-
-RDEPEND=">=dev-haskell/haskell-src-exts-1.11.1:=[profile?]
-	>=dev-haskell/mtl-1.1.1.1:=[profile?]
-	>=dev-haskell/uuagc-cabal-1.0.2.0:=[profile?]
-	>=dev-haskell/uulib-0.9.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	with-loag? ( dev-haskell/minisat:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-bootstrap_external \
-		$(cabal_flag with-loag with-loag)
-}
diff --git a/dev-haskell/uuid-types/Manifest b/dev-haskell/uuid-types/Manifest
index 8f3d853d196f..b20cc31e995e 100644
--- a/dev-haskell/uuid-types/Manifest
+++ b/dev-haskell/uuid-types/Manifest
@@ -1 +1,2 @@
-DIST uuid-types-1.0.3.tar.gz 11999 BLAKE2B 71941bf6abf554e2fa4fb64ae2cc5d61354643c07fe757920c19b60f762a7ffdce87c222d1f1a4a993b50f95e58ac4a011e2ae10c73108a6b71f65ebff209600 SHA512 039bccea9ee22388a50e3e233c95afdd3a59f01aa5f552dcd8e8c1ded8f9da210933c58a4d9cc0913c768b587c24ee27fa0eed15e531846ea841b666f513df9e
+DIST uuid-types-1.0.5-rev4.cabal 2636 BLAKE2B f435203ae4c48a0f9cabae2df90a8624fbaa8ef0d382dee1be8f2dcd226732053c16f8214ac3337922eb25133ae30e69e7f6ecd57994d225ea17c5269d7d3efb SHA512 1a612a9304d8d206ce79f1db86bb492914562f6d0464668599a4bc66ccf07eb66984fcd6518afd5b0bf0685904db04f587e40a75b610901799b316370db3a6d9
+DIST uuid-types-1.0.5.tar.gz 11922 BLAKE2B 82da240f63c255be7c64ddaa6b6f49e022446afbf814b6cd3f9607fd43c0bf33e5d92b0586477384d46b4906f15b17f72564227ad090da54c03b1c21608f5fcc SHA512 0e0821a426120ab63d991a6cd39ded65a89472751ada4d5fb5e4f12177d8e797ede3b6b74d6817ce260d6334adeb42de31b0073389f58a27a06ec8ea4a574ef6
diff --git a/dev-haskell/uuid-types/metadata.xml b/dev-haskell/uuid-types/metadata.xml
index 6ed8d01282ae..d9d345a26409 100644
--- a/dev-haskell/uuid-types/metadata.xml
+++ b/dev-haskell/uuid-types/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library contains type definitions for Universally Unique Identifiers
-		and basic conversion functions.
-		See &lt;https://en.wikipedia.org/wiki/UUID&gt; for the general idea.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">aslatter/uuid</remote-id>
+		<remote-id type="hackage">uuid-types</remote-id>
+		<remote-id type="github">haskell-hvr/uuid</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
deleted file mode 100644
index 4cae53fd3942..000000000000
--- a/dev-haskell/uuid-types/uuid-types-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type definitions for Universally Unique Identifiers"
-HOMEPAGE="https://github.com/aslatter/uuid"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >=2.4 && < 2.9' 'QuickCheck >=2.4' \
-		'HUnit >=1.2 && < 1.4' 'HUnit >=1.2' \
-		'tasty >= 0.10 && < 0.12' 'tasty >= 0.10' \
-		'tasty-hunit == 0.9.*' 'tasty-hunit >= 0.9' \
-		'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
-		'random >= 1.0.1 && < 1.2' 'random >= 1.0.1'
-}
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.3.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.3.ebuild
deleted file mode 100644
index 2c16dd98dee1..000000000000
--- a/dev-haskell/uuid-types/uuid-types-1.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Type definitions for Universally Unique Identifiers"
-HOMEPAGE="https://github.com/aslatter/uuid"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/hashable-1.1.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck >=2.4 && < 2.9' 'QuickCheck >=2.4'
-}
diff --git a/dev-haskell/uuid-types/uuid-types-1.0.5-r1.ebuild b/dev-haskell/uuid-types/uuid-types-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..5f189b66a425
--- /dev/null
+++ b/dev-haskell/uuid-types/uuid-types-1.0.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Type definitions for Universally Unique Identifiers"
+HOMEPAGE="https://github.com/haskell-hvr/uuid"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	|| (
+		( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
+		( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
+	)
+	dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/ghc-byteorder-4.11 <dev-haskell/ghc-byteorder-4.12
+		>=dev-haskell/quickcheck-2.14.2 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+	)
+"
diff --git a/dev-haskell/uuid/Manifest b/dev-haskell/uuid/Manifest
index 6cacd27d67e7..df4bff53385b 100644
--- a/dev-haskell/uuid/Manifest
+++ b/dev-haskell/uuid/Manifest
@@ -1,3 +1,2 @@
-DIST uuid-1.3.11.tar.gz 8578 BLAKE2B ab865736dda4ca4188b9b21b06649fde81d8de1ef4939bf0a5945353d17da691fcd267faded8f64edec7371727a99239f961b25b3402f8fb68b5f0ad89052bae SHA512 3b94c13ff8b6a631f9411a313a99251ee961234d0322e446e22b04110728a4acb687f4bb4b83f9b09268fed9238b1265dc53c5214ae4bb8e18c12455c41c41e5
-DIST uuid-1.3.12.tar.gz 8738 BLAKE2B a6e8fe96d6c20b9294c1535d367ad3ce0a91dfec4c9cd408d5b7e2ec0988326721db3d7a6ea3addded81c12f86692ed898e14612c20fcaf16f0ea6be6f2ef21c SHA512 53d1a9e69dbc3ce2cb2e35aeca9b116e5fbf176fe048d4afaaff1bfaae80445da8e3d53c4652ada41791fb3e237e2cd24d3ac15e6a786242844fdf076588dae9
-DIST uuid-1.3.13.tar.gz 8926 BLAKE2B d7b4850eb921467677534d33475dccb90b2e74a4f73137eb8e9a45573a337d4152b19f052dea584bb0b6ab862dcdf764106c4e35efa1e8ae3ecec41becc75a4e SHA512 e888e6350a32c6496b0b57384797925c78ab1c4dc674d296972981fa81338b4705d21a96960a63771aa5b9a785efd507ecaad195767dba7847fcab5ca7f3f923
+DIST uuid-1.3.15-rev2.cabal 2642 BLAKE2B db44dabaa7962207d089fb79db6781e4387fb1958366e938125ec95d79125fc277fe1167a0aab2d133441c95a70953cee5ab30b4a1811bfd5c6733f178239ed5 SHA512 cb8a0aa11945375d175de2c48c710ef0f423d38fa4960ef91050e04038a402b38f532e25d5f56ecd715513dbb05da25922744ffde51edd8bb99b55985c9342be
+DIST uuid-1.3.15.tar.gz 8815 BLAKE2B fec665690dc6fe05e9b7083700ca5ba2723d9bbd7cdc7f8770359d26b9b4b32572e15b686bc4589a3bed2cd25caa02cbea96270ea2e373941451aa6f315df401 SHA512 acb5c17b809bee5ce2f1591f3382a7c3a57e9d20a47d8f47be717b0e7fbfd803603810ebaaf88597bcf98dff698f4807dc7d8122a0d7d36785a47e0e065fb59e
diff --git a/dev-haskell/uuid/metadata.xml b/dev-haskell/uuid/metadata.xml
index 7c9c76c8d405..5626c2e65497 100644
--- a/dev-haskell/uuid/metadata.xml
+++ b/dev-haskell/uuid/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library is useful for creating, comparing, parsing and
-		printing Universally Unique Identifiers.
-		See &lt;https://en.wikipedia.org/wiki/UUID&gt; for the general idea.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">aslatter/uuid</remote-id>
+		<remote-id type="hackage">uuid</remote-id>
+		<remote-id type="github">haskell-hvr/uuid</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/uuid/uuid-1.3.11-r2.ebuild b/dev-haskell/uuid/uuid-1.3.11-r2.ebuild
deleted file mode 100644
index 44de6b12aca1..000000000000
--- a/dev-haskell/uuid/uuid-1.3.11-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="https://github.com/aslatter/uuid"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/cryptohash-0.7:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	>=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit >=1.2 && < 1.3' 'HUnit >=1.2' \
-		'tasty == 0.10.*' 'tasty >= 0.10'
-}
diff --git a/dev-haskell/uuid/uuid-1.3.12.ebuild b/dev-haskell/uuid/uuid-1.3.12.ebuild
deleted file mode 100644
index 7e7a5956fd67..000000000000
--- a/dev-haskell/uuid/uuid-1.3.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="https://github.com/aslatter/uuid"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'QuickCheck >=2.4 && < 2.9' 'QuickCheck >=2.4'
-}
diff --git a/dev-haskell/uuid/uuid-1.3.13-r1.ebuild b/dev-haskell/uuid/uuid-1.3.13-r1.ebuild
deleted file mode 100644
index 31f07bace4ef..000000000000
--- a/dev-haskell/uuid/uuid-1.3.13-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="For creating, comparing, parsing and printing Universally Unique Identifiers"
-HOMEPAGE="https://github.com/hvr/uuid"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12:=[profile?]
-	>=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12:=[profile?]
-	>=dev-haskell/entropy-0.3.7:=[profile?]
-	>=dev-haskell/network-info-0.2:=[profile?] <dev-haskell/network-info-0.3:=[profile?]
-	>=dev-haskell/random-1.0.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/text-1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/uuid-types-1.0.2:=[profile?] <dev-haskell/uuid-types-2:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2.4
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'QuickCheck       >= 2.4   && < 2.10' 'QuickCheck       >= 2.4' \
-		'time            >= 1.1      && < 1.8' 'time            >= 1.1' \
-		'tasty            >= 0.10  && < 0.12' 'tasty            >= 0.10' \
-		'tasty-hunit      == 0.9.*' 'tasty-hunit      >= 0.9' \
-		'tasty-quickcheck == 0.8.*' 'tasty-quickcheck >= 0.8' \
-		'HUnit            >= 1.2   && < 1.4' 'HUnit            >= 1.2' \
-		'entropy         >= 0.3.7    && < 0.4' 'entropy         >= 0.3.7'
-}
diff --git a/dev-haskell/uuid/uuid-1.3.15-r1.ebuild b/dev-haskell/uuid/uuid-1.3.15-r1.ebuild
new file mode 100644
index 000000000000..679ee0de762c
--- /dev/null
+++ b/dev-haskell/uuid/uuid-1.3.15-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="For creating, comparing, parsing and printing Universally Unique Identifiers"
+HOMEPAGE="https://github.com/haskell-hvr/uuid"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/cryptohash-md5-0.11.100:=[profile?] <dev-haskell/cryptohash-md5-0.12
+	>=dev-haskell/cryptohash-sha1-0.11.100:=[profile?] <dev-haskell/cryptohash-sha1-0.12
+	>=dev-haskell/entropy-0.3.7:=[profile?] <dev-haskell/entropy-0.5
+	=dev-haskell/network-info-0.2*:=[profile?]
+	>=dev-haskell/random-1.1:=[profile?] <dev-haskell/random-1.3
+	=dev-haskell/uuid-types-1.0.5*:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	|| (
+		( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
+		=dev-haskell/text-2.0*
+	)
+	dev-haskell/text:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/quickcheck-2.14.2 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5
+		=dev-haskell/tasty-hunit-0.10*
+		=dev-haskell/tasty-quickcheck-0.10*
+	)
+"
diff --git a/dev-haskell/uulib/Manifest b/dev-haskell/uulib/Manifest
deleted file mode 100644
index 9a25ebc03b4b..000000000000
--- a/dev-haskell/uulib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uulib-0.9.16.tar.gz 44333 BLAKE2B a99c29d41f6ba34d4e62bb134bf7917e93ba7924b2838e43db2070c581af8eb8337f78f6e021b41c380453b7631e57bcc680c533216d96caefbde60c9c35acaf SHA512 89a9a2d34e8cd5e367a479f3d9bd6083abc140c247ba48cce5a39f2ea0835bee67c57b7c6c5850968d2f4b5cbc78b2835e85c8255c041981650d62d40070cc78
-DIST uulib-0.9.22.tar.gz 45487 BLAKE2B d2a597ae5a011b46c80886331a91130400ec01d338cc65829d20a65e64014a5b41704d8eed64fb93fdca474909cf036d61f64670d6961fcdfcb30ba90cae014a SHA512 34803448aa29870ec4776128565b52ac52da4395425ba4fdb6fa38ec45b5af59cb89b2b88e3502e409707491863f88b6d95b13093a15cf04a7c58d24244955f7
-DIST uulib-0.9.24.tar.gz 45362 BLAKE2B ea9b2854ef75cdc4f0555ca275b18089d40121940ed2b0eff5b86489b608e916b6cc568c425faca98e77cfdc89bae4f9d95ec64639c4117c405eebf669360e17 SHA512 7c5feadbeb6a67a7d7b0ed1a15dbbe50e8f4b05534aa9602bfc91feef9ee0e9239ef6fe879a8fec881902692a8c30daa8fdaab5503a6e15f97b26fcf31de8223
diff --git a/dev-haskell/uulib/metadata.xml b/dev-haskell/uulib/metadata.xml
deleted file mode 100644
index 6d3d94e01d7f..000000000000
--- a/dev-haskell/uulib/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">UU-ComputerScience/uulib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/uulib/uulib-0.9.16.ebuild b/dev-haskell/uulib/uulib-0.9.16.ebuild
deleted file mode 100644
index 1e12ec378df8..000000000000
--- a/dev-haskell/uulib/uulib-0.9.16.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Utrecht Tools Library"
-HOMEPAGE="http://www.cs.uu.nl/wiki/HUT/WebHome"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/uulib/uulib-0.9.22.ebuild b/dev-haskell/uulib/uulib-0.9.22.ebuild
deleted file mode 100644
index c7db088a54da..000000000000
--- a/dev-haskell/uulib/uulib-0.9.22.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Utrecht Tools Library"
-HOMEPAGE="https://github.com/UU-ComputerScience/uulib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/uulib/uulib-0.9.24.ebuild b/dev-haskell/uulib/uulib-0.9.24.ebuild
deleted file mode 100644
index 43daedca893e..000000000000
--- a/dev-haskell/uulib/uulib-0.9.24.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell Utrecht Tools Library"
-HOMEPAGE="https://github.com/UU-ComputerScience/uulib"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/validity/Manifest b/dev-haskell/validity/Manifest
deleted file mode 100644
index 74889abb809a..000000000000
--- a/dev-haskell/validity/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST validity-0.9.0.3.tar.gz 8015 BLAKE2B a14f2dfb2a716251bf7e65548fad61d3525685c2b5065e4b4f74c9fcabe39f4b588a0e5d422abf9b3c734a0be528a59fd660833dcd65e1e0dd06283a0db95552 SHA512 f60faa65677f4a306a289d2985cd1827c3b2fbac18f25802f37af89bb8e0e9dfa23bebff6c2da4eda7824b94e9d26e5bcde55a3756b4e25b86f14ac0aee8446e
diff --git a/dev-haskell/validity/metadata.xml b/dev-haskell/validity/metadata.xml
deleted file mode 100644
index 06ff9ff9cc14..000000000000
--- a/dev-haskell/validity/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Note: There are companion instance packages for this library:
-		
-		* &lt;https://hackage.haskell.org/package/validity-text validity-text&gt;
-		
-		* &lt;https://hackage.haskell.org/package/validity-containers validity-containers&gt;
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/validity/validity-0.9.0.3.ebuild b/dev-haskell/validity/validity-0.9.0.3.ebuild
deleted file mode 100644
index 7d670251814d..000000000000
--- a/dev-haskell/validity/validity-0.9.0.3.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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Validity typeclass"
-HOMEPAGE="https://github.com/NorfairKing/validity#readme"
-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.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/vault/Manifest b/dev-haskell/vault/Manifest
index 305337b50110..b94e26dcb4b4 100644
--- a/dev-haskell/vault/Manifest
+++ b/dev-haskell/vault/Manifest
@@ -1,4 +1,2 @@
-DIST vault-0.3.0.3.tar.gz 4906 BLAKE2B 75f24dee6bfe17755304b36becb6584120c23ed2a09efb81ef332b7bb81797f2afdfd1ff9ae1029e3cf7ebae36571ce8a2bba5a076e13722f622cfbcfbc158e6 SHA512 142bd654c5ea0cdda17429d130bf44901cfb197068db2aa671f564bd2ff1ce61f517d4fa598990bd3c3ce33181f784b5e4524190895d0efe8f4b57d163096fb5
-DIST vault-0.3.0.5.tar.gz 5142 BLAKE2B ced3a0bef6347d1177d807c1b2e403775a345b058ae6ae50f8fe35619181049cc1c9e1aa0087daabc1d45f3c536ddc9936c1168ef53311d5432bb02523315a3b SHA512 be66e8f3028cdf14ac89dbff64e326a11db23dfece1e3f39d2e70eb1e391bebbe7b569969c7c48a1fabae94ac2ee9623f6b3dbb75139f34dd28f2f2ef8eb69c1
-DIST vault-0.3.0.6.tar.gz 5142 BLAKE2B 1e93e900c7d90a2a14616b3c8b06efe50ddc2ea0b0123af274c25e208b91f2b5855aa49c0510ecc22fd5fafa88d9f122b56494466d188965a240d2f8bcbf7a91 SHA512 5e8842900378a371352c1c5a23ea19920e66a18710c6a52fe809b80e679363cbb44e5254351ee435404ec2064390b3746d97ad07779eee70f0bff5e41cec12b9
-DIST vault-0.3.1.3.tar.gz 5314 BLAKE2B 99b98c771075c38e9ad11dfced093556af020dd03f4549ed9eca2f2e8066b69a2e3c3c6ea8ff27488c5c3c2a3c4fa62f4b03dd2b4a899ccc8dfacabb0e219d1d SHA512 70773be0f9c6fc9db290b633e663cdaad3e4d30dee5a6754415d475b40adf1bb20aca61c80b2971570c411ebc6644e646f5908fe7149e8698d38270e1f3f409b
+DIST vault-0.3.1.5-rev3.cabal 2366 BLAKE2B 2492299c833115d75b4b9f9285ad371bc9c46616fa08189dcbea40bf0dbc3f397c9e402c97469d45d0d792a860cb7174649d8a188aa0e398cb5fc8d5718e2d7c SHA512 d572fadb89ee20a6740d3a2773f27153b45a11931e0f6335ebc29f47799decd52f0486dca20216d6856bd9d4baf682260fa3f9614209fe3d39facae32e1d820b
+DIST vault-0.3.1.5.tar.gz 5431 BLAKE2B e102b85b99e6c28e0df1ff535c0bc9c61b01ec8c616107fa6298247f4d7f54e82e26eee7614b616d66cdefb21141a67cfcdf8d15743a59abf94ece0ac692f143 SHA512 f268d192f53594d5be39db807982073591e9bb830411813d6904e5ad1bf10d16eb5f89d9a39b764f92e6e196aeaabeac1b75cd07a70c59a42ce842835758e409
diff --git a/dev-haskell/vault/metadata.xml b/dev-haskell/vault/metadata.xml
index 437acd12b91d..afac3eaf0d55 100644
--- a/dev-haskell/vault/metadata.xml
+++ b/dev-haskell/vault/metadata.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A /vault/ is a typed, persistent store for values of arbitrary types.
-		It's like having first-class access to the storage space behind IORefs.
-		
-		The data structure is analogous to a bank vault,
-		where you can access different bank boxes with different keys;
-		hence the name.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">vault</remote-id>
 		<remote-id type="github">HeinrichApfelmus/vault</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/vault/vault-0.3.0.3.ebuild b/dev-haskell/vault/vault-0.3.0.3.ebuild
deleted file mode 100644
index a10e5bc473e8..000000000000
--- a/dev-haskell/vault/vault-0.3.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'base >= 4.5 && < 4.8' 'base >= 4.5'
-}
diff --git a/dev-haskell/vault/vault-0.3.0.5.ebuild b/dev-haskell/vault/vault-0.3.0.5.ebuild
deleted file mode 100644
index 85a40899e5da..000000000000
--- a/dev-haskell/vault/vault-0.3.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +useghc
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=useghc
-}
diff --git a/dev-haskell/vault/vault-0.3.0.6.ebuild b/dev-haskell/vault/vault-0.3.0.6.ebuild
deleted file mode 100644
index 482f729c8304..000000000000
--- a/dev-haskell/vault/vault-0.3.0.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: +useghc
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=useghc
-}
diff --git a/dev-haskell/vault/vault-0.3.1.3.ebuild b/dev-haskell/vault/vault-0.3.1.3.ebuild
deleted file mode 100644
index f3506a9f6106..000000000000
--- a/dev-haskell/vault/vault-0.3.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: +useghc
-
-CABAL_FEATURES="lib profile haddock hoogle" # disable hscolour: ghc-8.8.1 is buggy: https://github.com/haskell/haddock/issues/1091
-inherit haskell-cabal
-
-DESCRIPTION="a persistent store for values of arbitrary types"
-HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	>=dev-haskell/semigroups-0.1:=[profile?] <dev-haskell/semigroups-1.0:=[profile?]
-	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=useghc
-}
diff --git a/dev-haskell/vault/vault-0.3.1.5-r2.ebuild b/dev-haskell/vault/vault-0.3.1.5-r2.ebuild
new file mode 100644
index 000000000000..819d85b66e1e
--- /dev/null
+++ b/dev-haskell/vault/vault-0.3.1.5-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +useghc
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION=3
+inherit haskell-cabal
+
+DESCRIPTION="a persistent store for values of arbitrary types"
+HOMEPAGE="https://github.com/HeinrichApfelmus/vault"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.3.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=useghc
+}
diff --git a/dev-haskell/vector-algorithms/Manifest b/dev-haskell/vector-algorithms/Manifest
index 95ffba10192d..a0704f6820b1 100644
--- a/dev-haskell/vector-algorithms/Manifest
+++ b/dev-haskell/vector-algorithms/Manifest
@@ -1,3 +1,3 @@
-DIST vector-algorithms-0.6.0.4.tar.gz 20455 BLAKE2B 0d0c4ef7ed8996d1ebe65971a451d4cb49118faedbf9cb4a987afb281adf563808778a689df608d2fb3c8fe9398af995d1c5e31cc89fd4f2075c2ebdd7ca4277 SHA512 5e99a77771831f0b9a4485f48aa7be5f5928e811512f0a68e18fa65ecace185dfea74ec09037b05d56e1a9208d2cdbcfed94ce2678d504f6d12267496a3616bf
-DIST vector-algorithms-0.7.0.1.tar.gz 25435 BLAKE2B f9cb3bf592316c92bff4313d264370cc35d62c64e7dec6f14ee9954c0fc12f573e799172793501e1b4f9c556fa1ea8e3db1ac3381ff71bb143e33520c69c18b8 SHA512 1ea718eeb062defee830fa7dba323981678691c5d320b8929dcd695af17f82d65007cfd35103310026dab51cf10462dbead09082fc0ba5ddd0c2e18e305c4c6a
-DIST vector-algorithms-0.8.0.3.tar.gz 26559 BLAKE2B 7541d141967faf4bc1b33dcd23f283e1a6868f0b51e784918c1516a46c38ba3e9205045c87679738d89c48fee3ee2e61286eab59cc66ec8cfc18f1a4b977c634 SHA512 45311e19a1e5c9994e7d666b73445d11946f60915df3d2f385a435538d1b6b0929b56a960f83c5df1b2df883566e7f8e6fdd5be4e075364d7daecd6dbec780e5
+DIST vector-algorithms-0.8.0.4.tar.gz 26681 BLAKE2B fde5a8a9663e5e94e340f4edb1c1d17a47e7b561013982b5bf7711fe595913280476de629470ec9a049a6bd277587b1dc5390ec9e6dd0d7da87eb7f48ab891c8 SHA512 da5f52493c7f68df0a2c718724dcac9be758b09b14c8fa913aa328ee4c1286893fb239882018202d0fcd56709364ccddf3d620ff3b886d830102ef52a0868d42
+DIST vector-algorithms-0.9.0.1-rev1.cabal 3670 BLAKE2B ebb640235c30c3689dc4abe7e5978b435f6f3adb481b595f6ea8d3e702902fc815a07a7cf3569e1a7f82e25a9553bc0432a9897e39626a0813987bbc6947bffb SHA512 1cd195b4ea8c8245d832107c8fb3a58998b461a3973affce983ba802e300d05e8b45c58836d5623073cd4395c196a0d43f1c9648e834cb0d7c4aebf9e97409fd
+DIST vector-algorithms-0.9.0.1.tar.gz 29149 BLAKE2B 4d1e713845c311ca6eea96ad6f42ee53e4fc115b5abe77fd582c5904e3fe8c6c6006a5f4adb0353919931b8f9c99aed812128bca36362e9571d4848ac00a7af6 SHA512 007a0aeac87ca6596cae0f67e8ab5cd3ac4120df940dd221745d86c6500fa1e732d6096248ba613472c57825283cae6a2d67d2d2a5a652496f9ad17c91f9b620
diff --git a/dev-haskell/vector-algorithms/files/vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch b/dev-haskell/vector-algorithms/files/vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch
deleted file mode 100644
index 3616dd76d82c..000000000000
--- a/dev-haskell/vector-algorithms/files/vector-algorithms-0.7.0.1-ghc-8.0.2_rc1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/tests/properties/Tests.hs b/tests/properties/Tests.hs
-index a0b7d35..8fcfd36 100644
---- a/tests/properties/Tests.hs
-+++ b/tests/properties/Tests.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE ImpredicativeTypes, RankNTypes, TypeOperators, FlexibleContexts #-}
-+{-# LANGUAGE ImpredicativeTypes, RankNTypes, TypeOperators, FlexibleContexts, ScopedTypeVariables #-}
- 
-@@ -44,4 +44,4 @@ args = stdArgs
- 
--check_Int_sort = forM_ algos $ \(name,algo) ->
--  quickCheckWith args (label name . prop_fullsort algo)
-+check_Int_sort = forM_ algos (\(name,algo :: Algo Int ()) ->
-+  quickCheckWith args (label name . prop_fullsort algo))
-  where
-@@ -55,4 +55,4 @@ check_Int_sort = forM_ algos $ \(name,algo) ->
- 
--check_Int_partialsort = forM_ algos $ \(name,algo) ->
--  quickCheckWith args (label name . prop_partialsort algo)
-+check_Int_partialsort = forM_ algos (\(name,algo :: SizeAlgo Int ()) ->
-+  quickCheckWith args (label name . prop_partialsort algo))
-  where
-@@ -63,4 +63,4 @@ check_Int_partialsort = forM_ algos $ \(name,algo) ->
- 
--check_Int_select = forM_ algos $ \(name,algo) ->
--  quickCheckWith args (label name . prop_select algo)
-+check_Int_select = forM_ algos (\(name,algo :: SizeAlgo Int ()) ->
-+  quickCheckWith args (label name . prop_select algo))
-  where
-@@ -119,10 +119,10 @@ check_permutation = do
-   qc $ label "introsort"    . prop_permutation (INT.sort :: Algo Int ())
--  qc $ label "intropartial" . prop_sized (const . prop_permutation)
-+  qc $ label "intropartial" . prop_sized (\x -> const (prop_permutation x))
-                                          (INT.partialSort :: SizeAlgo Int ())
--  qc $ label "introselect"  . prop_sized (const . prop_permutation)
-+  qc $ label "introselect"  . prop_sized (\x -> const (prop_permutation x))
-                                          (INT.select :: SizeAlgo Int ())
-   qc $ label "heapsort"     . prop_permutation (H.sort :: Algo Int ())
--  qc $ label "heappartial"  . prop_sized (const . prop_permutation)
-+  qc $ label "heappartial"  . prop_sized (\x -> const (prop_permutation x))
-                                          (H.partialSort :: SizeAlgo Int ())
--  qc $ label "heapselect"   . prop_sized (const . prop_permutation)
-+  qc $ label "heapselect"   . prop_sized (\x -> const (prop_permutation x))
-                                          (H.select :: SizeAlgo Int ())
diff --git a/dev-haskell/vector-algorithms/metadata.xml b/dev-haskell/vector-algorithms/metadata.xml
index 4a0d9fc89df7..7d5210abf463 100644
--- a/dev-haskell/vector-algorithms/metadata.xml
+++ b/dev-haskell/vector-algorithms/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="bench">Build a benchmarking program.</flag>
-		<flag name="boundschecks">Enable bounds checking.</flag>
+		<flag name="bench">Build a benchmarking program to test vector-algorithms performance</flag>
+		<flag name="boundschecks">Enable bounds checking</flag>
 		<flag name="internalchecks">Enable internal consistency checks at the cost of a significant performance penalty.</flag>
-		<flag name="properties">Enable quickcheck tests.</flag>
+		<flag name="properties">Enable the quickcheck tests</flag>
 		<flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a significant performance penalty.</flag>
 	</use>
-	<longdescription>
-		Efficient algorithms for vector arrays
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">vector-algorithms</remote-id>
+		<remote-id type="github">erikd/vector-algorithms</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild
deleted file mode 100644
index 60de2b4a02fb..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.6.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient algorithms for vector arrays"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bench +boundschecks internalchecks +properties unsafechecks"
-
-RESTRICT=test # hangs
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( properties? ( >=dev-haskell/quickcheck-2 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bench bench) \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag properties properties) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild
deleted file mode 100644
index 9a143ddec1ca..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.7.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient algorithms for vector arrays"
-HOMEPAGE="http://code.haskell.org/~dolio/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bench +boundschecks internalchecks +properties unsafechecks"
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( properties? ( >=dev-haskell/quickcheck-2 ) )
-"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bench bench) \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag properties properties) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild
deleted file mode 100644
index a1fcf35bd7ab..000000000000
--- a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.1
-#hackport: flags: -llvm
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient algorithms for vector arrays"
-HOMEPAGE="https://github.com/erikd/vector-algorithms/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bench +boundschecks internalchecks +properties unsafechecks"
-
-RDEPEND=">=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.9.2
-	test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14 ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bench bench) \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		--flag=-llvm \
-		$(cabal_flag properties properties) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild
new file mode 100644
index 000000000000..511e4de77a01
--- /dev/null
+++ b/dev-haskell/vector-algorithms/vector-algorithms-0.8.0.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -llvm
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient algorithms for vector arrays"
+HOMEPAGE="https://github.com/erikd/vector-algorithms/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+bench +boundschecks internalchecks +properties unsafechecks"
+
+RDEPEND=">=dev-haskell/primitive-0.3:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/tagged-0.4:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.15 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bench bench) \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		--flag=-llvm \
+		$(cabal_flag properties properties) \
+		$(cabal_flag unsafechecks unsafechecks)
+}
diff --git a/dev-haskell/vector-algorithms/vector-algorithms-0.9.0.1-r1.ebuild b/dev-haskell/vector-algorithms/vector-algorithms-0.9.0.1-r1.ebuild
new file mode 100644
index 000000000000..1bb09c174af8
--- /dev/null
+++ b/dev-haskell/vector-algorithms/vector-algorithms-0.9.0.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -llvm
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient algorithms for vector arrays"
+HOMEPAGE="https://github.com/erikd/vector-algorithms/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+bench +boundschecks internalchecks +properties unsafechecks"
+
+RDEPEND=">=dev-haskell/bitvec-1.0:=[profile?] <dev-haskell/bitvec-1.2:=[profile?]
+	>=dev-haskell/primitive-0.6.2.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+
+# bug 916191
+RDEPEND+="
+	|| (
+		dev-haskell/bitvec[gmp]
+		dev-lang/ghc[gmp]
+	)
+"
+
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( properties? ( >dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.15 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bench bench) \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		--flag=-llvm \
+		$(cabal_flag properties properties) \
+		$(cabal_flag unsafechecks unsafechecks)
+}
diff --git a/dev-haskell/vector-binary-instances/Manifest b/dev-haskell/vector-binary-instances/Manifest
index 336df1853d3d..e69c08aae130 100644
--- a/dev-haskell/vector-binary-instances/Manifest
+++ b/dev-haskell/vector-binary-instances/Manifest
@@ -1,3 +1,3 @@
-DIST vector-binary-instances-0.2.1.0.tar.gz 3114 BLAKE2B 24982160160805717302f602ca7e7aa97487ea1af51ebab7577eb5a744c38dbeefc56fbe46538a492095e16db13df7aaa9978dd8d2ed2c0c082bebce6f584a34 SHA512 37955552fc7ea24f35760f8e791d115329591ac720f66bc94db172cf609c67b51d8f075cdcda96e3fcbf9f4fd566557ebdeb306d86e7512e8acf526d691b4ff7
-DIST vector-binary-instances-0.2.3.2.tar.gz 3989 BLAKE2B 69d25cdce13e999551ca0027171d252a5b2cf8868ef8f2415b1dfaa6df5f955bfdf257837ac67fb73a82526374b6d562afbf6705e6431659e234df186a16c0ba SHA512 ef3ef6a11dc5b35c2b24eb8b6487e6ad3ba73267107e8e8b4b172afbdd10d1d283d653025cfbd9089d4c2135d881e2b7efb5427a8dabcbef51de4ecadb332d62
 DIST vector-binary-instances-0.2.5.1.tar.gz 4067 BLAKE2B 4c4bc50e10be05d0a063cd417198c52e5f79e94547b69eac5d87d26762e62e92dbcb9dfc3209a4d105ca6e3ae772a918de1b983856beeb9117c5c9fdae467b21 SHA512 a16202b8ca3f88df82c27b37511087008579296363c73fe09ab19b00dee0fbaf98699b79b08d7e7410fcd062c03f2c5d1560f6b1c9ebf1ab8290596a35758be0
+DIST vector-binary-instances-0.2.5.2-rev5.cabal 2728 BLAKE2B 33fa3b860a5f5ff2e9a6b2cfa9a3d58fe9715a7973c95ac745ac2e33993d3d7555f77a16a924e201b8214edab5d060348bbf4acbe19341f4466512dba788cd0e SHA512 28f94e3192c498d24a91ebcdc8e8e54fdbfa6d0b0d7d39a325874c986b311939a7f4f888796fd669acab758f64e7742073518cf66a89b5714822bee1d372dc91
+DIST vector-binary-instances-0.2.5.2.tar.gz 4028 BLAKE2B 45e222d9ef3be00af5e40062092ff78526ce7837125880f18ba3359cbba2d5046d13ac81ef3409d4d81a990df60013d732b6f4f85ea2e65e1c806035899e8033 SHA512 885dff7f6508113c355bb125c3949fd722ea5c6e834beb3083e1e6cc16f84bba1b8fd44cd41990af79f095a18fd282dd1ccd94ccf586c5ca08e54b0454575d03
diff --git a/dev-haskell/vector-binary-instances/metadata.xml b/dev-haskell/vector-binary-instances/metadata.xml
index db582d2c5586..58610ac88ae7 100644
--- a/dev-haskell/vector-binary-instances/metadata.xml
+++ b/dev-haskell/vector-binary-instances/metadata.xml
@@ -1,31 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Instances for Binary for the types defined in the vector package,
-		making it easy to serialize vectors to and from disk. We use the
-		generic interface to vectors, so all vector types are supported.
-		Specific instances are provided for unboxed, boxed and storable
-		vectors.
-		
-		To serialize a vector:
-		
-		&gt; *Data.Vector.Binary&gt; let v = Data.Vector.fromList [1..10]
-		&gt; *Data.Vector.Binary&gt; v
-		&gt; fromList [1,2,3,4,5,6,7,8,9,10] :: Data.Vector.Vector
-		&gt; *Data.Vector.Binary&gt; encode v
-		&gt; Chunk "\NUL\NUL\NUL\NUL\NUL...\NUL\NUL\NUL\t\NUL\NUL\NUL\NUL\n" Empty
-		
-		Which you can in turn compress before writing to disk:
-		
-		&gt; compress . encode $ v
-		&gt; Chunk "\US\139\b\NUL\NUL\N...\229\240,\254:\NUL\NUL\NUL" Empty
-	</longdescription>
 	<upstream>
-		<remote-id type="github">bos/vector-binary-instances</remote-id>
+		<remote-id type="hackage">vector-binary-instances</remote-id>
+		<remote-id type="github">haskell/vector-binary-instances</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.1.0.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.1.0.ebuild
deleted file mode 100644
index dfb1e1adbd1e..000000000000
--- a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Instances of Data.Binary and Data.Serialize for vector"
-HOMEPAGE="https://github.com/bos/vector-binary-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/binary:=[profile?]
-		dev-haskell/cereal:=[profile?]
-		>=dev-haskell/vector-0.6:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.3.2.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.3.2.ebuild
deleted file mode 100644
index 30976a6e7fce..000000000000
--- a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Instances of Data.Binary and Data.Serialize for vector"
-HOMEPAGE="https://github.com/bos/vector-binary-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.7:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
index b0d4d4dbe607..9c187d288c83 100644
--- a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
+++ b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.5.6.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.13:=[profile?]
@@ -26,9 +26,6 @@ DEPEND="${RDEPEND}
 		dev-haskell/tasty-quickcheck )
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
+CABAL_CHDEPS=(
 		'base > 3 && < 4.13' 'base > 3'
-}
+)
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.2.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.2.ebuild
new file mode 100644
index 000000000000..9bf1ecccbee9
--- /dev/null
+++ b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Instances of Data.Binary for vector"
+HOMEPAGE="https://github.com/haskell/vector-binary-instances"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/vector-builder/Manifest b/dev-haskell/vector-builder/Manifest
deleted file mode 100644
index fdf9e0514f40..000000000000
--- a/dev-haskell/vector-builder/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vector-builder-0.3.8.tar.gz 5045 BLAKE2B 1e599a0e50102c50cd6057cf892d97f9dad7468b0e49500743bf422b8a9e085d062b9b4e13ae9bb68d3c59e6bb549e77a962fdaed91d5a3e3e5d74b8ec45a6b7 SHA512 e7ca1b6ba35aa76e16ad485cfd5e326c2b257339d2aadc57b7ce2a5ec3d5790fec99e5546ea18351cd9cbf31e7ec99c737461950acd355f62be27b53edb2be17
diff --git a/dev-haskell/vector-builder/metadata.xml b/dev-haskell/vector-builder/metadata.xml
deleted file mode 100644
index 95e22703be14..000000000000
--- a/dev-haskell/vector-builder/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		An API for efficient and convenient construction of vectors.
-		It provides the composable `Builder` abstraction, which has instances of the `Monoid` and `Semigroup` classes.
-		
-		[Usage]
-		
-		First you use the `Builder` abstraction to specify the structure of the vector.
-		Then you execute the builder to actually produce the vector.
-		
-		[Example]
-		
-		The following code shows how you can efficiently concatenate different datastructures into a single immutable vector:
-		
-		&gt;
-		&gt;import qualified Data.Vector as A
-		&gt;import qualified VectorBuilder.Builder as B
-		&gt;import qualified VectorBuilder.Vector as C
-		&gt;
-		&gt;
-		&gt;myVector :: A.Vector a -&gt; [a] -&gt; a -&gt; A.Vector a
-		&gt;myVector vector list element =
-		&gt;  C.build builder
-		&gt;  where
-		&gt;    builder =
-		&gt;      B.vector vector &lt;&gt;
-		&gt;      foldMap B.singleton list &lt;&gt;
-		&gt;      B.singleton element
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild b/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild
deleted file mode 100644
index 5c2ac8cc49f5..000000000000
--- a/dev-haskell/vector-builder/vector-builder-0.3.8.ebuild
+++ /dev/null
@@ -1,34 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Vector builder"
-HOMEPAGE="https://github.com/nikita-volkov/vector-builder"
-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-2:=[profile?]
-	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/attoparsec-0.13 <dev-haskell/attoparsec-0.14
-		>=dev-haskell/quickcheck-2.8.1 <dev-haskell/quickcheck-3
-		>=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.4
-		<dev-haskell/rerebase-2
-		>=dev-haskell/tasty-0.12 <dev-haskell/tasty-2
-		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.9 <dev-haskell/tasty-quickcheck-0.11 )
-"
diff --git a/dev-haskell/vector-instances/Manifest b/dev-haskell/vector-instances/Manifest
deleted file mode 100644
index 00b97fc0dbd7..000000000000
--- a/dev-haskell/vector-instances/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST vector-instances-3.3.1.tar.gz 3726 BLAKE2B d7d592c0cac6745449aefabc87c6475bcd26012a6917e9a5d5d1167384f3901e75aeb53653ab9fe3644575a5601049d1b0a7b99e8425fd447eee9ac05c375c47 SHA512 0416532a83ee6f750e51296f1c8a3cf1f374a316bbc30638501e663199434fca28f85064660a9fc0bdbfb08ff5919c0ba1662dba704ff50bd8a7bd1ce09d56ae
-DIST vector-instances-3.4.tar.gz 5276 BLAKE2B ca68a6cb0a4b9aeab81409e757d7d5d5a18c53ed826668fa75725b52e374d4047ee096d392557c9c316aaa9740c307165d0aa5658542edb8827be5ddf9a883cc SHA512 67ffd6b941909bda1b6f26c8c7579fc495267425461f15f20bbaecf22b67d3dbf4ee88eb2ac76232f47917c26558eb325fedfe8ffc97368bbe1ad90fb427a7b1
diff --git a/dev-haskell/vector-instances/metadata.xml b/dev-haskell/vector-instances/metadata.xml
deleted file mode 100644
index a07a56ad4976..000000000000
--- a/dev-haskell/vector-instances/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="hashable">use <pkg>dev-haskell/hashable</pkg></flag>
-	</use>
-	<longdescription>
-		Orphan Instances for 'Data.Vector'
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ekmett/vector-instances</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/vector-instances/vector-instances-3.3.1.ebuild b/dev-haskell/vector-instances/vector-instances-3.3.1.ebuild
deleted file mode 100644
index 484c045a5020..000000000000
--- a/dev-haskell/vector-instances/vector-instances-3.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan Instances for 'Data.Vector'"
-HOMEPAGE="https://github.com/ekmett/vector-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/comonad-3:=[profile?]
-	>=dev-haskell/keys-3:=[profile?]
-	>=dev-haskell/pointed-3:=[profile?]
-	>=dev-haskell/semigroupoids-3:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/vector-instances/vector-instances-3.4.ebuild b/dev-haskell/vector-instances/vector-instances-3.4.ebuild
deleted file mode 100644
index 80286959a696..000000000000
--- a/dev-haskell/vector-instances/vector-instances-3.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Orphan Instances for 'Data.Vector'"
-HOMEPAGE="https://github.com/ekmett/vector-instances"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+hashable"
-
-RDEPEND=">=dev-haskell/comonad-3:=[profile?]
-	>=dev-haskell/keys-3:=[profile?]
-	>=dev-haskell/pointed-3:=[profile?]
-	>=dev-haskell/semigroupoids-3:=[profile?]
-	>=dev-haskell/semigroups-0.8.3.1:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	hashable? ( >=dev-haskell/hashable-1.1.1.0:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag hashable hashable)
-}
diff --git a/dev-haskell/vector-space/Manifest b/dev-haskell/vector-space/Manifest
deleted file mode 100644
index 0ce249a40d7d..000000000000
--- a/dev-haskell/vector-space/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vector-space-0.10.4.tar.gz 14249 BLAKE2B 519f99dfec2bb4999939b2b3247822202ab93832597c2412a3ec97a8ddb7b74329b98fe296e7aa0dd96297c9ca802346cf9d6478755995a7e40e9e01c8584611 SHA512 c7218701fe837eab01cd65b3bc0ce2d85fb3a73c8aa034bb606b7bc0bbe87856dc5f375bd1515f65f77e08e12d84b63757d0ba755ae726771888ea7413bac183
diff --git a/dev-haskell/vector-space/metadata.xml b/dev-haskell/vector-space/metadata.xml
deleted file mode 100644
index 159853575fc3..000000000000
--- a/dev-haskell/vector-space/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		/vector-space/ provides classes and generic operations for vector
-		spaces and affine spaces.  It also defines a type of infinite towers
-		of generalized derivatives.  A generalized derivative is a linear
-		transformation rather than one of the common concrete representations
-		(scalars, vectors, matrices, ...).
-		
-		/Warning/: this package depends on type families working fairly well,
-		and requires ghc version at least 6.9.
-		
-		Project wiki page: &lt;http://haskell.org/haskellwiki/vector-space&gt;
-		
-		&amp;#169; 2008-2012 by Conal Elliott; BSD3 license.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/vector-space/vector-space-0.10.4.ebuild b/dev-haskell/vector-space/vector-space-0.10.4.ebuild
deleted file mode 100644
index 9d34c0aa1878..000000000000
--- a/dev-haskell/vector-space/vector-space-0.10.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Vector & affine spaces, linear maps, and derivatives"
-HOMEPAGE="https://hackage.haskell.org/package/vector-space"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/boolean-0.1.0:=[profile?]
-	>=dev-haskell/memotrie-0.5:=[profile?]
-	>=dev-haskell/numinstances-1.0:=[profile?]
-	>=dev-lang/ghc-7.4.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 2cc6f1f2db7f..2a47db129c81 100644
--- a/dev-haskell/vector-th-unbox/Manifest
+++ b/dev-haskell/vector-th-unbox/Manifest
@@ -1,3 +1,3 @@
-DIST vector-th-unbox-0.2.1.3.tar.gz 4585 BLAKE2B 507f1ee7228024e446e5f9d8d871cae67497301634e09ce2d4566fbf4f6da1bab3fea00207b5a7337075dcdb9a18d779b1d8df6784f9ec3c83815d076f726276 SHA512 187d23b84387c14a45aa97e196d51d1e171dea2a93b400023db552a8fdfb2d9c5ba4c3cb3589ee73abe612e63b4889851fac889d3b6cd0216dd2d853c24d57ba
-DIST vector-th-unbox-0.2.1.6.tar.gz 4717 BLAKE2B 89e1d2fed19e89fab2fc0c20cdcbb387c07f9a8aadb05a02482d3760c3a4b1d5e50c16929b9d5fb5d0b28f79360790884e80d4978f15be3b5f1e75217b31c517 SHA512 e25bbe44cbdf47ee4e89bac358cce4179c49ce00d676fec911a1ba6be5d81fc70072f55374442c8209cf2023d0a91b8fce3e2a266294aa04ed9b12acbd7dc955
 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
diff --git a/dev-haskell/vector-th-unbox/metadata.xml b/dev-haskell/vector-th-unbox/metadata.xml
index 4d584e01ce4b..e088f89cce76 100644
--- a/dev-haskell/vector-th-unbox/metadata.xml
+++ b/dev-haskell/vector-th-unbox/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A Template Haskell deriver for unboxed vectors, given a pair of coercion
-		functions to and from some existing type with an Unbox instance.
-		
-		Refer to "Data.Vector.Unboxed.Deriving" for documentation and examples.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">vector-th-unbox</remote-id>
+		<remote-id type="github">tsurucapital/vector-th-unbox</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.3.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.3.ebuild
deleted file mode 100644
index 4bf941727b93..000000000000
--- a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deriver for Data.Vector.Unboxed using Template Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/vector-th-unbox"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/data-default )
-"
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.6.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.6.ebuild
deleted file mode 100644
index 55f3fa983a3f..000000000000
--- a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Deriver for Data.Vector.Unboxed using Template Haskell"
-HOMEPAGE="https://hackage.haskell.org/package/vector-th-unbox"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/vector-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/data-default )
-"
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 820ebe66aefa..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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -14,13 +14,18 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+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
 	test? ( dev-haskell/data-default )
 "
+
+CABAL_CHDEPS=(
+	'base >= 4.5 && < 4.14' 'base >= 4.5'
+	'template-haskell >= 2.5 && <2.16' 'template-haskell >= 2.5'
+)
diff --git a/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.2.ebuild b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.2.ebuild
new file mode 100644
index 000000000000..130f998cd233
--- /dev/null
+++ b/dev-haskell/vector-th-unbox/vector-th-unbox-0.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Deriver for Data.Vector.Unboxed using Template Haskell"
+HOMEPAGE="https://github.com/tsurucapital/vector-th-unbox"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/vector-0.7.1:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( dev-haskell/data-default )
+"
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index 6ebe657084e2..6cc95a4e6de1 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -1,3 +1,3 @@
-DIST vector-0.10.12.3.tar.gz 103617 BLAKE2B cd4a4fda8a3da5b431c316d04b23eb82947f08cc930059beb3182c9c68d646c6a767168ae2fd82d06a782991b055421a0558dbf41a1e92f06d265c043cdb2048 SHA512 2b2c98f1fbaaf4f5e7243e18a08e373e85acb06dddf73a48d34b966bfd736efc72880babec9c47859bd8d6d6928a28ac9acd9134eb0ef61b2f88fa31bf18811b
-DIST vector-0.11.0.0.tar.gz 115558 BLAKE2B e2475a37593b92f896c48ff85f6e506fb5011d89173bb0fe12492ed8c6f9620f426c9db88cbc274b37aade52bf6ca3cbdc7cf03b013371b37f2d1b42c348a117 SHA512 4f31e45d08a08c09e5ce73cca4da70e954bf3921d05130b9458c7f2ba267602e0aafc96496595000fd7b82f80aa9147c880917dc64086dab7bf5b2cd426539e0
-DIST vector-0.12.1.2.tar.gz 131049 BLAKE2B d77981f49b89cab1aefa3237d87e84ae36c4586c20ca3f359c0855e3f3e15b8087849590bde06bd2017d83d92d8ff03ff1b9d8d949ceab382865707f16c723b0 SHA512 36d0237cf7c5a6b78f88b33ff09ea8b19baeaf85609efdeba9ab802ca588956457d4607304b73e8d58e9e802a9101c23da62caee71508f069047a6d531e50170
+DIST vector-0.12.3.1-rev1.cabal 7946 BLAKE2B f1545c06c3a2ce405c9bc498e471b640fa415acd3413fbb3514fd0ea9422f4c7d51ee9ff8b6041da842c45a156132f6eebf89ea11b843835fd360b7c1dafa8f3 SHA512 292df3231e4f34bc038efa769928813808e562553188547420a83a5d068e5d591a169957ef50da42da66b5ba9eea12408b3e739f0f9edb76f06977d6b75a4843
+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
diff --git a/dev-haskell/vector/files/vector-0.11.0.0-primitive-0.6.2.0.patch b/dev-haskell/vector/files/vector-0.11.0.0-primitive-0.6.2.0.patch
deleted file mode 100644
index 3b78ad74efc3..000000000000
--- a/dev-haskell/vector/files/vector-0.11.0.0-primitive-0.6.2.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Data/Vector.hs b/Data/Vector.hs
-index db6dfb7..f074bf0 100644
---- a/Data/Vector.hs
-+++ b/Data/Vector.hs
-@@ -152,3 +152,3 @@ module Data.Vector (
-   -- ** Lists
--  toList, fromList, fromListN,
-+  toList, Data.Vector.fromList, Data.Vector.fromListN,
- 
-@@ -222,4 +222,4 @@ instance Exts.IsList (Vector a) where
-   type Item (Vector a) = a
--  fromList = fromList
--  fromListN = fromListN
-+  fromList = Data.Vector.fromList
-+  fromListN = Data.Vector.fromListN
-   toList = toList
-@@ -343,3 +343,3 @@ instance Traversable.Traversable Vector where
-   {-# INLINE traverse #-}
--  traverse f xs = fromList Applicative.<$> Traversable.traverse f (toList xs)
-+  traverse f xs = Data.Vector.fromList Applicative.<$> Traversable.traverse f (toList xs)
- 
diff --git a/dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch b/dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch
new file mode 100644
index 000000000000..72f56dcb64de
--- /dev/null
+++ b/dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch
@@ -0,0 +1,86 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/1231
+
+doctest pulls in the out-of-scope packages if they are installed on the
+system. The best workaround is to use migrate to cabal-doctest.
+
+diff -urN vector-0.12.3.1/Setup.hs vector-0.12.3.1-r1/Setup.hs
+--- vector-0.12.3.1/Setup.hs	2021-09-21 10:02:15.000000000 -0600
++++ vector-0.12.3.1-r1/Setup.hs	2022-03-22 22:12:57.107142731 -0600
+@@ -1,3 +1,6 @@
+-import Distribution.Simple
+-main = defaultMain
++module Main (main) where
+ 
++import Distribution.Extra.Doctest ( defaultMainWithDoctests )
++
++main :: IO ()
++main = defaultMainWithDoctests "vector-doctest"
+diff -urN vector-0.12.3.1/tests/doctests.hs vector-0.12.3.1-r1/tests/doctests.hs
+--- vector-0.12.3.1/tests/doctests.hs	2021-09-21 10:02:15.000000000 -0600
++++ vector-0.12.3.1-r1/tests/doctests.hs	2022-03-22 22:14:54.557142788 -0600
+@@ -1,4 +1,30 @@
+ import Test.DocTest (doctest)
++import GHC.IO.Encoding (setLocaleEncoding)
++import System.Directory (getCurrentDirectory, makeAbsolute)
++import System.FilePath.Posix ((</>))
++import System.IO (utf8)
++import Build_doctests (pkgs)
+ 
+ main :: IO ()
+-main = doctest ["-Iinclude", "-Iinternal", "Data"]
++main = do
++    setLocaleEncoding utf8
++    pwd    <- getCurrentDirectory
++    prefix <- makeAbsolute pwd
++
++    let customFlags =
++            [ "-package-env=-"
++            , "-hide-all-packages"
++            , "-no-user-package-db"
++            , "-package-db=" ++ prefix </> "dist/package.conf.inplace"
++            ]
++
++    let origFlags =
++            [ "-Iinclude"
++            , "-Iinternal"
++            ]
++
++    let modules =
++            [ "Data"
++            ]
++
++    doctest $ customFlags ++ pkgs ++ origFlags ++ modules
+diff -urN vector-0.12.3.1/vector.cabal vector-0.12.3.1-r1/vector.cabal
+--- vector-0.12.3.1/vector.cabal	2022-03-22 22:09:55.787142644 -0600
++++ vector-0.12.3.1-r1/vector.cabal	2022-03-22 22:12:23.547142715 -0600
+@@ -49,7 +49,7 @@
+ 
+ 
+ Cabal-Version:  >=1.10
+-Build-Type:     Simple
++Build-Type:     Custom
+ 
+ Extra-Source-Files:
+       changelog.md
+@@ -99,6 +99,11 @@
+   Default: False
+   Manual: True
+ 
++custom-setup
++  setup-depends:
++      base
++    , Cabal
++    , cabal-doctest
+ 
+ Library
+   Default-Language: Haskell2010
+@@ -288,4 +293,6 @@
+         base      -any
+       , doctest   >=0.15 && <0.19
+       , primitive >= 0.6.4.0 && < 0.8
+-      , vector    -any
++      , directory
++      , filepath
++      , base-compat
diff --git a/dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch b/dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch
new file mode 100644
index 000000000000..1a04dd89c7f0
--- /dev/null
+++ b/dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch
@@ -0,0 +1,27 @@
+From eb479f24b766425dd522ba01e0c298fc814c788d Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sat, 4 Mar 2023 14:46:07 -0700
+Subject: [PATCH] Disable doctests
+
+Doctests are not working on ghc-9.2
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ vector.cabal | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/vector.cabal b/vector.cabal
+index cea122a..c738a35 100644
+--- a/vector.cabal
++++ b/vector.cabal
+@@ -274,6 +274,7 @@ test-suite vector-tests-O2
+       Ghc-Options: -Wno-redundant-constraints
+ 
+ test-suite vector-doctest
++  buildable:        False
+   type:             exitcode-stdio-1.0
+   main-is:          doctests.hs
+   hs-source-dirs:   tests
+-- 
+2.39.2
+
diff --git a/dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch b/dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch
new file mode 100644
index 000000000000..8a8db580f225
--- /dev/null
+++ b/dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch
@@ -0,0 +1,42 @@
+From df8dd8e8e84005aa6b187b03cd502f3c6e18cf3c Mon Sep 17 00:00:00 2001
+From: Bodigrim <andrew.lelechenko@gmail.com>
+Date: Sun, 4 Jun 2023 17:55:28 +0100
+Bug: https://github.com/haskell/vector/pull/461
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Subject: [PATCH] Fix instance TestData Float/Double
+
+---
+ vector/tests/Utilities.hs | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/vector/tests/Utilities.hs b/vector/tests/Utilities.hs
+index 24799554..ae19d425 100644
+--- a/tests/Utilities.hs
++++ b/tests/Utilities.hs
+@@ -121,10 +121,24 @@ instance TestData ty where { \
+ id_TestData(())
+ id_TestData(Bool)
+ id_TestData(Int)
+-id_TestData(Float)
+-id_TestData(Double)
+ id_TestData(Ordering)
+ 
++instance TestData Float where
++  type Model Float = Float
++  model = id
++  unmodel = id
++
++  type EqTest Float = Property
++  equal x y = property (x == y || (isNaN x && isNaN y))
++
++instance TestData Double where
++  type Model Double = Double
++  model = id
++  unmodel = id
++
++  type EqTest Double = Property
++  equal x y = property (x == y || (isNaN x && isNaN y))
++
+ bimapEither :: (a -> b) -> (c -> d) -> Either a c -> Either b d
+ bimapEither f _ (Left a) = Left (f a)
+ bimapEither _ g (Right c) = Right (g c)
diff --git a/dev-haskell/vector/metadata.xml b/dev-haskell/vector/metadata.xml
index fac2f4dc8e54..d7ad3155bea8 100644
--- a/dev-haskell/vector/metadata.xml
+++ b/dev-haskell/vector/metadata.xml
@@ -1,75 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		An efficient implementation of Int-indexed arrays (both mutable
-		and immutable), with a powerful loop optimisation framework .
-
-		It is structured as follows:
-
-		["Data.Vector"] Boxed vectors of arbitrary types.
-
-		["Data.Vector.Unboxed"] Unboxed vectors with an adaptive
-		representation based on data type families.
-
-		["Data.Vector.Storable"] Unboxed vectors of 'Storable' types.
-
-		["Data.Vector.Primitive"] Unboxed vectors of primitive types as
-		defined by the @primitive@ package. "Data.Vector.Unboxed" is more
-		flexible at no performance cost.
-
-		["Data.Vector.Generic"] Generic interface to the vector types.
-
-		Each module has a @Safe@ version with is marked as @Trustworthy@
-		(see &lt;http://hackage.haskell.org/trac/ghc/wiki/SafeHaskell&gt;).
-
-		There is also a (draft) tutorial on common uses of vector.
-
-		* &lt;http://haskell.org/haskellwiki/Numeric_Haskell:_A_Vector_Tutorial&gt;
-
-		Please use the project trac to submit bug reports and feature
-		requests.
-
-		* &lt;http://trac.haskell.org/vector&gt;
-
-		Changes in version 0.9
-
-		* 'MonadPlus' instance for boxed vectors
-
-		* Export more @construct@ and @constructN@ from @Safe@ modules
-
-		* Require @primitive-0.4.0.1@
-
-		Changes in version 0.8
-
-		* New functions: @constructN@, @constructrN@
-
-		* Support for GHC 7.2 array copying primitives
-
-		* New fixity for @(!)@
-
-		* Safe Haskell support (contributed by David Terei)
-
-		* 'Functor', 'Monad', 'Applicative', 'Alternative', 'Foldable' and
-		'Traversable' instances for boxed vectors
-		(/WARNING: they tend to be slow and are only provided for completeness/)
-
-		* 'Show' instances for immutable vectors follow containers conventions
-
-		* 'Read' instances for all immutable vector types
-
-		* Performance improvements
-	</longdescription>
 	<use>
 		<flag name="boundschecks">Enable bounds checking</flag>
-		<flag name="internalchecks">Enable internal consistency checks at the cost of a significant performance penalty</flag>
-		<flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a significant performance penalty</flag>
+		<flag name="internalchecks">Enable internal consistency checks at the cost of a
+significant performance penalty</flag>
+		<flag name="unsafechecks">Enable bounds checking in unsafe operations at the cost of a
+significant performance penalty</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">vector</remote-id>
 		<remote-id type="github">haskell/vector</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/vector/vector-0.10.12.3.ebuild b/dev-haskell/vector/vector-0.10.12.3.ebuild
deleted file mode 100644
index 737b447e1554..000000000000
--- a/dev-haskell/vector/vector-0.10.12.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient Arrays"
-HOMEPAGE="https://github.com/haskell/vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+boundschecks internalchecks unsafechecks"
-
-RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9
-		dev-haskell/random
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2
-		>=dev-haskell/transformers-0.2.0.0 )
-"
-
-src_prepare() {
-	local can_spec_const="yes"
-
-	cabal_chdeps \
-		"QuickCheck >=  2.7  && < 2.8" "QuickCheck >=  2.7  && < 2.9"
-
-	ghc-supports-interpreter || can_spec_const="no"
-
-	# ghci-less GHC can't do ANN #482960
-	if [[ ${can_spec_const} == "no" ]]; then
-		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
-		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
-			-i Data/Vector/Fusion/Stream/Monadic.hs || die
-	fi
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector/vector-0.11.0.0.ebuild b/dev-haskell/vector/vector-0.11.0.0.ebuild
deleted file mode 100644
index f78779315b57..000000000000
--- a/dev-haskell/vector/vector-0.11.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: #666812
-inherit haskell-cabal
-
-DESCRIPTION="Efficient Arrays"
-HOMEPAGE="https://github.com/haskell/vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="+boundschecks internalchecks unsafechecks"
-
-RESTRICT=test # -O2 -g makes tests build hang
-
-RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-PATCHES=("${FILESDIR}"/${P}-primitive-0.6.2.0.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		"QuickCheck >=  2.7  && < 2.8" "QuickCheck >=  2.7" \
-		'base >= 4.3 && < 4.9' 'base >= 4.3' \
-		'ghc-prim >= 0.2 && < 0.5' 'ghc-prim >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag unsafechecks unsafechecks)
-}
diff --git a/dev-haskell/vector/vector-0.12.1.2.ebuild b/dev-haskell/vector/vector-0.12.1.2.ebuild
deleted file mode 100644
index d03f43378f3f..000000000000
--- a/dev-haskell/vector/vector-0.12.1.2.ebuild
+++ /dev/null
@@ -1,46 +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.4.9999
-#hackport: flags: -wall
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient Arrays"
-HOMEPAGE="https://github.com/haskell/vector"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boundschecks internalchecks unsafechecks"
-
-RESTRICT="test" # test-suite is too memory intensive
-
-RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
-	>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.20:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10"
-# 	test? ( >=dev-haskell/base-orphans-0.6
-# 		dev-haskell/hunit
-# 		>=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.14
-# 		dev-haskell/random
-# 		dev-haskell/tasty
-# 		dev-haskell/tasty-hunit
-# 		dev-haskell/tasty-quickcheck
-# 		>=dev-haskell/transformers-0.2.0.0 )
-# "
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag boundschecks boundschecks) \
-		$(cabal_flag internalchecks internalchecks) \
-		$(cabal_flag unsafechecks unsafechecks) \
-		--flag=-wall
-}
diff --git a/dev-haskell/vector/vector-0.12.3.1-r1.ebuild b/dev-haskell/vector/vector-0.12.3.1-r1.ebuild
new file mode 100644
index 000000000000..23f7fd1c6530
--- /dev/null
+++ b/dev-haskell/vector/vector-0.12.3.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+#hackport: flags: -wall
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient Arrays"
+HOMEPAGE="https://github.com/haskell/vector"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+boundschecks internalchecks unsafechecks"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.3.1-disable-doctests.patch"
+	"${FILESDIR}/${PN}-0.12.3.1-fix-testdata-float.patch"
+)
+
+RDEPEND="
+	>=dev-haskell/primitive-0.6.4.0:=[profile?] <dev-haskell/primitive-0.9:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/base-orphans-0.6
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.15
+		dev-haskell/random
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		$(cabal_flag unsafechecks unsafechecks) \
+		--flag=-wall
+}
diff --git a/dev-haskell/vector/vector-0.12.3.1.ebuild b/dev-haskell/vector/vector-0.12.3.1.ebuild
new file mode 100644
index 000000000000..76e5a4178141
--- /dev/null
+++ b/dev-haskell/vector/vector-0.12.3.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -wall
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Efficient Arrays"
+HOMEPAGE="https://github.com/haskell/vector"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+boundschecks internalchecks unsafechecks"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.3.1-cabal-doctest.patch"
+	"${FILESDIR}/${PN}-0.12.3.1-fix-testdata-float.patch"
+
+)
+
+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
+	test? ( >=dev-haskell/base-orphans-0.6
+		dev-haskell/base-compat
+		>=dev-haskell/doctest-0.15
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.15
+		dev-haskell/random
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
+
+CABAL_CHDEPS=(
+	'doctest   >=0.15 && <0.19' 'doctest >=0.15'
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		$(cabal_flag unsafechecks unsafechecks) \
+		--flag=-wall
+}
+
+GHC_BOOTSTRAP_PACKAGES=( cabal-doctest )
diff --git a/dev-haskell/void/Manifest b/dev-haskell/void/Manifest
index 13c429a3c406..236e5d73340d 100644
--- a/dev-haskell/void/Manifest
+++ b/dev-haskell/void/Manifest
@@ -1,3 +1 @@
-DIST void-0.6.1.tar.gz 3807 BLAKE2B 649b810bdb0d4ff1e670dee0d4f2feeb131eec09e10d4aeef1094b06dc0b2e4ed67ee3867c3a39d3efbd14ffea5479b54ea81e928a3bb345cc1b823eb35ef922 SHA512 9158e201547b43e97d13112d87ab27b7dddff90fff11727c880bbd03e50faf2755ff27c03710e7bd634325a2c31f07e70dae61e62d925fa1f31b0b66e3927c48
-DIST void-0.7.1.tar.gz 4103 BLAKE2B 194310d0aa555d7524fdda5e57be6e56026dbdf99a299cd03d20863027e3e67f86521d62cbfe56b5126513c0f6c06ef793fa537d190ca532bd965252f0d7bfce SHA512 15cffa3ad31f365ffd276d962ba6c401907d5f4d74deb0b2635a8dc9b516519961c7b5d44751a816cc3480d12bd84be4a81b05703e31d4e796a58c4205e4785c
 DIST void-0.7.3.tar.gz 6741 BLAKE2B ff5e21a4d902d23b056c39ab691d532c9be6d2c11452291629a0d40113a5fc72fd68f5713834c6a5ba5a07c3f4a4603faf8f53aa9968406a7d03468ffda78d48 SHA512 d9ecf726c6f7806d25d7d3f759a94d8b82c21c348b1cb7943c48d799bbdfdc01d9d729f1a64aebbf66d52275f2e69fa2b060db2fcb408b83a23ccff2730d8a11
diff --git a/dev-haskell/void/metadata.xml b/dev-haskell/void/metadata.xml
index 0c190a6bf351..edff337ecc00 100644
--- a/dev-haskell/void/metadata.xml
+++ b/dev-haskell/void/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A Haskell 98 logically uninhabited data type. Used to indicate that a given term should not exist.
-	</longdescription>
 	<use>
 		<flag name="safe">dissable effective but unsafe coersions</flag>
 	</use>
diff --git a/dev-haskell/void/void-0.6.1.ebuild b/dev-haskell/void/void-0.6.1.ebuild
deleted file mode 100644
index 28d8fec5ba60..000000000000
--- a/dev-haskell/void/void-0.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell 98 logically uninhabited data type"
-HOMEPAGE="https://github.com/ekmett/void"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="safe"
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
-		>=dev-haskell/semigroups-0.8.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag safe safe)
-}
diff --git a/dev-haskell/void/void-0.7.1.ebuild b/dev-haskell/void/void-0.7.1.ebuild
deleted file mode 100644
index e7c32f9fa3e4..000000000000
--- a/dev-haskell/void/void-0.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Haskell 98 logically uninhabited data type"
-HOMEPAGE="https://github.com/ekmett/void"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="safe"
-
-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
-	>=dev-haskell/semigroups-0.8.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag safe safe)
-}
diff --git a/dev-haskell/void/void-0.7.3.ebuild b/dev-haskell/void/void-0.7.3.ebuild
index dd7ae273a1d5..f7b4e5f0b776 100644
--- a/dev-haskell/void/void-0.7.3.ebuild
+++ b/dev-haskell/void/void-0.7.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="safe"
 
 RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
diff --git a/dev-haskell/wai-app-static/Manifest b/dev-haskell/wai-app-static/Manifest
index 53af146813af..4665adb4aadf 100644
--- a/dev-haskell/wai-app-static/Manifest
+++ b/dev-haskell/wai-app-static/Manifest
@@ -1,6 +1 @@
-DIST wai-app-static-1.3.2.1.tar.gz 19247 BLAKE2B 0082f01f36a4d5c9cbd26ddd48a647859000deea50140859d6e2bbc1641b782992f16d18a971ba0de7ff43d5fc41e264bcc5574d23fc77af091882bbb40f4fe4 SHA512 718d9f01169c087f9e90ed662258e54c2b8a5a46f0a6248503cb9447e078e680ec291876fdaabe71c17c110d8a9e0fec4378423ae6a778f8a0d02c71288e797c
-DIST wai-app-static-2.0.0.3.tar.gz 19337 BLAKE2B 0f6e079ba8ed171b046cdfa7cc07a56e4249f5379aece3f1e24db1938ff34da3b1cf53cd880b88895e100dface6a06fc568ce8abaf6cef777d354be00d8ba8b8 SHA512 b4b40719b300b2f7ad448f9a6f4acdc3258419c66a5ca39887466dfa689c4d80dac8bbefd2a57f521e0f66e1ff87c0710af55b5a0bbcaf1d4592c833c61d693d
-DIST wai-app-static-3.0.1.tar.gz 21502 BLAKE2B c19eba52bee7f6a2e6412c359438fcde28a7c4f50870631e788ef68a00702eddf525d709218e093448243f9f49e644acaac984ce93c6799ba2b5f02129ca4f04 SHA512 851c6c3d13d01dda0566c6c98364ddcc54b8aedb4775e9e491452ea672f3f8dfb05ee75d9c44e78a5c89944ab10f8b6646f3dc9d6bfe44e9f2abd910bb33f687
-DIST wai-app-static-3.1.4.1.tar.gz 22321 BLAKE2B afcea96f91e88c2abd3a186b9f9c5686719d2dfd0fb0e63fde728117547b9d0c15cd391f7c38711ab3bb4c46d02bf49cb3ff262d44e5a6c0b324c0d1fafc1cb7 SHA512 2a4925a48a09ca1d7e366a1b01961b0069c941f0987721e92cb0c257df8feefe78f0dc5f8c69680d155a3d1b1bdee95f4417fe734c14e02b0596475bead72b8f
-DIST wai-app-static-3.1.6.1.tar.gz 22686 BLAKE2B f6c41a0df5daf01d8a6cb9b440098b3e45c4ccaeb36624fd9bef2f9a0d99ab7cd0343c61a99d0cb8d22736272f5661b0c6daa5bbc64cf5eb6b1c554b65d7bc94 SHA512 a2a19a57f289ecec8b2cbae2d412783ebcc789c8518a357eed8bbeee01a6283f7e636c38065c815cba3af782e56363b644baa21b32f70dd851cb6fd0bff692c6
-DIST wai-app-static-3.1.7.1.tar.gz 22782 BLAKE2B 3112ae5b202b6f6c531cacfaebfaf4304404fb5e4846a950eb4cdfc50297d20ffef024649c575e257f1db6500a7d190b9b26472fff68d9d9b46398ee0a18d632 SHA512 eae193f79a15b9e995d3db3a8c8a4a80ac8faeacb775b307c9a20f9ef5d77583143009c0ae71d77ecf9224a752460d3ecd9109db873f8517ed359025a4efb1d3
+DIST wai-app-static-3.1.7.2.tar.gz 22843 BLAKE2B 777a25ac71c24fa850b214d18096396dd03809c125aab8197d2621f0943bfc6bbae0f8f25dbfe19dd93bb835dbb39487ee89689ca3ef49e8c9580f102d1a9df9 SHA512 e073d85efc201eab94b9c8be4e40ee71567d07ed2e2907504a946477211bc21aaf2250213cac67525ae58be499b164b09880600c0a6f62b0b1742fb9d730d6d9
diff --git a/dev-haskell/wai-app-static/metadata.xml b/dev-haskell/wai-app-static/metadata.xml
index cb0dd1304272..a37c38a33846 100644
--- a/dev-haskell/wai-app-static/metadata.xml
+++ b/dev-haskell/wai-app-static/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Also provides some helper functions and datatypes for use outside of WAI.
-	</longdescription>
 	<use>
 		<flag name="print">print debug info.</flag>
 	</use>
diff --git a/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild
deleted file mode 100644
index ffd4d7f66db1..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-1.3.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/cereal-0.3.5:=[profile?]
-	>=dev-haskell/crypto-api-0.12.2:=[profile?]
-	>=dev-haskell/crypto-conduit-0.4:=[profile?]
-	>=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?] <dev-haskell/wai-1.5:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/network
-		dev-haskell/wai-test )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild b/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild
deleted file mode 100644
index 77d5851f6dd0..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-2.0.0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/cereal-0.3.5:=[profile?]
-	>=dev-haskell/crypto-api-0.12.2:=[profile?]
-	>=dev-haskell/crypto-conduit-0.4:=[profile?]
-	>=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.2:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/network
-		dev-haskell/wai-test )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild
deleted file mode 100644
index 6af5576e0fd7..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-3.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	dev-haskell/cryptohash-conduit:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
-	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.1:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/network )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild
deleted file mode 100644
index 42c45884f9d7..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-3.1.4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	dev-haskell/cryptohash-conduit:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
-	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/network
-		dev-haskell/temporary )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild
deleted file mode 100644
index 0bfa63fbba5f..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-3.1.6.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/cryptonite-0.6:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/memory-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
-	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.3:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/mockery
-		dev-haskell/network
-		dev-haskell/temporary )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.7.1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.7.1.ebuild
deleted file mode 100644
index 6c81719d9693..000000000000
--- a/dev-haskell/wai-app-static/wai-app-static-3.1.7.1.ebuild
+++ /dev/null
@@ -1,50 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="WAI application for static serving"
-HOMEPAGE="http://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="print"
-
-RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/cryptonite-0.6:=[profile?]
-	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/memory-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
-	>=dev-haskell/optparse-applicative-0.7:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
-	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/mockery
-		dev-haskell/network
-		dev-haskell/temporary )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag print print)
-}
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
new file mode 100644
index 000000000000..d0cd4c75f305
--- /dev/null
+++ b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="WAI application for static serving"
+HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="print"
+
+RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	>=dev-haskell/cryptonite-0.6:=[profile?]
+	>=dev-haskell/file-embed-0.0.3.1:=[profile?]
+	dev-haskell/http-date:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/memory-0.7:=[profile?]
+	>=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.2:=[profile?]
+	>=dev-haskell/optparse-applicative-0.7:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.2:=[profile?]
+	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/mockery
+		dev-haskell/network
+		dev-haskell/temporary )
+"
+
+CABAL_CHDEPS=(
+	'wai-extra                 >= 3.0      && < 3.1' 'wai-extra                 >= 3.0'
+)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag print print)
+}
diff --git a/dev-haskell/wai-conduit/Manifest b/dev-haskell/wai-conduit/Manifest
deleted file mode 100644
index a34b38bc9ca9..000000000000
--- a/dev-haskell/wai-conduit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST wai-conduit-3.0.0.2.tar.gz 2139 BLAKE2B be13ca69bb1c5eb8a69148a2b954b5725f3ce7530636d1e6fb2555e3a6095b3078db540f477a0cd6db131f27ffb0ead792c0a9bf6c20317b112772ed5d41cbb8 SHA512 2b24acf1148b157375dd9f70a15f07b1fb24e76b8cdaa0e67abc47bf8f181d41ae326beb05c769698bbaff0cedb3211f6c148c323f3ff0e35745a5f05198ae1b
-DIST wai-conduit-3.0.0.3.tar.gz 2129 BLAKE2B b85282eb13e4452e306eb0b1c08f63576fe1abd63458c3bba754275925d3c1c15621be8e5b4209113224ef5afc3ef0e4cae0afc4414715b27a9b9c27759d1904 SHA512 adf6c507f53dfd5eab33cc713528d27fd37d044262024626e89da1489d9315e2fbd47a1a3fb00384858a79101482cf056349e17a0614e6788613e67bad1ff976
diff --git a/dev-haskell/wai-conduit/metadata.xml b/dev-haskell/wai-conduit/metadata.xml
deleted file mode 100644
index 1e1fa5cc48a2..000000000000
--- a/dev-haskell/wai-conduit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Since version 3.0.0, WAI has no built-in streaming data abstraction.
-		This library provides similar functionality to what existed in WAI 2.x.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">yesodweb/wai</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild b/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild
deleted file mode 100644
index a7ee2fd95887..000000000000
--- a/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="conduit wrappers for WAI"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild b/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild
deleted file mode 100644
index 0912b88e9cd8..000000000000
--- a/dev-haskell/wai-conduit/wai-conduit-3.0.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="conduit wrappers for WAI"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/wai-cors/Manifest b/dev-haskell/wai-cors/Manifest
new file mode 100644
index 000000000000..f352da37f051
--- /dev/null
+++ b/dev-haskell/wai-cors/Manifest
@@ -0,0 +1 @@
+DIST wai-cors-0.2.7.tar.gz 16248 BLAKE2B 636eb9bb17224608924f8f9d33db7f74b62e243b7d591d81a1c93e63e30173408fcf8fa3828bb8919446e818815d8172a51ddf370375710364f3a478c2c85e20 SHA512 77a9e3cb457136a05c2b104ac331af17d70edf8d985689c962d3e6cc0981c6752eff59ef18301c0ba98c6d4256909c44afe50bedb0f3dd741b6879564516cea7
diff --git a/dev-haskell/wai-cors/metadata.xml b/dev-haskell/wai-cors/metadata.xml
new file mode 100644
index 000000000000..044b4adb95d8
--- /dev/null
+++ b/dev-haskell/wai-cors/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">wai-cors</remote-id>
+		<remote-id type="github">larskuhtz/wai-cors</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/wai-cors/wai-cors-0.2.7.ebuild b/dev-haskell/wai-cors/wai-cors-0.2.7.ebuild
new file mode 100644
index 000000000000..9b040f1530e2
--- /dev/null
+++ b/dev-haskell/wai-cors/wai-cors-0.2.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="CORS for WAI"
+HOMEPAGE="https://github.com/larskuhtz/wai-cors"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # one test fails
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.4.0:=[profile?]
+	>=dev-haskell/base-unicode-symbols-0.2.2.3:=[profile?]
+	>=dev-haskell/case-insensitive-1.0.0.1:=[profile?]
+	>=dev-haskell/http-types-0.8.0:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( >=dev-haskell/network-2.6
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-hunit-0.9
+		>=dev-haskell/text-1.2
+		>=dev-haskell/wai-extra-3.0
+		>=dev-haskell/wai-websockets-3.0.1
+		>=dev-haskell/warp-3.0
+		>=dev-haskell/websockets-0.10 )
+"
diff --git a/dev-haskell/wai-extra/Manifest b/dev-haskell/wai-extra/Manifest
index 7b5504936403..79eb4a7df3e5 100644
--- a/dev-haskell/wai-extra/Manifest
+++ b/dev-haskell/wai-extra/Manifest
@@ -1,5 +1,3 @@
-DIST wai-extra-3.0.10.tar.gz 49846 BLAKE2B 34c77322bf4c4f2db666f868ee8dc562a2d7a7be2acd24474e54824acec6c867202b01927fa23e028671167e05205b7742f59e5fcdbe3b474841ead716849a06 SHA512 c634c02d5c5b7774fede0b639be6cce7522e74cfb5eab4b5e5bcca3d00dd6304bb1d2a83a8bfa34e29c5dd3b72802bfc1306d323bd98629e530b0b630e0b00e3
-DIST wai-extra-3.0.14.tar.gz 52041 BLAKE2B 4ab0336b0f2ae87e1dc1fcb737b4d94a04d354079988b37d6a661514e7300e4a1317903429c4fd880e55c31b01a6e9106bc1b0830dc25f8e10315e793d8a15c5 SHA512 92c8456cc2959ddfd23bfae50936f237bfe903143d68ef211e2af8dbe1327a8ede63cadd74d3555349411a5046df9a2c87c7e983e06728759eafde80092a8aea
-DIST wai-extra-3.0.15.1.tar.gz 53546 BLAKE2B d6ece1ded9b2eb53a449ec8c3def2d4393ec4eb4d903e92c560628ff0baa4089da2893d9c0ab98b75c2b11d2615a15ad6fe3284f3db5e6796e6c659c21d47a52 SHA512 0a212b1f40fee357dbe452b71da9a5d793d1fc826e82b9b0df84c65e4fc06773fdf41ba637fe29bdc0627e01b4863076813d2cef4dd36e5e248400083a1248e8
-DIST wai-extra-3.0.18.tar.gz 59477 BLAKE2B b3f565c0f154b6341b618b23916c80c79edd972afb6f3d9b167f86787c6d1adf980c0a0f8ec726b0d1a5529881f5e93c80cb4a0f479f0a802c3919e9bdd0b6de SHA512 d17f7f31ca35b2d8ce9bb5b63579d720a5cc4b72907dcde8668038953ac99fd5798d84ec8ab533a5a2b7f5a411e945fd91c8e389190b9cf5ca47fcc2f666715b
-DIST wai-extra-3.0.29.1.tar.gz 63831 BLAKE2B 61f3948add59e37a23f13ad9fd35456528835cac4190abc98f6d68897d32227b094ff04ddf6520ac009ac53186089f85e07d95268a4d554e51b1bbe9e0f0e0a5 SHA512 f8c5f2d534a0ef4b16b4375cabfb49d11a643fd8f8d2b30f0f88b29b39f91e84db7170508a5ddb64540f4a33c30bde703a52345ac9195560141cd75626ef5ca4
+DIST wai-extra-3.1.13.0-rev1.cabal 8287 BLAKE2B 71844b39699651c434a2566f1231d99142639aaf9cb12b02ac2e854c4bcb0098d08d3c8bbd03bf6658fc03b0cef6a21f702921bf05950f481acccb96eff2220d SHA512 57e9d7ccfc243651a91ba4d8254384bd9108132b255b8676c1eb1cf8e0a0eebda6a66bbc0393bbd85ecdf5e5a2e17f39106fb7067fc5be8e8b4e73409fdf106e
+DIST wai-extra-3.1.13.0.tar.gz 82251 BLAKE2B 30919e421f1e0f0e827bd73b50e11c9aee9714d7c582faa70b69f160c278552b19a7024aaf97f80ffa7bf442118b7a31cb46d92fa2ecef356b66bc399ecf2191 SHA512 ec94ad7fe318543c83dc20586bab04e9cb5cc9a3a96c4392acb1abd22f7a232a703f05051c9580836ad3758875751f02ef53bdc3c450e7d262ba8575761380b8
+DIST wai-extra-3.1.4.1.tar.gz 67063 BLAKE2B d75f1425cf4c75596adb65c152c954a6005b085f3a290d7dea279a4417d85e359f6948fc8282cee63f2057b4dfe3e33b7a364667544c925582024e4255e71462 SHA512 c33b513bd6e627361007f285167235535ac4065e7198749c14d05cfcd89c5017b54896064c64ffdda9875d6363b684b9beed4098fdbefaba1058045ba3245af5
diff --git a/dev-haskell/wai-extra/metadata.xml b/dev-haskell/wai-extra/metadata.xml
index 5fef2dac5332..b23b10b74f9b 100644
--- a/dev-haskell/wai-extra/metadata.xml
+++ b/dev-haskell/wai-extra/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The goal here is to provide common features without many dependencies.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">wai-extra</remote-id>
 		<remote-id type="github">yesodweb/wai</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild
deleted file mode 100644
index 266874b9cc35..000000000000
--- a/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides some basic WAI handlers and middleware"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/vault:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?]
-	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/zlib )
-"
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.14.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.14.ebuild
deleted file mode 100644
index 163952ecc052..000000000000
--- a/dev-haskell/wai-extra/wai-extra-3.0.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides some basic WAI handlers and middleware"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/fast-logger-2.1:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/iproute:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/network-2.6.1.0:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/vault:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?]
-	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-logger-2.0:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?]
-	dev-haskell/word8:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild
deleted file mode 100644
index 3634b792db7e..000000000000
--- a/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides some basic WAI handlers and middleware"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/fast-logger-2.4.5:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/iproute:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/network-2.6.1.0:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/vault:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?]
-	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-logger-2.2.6:=[profile?] <dev-haskell/wai-logger-2.3:=[profile?]
-	dev-haskell/word8:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.18.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.18.ebuild
deleted file mode 100644
index e01d9d9d10e4..000000000000
--- a/dev-haskell/wai-extra/wai-extra-3.0.18.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides some basic WAI handlers and middleware"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/fast-logger-2.4.5:=[profile?] <dev-haskell/fast-logger-2.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/iproute:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/network-2.6.1.0:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/vault:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?]
-	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-logger-2.2.6:=[profile?] <dev-haskell/wai-logger-2.4:=[profile?]
-	dev-haskell/word8:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.29.1.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.29.1.ebuild
deleted file mode 100644
index ac7aab582e45..000000000000
--- a/dev-haskell/wai-extra/wai-extra-3.0.29.1.ebuild
+++ /dev/null
@@ -1,55 +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.4.9999
-#hackport: flags: build-example:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Provides some basic WAI handlers and middleware"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/ansi-terminal:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/fast-logger-2.4.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/http2:=[profile?]
-	dev-haskell/iproute:=[profile?]
-	>=dev-haskell/network-2.6.1.0:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	>=dev-haskell/streaming-commons-0.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/vault:=[profile?]
-	>=dev-haskell/void-0.5:=[profile?]
-	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-logger-2.3.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	examples? ( dev-haskell/warp:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples build-example)
-}
diff --git a/dev-haskell/wai-extra/wai-extra-3.1.13.0.ebuild b/dev-haskell/wai-extra/wai-extra-3.1.13.0.ebuild
new file mode 100644
index 000000000000..82a7ff2c92f9
--- /dev/null
+++ b/dev-haskell/wai-extra/wai-extra-3.1.13.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: build-example:examples
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Provides some basic WAI handlers and middleware"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+CABAL_CHDEPS=(
+	'executable example' "executable ${PN}-example"
+)
+
+RDEPEND="
+	dev-haskell/aeson:=[profile?]
+	>=dev-haskell/ansi-terminal-0.4:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	dev-haskell/call-stack:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/fast-logger-2.4.5:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/hunit:=[profile?]
+	>=dev-haskell/iproute-1.7.8:=[profile?]
+	>=dev-haskell/network-2.6.1.0:=[profile?]
+	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+	>=dev-haskell/streaming-commons-0.2:=[profile?]
+	dev-haskell/vault:=[profile?]
+	>=dev-haskell/wai-3.2.2.1:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-logger-2.3.7:=[profile?]
+	>=dev-haskell/warp-3.3.22:=[profile?]
+	dev-haskell/word8:=[profile?]
+	>=dev-lang/ghc-8.6.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.4.0.1
+	test? (
+		>=dev-haskell/hspec-1.3
+		dev-haskell/temporary
+		dev-haskell/zlib
+	)
+"
+BDEPEND="
+	test? (
+		dev-haskell/hspec-discover
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples build-example)
+}
+
+pkg_postinst() {
+	if use examples; then
+		elog "The example executable installed with this package (normally named"
+		elog "'example') has been renamed to '${PN}-example' to help prevent name"
+		elog "collisions."
+	fi
+
+	haskell-cabal_pkg_postinst
+}
diff --git a/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
new file mode 100644
index 000000000000..385804a5b649
--- /dev/null
+++ b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: build-example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Provides some basic WAI handlers and middleware"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	dev-haskell/ansi-terminal:=[profile?]
+	dev-haskell/base64-bytestring:=[profile?]
+	dev-haskell/call-stack:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/fast-logger-2.4.5:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/http2:=[profile?]
+	dev-haskell/hunit:=[profile?]
+	dev-haskell/iproute:=[profile?]
+	>=dev-haskell/network-2.6.1.0:=[profile?]
+	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/streaming-commons-0.2:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	dev-haskell/vault:=[profile?]
+	>=dev-haskell/void-0.5:=[profile?]
+	>=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/wai-logger-2.3.2:=[profile?]
+	dev-haskell/word8:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+	examples? ( dev-haskell/warp:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( >=dev-haskell/hspec-1.3 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples build-example)
+}
diff --git a/dev-haskell/wai-logger/Manifest b/dev-haskell/wai-logger/Manifest
index af60ca896a39..17690723ee3c 100644
--- a/dev-haskell/wai-logger/Manifest
+++ b/dev-haskell/wai-logger/Manifest
@@ -1,3 +1,2 @@
-DIST wai-logger-2.2.4.1.tar.gz 6585 BLAKE2B 76915a9816b5f9f57914854014570e19dd8c6f31b8667d54f046ddf2efe549750211afe07d2804320cdb5d418e479bc3763039ec1c98e44e04569daa5f901416 SHA512 0900ecbcebed9433541ae4665c98037f1da832d6e6659be81328433f3ba9a5f258059736205e36517fdc22aefbd2d85e79bb5b50296c257b964c9256b2e828c5
-DIST wai-logger-2.2.7.tar.gz 5162 BLAKE2B a7cad6302151ed916c9dea4c42096e186269cdefab99d4edaf6d60e5b26bee7115686ae56b72296b7a6850d5ab9d097a882c75256df43cd6cdb22ed27149805b SHA512 09335971d30ef615c579df29214c7f9a1e7295c457d3d0aa6107d80a6ffce1399c13a101e7a4b64f0d869f66206fe28f8d0e0b01787421dd59f46046ebee382d
 DIST wai-logger-2.3.6.tar.gz 5823 BLAKE2B a08fde37085151e267b8abb21653021e4de773f5e85606b98900ea5fa33eca680f37dffebe7b416d95abc8ee925110274809de6dabc1be169226835256dcb091 SHA512 0c16120c342321cd686ab7cf9fa7df503a426b0c3d145c16e566013e0df44ef565d9890726d780c1fb73a49507f49bbf5fb886ff4bdccbd19a19b4c00626532e
+DIST wai-logger-2.4.0.tar.gz 5925 BLAKE2B e9446ab7cf81d5ce24b33922bb32e2fdf1c43ebc4cd8ff6bf8acb853060d98a2e2afc1d1b465dc120eb9ed59d7bee94ded657a57ce0ea6e820018fa79dccef22 SHA512 8d09b7fa7688601396f994513772884ac7f73a0b934f73420e3d200ae4e906450bbef14746d43dc484ce8d9181f8171dfb8d3496d17c0d81ba7c27eee39a90d4
diff --git a/dev-haskell/wai-logger/metadata.xml b/dev-haskell/wai-logger/metadata.xml
index f2ec4ab58349..937381521944 100644
--- a/dev-haskell/wai-logger/metadata.xml
+++ b/dev-haskell/wai-logger/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A logging system for WAI
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild b/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild
deleted file mode 100644
index c65341598f03..000000000000
--- a/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A logging system for WAI"
-HOMEPAGE="https://hackage.haskell.org/package/wai-logger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # wai-test cyclic depend
-
-RDEPEND="dev-haskell/auto-update:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/easy-file-0.2:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/unix-time-0.2.2:=[profile?]
-	>=dev-haskell/wai-2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/doctest )
-"
diff --git a/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild b/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
deleted file mode 100644
index f864aa9a38ec..000000000000
--- a/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A logging system for WAI"
-HOMEPAGE="https://hackage.haskell.org/package/wai-logger"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing file?
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/byteorder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	>=dev-haskell/fast-logger-2.4.5:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/unix-time-0.2.2:=[profile?]
-	>=dev-haskell/wai-2.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/doctest-0.10.1 )
-"
diff --git a/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild b/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
index 3ec510446dc0..9d031ad12216 100644
--- a/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
+++ b/dev-haskell/wai-logger/wai-logger-2.3.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1
 
@@ -9,14 +9,18 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A logging system for WAI"
-HOMEPAGE="http://hackage.haskell.org/package/wai-logger"
+HOMEPAGE="https://hackage.haskell.org/package/wai-logger"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
+GHC_BOOTSTRAP_PACKAGES=(
+	cabal-doctest
+)
+
 RESTRICT=test # does not specify full dependencies
 
 RDEPEND="dev-haskell/byteorder:=[profile?]
diff --git a/dev-haskell/wai-logger/wai-logger-2.4.0.ebuild b/dev-haskell/wai-logger/wai-logger-2.4.0.ebuild
new file mode 100644
index 000000000000..be8556efbdf3
--- /dev/null
+++ b/dev-haskell/wai-logger/wai-logger-2.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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" # test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A logging system for WAI"
+HOMEPAGE="https://hackage.haskell.org/package/wai-logger"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # does not specify full dependencies
+
+RDEPEND="dev-haskell/byteorder:=[profile?]
+	>=dev-haskell/fast-logger-3:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	dev-haskell/network:=[profile?]
+	>=dev-haskell/wai-2.0.0:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	>=dev-haskell/cabal-doctest-1.0.6 <dev-haskell/cabal-doctest-1.1"
+#    test? ( >=dev-haskell/doctest-0.10.1 )
+#"
diff --git a/dev-haskell/wai-test/Manifest b/dev-haskell/wai-test/Manifest
deleted file mode 100644
index 2f223529ed20..000000000000
--- a/dev-haskell/wai-test/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wai-test-1.3.1.1.tar.gz 3858 BLAKE2B fc16e086749bae7637e5aa11fac7ee5447aba0fe24fc665985101d8cf8a5933f0879555403b4e78d7eee289d2e6baedd0e6593807aba024a2bb80130694e9ada SHA512 fb9d216812d9e5d3bf18ece6ae397290444e9e843749869a688c7fecdb2d4cbb56d4c9d7527d6c8ecd597e055717cf6a5df9286950c38c94f862b7d578a6825d
-DIST wai-test-2.0.0.2.tar.gz 3645 BLAKE2B f63efd0030b23768aa6eefecf4bcf9b33445ba3dc7c2c63d4cdf2891a4d4ceb861d5d49e62d882b24340400ce9ef08b9e43e01732e2aa2dbbe30c4276dd3fb0f SHA512 d81fc332ebbcf071c9d62f1dea7b9cb2e7ad1bf160a2472ced347dd4dea0a0f36dbbfaa733ccd00958c904a9e4413f720d75e9c66efb7bed17c7e3bc067f5379
-DIST wai-test-3.0.0.tar.gz 1227 BLAKE2B 4a99ab99810cff2d3b2fbdc7c36acc239d1ab8d15ffe5d4d9d8c953c01de2daca63279a6f36f2850740f8f945f8e7edc6d756a6516acfc686c45a35d9af8c400 SHA512 2c7f8788f3a51f94b02a2d79b7ad40c0f92f3756163b1e4c0981e92c3364c822b6a1cbf2b7129fd6974a745774f2dbffe1a6097e362d183bc2e30dd62125666f
diff --git a/dev-haskell/wai-test/metadata.xml b/dev-haskell/wai-test/metadata.xml
deleted file mode 100644
index 79cdd05b83e0..000000000000
--- a/dev-haskell/wai-test/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Unit test framework (built on HUnit) for WAI applications.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild b/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild
deleted file mode 100644
index 4097b599520b..000000000000
--- a/dev-haskell/wai-test/wai-test-1.3.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unit test framework (built on HUnit) for WAI applications"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-		<dev-haskell/blaze-builder-0.4:=[profile?]
-		>=dev-haskell/blaze-builder-conduit-0.5:=[profile?]
-		<dev-haskell/blaze-builder-conduit-1.1:=[profile?]
-		>=dev-haskell/case-insensitive-0.2:=[profile?]
-		>=dev-haskell/conduit-0.5:=[profile?]
-		<dev-haskell/conduit-1.1:=[profile?]
-		>=dev-haskell/cookie-0.2:=[profile?]
-		<dev-haskell/cookie-0.5:=[profile?]
-		>=dev-haskell/http-types-0.7:=[profile?]
-		=dev-haskell/hunit-1.2*:=[profile?]
-		dev-haskell/network:=[profile?]
-		>=dev-haskell/text-0.7:=[profile?]
-		<dev-haskell/text-0.12:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-haskell/wai-1.3:=[profile?]
-		<dev-haskell/wai-1.5:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-		)"
diff --git a/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild b/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild
deleted file mode 100644
index 950b7b108160..000000000000
--- a/dev-haskell/wai-test/wai-test-2.0.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Unit test framework (built on HUnit) for WAI applications"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-builder-conduit-0.5:=[profile?] <dev-haskell/blaze-builder-conduit-1.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/cookie-0.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-1.3:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/wai-2.0:=[profile?] <dev-haskell/wai-2.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/wai-test/wai-test-3.0.0.ebuild b/dev-haskell/wai-test/wai-test-3.0.0.ebuild
deleted file mode 100644
index 183057606b1f..000000000000
--- a/dev-haskell/wai-test/wai-test-3.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Unit test framework (built on HUnit) for WAI applications. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/book/web-application-interface"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/wai-3.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/wai-websockets/Manifest b/dev-haskell/wai-websockets/Manifest
new file mode 100644
index 000000000000..7977d725540e
--- /dev/null
+++ b/dev-haskell/wai-websockets/Manifest
@@ -0,0 +1 @@
+DIST wai-websockets-3.0.1.2.tar.gz 7051 BLAKE2B 0c39cd9917e1c340413e48737e4fd5ada23056189a6aad9de1aaf551f12b45b9544b99b54bbf078ccf88aea816f025c3508e07212ca05a2e9a2d779fd1edeee9 SHA512 c3415d1a36ca2f063fb1ae0ff7d3d9d271d8ff2c6099a754baed45f1c36f24cf1fa346e8e6403499cbeb329bcdf89326a9ed95f8e60111b4a879f5e51967ecc0
diff --git a/dev-haskell/wai-websockets/metadata.xml b/dev-haskell/wai-websockets/metadata.xml
new file mode 100644
index 000000000000..3d76fcca496a
--- /dev/null
+++ b/dev-haskell/wai-websockets/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">wai-websockets</remote-id>
+		<remote-id type="github">yesodweb/wai</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/wai-websockets/wai-websockets-3.0.1.2.ebuild b/dev-haskell/wai-websockets/wai-websockets-3.0.1.2.ebuild
new file mode 100644
index 000000000000..5c63f00f4c2f
--- /dev/null
+++ b/dev-haskell/wai-websockets/wai-websockets-3.0.1.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: example:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Provide a bridge between WAI and the websockets package"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+examples"
+
+RDEPEND=">=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/http-types:=[profile?]
+	>=dev-haskell/network-2.2.1.5:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/websockets-0.9:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	examples? ( dev-haskell/file-embed:=[profile?]
+			dev-haskell/text:=[profile?]
+			dev-haskell/wai-app-static:=[profile?]
+			dev-haskell/warp:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples example)
+}
diff --git a/dev-haskell/wai/Manifest b/dev-haskell/wai/Manifest
index daf061c21d0c..b36e88e0b1ec 100644
--- a/dev-haskell/wai/Manifest
+++ b/dev-haskell/wai/Manifest
@@ -1,7 +1 @@
-DIST wai-1.4.0.2.tar.gz 4659 BLAKE2B a74a5b7267788590e0cd2cbcc5b9dfc836b9d32ce59533464226be0b805f286b8f0f87ce9a8b30a1b3b3bf49609f936c604ff7c0ab38a900a9543d491ffce11c SHA512 2f0953e37a2f80044ba70d5bbbb4d9c964c6703702619710c959fd2dc9c49803ab470f689e4c0f13e6fe86612d6202ac822e1c5e8dc0c438027fac3dcd660202
-DIST wai-2.0.0.tar.gz 5971 BLAKE2B d7274842234860bca702118c068d266434ceffa2e2fd81f9e061dc21d9f5e6648193831def64ca5b0e3d0736279b2fff6563d4e2d37c880940aaf0b1442c8e94 SHA512 2c154cd3000fe6380d1584df0c27235b8d3574bf6b1ee54be8d2fbd2ccb025b4e263549c450f71c78c04b633bd4aa90ba957274643e196b7bb1bf9361d709a2b
-DIST wai-2.1.0.tar.gz 6249 BLAKE2B f65fa57e518f26bfeb10bd6a36faf1100322d82312a8fcef8722e2bd5e6c513f8d94446cd3682b26aecc6e7992a6287c0057ad22bfd3c856b7e6b9253e5d8359 SHA512 4df4cf10220c97439385990de9d8e5bce97a842fbdc131d8a90ff96c8c2aa958179851563750136043cbc7ebbe10542bafa81c7d9db20a8218380a064d76032b
-DIST wai-3.0.3.0.tar.gz 9532 BLAKE2B 0e65afe6127b96ba35c6a2e59d370ac0781039a0d92764308bb9e7d280f65ebc9aa057628d8b57c7372c1ce04d0c285f1cef98be37465f2dc93d76d5583aa879 SHA512 e1a3672db5ad367abdafe88b8366f29c8cc4dc5ef309b09193a2167d90466cdfed19fcb5ba4e179b31622c3df8ddb74a11c5338967fdae8696fb739cf62a7002
-DIST wai-3.0.5.0.tar.gz 14498 BLAKE2B 48e7ed33110cb5e6c21624392e65fa29832809f068f48ccc260998962ca442bf532154d1fa0c21f883a40773e668e1fbf3cc71be37852077a12fa46d1a429288 SHA512 076ebc3a651b5e93e608d42a9a64a591bfc742139dc6112ce574ef04b4e701d709bc3fed2ed7ce74ca46f9e99df45990a0b8bfe7da0b054c06f0bc7864b29fc7
-DIST wai-3.2.1.1.tar.gz 10039 BLAKE2B 017d5fd4555541263ce6c47a2d666215c155585cf08ce111a5d1c7e818b6bff11f785bf7bbb374c4fc18c98f806e118cd272e0b1f243a5b8c03d7ac00c77533c SHA512 5fadbc5e665002f9e1a5d962731309bac6cb91a0533ba8ce0ae8d69014322e2a2960bcd0e6c56e65e3a2a03be6832ba5e72dcca6ae33620f1cd1791ea725f6a3
-DIST wai-3.2.2.1.tar.gz 10221 BLAKE2B 5822bae6d3f0326206da9b14646654af135690ca134d48b5f8b7eb6acd39652d829c8d4daa5afc80926b2409cf9fe1d498ef2b727cd8baae7c1f266178a39861 SHA512 72c92389d3faff234003f835206ff6eae3f8e3d885d7519706f8b78df3cb1c92121c5de7e8272436aed22ade8440baaefb14d50a10f2f233badadf16d1b5e431
+DIST wai-3.2.3.tar.gz 11619 BLAKE2B 3ef7328a252a21d23d885ac3ea36b6a25bf06c0678e2a8627337aeebb325314e64c7e3415b3f4143139d9c20d910809cdbaaaaf6e15757a5eceb4c5fe0c3e98b SHA512 1851da58310c45a809ec1cd3efd760e45bee814e41526a9f3404ea55e2428e92ff1563785b3118e8c605d5edaacd70670d21b5e5b300ce477f16b159c33a2040
diff --git a/dev-haskell/wai/metadata.xml b/dev-haskell/wai/metadata.xml
index 1f32097775f3..6b5972c48ca4 100644
--- a/dev-haskell/wai/metadata.xml
+++ b/dev-haskell/wai/metadata.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides a common protocol for communication between web applications and web servers.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">yesodweb/wai</remote-id>
 	</upstream>
diff --git a/dev-haskell/wai/wai-1.4.0.2.ebuild b/dev-haskell/wai/wai-1.4.0.2.ebuild
deleted file mode 100644
index b8c9dde848be..000000000000
--- a/dev-haskell/wai/wai-1.4.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/wai/wai-2.0.0.ebuild b/dev-haskell/wai/wai-2.0.0.ebuild
deleted file mode 100644
index 1410d108991f..000000000000
--- a/dev-haskell/wai/wai-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/conduit-1.0.8:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/vault-0.1:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/wai/wai-2.1.0.ebuild b/dev-haskell/wai/wai-2.1.0.ebuild
deleted file mode 100644
index 1f78f4ffa971..000000000000
--- a/dev-haskell/wai/wai-2.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/conduit-1.0.8:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
diff --git a/dev-haskell/wai/wai-3.0.3.0.ebuild b/dev-haskell/wai/wai-3.0.3.0.ebuild
deleted file mode 100644
index 570d866dddf5..000000000000
--- a/dev-haskell/wai/wai-3.0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/wai/wai-3.0.5.0.ebuild b/dev-haskell/wai/wai-3.0.5.0.ebuild
deleted file mode 100644
index 98ce65378185..000000000000
--- a/dev-haskell/wai/wai-3.0.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4.0:=[profile?] <dev-haskell/bytestring-builder-0.10.7:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/wai/wai-3.2.1.1.ebuild b/dev-haskell/wai/wai-3.2.1.1.ebuild
deleted file mode 100644
index 324ce2a9289b..000000000000
--- a/dev-haskell/wai/wai-3.2.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4.0:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.0:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/wai/wai-3.2.2.1.ebuild b/dev-haskell/wai/wai-3.2.2.1.ebuild
deleted file mode 100644
index 7639458078ae..000000000000
--- a/dev-haskell/wai/wai-3.2.2.1.ebuild
+++ /dev/null
@@ -1,29 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Web Application Interface"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/network-2.2.1.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/wai/wai-3.2.3.ebuild b/dev-haskell/wai/wai-3.2.3.ebuild
new file mode 100644
index 000000000000..f1d85bd25006
--- /dev/null
+++ b/dev-haskell/wai/wai-3.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Web Application Interface"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/network-2.2.1.5:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/vault-0.3:=[profile?] <dev-haskell/vault-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hspec )
+"
diff --git a/dev-haskell/warp-tls/Manifest b/dev-haskell/warp-tls/Manifest
index f34696348a6c..e8d9ec5a6c8d 100644
--- a/dev-haskell/warp-tls/Manifest
+++ b/dev-haskell/warp-tls/Manifest
@@ -1,4 +1,2 @@
-DIST warp-tls-3.0.4.2.tar.gz 5870 BLAKE2B ea55807c1ed297befd351db83bfac773d22bb5de509d56870fc7695716a0144b55d99ea27a7e9b30a0042fbe075ab0ccd47c47d463a345ef4b30efa27b2a52e7 SHA512 3334d8923b720ed4b79f9489364824170df276bcf3ac530719d26999d0899e4ae46c2758856819b440ee937d8c411bbfff2a446984a3b7d5c61177582517e467
-DIST warp-tls-3.1.5.tar.gz 6967 BLAKE2B ca5a4bc7abc7a1ebf1348c85ce4ff2ccb329e55ff3a669b4714cdea225b8b5d25692bc1fa79b1952017f9c421fe4fb2f200014b1a3de0b2a66b8890b18eb68a2 SHA512 f34f706ed1a1a37a3d78b3b5f296bd8416b5524fcded5b1291ffc2b7e20069ab252fe5c1620bc6c79b8c2346a70b872654b88d0957a55a843a92ce6384fe3483
 DIST warp-tls-3.2.12.tar.gz 8200 BLAKE2B 71380d62ef1ec401140d308499dc7aad8e6fae1d3e51cc64285f5e740c1ed9fc30f9f096f1a40977e5f5252da49646632c9dfb21090f8d7924b6ab29e619082e SHA512 c1fa08c710bbbb88e914bcb7e978fa0fedcff9900351cf8f2b59bbba8b35e56b605ba3bd36d6162459397f38a0cdcedd5e48472f3d7d1b1357d0b0c3c2fa75ba
-DIST warp-tls-3.2.3.tar.gz 7159 BLAKE2B c54d4ffd52a2968e279fd8cef2acbbc22bdf1830fac4fad71319c85d8e7906c799b5a0385cd01ea59aa30a8304b0219be280a2ec774b60a9f5c43b628dd1ebd6 SHA512 d20baaf2d89007cef8f7beed1eb5dc9e3698376c0abfdfca65d06c3c55dc083fa1f68b0fdfb2f67e686e1d5bcc69e5d3f128d2807f72b95c49ef2400791f8b03
+DIST warp-tls-3.4.1.tar.gz 8941 BLAKE2B 0aa9548001acb32845af0d18c127fddb27f63d5324092b8aac4bff1a9eb52c48adb9163530d64a5982f7ea0b8941612b3942b0e98cdfdfa24e9fdea757b6b5bd SHA512 433dfd946a50bb56f6d0a7cd0bb6b95c1745f7ba8c58c9d766064f9c7d81b8f6aad25dc5dd25b75b45b0e97716ed546b3a46d5d21052415f126de034fe48404e
diff --git a/dev-haskell/warp-tls/metadata.xml b/dev-haskell/warp-tls/metadata.xml
index e8a84ab12130..4c8395816b5c 100644
--- a/dev-haskell/warp-tls/metadata.xml
+++ b/dev-haskell/warp-tls/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		HTTP over SSL/TLS support for Warp via the TLS package.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">warp-tls</remote-id>
 		<remote-id type="github">yesodweb/wai</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild b/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild
deleted file mode 100644
index 724aa96ef4e3..000000000000
--- a/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: +tls_1_1_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP over SSL/TLS support for Warp via the TLS package"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cprng-aes-0.5.0:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/network-2.2.1:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/tls-1.2.16:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-haskell/warp-3.0.8:=[profile?] <dev-haskell/warp-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=tls_1_1_3
-}
diff --git a/dev-haskell/warp-tls/warp-tls-3.1.5.ebuild b/dev-haskell/warp-tls/warp-tls-3.1.5.ebuild
deleted file mode 100644
index 409d4cbe8c9b..000000000000
--- a/dev-haskell/warp-tls/warp-tls-3.1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: +tls_1_1_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP over TLS support for Warp via the TLS package"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cprng-aes-0.5.0:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/network-2.2.1:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/tls-1.3.2:=[profile?]
-	>=dev-haskell/wai-3.0.4:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-haskell/warp-3.1.7:=[profile?] <dev-haskell/warp-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=tls_1_1_3
-}
diff --git a/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild b/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
index 1bd16536432e..85c88e83d767 100644
--- a/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
+++ b/dev-haskell/warp-tls/warp-tls-3.2.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.4.9999
 #hackport: flags: +tls_1_1_3
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cryptonite-0.12:=[profile?]
diff --git a/dev-haskell/warp-tls/warp-tls-3.2.3.ebuild b/dev-haskell/warp-tls/warp-tls-3.2.3.ebuild
deleted file mode 100644
index 7d1c879259e7..000000000000
--- a/dev-haskell/warp-tls/warp-tls-3.2.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: +tls_1_1_3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP over TLS support for Warp via the TLS package"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptonite-0.12:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/network-2.2.1:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	>=dev-haskell/tls-1.3.5:=[profile?]
-	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/warp-3.2.10:=[profile?] <dev-haskell/warp-3.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=tls_1_1_3
-}
diff --git a/dev-haskell/warp-tls/warp-tls-3.4.1.ebuild b/dev-haskell/warp-tls/warp-tls-3.4.1.ebuild
new file mode 100644
index 000000000000..f3b41384b4b8
--- /dev/null
+++ b/dev-haskell/warp-tls/warp-tls-3.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +tls_1_1_3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HTTP over TLS support for Warp via the TLS package"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?]
+	>=dev-haskell/network-2.2.1:=[profile?]
+	>=dev-haskell/recv-0.1.0:=[profile?] <dev-haskell/recv-0.2.0:=[profile?]
+	dev-haskell/streaming-commons:=[profile?]
+	>=dev-haskell/tls-1.7:=[profile?]
+	>=dev-haskell/tls-session-manager-0.0.4:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
+	>=dev-haskell/warp-3.3.23:=[profile?] <dev-haskell/warp-3.4:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=tls_1_1_3
+}
diff --git a/dev-haskell/warp/Manifest b/dev-haskell/warp/Manifest
index f5bdb2d22439..95d18997e935 100644
--- a/dev-haskell/warp/Manifest
+++ b/dev-haskell/warp/Manifest
@@ -1,4 +1,2 @@
-DIST warp-3.0.13.1.tar.gz 44894 BLAKE2B 1eafa5629ea5c4562d904da62c988b87f42d8f53a58214323414f94ff56fa0c363449ec703a57ca67f63e11c385018d07aac7b5b1db6cf6456a0b01e339842a9 SHA512 5da05c58e0a4223469ffa78877a7099c5ab9bdae1f4cc43db1f88fa109f0a5f44a9eb7a98f36f068ecd2b67a1c4b218e565fa8d4cb8cd39a944995569fe6feda
-DIST warp-3.1.10.tar.gz 72128 BLAKE2B fcb3c3a01a5d1d8943559aca2f66c62a19ae85db5f17a7978f99c414c1d60c845d46870add61296b3c4bf43b13bfb403fa62152145011f6c2d4498d253e8648c SHA512 ee5ea6a1bbf4b9773ce0e69d51989268ed610564bcbe06fd8b214ec1edf2a71c22b47c2970cd0a45573fa9bec734ff2b585747dfc86e1e788b16f12429aea645
-DIST warp-3.2.11.tar.gz 78007 BLAKE2B 5dc7b0e3a14d8dca141a7f537021d9cc721f8eb441f62e6ab10abaa2f41ba69049c352a6e311bf3de637ee83d452a618c221ff34fb657de59c0df4ca32fdb8b9 SHA512 971662d84c327b314822bf4f4a9c4f9c1950ef444d1965fab5139fe245dc5c0bb88302f1ff40cf32afa7085a80494dd377a5528586ad3395dc633f3ae782b04c
-DIST warp-3.3.13.tar.gz 64719 BLAKE2B f9430b22fed524cfa8b90ec3ead31f8c86c74a5b5b967503dcc682a31da8880814856f37c4612d16a873ecdb6faf21dbca1af28c1e1f22942fa258c3b828c326 SHA512 ac37e1f274d26b2c846429960074d27010c0864efd87da6d79f03e3f833aca3269176bb99301ab8cb59c4476ff12bae35b26e0fe602e7b0e2cad2837592e07b1
+DIST warp-3.3.21.tar.gz 66529 BLAKE2B e8de94a4695c42a7620c1afa1a38225f6c26fc454235e941e34b65929a733e160781d895335d0ab48c4d7db25aa650d50e1d84a3ef83daf62b22f409c2045d48 SHA512 7f181669d9f10f88d14f8f1dc3acb6c08f41c8f4565f371f7fe4b89b3fde411a0190e50f003b07a239ba25ea71dbafaa16cb9e77effbe574bec929ea29646f37
+DIST warp-3.3.28.tar.gz 65625 BLAKE2B b054d03b66cdcf67a990dd9c1f8ba822e416da3f7e5d6dfa9afbf9ecc8f154e5bba2013beadf616174a629c90c1203f3205d88763dfa6644f7085f1b3c48f587 SHA512 5f3a73f611342545d010ba770614b7012c31a335fe4d209a4f7f3d466b440901a58b0f3f477da10b95bb739dbd30afffa1ced66828039159844eb476c845648e
diff --git a/dev-haskell/warp/metadata.xml b/dev-haskell/warp/metadata.xml
index 686087ee568d..153f3ad7acc9 100644
--- a/dev-haskell/warp/metadata.xml
+++ b/dev-haskell/warp/metadata.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://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="hackage">warp</remote-id>
 		<remote-id type="github">yesodweb/wai</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/warp/warp-3.0.13.1.ebuild b/dev-haskell/warp/warp-3.0.13.1.ebuild
deleted file mode 100644
index ecb770eeeb96..000000000000
--- a/dev-haskell/warp/warp-3.0.13.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, light-weight web server for WAI applications"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-sendfilefd warp-debug"
-
-# Ambiguous module name ‘Data.IP’: it was found in multiple packages:
-# iproute-1.4.0@ network-data-0.5.3@
-RESTRICT=test
-
-RDEPEND="
-	>=dev-haskell/auto-update-0.1.1:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
-	>=dev-haskell/blaze-builder-0.3.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.8.5:=[profile?]
-	>=dev-haskell/iproute-1.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.10:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	allow-sendfilefd? ( dev-haskell/hashable:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? (
-		dev-haskell/async
-		>=dev-haskell/doctest-0.9.3
-		>=dev-haskell/hspec-1.3
-		dev-haskell/http
-		dev-haskell/hunit
-		>=dev-haskell/lifted-base-0.1
-		dev-haskell/old-locale
-		dev-haskell/quickcheck
-		>=dev-haskell/transformers-0.2.2
-	)
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
-		--flag=-network-bytestring \
-		$(cabal_flag warp-debug warp-debug)
-}
diff --git a/dev-haskell/warp/warp-3.1.10.ebuild b/dev-haskell/warp/warp-3.1.10.ebuild
deleted file mode 100644
index 0155fa07f1b0..000000000000
--- a/dev-haskell/warp/warp-3.1.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, light-weight web server for WAI applications"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-sendfilefd warp-debug"
-
-RESTRICT=test # module colision
-
-RDEPEND=">=dev-haskell/auto-update-0.1.1:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.8.5:=[profile?]
-	>=dev-haskell/http2-1.3:=[profile?]
-	>=dev-haskell/iproute-1.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[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/unix-compat-0.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?]
-	>=dev-haskell/wai-3.0.4:=[profile?] <dev-haskell/wai-3.1:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/doctest-0.10.1
-		>=dev-haskell/hspec-1.3
-		dev-haskell/http
-		dev-haskell/hunit
-		>=dev-haskell/lifted-base-0.1
-		dev-haskell/quickcheck
-		>=dev-haskell/transformers-0.2.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
-		--flag=-network-bytestring \
-		$(cabal_flag warp-debug warp-debug)
-}
diff --git a/dev-haskell/warp/warp-3.2.11.ebuild b/dev-haskell/warp/warp-3.2.11.ebuild
deleted file mode 100644
index 0192f98a1a33..000000000000
--- a/dev-haskell/warp/warp-3.2.11.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, light-weight web server for WAI applications"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-sendfilefd warp-debug"
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/auto-update-0.1.3:=[profile?] <dev-haskell/auto-update-0.2:=[profile?]
-	>=dev-haskell/blaze-builder-0.4:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	dev-haskell/http-date:=[profile?]
-	>=dev-haskell/http-types-0.8.5:=[profile?]
-	>=dev-haskell/http2-1.6:=[profile?] <dev-haskell/http2-1.7:=[profile?]
-	>=dev-haskell/iproute-1.3.1:=[profile?]
-	>=dev-haskell/network-2.3:=[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/unix-compat-0.2:=[profile?]
-	>=dev-haskell/vault-0.3:=[profile?]
-	>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/doctest-0.10.1
-		>=dev-haskell/hspec-1.3
-		dev-haskell/http
-		dev-haskell/hunit
-		>=dev-haskell/lifted-base-0.1
-		dev-haskell/quickcheck
-		dev-haskell/silently
-		>=dev-haskell/transformers-0.2.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
-		--flag=-network-bytestring \
-		$(cabal_flag warp-debug warp-debug)
-}
diff --git a/dev-haskell/warp/warp-3.3.13.ebuild b/dev-haskell/warp/warp-3.3.13.ebuild
deleted file mode 100644
index f9433e28e4b5..000000000000
--- a/dev-haskell/warp/warp-3.3.13.ebuild
+++ /dev/null
@@ -1,60 +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.4.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A fast, light-weight web server for WAI applications"
-HOMEPAGE="https://github.com/yesodweb/wai"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+allow-sendfilefd warp-debug"
-
-RESTRICT=test # requires network
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=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/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/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:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/http-client
-		dev-haskell/hunit
-		>=dev-haskell/lifted-base-0.1
-		dev-haskell/quickcheck )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
-		--flag=-network-bytestring \
-		$(cabal_flag warp-debug warp-debug)
-}
diff --git a/dev-haskell/warp/warp-3.3.21.ebuild b/dev-haskell/warp/warp-3.3.21.ebuild
new file mode 100644
index 000000000000..6049eb0072a6
--- /dev/null
+++ b/dev-haskell/warp/warp-3.3.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -network-bytestring
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast, light-weight web server for WAI applications"
+HOMEPAGE="https://github.com/yesodweb/wai"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+allow-sendfilefd debug +x509"
+
+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-3.0:=[profile?] <dev-haskell/http2-3.1:=[profile?]
+	>=dev-haskell/iproute-1.3.1:=[profile?]
+	>=dev-haskell/network-2.3:=[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/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-lang/ghc-8.6.3:=
+	x509? ( dev-haskell/x509:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=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/quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag allow-sendfilefd allow-sendfilefd) \
+		--flag=-network-bytestring \
+		$(cabal_flag debug warp-debug) \
+		$(cabal_flag x509 x509)
+}
diff --git a/dev-haskell/warp/warp-3.3.28.ebuild b/dev-haskell/warp/warp-3.3.28.ebuild
new file mode 100644
index 000000000000..4e2a9921d4e2
--- /dev/null
+++ b/dev-haskell/warp/warp-3.3.28.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +allow-sendfilefd,-network-bytestring,warp-debug:debug
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast, light-weight web server for WAI applications"
+HOMEPAGE="https://github.com/yesodweb/wai"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="debug +x509"
+
+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-3.0:=[profile?] <dev-haskell/http2-5:=[profile?]
+	>=dev-haskell/iproute-1.3.1:=[profile?]
+	>=dev-haskell/network-2.3:=[profile?]
+	>=dev-haskell/recv-0.1.0:=[profile?] <dev-haskell/recv-0.2.0:=[profile?]
+	>=dev-haskell/simple-sendfile-0.2.7:=[profile?] <dev-haskell/simple-sendfile-0.3:=[profile?]
+	>=dev-haskell/streaming-commons-0.1.10:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/time-manager:=[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-lang/ghc-8.8.1:=
+	x509? ( dev-haskell/crypton-x509:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/http-client
+		dev-haskell/quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=allow-sendfilefd \
+		--flag=-network-bytestring \
+		$(cabal_flag debug warp-debug) \
+		$(cabal_flag x509 x509)
+}
diff --git a/dev-haskell/wavy/Manifest b/dev-haskell/wavy/Manifest
deleted file mode 100644
index ea0dbf630fed..000000000000
--- a/dev-haskell/wavy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wavy-0.1.0.0.tar.gz 25100 BLAKE2B 5c4926c22b0a874b84a02fdff9218aa78f78a97dd736ae1243e99bfe368c8d136dc463346c3905e794b70deaeba5dab7223a54fa43304d67234cb16f0bd489e2 SHA512 25103aeae5104f6525b75cae4aea1b70e3998a56e4c262462a8dd7b8edfee2749fbd099e81a2c2bde0bfb0211e2194d0e4df705bd8882e526516c85be0fdd94d
diff --git a/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch b/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch
deleted file mode 100644
index 88db75b995c2..000000000000
--- a/dev-haskell/wavy/files/wavy-0.1.0.0-binary-0.8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Sound/Wav/Binary.hs b/Sound/Wav/Binary.hs
-index d2c539c..11883a3 100644
---- a/Sound/Wav/Binary.hs
-+++ b/Sound/Wav/Binary.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE CPP #-}
- -- | This module provides helper binary functions to get integer values from binary streams and put
-@@ -8,2 +9,3 @@ import Data.Int
- 
-+#if ! MIN_VERSION_binary(0,8,0)
- getInt8 :: Get Int8
-@@ -31 +33,2 @@ putInt64le :: Int64 -> Put
- putInt64le = putWord64le . fromIntegral
-+#endif
diff --git a/dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch b/dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch
deleted file mode 100644
index 5d5fdee9bd24..000000000000
--- a/dev-haskell/wavy/files/wavy-0.1.0.0-ghc-8.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Sound/Wav/ChannelData.hs
-+++ b/Sound/Wav/ChannelData.hs
-@@ -111,7 +111,7 @@ wordPutter 1 = putInt8 . zeroStable (0 :: Int8)
- wordPutter 2 = putInt16le . zeroStable (0 :: Int16)
- wordPutter 3 = putInt32le . zeroStable (0 :: Int32)
- wordPutter 4 = putInt64le
--wordPutter x = \_ -> fail $ "The is no word putter for byte size " ++ show x
-+wordPutter x = \_ -> error $ "The is no word putter for byte size " ++ show x
- 
- wordGetter :: (Num a, Show a, Eq a) => a -> Get Int64
- wordGetter 1 = fmap zeroStable64 getInt8
diff --git a/dev-haskell/wavy/metadata.xml b/dev-haskell/wavy/metadata.xml
deleted file mode 100644
index 162d299f5c8f..000000000000
--- a/dev-haskell/wavy/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Wavy was designed to be a fast and efficient method of extracting and writing PCM
-		data to and from WAV files. It is here to help you make fast use of Audio
-		data in your Haskell programs and thus encourage many more audio projects in Haskell.
-	</longdescription>
-	<upstream>
-		<remote-id type="bitbucket">robertmassaioli/wavy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/wavy/wavy-0.1.0.0.ebuild b/dev-haskell/wavy/wavy-0.1.0.0.ebuild
deleted file mode 100644
index bfc61294c40e..000000000000
--- a/dev-haskell/wavy/wavy-0.1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Process WAVE files in Haskell"
-HOMEPAGE="http://bitbucket.org/robertmassaioli/wavy"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/pretty-show:=[profile?]
-	>=dev-haskell/riff-0.3:=[profile?] <dev-haskell/riff-0.4:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
-	>=dev-haskell/vector-0.10:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-binary-0.8.patch
-	"${FILESDIR}"/${P}-ghc-8.8.patch
-)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'vector ==0.10.*' 'vector >= 0.10' \
-		'filepath ==1.3.*' 'filepath >= 1.3' \
-		'binary ==0.7.*' 'binary >= 0.7' \
-		'containers ==0.4.*' 'containers >= 0.4'
-}
diff --git a/dev-haskell/wcwidth/metadata.xml b/dev-haskell/wcwidth/metadata.xml
index 9e3d25033a24..1cf9efce533a 100644
--- a/dev-haskell/wcwidth/metadata.xml
+++ b/dev-haskell/wcwidth/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
@@ -15,4 +15,7 @@
 		the widths assigned by it. The command line tool can compile a width table
 		to Haskell code that assigns widths to the Char type.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">solidsnack/wcwidth</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
index 32bc1fc8e9e2..56e8e6ff4977 100644
--- a/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
+++ b/dev-haskell/wcwidth/wcwidth-0.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5
 # hackport: flags: +split-base
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="cli"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6.0
 "
 
-PATCHES=( ${FILESDIR}/${P}-fix-build-failure.patch )
+PATCHES=( "${FILESDIR}"/${P}-fix-build-failure.patch )
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/websockets/Manifest b/dev-haskell/websockets/Manifest
new file mode 100644
index 000000000000..09bcee8af898
--- /dev/null
+++ b/dev-haskell/websockets/Manifest
@@ -0,0 +1,2 @@
+DIST websockets-0.12.7.3-rev2.cabal 8237 BLAKE2B 2280cc2e730cb5ea9c0501740f6c7b80134bc51344a520ee1890e98482806eb231c3fd3b74b478b46214ed7437bcf29e4f9ee6068d4222dfdc02f15efa14dd13 SHA512 61c66dbade090e0b5da39a780d343213ae8f9a896b22b9d7d981805df736bd3545c0cc901fed29adb72facf22f383834795c9ba3ed02967a369b08a80a843abc
+DIST websockets-0.12.7.3.tar.gz 40077 BLAKE2B cd80eecd52ae3aa8ab67be7eb87d297ecd7b286d893962dfa2b6a1e2f07ac2a1573549b18a3e9bce956e041bdcf4b0eae79d045f31ffe12e27c041748cf31c6f SHA512 9eb9147ff7b545c6e3e859055ff0ca51c16d7e2f0e8603279409b3e74db7ec858c33e586d8f40e3059ac8acf96d8c7502e1b5fe298d3d7fa4cad507e13a2b300
diff --git a/dev-haskell/websockets/metadata.xml b/dev-haskell/websockets/metadata.xml
new file mode 100644
index 000000000000..937381521944
--- /dev/null
+++ b/dev-haskell/websockets/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/websockets/websockets-0.12.7.3.ebuild b/dev-haskell/websockets/websockets-0.12.7.3.ebuild
new file mode 100644
index 000000000000..d5f719c02f2d
--- /dev/null
+++ b/dev-haskell/websockets/websockets-0.12.7.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: example:examples
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A sensible and clean way to write WebSocket-capable servers in Haskell"
+HOMEPAGE="https://jaspervdj.be/websockets"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	<dev-haskell/bytestring-builder-0.11:=[profile?]
+	>=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/clock-0.8:=[profile?] <dev-haskell/clock-0.9:=[profile?]
+	>=dev-haskell/entropy-0.2.1:=[profile?] <dev-haskell/entropy-0.5:=[profile?]
+	>=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/sha-1.5:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/streaming-commons-0.1:=[profile?] <dev-haskell/streaming-commons-0.3:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples example)
+}
diff --git a/dev-haskell/weigh/Manifest b/dev-haskell/weigh/Manifest
deleted file mode 100644
index 9b922ef0fffb..000000000000
--- a/dev-haskell/weigh/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST weigh-0.0.16.tar.gz 9070 BLAKE2B 9d21313445541701460267fc605056bebe17cd409a733a05c306602129f8850ded4b9688c52084f35cbfb9105e397779d9127c04a74556796a0091b413d1d16b SHA512 a7889b891f8099e23922f37c9a770c94c8bfd6e7e7740786ba1595c0c153dcd60a320d79647952a1a1275a1cf06e2a2aed9ee0ce60e34583a91d186e246f9470
-DIST weigh-0.0.3.tar.gz 7028 BLAKE2B bee320438a986d8a3fd21c8680f7263a4394e9eb713d8b503dc57bb823841ada5d6395e813685fd4e4c7f19f0b5153e70dae1fb2a7f9e4a81e9c674dba0be0d2 SHA512 26c33c4079b6461be3cd93c9ba07deec9f5e1945bf9a2baddd3608d19fb5a3c5e103415dd37f931a7f63e3d62c42cac5d7e156d59e9a1a2789d46c27c24b550e
diff --git a/dev-haskell/weigh/metadata.xml b/dev-haskell/weigh/metadata.xml
deleted file mode 100644
index 202d5d721b7c..000000000000
--- a/dev-haskell/weigh/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Please see README.md
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fpco/weigh</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/weigh/weigh-0.0.16.ebuild b/dev-haskell/weigh/weigh-0.0.16.ebuild
deleted file mode 100644
index 138620c790cc..000000000000
--- a/dev-haskell/weigh/weigh-0.0.16.ebuild
+++ /dev/null
@@ -1,34 +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.1
-#hackport: flags: -weigh-maps
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Measure allocations of a Haskell functions/values"
-HOMEPAGE="https://github.com/fpco/weigh#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/temporary:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	>=dev-lang/ghc-8.2.1:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-weigh-maps
-}
diff --git a/dev-haskell/weigh/weigh-0.0.3.ebuild b/dev-haskell/weigh/weigh-0.0.3.ebuild
deleted file mode 100644
index ca3ed1402589..000000000000
--- a/dev-haskell/weigh/weigh-0.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Measure allocations of a Haskell functions/values"
-HOMEPAGE="https://github.com/fpco/weigh#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	dev-haskell/split:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/with-location/Manifest b/dev-haskell/with-location/Manifest
deleted file mode 100644
index ae3cd6a3da44..000000000000
--- a/dev-haskell/with-location/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST with-location-0.0.0.tar.gz 1806 BLAKE2B 5a861687b8c0670c52f1e2a89fb29353466efc44a0cacaf76dca21e45323762629683b1f45955b5b238a93ce549c8be2e1e4062302efed7dfcd9347772e025e1 SHA512 c5be3a9478c0f9585daebe1b7ab73d81ed937740d7c5f5f3dac05289c58a508fca458e5c0727aed767e507c27a9007e878ee949228b8d25355ab8474ba7289c2
-DIST with-location-0.1.0.tar.gz 2029 BLAKE2B 0d76733cff25a2dc3603ddad7b0806d43e2007017f73ec8773f6d00db0f7830eb2a30e324a5044654b7537bb9a43d453dbe50fd1ee89668fbbc465a5a27f90ee SHA512 1b8bdecd02d4acaa8b21e2cd6acdee573ac29b909c9a6f0d88a56adcd7433d551db5c1fadbc3e72c78378d74a614594d8d2ad08899fd63ecc57c65d0c37b28b9
diff --git a/dev-haskell/with-location/metadata.xml b/dev-haskell/with-location/metadata.xml
deleted file mode 100644
index 9c623ab5f924..000000000000
--- a/dev-haskell/with-location/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Use ImplicitParams-based source locations in a backward compatible way
-	</longdescription>
-	<upstream>
-		<remote-id type="github">sol/with-location</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/with-location/with-location-0.0.0.ebuild b/dev-haskell/with-location/with-location-0.0.0.ebuild
deleted file mode 100644
index 90731a67b9e2..000000000000
--- a/dev-haskell/with-location/with-location-0.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Use ImplicitParams-based source locations in a backward compatible way"
-HOMEPAGE="https://github.com/sol/with-location#readme"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/with-location/with-location-0.1.0.ebuild b/dev-haskell/with-location/with-location-0.1.0.ebuild
deleted file mode 100644
index 746345fec933..000000000000
--- a/dev-haskell/with-location/with-location-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Use ImplicitParams-based source locations in a backward compatible way"
-HOMEPAGE="https://github.com/sol/with-location#readme"
-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.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/witherable/Manifest b/dev-haskell/witherable/Manifest
new file mode 100644
index 000000000000..90832bc1f809
--- /dev/null
+++ b/dev-haskell/witherable/Manifest
@@ -0,0 +1,2 @@
+DIST witherable-0.4.2-rev4.cabal 2342 BLAKE2B c33bfbe39c7a7a17ebfd156a30155cadc50f8ae6c852caef3f8c3853fd75d0cef24c6cb86270f8b8860790bb17f0fad41d995786a44bbf9d34b35369f34d9027 SHA512 a2170aa691bb07dd39da3d09192836a30d4d2dbf3e499bf19112369deedc64b946baaa890d5cbd2aaa964cd40b3bc2f491a4b19404d2d592d883ec814d867927
+DIST witherable-0.4.2.tar.gz 11876 BLAKE2B 58294fc66aa0e60cbb3a75b73ddc89ed3bb64ba62c2a462028afdfe0a86c219cb80db8a008c6abd9c5688fb684c05f2156dd51c796efd586a1a2f72a30ca7e7e SHA512 14ad590e24b93fc25f16fecaf71d6f9f891a903dd76e052d9f6c21b464f0d28df4f019d33ac36086341a6c5bd20833d7b0c2d19543460d1530899c0c25cea852
diff --git a/dev-haskell/witherable/metadata.xml b/dev-haskell/witherable/metadata.xml
new file mode 100644
index 000000000000..1db55be5ffc8
--- /dev/null
+++ b/dev-haskell/witherable/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	<upstream>
+		<remote-id type="hackage">witherable</remote-id>
+		<remote-id type="github">fumieval/witherable</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-haskell/witherable/witherable-0.4.2-r1.ebuild b/dev-haskell/witherable/witherable-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..6fb6284e0924
--- /dev/null
+++ b/dev-haskell/witherable/witherable-0.4.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="filterable traversable"
+HOMEPAGE="https://github.com/fumieval/witherable"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
+	>=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.12.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.12.2.0:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/quickcheck-2.14.2
+		dev-haskell/quickcheck-instances
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck
+	)
+"
diff --git a/dev-haskell/wl-pprint-annotated/Manifest b/dev-haskell/wl-pprint-annotated/Manifest
index edd0c46ff4ac..cdc3c9d43ff2 100644
--- a/dev-haskell/wl-pprint-annotated/Manifest
+++ b/dev-haskell/wl-pprint-annotated/Manifest
@@ -1 +1,2 @@
+DIST wl-pprint-annotated-0.1.0.1-rev1.cabal 2296 BLAKE2B 1b239089245dbc936763b0dcdc2f4afe1c90e7d8d3f80a823e1868ad6e4ea988395f20de015e55cc7db642f34f58ec4446bf4b8a697eeeb22c3a0efe8be2cf36 SHA512 0f79b2c436ddbf8deeb6aae9fe65d08b11030be1435df81cee292e1ec6cdda9d05461a9000984f1f7e89b9338aaa399e43687eeee8904602f4e4718013eb9a6e
 DIST wl-pprint-annotated-0.1.0.1.tar.gz 15458 BLAKE2B 8699ca505a0c72790d70890ec290bbb602d259015554a6260d52445574d8e0f86c9d4e4a05bba155f59730595073d0613cda00fcecbf142c97afc0375eaedcf2 SHA512 45f1881254f8b20d9992a477a36a7408d2df8d94f99c71d72d75cd04aee3831966886c94b6e6a68791acda24aec8c4a339d052b9a188af8c2ca24e74da1e9596
diff --git a/dev-haskell/wl-pprint-annotated/metadata.xml b/dev-haskell/wl-pprint-annotated/metadata.xml
index b7878815d80d..85a1cbd157fb 100644
--- a/dev-haskell/wl-pprint-annotated/metadata.xml
+++ b/dev-haskell/wl-pprint-annotated/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">wl-pprint-annotated</remote-id>
+		<remote-id type="github">minad/wl-pprint-annotated</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1-r2.ebuild b/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1-r2.ebuild
new file mode 100644
index 000000000000..5e40ec179b12
--- /dev/null
+++ b/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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="Pretty printer with annotation support"
+HOMEPAGE="https://github.com/minad/wl-pprint-annotated#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2.1
+	>=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild b/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
deleted file mode 100644
index 2548bc51581a..000000000000
--- a/dev-haskell/wl-pprint-annotated/wl-pprint-annotated-0.1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Wadler/Leijen pretty printer with annotations and slightly modernized API"
-HOMEPAGE="https://github.com/minad/wl-pprint-annotated#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-hunit )
-"
diff --git a/dev-haskell/wl-pprint-text/Manifest b/dev-haskell/wl-pprint-text/Manifest
deleted file mode 100644
index 3d12106a5a8f..000000000000
--- a/dev-haskell/wl-pprint-text/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wl-pprint-text-1.1.0.4.tar.gz 15140 BLAKE2B c2c7739638098180394c6ef98e435ea52d2a414da4d629db2ebc0ae9f01414c4a33eeaacfe0c8b733e89914ce308885bc434a71797a3228d94ae5fed1a32bdc3 SHA512 17116393deea2b0ff9b34d6df411e1edc219803bc3986ef105e4bb6bf03f193c622e54be998712a777605bb931a322e828ffee7d150a8787d41480672ea178f5
-DIST wl-pprint-text-1.1.1.0.tar.gz 16575 BLAKE2B 9e90e0d58fa9bf099cdd03446e35ee933890428f2e523978e8addb55af6a8d31642da5989a8a1703b67e82d29fb93baf84a2471e493a4433dc2024a100799d7a SHA512 16a265846b6f116b8e53b691875afab2e40c6c75dabd6ed74d2bc23aab8241208236aba880cb1b45b15dc2d3b0e1654f0187d8492145147922ee6ff4a36009fd
-DIST wl-pprint-text-1.2.0.1.tar.gz 16766 BLAKE2B af6666833956c37e62f36c0d6ea3174c830146855fa3a29265716bfe3c356269666c257e0b9e0ecf71752a2bc76d47284a0e4b2a0f8443e19de073f335a06804 SHA512 944ad7ead8eb062a3fdf71a90872a14d7c4e021d5237cd6aac19f1e882dc62e14cfdca114a8011b7b76faed10cf5fd76b120336adb4c10f6506fa06672e922f0
diff --git a/dev-haskell/wl-pprint-text/metadata.xml b/dev-haskell/wl-pprint-text/metadata.xml
deleted file mode 100644
index 55e03cdd691b..000000000000
--- a/dev-haskell/wl-pprint-text/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		A clone of wl-pprint for use with the text library.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
deleted file mode 100644
index f6a1364f68ac..000000000000
--- a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Wadler/Leijen Pretty Printer for Text values"
-HOMEPAGE="https://hackage.haskell.org/package/wl-pprint-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild
deleted file mode 100644
index b905bfa007fb..000000000000
--- a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Wadler/Leijen Pretty Printer for Text values"
-HOMEPAGE="https://hackage.haskell.org/package/wl-pprint-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.9:=[profile?] <dev-haskell/base-compat-0.10:=[profile?]
-	>=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild
deleted file mode 100644
index 2a11a3b66db6..000000000000
--- a/dev-haskell/wl-pprint-text/wl-pprint-text-1.2.0.1.ebuild
+++ /dev/null
@@ -1,26 +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 Wadler/Leijen Pretty Printer for Text values"
-HOMEPAGE="http://hackage.haskell.org/package/wl-pprint-text"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?] <dev-haskell/base-compat-0.12:=[profile?]
-	>=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/wl-pprint/Manifest b/dev-haskell/wl-pprint/Manifest
deleted file mode 100644
index 89a6de575ea0..000000000000
--- a/dev-haskell/wl-pprint/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST wl-pprint-1.2.1.tar.gz 9959 BLAKE2B 03192e4e28f6a30661f156006f2cfad91f857b0c99d19fc5c00083de278a9b7a77e5bd60bf677f555b570965c9ea476b6d0cbcfb7daf67e55f8574aa6562d35a SHA512 84a3646b9039455b24c3dd4a4bbb2fc69ffa1fa3ead4d0574dc90da1a28064590a28c147135a0568700550c42e4ff83b04b0280564f0ed19acbfcb9d0400c2a3
-DIST wl-pprint-1.2.tar.gz 9881 BLAKE2B 7025f41b0a5213b6c08b07d0a87deeb16526f102ec73c1196be72179bb76320a83ac5631bfd16d88845751a756d0f87db60afe9109106e8676f8953eb6095851 SHA512 b5e6a8be51f10f1e1dad225020ba769cac62c311d6c0cc13a4ff8623e9b906218826d6f829e9169396eef9fc44379ba32d642914f543bd2f4e7070d6886ee91b
diff --git a/dev-haskell/wl-pprint/metadata.xml b/dev-haskell/wl-pprint/metadata.xml
deleted file mode 100644
index ea057004cb79..000000000000
--- a/dev-haskell/wl-pprint/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a pretty printing library based on Wadler's paper "A Prettier
-		Printer".  See the haddocks for full info.  This version allows the
-		library user to declare overlapping instances of the 'Pretty' class.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild b/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild
deleted file mode 100644
index 46b2bc15c86c..000000000000
--- a/dev-haskell/wl-pprint/wl-pprint-1.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer"
-HOMEPAGE="https://hackage.haskell.org/package/wl-pprint"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/wl-pprint/wl-pprint-1.2.ebuild b/dev-haskell/wl-pprint/wl-pprint-1.2.ebuild
deleted file mode 100644
index 90277f74afd3..000000000000
--- a/dev-haskell/wl-pprint/wl-pprint-1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer"
-HOMEPAGE="https://hackage.haskell.org/package/wl-pprint"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/word8/Manifest b/dev-haskell/word8/Manifest
index f1e202809320..9593842cb6a5 100644
--- a/dev-haskell/word8/Manifest
+++ b/dev-haskell/word8/Manifest
@@ -1,2 +1 @@
-DIST word8-0.1.2.tar.gz 6218 BLAKE2B 5001304392cb5e7be20f129f308df2d67ae0aca789e5d45b160e3477cd2f1f42c09d11133e127704f137f5ed63681b9062a7756614a85808238a23c5646d2972 SHA512 6eb6bbf5e0e06fe5846fcd9eae24d9716e11b56aa1d431a96a0c0092be621668a0350f6c8d4ca0bdd3e1d2e3d2453e600c1a5a0bcfc058005ed1e7ddbe12608c
 DIST word8-0.1.3.tar.gz 6271 BLAKE2B 55b1bed8a7e7c6e11cab5d6c229c6e60d74154042565644d52aab806737c180773a498104b949f8331f300190656e438170b2f51c2be44fdada20429095f98c7 SHA512 e6442eddb582c41f38206a436fc69c476ff97bf1bd5f37aa173d4efd0153744e9d20b71435329b69dc12a7919034082d4195db88bb2f83b462e1ba430b1ad988
diff --git a/dev-haskell/word8/metadata.xml b/dev-haskell/word8/metadata.xml
index 3675ea513613..937381521944 100644
--- a/dev-haskell/word8/metadata.xml
+++ b/dev-haskell/word8/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Word8 library to be used with Data.ByteString
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/word8/word8-0.1.2.ebuild b/dev-haskell/word8/word8-0.1.2.ebuild
deleted file mode 100644
index fb77d99c1a67..000000000000
--- a/dev-haskell/word8/word8-0.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Word8 library"
-HOMEPAGE="https://hackage.haskell.org/package/word8"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( dev-haskell/hspec )
-"
diff --git a/dev-haskell/word8/word8-0.1.3.ebuild b/dev-haskell/word8/word8-0.1.3.ebuild
index e07a42a6ca38..3bc1f3e8d5cb 100644
--- a/dev-haskell/word8/word8-0.1.3.ebuild
+++ b/dev-haskell/word8/word8-0.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.3.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/wreq/Manifest b/dev-haskell/wreq/Manifest
deleted file mode 100644
index 8a75bfc17d78..000000000000
--- a/dev-haskell/wreq/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wreq-0.5.3.2.tar.gz 57521 BLAKE2B 2265e7f8abe371371d079f735d61917c0efa5b78e2d3e8965e3b720a94e89b3a7ae05824f54d6fe765c643ed81f506b12694355b0bf1d7b4c2e9198d08c2317c SHA512 5a2c62b973758cb8ce2bf20504e328090896fa25e7ee1f77b472d7cf5156e08b6d85bf4341ff45e44db1724070fcf3c0f21037fa0a79211a1767024328f7c779
diff --git a/dev-haskell/wreq/metadata.xml b/dev-haskell/wreq/metadata.xml
deleted file mode 100644
index 887b9ecf25d1..000000000000
--- a/dev-haskell/wreq/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		
-		A web client library that is designed for ease of use.
-		
-		Tutorial: &lt;http://www.serpentine.com/wreq/tutorial.html&gt;
-		
-		Features include:
-		
-		* Simple but powerful `lens`-based API
-		
-		* A solid test suite, and built on reliable libraries like
-		http-client and lens
-		
-		* Session handling includes connection keep-alive and pooling, and
-		cookie persistence
-		
-		* Automatic response body decompression
-		
-		* Powerful multipart form and file upload handling
-		
-		* Support for JSON requests and responses, including navigation of
-		schema-less responses
-		
-		* Basic and OAuth2 bearer authentication
-		
-		* Early TLS support via the tls package
-	</longdescription>
-	<use>
-		<flag name="aws">Enable AWS tests</flag>
-		<flag name="httpbin">Install client</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-haskell/wreq/wreq-0.5.3.2.ebuild b/dev-haskell/wreq/wreq-0.5.3.2.ebuild
deleted file mode 100644
index 62ccd4251442..000000000000
--- a/dev-haskell/wreq/wreq-0.5.3.2.ebuild
+++ /dev/null
@@ -1,76 +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
-#hackport: flags: -developer,+doctest
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="An easy-to-use HTTP client library"
-HOMEPAGE="http://www.serpentine.com/wreq"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="aws httpbin"
-
-RESTRICT=test # needs network
-
-RDEPEND=">=dev-haskell/aeson-1.0.0.0:=[profile?]
-	>=dev-haskell/attoparsec-0.11.1.0:=[profile?]
-	>=dev-haskell/authenticate-oauth-1.5:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	>=dev-haskell/exceptions-0.5:=[profile?]
-	dev-haskell/hashable:=[profile?]
-	>=dev-haskell/http-client-0.6:=[profile?]
-	>=dev-haskell/http-client-tls-0.3.3:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	>=dev-haskell/lens-4.5:=[profile?]
-	dev-haskell/lens-aeson:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mime-types:=[profile?]
-	>=dev-haskell/psqueues-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/time-locale-compat:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	httpbin? ( >=dev-haskell/aeson-pretty-0.8.0:=[profile?]
-			dev-haskell/base64-bytestring:=[profile?]
-			>=dev-haskell/snap-core-1.0.0.0:=[profile?]
-			>=dev-haskell/snap-server-0.9.4.4:=[profile?]
-			dev-haskell/unix-compat:=[profile?]
-			dev-haskell/uuid:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	>=dev-haskell/cabal-doctest-1.0.2 <dev-haskell/cabal-doctest-1.1
-	test? ( dev-haskell/doctest
-		dev-haskell/hunit
-		dev-haskell/network-info
-		>=dev-haskell/quickcheck-2.7
-		dev-haskell/temporary
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2
-		dev-haskell/vector
-		!httpbin? ( >=dev-haskell/aeson-pretty-0.8.0
-				dev-haskell/base64-bytestring
-				>=dev-haskell/snap-core-1.0.0.0
-				>=dev-haskell/snap-server-0.9.4.4
-				dev-haskell/unix-compat
-				dev-haskell/uuid ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag aws aws) \
-		--flag=-developer \
-		--flag=doctest \
-		$(cabal_flag httpbin httpbin)
-}
diff --git a/dev-haskell/wx/Manifest b/dev-haskell/wx/Manifest
deleted file mode 100644
index afa106db4ab6..000000000000
--- a/dev-haskell/wx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wx-0.92.2.0.tar.gz 50938 BLAKE2B 3a1b8c4391c73c78d8aa635e48ebd135671bbec4c5312de715966f6596e2201c50c8284c69fd8f873c65e72a654944374c757de4e8c4afe81939e9771a318d77 SHA512 f8bbb2598fc1555030ebe3084737d6f8c0691a3e2fddd9b979c4694442b458937a9bb6afe347b2a5661b7d70339194087ce083ad6efc01173bc0f62b72bf1134
diff --git a/dev-haskell/wx/metadata.xml b/dev-haskell/wx/metadata.xml
deleted file mode 100644
index 89beeeef44de..000000000000
--- a/dev-haskell/wx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		wxHaskell is a portable and native GUI library for Haskell.  It is built on top of wxWidgets - a comprehensive C++ library that is portable across all major GUI platforms; including GTK, Windows, X11, and MacOS X.  This version works with wxWidgets 2.8 only.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wx/wx-0.92.2.0.ebuild b/dev-haskell/wx/wx-0.92.2.0.ebuild
deleted file mode 100644
index 2e387aae3817..000000000000
--- a/dev-haskell/wx/wx-0.92.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable and native GUI library built on wxWidgets"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/stm:=[profile?]
-	>=dev-haskell/wxcore-0.92:${WX_GTK_VER}=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_configure() {
-	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9155
-	[[ $(ghc-version) == 7.8.2 ]] && replace-hcflags -O[2-9] -O1
-	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9303
-	[[ $(ghc-version) == 7.8.3 ]] && replace-hcflags -O[2-9] -O1
-
-	haskell-cabal_src_configure \
-		--flag=newbase
-}
diff --git a/dev-haskell/wxc/Manifest b/dev-haskell/wxc/Manifest
deleted file mode 100644
index 9626844845e1..000000000000
--- a/dev-haskell/wxc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wxc-0.92.2.0.tar.gz 203065 BLAKE2B 3f873b3bbc50e5fa7690f2f05a25ab360260d90523dd0b9c016f5dfeea99e9a59fe4848de520d642d2cea52dbadfd69aa31671f521243240488d643d4554e880 SHA512 e6fba1be94978603965b8902fad9326772b5483d5df621d5245f1fae97d85bcb1aff4565f1e8396de23c854050151c5e009e34a1ea29c3037057599ac0412bcd
diff --git a/dev-haskell/wxc/metadata.xml b/dev-haskell/wxc/metadata.xml
deleted file mode 100644
index 7960f5bec78c..000000000000
--- a/dev-haskell/wxc/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		wxHaskell is a portable and native GUI library for Haskell. It is
-		built on top of wxWidgets, a comprehensive C++ library that is
-		portable across all major GUI platforms, including GTK, Windows,
-		X11, and MacOS X. This version works with wxWidgets 2.9 only.
-		Distributed under the WXWINDOWS LIBRARY LICENSE. Please see
-		LICENSE file, but note that this is essentially LGPL with an
-		exception allowing binary distribution of proprietary software.
-		This is the same license as wxWidgets itself uses.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wxc/wxc-0.92.2.0.ebuild b/dev-haskell/wxc/wxc-0.92.2.0.ebuild
deleted file mode 100644
index 0e5e4f13e994..000000000000
--- a/dev-haskell/wxc/wxc-0.92.2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal multilib versionator wxwidgets
-
-DESCRIPTION="wxHaskell C++ wrapper"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">dev-haskell/split-0:=[profile?]
-	>=dev-haskell/wxdirect-0.90.1.1:${WX_GTK_VER}=[profile?]
-	x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer,opengl]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-"
-
-src_prepare() {
-	sed -e "s@\"wx-config\"@\"${WX_CONFIG}\"@g" \
-		-i "${S}/Setup.hs" || die "Could not specify wx-config in Setup.hs"
-}
-
-src_configure() {
-	local cgcc=()
-	for i in ${CXXFLAGS}
-	do
-		cgcc+=( --gcc-option="${i}" )
-	done
-	# Trying to specify the LDFLAGS in --ld-option does not work, as ld does
-	# not understand ld options prefixed with -Wl,
-	# The linker that is used to link the libwxc.so shared library is hard coded
-	# in Setup.hs.  So the --with-ld would not change the linker used when
-	# linking libwxc.so.  --with-ld="gcc" does not help, as then cabal passes
-	# ld options like -x to gcc which then returns a non-zero exit status, then
-	# cabal ignores all the --ld-option parameters.
-	# So I place all the LDFLAGS in --gcc-option parameters. They are ignored
-	# when building .o files.
-	local cld=()
-	for i in ${LDFLAGS}
-	do
-		cld+=( --gcc-option="${i}" )
-	done
-	cabal_src_configure ${cgcc[*]} ${cld[*]} --verbose=3
-}
diff --git a/dev-haskell/wxcore/Manifest b/dev-haskell/wxcore/Manifest
deleted file mode 100644
index 7eb5e7040cbf..000000000000
--- a/dev-haskell/wxcore/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wxcore-0.92.2.0.tar.gz 400116 BLAKE2B c4d87792ad7a7fdf125ef68211f1efe89bff9d3114dc2dacb8f7b96a824fa359addb00c331e3d8fd6325cf90cf3c78448c500431ef18ac7d2989eedee952e17c SHA512 e1339ea30a699e22a9fc2f12b6ddcd773911e4d611f834886952bde4d76205c448e1702bab3148f4c370eec1cabeac06655b4cf3cbbfe24e2ea08a628906880a
diff --git a/dev-haskell/wxcore/metadata.xml b/dev-haskell/wxcore/metadata.xml
deleted file mode 100644
index 922fc18d17bb..000000000000
--- a/dev-haskell/wxcore/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		wxHaskell is a portable and native GUI library for Haskell. It is
-		built on top of wxWidgets, a comprehensive C++ library that is
-		portable across all major GUI platforms, including GTK, Windows,
-		X11, and MacOS X. This version works with wxWidgets 2.8 only.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wxcore/wxcore-0.92.2.0.ebuild b/dev-haskell/wxcore/wxcore-0.92.2.0.ebuild
deleted file mode 100644
index b31e16b9abbc..000000000000
--- a/dev-haskell/wxcore/wxcore-0.92.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal wxwidgets
-
-DESCRIPTION="wxHaskell core"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="wxWinLL-3.1"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/parsec:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-haskell/wxc-0.92:${WX_GTK_VER}=[profile?]
-	>=dev-haskell/wxdirect-0.91:${WX_GTK_VER}=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/wxGTK:${WX_GTK_VER}=[X,gstreamer,opengl]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	sed -e "s@wxdirect@wxdirect-${WX_GTK_VER}@g" \
-		-i "${S}/Setup.hs" \
-		|| die "Could not change Setup.hs for wxdirect slot ${WX_GTK_VER}"
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=splitbase
-}
diff --git a/dev-haskell/wxdirect/Manifest b/dev-haskell/wxdirect/Manifest
deleted file mode 100644
index ecf20b6fbdbb..000000000000
--- a/dev-haskell/wxdirect/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST wxdirect-0.92.2.0.tar.gz 30544 BLAKE2B 3d51252cc792f2d00be9ec53f139d961c19d6bf5e5aa792b1fe65ed258b2f98b9da30fda28d018b6d26dae72d80d8c394c17ba822e43c2ba89611881b7ba9b29 SHA512 f112fc0a62031bc9eb8e6caa2bd70f0b9fa66a81380785165a07bdffa6fa2b44652ffb9f1165c3b8ab7db8a31273650e36e98c8eb72f7cec5873ecb75f58dc21
-DIST wxdirect-0.92.3.0.tar.gz 30586 BLAKE2B cb174838000a39b0067338297adb7c1e0b96bd524297950f5d3ede244ec914d2a1b3c717669b5af53f29b55266473c7042b7c90990b70c6177e85fc11d76bc34 SHA512 02dfd9496f1a36480c82a4cf03e3a0ded0a45ede984b70e923b2289323f9c4561b7c0a2ab2db34ee2021b7b5fe62c25ea4a8b61bcbbe3414f821dacb14190f8b
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch
deleted file mode 100644
index 75d9bf21c726..000000000000
--- a/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- wxdirect-0.90.0.1-orig/wxdirect.cabal	2012-04-19 01:05:11.000000000 +1000
-+++ wxdirect-0.90.0.1/wxdirect.cabal	2012-05-19 21:12:02.612085338 +1000
-@@ -66,7 +66,7 @@
-   if flag(splitBase)
-     build-depends:
-         base       >= 4     && < 5,
--        containers >= 0.2   && < 0.5
-+        containers >= 0.2   && < 0.6
-   else
-     build-depends:
-         base       >= 3     && < 4,
---- wxdirect-0.90.0.1-orig/src/Classes.hs	2012-04-19 01:05:10.000000000 +1000
-+++ wxdirect-0.90.0.1/src/Classes.hs	2012-07-14 13:58:48.072492467 +1000
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- -----------------------------------------------------------------------------------------
- {-| Module      :  Classes
-     Copyright   :  (c) Daan Leijen 2003
-@@ -28,7 +29,9 @@
- import Data.List( sort, sortBy )
- import qualified Data.Set as Set
- import qualified Data.Map as Map
-+#if !MIN_VERSION_base(4,6,0)
- import Prelude hiding ( catch )
-+#endif
- import HaskellNames( haskellTypeName, isBuiltin )
- import Types
- 
---- wxdirect-0.90.0.1-orig/src/CompileClasses.hs	2012-04-19 01:05:10.000000000 +1000
-+++ wxdirect-0.90.0.1/src/CompileClasses.hs	2012-05-19 21:28:27.358052781 +1000
-@@ -89,7 +89,7 @@
-            (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass []
- 
-            methodCount  = length decls
--           ghcoptions   = [ "{-# LANGUAGE ForeignFunctionInterface #-}"]
-+           ghcoptions   = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"]
- 
-            export   = concat  [ ["module " ++ moduleRoot ++ moduleName
-                                 , "    ( -- * Global" ]
-@@ -103,6 +103,9 @@
-                                 , "import System.IO.Unsafe( unsafePerformIO )"
-                                 , "import " ++ moduleRoot ++ "WxcTypes"
-                                 , "import " ++ moduleRoot ++ moduleClassTypesName
-+                                , "#if (__GLASGOW_HASKELL__>=705)"
-+                                , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))"
-+                                , "#endif"
-                                 , ""
-                                 ]
-                               ]
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch
deleted file mode 100644
index df29d1ba08b8..000000000000
--- a/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- wxdirect-0.90.1.1-orig/src/Classes.hs	2014-03-23 01:08:59.000000000 +1100
-+++ wxdirect-0.90.1.1/src/Classes.hs	2014-03-23 15:43:57.402011540 +1100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- -----------------------------------------------------------------------------------------
- {-| Module      :  Classes
-     Copyright   :  (c) Daan Leijen 2003
-@@ -24,6 +25,9 @@
- 
- import qualified Data.Set as Set
- import qualified Data.Map as Map
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding ( catch )
-+#endif
- import Text.Parsec.Prim hiding ( try )
- import HaskellNames( haskellTypeName, isBuiltin )
- import Types
---- wxdirect-0.90.1.1-orig/src/CompileClasses.hs	2014-03-23 01:08:59.000000000 +1100
-+++ wxdirect-0.90.1.1/src/CompileClasses.hs	2014-03-23 15:42:14.123894206 +1100
-@@ -96,7 +96,7 @@
-            (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass []
- 
-            methodCount  = length decls
--           ghcoptions   = [ "{-# LANGUAGE ForeignFunctionInterface #-}"]
-+           ghcoptions   = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"]
- 
-            export   = concat  [ ["module " ++ moduleRoot ++ moduleName
-                                 , "    ( -- * Global" ]
-@@ -111,6 +111,9 @@
-                                 , "import Foreign.C.Types(CInt(..), CWchar(..), CChar(..), CDouble(..))"
-                                 , "import " ++ moduleRoot ++ "WxcTypes"
-                                 , "import " ++ moduleRoot ++ moduleClassTypesName
-+                                , "#if (__GLASGOW_HASKELL__>=705)"
-+                                , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))"
-+                                , "#endif"
-                                 , ""
-                                 ]
-                               ]
diff --git a/dev-haskell/wxdirect/metadata.xml b/dev-haskell/wxdirect/metadata.xml
deleted file mode 100644
index aeeb72f3259a..000000000000
--- a/dev-haskell/wxdirect/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		wxHaskell is a portable and native GUI library for Haskell. It is built on
-		top of wxWidgets, a comprehensive C++ library that is portable across all
-		major GUI platforms, including GTK, Windows, X11, and MacOS X. This version
-		works with wxWidgets 2.8 only.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/wxdirect/wxdirect-0.92.2.0-r1.ebuild b/dev-haskell/wxdirect/wxdirect-0.92.2.0-r1.ebuild
deleted file mode 100644
index 513b9111dc9c..000000000000
--- a/dev-haskell/wxdirect/wxdirect-0.92.2.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="helper tool for building wxHaskell"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	dev-haskell/strict:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'process    >= 1.1   && < 1.3' 'process    >= 1.1'
-
-	sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \
-		-i "${S}/${PN}.cabal" \
-		|| die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}"
-}
diff --git a/dev-haskell/wxdirect/wxdirect-0.92.2.0.ebuild b/dev-haskell/wxdirect/wxdirect-0.92.2.0.ebuild
deleted file mode 100644
index 5ea34301b624..000000000000
--- a/dev-haskell/wxdirect/wxdirect-0.92.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="helper tool for building wxHaskell"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	dev-haskell/strict:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \
-		-i "${S}/${PN}.cabal" \
-		|| die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}"
-}
diff --git a/dev-haskell/wxdirect/wxdirect-0.92.3.0-r1.ebuild b/dev-haskell/wxdirect/wxdirect-0.92.3.0-r1.ebuild
deleted file mode 100644
index 1fdef5bfeffb..000000000000
--- a/dev-haskell/wxdirect/wxdirect-0.92.3.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.3.9999
-
-WX_GTK_VER="3.0"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="helper tool for building wxHaskell"
-HOMEPAGE="https://wiki.haskell.org/WxHaskell"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="${WX_GTK_VER}/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?]
-	dev-haskell/strict:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'process    >= 1.1   && < 1.5' 'process    >= 1.1'\
-		'base       >= 3     && < 4' 'base >=3'\
-		'containers >= 0.1   && < 0.3' 'containers >=0.1'
-
-	sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \
-		-i "${S}/${PN}.cabal" \
-		|| die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}"
-
-	# embed ${CHOST}-cpp instead of "cpp" to support sys-devel/gcc-config[-native-symlinks]
-	# Ideally it should also obey CPP variable
-	sed -e 's/"cpp"/"'${CHOST}-cpp'"/g' \
-		-i src/ParseC.hs || die
-}
diff --git a/dev-haskell/x11-xft/Manifest b/dev-haskell/x11-xft/Manifest
index fff53ad6af68..0c742bb66dd8 100644
--- a/dev-haskell/x11-xft/Manifest
+++ b/dev-haskell/x11-xft/Manifest
@@ -1 +1 @@
-DIST X11-xft-0.3.1.tar.gz 13621 BLAKE2B a8b7f1d042e4cc10707a8d38b570cf4af8041b978afb75eddd8ce65c7ad20a4b13de384aab51a46d298ffc4be73912381d9c8cc1d8d987069259e1dfb163f7d6 SHA512 8f40db25453227ef9ce53b05a0c6af869e3a2efdb1d9b9ad683baf52601f320c85b09f0e514bb6ffeb17516d9b75c6772aa49613bb96272d56f06788118b7cfe
+DIST x11-xft-0.3.4.tar.gz 6648 BLAKE2B c83d8cc4c8a01b923342a1dd1dab007f9bfb3d6c9040edc2b48f48f903189e8ceb09ad233492150ec50bf37c2944e2350ac728e2ef61afc9516cad75f3323c24 SHA512 cd7c10bbe21f096814ebbf1015f4492ee60e73032bbb114f8fa5684e46f96239814f6986d44955642509c06b790112a38194661754e23c874dfe9446b0c13eef
diff --git a/dev-haskell/x11-xft/metadata.xml b/dev-haskell/x11-xft/metadata.xml
index 522384de8446..c7bb0e775ab0 100644
--- a/dev-haskell/x11-xft/metadata.xml
+++ b/dev-haskell/x11-xft/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
   <email>haskell@gentoo.org</email>
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
deleted file mode 100644
index a55c7498c3cd..000000000000
--- a/dev-haskell/x11-xft/x11-xft-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11-xft"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-HOMEPAGE="https://hackage.haskell.org/package/X11-xft"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
-		>=dev-haskell/x11-1.2.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		x11-libs/libXft"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-0
-		virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
deleted file mode 100644
index 98b31928525e..000000000000
--- a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="X11-xft"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-HOMEPAGE="https://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.6.1
-		 >=dev-haskell/utf8-string-0.1[profile?]
-		 >=dev-haskell/x11-1.2.1[profile?]
-		 x11-libs/libXft"
-
-DEPEND="${RDEPEND}
-		dev-haskell/cabal"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
new file mode 100644
index 000000000000..80d5a221a7af
--- /dev/null
+++ b/dev-haskell/x11-xft/x11-xft-0.3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: -pedantic
+CABAL_PN="X11-xft"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings to the Xft and some Xrender parts"
+HOMEPAGE="https://hackage.haskell.org/package/X11-xft"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/utf8-string-0.1:=[profile?]
+	>=dev-haskell/x11-1.2.1:=[xinerama,profile?]
+	>=dev-lang/ghc-8.4.3:=
+	x11-libs/libXft
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+BDEPEND="virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-pedantic
+}
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index d36936af2a28..3fb40abbdb7f 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,4 +1 @@
-DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 8ce533c89812c1b1e5babd1025773919518f021396d67bda3cc87b0ec61b241ebe27ca40ff4ae9fca9562a73263b71b64ceda098ff809a9a688230d5a71efcde SHA512 d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144
-DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B f75e16010000fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e SHA512 f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b
-DIST X11-1.8.tar.gz 191331 BLAKE2B a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6 SHA512 bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c
-DIST X11-1.9.1.tar.gz 190698 BLAKE2B ba8ee8f26b6e7cacb2334248d3609863277817b2c06d5eb7d8491ee2804691bcc49bb1588e3f2308acacebb739d9d7920507969729ef651e9b0600aa5acbc1f4 SHA512 6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7
+DIST x11-1.10.2.tar.gz 192634 BLAKE2B a42e24aea6287a0af7f1b96fd9603d494fc010c9659a69ffcc46bb8670993271fb67061f5026f201bf730dbe0670d485f2a4197cdba5fc6bbd4f36fca4d6dd8e SHA512 5013dc359e081900193efd201c38c41ca73bc8dae3610e8e3b46e42aad7ae4a5917ecd3219d77e40141be7179963aaa2454032c820945e93ff4310ef359b2df4
diff --git a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
deleted file mode 100644
index f1d5c179036e..000000000000
--- a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
-diff --git a/X11.buildinfo.in b/X11.buildinfo.in
-index 6925939..6a18b58 100644
---- a/X11.buildinfo.in
-+++ b/X11.buildinfo.in
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
- cc-options: @X_CFLAGS@ @CPPFLAGS@
--ld-options: @X_LIBS@ @LDFLAGS@
-+ld-options: @X_LIBS@
- extra-libraries: @EXTRA_LIBRARIES@
diff --git a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
deleted file mode 100644
index 69bc33c0d21e..000000000000
--- a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
---- a/X11.buildinfo.in
-+++ b/X11.buildinfo.in
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
- cc-options: @X_CFLAGS@ @CPPFLAGS@
--ld-options: @X_LIBS@ @LDFLAGS@
-+ld-options: @X_LIBS@
- extra-libraries: @EXTRA_LIBRARIES@
diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index 4c6b85a81825..0a2f75a68429 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A Haskell binding to the X11 graphics library.
-		The binding is a direct translation of the C binding; for
-		documentation of these calls, refer to "The Xlib Programming
-		Manual", available online at &lt;http://tronche.com/gui/x/xlib/&gt;.
-	</longdescription>
-	<use>
-		<flag name="screensaver">whether to build XScreenSaver.</flag>
-	</use>
 	<upstream>
-		<remote-id type="github">haskell-pkg-janitors/X11</remote-id>
+		<remote-id type="github">xmonad/X11</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/x11/x11-1.10.2.ebuild b/dev-haskell/x11/x11-1.10.2.ebuild
new file mode 100644
index 000000000000..289b9c9d7a5c
--- /dev/null
+++ b/dev-haskell/x11/x11-1.10.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+#hackport: flags: -pedantic
+CABAL_PN="X11"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A binding to the X11 graphics library"
+HOMEPAGE="https://github.com/xmonad/X11"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+xinerama"
+
+# add +xinerama to IUSE and RDEPEND on libXScrnSaver and libXinerama below
+RDEPEND=">=dev-haskell/data-default-class-0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	xinerama? ( x11-libs/libXinerama )
+
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-pedantic \
+		--configure-option=$(use_with xinerama)
+}
diff --git a/dev-haskell/x11/x11-1.6.1.1.ebuild b/dev-haskell/x11/x11-1.6.1.1.ebuild
deleted file mode 100644
index 248061d60543..000000000000
--- a/dev-haskell/x11/x11-1.6.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-		>=dev-lang/ghc-7.4.1:=
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		screensaver? ( x11-libs/libXScrnSaver )
-		xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama) \
-		--configure-option=$(use_with screensaver xscreensaver)
-}
diff --git a/dev-haskell/x11/x11-1.6.1.2.ebuild b/dev-haskell/x11/x11-1.6.1.2.ebuild
deleted file mode 100644
index 5c8d1e671cee..000000000000
--- a/dev-haskell/x11/x11-1.6.1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/haskell-pkg-janitors/X11"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-		screensaver? ( x11-libs/libXScrnSaver )
-		xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama) \
-		--configure-option=$(use_with screensaver xscreensaver)
-}
diff --git a/dev-haskell/x11/x11-1.8-r1.ebuild b/dev-haskell/x11/x11-1.8-r1.ebuild
deleted file mode 100644
index 9f9524f235d7..000000000000
--- a/dev-haskell/x11/x11-1.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/xmonad/X11"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	screensaver? ( x11-libs/libXScrnSaver )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama) \
-		--configure-option=$(use_with screensaver xscreensaver)
-}
diff --git a/dev-haskell/x11/x11-1.9.1.ebuild b/dev-haskell/x11/x11-1.9.1.ebuild
deleted file mode 100644
index 6f5d9102b177..000000000000
--- a/dev-haskell/x11/x11-1.9.1.ebuild
+++ /dev/null
@@ -1,44 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="X11"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A binding to the X11 graphics library"
-HOMEPAGE="https://github.com/xmonad/X11"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--configure-option=$(use_with xinerama)
-}
diff --git a/dev-haskell/x509-store/Manifest b/dev-haskell/x509-store/Manifest
index f7dcbd4fd9e8..33e1adca7f37 100644
--- a/dev-haskell/x509-store/Manifest
+++ b/dev-haskell/x509-store/Manifest
@@ -1,5 +1,2 @@
-DIST x509-store-1.4.4.tar.gz 2992 BLAKE2B 9727c4a16f63003222c8794158ad96304f25579f0a43e46a7fa1c5db85d8d7ab99088096e03003622ac3d2afcb39fd5b985872e5d0edec6289f97f30493533a7 SHA512 b7a1ef5e25889ada9e654a52cf2606630c40b536359d7e1df01c96bf047816addfebdd2b0b3c7326a9b41a2b3034c641238f5fdee2f437eb29e0bc89a20e78c6
-DIST x509-store-1.5.0.tar.gz 2981 BLAKE2B 579eca067e0a2c8e65df57e2e1ebf8772959a4fd0d63bac752a3ffb7d1dd60ba57f73d0d638bc63e3194fa6343496eb8a343ca569abf4e632a822513c2bfbea4 SHA512 fdad44693615f832aafc0fc2b804bc7255d411241f669dc7396a5df958f128d6e94c1637a4b38860c4967a482915549aa94912821110477134d83095d27623d8
-DIST x509-store-1.6.1.tar.gz 3562 BLAKE2B cbbb3bd9cd280334f2dead12f156fa2b3b8ab5dbe2d72a5eb4cbb42023ee15df8823d89dd076c62638bb52a37537f6c1ada7906c3d1f374da3bcf54aecd0c0e5 SHA512 1417bfbb1f4863fe2e3e31f37253b2d96f145a790edb1f5f2439ddcadad67497d082222410f08ae9c2c2d1e87a1c994f09551f796b17ab757373a85fbb53e5da
-DIST x509-store-1.6.2.tar.gz 4326 BLAKE2B 1d79775d622cb6ba70069fdc61c5338447cb6e496b3ac621695ae4a172ff35c008cda4d036dd04d27c6f787d480ac5779d90c01c387eb83c080a5a01fc95c6b1 SHA512 41e511ea32095e96c71da17a1dfd34fa4e4d5e9a0d87d99586a5976602844f196aa0cca9ee97f66a092284a2c6120c0174a7f2d707a3e80c1d7020ee6168f847
 DIST x509-store-1.6.7.tar.gz 12689 BLAKE2B 13e879b6a46e662de0660c5a2257881e50487d2667180030dca0dcf33a60718c75aa6413daa5b874622eaf9612e6cad7009ecd84d2d517bb5769beb4eafe4ec7 SHA512 7b0b792a988aed50995523c3f6a3bb0da08cb8963ad834afbeef8bc53e4bb3d7d11af757a999f7b5c81ef073bac10a4003fba7486abd9343a48770bfc954167e
+DIST x509-store-1.6.9.tar.gz 12734 BLAKE2B f7b7ca1dcba3f2a08cc4f887da074604ac855f0a381a5e87a9283d864e18e7c9e436def2dff58c55d73eaf9e19e4d15a3e5f4d3980585b1cfbe2a992b1a8d688 SHA512 10d0f4a4cb88852d8fd79676908e712ecc19a1b54cae9245f976eea1382abc03392e7fa593973180e6cfd9eb3c1de7133cf738a7c8b3a86d02278d2777d3af96
diff --git a/dev-haskell/x509-store/metadata.xml b/dev-haskell/x509-store/metadata.xml
index 387cfc03b044..cfceea26acb5 100644
--- a/dev-haskell/x509-store/metadata.xml
+++ b/dev-haskell/x509-store/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="executable">Build the executable</flag>
-	</use>
-	<longdescription>
-		X.509 collection accessing and storing methods for certificate, crl, exception list
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">x509-store</remote-id>
 		<remote-id type="github">vincenthz/hs-certificate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/x509-store/x509-store-1.4.4.ebuild b/dev-haskell/x509-store/x509-store-1.4.4.ebuild
deleted file mode 100644
index b7b75bc7daa4..000000000000
--- a/dev-haskell/x509-store/x509-store-1.4.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 collection accessing and storing methods"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.8:=[profile?] <dev-haskell/asn1-encoding-0.9:=[profile?]
-	>=dev-haskell/asn1-types-0.2:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.4.3:=[profile?] <dev-haskell/x509-1.5:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/x509-store/x509-store-1.5.0.ebuild b/dev-haskell/x509-store/x509-store-1.5.0.ebuild
deleted file mode 100644
index 4911e1fef2fc..000000000000
--- a/dev-haskell/x509-store/x509-store-1.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 collection accessing and storing methods"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.3:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable) \
-		$(cabal_flag test test)
-}
diff --git a/dev-haskell/x509-store/x509-store-1.6.1.ebuild b/dev-haskell/x509-store/x509-store-1.6.1.ebuild
deleted file mode 100644
index 6d695184f6a1..000000000000
--- a/dev-haskell/x509-store/x509-store-1.6.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 collection accessing and storing methods"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-store/x509-store-1.6.2.ebuild b/dev-haskell/x509-store/x509-store-1.6.2.ebuild
deleted file mode 100644
index 55d711f3c4f8..000000000000
--- a/dev-haskell/x509-store/x509-store-1.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 collection accessing and storing methods"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-store/x509-store-1.6.7.ebuild b/dev-haskell/x509-store/x509-store-1.6.7.ebuild
index 6bd29f8a9c29..475d7787ec32 100644
--- a/dev-haskell/x509-store/x509-store-1.6.7.ebuild
+++ b/dev-haskell/x509-store/x509-store-1.6.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
diff --git a/dev-haskell/x509-store/x509-store-1.6.9.ebuild b/dev-haskell/x509-store/x509-store-1.6.9.ebuild
new file mode 100644
index 000000000000..a65b9e8098fb
--- /dev/null
+++ b/dev-haskell/x509-store/x509-store-1.6.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 collection accessing and storing methods"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	dev-haskell/cryptonite:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+	>=dev-haskell/x509-1.7.2:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/x509-system/Manifest b/dev-haskell/x509-system/Manifest
index 8fdfc85bd469..7e306acd4515 100644
--- a/dev-haskell/x509-system/Manifest
+++ b/dev-haskell/x509-system/Manifest
@@ -1,5 +1,2 @@
-DIST x509-system-1.4.5.tar.gz 3596 BLAKE2B 09c07e7391ebabd7ea2d52b784b54c6b6f39ee2ad6cd29c6ab0ba1b9b4be44cb2edce88b66e499f3ab1fbfbfb22ad1e1b60f907733bc6d3e45cd53085bafdfd9 SHA512 609dfd0a8095f9a9b9b869a871b9da463f50c2973a48d60dad8e6c8f652cdebc09675391f8193bf183b64dab9d81dab09e1561bc253534958d10d325e217c3a9
-DIST x509-system-1.5.0.tar.gz 3832 BLAKE2B 8912c9cd13add9113b204bc0626fa36ce91ec797743e655c978f56352f3d7ea77158168d887e85b4cf13e71cef73586fd82b987a8ba994f08587a891a6e59a71 SHA512 275423717680d62978fbe0703861c05ca2ebe2f0185bd479b5590c725380508d3aefcb229f62111647592f28bddef5285d1224cedab71349b28ee23d8a7d1ee4
-DIST x509-system-1.6.3.tar.gz 4035 BLAKE2B 639deab930f04f1faaa362cd475eb9ced191c7cc93eb83a35e8230b80723e2c607e0c1b9ac34e807afc22c628ad96773e3d83fbecb42aa819ef5a19de4356ae2 SHA512 4368254a6a1d96876372797bdb360c89fde4266a1fd73d028e7807ea342cc58090181c5fe81c0f19ec8620424be04ceefc48dbe4a682cb792dc6bd6726bc2e6e
-DIST x509-system-1.6.4.tar.gz 3443 BLAKE2B 95357c8cd5f5b6e18af9a380d13adfd4bd7eaa69dd67451ab74313046ccc20b16b96d8980818e0700be019d49f419f6fd447943b12c7ffe82690cf2f796b2265 SHA512 5b12e9d3509d0f131532f4a5857442cdb64c157b16fb71b181336b7ff1840222f6bbcccbd69609b74d5f387963eb4ece37bb9fd37bb5d1e6d9d2aa5162739bf7
 DIST x509-system-1.6.6.tar.gz 3419 BLAKE2B 12de162cfc29ddc0f0e5649e0531609bda73f0b0cb305e03015e037f7cb5cef7e4c9a2fa202396673f81e28084e6c4c52cd588cc1050e7bbd4cbe1116b916722 SHA512 110f8e9566ab1cd9491f1bc9cb11ee950c34308af026e71b9f8e60beac09b0e062e1e3a0177d67b04aab824c54476b800b965bf616fe84ba0181991371c9c220
+DIST x509-system-1.6.7.tar.gz 3438 BLAKE2B 74ba3138c21ea81a03deeb2c3b691238704ad8c275eeefc792ba4a79f0953fcea3466861df7f90f03d5e3435fa7fd4da3c342c5a3fbfa73c946929ad71c755c8 SHA512 8414d8f6d0e704419ccdd6832522480022bb15ac225b6bd9cf5f2d8fffb7f979d414bcb5c465f4d73d9eef40210ef9aa5da51aea9eed2ce245d2b44daf2c415e
diff --git a/dev-haskell/x509-system/metadata.xml b/dev-haskell/x509-system/metadata.xml
index dea36bde9523..436de7f6d64b 100644
--- a/dev-haskell/x509-system/metadata.xml
+++ b/dev-haskell/x509-system/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		System X.509 handling
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">x509-system</remote-id>
 		<remote-id type="github">vincenthz/hs-certificate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/x509-system/x509-system-1.4.5.ebuild b/dev-haskell/x509-system/x509-system-1.4.5.ebuild
deleted file mode 100644
index 81ef02f263c2..000000000000
--- a/dev-haskell/x509-system/x509-system-1.4.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.4:=[profile?] <dev-haskell/x509-1.5:=[profile?]
-	>=dev-haskell/x509-store-1.4:=[profile?] <dev-haskell/x509-store-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-system/x509-system-1.5.0.ebuild b/dev-haskell/x509-system/x509-system-1.5.0.ebuild
deleted file mode 100644
index a214790d52dd..000000000000
--- a/dev-haskell/x509-system/x509-system-1.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.5:=[profile?] <dev-haskell/x509-1.6:=[profile?]
-	>=dev-haskell/x509-store-1.5:=[profile?] <dev-haskell/x509-store-1.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-system/x509-system-1.6.3.ebuild b/dev-haskell/x509-system/x509-system-1.6.3.ebuild
deleted file mode 100644
index 2b31d4159201..000000000000
--- a/dev-haskell/x509-system/x509-system-1.6.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-system/x509-system-1.6.4.ebuild b/dev-haskell/x509-system/x509-system-1.6.4.ebuild
deleted file mode 100644
index fa130c765c7c..000000000000
--- a/dev-haskell/x509-system/x509-system-1.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-haskell/x509-store-1.6.2:=[profile?] <dev-haskell/x509-store-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/x509-system/x509-system-1.6.6.ebuild b/dev-haskell/x509-system/x509-system-1.6.6.ebuild
index b7c957b16e63..d97c4bacd6aa 100644
--- a/dev-haskell/x509-system/x509-system-1.6.6.ebuild
+++ b/dev-haskell/x509-system/x509-system-1.6.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.5.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/x509-system/x509-system-1.6.7.ebuild b/dev-haskell/x509-system/x509-system-1.6.7.ebuild
new file mode 100644
index 000000000000..20c0a3d95752
--- /dev/null
+++ b/dev-haskell/x509-system/x509-system-1.6.7.ebuild
@@ -0,0 +1,27 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Handle per-operating-system X.509 accessors and storage"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
+	|| ( dev-lang/ghc dev-haskell/process[profile?] )
+	>=dev-haskell/x509-1.6:=[profile?]
+	>=dev-haskell/x509-store-1.6.2:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/x509-validation/Manifest b/dev-haskell/x509-validation/Manifest
index 29fc16ff3669..a9740d87824f 100644
--- a/dev-haskell/x509-validation/Manifest
+++ b/dev-haskell/x509-validation/Manifest
@@ -1,4 +1,2 @@
-DIST x509-validation-1.5.2.tar.gz 9658 BLAKE2B b0df27e594214e18130cad45d64b6bd14f21074d4fa3ce1090af80a432399ed77c99763fdbc089bdabafbe16d26b501e3fd221f5c55169efadbc09009cbb4463 SHA512 113cb7ebf6575e1902500a9b91dcf246d7a2d01fdccd25454660b4be667c92b60c8f18d797d69814a90ab941909370c96a24d1ed1a63b55bab5d75491f1cf603
 DIST x509-validation-1.6.11.tar.gz 19752 BLAKE2B bc9a113db4c7cc5bdcf161e39efc0858b3d08f08e8304c4f3eda5ae051d5670e1c681bf6cc9edc7244838a1fbda2f9217ffccc0cb2c00ab6732a0214932a3a74 SHA512 5c156b7018afabedac0c2ee6192c536cf09eacdaf9265490a7f4a7d336077dc198a07f16bf58f3fec04a1350f0a8b3c050380673612cf5695c9e7b5a73a4ebf4
-DIST x509-validation-1.6.3.tar.gz 10259 BLAKE2B f7ebb98c668a57399325fe9561d1d9fcea1f28e6079cdd29b3298a1a818a1fd0d318a81040bad4cd610aed0470d679ab7495b31ccf0a0f952d647e6b1381f887 SHA512 83aa4a403ee726cae8a901c64e997ce0ff9d94027c90f794ebd1eb0267cbf9f8846df7e3fd03cba5bd414e8dd7c89a46fc74d88bed8f42850e0c0e191aadabcf
-DIST x509-validation-1.6.5.tar.gz 10370 BLAKE2B 9fa399e63457c9d3d0e9bc52bfe739e38f1fa89a77a56384b7107b78b56f68f8a341ebd04a98db8b9a2dc096594893eeacc1b064e1cdfaabcc2899366685ae9f SHA512 170a01b748ebd082ed4b7c084ce2e4ee9614c8ff45ca28d4cfe32b0cae498c43bbb4ec0d9e0a6a25b480f57660fcab67222442c3df970a4242d0191e5c2015e6
+DIST x509-validation-1.6.12.tar.gz 19733 BLAKE2B 04e4a9e4030612410ffb756800a035b0f7907833bc76bad56cbeb7ee5cc829701af73e47a01c60230069b1f8d66681e70a2acb6c57822785f45ec73f65422c3e SHA512 0f9a18e422063bbd6d4db46380e8557efab8a2f5d64957325577ea9ca9ac9b1310e4bd7cba51e0d0902c094107ded6d33931ddd56c032b2203b5268bd848098e
diff --git a/dev-haskell/x509-validation/metadata.xml b/dev-haskell/x509-validation/metadata.xml
index 2fe4ec59d173..bfdf7015dd36 100644
--- a/dev-haskell/x509-validation/metadata.xml
+++ b/dev-haskell/x509-validation/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		X.509 Certificate and CRL validation
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">x509-validation</remote-id>
 		<remote-id type="github">vincenthz/hs-certificate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild b/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild
deleted file mode 100644
index aff853ef41fc..000000000000
--- a/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 Certificate and CRL validation"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-pubkey-0.1.4:=[profile?] <dev-haskell/crypto-pubkey-0.3:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	>=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.5.0:=[profile?] <dev-haskell/x509-1.6:=[profile?]
-	>=dev-haskell/x509-store-1.5:=[profile?] <dev-haskell/x509-store-1.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild b/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
index 6ac65f9ab9ac..84d79a128fe6 100644
--- a/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
+++ b/dev-haskell/x509-validation/x509-validation-1.6.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
diff --git a/dev-haskell/x509-validation/x509-validation-1.6.12.ebuild b/dev-haskell/x509-validation/x509-validation-1.6.12.ebuild
new file mode 100644
index 000000000000..439d4d8797db
--- /dev/null
+++ b/dev-haskell/x509-validation/x509-validation-1.6.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X.509 Certificate and CRL validation"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-haskell/cryptonite-0.24:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	dev-haskell/hourglass:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?]
+	>=dev-haskell/x509-1.7.5:=[profile?]
+	>=dev-haskell/x509-store-1.6:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/x509-validation/x509-validation-1.6.3.ebuild b/dev-haskell/x509-validation/x509-validation-1.6.3.ebuild
deleted file mode 100644
index d1af970f3db1..000000000000
--- a/dev-haskell/x509-validation/x509-validation-1.6.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 Certificate and CRL validation"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptonite-0.3:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/x509-validation/x509-validation-1.6.5.ebuild b/dev-haskell/x509-validation/x509-validation-1.6.5.ebuild
deleted file mode 100644
index 1d0978625739..000000000000
--- a/dev-haskell/x509-validation/x509-validation-1.6.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="X.509 Certificate and CRL validation"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/cryptonite-0.8:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/x509-1.6.2:=[profile?] <dev-haskell/x509-1.7:=[profile?]
-	>=dev-haskell/x509-store-1.6:=[profile?] <dev-haskell/x509-store-1.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/x509/Manifest b/dev-haskell/x509/Manifest
index cfb7d31d8c1c..bf28bcfeb484 100644
--- a/dev-haskell/x509/Manifest
+++ b/dev-haskell/x509/Manifest
@@ -1,5 +1,2 @@
-DIST x509-1.4.11.tar.gz 13976 BLAKE2B ef161b6ac7bc28eed8736609487fc7f53eb9765d0a51677f917ee9e304c6ac9eda56dba2b775032eaff4bab408c7fafa7814f1ad023c5682f0d77fa79a608db6 SHA512 901e8d7623dfaae745d1748a302d2aba48e63fdf0f17eb932455f0dc0e348aa17f5b9bcc9ef4838c41ac5b9f9e0b03c6dac2805ba146584dcddf55069d29a2da
-DIST x509-1.5.1.tar.gz 14528 BLAKE2B d58463da78e3ba9204e7b93e69917bfa2c04ab8debf68c1fc27cc4e0c11fc5d15f304008ced232efae93a985843feab688b18a0a188882bbed1a23a11b9adcc2 SHA512 8255cd78c2602f2bda0eb6dc8b539c5f9c656e2b24b015031e1cc0439013b17e56e339ba497717c2aa38dc33b3e61632db2965e3a7859146a69ca6cb4e69e92d
-DIST x509-1.6.3.tar.gz 16134 BLAKE2B a1f8aec494f3a1614474c949da284909a848c637f3a358a71ded546d930973805352f4b7699eb372aac1d90941a1df5e815f059fb0b03053a72093aad83d9cd0 SHA512 6ee4198954bd66febdae4b2d223490085c5e49ca6cb416667061f879488f32cb51dbe9ba8c6c9dd6a79ee3a57706c0eba3cbf49603b80d613f692192bdb32221
-DIST x509-1.6.5.tar.gz 16711 BLAKE2B 0bc0997880dd74f97806a4a287e3dbdd8b1be0a28c52666b4a1057c2607c34d8b480d3af9d02d956ccb885ff6b8dac50ff74959dda2dd650899276b7f1240543 SHA512 bd63bcb1723777e379c50db55f32a2a7d10b051a7d5a586f1caa3ed298932626669adf8dc7e4becc54090741921b23a7e39879ac743ed90c2281634f8d18240c
 DIST x509-1.7.5.tar.gz 21457 BLAKE2B 4bc51e63826de27050e254d3f51b8f346a175bfe825c4555095fecb03c1f586827a0d64865ea78b9a579aec38f671f8adf56a2d432b16ff6be8f988544bd8cfc SHA512 e1caa84944294ca412b18269eef19f1b511f0e317b25431102b8b757ce266ab4ec48f805d4d251ff46a85f3b20ef368b176d8b93a92456fc9b8885a85695c537
+DIST x509-1.7.7.tar.gz 21707 BLAKE2B 01849ecc3c47e1dde4bd2950e7fc1ee3baa59e8472e3581de26cefd32b65acf6479d230fafa3613bd8a6370673974dbd5b6594fc804be60fabf87ce9d532ac3c SHA512 36f7f703e3bd2e0f2780091901f0558fd49c568c565cabb4a638a7428e212e882aaf8e1ec0de9b1cf97296858293418d7030a4d4fe9eddb5b07656d6ee84eea6
diff --git a/dev-haskell/x509/metadata.xml b/dev-haskell/x509/metadata.xml
index c2856848dc0e..5c5e731516f8 100644
--- a/dev-haskell/x509/metadata.xml
+++ b/dev-haskell/x509/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		X509 reader and writer
-	</longdescription>
 	<upstream>
-		<remote-id type="github">vincenthz/hs-certificate</remote-id>
+		<remote-id type="github">haskell-tls/hs-certificate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/x509/x509-1.4.11.ebuild b/dev-haskell/x509/x509-1.4.11.ebuild
deleted file mode 100644
index c3269e09896f..000000000000
--- a/dev-haskell/x509/x509-1.4.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="X509 reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.8:=[profile?] <dev-haskell/asn1-encoding-0.9:=[profile?]
-	>=dev-haskell/asn1-parse-0.8:=[profile?] <dev-haskell/asn1-parse-0.9:=[profile?]
-	>=dev-haskell/asn1-types-0.2.3:=[profile?] <dev-haskell/asn1-types-0.3:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4.2.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	>=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit
-		dev-haskell/test-framework-quickcheck2 )
-"
diff --git a/dev-haskell/x509/x509-1.5.1.ebuild b/dev-haskell/x509/x509-1.5.1.ebuild
deleted file mode 100644
index 304d6883e5d6..000000000000
--- a/dev-haskell/x509/x509-1.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="X509 reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-parse-0.9:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4.2.1:=[profile?] <dev-haskell/crypto-pubkey-types-0.5:=[profile?]
-	>=dev-haskell/cryptohash-0.9:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/x509/x509-1.6.3.ebuild b/dev-haskell/x509/x509-1.6.3.ebuild
deleted file mode 100644
index 851652793d09..000000000000
--- a/dev-haskell/x509/x509-1.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="X509 reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/x509/x509-1.6.5.ebuild b/dev-haskell/x509/x509-1.6.5.ebuild
deleted file mode 100644
index 2ed3acac1500..000000000000
--- a/dev-haskell/x509/x509-1.6.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="X509 reader and writer"
-HOMEPAGE="https://github.com/vincenthz/hs-certificate"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
-	>=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
-	>=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/hourglass:=[profile?]
-	dev-haskell/memory:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
-"
diff --git a/dev-haskell/x509/x509-1.7.5.ebuild b/dev-haskell/x509/x509-1.7.5.ebuild
index de60ccc68a27..ffd9271be036 100644
--- a/dev-haskell/x509/x509-1.7.5.ebuild
+++ b/dev-haskell/x509/x509-1.7.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
diff --git a/dev-haskell/x509/x509-1.7.7.ebuild b/dev-haskell/x509/x509-1.7.7.ebuild
new file mode 100644
index 000000000000..5bca509cfeea
--- /dev/null
+++ b/dev-haskell/x509/x509-1.7.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="X509 reader and writer"
+HOMEPAGE="https://github.com/vincenthz/hs-certificate"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
+	>=dev-haskell/asn1-parse-0.9.3:=[profile?] <dev-haskell/asn1-parse-0.10:=[profile?]
+	>=dev-haskell/asn1-types-0.3.1:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-haskell/cryptonite-0.24:=[profile?]
+	dev-haskell/hourglass:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/pem-0.1:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
deleted file mode 100644
index 0cae4d446f0c..000000000000
--- a/dev-haskell/xhtml/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST xhtml-3000.2.1.tar.gz 14555 BLAKE2B e6617914fbcf4ea56b7ffbf7790305fe6c89a27f2a24a50e54cf8a13d57c5bfe66731c47bf41c3163698ae6ce98a8566199c952bca9df22ead5e1a8d9d9a2cdd SHA512 a3e901f6173e3885717ee5e451f8ea8d2ee61cbb159335eb69b0a7e097dbad350b1919aedd7f9daf530147fea7982921fc324df41112e69ed362d143fe327342
-DIST xhtml-3000.2.2.1.tar.gz 14647 BLAKE2B e1e0bf0e0f9927fd8299e67925b45caa2f265302ec940c6ec50ee464bb2fecf94d9bd14d4ee5909d7ae1564a71d1891241ecd99598a2a9757aff45b8caee8714 SHA512 0843042fb40e11ad0f47100fbead8a6eadf2d9d1d8d530195cd5100d9a2a9b81a8cf5118bcce40239e5f4fc3875ac7809791b32d19055c6fdf0b4d0cc72b207d
diff --git a/dev-haskell/xhtml/metadata.xml b/dev-haskell/xhtml/metadata.xml
deleted file mode 100644
index b628ca84b8de..000000000000
--- a/dev-haskell/xhtml/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">haskell/xhtml</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
deleted file mode 100644
index 66f29191029f..000000000000
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An XHTML combinator library"
-HOMEPAGE="https://github.com/haskell/xhtml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4 7.10.0.20141222 7.10.0.20150123 PM:7.10.1_rc3 PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3 PM:8.0.1_rc1 PM:8.0.1_rc2 PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2"
diff --git a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
deleted file mode 100644
index 9046501c4955..000000000000
--- a/dev-haskell/xhtml/xhtml-3000.2.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An XHTML combinator library"
-HOMEPAGE="https://github.com/haskell/xhtml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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:9999"
diff --git a/dev-haskell/xml-conduit/Manifest b/dev-haskell/xml-conduit/Manifest
index 98ff2af95f20..4a24062d5610 100644
--- a/dev-haskell/xml-conduit/Manifest
+++ b/dev-haskell/xml-conduit/Manifest
@@ -1,6 +1,2 @@
-DIST xml-conduit-1.1.0.9.tar.gz 29805 BLAKE2B c278d24aa5d028a56610539324044bc175cf50aa8fe8260aa9abba529db54d14653c12496ae1ceca0fa5407073a66454633eb98b39741dfcbda6cec5a111a804 SHA512 94c3f925e3ace90c1434b0becdf1a6fa73db786d71522ea413bcf40fab653f415c4e7b8653ed423ca9f24665e4b8af92661aa436824c4a1dfb7d249702bf079e
-DIST xml-conduit-1.2.3.3.tar.gz 31240 BLAKE2B a5ae1399be53d483a38ffe7570bd422a3eedfbfbcb3ee312252bade12144b43e5be0423b3521466fc2ee570a3384fa9d76827a6cb2c53862c258795356542d3c SHA512 1a72b890ad3501d8a80a4030a01da35ef913f9245db9c870f13b5d266e073f14d490d38666c639575e5cf9a28c19e27378ffda9d4fe551b2b187f9e98167bd69
-DIST xml-conduit-1.3.1.tar.gz 33304 BLAKE2B 3ee7e88de9ffc583dfb801e318304f17dbf79b0eb3c06d38fad748c8c8508aa05187f007b2aac1885fcab9211fdc1eed03518d50c1f5024beb453f4bb7478be4 SHA512 939a891304647a8643bbf186269edb3a59930bf825dfa9e5f96382259ecc1c0787fbeb826ba0e5ec2105b263c8a639fc6079e8e3918b271f0e6ab9640133d1a5
-DIST xml-conduit-1.3.3.tar.gz 33965 BLAKE2B e6bea7a2b7cec94758ffe6d624eae81eef1bcff7de6732f30a3c367367614a474768ac792f7aee5347358af0c86da6d9651257c0ce4696f49f39fd7bf6d2449d SHA512 1be43bafbdd3e0b0ca778741a42d81e95ee4f02f38dd61b06fd371f1314ff809223d0a6a269124191df8887ab82a85ff280d3a95d82c37038b04e86da12ee2b2
-DIST xml-conduit-1.3.4.2.tar.gz 34828 BLAKE2B 24514ea18adb396e66792631fb58949fa94a90980e0ab712e17175ee33152a2f68ac7b462cf92d1eeb5eac8b80ce4e7963d0dfe996fbcac4d1f64a0e908b3f90 SHA512 c4b505189edc39f80c1ae842516c2a2ca15f486465fab94864259b094f9f23dc1dfcab73f1754096fd323f0ab0bcd9a87f801d775295c99e208e9c7fa688b65a
-DIST xml-conduit-1.9.0.0.tar.gz 40139 BLAKE2B b82fc11cc1ff1e63dc8638eb5da3506cf2ca755d94aa98fa0c5db16d17c676396e1d3e747037ba846e959b9883465d090bdb036809cb542453980c52ecb4ada9 SHA512 a6348233d99db2987289448c7320820abb9ed897b389d0a275e92c4a1e8055e9fa60a422b306f2bb1289b85f83545effe00d07c9ca1ecc7f2893d74b812cca23
+DIST xml-conduit-1.9.1.1.tar.gz 42901 BLAKE2B 2dacf27f6373827b779492130b837d3b5bc7adce599820b310cebedc8b1cf525ef300c5d6e65acafb5579a6f0922a47c749fbd8c49bbb623950d08dff63079c0 SHA512 4d75960eb400a4ac8cb13bb70f59b554659fa2a6165906f73097a2bc564505a1efa78e72b121d9ed0fd8b424ff25cd1d8368e6c1f2b6ffa4b0aa36f584727687
+DIST xml-conduit-1.9.1.3.tar.gz 44653 BLAKE2B 0796cd3b4c5daa7210027b0e17eb0870dbceeaa08d60672a5bd104a1e831c98f8fe5eba3f870f0d83ae508327daabe25fd6b87fcc644bcfdf1452af939d18687 SHA512 e864ce8c8785c11d81743b6cfaab91d863c728e7f3a955d9d5ce603bd36754dad2c7066fd60270ca2a39239cb314536b4bfc02f836d53a251c842741c4909324
diff --git a/dev-haskell/xml-conduit/metadata.xml b/dev-haskell/xml-conduit/metadata.xml
index 9fafda76aad4..c8b5a6780961 100644
--- a/dev-haskell/xml-conduit/metadata.xml
+++ b/dev-haskell/xml-conduit/metadata.xml
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package provides parsing and rendering functions for XML. It is based on the datatypes found in the xml-types package. This package is broken up into the following modules:
-		
-		* Text.XML: DOM-based parsing and rendering. This is the most commonly used module.
-		
-		* Text.XML.Cursor: A wrapper around "Text.XML" which allows bidirectional traversing of the DOM, similar to XPath. (Note: Text.XML.Cursor.Generic is the same concept, but will work with any node representation.)
-		
-		* Text.XML.Unresolved: A slight modification to "Text.XML" which does not require all entities to be resolved at parsing. The datatypes are slightly more complicated here, and therefore this module is only recommended when you need to deal directly with raw entities.
-		
-		* Text.XML.Stream.Parse: Streaming parser, including some streaming parser combinators.
-		
-		* Text.XML.Stream.Render: Streaming renderer.
-		
-		Additionally, the xml-hamlet package &lt;http://hackage.haskell.org/package/xml-hamlet&gt; provides a more convenient syntax for creating XML documents. For a more thorough tutorial on this library, please see &lt;http://www.yesodweb.com/book/xml-enumerator&gt;.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">xml-conduit</remote-id>
 		<remote-id type="github">snoyberg/xml</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild
deleted file mode 100644
index 575684caea9c..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.1.0.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/attoparsec-conduit-1.0:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-builder-conduit-1.0:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-0.5:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.2.3.3.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.2.3.3.ebuild
deleted file mode 100644
index 778181a6ea6c..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.2.3.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild
deleted file mode 100644
index 4450917ad250..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild
deleted file mode 100644
index 371f49a09cb5..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild
deleted file mode 100644
index 5bf481bdbd4c..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/conduit-extra-1.1:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild
deleted file mode 100644
index 043022e12e7a..000000000000
--- a/dev-haskell/xml-conduit/xml-conduit-1.9.0.0.ebuild
+++ /dev/null
@@ -1,36 +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.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
-HOMEPAGE="https://github.com/snoyberg/xml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5:=[profile?]
-	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
-	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/doctest-0.8
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
new file mode 100644
index 000000000000..d1f0621b99b4
--- /dev/null
+++ b/dev-haskell/xml-conduit/xml-conduit-1.9.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES+=" rebuild-after-doc-workaround"
+inherit haskell-cabal
+
+DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
+HOMEPAGE="https://github.com/snoyberg/xml"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/doctest-0.8
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
+
+GHC_BOOTSTRAP_PACKAGES=( cabal-doctest )
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.9.1.3.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.9.1.3.ebuild
new file mode 100644
index 000000000000..78a0351adb9c
--- /dev/null
+++ b/dev-haskell/xml-conduit/xml-conduit-1.9.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES+=" rebuild-after-doc-workaround"
+inherit haskell-cabal
+
+DESCRIPTION="Pure-Haskell utilities for dealing with XML with the conduit package"
+HOMEPAGE="https://github.com/snoyberg/xml"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/conduit-extra-1.3:=[profile?] <dev-haskell/conduit-extra-1.4:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	>=dev-haskell/xml-types-0.3.4:=[profile?] <dev-haskell/xml-types-0.4:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0 <dev-haskell/cabal-4
+	>=dev-haskell/cabal-doctest-1.0.9 <dev-haskell/cabal-doctest-1.1
+	test? ( >=dev-haskell/doctest-0.8
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit )
+"
+
+GHC_BOOTSTRAP_PACKAGES=( cabal-doctest )
diff --git a/dev-haskell/xml-hamlet/Manifest b/dev-haskell/xml-hamlet/Manifest
index 7a79ff60638d..b793a482818f 100644
--- a/dev-haskell/xml-hamlet/Manifest
+++ b/dev-haskell/xml-hamlet/Manifest
@@ -1,3 +1,2 @@
-DIST xml-hamlet-0.4.0.11.tar.gz 6080 BLAKE2B 282ec0afa37f65f45b6581f6323f3d3cc009cb47a4af8dbb846613699a620ec1be5918b340c4e898d65c32323919aad56df808ae84baba2a97f5e9fd7f2ec71e SHA512 a0deb9996948a2a87f63f58f18365cac4d9db2538b24f10f5e0a171fb597d10c567c926c89c1cdfb098f471acdbecc8ea58164c94a10f18eebb3f7779e9f999b
-DIST xml-hamlet-0.4.0.12.tar.gz 6078 BLAKE2B a476145a649181ef9116bcc0f1bfeb076a7967d16250bdfadf455f97615cf6c384801f1addc570e9b53fc0a834bf0e58059cd77fe1347b626cbb4ab28f39b11f SHA512 f503ffdefc0c8b3f8cce140bdf474086855a78d8be1ad729674f439e6a13e3f3b5313bdc5a4c88ac06756e85946b2b1e7f51e2a336ede6d4815bed4873dbe182
 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
diff --git a/dev-haskell/xml-hamlet/metadata.xml b/dev-haskell/xml-hamlet/metadata.xml
index e8e0075eaf33..3ddd5748f682 100644
--- a/dev-haskell/xml-hamlet/metadata.xml
+++ b/dev-haskell/xml-hamlet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Hamlet-style quasiquoter for XML content
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">xml-hamlet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild
deleted file mode 100644
index 8cec2fc1b1dd..000000000000
--- a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hamlet-style quasiquoter for XML content"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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-haskell/xml-conduit-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
diff --git a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild
deleted file mode 100644
index 8c5905bbbc56..000000000000
--- a/dev-haskell/xml-hamlet/xml-hamlet-0.4.0.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hamlet-style quasiquoter for XML content"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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-haskell/xml-conduit-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
-"
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 2313e63c9738..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
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.1.9999
 
@@ -9,19 +9,19 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Hamlet-style quasiquoter for XML content"
-HOMEPAGE="http://www.yesodweb.com/"
+HOMEPAGE="https://www.yesodweb.com/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 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/xml-hamlet/xml-hamlet-0.5.0.2.ebuild b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.2.ebuild
new file mode 100644
index 000000000000..b6342e412fba
--- /dev/null
+++ b/dev-haskell/xml-hamlet/xml-hamlet-0.5.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hamlet-style quasiquoter for XML content"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+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-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+	)
+"
diff --git a/dev-haskell/xml-types/Manifest b/dev-haskell/xml-types/Manifest
index 47429d375fc5..7846e268690b 100644
--- a/dev-haskell/xml-types/Manifest
+++ b/dev-haskell/xml-types/Manifest
@@ -1,2 +1 @@
-DIST xml-types-0.3.4.tar.gz 3857 BLAKE2B 67395009679fc88baaece0732346016787909ea66cd09ecd6d7e948e1cbce22fb508bc1df006202f8b883ee4ec8e5ec1614fa08d84ab13d1bbaf7306381e7d97 SHA512 85f5de90d6494cb1e85b01f6da71335f4843336295df7b346870570fbc33ce3d760c1b92b74ca15f7fed1554a3f60025a4d51a5a9cb3079321a394f5a6842836
-DIST xml-types-0.3.6.tar.gz 4020 BLAKE2B 450e50ee20a7f758dc353fa0331e1a224dabf10e7658f489afd6755d332813564e025b2fc4f9c46a83d5c4ec7437aa3ee7dbd093d1502af5c4f1caf1d431a269 SHA512 552f2230e55bc8e45a62e06bbe8c0cb7844c5d73185303b3290632a816c5956b781fff1b0a679ce33b1759f1b9c815dab8063f6b9ced0c9e94ac314cf77b34ea
+DIST xml-types-0.3.8.tar.gz 4054 BLAKE2B c3724a1b28d0a0c2a2af6eb01eef1504bfe0b9c358f78fe507602032f3867d793b20a68432f0b87a9c5023ab898ef1efd26c925ccae472698a4e04b3bcb4958c SHA512 ef54a59de85001919ae4d0c261036b07e8e8462dd0573e7c96d500f6a559f25cb870f41e7b5a008b9fbccde771b28aa9eaba39d7940eeed9350a37fe44a8a90f
diff --git a/dev-haskell/xml-types/metadata.xml b/dev-haskell/xml-types/metadata.xml
index 3daaa927ccb7..937381521944 100644
--- a/dev-haskell/xml-types/metadata.xml
+++ b/dev-haskell/xml-types/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Basic types for representing XML
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/xml-types/xml-types-0.3.4.ebuild b/dev-haskell/xml-types/xml-types-0.3.4.ebuild
deleted file mode 100644
index fc3f4e8c8849..000000000000
--- a/dev-haskell/xml-types/xml-types-0.3.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic types for representing XML"
-HOMEPAGE="https://john-millikin.com/software/haskell-xml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/xml-types/xml-types-0.3.6.ebuild b/dev-haskell/xml-types/xml-types-0.3.6.ebuild
deleted file mode 100644
index 3183d22e8453..000000000000
--- a/dev-haskell/xml-types/xml-types-0.3.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Basic types for representing XML"
-HOMEPAGE="https://john-millikin.com/software/haskell-xml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/xml-types/xml-types-0.3.8.ebuild b/dev-haskell/xml-types/xml-types-0.3.8.ebuild
new file mode 100644
index 000000000000..1ee1851422d7
--- /dev/null
+++ b/dev-haskell/xml-types/xml-types-0.3.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Basic types for representing XML"
+HOMEPAGE="https://git.singpolyma.net/xml-types-haskell"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/xml/Manifest b/dev-haskell/xml/Manifest
index 24c91c2642b4..5d134fdf38b8 100644
--- a/dev-haskell/xml/Manifest
+++ b/dev-haskell/xml/Manifest
@@ -1,2 +1 @@
-DIST xml-1.3.13.tar.gz 12082 BLAKE2B a1e04ecfb4a94b8ff7e238a39cf708e7d22481e530dc247056913dc34ac874b18dbda0c33128bcaf1a872e22b0d36378d5d0f505bde918a4aae74eb6a159f986 SHA512 d38b74d2f57eb6b19b6b60407ac0832b391d85aa74a26aa325be0a6b79457e94333a07c7b986baca66d6135073c00fb9f6c0b7d6959e44a365397d7b9cc1644f
 DIST xml-1.3.14.tar.gz 12048 BLAKE2B bc30ff6dbc0da5554967b8ac2901cdb535ec0429d35c161f886a6172b3d5aad38e8f32dd2ec496b8acf3d21dbbd21880b148590623aaa305a15adac1c45541c2 SHA512 2ddaa6c837fe85a06c751a66ae2c185fb7190f51f24649a668032b048b3e1b15982b45c86dfee4131453f0bd1ed704e934090bbede252a2b6de30c5f4ad44137
diff --git a/dev-haskell/xml/metadata.xml b/dev-haskell/xml/metadata.xml
index dea69f9c52db..937381521944 100644
--- a/dev-haskell/xml/metadata.xml
+++ b/dev-haskell/xml/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A simple XML library.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/xml/xml-1.3.13.ebuild b/dev-haskell/xml/xml-1.3.13.ebuild
deleted file mode 100644
index df1bf93b67a4..000000000000
--- a/dev-haskell/xml/xml-1.3.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A simple XML library"
-HOMEPAGE="http://code.galois.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/text:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/xml/xml-1.3.14.ebuild b/dev-haskell/xml/xml-1.3.14.ebuild
index 3a0f55cfd680..cfa38045b2c4 100644
--- a/dev-haskell/xml/xml-1.3.14.ebuild
+++ b/dev-haskell/xml/xml-1.3.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 # ebuild generated by hackport 0.4.4.9999
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/xmlgen/Manifest b/dev-haskell/xmlgen/Manifest
deleted file mode 100644
index fb264c5ef66b..000000000000
--- a/dev-haskell/xmlgen/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST xmlgen-0.6.2.1.tar.gz 9452 BLAKE2B 724a2905a92ea95f02e71502d6f0025812e1cce52a6f6e8d3f04e4c82ac2022b7d47a04268461786cc3a45b1aa4ff3e3e6bcf2463d86a9ddb2c53b4e3c9cf6fa SHA512 c3c978859dd54cf5df970cb05f49b8b2a75a2096ef25e9a204fe665bdb3694139f69fd32f8eaef0ca047948b4c08dacae54eb67e64ac8da63cc0885022e09591
-DIST xmlgen-0.6.2.2.tar.gz 9640 BLAKE2B eb83a9548e436905e6332cac8dc658611ab6a319aabb2aae35ce60876e556c5f275799214804f5b031b5520b2b000142563645d5e3fc424f5dd775850c00115d SHA512 af86121d9417309fd27dc10c99878d5bd95c98d15ec4fc6cf29877fdd214046c0a60fc43eb7eb7fe99017553e31d615168ccbc41dc8cb915826f867e1e225b9c
diff --git a/dev-haskell/xmlgen/metadata.xml b/dev-haskell/xmlgen/metadata.xml
deleted file mode 100644
index 268865abb51e..000000000000
--- a/dev-haskell/xmlgen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Library for high-performance XML generation.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/xmlgen/xmlgen-0.6.2.1.ebuild b/dev-haskell/xmlgen/xmlgen-0.6.2.1.ebuild
deleted file mode 100644
index 1146fc9328b2..000000000000
--- a/dev-haskell/xmlgen/xmlgen-0.6.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Fast XML generation library"
-HOMEPAGE="https://hackage.haskell.org/package/xmlgen"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # Cases: 8  Tried: 0  Errors: 0  Failures: 0test/1.xml: openFile: does not exist (No such file or directory)
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/hxt-9.3 <dev-haskell/hxt-9.4
-		>=dev-haskell/quickcheck-2.5 )
-"
diff --git a/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild b/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild
deleted file mode 100644
index 23426dcaa3b1..000000000000
--- a/dev-haskell/xmlgen/xmlgen-0.6.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite: needs a port to quickcheck
-inherit haskell-cabal
-
-DESCRIPTION="Fast XML generation library"
-HOMEPAGE="https://hackage.haskell.org/package/xmlgen"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # Cases: 8  Tried: 0  Errors: 0  Failures: 0test/1.xml: openFile: does not exist (No such file or directory)
-
-RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
diff --git a/dev-haskell/xss-sanitize/Manifest b/dev-haskell/xss-sanitize/Manifest
index e1f17682095e..ca500737c927 100644
--- a/dev-haskell/xss-sanitize/Manifest
+++ b/dev-haskell/xss-sanitize/Manifest
@@ -1,3 +1,2 @@
-DIST xss-sanitize-0.3.5.6.tar.gz 10874 BLAKE2B 60f0b7ac4507870bfdd645fd47c69ecc152865be83affeb3739c6c91e94a17fb93b16be536f74bf888db50b770f361629342fb1e868b686377173e5a2cc11d1b SHA512 9799979f2632b5a5d446913e1b465110a9f4ce6c25dddf27d4fd54a492293ab9f1937668213af762494fc44d4ec270beb0816a2afb3f2b3a5da22c180cb6707d
-DIST xss-sanitize-0.3.5.7.tar.gz 10878 BLAKE2B d6746b23ad149bd0fa37954caa52cda2e636b22c837f0f8701bd2a00cd610115d0db76c08deaf8d29265bc621cdba70597f18719e077e3a4a401c39d08c8d6f4 SHA512 8633a160ef9ad5408767eecf5279b009e01621a3ac2e3a5cfd6a6a480c5f1991497d1e4eb7b0195fbdc296830d5ef729e7893b836555f3fbc2c313032f4de040
 DIST xss-sanitize-0.3.6.tar.gz 11655 BLAKE2B b1d438a6bfa587aa9eb62031fb2c1c53cc48bbadc26b6f64ce717d20d5ab9e282ed657ce5109e0501de393a8609ba99fb9e73966220dc358b222f69301ab5661 SHA512 8d038d807b7fa01a65f4b73d135c87ab75385f4c91ce174b332cd5fd1dc1ebdec26b0c5713cf3f68c27351e19e099815d1b530af3ecb7e4c45e71fec4ae12b4c
+DIST xss-sanitize-0.3.7.2.tar.gz 12002 BLAKE2B 960c3bcbdb44eee95c02e9f52b416fa283712acd1d400f1add5d9649d445e1283cc8ab73ffd797b1a331db7bbc562dbc0443db7e930fd43ad2799899db464f67 SHA512 affd74f2df2e31eb12348fd51890028cce76c3c5f905e5d10979a98dd3a325f522758b3bd7cdcdc5ab08c212468eac3326c40f62ac71e92cf4029c9c94d6dd2a
diff --git a/dev-haskell/xss-sanitize/metadata.xml b/dev-haskell/xss-sanitize/metadata.xml
index 7d68100b3327..cd6528164118 100644
--- a/dev-haskell/xss-sanitize/metadata.xml
+++ b/dev-haskell/xss-sanitize/metadata.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		run untrusted HTML through Text.HTML.SanitizeXSS.sanitizeXSS to prevent XSS attacks. see README.md &lt;https://github.com/yesodweb/haskell-xss-sanitize&gt; for more details
-	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 	<upstream>
+		<remote-id type="hackage">xss-sanitize</remote-id>
 		<remote-id type="github">yesodweb/haskell-xss-sanitize</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.6.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.6.ebuild
deleted file mode 100644
index e7c9a507780d..000000000000
--- a/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="sanitize untrusted HTML to prevent XSS attacks"
-HOMEPAGE="https://github.com/yesodweb/haskell-xss-sanitize"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?]
-	>=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.7.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.7.ebuild
deleted file mode 100644
index 4077e3221e0e..000000000000
--- a/dev-haskell/xss-sanitize/xss-sanitize-0.3.5.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="sanitize untrusted HTML to prevent XSS attacks"
-HOMEPAGE="https://github.com/yesodweb/haskell-xss-sanitize"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
-	>=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?]
-	>=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
index b690a7cba4ef..8d6d1c4e7596 100644
--- a/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
+++ b/dev-haskell/xss-sanitize/xss-sanitize-0.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,8 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND=">=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
 	>=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?]
@@ -23,10 +22,10 @@ RDEPEND=">=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1
 	>=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?]
 	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2:=[profile?]
 	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/hspec-1.3
 		>=dev-haskell/hunit-1.2 )
 "
diff --git a/dev-haskell/xss-sanitize/xss-sanitize-0.3.7.2.ebuild b/dev-haskell/xss-sanitize/xss-sanitize-0.3.7.2.ebuild
new file mode 100644
index 000000000000..b099d090cb66
--- /dev/null
+++ b/dev-haskell/xss-sanitize/xss-sanitize-0.3.7.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="sanitize untrusted HTML to prevent XSS attacks"
+HOMEPAGE="https://github.com/yesodweb/haskell-xss-sanitize#readme"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-haskell/attoparsec-0.10.0.3:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
+	>=dev-haskell/css-text-0.1.1:=[profile?] <dev-haskell/css-text-0.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
+	>=dev-haskell/tagsoup-0.12.2:=[profile?] <dev-haskell/tagsoup-1:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/hspec-1.3
+		>=dev-haskell/hunit-1.2
+	)
+"
diff --git a/dev-haskell/yaml/Manifest b/dev-haskell/yaml/Manifest
index ee853abc685c..ab07d5605989 100644
--- a/dev-haskell/yaml/Manifest
+++ b/dev-haskell/yaml/Manifest
@@ -1,6 +1,2 @@
-DIST yaml-0.11.2.0.tar.gz 29254 BLAKE2B ba9e0086fb4d93a9fd74ddf20dab71e3760af741476b13a1fe8d89944f5e5fc1aadce9a61a29a4a4607863378da98a5b5ead8bd7b4c7ffc3bae1e6b5695f977b SHA512 b90580ca37066401558c1a19148f70f6153a7f44f65ade99827adf20a4ba04edb8a9d6101b507014b92970d4bbe89c0fd89792a62206a2fbdc7ae5ff08915885
-DIST yaml-0.8.10.1.tar.gz 73448 BLAKE2B 1b4e8b50d8e4913dd772253a8a7481802afe3dbc91538da9ce06437a09d155d2711540a87d4592a9953f6f316915da20caaf85a49f3f1369b2d98a5d8d9004ca SHA512 59b26eaca99379ff84cda6b8972ec2ff1e777536a754b9bda248d350a0797ef6c24d9cb86590062f4e6c12a5453224619a656c306a0292fdd1fe46e459a286e7
-DIST yaml-0.8.15.2.tar.gz 75540 BLAKE2B fc7b03cdb582221c0d8611bee0f38189a4e55cc78a10c12906e09e1b4820de00298096d43289cd7d01ad23cd5fb9a221d9d976f90b0ec966f15975a97779312e SHA512 214a8203ca13350268b285d7049110ce91c03d6c8b0bc59187048b9efed15374c97a4b91e464e86f719d3190c0bc534f9ca4b7436fc33a4748d0fa84bb747bb4
-DIST yaml-0.8.17.1.tar.gz 78775 BLAKE2B 66ddd1bf1ccb1f7b1314cd5b56987cc6e29da23ccadbde0d62baa6a9f143167e619f83bdb2734b8d561be030ebffed62ae610c417c52a40375b395ba38fd9ee7 SHA512 7119651e209942d41a9f5a542d365b5fea77c56d9dab012e3bf77234e6c6d23e2cff65c9b6c16ca185ff33338fd75c6b3f7dacaf1ff56f96c5773fcea70687f3
-DIST yaml-0.8.20.tar.gz 80264 BLAKE2B dc1252c331e707b96f04a15026eb50862b457a0d1137c5a72f1e9269db3a1f2aac0425784c442417b04e1d08b21d52e10ba115f1170595229177f96c3545b779 SHA512 bed0bcc6758606663aa1ba315590b7f4e26043bd5fbf462219e4164c7d41144d093763f85015db2ad83fdeb51b464715d49c0ec882e43cba6b141d40d7a2226e
-DIST yaml-0.8.21.2.tar.gz 81350 BLAKE2B e2c1474625d1283eae811805127babf37e89f00a38fa889cf855a53defec7837b5c80a3e4f6cadb48855056430487cb21d380c8c4af5d54ba5e61b57820c0463 SHA512 94c612a6b54ea0844c092b2304f786dd974b7d36c365bc56a3d6f4705197a9aba85bd1c429d356bb6bb8ec1bf81ded38a859ed16a5846bfd86add6e598c7a4fa
+DIST yaml-0.11.11.2.tar.gz 31926 BLAKE2B 3c8fb1973a8d8e03fa626122862c124fd6cf8b0f5ffbcc2c6d9566fcca84fb1428857c916b5f072de13dc9198fbfec8bf2c8b3b69836eb351c24fe42cb496420 SHA512 419b5fb86d96d2e7adda5b0091d9d32eb2a5c964d32ca9d72e83feb14aef738e5029f43d1760a91ae83c47aebd8d2211e255dfdf28e95c64be3fbb2380cfaf60
+DIST yaml-0.11.8.0.tar.gz 31674 BLAKE2B a4c508eecb4e5b931e6832ceee0bd694fc6879cc6c3482a48e44c1b865207e3525c52cd51a9e2ec74a9ef98e1537f8d559151da80c0ef07351ace1665e5b5f09 SHA512 f47ae0a158bfd323e06ff31db348f916077882f4198b160c7f3f88e89ae0e62a9f17ff5ba29c15a1d74a52d040245613eced5267c38f9658d0a19007efb402f7
diff --git a/dev-haskell/yaml/metadata.xml b/dev-haskell/yaml/metadata.xml
index 2ea8f62867a3..71b8b45b1435 100644
--- a/dev-haskell/yaml/metadata.xml
+++ b/dev-haskell/yaml/metadata.xml
@@ -1,24 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides support for parsing and emitting Yaml documents.
-		
-		This package includes the full libyaml C library version 0.1.12 by Kirill
-		Simonov (&lt;http://pyyaml.org/wiki/LibYAML&gt;) in the package so you
-		don't need to worry about any non-Haskell dependencies.
-	</longdescription>
 	<use>
-		<flag name="no-examples">don't build the examples</flag>
-		<flag name="no-exe">don't install the yaml2json executable</flag>
-		<flag name="no-unicode">Don't enable unicode output. Instead, unicode characters will be escaped.</flag>
-		<flag name="system-libyaml">Use system libyaml instead on generic one</flag>
+		<flag name="executable">Install the yaml2json and json2yaml executables</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">yaml</remote-id>
 		<remote-id type="github">snoyberg/yaml</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/yaml/yaml-0.11.11.2.ebuild b/dev-haskell/yaml/yaml-0.11.11.2.ebuild
new file mode 100644
index 000000000000..9eb42d269c67
--- /dev/null
+++ b/dev-haskell/yaml/yaml-0.11.11.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for parsing and rendering YAML documents"
+HOMEPAGE="https://github.com/snoyberg/yaml#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples executable"
+
+CABAL_CHDEPS=(
+	'executable examples' 'executable haskell-yaml-examples'
+)
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
+	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
+	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
+	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+	executable? ( dev-haskell/optparse-applicative:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/base-compat
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/mockery
+		dev-haskell/temporary
+		!examples? ( dev-haskell/raw-strings-qq ) )
+"
+
+src_configure() {
+	local examples_flag="no-examples"
+	use examples && examples_flag="-no-examples"
+
+	local exe_flag="no-exe"
+	use executable && exe_flag="-no-exe"
+
+	haskell-cabal_src_configure \
+		--flag="${examples_flag}" \
+		--flag="${exe_flag}"
+}
+
+pkg_postinst() {
+	if use examples; then
+		elog "The executable installed with this package (normally named 'examples')"
+		elog "has been renamed to 'haskell-yaml-examples' to help prevent name collisions."
+	fi
+
+	haskell-cabal_pkg_postinst
+}
diff --git a/dev-haskell/yaml/yaml-0.11.2.0.ebuild b/dev-haskell/yaml/yaml-0.11.2.0.ebuild
deleted file mode 100644
index 77c1d3c93b58..000000000000
--- a/dev-haskell/yaml/yaml-0.11.2.0.ebuild
+++ /dev/null
@@ -1,47 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples +no-exe"
-
-RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
-	>=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
-	>=dev-haskell/scientific-0.3:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery
-		dev-haskell/temporary
-		no-examples? ( dev-haskell/raw-strings-qq ) )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe)
-}
diff --git a/dev-haskell/yaml/yaml-0.11.8.0.ebuild b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
new file mode 100644
index 000000000000..a3f0fb87e619
--- /dev/null
+++ b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for parsing and rendering YAML documents"
+HOMEPAGE="https://github.com/snoyberg/yaml#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples executable"
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
+	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
+	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
+	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+	executable? ( dev-haskell/optparse-applicative:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/base-compat
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/mockery
+		dev-haskell/temporary
+		!examples? ( dev-haskell/raw-strings-qq ) )
+"
+
+CABAL_CHBINS=(
+	'examples' 'haskell-yaml-examples'
+)
+
+src_configure() {
+	local examples_flag="no-examples"
+	use examples && examples_flag="-no-examples"
+
+	local exe_flag="no-exe"
+	use executable && exe_flag="-no-exe"
+
+	haskell-cabal_src_configure \
+		--flag="${examples_flag}" \
+		--flag="${exe_flag}"
+}
diff --git a/dev-haskell/yaml/yaml-0.8.10.1.ebuild b/dev-haskell/yaml/yaml-0.8.10.1.ebuild
deleted file mode 100644
index 7cad1b4d1359..000000000000
--- a/dev-haskell/yaml/yaml-0.8.10.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="no-exe unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/aeson-qq
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-exe no-exe) \
-		$(usex unicode "--flags=-no-unicode" "--flags=no-unicode") \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.15.2.ebuild b/dev-haskell/yaml/yaml-0.8.15.2.ebuild
deleted file mode 100644
index f99d3be78eac..000000000000
--- a/dev-haskell/yaml/yaml-0.8.15.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.17.1.ebuild b/dev-haskell/yaml/yaml-0.8.17.1.ebuild
deleted file mode 100644
index 5ebc14438470..000000000000
--- a/dev-haskell/yaml/yaml-0.8.17.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.20.ebuild b/dev-haskell/yaml/yaml-0.8.20.ebuild
deleted file mode 100644
index 3bdfe6f0dfbc..000000000000
--- a/dev-haskell/yaml/yaml-0.8.20.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery
-		dev-haskell/temporary )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.21.2.ebuild b/dev-haskell/yaml/yaml-0.8.21.2.ebuild
deleted file mode 100644
index 83876298f741..000000000000
--- a/dev-haskell/yaml/yaml-0.8.21.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery
-		dev-haskell/temporary )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yesod-auth-hashdb/Manifest b/dev-haskell/yesod-auth-hashdb/Manifest
deleted file mode 100644
index 2c1593fc164d..000000000000
--- a/dev-haskell/yesod-auth-hashdb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yesod-auth-hashdb-1.5.1.3.tar.gz 13367 BLAKE2B ee67116905ba799cb67e813e2096c63361ab9c4d7fdb3d64df44744e7df39b2a5754acf4f79a9b87f167a827449c6bfadc1a0bdb4df6f39f3b9110d8b7c3b0ae SHA512 2fd7de432307c2e4465b8eb9ca6af6e1ede0fb8a3e09f9a6d04cff63d03c2db57eba2282f3441b45c82774bb063fa1d5546b832ca521074304e03343010a1952
-DIST yesod-auth-hashdb-1.5.1.tar.gz 12987 BLAKE2B c0a715d26950de505e76900b309572b78ca28d8bcbd6c3c5935c91a6e614e46bb05089c442d154703ba230ab2e591bb16b1bb2fdaabac68bb51b1496030db956 SHA512 9fbbd5b3b8bdd56e0e35a7609408fff034ba320e8271655ae29d75b1a75dd7c4ef9cebc4f94ed991137940d8161ec8560af6bf3c397d86de78e447adaf741ccf
-DIST yesod-auth-hashdb-1.7.1.2.tar.gz 15751 BLAKE2B cff24e8957a68539c168466f77433fee064aa76b8426e9c1023ff704c990d0b774341c113bae066b30bbcb01e1c1199f8c6dcd9431e574838c67863a63f791a5 SHA512 417c5113530b6960f30e5209f0188c5367361acfbea2eb60a6d30a9facb5a3be6d8547dfa504da4f7a7585d8c848adbaafa0a28ffea6930f9954071e6e2647e2
diff --git a/dev-haskell/yesod-auth-hashdb/metadata.xml b/dev-haskell/yesod-auth-hashdb/metadata.xml
deleted file mode 100644
index eb75132e3307..000000000000
--- a/dev-haskell/yesod-auth-hashdb/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This package is the Yesod.Auth.HashDB plugin, originally included in yesod-auth, but now modified to be more secure and placed in a separate package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">paul-rouse/yesod-auth-hashdb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.3.ebuild b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.3.ebuild
deleted file mode 100644
index 961d9bf69d9d..000000000000
--- a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication plugin for Yesod"
-HOMEPAGE="https://github.com/paul-rouse/yesod-auth-hashdb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptohash-0.8:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/pwstore-fast-2.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0
-	test? ( dev-haskell/basic-prelude
-		>=dev-haskell/hspec-2.0.0
-		dev-haskell/http-conduit
-		dev-haskell/http-types
-		dev-haskell/monad-logger
-		dev-haskell/network-uri
-		dev-haskell/persistent-sqlite
-		dev-haskell/resourcet
-		dev-haskell/wai-extra
-		dev-haskell/yesod
-		>=dev-haskell/yesod-test-1.4.3 )
-"
diff --git a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.ebuild b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.ebuild
deleted file mode 100644
index f5332450b22b..000000000000
--- a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication plugin for Yesod"
-HOMEPAGE="https://github.com/paul-rouse/yesod-auth-hashdb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cryptohash-0.8:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?]
-	>=dev-haskell/pwstore-fast-2.2:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0
-	test? ( dev-haskell/classy-prelude
-		>=dev-haskell/hspec-2.0.0
-		dev-haskell/http-conduit
-		dev-haskell/http-types
-		dev-haskell/monad-logger
-		dev-haskell/network-uri
-		dev-haskell/persistent-sqlite
-		dev-haskell/resourcet
-		dev-haskell/wai-extra
-		dev-haskell/yesod
-		>=dev-haskell/yesod-test-1.4.3 )
-"
diff --git a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild b/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.ebuild
deleted file mode 100644
index 67438bbc6ba1..000000000000
--- a/dev-haskell/yesod-auth-hashdb/yesod-auth-hashdb-1.7.1.2.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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication plugin for Yesod"
-HOMEPAGE="https://github.com/paul-rouse/yesod-auth-hashdb"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/yesod-auth-1.4.18:=[profile?] <dev-haskell/yesod-auth-1.7:=[profile?]
-	>=dev-haskell/yesod-core-1.4.19:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/basic-prelude
-		>=dev-haskell/hspec-2.0.0
-		dev-haskell/http-conduit
-		dev-haskell/http-types
-		dev-haskell/monad-logger
-		dev-haskell/network-uri
-		dev-haskell/persistent-sqlite
-		dev-haskell/resourcet
-		dev-haskell/unordered-containers
-		dev-haskell/wai-extra
-		dev-haskell/yesod
-		>=dev-haskell/yesod-test-1.5.0.1
-		|| ( ( >=dev-haskell/yesod-auth-1.4.18 <dev-haskell/yesod-auth-1.5 )
-			( >=dev-haskell/yesod-auth-1.6.1 <dev-haskell/yesod-auth-1.7 ) ) )
-"
diff --git a/dev-haskell/yesod-auth/Manifest b/dev-haskell/yesod-auth/Manifest
deleted file mode 100644
index 40f5be4af659..000000000000
--- a/dev-haskell/yesod-auth/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST yesod-auth-1.4.13.2.tar.gz 48670 BLAKE2B 1cae99e4ae777286de827fc86ad7fc0b81810bfe80f67e15b3de4358675151bcb66c58727b1a8e0c767f6dc2f29fecd0f0bac967ca69c30c5da684d127ff74bc SHA512 b22207d0ccf86345a50b87a66b4050727003edda7a54d86f81861471a694b2ccfb21d247bea972f21a2e8693cb79988028777f25791059ea3d2a47ddd8a47731
-DIST yesod-auth-1.4.13.5.tar.gz 49064 BLAKE2B c8120dd146266e8f5d31fa6149d6a5c30ca1d62cd9fdc9646afc125ad72a9253073f8d62a62b040f86bb8cc4afc58a5fa373af37552ed4d6b20710ec3c836cba SHA512 e401fc7b2d74c924108e59784f286704cbe44af05a8dabaacac027a3da45425592e0d85d0289c2601d5aec876fd19d2707b9a31a424f3997c8577a41dc49ed73
-DIST yesod-auth-1.4.16.tar.gz 50119 BLAKE2B 54f8a6b756e13c06597c989aa75bf6f16af2b16ac71f83d6c323853341fc9bfdc6c82be648aeef0ede89327ea9af0a41fa872d03819c0a03f59bd9e2cbf8a310 SHA512 cfa30040ce0c583a96af75ff1ff0c049a24239759814138d9891c05ceb8d47acbd39f96c3940713c5c3353627cba49504f29296a99c1fe8efcd3b033e19b677b
-DIST yesod-auth-1.6.9.tar.gz 52717 BLAKE2B 0b84d830effe84ecf5f4a5bdbaed31eb746b7af32ba39c753e0c40cf9d4a1bb4efb4fc7b4a25620acd69853ae878ff0c0937a1cd9c68c2ce06dba4d0b90ff67f SHA512 071f5c3b01f70d4cf7f9516d97bdf352a6fc20f9191c6a46bccacf84f7e245e8076ff1881fa6e64c3929d300a0361b5ed1bf67c670544e2c2eca07b8aa3e24c0
diff --git a/dev-haskell/yesod-auth/metadata.xml b/dev-haskell/yesod-auth/metadata.xml
deleted file mode 100644
index a0139ad324bb..000000000000
--- a/dev-haskell/yesod-auth/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <maintainer type="project">
-  <email>haskell@gentoo.org</email>
-  <name>Gentoo Haskell</name>
-        </maintainer>
-        <longdescription>
-                Authentication for Yesod.
-        </longdescription>
-<use>
-  <flag name="network-uri">Get Network.URI from the network-uri package</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.4.13.2.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.4.13.2.ebuild
deleted file mode 100644
index 607490413b80..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.4.13.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/authenticate-1.3:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mime-mail-0.3:=[profile?]
-	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.4.20:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.4.13.5.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.4.13.5.ebuild
deleted file mode 100644
index d15c2082a549..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.4.13.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/authenticate-1.3:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/binary:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mime-mail-0.3:=[profile?]
-	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.4.20:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.4.16.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.4.16.ebuild
deleted file mode 100644
index 93b08a11063e..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.4.16.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/authenticate-1.3:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptohash:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	dev-haskell/http-client:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mime-mail-0.3:=[profile?]
-	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.4.31:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild b/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild
deleted file mode 100644
index c4fad39fdccb..000000000000
--- a/dev-haskell/yesod-auth/yesod-auth-1.6.9.ebuild
+++ /dev/null
@@ -1,61 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Authentication for Yesod"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/authenticate-1.3.4:=[profile?]
-	dev-haskell/base16-bytestring:=[profile?]
-	dev-haskell/base64-bytestring:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/cryptonite:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	>=dev-haskell/http-client-0.5:=[profile?]
-	dev-haskell/http-client-tls:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	dev-haskell/http-types:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/nonce-1.0.2:=[profile?] <dev-haskell/nonce-1.1:=[profile?]
-	>=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unliftio:=[profile?]
-	dev-haskell/unliftio-core:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
-	>=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
-	>=dev-haskell/yesod-persistent-1.6:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
index aa590b818914..76f6b17bb8c3 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -1,6 +1,2 @@
-DIST yesod-core-1.2.7.tar.gz 59361 BLAKE2B 03a929e123b854c8cda91f2c55f8c574436faff6299399e36567b29605ab68d38ea6bb6b1383458a652c8173dc7bc7dd39c85c1425dcc9314656710d91243bd6 SHA512 ca29b69db3e9ddcd93928fed78642a8740b8f73c21093cf2116caeceac597a5285f24882e2b5a40cc5ef66343e8c3d160e2d0e7b88459b649abd4b7148e6c400
-DIST yesod-core-1.4.18.1.tar.gz 85651 BLAKE2B d401ec6b53f05f0dcd6936c58fd9dea386586c9829dd1c17bb5f3835e193411be87c3e6a14c136daf98aebd7453d4b61c02717eec040df128fd5ed5376d30ac1 SHA512 9a97f00ed00f4f63be076dc586ca2305f6341816123758086265a0c939ce9e79a1f0b1399175f69a98ea0d40a5419848a81b95e64bda2010ad29b2810c515ed8
-DIST yesod-core-1.4.20.2.tar.gz 87502 BLAKE2B f689503fe45d202457f0f9bec290ecac360f116660ff3dde5b299d29cc301d45d8771d5a6eca0b2920d2787f962ea6b44df3a59d0e2fb059f0acd52ccb888272 SHA512 ad4be45ee06e3d29e2b936c2962a3d78abb398499f91019a9c3ab94d5a5e2ed9efe3d09c27c7fa078da4ec16e7d2d156765c73e8234b2e87a99c3cd46ad43c90
-DIST yesod-core-1.4.25.tar.gz 89777 BLAKE2B bdce9a3c821dadd5dd238f278230ea2fba2c509719bc6df8920f6461654f22f5062f03ede315bee2596e7241223270823155291e06c4854b61389e1ffe25dd17 SHA512 ede4120909247f5272064671df922c246736c62ddb3775657d10e865322926944de169a7e85c9fd4fe6011ccd45bc08003f872a55b17549058b93a889c080fd3
-DIST yesod-core-1.4.31.tar.gz 91273 BLAKE2B 036cb334ea56c0ed2af4263c073c942fcc9124259fba482bbe9d5a9d6e6707933b0e179d0b0c43bf92f0e5455a0d46fddc66bd05c092aecfe99cf2d99ca534dd SHA512 e701ab5bc56b7aaf0212443fd9057dfefd1709715cc69be0ab4c3a65764de123adf591e7600df243abda4a5232c79b73aecde1c853e0fb15311b30a4da53a574
-DIST yesod-core-1.6.17.2.tar.gz 97530 BLAKE2B 32f0a511ae1fa2250843470b0d4338938b9385287e09dfdf8dcef0316727b8fa93b6647458a18357ae39000d51e55b21ce99e7e46b1572a2977ca2d1321c0227 SHA512 6d07d84ced61800a2b6448862d40c77f3e36afe7d09722e45d276797a80698b40ff5dfc8f67092cce7a6759e4e325ae113fdcd0550524c42334bc15d439dfbf9
+DIST yesod-core-1.6.23.1.tar.gz 103119 BLAKE2B a15ee64ddc5da8f531690b8d6b661af618754a44e3e3511f15af69d82a53ce6d7886a4b55243d611727c2618446a145469db27b9ba122a32bd538d8cf6abdf80 SHA512 edbdf46c2a04a7286d46030212dcbb2c7f0e0e8b62e87682ae8ed4468796d15544990fb43d56a801fcfbf4dde740bc09cfa192ec21c3d5aeb72b92a5ed0cb173
+DIST yesod-core-1.6.24.2.tar.gz 104045 BLAKE2B fa18b345d97bf791275efca6a3e92f5c82fd1651391211669a2919d9a1b1ef896db5ca3fee80ae7d65a0f540a08e7eeca90ec25b524095fce5b480a02daf6bc7 SHA512 d75431871d3b38b78ca220a602ac44894c1142345588707591bacb9590ca98d4706285377d91e78e61e84050b55b2c96c0a308c4d84d2779d5fccb318f451ef3
diff --git a/dev-haskell/yesod-core/metadata.xml b/dev-haskell/yesod-core/metadata.xml
index 3dcacd9d0c75..9e6066177c58 100644
--- a/dev-haskell/yesod-core/metadata.xml
+++ b/dev-haskell/yesod-core/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Yesod is a framework designed to foster creation of RESTful web application that have strong compile-time guarantees of correctness. It also affords space efficient code and portability to many deployment backends, from CGI to stand-alone serving.
-		
-		The Yesod documentation site &lt;http://www.yesodweb.com/&gt; has much more information, tutorials and information on some of the supporting packages, like Hamlet and Persistent.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">yesod-core</remote-id>
+		<remote-id type="github">yesodweb/yesod</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild b/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild
deleted file mode 100644
index d3def3930fa6..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.2.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec-conduit:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	>=dev-haskell/cookie-0.4:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/failure-0.2:=[profile?] <dev-haskell/failure-0.3:=[profile?]
-	>=dev-haskell/fast-logger-0.2:=[profile?]
-	>=dev-haskell/hamlet-1.1:=[profile?] <dev-haskell/hamlet-1.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.2:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.1:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-0.5:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>=dev-haskell/shakespeare-1.0:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?]
-	>=dev-haskell/shakespeare-css-1.0:=[profile?] <dev-haskell/shakespeare-css-1.1:=[profile?]
-	>=dev-haskell/shakespeare-i18n-1.0:=[profile?] <dev-haskell/shakespeare-i18n-1.1:=[profile?]
-	>=dev-haskell/shakespeare-js-1.0.2:=[profile?] <dev-haskell/shakespeare-js-1.3:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.11:=[profile?]
-	>=dev-haskell/wai-1.4:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-1.3.8:=[profile?]
-	>=dev-haskell/yesod-routes-1.2:=[profile?] <dev-haskell/yesod-routes-1.3:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/network-conduit
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/wai-test-1.3.0.5 )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild
deleted file mode 100644
index 84452e391191..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.4.18.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/auto-update:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cookie-0.4.1:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.7:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-3.0.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		dev-haskell/streaming-commons )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild
deleted file mode 100644
index 422366e0cc35..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.4.20.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/auto-update:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cookie-0.4.1:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.7:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-3.0.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		dev-haskell/streaming-commons )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild
deleted file mode 100644
index 4fb590107298..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.4.25.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/auto-update:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cookie-0.4.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/deepseq-generics:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.7:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-3.0.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		dev-haskell/streaming-commons )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild b/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild
deleted file mode 100644
index 8a6abef60d10..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.4.31.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/auto-update:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.7.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cookie-0.4.2:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/deepseq-generics:=[profile?]
-	>=dev-haskell/exceptions-0.6:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lifted-base-0.1.2:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	>=dev-haskell/monad-logger-0.3.1:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/mwc-random:=[profile?]
-	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
-	dev-haskell/primitive:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-0.4.9:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	>=dev-haskell/transformers-base-0.4:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.7:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-3.0.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/network
-		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		dev-haskell/streaming-commons )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.17.2.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.17.2.ebuild
deleted file mode 100644
index 9f1561c5c41d..000000000000
--- a/dev-haskell/yesod-core/yesod-core-1.6.17.2.ebuild
+++ /dev/null
@@ -1,63 +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.4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # requires network
-
-RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
-	dev-haskell/auto-update:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.7.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	>=dev-haskell/cereal-0.3:=[profile?]
-	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
-	>=dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
-	>=dev-haskell/fast-logger-2.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
-	>=dev-haskell/primitive-0.6:=[profile?]
-	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.2:=[profile?]
-	>=dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.7:=[profile?]
-	dev-haskell/unix-compat:=[profile?]
-	dev-haskell/unliftio:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/wai-3.2:=[profile?]
-	>=dev-haskell/wai-extra-3.0.7:=[profile?]
-	>=dev-haskell/wai-logger-0.2:=[profile?]
-	>=dev-haskell/warp-3.0.2:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( dev-haskell/async
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit
-		dev-haskell/network
-		dev-haskell/streaming-commons )
-"
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild
new file mode 100644
index 000000000000..18130695bf22
--- /dev/null
+++ b/dev-haskell/yesod-core/yesod-core-1.6.23.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RESTRICT=test # requires network access
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	dev-haskell/auto-update:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.7.1:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	>=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+	dev-haskell/entropy:=[profile?]
+	>=dev-haskell/fast-logger-2.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
+	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
+	>=dev-haskell/primitive-0.6:=[profile?]
+	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/shakespeare-2.0:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/wai-3.2:=[profile?]
+	>=dev-haskell/wai-extra-3.0.7:=[profile?]
+	>=dev-haskell/wai-logger-0.2:=[profile?]
+	>=dev-haskell/warp-3.0.2:=[profile?]
+	dev-haskell/word8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/async
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hspec-expectations
+		dev-haskell/hunit
+		dev-haskell/network
+		dev-haskell/streaming-commons )
+"
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.24.2.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.24.2.ebuild
new file mode 100644
index 000000000000..4b9c5e3ecdc0
--- /dev/null
+++ b/dev-haskell/yesod-core/yesod-core-1.6.24.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+	dev-haskell/auto-update:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.7.1:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/conduit-extra:=[profile?]
+	>=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?]
+	dev-haskell/entropy:=[profile?]
+	>=dev-haskell/fast-logger-2.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?]
+	>=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?]
+	>=dev-haskell/primitive-0.6:=[profile?]
+	>=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/resourcet-1.2:=[profile?]
+	>=dev-haskell/shakespeare-2.0:=[profile?]
+	>=dev-haskell/text-0.7:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	dev-haskell/unliftio:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-haskell/wai-3.2:=[profile?]
+	>=dev-haskell/wai-extra-3.0.7:=[profile?]
+	>=dev-haskell/wai-logger-0.2:=[profile?]
+	>=dev-haskell/warp-3.0.2:=[profile?]
+	dev-haskell/word8:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/async
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hspec-expectations
+		dev-haskell/hunit
+		dev-haskell/network
+		dev-haskell/streaming-commons )
+"
diff --git a/dev-haskell/yesod-default/Manifest b/dev-haskell/yesod-default/Manifest
deleted file mode 100644
index e6264653bb38..000000000000
--- a/dev-haskell/yesod-default/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yesod-default-1.2.0.tar.gz 1397 BLAKE2B 9ec72760a47bc5ad36da19ae2e1f42bbf758d0ddb45c5c1e9450600296c26d402ca91719cadbac5ac0a82ec912f8d54b695964dd86e19b9151c380350a3290ab SHA512 35952255a12d7f661bca1312c31a2516fcce64046018e58f10811dd2c7439c2f4faaac622946e6ec64153972fd33d0c00f575f3cba196d99658c4d46c0d1e18d
diff --git a/dev-haskell/yesod-default/metadata.xml b/dev-haskell/yesod-default/metadata.xml
deleted file mode 100644
index 121cf62fce42..000000000000
--- a/dev-haskell/yesod-default/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Convenient wrappers for your the configuration and
-		execution of your yesod application
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild b/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
deleted file mode 100644
index 6c38ba24a775..000000000000
--- a/dev-haskell/yesod-default/yesod-default-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Default config and main functions for your yesod application (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/yesod-core-1.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/yesod-form/Manifest b/dev-haskell/yesod-form/Manifest
index 1df60affa023..813539bb2d01 100644
--- a/dev-haskell/yesod-form/Manifest
+++ b/dev-haskell/yesod-form/Manifest
@@ -1,4 +1,2 @@
-DIST yesod-form-1.4.10.tar.gz 31028 BLAKE2B 745d2b872eb79e0c5d4504e783ac5f6797b258071009e1ba9874d1297698a01800876f8b28e96a09ddc81de10c41f8710142637fb9cf19a46b8b2598f7a28086 SHA512 a8736407147c2d0158ee4c6d9805450fdc692cb307e87bac753c380f78e1c6a2b36fc482bf6fab7e64403ea82df0af95a7afbeba0f4fdd93c42b9ab75503c8c4
-DIST yesod-form-1.4.7.1.tar.gz 30581 BLAKE2B 27d7c0bbdb835838704a52dce5ab59e77df3813e234b76d3131d121734496f0fe35443f1d96f765c437b63d00618c83a5ef0aeb0ebb42380dcc07a080eeda90a SHA512 71d5eacfb959320f2120304e36ad067c480002fddc2f6f6b1d9fb0b97864ead335eb66e813ebb554a8d312859a60cbd820edaa7541745f847c18aef8130598d7
-DIST yesod-form-1.4.8.tar.gz 30739 BLAKE2B 7a9a2348e537d077225b83d5e2588eac78dc1cd27229a22d34406b4ef8b3536950c43914c4ed4c1b6167dc2e235b4688be7fd8c971257c4aa6cdc793af182647 SHA512 d413f41c820c5428ceac0815d68d7518f8a5e45104a64a92d03381f1ccfcfb7e0c99b176c4440adf463b6ed2a4cf52aaebec6deb422c27ae0e6bd143434e4838
-DIST yesod-form-1.6.7.tar.gz 33673 BLAKE2B 0675fc4bdb5e5ae9b7a7556378c14d4c8a8ff85ae055f3f8989667a6de209e8f1a318bd69148e81ba6cf121c5f0ac18fb20bcccfa6bd85d31ce164a30ba6282d SHA512 a23c2cb67ed0a87afde9e9e903aa789f8fd9c071893a1bebd0ff9dc3dec6e8e03dd08a4a7ef6ef2d438fbf62597ea0181a038bd7bb5631199c9be83d2a8aef0c
+DIST yesod-form-1.7.0.tar.gz 34435 BLAKE2B 86b299931316eaece475ee741357acf8e61797bd00cdbdaf9298a1ac6967b735915f0169eb12559ef7296466f61fd20a6624c62c08a5ef148566925659da1e05 SHA512 dc5373c62e78d79e570171c608fa2e9cfb2092a859b81a881ab69a406c357cc9eeff0ff04d0c08f8cc29cf66ef488ce6b96195d26b9c6dff879a1fea96eff013
+DIST yesod-form-1.7.4.tar.gz 35498 BLAKE2B 71812b32c44b21cd36045b821a6602551b09ec57be4c9e378c303b5e68fe7165950b623c013ee6ea3d35c0c33b8fd285fb138d480678245be1404921c753cb09 SHA512 8233cc85d7fd6f6e2d815fd38d3d0d2ebd1c7c11249ee3708dace0934e961319cf4d7063e8982b9f7bd329c3d110bade8013dfe987d6cbdecfc6c15e87abb982
diff --git a/dev-haskell/yesod-form/metadata.xml b/dev-haskell/yesod-form/metadata.xml
index fb12836282c7..a8a9666053c5 100644
--- a/dev-haskell/yesod-form/metadata.xml
+++ b/dev-haskell/yesod-form/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer type="project">
-  <email>haskell@gentoo.org</email>
-  <name>Gentoo Haskell</name>
-        </maintainer>
-        <longdescription>
-                Form handling support for Yesod Web Framework
-        </longdescription>
-<use>
-  <flag name="network-uri">Get Network.URI from the network-uri package</flag>
-</use>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="network-uri">Get Network.URI from the network-uri package</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">yesod-form</remote-id>
+		<remote-id type="github">yesodweb/yesod</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/yesod-form/yesod-form-1.4.10.ebuild b/dev-haskell/yesod-form/yesod-form-1.4.10.ebuild
deleted file mode 100644
index 76638fa1cb1b..000000000000
--- a/dev-haskell/yesod-form/yesod-form-1.4.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-form/yesod-form-1.4.7.1.ebuild b/dev-haskell/yesod-form/yesod-form-1.4.7.1.ebuild
deleted file mode 100644
index 1e1ef5035f83..000000000000
--- a/dev-haskell/yesod-form/yesod-form-1.4.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-form/yesod-form-1.4.8.ebuild b/dev-haskell/yesod-form/yesod-form-1.4.8.ebuild
deleted file mode 100644
index 287398ddc77e..000000000000
--- a/dev-haskell/yesod-form/yesod-form-1.4.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-form/yesod-form-1.6.7.ebuild b/dev-haskell/yesod-form/yesod-form-1.6.7.ebuild
deleted file mode 100644
index 39c33a1f6d21..000000000000
--- a/dev-haskell/yesod-form/yesod-form-1.6.7.ebuild
+++ /dev/null
@@ -1,48 +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
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Form handling support for Yesod Web Framework"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/byteable:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/email-validate-1.0:=[profile?]
-	dev-haskell/persistent:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-haskell/shakespeare-2.0:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
-	>=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild b/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
new file mode 100644
index 000000000000..8b19fef258e0
--- /dev/null
+++ b/dev-haskell/yesod-form/yesod-form-1.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Form handling support for Yesod Web Framework"
+HOMEPAGE="https://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+network-uri"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	dev-haskell/byteable:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/email-validate-1.0:=[profile?]
+	dev-haskell/persistent:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	>=dev-haskell/shakespeare-2.0:=[profile?]
+	>=dev-haskell/text-0.9:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hspec )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/yesod-form/yesod-form-1.7.4.ebuild b/dev-haskell/yesod-form/yesod-form-1.7.4.ebuild
new file mode 100644
index 000000000000..f40f5131eed9
--- /dev/null
+++ b/dev-haskell/yesod-form/yesod-form-1.7.4.ebuild
@@ -0,0 +1,45 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Form handling support for Yesod Web Framework"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+network-uri"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
+	dev-haskell/byteable:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/email-validate-1.0:=[profile?]
+	dev-haskell/persistent:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	>=dev-haskell/shakespeare-2.0:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3.0.1:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hspec )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/yesod-json/Manifest b/dev-haskell/yesod-json/Manifest
deleted file mode 100644
index e2b7228c8231..000000000000
--- a/dev-haskell/yesod-json/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST yesod-json-1.1.2.2.tar.gz 3752 BLAKE2B fadd8b8b25d7e9e3de74ae8b7da7192065a68e015b5bf5bab8e476bbf45513b7cf59df7a60d6ea8e03e7398f83afead3ab4178cccb3c570d2cbc5512935076f9 SHA512 ab577311763850d3bdac8281761e43384bbc552e2caa7285797f7a9c8163de5b43f4d84495f2f716577a1848fa84a892789a5223752b6395bcdac7a46deb6763
-DIST yesod-json-1.2.0.tar.gz 1373 BLAKE2B d1e7d69aa98685fd6a77274a52302b9aa9b7614a1363f272209620ebd4f267062c4c7d5964c4f48a4d5a87571f02616a0b3bdbd834916f4821d271fa6257bd68 SHA512 9fa3eb964e5a543d4f38293245a8ef7f585c5ead94dd0fbc028fca5c954401eafb11e3d18a60a12baa82d3cedce871271b8320d65996f0b00021804c00da0dbb
diff --git a/dev-haskell/yesod-json/metadata.xml b/dev-haskell/yesod-json/metadata.xml
deleted file mode 100644
index ee87ffcd4335..000000000000
--- a/dev-haskell/yesod-json/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Generate content for Yesod using the aeson package.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-json/yesod-json-1.1.2.2.ebuild b/dev-haskell/yesod-json/yesod-json-1.1.2.2.ebuild
deleted file mode 100644
index d0c4ea156949..000000000000
--- a/dev-haskell/yesod-json/yesod-json-1.1.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Generate content for Yesod using the aeson package"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-		>=dev-haskell/attoparsec-conduit-0.5:=[profile?]
-		dev-haskell/blaze-builder:=[profile?]
-		>=dev-haskell/conduit-0.5:=[profile?]
-		>=dev-haskell/safe-0.2:=[profile?]
-		>=dev-haskell/shakespeare-js-1.0:=[profile?]
-		>=dev-haskell/text-0.8:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		>=dev-haskell/vector-0.9:=[profile?]
-		>=dev-haskell/wai-1.3:=[profile?]
-		>=dev-haskell/wai-extra-1.3:=[profile?]
-		>=dev-haskell/yesod-core-1.1:=[profile?]
-		>=dev-haskell/yesod-routes-1.1:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( dev-haskell/hspec
-			dev-haskell/wai-test
-		)"
diff --git a/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild b/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
deleted file mode 100644
index 2ddf8f640ae2..000000000000
--- a/dev-haskell/yesod-json/yesod-json-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Generate content for Yesod using the aeson package. (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/yesod-core-1.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/yesod-persistent/Manifest b/dev-haskell/yesod-persistent/Manifest
index 9883ec097f1c..a97e826911ec 100644
--- a/dev-haskell/yesod-persistent/Manifest
+++ b/dev-haskell/yesod-persistent/Manifest
@@ -1,4 +1 @@
-DIST yesod-persistent-1.4.0.5.tar.gz 4375 BLAKE2B 805d7a92af3183a7dbe47f836162bfc6c39c9fe65e40681cac949fe89b0a54dcbf9a41582f4f077d32570b4b5978073330c72087a62f9a3337e528aa12f96cd8 SHA512 867e252e7c511da5b4adaaebb22f53fcf657a588c43be456d8415157e49caa8e51b40fb875bf93834cf93c353c5d9f8455eff911636a13245c0725617ad52eb1
-DIST yesod-persistent-1.4.0.6.tar.gz 4401 BLAKE2B 7fe7900bee5ee3925b9a9c0d557e46a482c9fe40ac1a4669767ee52921ebf0c5d76a5b4e7957ccf9baf1938cf3955ce72ede4d822c056c86f5717d9e3eece858 SHA512 36f949ad6e2740ee3f9e3d198e4e8641b8349f41d1ebb4a958892df638a966b98cffb2579d3d08dae30baffd385aaba93364864736db973ce74174eb2062f64e
-DIST yesod-persistent-1.4.1.1.tar.gz 4893 BLAKE2B 5760256a7dcba44df192e47df3dfc0f4cd8691dd4a48def527e21c29e9111e644aef7a2be089cab44227248167c382b07b4217c8a3ba16bb470830e16c00d120 SHA512 e808d9266299d5d91c8d7766af62693791654213a1c51368e4259c9fcbd16e476d17403870d1ce5dd1c8761fa09932b4e91f713af715ca8e0de63a13f48bda04
-DIST yesod-persistent-1.6.0.4.tar.gz 5319 BLAKE2B ed8afa4ceaad8dabd62e5da4d11d7aef3f2f8c97277de6df99380be8650ca3c0481aba2f62204b8d94f9bc5769e260c1576dd9fe5608626bd6018d1e965389ca SHA512 a52d85b025397ae04641346107124a5570765356bc7209f0391646b93b3c8954219c73d717c98d108d552800eeb2122531f98abd2b0e2109aee59c7d9825f70d
+DIST yesod-persistent-1.6.0.8.tar.gz 5612 BLAKE2B c3eae29c88a3093d0ef0f254888943f284be22c6b1face4ebffe63f8964e1681c23ef054eac7b3ad2cb1a04d382c1388e042e11ebe54474321ce51783b6f0c78 SHA512 2e356cd3f1ffac1ad7390cdaff436c4179190e8f160fe8a8e798678498e67ea34ba087207df750453bc237e827f7c2748c86a2419240079c5a7012cef5381340
diff --git a/dev-haskell/yesod-persistent/metadata.xml b/dev-haskell/yesod-persistent/metadata.xml
index dbc5c9243bbe..937381521944 100644
--- a/dev-haskell/yesod-persistent/metadata.xml
+++ b/dev-haskell/yesod-persistent/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Some helpers for using Persistent from Yesod.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.5.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.5.ebuild
deleted file mode 100644
index d744096b8ca0..000000000000
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.6:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.6:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4.5:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-sqlite
-		dev-haskell/text
-		dev-haskell/wai-extra )
-"
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.6.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.6.ebuild
deleted file mode 100644
index 9ac021eba124..000000000000
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.4.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4.5:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-sqlite
-		dev-haskell/text
-		dev-haskell/wai-extra )
-"
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.4.1.1.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.4.1.1.ebuild
deleted file mode 100644
index a290fa55d386..000000000000
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.4.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/persistent-2.1:=[profile?] <dev-haskell/persistent-2.7:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.7:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4.0:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/persistent-sqlite
-		dev-haskell/text
-		dev-haskell/wai-extra )
-"
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild
deleted file mode 100644
index f2c67cec55ef..000000000000
--- a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.4.ebuild
+++ /dev/null
@@ -1,35 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Some helpers for using Persistent from Yesod"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/blaze-builder:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/persistent-2.8:=[profile?] <dev-haskell/persistent-2.11:=[profile?]
-	>=dev-haskell/persistent-template-2.1:=[profile?] <dev-haskell/persistent-template-2.9:=[profile?]
-	dev-haskell/resource-pool:=[profile?]
-	>=dev-haskell/resourcet-0.4.5:=[profile?]
-	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		>=dev-haskell/persistent-sqlite-2.8
-		dev-haskell/text
-		dev-haskell/wai-extra )
-"
diff --git a/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild
new file mode 100644
index 000000000000..446aea1bf314
--- /dev/null
+++ b/dev-haskell/yesod-persistent/yesod-persistent-1.6.0.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Some helpers for using Persistent from Yesod"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/blaze-builder:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	>=dev-haskell/persistent-2.8:=[profile?]
+	>=dev-haskell/persistent-template-2.1:=[profile?]
+	dev-haskell/resource-pool:=[profile?]
+	>=dev-haskell/resourcet-0.4.5:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hspec
+		>=dev-haskell/persistent-sqlite-2.8
+		dev-haskell/wai-extra )
+"
diff --git a/dev-haskell/yesod-platform/Manifest b/dev-haskell/yesod-platform/Manifest
deleted file mode 100644
index 26c3acb0b5e5..000000000000
--- a/dev-haskell/yesod-platform/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yesod-platform-1.2.13.3.tar.gz 2730 BLAKE2B 77dc083346d1223593d870cbcf978fb33ef7ff6479cb6b53b139b32a3aa270207215b0c6a2b6d4885169a373fe0198b3374e31d0a0dd45c0a19842d22991eafa SHA512 4049d39eb781d909cab7933e0eea0cf6108ebcb1e964fdc1b168fbaa7bf5da557b34d8e7e662ee91fa3f00de650b12bf19d27546981c2718b2c9c09d3221699a
diff --git a/dev-haskell/yesod-platform/metadata.xml b/dev-haskell/yesod-platform/metadata.xml
deleted file mode 100644
index 9d35a301e8dc..000000000000
--- a/dev-haskell/yesod-platform/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Instead of allowing version ranges of dependencies, this package requires specific versions to avoid dependency hell
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-platform/yesod-platform-1.2.13.3.ebuild b/dev-haskell/yesod-platform/yesod-platform-1.2.13.3.ebuild
deleted file mode 100644
index 9697e7db8201..000000000000
--- a/dev-haskell/yesod-platform/yesod-platform-1.2.13.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Meta package for Yesod (deprecated)"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ansi-terminal-0.6.1.1:=[profile?]
-	>=dev-haskell/ansi-wl-pprint-0.6.7.1:=[profile?]
-	>=dev-haskell/asn1-encoding-0.8.1.3:=[profile?]
-	>=dev-haskell/asn1-parse-0.8.1:=[profile?]
-	>=dev-haskell/asn1-types-0.2.3:=[profile?]
-	>=dev-haskell/attoparsec-conduit-1.1.0:=[profile?]
-	>=dev-haskell/authenticate-1.3.2.10:=[profile?]
-	>=dev-haskell/auto-update-0.1.0.0:=[profile?]
-	>=dev-haskell/base16-bytestring-0.1.1.6:=[profile?]
-	>=dev-haskell/base64-bytestring-1.0.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3.3.2:=[profile?]
-	>=dev-haskell/blaze-builder-conduit-1.1.0:=[profile?]
-	>=dev-haskell/blaze-html-0.7.0.2:=[profile?]
-	>=dev-haskell/blaze-markup-0.6.1.0:=[profile?]
-	>=dev-haskell/byteable-0.1.1:=[profile?]
-	>=dev-haskell/byteorder-1.0.4:=[profile?]
-	>=dev-haskell/cereal-0.4.0.1:=[profile?]
-	>=dev-haskell/cipher-aes-0.2.8:=[profile?]
-	>=dev-haskell/cipher-des-0.0.6:=[profile?]
-	>=dev-haskell/cipher-rc4-0.1.4:=[profile?]
-	>=dev-haskell/clientsession-0.9.0.3:=[profile?]
-	>=dev-haskell/conduit-1.1.7:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.3:=[profile?]
-	>=dev-haskell/connection-0.2.3:=[profile?]
-	>=dev-haskell/cookie-0.4.1.2:=[profile?]
-	>=dev-haskell/cprng-aes-0.5.2:=[profile?]
-	>=dev-haskell/crypto-api-0.13:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.9:=[profile?]
-	>=dev-haskell/crypto-numbers-0.2.3:=[profile?]
-	>=dev-haskell/crypto-pubkey-0.2.4:=[profile?]
-	>=dev-haskell/crypto-pubkey-types-0.4.2.2:=[profile?]
-	>=dev-haskell/crypto-random-0.0.7:=[profile?]
-	>=dev-haskell/cryptohash-0.11.6:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2.1:=[profile?]
-	>=dev-haskell/data-default-0.5.3:=[profile?]
-	>=dev-haskell/data-default-class-0.0.1:=[profile?]
-	>=dev-haskell/data-default-instances-base-0.0.1:=[profile?]
-	>=dev-haskell/data-default-instances-containers-0.0.1:=[profile?]
-	>=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?]
-	>=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?]
-	>=dev-haskell/dlist-0.7.1:=[profile?]
-	>=dev-haskell/email-validate-2.0.1:=[profile?]
-	>=dev-haskell/entropy-0.3.2:=[profile?]
-	>=dev-haskell/esqueleto-1.4.4:=[profile?]
-	>=dev-haskell/exceptions-0.6.1:=[profile?]
-	>=dev-haskell/fast-logger-2.2.0:=[profile?]
-	>=dev-haskell/file-embed-0.0.7:=[profile?]
-	>=dev-haskell/hamlet-1.2.0:=[profile?]
-	>=dev-haskell/hjsmin-0.1.4.7:=[profile?]
-	>=dev-haskell/hspec-1.11.0:=[profile?]
-	>=dev-haskell/hspec-expectations-0.6.0.1:=[profile?]
-	>=dev-haskell/html-conduit-1.1.0.5:=[profile?]
-	>=dev-haskell/http-client-0.3.7.1:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?]
-	>=dev-haskell/http-conduit-2.1.4:=[profile?]
-	>=dev-haskell/http-date-0.0.4:=[profile?]
-	>=dev-haskell/http-reverse-proxy-0.4.0.1:=[profile?]
-	>=dev-haskell/http-types-0.8.5:=[profile?]
-	>=dev-haskell/language-javascript-0.5.13:=[profile?]
-	>=dev-haskell/lifted-base-0.2.3.0:=[profile?]
-	>=dev-haskell/mime-mail-0.4.5.2:=[profile?]
-	>=dev-haskell/mime-types-0.1.0.4:=[profile?]
-	>=dev-haskell/mmorph-1.0.3:=[profile?]
-	>=dev-haskell/monad-control-0.3.3.0:=[profile?]
-	>=dev-haskell/monad-logger-0.3.7.1:=[profile?]
-	>=dev-haskell/monad-loops-0.4.2.1:=[profile?]
-	>=dev-haskell/nats-0.2:=[profile?]
-	>=dev-haskell/network-conduit-1.1.0:=[profile?]
-	>=dev-haskell/optparse-applicative-0.9.1.1:=[profile?]
-	>=dev-haskell/path-pieces-0.1.4:=[profile?]
-	>=dev-haskell/pem-0.2.2:=[profile?]
-	>=dev-haskell/persistent-1.3.3:=[profile?]
-	>=dev-haskell/persistent-template-1.3.2.2:=[profile?]
-	>=dev-haskell/publicsuffixlist-0.1:=[profile?]
-	>=dev-haskell/pwstore-fast-2.4.1:=[profile?]
-	>=dev-haskell/quickcheck-io-0.1.1:=[profile?]
-	>=dev-haskell/resource-pool-0.2.3.0:=[profile?]
-	>=dev-haskell/resourcet-1.1.2.3:=[profile?]
-	>=dev-haskell/safe-0.3.7:=[profile?]
-	>=dev-haskell/securemem-0.1.3:=[profile?]
-	>=dev-haskell/semigroups-0.15.2:=[profile?]
-	>=dev-haskell/setenv-0.1.1.1:=[profile?]
-	>=dev-haskell/sha-1.6.4.1:=[profile?]
-	>=dev-haskell/shakespeare-2.0.1.1:=[profile?]
-	>=dev-haskell/shakespeare-css-1.1.0:=[profile?]
-	>=dev-haskell/shakespeare-i18n-1.1.0:=[profile?]
-	>=dev-haskell/shakespeare-js-1.3.0:=[profile?]
-	>=dev-haskell/shakespeare-text-1.1.0:=[profile?]
-	>=dev-haskell/silently-1.2.4.1:=[profile?]
-	>=dev-haskell/simple-sendfile-0.2.15:=[profile?]
-	>=dev-haskell/skein-1.0.9:=[profile?]
-	>=dev-haskell/socks-0.5.4:=[profile?]
-	>=dev-haskell/stm-chans-3.0.0.2:=[profile?]
-	>=dev-haskell/streaming-commons-0.1.4.1:=[profile?]
-	>=dev-haskell/stringsearch-0.3.6.5:=[profile?]
-	>=dev-haskell/system-fileio-0.3.14:=[profile?]
-	>=dev-haskell/system-filepath-0.4.12:=[profile?]
-	>=dev-haskell/tagged-0.7.2:=[profile?]
-	>=dev-haskell/tagsoup-0.13.1:=[profile?]
-	>=dev-haskell/tagstream-conduit-0.5.5.1:=[profile?]
-	>=dev-haskell/tf-random-0.5:=[profile?]
-	>=dev-haskell/tls-1.2.8:=[profile?]
-	>=dev-haskell/transformers-base-0.4.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3.8:=[profile?]
-	>=dev-haskell/void-0.6.1:=[profile?]
-	>=dev-haskell/wai-3.0.1.1:=[profile?]
-	>=dev-haskell/wai-app-static-3.0.0:=[profile?]
-	>=dev-haskell/wai-extra-3.0.1.2:=[profile?]
-	>=dev-haskell/wai-logger-2.2.0:=[profile?]
-	>=dev-haskell/wai-test-3.0.0:=[profile?]
-	>=dev-haskell/warp-3.0.0.5:=[profile?]
-	>=dev-haskell/warp-tls-3.0.0:=[profile?]
-	>=dev-haskell/word8-0.1.1:=[profile?]
-	>=dev-haskell/x509-1.4.11:=[profile?]
-	>=dev-haskell/x509-store-1.4.4:=[profile?]
-	>=dev-haskell/x509-system-1.4.5:=[profile?]
-	>=dev-haskell/x509-validation-1.5.0:=[profile?]
-	>=dev-haskell/xml-conduit-1.2.1:=[profile?]
-	>=dev-haskell/xml-types-0.3.4:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3.5.3:=[profile?]
-	>=dev-haskell/yaml-0.8.8.4:=[profile?]
-	>=dev-haskell/yesod-1.2.6.1:=[profile?]
-	>=dev-haskell/yesod-auth-1.3.4.1:=[profile?]
-	>=dev-haskell/yesod-auth-hashdb-1.3.0.1:=[profile?]
-	>=dev-haskell/yesod-core-1.2.19:=[profile?]
-	>=dev-haskell/yesod-form-1.3.15.1:=[profile?]
-	>=dev-haskell/yesod-persistent-1.2.3:=[profile?]
-	>=dev-haskell/yesod-routes-1.2.0.7:=[profile?]
-	>=dev-haskell/yesod-static-1.2.4:=[profile?]
-	>=dev-haskell/yesod-test-1.2.3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		' == ' ' >= '
-}
diff --git a/dev-haskell/yesod-routes/Manifest b/dev-haskell/yesod-routes/Manifest
deleted file mode 100644
index e5244e45bfe6..000000000000
--- a/dev-haskell/yesod-routes/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST yesod-routes-1.1.2.tar.gz 17709 BLAKE2B 5fd3982d16529b4b79fcb802245c7aa295528d75c97d9aa0900b6d94a3b1523364b08db04c8a9c9ba687751d7683d9a94bbdda707e7602c8e4ea3119639c7222 SHA512 236dc8d53bce88b77bb832d57844a5379d0f9a1f0077c69f1e9fa24756ce411cff06eef5d66ac5bf50aa44f2211ffcbaf387bf336215df2029a982e0afdf608a
-DIST yesod-routes-1.2.0.7.tar.gz 21387 BLAKE2B 2cc3f1dd06473499df6fb12e30211a21c1a845b89c0823455aabc9f333823cf52ba438b85570286bf6c63d36620a62223f14e71ed75963e0d4b930f06bca1554 SHA512 966ba0a66b503ef8f4def2dd3b9c5b2f5a32eea3775e7daee0f58405703cd29b7b84f629490e772ddd84958c8ed0ce127abf8775af55637d670da622fb6755eb
diff --git a/dev-haskell/yesod-routes/metadata.xml b/dev-haskell/yesod-routes/metadata.xml
deleted file mode 100644
index 5418de0dcc8c..000000000000
--- a/dev-haskell/yesod-routes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Provides an efficient routing system, a parser and TH code generation.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/yesod-routes/yesod-routes-1.1.2.ebuild b/dev-haskell/yesod-routes/yesod-routes-1.1.2.ebuild
deleted file mode 100644
index 4dca36e81827..000000000000
--- a/dev-haskell/yesod-routes/yesod-routes-1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient routing for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/path-pieces-0.1*:=[profile?]
-		>=dev-haskell/text-0.5:=[profile?]
-		<dev-haskell/text-0.12:=[profile?]
-		>=dev-haskell/vector-0.8:=[profile?]
-		<dev-haskell/vector-0.11:=[profile?]
-		>=dev-lang/ghc-6.10.4:= <dev-lang/ghc-8"
-DEPEND="${RDEPEND}
-		test? ( >=dev-haskell/hspec-1.3
-			=dev-haskell/hunit-1.2*
-		)
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild b/dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild
deleted file mode 100644
index ffd5f73cb9a2..000000000000
--- a/dev-haskell/yesod-routes/yesod-routes-1.2.0.7-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Efficient routing for Yesod"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/path-pieces-0.1:=[profile?]
-	>=dev-haskell/text-0.5:=[profile?]
-	>=dev-haskell/vector-0.8:=[profile?]
-	>=dev-lang/ghc-7.4.1:= <dev-lang/ghc-8
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'path-pieces               >= 0.1      && < 0.2' 'path-pieces               >= 0.1' \
-		'HUnit                     >= 1.2      && < 1.3' 'HUnit                     >= 1.2' \
-		'vector                    >= 0.8      && < 0.11' 'vector                    >= 0.8'
-}
diff --git a/dev-haskell/yesod-static/Manifest b/dev-haskell/yesod-static/Manifest
index 41c5b0d3c615..b54f6b9259f1 100644
--- a/dev-haskell/yesod-static/Manifest
+++ b/dev-haskell/yesod-static/Manifest
@@ -1,6 +1 @@
-DIST yesod-static-1.2.4.tar.gz 25099 BLAKE2B c50fb5e52991221473a42d760e5ead5e0bf31a042c32403bb83b251a6af00def8a72d1962b956deba69d876e752b989556fb0c38dc4c98c0fe130801f1439ae8 SHA512 8879f50028f45194071d588d7ffb29f20b860983546a07a12975b4b8e5279e962060f4c7a794475ea34d35bb061f63a342383f45a20441f34f95e4e553b335a7
-DIST yesod-static-1.4.0.4.tar.gz 25101 BLAKE2B dba561ed7f0dee38f29a42e95befdd2f24dc5d0b5ea544f9fa807797e42ec01533c0e28066fbd24d422bfc40b356ebd9b7b8d033ffe11b187545b175e687dbe6 SHA512 598e1ba668f73c639afb786ed6b210ff9c62c9e12fabc87d6682c9876b08e96b43b7dbb4d53ac8bbe7c1c11b709d1a6e8c231f46598b74c271909d26fb26edb3
-DIST yesod-static-1.5.0.3.tar.gz 25036 BLAKE2B 710018d59b605cf28097ea93b009d52e0a4ac5504a0e8b94bfccdc522496538979838c7a75ad7312d8b3b8b359df3b4434a7f4d217e1ba3bbff089d494dc4b55 SHA512 5fd0de8c034063b637ff90382fb5fb31e810eff196327becd6b217df39b9bf8612deb56ffc8996395c7a46223983333c45f14020952422260aea3629d6429122
-DIST yesod-static-1.5.0.5.tar.gz 25028 BLAKE2B 5ad12523d3e09e23a5a62eec2c7cd27a7c04cb42190429627e398fe6c4d8663cd737abb1cb0f696270e6ebd489bb3dd84bd4c8d9c8fe789b42d7696d1073a9d5 SHA512 51c522e51389843da5fb7a3d90d5b18a0e216451bd9322d55f815c393a6f2a5cd3e0f195fe924db15f18d14f1c0ecac521a6e74b975b2cdbc9c1d3a5da85e9ba
-DIST yesod-static-1.5.1.1.tar.gz 25211 BLAKE2B 4691472d183e9350182654b3cba6262143f388e50b9e0b311146b047d47ae2587ea6c663ee8b4fa1fda8110667ed031b6a613d0ed4138b2473db32d6d55fe3ae SHA512 cdca4f3d2df8324ebf26aa39eba0d9f8bef75ea4fa6eaaa25b65e3a223af2229a4ea14130b8a30a6336b8676c34f448e6adede8023e218d7d8b80703813268a0
-DIST yesod-static-1.6.0.1.tar.gz 25463 BLAKE2B 98b5a317a2d8c91d5ef9628422dd7ce8627f7f47c88722e2732aac23705f44f449ebee4bf179c2c7e429026b52920df487c257aefd75a18efe6be1717e50dd94 SHA512 2e1e4873248d435a9d58f3075b6c06cde2edcdd520f700dc7f0427039c236d28787f62a643a8cf57b74d85a885625474a5662b91a56c25e8f4d1737be525bc2f
+DIST yesod-static-1.6.1.0.tar.gz 25613 BLAKE2B 6619169b5c745f215174cb7f3544dcc0eb5b32cb58059a87b1c1e8edae4e2e53e994c9d7afc60fd523be8aa5e33b996daebeae89063030861fa3b049b2e2c2d1 SHA512 66037ec28eac83e374161c1b306a4d20805ecb35ccfc4878e7894d961daaf30d9936c6e209641ff323d7e3dd5626f5a24a12915d4205417c496e272a2e969f6e
diff --git a/dev-haskell/yesod-static/metadata.xml b/dev-haskell/yesod-static/metadata.xml
index 272aa95e80ba..937381521944 100644
--- a/dev-haskell/yesod-static/metadata.xml
+++ b/dev-haskell/yesod-static/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Static file serving subsite for Yesod Web Framework.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/yesod-static/yesod-static-1.2.4.ebuild b/dev-haskell/yesod-static/yesod-static-1.2.4.ebuild
deleted file mode 100644
index f46ff680bf69..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.2.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/shakespeare-css-1.0.3:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-1.3.2:=[profile?]
-	>=dev-haskell/yesod-core-1.2:=[profile?] <dev-haskell/yesod-core-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		dev-haskell/wai-test
-		>=dev-haskell/yesod-test-1.2 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.4.0.4.ebuild b/dev-haskell/yesod-static/yesod-static-1.4.0.4.ebuild
deleted file mode 100644
index 1cf5f6db37b2..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.4.0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/system-fileio-0.3:=[profile?]
-	>=dev-haskell/system-filepath-0.4.6:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-1.3.2:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		>=dev-haskell/yesod-test-1.4 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild b/dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild
deleted file mode 100644
index 9de28b033223..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.5.0.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-3.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		>=dev-haskell/yesod-test-1.4 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.5.0.5.ebuild b/dev-haskell/yesod-static/yesod-static-1.5.0.5.ebuild
deleted file mode 100644
index 2ab06bb39958..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.5.0.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-3.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		>=dev-haskell/yesod-test-1.4 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.5.1.1.ebuild b/dev-haskell/yesod-static/yesod-static-1.5.1.1.ebuild
deleted file mode 100644
index bc77c46d56e1..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.5.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/byteable-0.1:=[profile?]
-	>=dev-haskell/conduit-0.5:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	>=dev-haskell/cryptohash-0.11:=[profile?]
-	>=dev-haskell/cryptohash-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/old-time-1.0:=[profile?]
-	>=dev-haskell/resourcet-0.4:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-3.1:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		>=dev-haskell/yesod-test-1.4 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.6.0.1.ebuild b/dev-haskell/yesod-static/yesod-static-1.6.0.1.ebuild
deleted file mode 100644
index 4a792d364a68..000000000000
--- a/dev-haskell/yesod-static/yesod-static-1.6.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Static file serving subsite for Yesod Web Framework"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/async:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
-	>=dev-haskell/blaze-builder-0.3:=[profile?]
-	>=dev-haskell/conduit-1.3:=[profile?]
-	>=dev-haskell/cryptonite-0.11:=[profile?]
-	>=dev-haskell/cryptonite-conduit-0.1:=[profile?]
-	>=dev-haskell/css-text-0.1.2:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
-	>=dev-haskell/hashable-1.1:=[profile?]
-	dev-haskell/hjsmin:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/mime-types-0.1:=[profile?]
-	>=dev-haskell/text-0.9:=[profile?]
-	>=dev-haskell/unix-compat-0.2:=[profile?]
-	>=dev-haskell/unordered-containers-0.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-app-static-3.1:=[profile?]
-	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/wai-extra
-		>=dev-haskell/yesod-test-1.6 )
-"
diff --git a/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild b/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
new file mode 100644
index 000000000000..c1fe349dc778
--- /dev/null
+++ b/dev-haskell/yesod-static/yesod-static-1.6.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Static file serving subsite for Yesod Web Framework"
+HOMEPAGE="https://www.yesodweb.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/async:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1.0.1:=[profile?]
+	>=dev-haskell/blaze-builder-0.3:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/cryptonite-0.11:=[profile?]
+	>=dev-haskell/cryptonite-conduit-0.1:=[profile?]
+	>=dev-haskell/css-text-0.1.2:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/file-embed-0.0.4.1:=[profile?] <dev-haskell/file-embed-0.5:=[profile?]
+	>=dev-haskell/hashable-1.1:=[profile?]
+	dev-haskell/hjsmin:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/mime-types-0.1:=[profile?]
+	>=dev-haskell/text-0.9:=[profile?]
+	>=dev-haskell/unix-compat-0.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/wai-app-static-3.1:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/rio
+		dev-haskell/wai-extra
+		>=dev-haskell/yesod-test-1.6 )
+"
diff --git a/dev-haskell/yesod-test/Manifest b/dev-haskell/yesod-test/Manifest
index c92d99da5752..f6bd5a81d064 100644
--- a/dev-haskell/yesod-test/Manifest
+++ b/dev-haskell/yesod-test/Manifest
@@ -1,7 +1,2 @@
-DIST yesod-test-1.2.3.1.tar.gz 13265 BLAKE2B c428c0db2d53918eeb744d109da733d5d5080488587f541f866e0ae5182248350c1097d4a38d82c2e91a0b62758961ef3d892543114415beb2c44028f294d57f SHA512 fbf9856392c5e7efcc6b95fc01eb08b234d55800fd1bc80a8ff290fe695b809a086918771d33bd79267d4d9825b05339222662fb4b128c21bc9e2e91401f1b02
-DIST yesod-test-1.4.3.1.tar.gz 15284 BLAKE2B 742abdbd17fe7a0c353f4077c892c517ff8ce009091cdbddd390761d3e0160b246dc2b5238f8c8108491430255c0c5b4dc4211ddd5440c4b36facc0ba57868fe SHA512 c423c10a10264a301418cf044aff1d8d8aab483039575e255c6bb29bffe91494a8e8f85e9c12b31aee6c394384b97356a4b64377f25d0781e516946d352aab13
-DIST yesod-test-1.5.0.1.tar.gz 17388 BLAKE2B c975819e793beeb7b551d2406b2ccd3939d551221de98c1201973381977d913bfa0a40e165d5175f7e6bf1499e713a55083015344c6fc320d7b654290ea8167b SHA512 f5798198d762415e8f0b97b63202393e2c4a41c8021cfda2db0b4f9144830d73be1ec5397da3a3de25b056798683955a1ff856eba93c64c172642c8cca6ada2d
-DIST yesod-test-1.5.1.1.tar.gz 18187 BLAKE2B cfcac2eef52beb79e0ce1cdb52c1bc7929c9632496bf2ae7cbda092959225dc1e7b47e9d898b3b986e554cce95578a829f05b7b2ab119c0a72be9781220c0d71 SHA512 a93db0b6ff7ea4d41c3783c35c3df0ae5bc86ee5797a7b200745db98f3404a4a1eb921b396b1cd23269ec89f092ddc9d572058844190a223b3a3b7d8afe3efbf
-DIST yesod-test-1.5.3.tar.gz 18076 BLAKE2B c89336800790c164156fdaf3ee7b3be440c71a53a67ded18d676d077444a83549122af32bfdc2dc9b077e5c8ea19ab78ffb154560e32b7b51d155155e9ffd7fa SHA512 56454230dcc3fa96eb06a2b77e3dbeebdbc0648bad57b18817d2b07d95d43483c8e618254d449dc5cafa0efce536952a0db95c638ead5bb19bb9818dd67fbdb0
-DIST yesod-test-1.5.4.1.tar.gz 18606 BLAKE2B 0676245dd796dcb333970f43a6dd664ae0f78bcd9fab12cb3e7558d91005ef55ea1a7344c1e411c51f05fab61f892687b306289b3639fddf19cdb3dfebfd476b SHA512 8c21e832b976d1e27f0a7a001c8e54e0ad40e24619047a767c8e74902afa19c29481309ff240f18636242cd543334bcac63fc9a460950c53de406ca047b98631
-DIST yesod-test-1.6.10.tar.gz 27593 BLAKE2B ed6b5be35032246a0e233a985cc7a739a38cd4b81db42ac000c823ff0975ed642d6e4dc7e8dafb6679d6acb53c8cfb2f438f84d4e73c9ab79ecac4c7d3adb681 SHA512 badbd76b9a345c86f9dcf8b5d6043f173eec60bf6f39bdcb4a60d17d95ad693991a1c7b4061a1e86d61fb9efe3f2f29b3129e6b9ffef4b07d5b563116959b016
+DIST yesod-test-1.6.12.tar.gz 27738 BLAKE2B 53cc4dc136b4d08c932812f2bd0b7f46ccc4acc3b0b0a2020386092006010859d3c0b14d9e4b36e91ae46617941d008d1795d652ccd1068437e537de83a4e4c3 SHA512 777d112d8c5ae77d667da2b8d1ed91a1cf751850d5b3678e787e7123aca8666d0a4b6d6161b7109491012d56c160603d62563b881a136ccc76a1edd006c423d6
+DIST yesod-test-1.6.14.tar.gz 28627 BLAKE2B c27e2825f07be19be645d1d1085e89e89988b21bdb7f9ef90fcebaae82626dad410a96365435223ac2cd25d156f3cdbe1c35f61b378023aa4175152c68802a3e SHA512 63c3f168f70e8ef1a9ba409a3052bab6c21aed8cb38df3c3ae68d553f74f1ec213db2120d9f985363d167726c161a24bc4a4e4ebd21a5f00b11259e931c0321e
diff --git a/dev-haskell/yesod-test/metadata.xml b/dev-haskell/yesod-test/metadata.xml
index 194abf9c4657..937381521944 100644
--- a/dev-haskell/yesod-test/metadata.xml
+++ b/dev-haskell/yesod-test/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Behaviour Oriented integration Testing for Yesod Applications
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild
deleted file mode 100644
index 415b67ba8a62..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.2.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-1.4:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/wai-test-1.3:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild
deleted file mode 100644
index f6f009b24723..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.4.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild
deleted file mode 100644
index f844f409f78b..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.5.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild
deleted file mode 100644
index 96135df1013d..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.5.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/lifted-base
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild
deleted file mode 100644
index dc2218368c76..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.5.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	>=dev-haskell/pretty-show-1.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hspec
-		dev-haskell/lifted-base
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild b/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild
deleted file mode 100644
index b89550249756..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.5.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="https://www.yesodweb.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/persistent-1.0:=[profile?]
-	>=dev-haskell/pretty-show-1.6:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.4.14:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hspec
-		dev-haskell/lifted-base
-		dev-haskell/yesod-form )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild b/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild
deleted file mode 100644
index a6124ce4ebb5..000000000000
--- a/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild
+++ /dev/null
@@ -1,49 +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.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="integration testing for WAI/Yesod Applications"
-HOMEPAGE="http://www.yesodweb.com"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/attoparsec-0.10:=[profile?]
-	dev-haskell/blaze-builder:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/case-insensitive-0.2:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	dev-haskell/cookie:=[profile?]
-	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
-	>=dev-haskell/html-conduit-0.1:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/hunit-1.2:=[profile?]
-	dev-haskell/memory:=[profile?]
-	>=dev-haskell/network-2.2:=[profile?]
-	>=dev-haskell/pretty-show-1.6:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/wai-3.0:=[profile?]
-	dev-haskell/wai-extra:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/yesod-core-1.6.17:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-	test? ( dev-haskell/hspec
-		dev-haskell/unliftio
-		dev-haskell/unliftio-core
-		>=dev-haskell/yesod-form-1.6 )
-"
diff --git a/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
new file mode 100644
index 000000000000..d2e130181352
--- /dev/null
+++ b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="integration testing for WAI/Yesod Applications"
+HOMEPAGE="https://www.yesodweb.com"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
+	>=dev-haskell/html-conduit-0.1:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/hunit-1.2:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/mtl-2.0.0:=[profile?]
+	>=dev-haskell/network-2.2:=[profile?]
+	>=dev-haskell/pretty-show-1.6:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?]
+	dev-haskell/wai-extra:=[profile?]
+	>=dev-haskell/xml-conduit-1.0:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?]
+	>=dev-haskell/yesod-core-1.6.17:=[profile?]
+	>=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( dev-haskell/hspec
+		dev-haskell/unliftio
+		dev-haskell/unliftio-core
+		>=dev-haskell/yesod-form-1.6 )
+"
diff --git a/dev-haskell/yesod-test/yesod-test-1.6.14.ebuild b/dev-haskell/yesod-test/yesod-test-1.6.14.ebuild
new file mode 100644
index 000000000000..b7c7cb5f1ac7
--- /dev/null
+++ b/dev-haskell/yesod-test/yesod-test-1.6.14.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="integration testing for WAI/Yesod Applications"
+HOMEPAGE="https://www.yesodweb.com"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?]
+	dev-haskell/blaze-builder:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?]
+	dev-haskell/blaze-markup:=[profile?]
+	>=dev-haskell/case-insensitive-0.2:=[profile?]
+	dev-haskell/conduit:=[profile?]
+	dev-haskell/cookie:=[profile?]
+	>=dev-haskell/hspec-core-2:=[profile?] <dev-haskell/hspec-core-3:=[profile?]
+	>=dev-haskell/html-conduit-0.1:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/hunit-1.2:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-haskell/network-2.2:=[profile?]
+	>=dev-haskell/pretty-show-1.6:=[profile?]
+	>=dev-haskell/wai-3.0:=[profile?]
+	dev-haskell/wai-extra:=[profile?]
+	>=dev-haskell/xml-conduit-1.0:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?]
+	>=dev-haskell/yesod-core-1.6.17:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( dev-haskell/hspec
+		dev-haskell/unliftio
+		dev-haskell/unliftio-core
+		>=dev-haskell/yesod-form-1.6 )
+"
diff --git a/dev-haskell/yesod/Manifest b/dev-haskell/yesod/Manifest
index 60ab19fabd9a..9abeb00e8c87 100644
--- a/dev-haskell/yesod/Manifest
+++ b/dev-haskell/yesod/Manifest
@@ -1,3 +1,2 @@
-DIST yesod-1.4.3.tar.gz 9023 BLAKE2B ef7db3731a4f2c828dcba4cb6f5982141897de553ce096460a9514a97ba1ba2074270e25c6519c6ade14a597c50d4bfaf475f16d5308c936cab328285db416c1 SHA512 2964e290307fde99ea0b3ad27af61a5c2d4577fcf24eeb18d7ddd2d7210db8801d4d3a824ae6331e4d79a23155f9943b7b0f705c347bcec4a947fbe7c83b9278
-DIST yesod-1.4.4.tar.gz 9146 BLAKE2B b49d699ac0f5fec33b194f71dba35eb913e6d9b5b50113ccf9602c3bc14adaf7c66d8fb64ef5a1fd268c20196099204d20af75649f965deb2475c07db5279254 SHA512 ff58454e31efa47a50f04905c555a684d2a7415c726f60a206332f96ecb152eb566e285679d97cc1233baae9cc5cd42702365358ec2a55559a8b898540803f7c
-DIST yesod-1.6.1.0.tar.gz 9794 BLAKE2B b0306995ca93646d4ed1eb58356c706b1a4fb773cbcf3dd7649405484af1f077f7f22c9d1792d9fb34aca11dc357dd7d527bbc5e5d6f60d24baa0b3797f60255 SHA512 712eed39b64f515cb949186ddb950133cc2daccde6d4a9b0115809e5f4726a957b2809ee785b348971c617b3d173bcd40776b065f5bf1d68b79af12905ada77a
+DIST yesod-1.6.2.1.tar.gz 9940 BLAKE2B 7234b550bc54dac8e46deac3d66b0ccb89af184520e9a25d218317dc4c735a7b4fde32ad1ce7325e3d222b551262ea57c36fb0af7cb478489afda499310b28f6 SHA512 ef61044b329b0c6e122bc5ca0203735264f6cb85a4fe728819146b390a8b813a56cad7bd2ef928eb3b3f1ed4618b7f41e856c0f97be1030e50510a14820fd866
+DIST yesod-1.6.2.tar.gz 9927 BLAKE2B 551b6a659180536dae72cea4a342f7451eb005cb79bd06cb5af38e41052956c40b93e2368da307ccdcc8bb5e0ea718ae89e7fd858b3273d8823787a333f11da1 SHA512 7c7a3e191ce91ac4070179bdfdae89c60e91c702d9141bb90fcb7095d175727a3f0648221ea151b6e1f5c37a236f55c37aaf963c526e4ced572c19bd6fb0b3a8
diff --git a/dev-haskell/yesod/metadata.xml b/dev-haskell/yesod/metadata.xml
index 7360e5a64339..a9e13b5f8156 100644
--- a/dev-haskell/yesod/metadata.xml
+++ b/dev-haskell/yesod/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		A RESTful web framework with strong compile-time guarantees of correctness. It also affords space efficient code, highly concurrent loads, and portability to many deployment backends (via the wai package), from CGI to stand-alone serving.
-		
-		Yesod also focuses on developer productivity. Yesod integrates well with tools for all your basic web development (wai, persistent, and shakespeare/hamlet)
-		
-		The Yesod documentation site &lt;http://www.yesodweb.com/&gt; has much more information, including on the supporting packages mentioned above.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">yesod</remote-id>
+		<remote-id type="github">yesodweb/yesod</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/yesod/yesod-1.4.3.ebuild b/dev-haskell/yesod/yesod-1.4.3.ebuild
deleted file mode 100644
index e1837b61d437..000000000000
--- a/dev-haskell/yesod/yesod-1.4.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/conduit-extra:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	dev-haskell/fast-logger:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/safe:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/warp-1.3:=[profile?]
-	>=dev-haskell/yaml-0.8.17:=[profile?]
-	>=dev-haskell/yesod-auth-1.4:=[profile?] <dev-haskell/yesod-auth-1.5:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/yesod/yesod-1.4.4.ebuild b/dev-haskell/yesod/yesod-1.4.4.ebuild
deleted file mode 100644
index 0d8dc22e0d5d..000000000000
--- a/dev-haskell/yesod/yesod-1.4.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="https://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/blaze-html-0.5:=[profile?]
-	>=dev-haskell/blaze-markup-0.5.1:=[profile?]
-	dev-haskell/conduit:=[profile?]
-	>=dev-haskell/conduit-extra-1.1.14:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/fast-logger:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/resourcet:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/warp-1.3:=[profile?]
-	>=dev-haskell/yaml-0.8.17:=[profile?]
-	>=dev-haskell/yesod-core-1.4:=[profile?] <dev-haskell/yesod-core-1.5:=[profile?]
-	>=dev-haskell/yesod-form-1.4:=[profile?] <dev-haskell/yesod-form-1.5:=[profile?]
-	>=dev-haskell/yesod-persistent-1.4:=[profile?] <dev-haskell/yesod-persistent-1.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
diff --git a/dev-haskell/yesod/yesod-1.6.1.0.ebuild b/dev-haskell/yesod/yesod-1.6.1.0.ebuild
deleted file mode 100644
index 79758008e39e..000000000000
--- a/dev-haskell/yesod/yesod-1.6.1.0.ebuild
+++ /dev/null
@@ -1,42 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Creation of type-safe, RESTful web applications"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/data-default-class:=[profile?]
-	dev-haskell/fast-logger:=[profile?]
-	dev-haskell/file-embed:=[profile?]
-	dev-haskell/monad-logger:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	dev-haskell/streaming-commons:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	>=dev-haskell/wai-1.3:=[profile?]
-	>=dev-haskell/wai-extra-1.3:=[profile?]
-	dev-haskell/wai-logger:=[profile?]
-	>=dev-haskell/warp-1.3:=[profile?]
-	>=dev-haskell/yaml-0.8.17:=[profile?]
-	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
-	>=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.7:=[profile?]
-	>=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
-	>=dev-lang/ghc-8.2.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0.0.2
-"
diff --git a/dev-haskell/yesod/yesod-1.6.2.1.ebuild b/dev-haskell/yesod/yesod-1.6.2.1.ebuild
new file mode 100644
index 000000000000..e0052e1cac93
--- /dev/null
+++ b/dev-haskell/yesod/yesod-1.6.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	dev-haskell/fast-logger:=[profile?]
+	dev-haskell/file-embed:=[profile?]
+	dev-haskell/monad-logger:=[profile?]
+	dev-haskell/shakespeare:=[profile?]
+	dev-haskell/streaming-commons:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/wai-extra-1.3:=[profile?]
+	dev-haskell/wai-logger:=[profile?]
+	>=dev-haskell/warp-1.3:=[profile?]
+	>=dev-haskell/yaml-0.8.17:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.8:=[profile?]
+	>=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
diff --git a/dev-haskell/yesod/yesod-1.6.2.ebuild b/dev-haskell/yesod/yesod-1.6.2.ebuild
new file mode 100644
index 000000000000..d3bfeaf4fe5d
--- /dev/null
+++ b/dev-haskell/yesod/yesod-1.6.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Creation of type-safe, RESTful web applications"
+HOMEPAGE="https://www.yesodweb.com/"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/conduit-1.3:=[profile?]
+	dev-haskell/data-default-class:=[profile?]
+	dev-haskell/fast-logger:=[profile?]
+	dev-haskell/file-embed:=[profile?]
+	dev-haskell/monad-logger:=[profile?]
+	dev-haskell/shakespeare:=[profile?]
+	dev-haskell/streaming-commons:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	>=dev-haskell/wai-1.3:=[profile?]
+	>=dev-haskell/wai-extra-1.3:=[profile?]
+	dev-haskell/wai-logger:=[profile?]
+	>=dev-haskell/warp-1.3:=[profile?]
+	>=dev-haskell/yaml-0.8.17:=[profile?]
+	>=dev-haskell/yesod-core-1.6:=[profile?] <dev-haskell/yesod-core-1.7:=[profile?]
+	>=dev-haskell/yesod-form-1.6:=[profile?] <dev-haskell/yesod-form-1.8:=[profile?]
+	>=dev-haskell/yesod-persistent-1.6:=[profile?] <dev-haskell/yesod-persistent-1.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
diff --git a/dev-haskell/zip-archive/Manifest b/dev-haskell/zip-archive/Manifest
index 2f700d2dedfe..651235f2acbc 100644
--- a/dev-haskell/zip-archive/Manifest
+++ b/dev-haskell/zip-archive/Manifest
@@ -1,4 +1,2 @@
-DIST zip-archive-0.1.3.4.tar.gz 11250 BLAKE2B 830cce7d1600b66833e53584da68b07bfbb0417e9a752bedeca02b436e287ce187477851660d426104f392b6e508409a79abb70b0c781523100d7d547a155e4a SHA512 8476041bd3674a42c3777c54243037162d3fdf6f8e0c0bcb9577a4cd76a41d6d9dbdddc482845256858b284bd2bb6ad06cce8208c5584e60553ae659386f8165
-DIST zip-archive-0.2.3.7.tar.gz 12902 BLAKE2B a9b5563034cebb36c604752691950577996bf04e33bafd449019b08532f99635959502b4147ecf8e282d5a9379e6f09d2d2fe730579595e4d2991c152dcbe836 SHA512 3849a9ac806d69b496bfd2973ba8908b981cd72f900565fc9aea8a2b4080ec7c6fe8c579158c22da0ddc398faecf77a7ae1793eecf4d3054d0bdc06fde2aa7cc
-DIST zip-archive-0.3.3.tar.gz 18229 BLAKE2B ed15ccb0c80308afa246c7c7e805f01df050242af4fa881863ee07f9b52496a5ea7f41c9a9e01db5cab2734055c5d7399a0d955a35a3c3dc16fe9dd54c96c1cf SHA512 f799c5e324ea40313c312649f5c2b2e96128fc70b52f86a51fa9475354488d8c3b85220b297bc557728a1c0dd5c0827ead8b4613aef16edae7071bbf250ad25d
 DIST zip-archive-0.4.1.tar.gz 20967 BLAKE2B 0e1276aa9dabf70a36041c5acb6d83a571d067bdb40a8be30b35a2943ec28da92225d8f586101bfa87602186025fd5c61347bf8855216ce2a0101e9ff70a81b4 SHA512 216555bd73a46da5061291c2c071e9c71239bd5ae253ac06ee80ade65bb1871366cc8e4dffbad983c5b6a7f4b0cb2a1439dfa5971db3e183124fa90442a73f0c
+DIST zip-archive-0.4.3.tar.gz 22161 BLAKE2B 8d9a31e1eddb204250b168038809f3ab28af0df6071b67d2f4bec732512516b2aafc7a0e6b11fe886126dbeb5c925d4c3fcfaa649eb65fea4183707b32e02307 SHA512 b98791a22d0dc4b499653bbd88254cff86108bd3a13b59a107cc54e36dc0702c2934eb4b497cbc6239235a45b3486006e52d27faa5af589a124443f8938670ad
diff --git a/dev-haskell/zip-archive/metadata.xml b/dev-haskell/zip-archive/metadata.xml
index 3f1368b5d4f1..ac3f59923966 100644
--- a/dev-haskell/zip-archive/metadata.xml
+++ b/dev-haskell/zip-archive/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The zip-archive library provides functions for creating, modifying,
-		and extracting files from zip archives.
-	</longdescription>
 	<use>
 		<flag name="executable">Build the Zip executable.</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">zip-archive</remote-id>
 		<remote-id type="github">jgm/zip-archive</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild b/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
deleted file mode 100644
index c0718f6ea009..000000000000
--- a/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library for creating and modifying zip archives"
-HOMEPAGE="https://github.com/jgm/zip-archive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?]
-		>=dev-haskell/digest-0.0.0.1:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-haskell/utf8-string-0.3.1:=[profile?]
-		dev-haskell/zlib:=[profile?]
-		>=dev-lang/ghc-7.0.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.10
-		test? ( dev-haskell/hunit
-			app-arch/zip
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild b/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
deleted file mode 100644
index 98f911d192f7..000000000000
--- a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library for creating and modifying zip archives"
-HOMEPAGE="https://github.com/jgm/zip-archive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/binary-0.5:=[profile?]
-	>=dev-haskell/digest-0.0.0.1:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( app-arch/zip
-		dev-haskell/hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild b/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild
deleted file mode 100644
index a883f504333b..000000000000
--- a/dev-haskell/zip-archive/zip-archive-0.3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Library for creating and modifying zip archives"
-HOMEPAGE="https://github.com/jgm/zip-archive"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="executable"
-
-RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit
-		dev-haskell/temporary )
-"
-
-# non-haskell depend i always forget about
-DEPEND="${DEPEND}
-	test? ( app-arch/zip )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag executable executable)
-}
diff --git a/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild b/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
index 8774d5580de2..49838c4fe498 100644
--- a/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
+++ b/dev-haskell/zip-archive/zip-archive-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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.2
 
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="executable"
 
 RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
diff --git a/dev-haskell/zip-archive/zip-archive-0.4.3.ebuild b/dev-haskell/zip-archive/zip-archive-0.4.3.ebuild
new file mode 100644
index 000000000000..7bca7c23d822
--- /dev/null
+++ b/dev-haskell/zip-archive/zip-archive-0.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library for creating and modifying zip archives"
+HOMEPAGE="https://github.com/jgm/zip-archive"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/digest-0.0.0.1:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/hunit
+		dev-haskell/temporary )
+"
+# non-haskell depend
+DEPEND="${DEPEND}
+	test? ( app-arch/zip )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
diff --git a/dev-haskell/zlib-bindings/Manifest b/dev-haskell/zlib-bindings/Manifest
deleted file mode 100644
index b5e4c19d1046..000000000000
--- a/dev-haskell/zlib-bindings/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zlib-bindings-0.1.1.5.tar.gz 54770 BLAKE2B df5ed0474ed29c47720b4d94bd8dee49afeec36e9ecafe6639324bbd0ff2c0ef8d52996c54b3ad09aaf3a1b84ee8898bdcddc91705e33847e3e9e1d6cbb4af42 SHA512 1ce7a21f462ce5fb1c6ae0ccd40b6f59eb95772b46fa8f5cb3b94f76d55189b7c020dfd97cb18afe21cd826d1a511d9d02909c4376b165c2f574ec881f7de299
diff --git a/dev-haskell/zlib-bindings/metadata.xml b/dev-haskell/zlib-bindings/metadata.xml
deleted file mode 100644
index 903a0cc68dc6..000000000000
--- a/dev-haskell/zlib-bindings/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Low-level bindings to the zlib package.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/zlib-bindings</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
deleted file mode 100644
index d522886fef03..000000000000
--- a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Low-level bindings to the zlib package. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/zlib-bindings"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/zlib-0.5.2.0:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/quickcheck-2.3 )
-"
diff --git a/dev-haskell/zlib-conduit/Manifest b/dev-haskell/zlib-conduit/Manifest
deleted file mode 100644
index 7dad005297b4..000000000000
--- a/dev-haskell/zlib-conduit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST zlib-conduit-1.0.0.tar.gz 3461 BLAKE2B 8605775bb5e801879c8017b8bd88379f200242bc021c34bf74322a578142444f013da227a9f9e7565b3f1afe27b9ab04a43666e16d9f4be81f3223b12ed07b52 SHA512 3f62701b687ab0220c2f5f18ebc2b9ba33010ed4471832523400cea4a808d02f59173c2de4ee3055f09ec6271a771745df35768612f8035d98c9dcd32be9b007
-DIST zlib-conduit-1.1.0.tar.gz 2024 BLAKE2B e7b8bcf5515cb25b2152c29db4a4f04d2050db8c999386428eaa913e296d34f6c07c136d2ff16962462b699fed20b35160ad51f079659d27b87a61bbb31c640a SHA512 5d19fa0e144b8e124486465c00b984f2e16f51e8ef0bc246fafd64b173e7dcef5b12f8cb431bb6071e4dab4a8c8f62606d47feb2cac2e36c1894216a9c8a32d9
diff --git a/dev-haskell/zlib-conduit/metadata.xml b/dev-haskell/zlib-conduit/metadata.xml
deleted file mode 100644
index 33070e5f5f8e..000000000000
--- a/dev-haskell/zlib-conduit/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Streaming compression/decompression via conduits.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild b/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild
deleted file mode 100644
index 7ed7b4b47334..000000000000
--- a/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming compression/decompression via conduits"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+debug"
-
-RDEPEND="=dev-haskell/conduit-1.0*:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		dev-haskell/void:=[profile?]
-		=dev-haskell/zlib-bindings-0.1*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/quickcheck
-			dev-haskell/resourcet
-		)"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug)
-}
diff --git a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild b/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
deleted file mode 100644
index 7c0d68c1b5b7..000000000000
--- a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile"
-inherit haskell-cabal
-
-DESCRIPTION="Streaming compression/decompression via conduits. (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/zlib-enum/Manifest b/dev-haskell/zlib-enum/Manifest
deleted file mode 100644
index 64b848965108..000000000000
--- a/dev-haskell/zlib-enum/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zlib-enum-0.2.3.1.tar.gz 4652 BLAKE2B a0148de59f5beac8dac5239228f8d2855249b613af2bebd6fae52f194fc17f4b0d517567267bfb6d5973e67b56e947a18e4f4904f504e33f0803bb66619fad50 SHA512 e68c72ab44922fa2df3b2bc718f65ce313be24742e2edfcbb97cb12f7963e9448aa68ba2e64ef08369b07f641773f4688a787615f76dd183982089ef7fe68a8c
diff --git a/dev-haskell/zlib-enum/metadata.xml b/dev-haskell/zlib-enum/metadata.xml
deleted file mode 100644
index dcfe8b5f7e36..000000000000
--- a/dev-haskell/zlib-enum/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		zlib-enum is a stop-gap package to provide enumeratees for
-		zlib compression/decompression.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">maltem/zlib-enum</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
deleted file mode 100644
index ae09a03b09a1..000000000000
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enumerator interface for zlib compression"
-HOMEPAGE="https://github.com/maltem/zlib-enum"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'transformers          >= 0.2 && < 0.5' 'transformers          >= 0.2' \
-		'transformers               >= 0.2      &&   < 0.5' 'transformers               >= 0.2'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test
-}
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
deleted file mode 100644
index a2e71e7a57c2..000000000000
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: -test
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Enumerator interface for zlib compression"
-HOMEPAGE="https://github.com/maltem/zlib-enum"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-test
-}
diff --git a/dev-haskell/zlib/Manifest b/dev-haskell/zlib/Manifest
index 20505946d824..739845850ae8 100644
--- a/dev-haskell/zlib/Manifest
+++ b/dev-haskell/zlib/Manifest
@@ -1,5 +1,4 @@
-DIST zlib-0.5.4.1.tar.gz 127760 BLAKE2B 3e0ade0091a9d9e50fd4d0b9e65eba9a1fa7037fa4cfaa46d2d8b777d0d3338ddbc09c96ca12b5de8b2d7337c1a213d17b789cba971bb30b84ba1c3b34493c20 SHA512 aa3522a5704978badcf634e1d99282144f01ddee4600bd146631a3ee8b98080914eb2887869a5fa404dc9d1e438a5df87cf7d44548c2f3e1ec13ba19004ef985
-DIST zlib-0.5.4.2.tar.gz 127818 BLAKE2B 899a0edf39b9830d5223c05dce0d6e4a7884ac12b918bc54bdd820fb77c3701acde768179a1f1b1a88330c9c5ab46433eab0420744994013e9adbbe72fe451ff SHA512 9ee75d04bea192967dcc9f59f500a199c605ed6b18b7883e2876e1b3116929ef62ccff9cb7174a2d72b567241c3fc2eb794b3532831b929bd5f5a6236bc03410
-DIST zlib-0.6.1.1.tar.gz 142902 BLAKE2B 30cc774ca73fd657a9fbb00bda520855cf33932dbeae91c60f900b7c34a57014f14853535d6bd2bf0affbcda3545b896a2bbc1ebe5e289f78140244dd9ea8fb1 SHA512 b9f665308fe7887db376625d6001b5d4c511b6b0f392e366903e84f262cc7c81ed9746d9a5f0b84e9a0ec9dfdc91ed41809528dd50e067008a91ef5168cad12e
-DIST zlib-0.6.1.2.tar.gz 142413 BLAKE2B 3dac7acfc11b9e8dd00e7e9b35daa420a34f9cf58d06e7d82fb00f33025b9eb2769b966fdb9772937e8be182b16d502c14e4c6018fbdd72d942b6fca95f7d974 SHA512 0034eb1297eaf20ab64e5cbfc835cee1985d34bc248325bf57f7bf5cdf2918ab72f339fe5b8b3f5f16dee862f190e0c71612960b9021cf2ca70c951788b73fc1
-DIST zlib-0.6.2.1.tar.gz 143424 BLAKE2B 2395cb4a87943025088e343036772deae6d2d7a695cf7f6c958a37681e99da9d0a1acbe1f3191cb587d077128b9fe0f6986b3883fbdf91483f83b879b79b3e9d SHA512 cee7942a86afbd08f03c19abd88154cc866a3ccc52342264d4d5b28a71643adf30bf03ba939d6a98b7c065752f9ec326729fc38cfe72b66998551c89186048c5
+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
diff --git a/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch b/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch
deleted file mode 100644
index 5b4cb5a6eca2..000000000000
--- a/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-zlib does not really support windows size of 8 bits:
-
-Reported by eroen
-
-https://github.com/haskell/zlib/issues/11
-https://bugs.gentoo.org/show_bug.cgi?id=613532
-diff --git a/test/Test.hs b/test/Test.hs
-index bbd8b94..81bd260 100644
---- a/test/Test.hs
-+++ b/test/Test.hs
-@@ -66,2 +66,3 @@ prop_decompress_after_compress w cp dp =
-    -- of the zlib source code.
-+   compressWindowBits cp /= WindowBits 8 &&
-    (decompressWindowBits dp > compressWindowBits cp || decompressWindowBits dp > WindowBits 8) &&
-@@ -76,2 +77,3 @@ prop_gziporzlib1 cp dp =
-    decompressWindowBits dp > compressWindowBits cp &&
-+   compressWindowBits cp /= WindowBits 8 &&
-    decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==>
-@@ -85,2 +87,3 @@ prop_gziporzlib2 cp dp =
-    decompressWindowBits dp >= compressWindowBits cp &&
-+   compressWindowBits cp /= WindowBits 8 &&
-    decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==>
-@@ -94,2 +97,3 @@ prop_gzip_concat cp dp input =
-    decompressWindowBits dp >= compressWindowBits cp &&
-+   compressWindowBits cp /= WindowBits 8 &&
-    decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==>
diff --git a/dev-haskell/zlib/metadata.xml b/dev-haskell/zlib/metadata.xml
index d3253b28407a..f4c9b1ea85a4 100644
--- a/dev-haskell/zlib/metadata.xml
+++ b/dev-haskell/zlib/metadata.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name='non-blocking-ffi'>Execute FFI calls in the context of haskell thread.</flag>
+		<flag name="bundled-c-zlib">Use the bundled zlib C sources. Requires pkg-config to be False.
+For windows, this is the default.</flag>
+		<flag name="non-blocking-ffi">The (de)compression calls can sometimes take a long time, which
+prevents other Haskell threads running. Enabling this flag
+avoids this unfairness, but with greater overall cost.</flag>
 	</use>
-	<longdescription>
-		This package provides a pure interface for compressing and
-		decompressing streams of data represented as lazy
-		'ByteString's. It uses the zlib C library so it has high
-		performance. It supports the \"zlib\", \"gzip\" and \"raw\"
-		compression formats.
-		
-		It provides a convenient high level API suitable for most
-		tasks and for the few cases where more control is needed it
-		provides access to the full zlib feature set.
-	</longdescription>
+	<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.5.4.1.ebuild b/dev-haskell/zlib/zlib-0.5.4.1.ebuild
deleted file mode 100644
index e602f752d263..000000000000
--- a/dev-haskell/zlib/zlib-0.5.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="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}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-		sys-libs/zlib"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/zlib/zlib-0.5.4.2.ebuild b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
deleted file mode 100644
index 72e171c86f76..000000000000
--- a/dev-haskell/zlib/zlib-0.5.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-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}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/zlib/zlib-0.6.1.1.ebuild b/dev-haskell/zlib/zlib-0.6.1.1.ebuild
deleted file mode 100644
index 51f1c95dc5c5..000000000000
--- a/dev-haskell/zlib/zlib-0.6.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-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}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-
-RESTRICT=test # needs porting to new test tools
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/tasty-0.8
-		>=dev-haskell/tasty-hunit-0.8
-		>=dev-haskell/tasty-quickcheck-0.8 )
-"
diff --git a/dev-haskell/zlib/zlib-0.6.1.2.ebuild b/dev-haskell/zlib/zlib-0.6.1.2.ebuild
deleted file mode 100644
index 82afd79b82e5..000000000000
--- a/dev-haskell/zlib/zlib-0.6.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-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}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="non-blocking-ffi"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.8 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-fix-w8-tests.patch)
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag non-blocking-ffi non-blocking-ffi)
-}
diff --git a/dev-haskell/zlib/zlib-0.6.2.1.ebuild b/dev-haskell/zlib/zlib-0.6.2.1.ebuild
deleted file mode 100644
index 6f1dd928f376..000000000000
--- a/dev-haskell/zlib/zlib-0.6.2.1.ebuild
+++ /dev/null
@@ -1,37 +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.9999
-#hackport: flags: +pkg-config
-
-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}"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE="non-blocking-ffi"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	virtual/pkgconfig
-	test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-		>=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.3
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.11
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag non-blocking-ffi non-blocking-ffi) \
-		--flag=pkg-config
-}
diff --git a/dev-haskell/zlib/zlib-0.6.2.3.ebuild b/dev-haskell/zlib/zlib-0.6.2.3.ebuild
new file mode 100644
index 000000000000..fb6a06ff8e42
--- /dev/null
+++ b/dev-haskell/zlib/zlib-0.6.2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 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"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="bundled-c-zlib non-blocking-ffi"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	virtual/pkgconfig
+	test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		>=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bundled-c-zlib bundled-c-zlib) \
+		$(cabal_flag non-blocking-ffi non-blocking-ffi) \
+		--flag=pkg-config
+}
diff --git a/dev-haskell/zlib/zlib-0.6.3.0.ebuild b/dev-haskell/zlib/zlib-0.6.3.0.ebuild
new file mode 100644
index 000000000000..ecdefa14223d
--- /dev/null
+++ b/dev-haskell/zlib/zlib-0.6.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.2.9999
+#hackport: flags: +pkg-config
+
+CABAL_HACKAGE_REVISION=2
+
+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"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="bundled-c-zlib non-blocking-ffi"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	virtual/pkgconfig
+	test? ( >=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+		>=dev-haskell/tasty-0.8 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag bundled-c-zlib bundled-c-zlib) \
+		$(cabal_flag non-blocking-ffi non-blocking-ffi) \
+		--flag=pkg-config
+}