summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhololeap <hololeap@protonmail.com>2023-11-03 16:55:39 -0600
committerSam James <sam@gentoo.org>2023-11-19 18:32:25 +0000
commit2925f2a129b745d1bd1f0a6f7dda37fcb403cfa5 (patch)
treee7acefd31185353305960cbc71c312fe527da50f
parentdev-lang/ghc: Filter LTO flags (diff)
downloadgentoo-2925f2a129b745d1bd1f0a6f7dda37fcb403cfa5.tar.gz
gentoo-2925f2a129b745d1bd1f0a6f7dda37fcb403cfa5.tar.bz2
gentoo-2925f2a129b745d1bd1f0a6f7dda37fcb403cfa5.zip
dev-haskell/cabal: drop 3.2.1.0-r2
With added upper bounds on GHC deps, older versions of Cabal must be removed along with ghc-8.10. Signed-off-by: hololeap <hololeap@protonmail.com> Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-haskell/cabal/Manifest2
-rw-r--r--dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild66
2 files changed, 0 insertions, 68 deletions
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 8141101470fa..fb916d95e040 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,5 +1,3 @@
-DIST cabal-3.2.1.0-rev1.cabal 27482 BLAKE2B 7726071d1d59f6f2dcc382346d8e75d219a00bc3b8f936049b464a13224ad1cac0cc6e065a0ab0fdd1ee85d24d3d7e33abbebd603dbac4ff564f72c8aafcab3b SHA512 0d8bb2d72f825a6e3e88e5a0146a97a0ea2f7fa7c4950205ce652648abda2c74ea336654ef77b40f95865cde57126a8725c7538e0d492e74cadf7ebcd4d80d4d
-DIST cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598
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-3.2.1.0-r2.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild
deleted file mode 100644
index f7ec4a9eae1f..000000000000
--- a/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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 test-suite due to "circular" dependencies with quickcheck
-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 ~x86 ~amd64-linux ~x86-linux" # ~ppc ~ppc64 ~ppc-macos ~x86-macos ~x86-solaris
-
-RESTRICT=test # circular deps: cabal -> quickcheck -> cabal
-
-RDEPEND="
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-"
-# test? (
-# >=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/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.16
-# >=dev-haskell/quickcheck-2.14 <dev-haskell/quickcheck-2.15
-# >=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="8.10.6 8.10.7"