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

Package-Manager: portage-2.1.2.2

4 files changed, 51 insertions, 37 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/Manifest b/dev-embedded/gezel/Manifest
index a722dac3a947..34477e56efa4 100644
--- a/dev-embedded/gezel/Manifest
+++ b/dev-embedded/gezel/Manifest
@@ -1,20 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST gezel-1.6b.tar.gz 728176 RMD160 e520fbaadd5654577dbe8b2fc8604740a5fcf02c SHA1 67f361d5ce90d3b02c705ceb111feed0b3851a3a SHA256 fe6fc426e1be3621f1aaa029dcf05a8872ff59a0089df84b45da02d552f546a7
 DIST gezel-1.7.tar.gz 1347886 RMD160 eecc62ab4f87cc692c5069bdc417176106688084 SHA1 dc98292edaa68b7db6c2fa770e891dacfa39b04e SHA256 f1fe781f30848b373c587bc70ed36c2b3d2ca573d33a73ed837dadd04499b38d
-EBUILD gezel-1.6b.ebuild 1048 RMD160 7ec3739d755b6b62acc99c71e1a60ae53359b779 SHA1 236c39ef924b29e702bd4344726b1233842f40f9 SHA256 00e80b0359b78722d0918c8e29d6068268685a154fd97cfca98a9ebc8523a09b
-MD5 8198f707bece8b3aee577986f4c8d641 gezel-1.6b.ebuild 1048
-RMD160 7ec3739d755b6b62acc99c71e1a60ae53359b779 gezel-1.6b.ebuild 1048
-SHA256 00e80b0359b78722d0918c8e29d6068268685a154fd97cfca98a9ebc8523a09b gezel-1.6b.ebuild 1048
-EBUILD gezel-1.7.ebuild 1302 RMD160 eaa886ca42ab4d171c0c0ddc763874958790b031 SHA1 c65829a85e8655c01fbf8ce39e823b10bbed4c5c SHA256 4d2afa84ff11ec9241a0349949c89dbe50f0194627c359b3819740a58d92d282
-MD5 721c51d0f287efdf82f409a05d2462fc gezel-1.7.ebuild 1302
-RMD160 eaa886ca42ab4d171c0c0ddc763874958790b031 gezel-1.7.ebuild 1302
-SHA256 4d2afa84ff11ec9241a0349949c89dbe50f0194627c359b3819740a58d92d282 gezel-1.7.ebuild 1302
-MISC ChangeLog 826 RMD160 98c6bdf5221930b933cf88e5093c2b85a4548b7e SHA1 f0955a1ea2eec63db871523d4974ec552c0f61b9 SHA256 cfc1eff857ee3dc7c38144f6a915d78b78fa3f2b4afb10ab16e74ee0d1fb8756
-MD5 c1ea8da79146080b357143d6261c68a7 ChangeLog 826
-RMD160 98c6bdf5221930b933cf88e5093c2b85a4548b7e ChangeLog 826
-SHA256 cfc1eff857ee3dc7c38144f6a915d78b78fa3f2b4afb10ab16e74ee0d1fb8756 ChangeLog 826
+EBUILD gezel-1.6b.ebuild 1340 RMD160 33d690b9b139c49ad46c6d8dae6969a3ba76b531 SHA1 4400eb3e8ba529a8f66c8562c6db7b7cbd8802e2 SHA256 36f2ba8087ba3adfd71b16c88f3e94cf0c23069349721c6e4a2475d438719131
+MD5 2e5beba1f1bc8b7d810de6f83eeab989 gezel-1.6b.ebuild 1340
+RMD160 33d690b9b139c49ad46c6d8dae6969a3ba76b531 gezel-1.6b.ebuild 1340
+SHA256 36f2ba8087ba3adfd71b16c88f3e94cf0c23069349721c6e4a2475d438719131 gezel-1.6b.ebuild 1340
+EBUILD gezel-1.7.ebuild 1620 RMD160 3b25b59f500980cbed7944aa8b3bcca08a0627e7 SHA1 c6e71c09dd702a6b8025da9bc3848b3f1ac604c0 SHA256 dc922087ff29d206af8cbe64680e8452e91fc283cef0e1fd4a21c3accf3d399c
+MD5 a1fa738107f8a875273c7b7b0fe5412c gezel-1.7.ebuild 1620
+RMD160 3b25b59f500980cbed7944aa8b3bcca08a0627e7 gezel-1.7.ebuild 1620
+SHA256 dc922087ff29d206af8cbe64680e8452e91fc283cef0e1fd4a21c3accf3d399c gezel-1.7.ebuild 1620
+MISC ChangeLog 1004 RMD160 50191db8823b1c4bb8f4ceb0e40211a5090d780f SHA1 20d6a8b519a51384253bc28d5dd02b21c98b33ec SHA256 6c5b56d0502a194443801d332d3660ef78a3ce6cc9fec427ea1be7e5ea29e1e0
+MD5 adfd36310f7f154ccf4928581e5bdf16 ChangeLog 1004
+RMD160 50191db8823b1c4bb8f4ceb0e40211a5090d780f ChangeLog 1004
+SHA256 6c5b56d0502a194443801d332d3660ef78a3ce6cc9fec427ea1be7e5ea29e1e0 ChangeLog 1004
 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a
 MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 metadata.xml 165
@@ -25,10 +22,3 @@ SHA256 72c6e30294cda310f21850e991bcb4637859516754dff5d3c910d9fd77c41983 files/di
 MD5 74f7035c6b04b999b9f71eb14810cd51 files/digest-gezel-1.7 232
 RMD160 cc287f6ab1d665286d970b7b425c8b5f22d21e03 files/digest-gezel-1.7 232
 SHA256 2d7de35301100aaefbaa7f013bd63e337e5c8f543a06466499ea6336d65744de files/digest-gezel-1.7 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzCCEAiZjviIA2XgRAvt4AKDVyyGDY1z2+wZL0MUDKBPOe/EcPgCgjJwV
-Lyfhn46Ynac0nlQBDDScf8U=
-=WkaF
------END PGP SIGNATURE-----
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'