Fix build error on some systems caused by our bison/yacc collision

workarounds by explictly calling bison always. Thanks to everyone on bug
#213759 who provided info and testing.
Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 70 insertions, 8 deletions

diff --git a/dev-util/ftjam/ChangeLog b/dev-util/ftjam/ChangeLog
index 321d757dca24..c51147d2280a 100644
--- a/dev-util/ftjam/ChangeLog
+++ b/dev-util/ftjam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/ftjam
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ChangeLog,v 1.11 2008/03/17 00:28:28 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ChangeLog,v 1.12 2008/08/03 08:35:40 dirtyepic Exp $
+
+  03 Aug 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/ftjam-2.5.3-i-hate-yacc.patch, ftjam-2.5.3_rc2.ebuild:
+  Fix build error on some systems caused by our bison/yacc collision
+  workarounds by explictly calling bison always. Thanks to everyone on bug
+  #213759 who provided info and testing.
 
   17 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> ftjam-2.5.3_rc2.ebuild:
   Stable on amd64.
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index 032fb8215325..ad3a9dc65ce9 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ftjam-2.5.3-i-hate-yacc.patch 1756 RMD160 63fe38dd18e8e9599f0cf176c3d73a93929771c5 SHA1 60f0a58f085075c0fed0d77552348ea0e8646d04 SHA256 8d8710e4699b3c910ed8f1ea50f9b1c1a9beaae8aee0c6fc815905666a5ffb81
 AUX ftjam-2.5.3-nostrip.patch 780 RMD160 668ac5ab61bcd4d34af0d668038115c944cc5550 SHA1 02df40e8513b085beb66ce1eea8e03e5a858b251 SHA256 66af8842f5853d22717dc1613c001aae61eed3c7f5997f16007298e0e7a97f6d
 DIST ftjam-2.5.3rc2.tar.bz2 215963 RMD160 dd4ed7e95958bd5425201ea6422e967efe501dff SHA1 683c9f000cccc37f48c2f3fd94a69ed70801fb75 SHA256 a9f8a274049893a4d1f1ad82f7b04f3ebc2554635dd606185e20ba97cb4d64ec
-EBUILD ftjam-2.5.3_rc2.ebuild 933 RMD160 0d9d80886267fa6b8cd7755eb03971d394f0982c SHA1 3dace8441a2d02a0d4ebde89db7417095b97d87c SHA256 699892d7f58b68f1277e0c4734815b14b3dd7a39e076489e8ae140b5725bbf86
-MISC ChangeLog 1519 RMD160 5b9ec5f18d9edbedfc6b4c29af65f6b53d48eafa SHA1 4afa45fcabdd06d0e70eb3914f2bd15539b87239 SHA256 776a564b4ec44c9794a17a5c2b595c3658bb40dbf4c2ae788d6d670b5b457994
+EBUILD ftjam-2.5.3_rc2.ebuild 985 RMD160 dc3e9862ec862e18f16294e7472565a1dbaa3e70 SHA1 f7d4de53f4761127eff1390b8ccf1082ea24e1b8 SHA256 bae14ed5c2b29a86905091044d7daec990099917f43744b0ec8d9c8f5aa94d27
+MISC ChangeLog 1817 RMD160 373de236ce44d736f13f0e32ba31e5993fad0cb7 SHA1 43a09b1a76f6dfa85a708aa44a68a6ee03682915 SHA256 c32055e168b9660b3a25251bb43ac613476ec803ec40e755a57e9aed7566d74e
 MISC metadata.xml 253 RMD160 b096274af87f9c103c75a962caafb7119d8806ce SHA1 12215f17ab0f6da7874825f25053cfd2a974a03b SHA256 360fc3b66d6f2c93018d2e4dc3bed95a8f078fd6097e15c2e42552fe4fa2bdc6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH3bsyiqiDRvmkBmIRApXFAJ9mcPmFqjqWPGVbG9RrsOp4U7aKqACg7bGn
