diff options
Diffstat (limited to 'dev-haskell/cabal-install')
7 files changed, 148 insertions, 112 deletions
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest index b3ad860dcea2..a3528ee38e6c 100644 --- a/dev-haskell/cabal-install/Manifest +++ b/dev-haskell/cabal-install/Manifest @@ -1 +1,4 @@ -DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062 +DIST cabal-install-3.4.1.0-rev2.cabal 16912 BLAKE2B 9844dca8c72e39cf6f81267f9eae07d25eea9ba351d4ec70026ad0d9a6fb15423b066f2d998e1b702bd9acc15f9f0f90a3a4fc4b4d359bf2c4f5748a77c352ae SHA512 287f819c47a4c1b85ce35c18a299ba18bb0907662a2a5980ed84aebbee93b558ba1237c07100175e44c6b85bcd4953b39691219afb119a8a7d1b6d8aede96d1b +DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db +DIST cabal-install-3.6.2.0-rev2.cabal 13012 BLAKE2B 06f2bd2876d97560abf7693faf0aa0648a685bea5a443fd517d32236db8dc22c100f672ec79b6e131acd441a91f8e139c46d8a1890f2656d8f2b74be57545b71 SHA512 f6422bd69ff798ac42d1b10790347bffef6e3fc3bfc8fc4be96b6ea990f77199eb388306e45810990fd090d7d7040d72c94f3d65dc6f2f69994bf6a18b4ef134 +DIST cabal-install-3.6.2.0.tar.gz 633319 BLAKE2B e7169cc852413b3cd9d7f763402a5cc4746f9412f008b9b4a456de6002fbc79c8b77835723e3819a4049fc4d5175528040cef543f6a0dfa6f38331be16eddddb SHA512 a02d72fd7d0bf7778b1d4f2925e0b78f6c321cb29d59d559da758bfa6a0cd17fc776bd64911db8d28a208189b35db50aceae109782a1011e059446c4c2d77ad3 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 085a26c438fa..000000000000 --- a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 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 - -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-r3.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild new file mode 100644 index 000000000000..9e2bce608882 --- /dev/null +++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild @@ -0,0 +1,76 @@ +# 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: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions,-debug-conflict-sets + +CABAL_HACKAGE_REVISION=2 + +CABAL_FEATURES="" +inherit haskell-cabal ghc-package + +DESCRIPTION="The command-line interface for Cabal and Hackage" +HOMEPAGE="https://www.haskell.org/cabal/" + +LICENSE="BSD" +SLOT="0" +# Keep in sync with relevant dev-haskell/cabal versions +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="+lukko +native-dns" + +CABAL_CHDEPS=( + 'base >= 4.8 && < 4.16' 'base >= 4.8' + 'hashable >= 1.0 && < 1.4' 'hashable >=1.0' + 'HTTP >= 4000.1.5 && < 4000.4' 'HTTP >= 4000.1.5 && < 4000.5' +) + +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.5:= + >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= + >=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/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() { + # no chance to link to -threaded on ppc64, alpha and others + # who use UNREG, not only ARM + if ! ghc-supports-threaded-runtime; then + export CABAL_CHDEPS+=( '-threaded' ' ' ) + fi + haskell-cabal_src_prepare +} + +src_configure() { + haskell-cabal_src_configure \ + --flag=-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.6.2.0-r1.ebuild b/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild new file mode 100644 index 000000000000..c39a1ed229dd --- /dev/null +++ b/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild @@ -0,0 +1,62 @@ +# 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: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions,-debug-conflict-sets + +CABAL_HACKAGE_REVISION=2 + +CABAL_FEATURES="" +inherit haskell-cabal + +DESCRIPTION="The command-line interface for Cabal and Hackage" +HOMEPAGE="https://www.haskell.org/cabal/" + +LICENSE="BSD" +SLOT="0" + +# Keep in sync with relevant dev-haskell/cabal versions +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="+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.6.1.0:= <dev-haskell/cabal-3.7:= + >=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/hashable-1.5:= + >=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:= + >=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:= + >=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/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_configure() { + haskell-cabal_src_configure \ + --flag=-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/files/cabal-install-0.13.3-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch deleted file mode 100644 index c36582680a56..000000000000 --- a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs -index 48d8d49..3a38ee1 100644 ---- a/Distribution/Client/IndexUtils.hs -+++ b/Distribution/Client/IndexUtils.hs -@@ -312,10 +312,15 @@ extractPkg entry = case Tar.entryContent entry of - - extractPrefs :: Tar.Entry -> Maybe [Dependency] - extractPrefs entry = case Tar.entryContent entry of -+{- -+ -- get rid of hackage's preferred-versions -+ -- I'd like to have bleeding-edge packages in system and I don't fear of -+ -- broken packages with improper depends - Tar.NormalFile content _ - | takeFileName (Tar.entryPath entry) == "preferred-versions" - -> Just . parsePreferredVersions - . BS.Char8.unpack $ content -+-} - _ -> Nothing - - parsePreferredVersions :: String -> [Dependency] diff --git a/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch b/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch deleted file mode 100644 index fa98278a277d..000000000000 --- a/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/Distribution/Client/Sandbox.hs b/Distribution/Client/Sandbox.hs -index 66b415d..6aa71bb 100644 ---- a/Distribution/Client/Sandbox.hs -+++ b/Distribution/Client/Sandbox.hs -@@ -1,5 +1,6 @@ - {-# LANGUAGE CPP #-} - {-# LANGUAGE FlexibleContexts #-} -+{-# LANGUAGE RankNTypes #-} - ----------------------------------------------------------------------------- - -- | - -- Module : Distribution.Client.Sandbox diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml index 6e16048a9b72..9025779d6797 100644 --- a/dev-haskell/cabal-install/metadata.xml +++ b/dev-haskell/cabal-install/metadata.xml @@ -5,12 +5,12 @@ <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> - <longdescription> - The 'cabal' command-line program simplifies the process of managing - Haskell software by automating the fetching, configuration, compilation - and installation of Haskell libraries and programs. - </longdescription> <use> - <flag name="native-dns">Enable use of the resolv and windns packages for performing DNS lookups</flag> + <flag name="lukko">Use @lukko@ for file-locking</flag> + <flag name="native-dns">Enable use of the [resolv](https://hackage.haskell.org/package/resolv) & [windns](https://hackage.haskell.org/package/windns) packages for performing DNS lookups</flag> </use> + <upstream> + <remote-id type="hackage">cabal-install</remote-id> + <remote-id type="github">haskell/cabal</remote-id> + </upstream> </pkgmetadata> |