From 12b3f8e8d6763d3072fbcf7ad9dfe2f47e830555 Mon Sep 17 00:00:00 2001
From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Fri, 12 Oct 2012 07:17:34 +0400
Subject: [x11-misc/envytools] Allow to build with recent bison

(Portage version: 2.2.0_alpha136/git/Linux x86_64)
---
 x11-misc/envytools/ChangeLog                   |  4 ++++
 x11-misc/envytools/envytools-9999.ebuild       |  4 ++++
 x11-misc/envytools/files/envytools-bison.patch | 27 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 x11-misc/envytools/files/envytools-bison.patch

(limited to 'x11-misc')

diff --git a/x11-misc/envytools/ChangeLog b/x11-misc/envytools/ChangeLog
index bc3e290c9..1fc4387a0 100644
--- a/x11-misc/envytools/ChangeLog
+++ b/x11-misc/envytools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> +files/envytools-bison.patch,
+  envytools-9999.ebuild:
+  [x11-misc/envytools] Allow to build with recent bison
+
 *envytools-9999 (12 Oct 2012)
 
   12 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> +envytools-9999.ebuild,
diff --git a/x11-misc/envytools/envytools-9999.ebuild b/x11-misc/envytools/envytools-9999.ebuild
index 36f83b08f..aa44d8f81 100644
--- a/x11-misc/envytools/envytools-9999.ebuild
+++ b/x11-misc/envytools/envytools-9999.ebuild
@@ -28,3 +28,7 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( OPCODES README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-bison.patch"
+	)
diff --git a/x11-misc/envytools/files/envytools-bison.patch b/x11-misc/envytools/files/envytools-bison.patch
new file mode 100644
index 000000000..0a9e4f649
--- /dev/null
+++ b/x11-misc/envytools/files/envytools-bison.patch
@@ -0,0 +1,27 @@
+From: Marcin Slusarz <address@hidden>
+Subject: [PATCH] easm: fix build with bison >= 2.6
+
+easm_parse.h started to reference yyscan_t, which is defined in easm_lex.h,
+but we can't include easm_lex.h before easm_parse.h, because easm_lex.h
+uses YYSTYPE which is defined in easm_parse.h.
+To fix this, break the circular dependency by injecting definition of yyscan_t
+before including anything.
+---
+ easm/easm_parse.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/easm/easm_parse.y b/easm/easm_parse.y
+index bfac370..0b6de26 100644
+--- a/easm/easm_parse.y
++++ b/easm/easm_parse.y
+@@ -23,6 +23,7 @@
+  */
+ 
+ %{
++typedef void* yyscan_t;
+ #include "easm.h"
+ #include "yy.h"
+ #include "easm_parse.h"
+-- 
+1.7.12
+
-- 
cgit v1.2.3-65-gdbad