Re-generate sources with local antlr. Patch for include now uses original grammar antlr source files

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 26 insertions, 9 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 90fa5b8eea77..dea01f60d3d0 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.31 2012/06/20 23:11:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.32 2012/06/21 18:32:34 bicatali Exp $
+
+*gdl-0.9.2-r2 (21 Jun 2012)
+
+  21 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> +gdl-0.9.2-r2.ebuild,
+  -gdl-0.9.2-r1.ebuild, files/0.9.2-include.patch:
+  Re-generate sources with local antlr. Patch for include now uses original
+  grammar antlr source files
 
   20 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
   +files/0.9.2-semaphore.patch, -gdl-0.9.2.ebuild, files/0.9.2-tests.patch,
diff --git a/dev-lang/gdl/files/0.9.2-include.patch b/dev-lang/gdl/files/0.9.2-include.patch
index 0462b0a170ed..49613da16e21 100644
--- a/dev-lang/gdl/files/0.9.2-include.patch
+++ b/dev-lang/gdl/files/0.9.2-include.patch
@@ -1,9 +1,10 @@
---- gdl-0.9.2.orig/src/CFMTLexer.cpp	2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/src/CFMTLexer.cpp	2011-12-24 06:35:24.000000000 +0000
-@@ -1,5 +1,6 @@
- /* $ANTLR 2.7.7 (20091222): "cformat.g" -> "CFMTLexer.cpp"$ */
+--- gdl-0.9.2.orig/src/cformat.g	2010-07-25 17:59:19.000000000 +0100
++++ gdl-0.9.2/src/cformat.g	2012-06-21 16:34:12.000000000 +0100
+@@ -16,6 +16,7 @@
+  ***************************************************************************/
  
+ header "pre_include_cpp" {
 +#include <cstdlib>
  #include "includefirst.hpp"
+ }
  
- #include "CFMTLexer.hpp"
diff --git a/dev-lang/gdl/gdl-0.9.2-r1.ebuild b/dev-lang/gdl/gdl-0.9.2-r2.ebuild
index 27fb9cbb42f7..5a40f10e813b 100644
--- a/dev-lang/gdl/gdl-0.9.2-r1.ebuild
+++ b/dev-lang/gdl/gdl-0.9.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.2-r1.ebuild,v 1.5 2012/06/20 23:11:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.2-r2.ebuild,v 1.1 2012/06/21 18:32:34 bicatali Exp $
 
 EAPI=4
 
@@ -42,7 +42,7 @@ RDEPEND="sci-libs/gsl
 	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
 
 DEPEND="${RDEPEND}
-	>=dev-java/antlr-2.7.7-r5:0[cxx]"
+	>=dev-java/antlr-2.7.7-r5:0[cxx,script]"
 
 pkg_setup() {
 	use wxwidgets && wxwidgets_pkg_setup
@@ -53,9 +53,18 @@ pkg_setup() {
 
 src_prepare() {
 	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
 	epatch "${FILESDIR}"/${PV}-{antlr,numpy,proj4,include,tests,semaphore}.patch
-	# make sure antlr includes are from system
+	# make sure antlr includes are from system and rebuild the sources with it
+	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
+
 	rm -rf src/antlr
+	einfo "Regenerate grammar"
+	pushd src > /dev/null
+	local i
+	for i in *.g; do antlr ${i} || die ; done
+	popd > /dev/null
+
 	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
 	sed -i \
 		-e 's:proj4:proj:' \