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

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27.4 x86_64

4 files changed, 16 insertions, 40 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/Manifest b/sys-devel/bison/Manifest
index bc25afa65878..db66119c7bc4 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA1
 
 AUX bison-1.32-extfix.patch 1170 RMD160 41daa5ee80712e419a15233af15efbd174ac1adf SHA1 a7cab61f53ca9d9d97b99c8687df1f092e1c1dbc SHA256 a47285e1b6f1ee53b8def53380068ad6a86ccd09e3338481f6d3d14c7e8b31c4
-AUX bison-2.4-compat.patch 7236 RMD160 3c2fcf82739b52a8497c99712b062a7fbb8f839d SHA1 7339dd981e5ba022d4002d0b795e5171deca52ee SHA256 4ce70a1c7a32d439ff90fcdf6139c87f04e1d9d385b16fa65d84b7a4624f53a7
+AUX bison-2.4-compat.patch 5896 RMD160 05f2e2db641baa2b24352e41e07bc116e05499e9 SHA1 98fea4f2a470bd65d0b29001fb35d1632c6156fe SHA256 7228583e34f08e643269161a073aa5e0d3a8157bf8f043ca3ad62542d1cdd425
 DIST bison-1.875d.tar.bz2 882745 RMD160 37ab2ea1df81021c481625794938dcdacc09e4d2 SHA1 cf17c4f2df1344ee93bcc5c336f691db831d1ab5 SHA256 37ff8d673e35838c195d614bc402573d1268c997796e79b831053f4a22e03808
 DIST bison-2.3.tar.bz2 1080319 RMD160 c6a116d6b763fad3f4df6e303943e09ed080cb26 SHA1 7e489f35c6d8171f0cb0cad3dda0fb39f2cb0b62 SHA256 b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb
 DIST bison-2.4.tar.bz2 1472671 RMD160 979d293bdf979c0bd21da631fa21581710734345 SHA1 32c959200e630d3185f24d661c8f12de67b38684 SHA256 0e6f1642fe686ad021c3e7c9ac5f9b2306ef13f3a1a8ebf861d862cd07d83a31
 EBUILD bison-1.875d.ebuild 1782 RMD160 115959d78930a7c4638a16bee4eb48d7e1a92a0a SHA1 3f06d979139405e4506a4380ea6253c7670d55d6 SHA256 d3f879e928e0f19948f1c81b1923f9d9c0e5d88e0fa8832a6cd6942141a12613
 EBUILD bison-2.3.ebuild 1070 RMD160 262d2d880834c4c24d86c7494abeb7ce1d363765 SHA1 3c17f2e23a60f63163bbb42ed018c8efa3c6ed9a SHA256 b761b01f372481b62c509f19f290d0be1993cba741e840b92757aebdcb7bfe36
-EBUILD bison-2.4-r1.ebuild 1343 RMD160 4d519ad4abc5885c535adaced0b8acc41ffee023 SHA1 9f78be3f0c7c3b9b6ad1d7d4f3db3ab3764d43a9 SHA256 804bf82eee1ef29023355cc711a153df5545b95a1e7e9c659ea17e812613a546
-MISC ChangeLog 10164 RMD160 fb6d57bdb9ca4bd9fdfc45b6111aa74262a83901 SHA1 9dac4ab55305281ed71c9a2c0f2aaaae8e55a4b1 SHA256 807eb98caa048ac510282d318560f7844ce9fb26cef665b22f52cfae8ae4594e
+EBUILD bison-2.4-r1.ebuild 1418 RMD160 8860f76bbb96bc7ff32f539e59d9a75d1dbfaa98 SHA1 c801623fb7f32757d3152e86959a364799662d31 SHA256 9a3d9dc946e58521acbe13edd757835e717890c90c778b79b59f6956b7ef8cdb
+MISC ChangeLog 10393 RMD160 512ed132b1d59bd79b0be69bcf7dd8bc405dd386 SHA1 3d907d7d4a947af7c981d7aae47c2acc5dc5e129 SHA256 c9f649c493edfd70489cf6fb9e82ce19ecd0934ce424facd36e8eae4bba727cb
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkdLsIACgkQ67wieSYcaxcklACfUQyQuYstPmjiI/M2AjHG8fxW
-8K0AoOGwC+lV9S8fTdr3lMlUufO9Pt/v
-=ywrN
+iEYEARECAAYFAkkdO9sACgkQ67wieSYcaxcTEQCgv1Zz0OMCZM/Kr85KpX69+nNo
+YJAAoJugXr81+UHKtRceunb/gBGii2Me
+=C1Ez
 -----END PGP SIGNATURE-----
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>