summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Coutts <dcoutts@gentoo.org>2005-12-10 14:55:42 +0000
committerDuncan Coutts <dcoutts@gentoo.org>2005-12-10 14:55:42 +0000
commit8ed7a3a3e94006e2af24fc559abe9f2cd91378f2 (patch)
tree954aa5874bcf6511b2ba1b2518df70d7f2be954f /dev-haskell
parentMade modular-friendly. (diff)
downloadhistorical-8ed7a3a3e94006e2af24fc559abe9f2cd91378f2.tar.gz
historical-8ed7a3a3e94006e2af24fc559abe9f2cd91378f2.tar.bz2
historical-8ed7a3a3e94006e2af24fc559abe9f2cd91378f2.zip
Patch to make it work with ghc-6.2.2. Hopefully this fixes bug #115034. Also disable the doc USE flag since it doesn't work.
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/haskell-src-exts/ChangeLog6
-rw-r--r--dev-haskell/haskell-src-exts/Manifest12
-rw-r--r--dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild15
3 files changed, 23 insertions, 10 deletions
diff --git a/dev-haskell/haskell-src-exts/ChangeLog b/dev-haskell/haskell-src-exts/ChangeLog
index 566d4688d563..38166c3d2954 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.1 2005/10/24 15:14:22 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.2 2005/12/10 14:55:42 dcoutts Exp $
+
+ 10 Dec 2005; <duncan@gentoo.org> haskell-src-exts-0.2.ebuild:
+ Patch to make it work with ghc-6.2.2. Hopefully this fixes bug #115034.
+ Also disable the doc USE flag since it doesn't work.
*haskell-src-exts-0.2 (24 Oct 2005)
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 41239724a1b5..5ca1649d8058 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,14 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 08e21738049ae8c8237a33d3b2b5bd1e haskell-src-exts-0.2.ebuild 721
+MD5 489163aa5ef61daed525f0d6cbb3349d haskell-src-exts-0.2.ebuild 1002
+MD5 578f1bcc4c7691212ecf7a34cbb82a91 ChangeLog 597
MD5 5173f3cddccbc40b8657fb05a97bfae1 metadata.xml 671
-MD5 bd126acb975242d5ada8c1c95c9c8706 ChangeLog 402
MD5 a68f55ac7cf8dc83e25c1aeb35383b09 files/digest-haskell-src-exts-0.2 71
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFDXPpmBQBy/eDH5uERAq01AJ44daB8+G5BoW+loFtMxQjq1CSitQCgtLGD
-J1q4lsFkfPe7PJAc805QLiY=
-=PQK0
+iD8DBQFDmuyr/B0cxt+cq+wRAoGmAJ4rf8PCQUs4fDXRCXW8kNxOuRdHjgCcDIqz
+AzBRGUZA/prqqgXKs1Gf2ZI=
+=XU1d
-----END PGP SIGNATURE-----
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 5de55a9d58a2..abfff7a4fd6e 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,8 @@
# Copyright 1999-2005 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.1 2005/10/24 15:14:22 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild,v 1.2 2005/12/10 14:55:42 dcoutts Exp $
-CABAL_FEATURES="haddock"
-inherit haskell-cabal
+inherit base haskell-cabal
DESCRIPTION="An extension to haskell-src that handles most common syntactic extensions to Haskell"
HOMEPAGE="http://www.cs.chalmers.se/~d00nibro/haskell-src-exts/"
@@ -20,3 +19,13 @@ DEPEND="virtual/ghc
S=${WORKDIR}/haskell-src-exts/src/haskell-src-exts
+src_unpack() {
+ base_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
+ sed -i 's/#ifdef __GLASGOW_HASKELL__/#if __GLASGOW_HASKELL__>=604/' \
+ ${S}/Language/Haskell/Hsx/Syntax.hs
+}