Made bnfc-* play nice with dev-lang/ghc-6.6

Package-Manager: portage-2.1.2_pre1-r1

7 files changed, 113 insertions, 16 deletions

diff --git a/dev-util/bnfc/ChangeLog b/dev-util/bnfc/ChangeLog
index fd46d4a62e65..95f27ab0599c 100644
--- a/dev-util/bnfc/ChangeLog
+++ b/dev-util/bnfc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/bnfc
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bnfc/ChangeLog,v 1.4 2005/10/08 17:22:30 kosmikus Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bnfc/ChangeLog,v 1.5 2006/10/11 21:52:53 kolmodin Exp $
+
+  11 Oct 2006; <kolmodin@gentoo.org> +files/bnfc-2.2-ghc66-utf8.patch,
+  bnfc-2.1.2.ebuild, bnfc-2.2.ebuild:
+  Made bnfc-* compatible with dev-lang/ghc-6.6
 
 *bnfc-2.2 (08 Oct 2005)
 
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
index 4e4037b45620..9bd54cff8aa5 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -1,16 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5d4d405612753ab288bf4d4fc96483ca bnfc-2.1.2.ebuild 780
-MD5 7826116c2d89b800d64a0654fe71cc4b bnfc-2.2.ebuild 841
-MD5 deb101e267fcec564e679c561060a1fd ChangeLog 689
+AUX bnfc-2.2-ghc66-utf8.patch 3184 RMD160 0ccb7f475edf7e76d6c6a80b4c0aa0cf3061c827 SHA1 992ca2c395e0404d6d2149399959081034a3216b SHA256 28c7e61ba43c9e343d5f9b7f7f328c21c01daa29609dc5899aff72911853cd3d
+MD5 dad9d65b0be5d777098c3aa6f9ddc3cf files/bnfc-2.2-ghc66-utf8.patch 3184
+RMD160 0ccb7f475edf7e76d6c6a80b4c0aa0cf3061c827 files/bnfc-2.2-ghc66-utf8.patch 3184
+SHA256 28c7e61ba43c9e343d5f9b7f7f328c21c01daa29609dc5899aff72911853cd3d files/bnfc-2.2-ghc66-utf8.patch 3184
+DIST BNFC_2.2.tgz 264246 RMD160 5f1055fc45916eb489e7f1628dc24c5ecb153500 SHA1 bea787e54baa8dcfdab4c0dd38561558a5c895a8 SHA256 8f035b5d0850d5010a0c754f360a9f91cfab526b8b5cf4b61c207b89223c3a33
+DIST bnfc_2.1.2.tgz 113340 RMD160 b4975061ada09df109bb657f27c9181fd06f868b SHA1 465a28ae694f8e03b2653726a780f2ae6fba7a6d SHA256 a45cd22d727c9246fca31d580f42a3e2aa8bed4e094f8d608f7fe0d38c167eb1
+EBUILD bnfc-2.1.2.ebuild 803 RMD160 d463d245185cb2cf6703dc13dec83f002774179b SHA1 9a94a04b8a6e111930d3e7a18920d17c20d44ee2 SHA256 a8be4b86257b34b448b408b8a4d0d134da952e96ab575cfede6901e10b9d445c
+MD5 ff490ef266fccd23b65ced25c2b5833e bnfc-2.1.2.ebuild 803
+RMD160 d463d245185cb2cf6703dc13dec83f002774179b bnfc-2.1.2.ebuild 803
+SHA256 a8be4b86257b34b448b408b8a4d0d134da952e96ab575cfede6901e10b9d445c bnfc-2.1.2.ebuild 803
+EBUILD bnfc-2.2.ebuild 936 RMD160 c2bda2b64f086c662e2e071044f8794d52d0ce40 SHA1 5ac6a9901e66ce104c880fdee8172dcbefaeef1a SHA256 14d3773e09ca63caea21904c6d2d1693cb90f8b0586a8e0ba35566a2a2ea9859
+MD5 17ff0fff46a987865efaab11feb7c4a1 bnfc-2.2.ebuild 936
+RMD160 c2bda2b64f086c662e2e071044f8794d52d0ce40 bnfc-2.2.ebuild 936
+SHA256 14d3773e09ca63caea21904c6d2d1693cb90f8b0586a8e0ba35566a2a2ea9859 bnfc-2.2.ebuild 936
+MISC ChangeLog 846 RMD160 960f572584cc81249bd062ce1fc3b392cd7355af SHA1 66c938441659dcb0f519542d16de4a80cbb72172 SHA256 afaee936a2d40b02d0c91c1c9222a5213dfc0ae590f5173d43221f99c2c73835
+MD5 e1100566045960a7ef938d73d61d5775 ChangeLog 846
+RMD160 960f572584cc81249bd062ce1fc3b392cd7355af ChangeLog 846
+SHA256 afaee936a2d40b02d0c91c1c9222a5213dfc0ae590f5173d43221f99c2c73835 ChangeLog 846
+MISC metadata.xml 224 RMD160 57bc74b2471cd3dba6dcdcce531df8eb82893cee SHA1 26ebe68897710a99cee04ae5e7c38217295e3dc2 SHA256 2b30834e4d9f141a1e1b63457d4af1f6a8cb6d4a47f8dd3b14e726277079769b
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 c39f54377c63e2af74a4ef4e99624313 files/digest-bnfc-2.1.2 59
-MD5 20fc3fd3d13153ffa6c3c4221cf80135 files/digest-bnfc-2.2 57
+RMD160 57bc74b2471cd3dba6dcdcce531df8eb82893cee metadata.xml 224
+SHA256 2b30834e4d9f141a1e1b63457d4af1f6a8cb6d4a47f8dd3b14e726277079769b metadata.xml 224
+MD5 29b3839bbc1d993d3aaeed364f0e3ffa files/digest-bnfc-2.1.2 223
+RMD160 db93909d291c54032f13a38e3b3a0697df5f7880 files/digest-bnfc-2.1.2 223
+SHA256 18a55b20a1248c0ce029cb66c1e3aeaf2d2630acadeeb76d4bd0e3390a140c8e files/digest-bnfc-2.1.2 223
+MD5 5ba4905cac35c2e67a537b5bd8fc0ae2 files/digest-bnfc-2.2 217
+RMD160 b5615d795364178aece0669164855c4c455ef8c9 files/digest-bnfc-2.2 217
+SHA256 dc30995310098db8788f0778e1d01f5d7af9884130c1a6faabefb80de45227a8 files/digest-bnfc-2.2 217
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDSAEUOKSBj1ObwosRAuwuAKCEIWIFG+HsKL6ryjr7uAhUhfLddgCffWuS
-ZTMEaHx8qh9Aa2y67UoY17g=
-=oi/o
+iD8DBQFFLWfI1n/CYbXjntIRAjY2AJ9QmdKydjB15FUwfdRbMMXs/C8ybgCdFdHD
+3Fkecfh/rlC5GXvv3IVake0=
+=bbu+
 -----END PGP SIGNATURE-----
