10 files changed, 31 insertions, 205 deletions
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 )
+"