Dont patch parse-gram.y since we patch parse-gram.c already as pointed out by Ryan Hill #246572 by Alexandre Rostovtsev.

(Portage version: 2.2_rc14/cvs/Linux 2.6.27.4 x86_64)

3 files changed, 10 insertions, 34 deletions

diff --git a/sys-devel/bison/ChangeLog b/sys-devel/bison/ChangeLog
index c0719f5049f7..e28567f97251 100644
--- a/sys-devel/bison/ChangeLog
+++ b/sys-devel/bison/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/bison
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.75 2008/11/14 07:54:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.76 2008/11/14 08:50:29 vapier Exp $
+
+  14 Nov 2008; Mike Frysinger <vapier@gentoo.org>
+  files/bison-2.4-compat.patch, bison-2.4-r1.ebuild:
+  Dont patch parse-gram.y since we patch parse-gram.c already as pointed out
+  by Ryan Hill #246572 by Alexandre Rostovtsev.
 
   14 Nov 2008; Mike Frysinger <vapier@gentoo.org>
   -files/bison-2.4.0-compat.patch, +files/bison-2.4-compat.patch,
diff --git a/sys-devel/bison/bison-2.4-r1.ebuild b/sys-devel/bison/bison-2.4-r1.ebuild
index 1baab60c5052..1dffd366e34a 100644
--- a/sys-devel/bison/bison-2.4-r1.ebuild
+++ b/sys-devel/bison/bison-2.4-r1.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/sys-devel/bison/bison-2.4-r1.ebuild,v 1.2 2008/11/14 07:54:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.4-r1.ebuild,v 1.3 2008/11/14 08:50:29 vapier Exp $
 
 inherit toolchain-funcs flag-o-matic
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="nls static"
 
-DEPEND="nls? ( sys-devel/gettext )"
-
+# need flex since we patch scan-code.l in ${P}-compat.patch
+DEPEND="nls? ( sys-devel/gettext )
+	sys-devel/flex"
 RDEPEND="sys-devel/m4"
 
 src_unpack() {
diff --git a/sys-devel/bison/files/bison-2.4-compat.patch b/sys-devel/bison/files/bison-2.4-compat.patch
index 4a834f5b9a83..adcd0b0422a1 100644
--- a/sys-devel/bison/files/bison-2.4-compat.patch
+++ b/sys-devel/bison/files/bison-2.4-compat.patch
@@ -109,36 +109,6 @@ index 76d25ef..ecb1cae 100644
  
    case 31:
  
-diff --git a/src/parse-gram.y b/src/parse-gram.y
-index a1740e7..cae4fb7 100644
---- a/src/parse-gram.y
-+++ b/src/parse-gram.y
-@@ -252,11 +252,11 @@
-       code_props_translate_code (&action);
-       gram_scanner_last_string_free ();
-       muscle_code_grow ("initial_action", action.code, @2);
-       code_scanner_last_string_free ();
-     }
--| "%language" STRING		{ language_argmatch ($2, 1, &@1); }
-+| "%language" STRING		{ language_argmatch ($2, grammar_prio, &@1); }
- | "%lex-param" "{...}"		{ add_param ("lex_param", $2, @2); }
- | "%locations"                  { locations_flag = true; }
- | "%name-prefix" STRING         { spec_name_prefix = $2; }
- | "%name-prefix" "=" STRING     { spec_name_prefix = $3; } /* deprecated */
- | "%no-lines"                   { no_lines_flag = true; }
-@@ -298,11 +298,11 @@
-             }
-           strcpy (skeleton_build + dir_length, skeleton_user);
-           skeleton_user = uniqstr_new (skeleton_build);
-           free (skeleton_build);
-         }
--      skeleton_arg (skeleton_user, 1, &@1);
-+      skeleton_arg (skeleton_user, grammar_prio, &@1);
-     }
- | "%token-table"                { token_table_flag = true; }
- | "%verbose"                    { report_flag |= report_states; }
- | "%yacc"                       { yacc_flag = true; }
- | /*FIXME: Err?  What is this horror doing here? */ ";"
 
 From 58bd33b7fc5d13fbd4b61404e1e878ab3b3c16da Mon Sep 17 00:00:00 2001
 From: Joel E. Denny <jdenny@ces.clemson.edu>