From 386855c4d1ef509c1fd32abd721589c81669613b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 23 Oct 2023 08:35:49 +0100 Subject: gentoo auto-resync : 23:10:2023 - 08:35:49 --- dev-haskell/cabal/Manifest | 14 ++++--- dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild | 54 ------------------------ dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild | 66 +++++++++++++++++++++++++++++ dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild | 69 +++++++++++++++++++++++++++++++ dev-haskell/cabal/cabal-3.4.1.0.ebuild | 51 ----------------------- dev-haskell/cabal/cabal-3.6.3.0.ebuild | 34 +++++++++++++++ dev-haskell/cabal/metadata.xml | 1 + 7 files changed, 179 insertions(+), 110 deletions(-) delete mode 100644 dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild create mode 100644 dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild create mode 100644 dev-haskell/cabal/cabal-3.4.1.0-r1.ebuild delete mode 100644 dev-haskell/cabal/cabal-3.4.1.0.ebuild create mode 100644 dev-haskell/cabal/cabal-3.6.3.0.ebuild (limited to 'dev-haskell/cabal') diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest index 7246ff59dcfd..7262abd81ee0 100644 --- a/dev-haskell/cabal/Manifest +++ b/dev-haskell/cabal/Manifest @@ -1,5 +1,9 @@ -DIST Cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598 -DIST Cabal-3.4.1.0.tar.gz 836938 BLAKE2B b185d2beb91a0317b392c6f32ea47a574b8037b23f5131334bca1282359218ab94aa406be737e0fbb15458e7dfa2cba2b22f7776d42c20aeed2b87598cda0e2d SHA512 93233007b70487c76b8ceb9e475ebff0cae4c86a4694820ee505ee83d9049147d60c32c9aea5c4802faf5273adaaae66db299c1ee722aed64c716ac7a3b3aa90 -EBUILD cabal-3.2.1.0-r1.ebuild 1841 BLAKE2B 59784f9eec944aa2d9174753a4303cae55e06e2c53f75d1430ff4acd798b2c45e85ef668e9d49c526d036d8b3287bca2e5b7622e34ee30dff76836555d355803 SHA512 c125206d3f5c5d9a09a5c77a9b2d4da058f5df25f887142b9d9afa7baefb714a1c35af63005d2bc9b85c692b97a2210e31c25aceaef1ea2982523eeef88227ab -EBUILD cabal-3.4.1.0.ebuild 1756 BLAKE2B 8bb62930c00a8a40d420b988b0cfb52636efc5390cb240aa9de25d81ab7bbba161696273767e6a6d029a1f2b4d928ca0aefcfcb5a92e4b4e22b8b6366e0fbee8 SHA512 b0d0d1424f1bd654c34a42a8da1b39d01a1fcecc88ab2911d2607b11b76a1afa852a5e7a7636fb24d0e12e448e0b5e5344af96506376254b5227015b5b5b884b -MISC metadata.xml 328 BLAKE2B 7bab39d27b80a48638ef71ce1adcd1d6a6c1ee38d7bc4704dd048cf55217c4d3b58650f1879501ef8635769a9f0e556c23a8bc4ad7158c7fe899deadd3f18d0d SHA512 428b94779689876a7681c1aa458f9ffeac6018d8935fee7f844d68c7bfb1e1d955bacd75a3c9e3c90e047e5819b136c019358dacc52a59a23a80386c493be3dd +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 +MISC metadata.xml 374 BLAKE2B 91a20e51209575537de737e8a73caf77ad851a085d56e90be385eeb12404e8fe3ed3f07bd6d4eb1f40db53ac46215a16aed0436ddfe1bfe3e8757996bccb9b11 SHA512 1d60c23734ee5c752f928b4edcd8333df968a8051efd84a20bcd803609de5372ab3337a955cf11f0231ff65ff953dc3d9fbcc7e7ad92a1e7391737257a8ad669 diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild deleted file mode 100644 index dc5b3144aa80..000000000000 --- a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.7.9999 -#hackport: flags: -bundled-binary-generic - -# Drop test-suite due to "circular" dependencies with quickcheck -CABAL_FEATURES="lib profile haddock hoogle hscolour" -CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken -inherit haskell-cabal - -MY_PN="Cabal" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A framework for packaging Haskell software" -HOMEPAGE="https://www.haskell.org/cabal/" -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" # ~ppc ~ppc64 ~ppc-macos -IUSE="" - -RESTRICT=test # circular deps: cabal -> quickcheck -> cabal - -# GHC lower bound set to 8.0 to remove semigroups and fail dependencies. -RDEPEND=" >=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-8.0:= -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # 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=-bundled-binary-generic -} - -CABAL_CORE_LIB_GHC_PV="8.10.6" diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild new file mode 100644 index 000000000000..f7ec4a9eae1f --- /dev/null +++ b/dev-haskell/cabal/cabal-3.2.1.0-r2.ebuild @@ -0,0 +1,66 @@ +# 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-orphans-0.6 =dev-haskell/diff-0.4 =dev-haskell/integer-logarithms-1.0.2 =dev-haskell/optparse-applicative-0.13.2.0 =dev-haskell/quickcheck-2.14 =dev-haskell/stm-2.4.5.0 =dev-haskell/tar-0.5.0.3 =dev-haskell/tasty-1.2.3 =dev-haskell/tasty-golden-2.3.1.1 =dev-haskell/tree-diff-0.1 quickcheck -> cabal + +RDEPEND=" + >=dev-lang/ghc-8.4.3:= +" +DEPEND="${RDEPEND} +" +# test? ( +# >=dev-haskell/async-2.2.2 =dev-haskell/base-compat-0.11.0 =dev-haskell/base-orphans-0.6 =dev-haskell/clock-0.8 =dev-haskell/diff-0.4 =dev-haskell/integer-logarithms-1.0.2 =dev-haskell/optparse-applicative-0.13.2.0 =dev-haskell/quickcheck-2.14 =dev-haskell/rere-0.1 =dev-haskell/stm-2.4.5.0 =dev-haskell/tar-0.5.0.3 =dev-haskell/tasty-1.2.3 =dev-haskell/tasty-golden-2.3.1.1 =dev-haskell/tree-diff-0.1 quickcheck -> cabal - -RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-8.4.3:= -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${CABAL_PN}-${PV}" - -src_prepare() { - default - - # 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=-bundled-binary-generic -} - -CABAL_CORE_LIB_GHC_PV="9.0.2" diff --git a/dev-haskell/cabal/cabal-3.6.3.0.ebuild b/dev-haskell/cabal/cabal-3.6.3.0.ebuild new file mode 100644 index 000000000000..65f9f2dbf9f7 --- /dev/null +++ b/dev-haskell/cabal/cabal-3.6.3.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.2.2.9999 +#hackport: flags: -parsec-struct-diff + +CABAL_PN="Cabal" + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +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" + +RDEPEND=" + >=dev-lang/ghc-9.2.4:= +" +DEPEND="${RDEPEND} +" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-parsec-struct-diff +} + +CABAL_CORE_LIB_GHC_PV="9.2.4 9.2.5 9.2.6 9.2.7 9.2.8" diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml index ac62fa133898..ff65eca11461 100644 --- a/dev-haskell/cabal/metadata.xml +++ b/dev-haskell/cabal/metadata.xml @@ -6,6 +6,7 @@ Gentoo Haskell + Cabal haskell/cabal -- cgit v1.2.3