diff options
| author |   Andres Loeh <kosmikus@gentoo.org> | 2005-03-18 23:34:54 +0000 |
|---|---|---|
| committer | Andres Loeh <kosmikus@gentoo.org> | 2005-03-18 23:34:54 +0000 |
| commit | 61aa8066cc38e283fccc66ab153220d2d9b25eb7 (patch) | |
| tree | d8d020378f14816374aaa6d40978bb0227440d60 /dev-haskell | |
| parent | Fixed double .patch in epatch line. (diff) | |
| download | historical-61aa8066cc38e283fccc66ab153220d2d9b25eb7.tar.gz historical-61aa8066cc38e283fccc66ab153220d2d9b25eb7.tar.bz2 historical-61aa8066cc38e283fccc66ab153220d2d9b25eb7.zip | |
Cabal works with ghc-6.4 now.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/cabal/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/cabal/Manifest | 14 | ||||
| -rw-r--r-- | dev-haskell/cabal/cabal-0.5.ebuild | 18 |
3 files changed, 29 insertions, 8 deletions
diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog index bfcfd61c9482..3b964305a650 100644 --- a/dev-haskell/cabal/ChangeLog +++ b/dev-haskell/cabal/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/cabal # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.1 2005/02/26 15:26:01 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.2 2005/03/18 23:34:54 kosmikus Exp $ + + 19 Mar 2005; Andres Loeh <kosmikus@gentoo.org> cabal-0.5.ebuild: + Cabal works with ghc-6.4 now. *cabal-0.5 (26 Feb 2005) diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest index cb39f4379255..13df1086a1f4 100644 --- a/dev-haskell/cabal/Manifest +++ b/dev-haskell/cabal/Manifest @@ -1,4 +1,14 @@ -MD5 88aaf040c0e1ca5b053a0da167c4c4aa cabal-0.5.ebuild 1906 -MD5 f858852124c0c77179423d0605f6ee08 ChangeLog 339 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 b0af408a3b8eaaa6a8373b70e97a9a9c cabal-0.5.ebuild 2186 +MD5 1fd5c85589d9217f694726d46ba9d546 ChangeLog 439 MD5 0b2872d51fdf7a2694dab3d34b57667d metadata.xml 232 MD5 9d318d0c3adc5992247ee3f54ff9c5b6 files/digest-cabal-0.5 58 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFCO2aoOKSBj1ObwosRAvTwAJsH+hHLX5XLddQ8N6ghaBGze/FDpgCeIByA +4qH8yoe1rV5VblK0hzKVw3s= +=hxQ5 +-----END PGP SIGNATURE----- diff --git a/dev-haskell/cabal/cabal-0.5.ebuild b/dev-haskell/cabal/cabal-0.5.ebuild index 8fd2fcae014d..7ac94c15ec19 100644 --- a/dev-haskell/cabal/cabal-0.5.ebuild +++ b/dev-haskell/cabal/cabal-0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-0.5.ebuild,v 1.1 2005/02/26 15:26:01 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-0.5.ebuild,v 1.2 2005/03/18 23:34:54 kosmikus Exp $ inherit ghc-package @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="~x86" -IUSE="" +IUSE="doc" DEPEND="${DEPEND} >=virtual/ghc-6.2" @@ -45,9 +45,17 @@ cabal-pkg() { ./setup register \ --gen-script \ || die "setup register failed" - # sed on ghc-pkg when it isn't always called ghc-pkg - # therefore, sed on a flag (we assume a lot about register.sh here) - sed -i "s|--auto-ghci-libs\(.*\)$|--force \1 --config-file=\\\\|" register.sh + if ghc-cabal; then + # ghc supports Cabal; however, ghc-6.4 ships a slightly + # broken version, which we fix here + sed -i "s|update *$|update .installed-pkg-config|" register.sh + fi + # we want to manually build ghci-libs, so we remove the flag; + # instead, we force the issue and write to the local config file + # rather than the global one (which would cause an access violation + # at this point anyway) + sed -i "s|--auto-ghci-libs\(.*\)$|--force \1 -f\\\\|" \ + register.sh echo "${S}/$(ghc-localpkgconf)" >> register.sh ghc-setup-pkg ./register.sh |