diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:49:41 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:49:41 +0000 |
| commit | d0d769b42f20effcfca2e879c63b450045fa5ea7 (patch) | |
| tree | 1d6ea2edc5b68523d72e856ae4ea663e62e718e7 /dev-haskell/time | |
| parent | Updates for upward compatability with cabal-1.2 and ghc-6.8 (diff) | |
| download | gentoo-2-d0d769b42f20effcfca2e879c63b450045fa5ea7.tar.gz gentoo-2-d0d769b42f20effcfca2e879c63b450045fa5ea7.tar.bz2 gentoo-2-d0d769b42f20effcfca2e879c63b450045fa5ea7.zip | |
Updates for upward compatability with cabal-1.2 and ghc-6.8
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-haskell/time')
| -rw-r--r-- | dev-haskell/time/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/time/time-1.0.ebuild | 7 | ||||
| -rw-r--r-- | dev-haskell/time/time-1.1.1.ebuild | 8 |
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-haskell/time/ChangeLog b/dev-haskell/time/ChangeLog index ca779e86429f..cd93e9c5fb1b 100644 --- a/dev-haskell/time/ChangeLog +++ b/dev-haskell/time/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/time # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/ChangeLog,v 1.9 2007/12/12 13:55:04 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/ChangeLog,v 1.10 2007/12/13 05:49:41 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> time-1.0.ebuild, + time-1.1.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 12 Dec 2007; Ferris McCormick <fmccor@gentoo.org> time-1.1.1.ebuild: Sparc stable --- part of Bug #201984. diff --git a/dev-haskell/time/time-1.0.ebuild b/dev-haskell/time/time-1.0.ebuild index 52001c379135..ee012836e98d 100644 --- a/dev-haskell/time/time-1.0.ebuild +++ b/dev-haskell/time/time-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.0.ebuild,v 1.4 2007/07/08 15:49:56 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.0.ebuild,v 1.5 2007/12/13 05:49:41 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -19,3 +19,8 @@ IUSE="" DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" + +src_unpack() { + unpack "${A}" + cabal-mksetup +} diff --git a/dev-haskell/time/time-1.1.1.ebuild b/dev-haskell/time/time-1.1.1.ebuild index 6a2bbbde02e2..94373e1529c8 100644 --- a/dev-haskell/time/time-1.1.1.ebuild +++ b/dev-haskell/time/time-1.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.1.ebuild,v 1.5 2007/12/12 13:55:04 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.1.1.ebuild,v 1.6 2007/12/13 05:49:41 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit haskell-cabal @@ -20,11 +20,7 @@ DEPEND=">=dev-lang/ghc-6.6" S="${WORKDIR}/ghc-${GHC_PV}/libraries/${PN}" -# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x src_unpack() { unpack "${A}" - sed -e "/type Hook/ s/UserHooks/Maybe UserHooks/" \ - -e "/^runTestScript ::/ d" \ - -e "s/maybeExit \\\$ //" \ - -i "${S}/Setup.hs" + cabal-mksetup } |