gentoo auto-resync : 19:11:2023 - 23:08:59

4 files changed, 4 insertions, 73 deletions

diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 7262abd81ee0..ea153e76c57e 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,9 +1,6 @@
-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
-EBUILD cabal-3.2.1.0-r2.ebuild 2380 BLAKE2B 97d19f3baea3728b90b7edcd8c10692d701e7be358405623a39995854e2390a1372a131ad544561f6aacbcff4c845f896207667d0b8d6d9cc77d106b91bcb259 SHA512 8914a31c63e9c01f017a89b396f96f48ad1c4b7e9c0af66efd16a1679d6fda9592c50ba6d9499d89d13ce76b0c067ec8c925388817b4c6527b247d305bf59584
-EBUILD cabal-3.4.1.0-r1.ebuild 2462 BLAKE2B 522e8f029fca0d9d122b64a1d146aa71fe1eb95896798407ecde35256c40d16c82042ad9d36b9fb421c756ac9d4ed7bab0ffd058b38f0c6ec203f41f266e088d SHA512 bacba152a2a6a93c3a4a27b4f63df5833a6c46e3f33be6ddb128da62ef758c456bcab91f92d659e5b1dd3625fec4941f006fc323a7705fc71fd42bec4cd5b820
-EBUILD cabal-3.6.3.0.ebuild 792 BLAKE2B 5d874741a050d936cbff4a64064bf0b5fda52390cbdf24222d96c5c4756db67f27ac07682178730dff984294f36f768ba0c03f92ab31df9367de6f03518fc2e3 SHA512 9a57a451c85a215b05777a3e9d9d2e2b4247f13e0a4583b66ba8d7ed8a0f2b9ac69bfdd377a283d2f3bf76ad05eb05fdc94b9581c29642478d00e8fc13de5b40
+EBUILD cabal-3.4.1.0-r1.ebuild 2482 BLAKE2B b673a814aed8647f696c6e807f1637ff678eee19942603a6391854551df63e780eff4824001a93ff1823bd8c0993104332dbfad78fe2672d5a0c701583936c39 SHA512 229b35976c3624d2af0665ee8f264ccbca7d78b5022f225858b510a7ff69dbb9dbe9c76ed9eaf05aa871675673d46f2d6226ed60a09d5df16556e4c49bed5ddd
+EBUILD cabal-3.6.3.0.ebuild 812 BLAKE2B f8c9bab41c9406be770aa1d022c531faf5a89a46c900c66d6436d53e2712c44a16edd0c720ee9e0d333473e12d4d27fd482de6f375c0e341a852fb8602399b38 SHA512 4626863a953a6663250601f16d2b6a34b0ef4dd5d1b675d62e690edb84b0b6e8c78cd77dc6e7d10e30c6d2171e3e9ceb585650830b270f67fc9989d0c2d36734
 MISC metadata.xml 374 BLAKE2B 91a20e51209575537de737e8a73caf77ad851a085d56e90be385eeb12404e8fe3ed3f07bd6d4eb1f40db53ac46215a16aed0436ddfe1bfe3e8757996bccb9b11 SHA512 1d60c23734ee5c752f928b4edcd8333df968a8051efd84a20bcd803609de5372ab3337a955cf11f0231ff65ff953dc3d9fbcc7e7ad92a1e7391737257a8ad669
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"
diff --git a/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
index ce7ccae0f5c3..c6c1f1ec4d33 100644
--- a/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
+++ b/dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild
@@ -25,7 +25,7 @@ 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-8.4.3:= <dev-lang/ghc-9.1:=
 "
 DEPEND="${RDEPEND}
 "
diff --git a/dev-haskell/cabal/cabal-3.6.3.0.ebuild b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
index 65f9f2dbf9f7..ecf27935c764 100644
--- a/dev-haskell/cabal/cabal-3.6.3.0.ebuild
+++ b/dev-haskell/cabal/cabal-3.6.3.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
-	>=dev-lang/ghc-9.2.4:=
+	>=dev-lang/ghc-9.2.4:= <dev-lang/ghc-9.3:=
 "
 DEPEND="${RDEPEND}
 "