Added patch to fix building with ghc-6.6

Package-Manager: portage-2.1.1-r1

4 files changed, 102 insertions, 16 deletions

diff --git a/dev-haskell/haskell-src-exts/ChangeLog b/dev-haskell/haskell-src-exts/ChangeLog
index 8a3f723e0c9d..76b18c5e8f6c 100644
--- a/dev-haskell/haskell-src-exts/ChangeLog
+++ b/dev-haskell/haskell-src-exts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haskell-src-exts
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.7 2006/03/09 18:33:19 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.8 2006/10/11 18:50:14 dcoutts Exp $
+
+  11 Oct 2006; Duncan Coutts <dcoutts@gentoo.org>
+  +files/haskell-src-exts-0.2-hiding-isSymbol.patch,
+  haskell-src-exts-0.2.ebuild:
+  Added patch to fix building with ghc-6.6
 
   09 Mar 2006; Duncan Coutts <dcoutts@gentoo.org>
   haskell-src-exts-0.2.ebuild:
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 05d2f5caa649..c60333ea58bd 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -1,22 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 84485d903f83bdbe301057f0f7c29ebd ChangeLog 1234
-RMD160 39bb9a5eeee2b13344718b5b5ff22f692f2c9fb9 ChangeLog 1234
-SHA256 32d24c286850a6804a2e387bb203db063e086894099dc61598352642e0b3b143 ChangeLog 1234
-MD5 4bdb0f2eea0626f11f6d857caa1391c6 files/digest-haskell-src-exts-0.2 259
-RMD160 df546f2230daa874979146ec3ce2f2ba749f7f93 files/digest-haskell-src-exts-0.2 259
-SHA256 7817d91ce21644746cc0fdbe58944032ffe773b2853244e53505a03d9ffd69fb files/digest-haskell-src-exts-0.2 259
-MD5 eb46a8d1f4ff5465f29c66d6ce5d6880 haskell-src-exts-0.2.ebuild 1001
-RMD160 b8ab326f93f9b3286fa466a0fcba08189f70bcf5 haskell-src-exts-0.2.ebuild 1001
-SHA256 3aca7f06e94fccca14880ae64a6f6c927815f4bf6b2513d390afee4e2125f15f haskell-src-exts-0.2.ebuild 1001
+AUX haskell-src-exts-0.2-hiding-isSymbol.patch 3016 RMD160 b6030108cbe3fc3a187854e751c179cf794dbb0f SHA1 2d49f3cb4e9651fccba162a4e91b3b5747a80190 SHA256 4bf72b759ff79278e67fa91f830fcbd8f3e6a26025234bd4e7889abc19148078
+MD5 7f0ea9a50d5c6f7c7afc4d49c946ec9c files/haskell-src-exts-0.2-hiding-isSymbol.patch 3016
+RMD160 b6030108cbe3fc3a187854e751c179cf794dbb0f files/haskell-src-exts-0.2-hiding-isSymbol.patch 3016
+SHA256 4bf72b759ff79278e67fa91f830fcbd8f3e6a26025234bd4e7889abc19148078 files/haskell-src-exts-0.2-hiding-isSymbol.patch 3016
+DIST haskell-src-exts-0.2.tar.gz 59520 RMD160 4fb15828c41cce431f947dcb549b3aa579367dcb SHA1 c4b9a76dbc6be91ba58835f7646b21750af68701 SHA256 f818f7f9ea079e4ee9689d8cb0a5d86b23603a9ba58f2fb047439e3c6f29b4d2
+EBUILD haskell-src-exts-0.2.ebuild 1117 RMD160 51e1365d32b50e6ad6288a26110237213a53f787 SHA1 88b6202318ff7c3a734599de493f3476518fddde SHA256 0761c9c2a9f1a1871eed25521e6b4ef7c292576fe1e81172715db735ea8c263a
+MD5 606a1627e73055acb5a882231f3a601a haskell-src-exts-0.2.ebuild 1117
+RMD160 51e1365d32b50e6ad6288a26110237213a53f787 haskell-src-exts-0.2.ebuild 1117
+SHA256 0761c9c2a9f1a1871eed25521e6b4ef7c292576fe1e81172715db735ea8c263a haskell-src-exts-0.2.ebuild 1117
+MISC ChangeLog 1412 RMD160 7d5c95540b11c1536092e0aa5f9a903accfa2a94 SHA1 a4cf0cf3006579aebb54073149f72c16292e407e SHA256 5fc0fcf38ec0ef23379e4695b310a9417746dcc87004c9905d0c1d12d3bf6386
+MD5 c825ff4a28f9d678b3bd986019c8e359 ChangeLog 1412
+RMD160 7d5c95540b11c1536092e0aa5f9a903accfa2a94 ChangeLog 1412
+SHA256 5fc0fcf38ec0ef23379e4695b310a9417746dcc87004c9905d0c1d12d3bf6386 ChangeLog 1412
+MISC metadata.xml 671 RMD160 fd9612929239d60ebebb881ba6f46fbe7c436fef SHA1 1ad0b0c59ee28e08d9849c9542411f0d28c78346 SHA256 7acde279d06a1095afbb79856ee028b68346cd45ebee58f734e965045e625c1d
 MD5 5173f3cddccbc40b8657fb05a97bfae1 metadata.xml 671
 RMD160 fd9612929239d60ebebb881ba6f46fbe7c436fef metadata.xml 671
 SHA256 7acde279d06a1095afbb79856ee028b68346cd45ebee58f734e965045e625c1d metadata.xml 671
