Added patch to fix building with ghc-6.6

Package-Manager: portage-2.1.1-r1

4 files changed, 65 insertions, 13 deletions

diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog
index ab7dd370fe17..52dca7f1e2a8 100644
--- a/dev-haskell/happy/ChangeLog
+++ b/dev-haskell/happy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/happy
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.22 2006/10/05 03:54:36 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.23 2006/10/11 18:31:57 dcoutts Exp $
+
+  11 Oct 2006; Duncan Coutts <dcoutts@gentoo.org>
+  +files/happy-1.15-ghc66.patch, happy-1.15.ebuild:
+  Added patch to fix building with ghc-6.6
 
   05 Oct 2006; Chris Parrott <cparrott@gentoo.org> happy-1.15.ebuild:
   marked stable for amd64 (bug 144677)
diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest
index c5de7eddc508..b7da69d6a2e2 100644
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -5,20 +5,24 @@ AUX happy-1.14-gcc3.4.patch 1849 RMD160 b7d901844f4bc24c5f224cceb225fdbf4f5796bd
 MD5 ccdd754a8212bb8a0ad2fa759a297250 files/happy-1.14-gcc3.4.patch 1849
 RMD160 b7d901844f4bc24c5f224cceb225fdbf4f5796bd files/happy-1.14-gcc3.4.patch 1849
 SHA256 403955cb6b84a123223685800fbf0f1ab48f3704537706b3d5578741e78eceab files/happy-1.14-gcc3.4.patch 1849
+AUX happy-1.15-ghc66.patch 1347 RMD160 d99f02830dc4af87828d4602e13404394ccae6c8 SHA1 a3b6ef1164ecae7b7f19718194f9e4b00954267e SHA256 06e18354fe372ce7c37a9a10a400e04a4dcb29edc9aed569edc42fc52e1390db
+MD5 6e76bf7c5f9f1b50b0a4992355997e94 files/happy-1.15-ghc66.patch 1347
+RMD160 d99f02830dc4af87828d4602e13404394ccae6c8 files/happy-1.15-ghc66.patch 1347
+SHA256 06e18354fe372ce7c37a9a10a400e04a4dcb29edc9aed569edc42fc52e1390db files/happy-1.15-ghc66.patch 1347
 DIST happy-1.14-src.tar.gz 473967
 DIST happy-1.15-src.tar.gz 510037 RMD160 ade977d45970841c94f1e9dbb52809d9a9aae37c SHA1 11bc945edb03280e8a5825ec1124cb9f84467c2f SHA256 451715306f2e602fa425776b81e22a8bc59a0c9a812fa1ee824c0a9a81767534
 EBUILD happy-1.14.ebuild 716 RMD160 f8ce286a07e3dcef9e0c519439c968aec2fdb173 SHA1 b129a8f84bf579a2e7182c1f569326613d837fb7 SHA256 7ffe70fa8868afd5259214f3eefc6320888d03aa29d21b1c66ec17298a831e22
 MD5 2abcf920e72ad1afe942d318c2b7db45 happy-1.14.ebuild 716
 RMD160 f8ce286a07e3dcef9e0c519439c968aec2fdb173 happy-1.14.ebuild 716
 SHA256 7ffe70fa8868afd5259214f3eefc6320888d03aa29d21b1c66ec17298a831e22 happy-1.14.ebuild 716
