diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:41:04 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:41:04 +0000 |
| commit | 47fb60419449eb5836613245ed76225fca2feec9 (patch) | |
| tree | d76facb88cb947aa738c2b76323904673da1c71a /dev-haskell/haskell-src | |
| parent | Updates for upward compatability with cabal-1.2 and ghc-6.8 (diff) | |
| download | gentoo-2-47fb60419449eb5836613245ed76225fca2feec9.tar.gz gentoo-2-47fb60419449eb5836613245ed76225fca2feec9.tar.bz2 gentoo-2-47fb60419449eb5836613245ed76225fca2feec9.zip | |
Updates for upward compatability with cabal-1.2 and ghc-6.8
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-haskell/haskell-src')
| -rw-r--r-- | dev-haskell/haskell-src/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild | 7 | ||||
| -rw-r--r-- | dev-haskell/haskell-src/haskell-src-1.0.1.ebuild | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/dev-haskell/haskell-src/ChangeLog b/dev-haskell/haskell-src/ChangeLog index da1426c21388..f09348dce2c0 100644 --- a/dev-haskell/haskell-src/ChangeLog +++ b/dev-haskell/haskell-src/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/haskell-src # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/ChangeLog,v 1.23 2007/12/13 00:46:10 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/ChangeLog,v 1.24 2007/12/13 05:41:04 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> haskell-src-1.0-r1.ebuild, + haskell-src-1.0.1.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 12 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> haskell-src-1.0.ebuild: Remove unnecessary blocker. diff --git a/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild b/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild index e1a70998de04..4a328c77d590 100644 --- a/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild +++ b/dev-haskell/haskell-src/haskell-src-1.0-r1.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/haskell-src/haskell-src-1.0-r1.ebuild,v 1.4 2007/07/08 15:36:08 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/haskell-src-1.0-r1.ebuild,v 1.5 2007/12/13 05:41:04 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base 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/haskell-src/haskell-src-1.0.1.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.1.ebuild index 11a03f7cdfa9..58adb023c932 100644 --- a/dev-haskell/haskell-src/haskell-src-1.0.1.ebuild +++ b/dev-haskell/haskell-src/haskell-src-1.0.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/haskell-src/haskell-src-1.0.1.ebuild,v 1.5 2007/12/12 14:08:55 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/haskell-src-1.0.1.ebuild,v 1.6 2007/12/13 05:41:04 dcoutts Exp $ CABAL_FEATURES="lib profile haddock" inherit base haskell-cabal @@ -20,8 +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 -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs" + cabal-mksetup } |