diff --git a/dev-util/bnfc/bnfc-2.1.2.ebuild b/dev-util/bnfc/bnfc-2.1.2.ebuild
index e8f758c3f22d..3ff27e149dfe 100644
--- a/dev-util/bnfc/bnfc-2.1.2.ebuild
+++ b/dev-util/bnfc/bnfc-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bnfc/bnfc-2.1.2.ebuild,v 1.3 2005/05/03 20:47:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bnfc/bnfc-2.1.2.ebuild,v 1.4 2006/10/11 21:52:53 kolmodin Exp $
 
 DESCRIPTION="BNF Converter -- a sophisticated parser generator"
 HOMEPAGE="http://www.cs.chalmers.se/~markus/BNFC/"
@@ -12,6 +12,7 @@ KEYWORDS="~x86 ~ppc"
 IUSE="doc"
 
 DEPEND=">=virtual/ghc-6.2
+	!>=virtual/ghc-6.6
 	doc? ( virtual/tetex )"
 
 RDEPEND="virtual/libc"
diff --git a/dev-util/bnfc/bnfc-2.2.ebuild b/dev-util/bnfc/bnfc-2.2.ebuild
index 2e167e8f77df..cf695a1c62c1 100644
--- a/dev-util/bnfc/bnfc-2.2.ebuild
+++ b/dev-util/bnfc/bnfc-2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bnfc/bnfc-2.2.ebuild,v 1.1 2005/10/08 17:22:30 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bnfc/bnfc-2.2.ebuild,v 1.2 2006/10/11 21:52:53 kolmodin Exp $
 
