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.
(Portage version: 2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64)

3 files changed, 63 insertions, 2 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/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() {