+MD5 4bdb0f2eea0626f11f6d857caa1391c6 files/digest-haskell-src-exts-0.2 259
+RMD160 df546f2230daa874979146ec3ce2f2ba749f7f93 files/digest-haskell-src-exts-0.2 259
+SHA256 7817d91ce21644746cc0fdbe58944032ffe773b2853244e53505a03d9ffd69fb files/digest-haskell-src-exts-0.2 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEEHTk/B0cxt+cq+wRAomgAKCl7K3bw1vFye5FSt7600KesMBj3gCgoU8R
-TwPcOa7UXDDBiFGMjCGr97Y=
-=W1eg
+iD8DBQFFLTybnUVyUObPUL4RAjnCAJ9ocMrpMBuBCPSeHu+l/+NTscepsACfcUeT
+mQSyZbjBWD7r4aqBEdVExdk=
+=/D4H
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch b/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch
new file mode 100644
index 000000000000..df83e026fe0e
--- /dev/null
+++ b/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch
@@ -0,0 +1,68 @@
+diff -urwpN haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
+--- haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs	2005-05-01 22:40:45.000000000 +0100
++++ haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs	2006-10-11 19:42:53.000000000 +0100
+@@ -207,9 +207,9 @@ special_varids = [
+  ( "hiding", 	KW_Hiding )
+  ]
+ 
+-isIdent, isSymbol :: Char -> Bool
++isIdent, isSymbol' :: Char -> Bool
+ isIdent  c = isAlpha c || isDigit c || c == '\'' || c == '_'
+-isSymbol c = elem c ":!#$%&*+./<=>?@\\^|-~"
++isSymbol' c = elem c ":!#$%&*+./<=>?@\\^|-~"
+ 
+ matchChar :: Char -> String -> Lex a ()
+ matchChar c msg = do
+@@ -242,7 +242,7 @@ lexWhiteSpace bol = do
+ 		bol <- lexNestedComment bol
+ 		(bol, _) <- lexWhiteSpace bol
+ 		return (bol, True)
+-	    '-':'-':s | all (== '-') (takeWhile isSymbol s) -> do
++	    '-':'-':s | all (== '-') (takeWhile isSymbol' s) -> do
+ 		lexWhile (== '-')
+ 		lexWhile (/= '\n')
+ 		lexNewline
+@@ -489,8 +489,8 @@ lexStdToken = do
+ 			Just keyword -> keyword
+ 			Nothing -> VarId ident
+ 
+-	    | isSymbol c -> do
+-		sym <- lexWhile isSymbol
++	    | isSymbol' c -> do
++		sym <- lexWhile isSymbol'
+ 		return $ case lookup sym (reserved_ops ++ special_varops) of
+ 			Just t  -> t
+ 			Nothing -> case c of
+@@ -586,9 +586,9 @@ lexConIdOrQual qual = do
+ 		discard 1
+ 		lexConIdOrQual qual'
+ 
+-	     | isSymbol c -> do	-- qualified symbol?
++	     | isSymbol' c -> do	-- qualified symbol?
+ 		discard 1
+-		sym <- lexWhile isSymbol
++		sym <- lexWhile isSymbol'
+ 		case lookup sym reserved_ops of
+ 		    -- cannot qualify a reserved operator
+ 		    Just _  -> just_a_conid
+diff -urwpN haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs
+--- haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs	2005-04-08 16:17:29.000000000 +0100
++++ haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs	2006-10-11 19:40:49.000000000 +0100
+@@ -1270,7 +1270,7 @@ trRPat s linear rp = case rp of
+ 		    	HsIdent n -> fail $ "Attempting to bind variable "++n++
+ 					  " inside the context of a numerable regular pattern"
+ 		    	_	      -> fail $ "This should never ever ever happen...\
+-						  \ how the ¤#% did you do it??!?"
++						  \ how the #% did you do it??!?"
+ 
+       where -- | Generate a declaration for a @ binding.
+ 	    mkAsDecl :: SrcLoc -> MFunMetaInfo -> Tr HsName
+@@ -1429,7 +1429,7 @@ trRPat s linear rp = case rp of
+   	-- of transformations of optional patterns should be able to call it...)
+   	mkOptDecl :: SrcLoc -> Bool -> MFunMetaInfo -> Tr MFunMetaInfo
+   	mkOptDecl s greedy nvt@(_, vs, t) = do
+-  		-- Un nome, s'il vouz plaît.
++  		-- Un nome, s'il vouz plaît.
+   		n <- genMatchName
+   		let -- Generate a generator for matching the subpattern
+   		    (g, val) = mkGenExp s nvt			-- (harp_valX, (foo, bar, ...)) <- harp_matchY
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 a87aeb516c9a..e6e74ef99cc5 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,6 +1,6 @@
 # Copyright 1999-2006 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.7 2006/03/09 18:33:19 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild,v 1.8 2006/10/11 18:50:14 dcoutts Exp $
 
 CABAL_FEATURES="lib happy"
 inherit base haskell-cabal
@@ -14,13 +14,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/ghc"
+DEPEND=">=virtual/ghc-6.2
+		dev-haskell/happy"
 
 S=${WORKDIR}/haskell-src-exts/src/haskell-src-exts
 
 src_unpack() {
 	base_src_unpack
 
+	# Make it work with ghc 6.6
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-hiding-isSymbol.patch"
+
 	# Make it work with ghc pre-6.4
 	sed -i 's/{-# OPTIONS_GHC /{-# OPTIONS /' \
 		${S}/Language/Haskell/Hsx/Syntax.hs \