Fixed bug #151566 thanks to Aurélien Francillon, and cleaned up dependencies a bit.

(Portage version: 2.1.2.2)

3 files changed, 39 insertions, 15 deletions

diff --git a/dev-embedded/gezel/ChangeLog b/dev-embedded/gezel/ChangeLog
index 6ed5387c924e..657dc6d3aae7 100644
--- a/dev-embedded/gezel/ChangeLog
+++ b/dev-embedded/gezel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/gezel
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gezel/ChangeLog,v 1.4 2007/02/09 07:19:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gezel/ChangeLog,v 1.5 2007/03/25 16:53:13 calchan Exp $
+
+  25 Mar 2007; Denis Dupeyron <calchan@gentoo.org> gezel-1.6b.ebuild,
+  gezel-1.7.ebuild:
+  Fixed bug #151566 thanks to Aurélien Francillon, and cleaned up
+  dependencies a bit.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-embedded/gezel/gezel-1.6b.ebuild b/dev-embedded/gezel/gezel-1.6b.ebuild
index 284d62b32528..0ced80010291 100644
--- a/dev-embedded/gezel/gezel-1.6b.ebuild
+++ b/dev-embedded/gezel/gezel-1.6b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gezel/gezel-1.6b.ebuild,v 1.1 2005/02/23 11:11:24 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gezel/gezel-1.6b.ebuild,v 1.2 2007/03/25 16:53:13 calchan Exp $
 
 inherit eutils
 
@@ -13,11 +13,20 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-RDEPEND="dev-libs/gmp
-	virtual/libc"
-DEPEND="sys-apps/gawk
-	sys-devel/bison
-	${RDEPEND}"
+RDEPEND="dev-libs/gmp"
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix for bug #151566
+	sed -i -e '/^%option c++/ i\
+%option noyywrap' ${S}/gezel/fdl.ll
+	sed -i -e '/^istream & operator >> (istream &is, gval &v);/ i\
+gval * make_gval(unsigned _wordlength, unsigned _sign);\
+gval * make_gval(char *);\
+gval * make_gval(unsigned _wordlength, unsigned _sign, char *valuestr);\
+' ${S}/gezel/gval.h
+}
 
 src_compile() {
 	econf --enable-gezel51 || die 'configure failed'
diff --git a/dev-embedded/gezel/gezel-1.7.ebuild b/dev-embedded/gezel/gezel-1.7.ebuild
index cf4152b0b5d1..5661153874db 100644
--- a/dev-embedded/gezel/gezel-1.7.ebuild
+++ b/dev-embedded/gezel/gezel-1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gezel/gezel-1.7.ebuild,v 1.2 2005/06/26 09:21:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gezel/gezel-1.7.ebuild,v 1.3 2007/03/25 16:53:13 calchan Exp $
 
 DESCRIPTION="GEZEL is a language and open environment for exploration, simulation and implementation of domain-specific micro-architectures."
 HOMEPAGE="http://www.ee.ucla.edu/~schaum/gezel/"
@@ -11,17 +11,27 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 IUSE="java"
 
-RDEPEND="dev-libs/gmp
-	virtual/libc"
+RDEPEND="dev-libs/gmp"
 
 #	systemc not tested - couldn't be bothered understanding their license.
 #	systemc? ( sci-electronics/systemc )"
 
-DEPEND="sys-apps/gawk
-	sys-devel/bison
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	java? ( virtual/jdk dev-java/java-config )"
 
+src_unpack() {
+	unpack ${A}
+
+	# Fix for bug #151566
+	sed -i -e '/^%option c++/ i\
+%option noyywrap' ${S}/gezel/fdl.ll
+	sed -i -e '/^istream & operator >> (istream &is, gval &v);/ i\
+gval * make_gval(unsigned _wordlength, unsigned _sign);\
+gval * make_gval(char *);\
+gval * make_gval(unsigned _wordlength, unsigned _sign, char *valuestr);\
+' ${S}/gezel/gval.h
+}
+
 src_compile() {
 	econf  --enable-gezel51 $(use_enable java)|| die 'configure failed'