diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:41:30 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 05:41:30 +0000 |
| commit | f1638aff0bc49dd7119821791c3e3ad50542c6f0 (patch) | |
| tree | 5bb760c88984cc3e99798bbdf41919d3d388f076 /dev-haskell/haskell-src-exts | |
| parent | Updates for upward compatability with cabal-1.2 and ghc-6.8 (diff) | |
| download | gentoo-2-f1638aff0bc49dd7119821791c3e3ad50542c6f0.tar.gz gentoo-2-f1638aff0bc49dd7119821791c3e3ad50542c6f0.tar.bz2 gentoo-2-f1638aff0bc49dd7119821791c3e3ad50542c6f0.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-exts')
| -rw-r--r-- | dev-haskell/haskell-src-exts/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild | 17 |
2 files changed, 17 insertions, 6 deletions
diff --git a/dev-haskell/haskell-src-exts/ChangeLog b/dev-haskell/haskell-src-exts/ChangeLog index ac97c0c89638..0e0a500d33f9 100644 --- a/dev-haskell/haskell-src-exts/ChangeLog +++ b/dev-haskell/haskell-src-exts/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/haskell-src-exts # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.10 2007/10/31 12:59:13 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.11 2007/12/13 05:41:30 dcoutts Exp $ + + 13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> + haskell-src-exts-0.2.ebuild: + Updates for upward compatability with cabal-1.2 and ghc-6.8 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> haskell-src-exts-0.2.ebuild: diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild index f56928046c0a..476a1d60b5f9 100644 --- a/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild +++ b/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild @@ -1,9 +1,9 @@ # 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-exts/haskell-src-exts-0.2.ebuild,v 1.10 2007/10/31 12:59:13 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild,v 1.11 2007/12/13 05:41:30 dcoutts Exp $ CABAL_FEATURES="lib happy" -inherit base haskell-cabal eutils +inherit base haskell-cabal eutils versionator DESCRIPTION="An extension to haskell-src that handles most common syntactic extensions to Haskell" HOMEPAGE="http://www.cs.chalmers.se/~d00nibro/haskell-src-exts/" @@ -28,8 +28,15 @@ src_unpack() { # Make it work with ghc pre-6.4 sed -i 's/{-# OPTIONS_GHC /{-# OPTIONS /' \ - ${S}/Language/Haskell/Hsx/Syntax.hs \ - ${S}/Language/Haskell/Hsx/Pretty.hs + "${S}/Language/Haskell/Hsx/Syntax.hs" \ + "${S}/Language/Haskell/Hsx/Pretty.hs" sed -i 's/#ifdef __GLASGOW_HASKELL__/#if __GLASGOW_HASKELL__>=604/' \ - ${S}/Language/Haskell/Hsx/Syntax.hs + "${S}/Language/Haskell/Hsx/Syntax.hs" + + if version_is_at_least "6.8" "$(ghc-version)"; then + sed -i -e '/Build-Depends:/a \ + , array, pretty' \ + "${S}/${PN}.cabal" + fi + } |