dev-haskell/cabal-install: drop 3.2.0.0, 3.2.0.0-r2, 3.4.1.0-r1

Signed-off-by: Sam James <sam@gentoo.org>

5 files changed, 2 insertions, 230 deletions

diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 0316daf7ec6b..1e6e6e555521 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,2 +1 @@
-DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062
 DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db
diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild
deleted file mode 100644
index 6665509be188..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.6.5.9999
-# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
-CABAL_FEATURES=""
-inherit haskell-cabal
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.10
-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/cabal-3.2:= <dev-haskell/cabal-3.3:=
-	>=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.0:= <dev-haskell/hackage-security-0.7:=
-	>=dev-haskell/hashable-1.0:=
-	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:=
-	>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
-	>=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/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
-"
-
-PATCHES=( "${FILESDIR}"/${P}-rankntypes.patch )
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.8      && < 4.14' 'base       >= 4.8' \
-		'hashable   >= 1.0      && < 1.4' 'hashable >=1.0' \
-		'base16-bytestring >= 0.1.1 && < 0.2' 'base16-bytestring >=0.1.1' \
-		'random     >= 1        && < 1.2' 'random >=1' \
-		'HTTP       >= 4000.1.5 && < 4000.4' 'HTTP       >= 4000.1.5 && < 4000.5'
-	#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 \
-		--flags=-debug-conflict-sets \
-		--flags=-debug-expensive-assertions \
-		--flags=-debug-tracetree \
-		$(cabal_flag native-dns native-dns)
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
deleted file mode 100644
index f4d9b998fb9d..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
-CABAL_FEATURES=""
-inherit haskell-cabal ghc-package
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-# keep in sync with ghc-8.10
-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/cabal-3.2:= <dev-haskell/cabal-3.3:=
-	>=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.6.0.0:= <dev-haskell/hackage-security-0.7:=
-	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:=
-	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
-	>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
-	>=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/semigroups-0.18.3:= <dev-haskell/semigroups-0.20:=
-	>=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
-"
-
-PATCHES=( "${FILESDIR}"/${P}-rankntypes.patch )
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base       >= 4.8      && < 4.14' '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 \
-		--flags=-debug-conflict-sets \
-		--flags=-debug-expensive-assertions \
-		--flags=-debug-tracetree \
-		$(cabal_flag native-dns native-dns)
-}
diff --git a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild
deleted file mode 100644
index 7d4b0c20b8f0..000000000000
--- a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.9999
-#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
-
-CABAL_FEATURES=""
-inherit haskell-cabal ghc-package
-
-DESCRIPTION="The command-line interface for Cabal and Hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +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.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.4:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
-	>=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.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/text-1.2.3:= <dev-haskell/text-1.3:=
-	>=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() {
-	default
-
-	#if use noprefs; then
-	#	epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	#fi
-
-	cabal_chdeps \
-		'base       >= 4.8      && < 4.15' 'base >= 4.8' \
-		'hashable   >= 1.0      && < 1.4' 'hashable >=1.0'
-
-	# 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 \
-		$(cabal_flag debug 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.4.1.0-r2.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
index ad7ac3748fb1..51030cf0b8da 100644
--- a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 #hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
 
 CABAL_FEATURES=""
-inherit haskell-cabal
+inherit haskell-cabal ghc-package
 
 DESCRIPTION="The command-line interface for Cabal and Hackage"
 HOMEPAGE="https://www.haskell.org/cabal/"
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 #keep in sync with ghc-9.0.2
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="debug +lukko +native-dns"
 
 RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=