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

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 32 insertions, 15 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/Manifest b/dev-lang/gdl/Manifest
index c644fb758b2c..a48d8a2678a2 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA1
 
 AUX 0.9.2-antlr.patch 2795 RMD160 4ccee6f6f3cc2ca585efe26308c3470882dc2abe SHA1 52aedb42f910b8e6b85208c99954640eddcf8b5c SHA256 9649cb996e771b7259cb81af75e3e1f555a003c3da0e2a21f4c7171e399703b9
-AUX 0.9.2-include.patch 300 RMD160 51f78d4f28104889f0377d37f45ee1b84fbcfccd SHA1 f7b2db56b4f407b7e13ac287fca3fe31a54d8ebf SHA256 d82f1b8c16037b16e38a2ba2688fa16b6a5d6a3fc62abe387c49d2d96f167c39
+AUX 0.9.2-include.patch 314 RMD160 30e9f05fe72d271fe210c8c9a8e9d5fa7e8f3173 SHA1 e91dd6ffc29deaae597f2e017743d5e13a7cf92c SHA256 6f9c9aaac6f9ee526c1cdd5eb107bfa28eecefa9f4a7f947e5f80cf6bb7591c7
 AUX 0.9.2-numpy.patch 557 RMD160 1906110caec6913f5fb691708ead513715927ff2 SHA1 529a142f40bc27e24a187e74b95affd03e8f2033 SHA256 a7c2f55cb652a711375c5b427112bc2fb5c6383e6350f5c05b3664827c545789
 AUX 0.9.2-proj4.patch 1185 RMD160 920acf7a98a53415a16701c2326c380b176dc7e9 SHA1 759c3c2745fa7ddcbba6cfd3bbdb0d5c0fe3d0bf SHA256 4c6b4d97823ddeebae4c3170dc80c14bb68681117de599077ce6a845fb2ae26f
 AUX 0.9.2-semaphore.patch 770 RMD160 3cf525ab4c3b15234ba74e3bb4e1268c758e522c SHA1 57d7c5b8bdc6de899e4227ef0caed33499ab541b SHA256 cbdfe65ddd23a62f04b2beee46f9f6e80bd12ff55a3563ea7059a7e2c083aac4
 AUX 0.9.2-tests.patch 8616 RMD160 7236c7eb811ccdced8beb0a47fae98e3577f4162 SHA1 8a41adb02bda342dacba11db5ffda6af7853dd92 SHA256 4cf7fa89353265361bdbcf38fbeb3bacb572f2b8920ca00a73ce1d66a57c5a9e
 DIST gdl-0.9.2.tar.gz 2436946 RMD160 6913b358de01550256ad38c920cc461e8ef94512 SHA1 0d6fe86e2971637310c6298379616b02f773e956 SHA256 59907d941877327e9653a9cda5d801ea0b45f67af4c7da22acfcdd7cad291acf
-EBUILD gdl-0.9.2-r1.ebuild 3647 RMD160 8bcf355080ea585b0bb12691f733d9b6ff6dc8fc SHA1 14734c12d68378c95897a4696f28639712e19bbd SHA256 7735f042f12e796e47f5dfd22aad42fa70e6f32661303d6c4c9e2a251c4d1ff0
-MISC ChangeLog 7374 RMD160 d7938a11663483bf827446ba11b5bfa2063101ca SHA1 a859f934276442b4e35410f7904a0588fcc8b76d SHA256 25c8a3b474ff8beb01768e73bbc6b1f69c3b8d02c29b64d86e67ce63a794c5fb
+EBUILD gdl-0.9.2-r2.ebuild 3897 RMD160 95efb431dcf4dbac8164ce8b13877a22a314d12c SHA1 f646ce6d127ee7501aa5b354cd9ec6921a8f5deb SHA256 cd1c312ef8d7d77361c7f03b4cacf311ef67b508045a8bc160e19fd4a9d59090
+MISC ChangeLog 7637 RMD160 083f8580e19878aa68b65fe7378652f8043f00d0 SHA1 c929e019d55c59e2c6362a53c4fc3476c1aedd26 SHA256 8cc5d94c957079f6d55da9cd129c1c24a44a19e0844650ff5fd29e3c635696b9
 MISC metadata.xml 868 RMD160 4a58201003c53d616ba172db44871d2b5167cfdd SHA1 891fbcd8fa32d24f994315df9a4b9b1251b48821 SHA256 8fe2970b31ca708b5948308b6de3ddb28c097df8f4a542bf051857ca724897d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk/iWL8ACgkQ1ycZbhPLE2A6rwCgp5gOcZSw+2/E4/Xe/NLXQC1B
-W0wAn2XPo5oTDvDVJoWAA8e5hMNTvbma
-=oADo
+iEYEARECAAYFAk/jaMoACgkQ1ycZbhPLE2BgWwCfTkDT62R/B5I2QToAwG6AsTqQ
+kvYAoK0Jhqa79sxNm0g/F+0lsLN0yPfJ
+=KF9g
 -----END PGP SIGNATURE-----
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:' \