-EBUILD happy-1.15.ebuild 1510 RMD160 0878e7f1b95cde387e286471c8ad1d80fd5c1697 SHA1 99e293b71de312b47c8223bee65b8711d34adfff SHA256 8e14d9be95d59eed56df48b40134ee0047169cb71d369625b8b0fb1cbb24f78d
-MD5 95831c95ed7a7fb13b5c14359aa67095 happy-1.15.ebuild 1510
-RMD160 0878e7f1b95cde387e286471c8ad1d80fd5c1697 happy-1.15.ebuild 1510
-SHA256 8e14d9be95d59eed56df48b40134ee0047169cb71d369625b8b0fb1cbb24f78d happy-1.15.ebuild 1510
-MISC ChangeLog 2583 RMD160 5c956ab0f1004b2fef56326210ffc1a641d3911c SHA1 42f5fabf52dc5d9b5ee779b4f22d0073e28032fe SHA256 34b4205a72ab329edc0c1986dd2438dec4777ae59bc11aa6a8d00f4034a88151
-MD5 090ce5dc3f2006ee346dd02eba7ab78f ChangeLog 2583
-RMD160 5c956ab0f1004b2fef56326210ffc1a641d3911c ChangeLog 2583
-SHA256 34b4205a72ab329edc0c1986dd2438dec4777ae59bc11aa6a8d00f4034a88151 ChangeLog 2583
+EBUILD happy-1.15.ebuild 1560 RMD160 0c01bf21334d520357ffda5506ddd73c511482c9 SHA1 7af419d58da4ef781ba9f37e2a07c8258c40b2bb SHA256 d84d51a8cc5071a831c6160e961bfbebf76bce3972a25e7968f7f607dc92a2b3
+MD5 de5689a2084a50d29c260dbbdda844bd happy-1.15.ebuild 1560
+RMD160 0c01bf21334d520357ffda5506ddd73c511482c9 happy-1.15.ebuild 1560
+SHA256 d84d51a8cc5071a831c6160e961bfbebf76bce3972a25e7968f7f607dc92a2b3 happy-1.15.ebuild 1560
+MISC ChangeLog 2728 RMD160 f820bb762787d93b1dbb1f6a7779f2a8f69ef916 SHA1 cc38ee89384ad2f00b7d918aa1b5575c0201fc9c SHA256 7e93c3266ca28a9514c0c73a67032075c4b5aff681b78732f6a403a1cb7d8ee8
+MD5 e2671f0e11628e488326db58f5eb2537 ChangeLog 2728
+RMD160 f820bb762787d93b1dbb1f6a7779f2a8f69ef916 ChangeLog 2728
+SHA256 7e93c3266ca28a9514c0c73a67032075c4b5aff681b78732f6a403a1cb7d8ee8 ChangeLog 2728
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -32,7 +36,7 @@ SHA256 94355ae4af5f39cf7c316a503ab51a37b6e3d9e631c1f5950b2c8cb4697f96d0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJIHeWAIrQc5r/yMRAiXHAKCy/gZtQ0+VEeO38eraGRItvQr8ZwCgsZUf
-I5D2CBaXmClI32tY6udLO4Y=
-=q6Ye
+iD8DBQFFLThQnUVyUObPUL4RAueoAJ9KjvsNphZRCB+66Uzhp1MVCzeOggCdHDGt
+cJcPxkM2xB+fVMI8vSzDvmc=
+=8zfD
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/happy/files/happy-1.15-ghc66.patch b/dev-haskell/happy/files/happy-1.15-ghc66.patch
new file mode 100644
index 000000000000..7a40971a2b6a
--- /dev/null
+++ b/dev-haskell/happy/files/happy-1.15-ghc66.patch
@@ -0,0 +1,41 @@
+diff -urwpN happy-1.15.orig/happy/src/LALR.lhs happy-1.15/happy/src/LALR.lhs
+--- happy-1.15.orig/happy/src/LALR.lhs	2005-01-14 14:57:54.000000000 +0000
++++ happy-1.15/happy/src/LALR.lhs	2006-09-12 10:02:19.000000000 +0100
+@@ -21,14 +21,14 @@ Generation of LALR parsing tables.
+ 
+ > import Control.Monad.ST
+ > import Data.Array.ST
+-> import Data.Array hiding (bounds)
++> import Data.Array as Array
+ > import Data.List (nub)
+ 
+ #elif defined(__GLASGOW_HASKELL__)
+ 
+ > import ST
+ > import MArray
+-> import Array 	hiding (bounds)
++> import Array as Array
+ > import List (nub)
+ 
+ #endif
+@@ -623,7 +623,7 @@ Count the conflicts
+ >   
+ >   where
+ >	   
+->	conflictArray = listArray (bounds action) conflictList
++>	conflictArray = listArray (Array.bounds action) conflictList
+ >	conflictList  = map countConflictsState (assocs action)
+ >
+ >	countConflictsState (state, actions) 
+diff -urwpN happy-1.15.orig/happy/src/ProduceCode.lhs happy-1.15/happy/src/ProduceCode.lhs
+--- happy-1.15.orig/happy/src/ProduceCode.lhs	2005-01-18 10:18:19.000000000 +0000
++++ happy-1.15/happy/src/ProduceCode.lhs	2006-09-12 09:51:32.000000000 +0100
+@@ -27,8 +27,6 @@ The code generator.
+ > import Data.Array.Unboxed ( UArray )
+ > import Data.Array.MArray
+ > import Data.Array.IArray 
+-> 
+-> marray_indices a = Data.Array.MArray.indices a
+ 
+ #elif __GLASGOW_HASKELL__ > 408
+ 
diff --git a/dev-haskell/happy/happy-1.15.ebuild b/dev-haskell/happy/happy-1.15.ebuild
index b1edce64d071..13ed7c28418c 100644
--- a/dev-haskell/happy/happy-1.15.ebuild
+++ b/dev-haskell/happy/happy-1.15.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/happy/happy-1.15.ebuild,v 1.14 2006/10/05 03:54:36 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.15.ebuild,v 1.15 2006/10/11 18:31:57 dcoutts Exp $
 
 inherit base eutils ghc-package
 
@@ -21,6 +21,9 @@ RDEPEND=""
 
 src_unpack() {
 	base_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-ghc66.patch"
 }
 
 src_compile() {