-inherit ghc-package
+inherit base ghc-package
 
 MY_PN="BNFC"
 
@@ -22,6 +22,12 @@ RDEPEND="virtual/libc"
 
 S="${WORKDIR}/${MY_PN}_${PV}"
 
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-ghc66-utf8.patch"
+}
+
 src_compile() {
 	emake GHC="$(ghc-getghc) -O" || die "emake failed"
 	if use doc ; then
diff --git a/dev-util/bnfc/files/bnfc-2.2-ghc66-utf8.patch b/dev-util/bnfc/files/bnfc-2.2-ghc66-utf8.patch
new file mode 100644
index 000000000000..9b819b9b69ee
--- /dev/null
+++ b/dev-util/bnfc/files/bnfc-2.2-ghc66-utf8.patch
@@ -0,0 +1,60 @@
+diff -urw --exclude='*.o' --exclude='*.hi' BNFC_2.2.orig/CF.hs BNFC_2.2/CF.hs
+--- BNFC_2.2.orig/CF.hs	2004-09-22 18:10:57.000000000 +0200
++++ BNFC_2.2/CF.hs	2006-09-13 16:53:52.000000000 +0200
+@@ -469,7 +469,7 @@
+    badtypes = filter isBadType $ cat : [c | Left c <- rhs]
+    isBadType c = not (isUpper (head c) || isList c || c == "#")
+    badFunName = not (isUpper (head f) 
+-                       || isCoercion f || isNilFun f || isOneFun f || isConsFun f)
++                       || isCoercion f || isNilFun f || isOneFun f || isConsFun f)
+ 
+ isPositionCat :: CFG f -> Cat -> Bool
+ isPositionCat cf cat =  or [b | TokenReg name b _ <- pragmasOfCF cf, name == cat]
+diff -urw --exclude='*.o' --exclude='*.hi' BNFC_2.2.orig/GetCF.hs BNFC_2.2/GetCF.hs
+--- BNFC_2.2.orig/GetCF.hs	2004-09-26 18:45:35.000000000 +0200
++++ BNFC_2.2/GetCF.hs	2006-09-13 16:54:13.000000000 +0200
+@@ -117,7 +117,7 @@
+ 	       pragma             = [r | Left (Left r) <- rs]
+ 	       errors             = [s | Right s <- rs, not (null s)]
+ 	       (symbols,keywords) = partition (any isSpec) reservedWords
+-	       isSpec             = flip elem "$+-*=<>[](){}!?.,;:^§~|&%#/\\$_@\"\'"
++	       isSpec             = flip elem "$+-*=<>[](){}!?.,;:^\167~|&%#/\\$_@\"\'"
+ 	       reservedWords      = nub [t | (_,(_,its)) <- rules, Right t <- its]
+                cats               = []
+ 	    in (((pragma,(literals,symbols,keywords,cats)),rules),errors)
+Only in BNFC_2.2.orig/: ParBNF.y
+Only in BNFC_2.2: bnfc
+diff -urw --exclude='*.o' --exclude='*.hi' BNFC_2.2.orig/formats/cpp/RegToFlex.hs BNFC_2.2/formats/cpp/RegToFlex.hs
+--- BNFC_2.2.orig/formats/cpp/RegToFlex.hs	2004-02-03 17:04:42.000000000 +0100
++++ BNFC_2.2/formats/cpp/RegToFlex.hs	2006-09-13 16:49:01.000000000 +0200
+@@ -69,5 +69,5 @@
+ mkEsc :: String -> String
+ mkEsc = concatMap escChar
+     where escChar c
+-	      | c `elem` "$+-*=<>[](){}!?.,;:^§~|&%#/\\$_@\"" = '\\':[c]
++	      | c `elem` "$+-*=<>[](){}!?.,;:^\167~|&%#/\\$_@\"" = '\\':[c]
+ 	      | otherwise = [c]
+diff -urw --exclude='*.o' --exclude='*.hi' BNFC_2.2.orig/formats/haskell2/CFtoAlex.hs BNFC_2.2/formats/haskell2/CFtoAlex.hs
+--- BNFC_2.2.orig/formats/haskell2/CFtoAlex.hs	2004-10-14 18:34:56.000000000 +0200
++++ BNFC_2.2/formats/haskell2/CFtoAlex.hs	2006-09-13 16:55:02.000000000 +0200
+@@ -84,7 +84,7 @@
+  where
+   mkEsc = unwords . map ( f . (:[]))
+   f s = if all isSpec s then '^':s else s
+-  isSpec = flip elem "$+-*=<>[](){}!?.,;:^§~|&%#/\\$_@\""
++  isSpec = flip elem "$+-*=<>[](){}!?.,;:^\167~|&%#/\\$_@\""
+ 
+ restOfAlex :: CF -> [String]
+ restOfAlex cf = [
+diff -urw --exclude='*.o' --exclude='*.hi' BNFC_2.2.orig/formats/haskell2/CFtoAlex2.hs BNFC_2.2/formats/haskell2/CFtoAlex2.hs
+--- BNFC_2.2.orig/formats/haskell2/CFtoAlex2.hs	2004-12-08 15:22:47.000000000 +0100
++++ BNFC_2.2/formats/haskell2/CFtoAlex2.hs	2006-09-13 16:54:44.000000000 +0200
+@@ -105,7 +105,7 @@
+  where
+   mkEsc = unwords . map ( f . (:[]))
+   f s = if all isSpec s then '\\':s else s
+-  isSpec = flip elem "$+-*=<>[](){}!?.,;:^§~|&%#/\\$_@\""
++  isSpec = flip elem "$+-*=<>[](){}!?.,;:^\167~|&%#/\\$_@\""
+ 
+ restOfAlex :: String -> Bool -> CF -> [String]
+ restOfAlex shareMod shareStrings cf = [
diff --git a/dev-util/bnfc/files/digest-bnfc-2.1.2 b/dev-util/bnfc/files/digest-bnfc-2.1.2
index 0ec5e8ccdd2b..137c15f101ce 100644
--- a/dev-util/bnfc/files/digest-bnfc-2.1.2
+++ b/dev-util/bnfc/files/digest-bnfc-2.1.2
@@ -1 +1,3 @@
 MD5 2570c1c6ffba25b8824804bae372710d bnfc_2.1.2.tgz 113340
+RMD160 b4975061ada09df109bb657f27c9181fd06f868b bnfc_2.1.2.tgz 113340
+SHA256 a45cd22d727c9246fca31d580f42a3e2aa8bed4e094f8d608f7fe0d38c167eb1 bnfc_2.1.2.tgz 113340
diff --git a/dev-util/bnfc/files/digest-bnfc-2.2 b/dev-util/bnfc/files/digest-bnfc-2.2
index 94f9d7f073f6..91b0fcc8b068 100644
--- a/dev-util/bnfc/files/digest-bnfc-2.2
+++ b/dev-util/bnfc/files/digest-bnfc-2.2
@@ -1 +1,3 @@
 MD5 1fff9eb84ba294639292d14a6d47a410 BNFC_2.2.tgz 264246
+RMD160 5f1055fc45916eb489e7f1628dc24c5ecb153500 BNFC_2.2.tgz 264246
+SHA256 8f035b5d0850d5010a0c754f360a9f91cfab526b8b5cf4b61c207b89223c3a33 BNFC_2.2.tgz 264246