10 files changed, 159 insertions, 372 deletions
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>