-3f/P2Rp2Oik3c51XyCT7Fsc=
-=lfmS
+iEYEARECAAYFAkiVbfAACgkQiqiDRvmkBmLIdwCggdGRJNzZOpbPmZgwAKgv9fgn
+KiQAni3TWMZyfrZVyjieTy+Gts1hxHO2
+=CidY
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch b/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch
new file mode 100644
index 000000000000..44322d64c2cf
--- /dev/null
+++ b/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch
@@ -0,0 +1,54 @@
+diff -Naurp ftjam-2.5.3rc2-orig/Jambase ftjam-2.5.3rc2/Jambase
+--- ftjam-2.5.3rc2-orig/Jambase	2007-06-05 08:20:19.000000000 -0600
++++ ftjam-2.5.3rc2/Jambase	2008-07-21 19:26:02.000000000 -0600
+@@ -813,7 +813,7 @@ else if $(UNIX)

+     LINKLIBS    ?= ;

+     OPTIM       ?= -O ;

+     RANLIB      ?= ranlib ;

+-    YACC        ?= yacc ;

++    YACC        ?= bison -y ;

+     YACCGEN     ?= .c ;

+     YACCFILES   ?= y.tab ;

+     YACCFLAGS   ?= -d ;

+@@ -882,10 +882,10 @@ DC ?= dmd ;

+     SUFLIB      ?= .a ;

+     SUFOBJ      ?= .o ;

+     UNDEFFLAG   ?= "-u _" ;

+-    YACC        ?= ;

+-    YACCGEN     ?= ;

+-    YACCFILES   ?= ;

+-    YACCFLAGS   ?= ;

++    YACC        ?= bison -y ;

++    YACCGEN     ?= .c ;

++    YACCFILES   ?= y.tab ;

++    YACCFLAGS   ?= -d ;

+ 

+     HDRPATTERN =

+             "^[ 	]*#[ 	]*include[ 	]*[<\"]([^\">]*)[\">].*$" ;

+diff -Naurp ftjam-2.5.3rc2-orig/jambase.c ftjam-2.5.3rc2/jambase.c
+--- ftjam-2.5.3rc2-orig/jambase.c	2007-06-05 08:31:08.000000000 -0600
++++ ftjam-2.5.3rc2/jambase.c	2008-07-21 19:27:55.000000000 -0600
+@@ -632,7 +632,7 @@ const char *jambase[] = {
+ "LINKLIBS    ?= ;\n",
+ "OPTIM       ?= -O ;\n",
+ "RANLIB      ?= ranlib ;\n",
+-"YACC        ?= yacc ;\n",
++"YACC        ?= bison -y ;\n",
+ "YACCGEN     ?= .c ;\n",
+ "YACCFILES   ?= y.tab ;\n",
+ "YACCFLAGS   ?= -d ;\n",
+@@ -695,10 +695,10 @@ const char *jambase[] = {
+ "SUFLIB      ?= .a ;\n",
+ "SUFOBJ      ?= .o ;\n",
+ "UNDEFFLAG   ?= \"-u _\" ;\n",
+-"YACC        ?= ;\n",
+-"YACCGEN     ?= ;\n",
+-"YACCFILES   ?= ;\n",
+-"YACCFLAGS   ?= ;\n",
++"YACC        ?= bison -y ;\n",
++"YACCGEN     ?= .c ;\n",
++"YACCFILES   ?= y.tab ;\n",
++"YACCFLAGS   ?= -d ;\n",
+ "\n",
+ "HDRPATTERN =\n",
+ "\"^[ 	]*#[ 	]*include[ 	]*[<\\\"]([^\\\">]*)[\\\">].*$\" ;\n",
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2.ebuild
index 0ab7048719c4..1f15fa76aebf 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ftjam-2.5.3_rc2.ebuild,v 1.12 2008/03/17 00:28:28 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ftjam-2.5.3_rc2.ebuild,v 1.13 2008/08/03 08:35:40 dirtyepic Exp $
 
 inherit eutils versionator
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/ftjam-2.5.3-nostrip.patch
+	epatch "${FILESDIR}"/ftjam-2.5.3-i-hate-yacc.patch
 }
 
 src_install() {