Version bump. Now really unbundle antlr

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

5 files changed, 159 insertions, 9 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index e5ed9e527eab..4ba6b25b30d0 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.23 2011/01/04 05:04:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.24 2011/04/08 21:37:21 bicatali Exp $
+
+*gdl-0.9.1 (08 Apr 2011)
+
+  08 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org> gdl-0.9-r1.ebuild,
+  +gdl-0.9.1.ebuild, +files/gdl-0.9.1-antlr.patch:
+  Version bump. Now really unbundle antlr
 
 *gdl-0.9-r1 (04 Jan 2011)
 
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 8ad2cf9d896c..b9e31ecd497b 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -3,17 +3,20 @@ Hash: SHA1
 
 AUX gdl-0.9-configure.patch 1678 RMD160 d766294518e0ff3b5f59743d28315efec1002637 SHA1 a5e1f020bc9a45b6c5c3e955bb4460b4b8d0531a SHA256 6c41bafe4a04cd3405b7998bafd8ddc93edaac50ae3260a295c1a7d1c2a80e68
 AUX gdl-0.9-numpy.patch 7734 RMD160 d77c4793e7e43ce38db234f84079b893b1281707 SHA1 aac5d20d82f26281658de9f997555e1bc3e0d81c SHA256 feb1653341a0e04350197a449ef2ae779ca4aea3e0aa302f0b41f8c7650e853e
+AUX gdl-0.9.1-antlr.patch 1510 RMD160 848f5e81c75e7fae84b4db52119bdae006d9d5c2 SHA1 a63ae60e868fbf175adf21f217ce87d081a58d9c SHA256 e236b512cbf512061150e2740f7d433302a9ec7e1e153ab864de3ba8c0cff85a
 AUX gdl-0.9_rc2-gcc4.4.patch 372 RMD160 e1f5eed5e509981f5f408b0091eee25fac2ec913 SHA1 44fbcbb7c60ed9efd3145b983a7d8549a1b3a4be SHA256 57a1bab2e97953a7181c9da325c5d9fa17755568d2c4df1febbcc64035a11ac6
 AUX gdl-0.9_rc4-gcc4.3.patch 377 RMD160 b32e74d24fde6c37292b5a70450ad892a8ebbe46 SHA1 223bfc83e74f3ef788fd8e0c78f3cc82019834b4 SHA256 81d769b09bead8a103b85ff17083d3a8aac1b68b06db8d7cf2d2330787dd5f1c
 AUX gdl-0.9_rc4-gcc4.5.patch 756 RMD160 e9129082b199bf69e0ac06fbad268e4ffa02bb35 SHA1 98c2cfcf10d5bd38d4869ef13e78b2a484507b4f SHA256 4cf2cec2310285e76b563684f282f2cd6358e8942395170b051b64217ef3ff6b
+DIST gdl-0.9.1.tar.gz 1528008 RMD160 9ce6dce6f32d0fbf3140b26699c8eca436907b00 SHA1 97c71a70672ae82f052ffa5906fc2415f4cf7b9d SHA256 873e235a4ec7c16ecec05b42f3e3e2cc9fedbd6ccb9e13d167336fdaec3ca197
 DIST gdl-0.9.tar.gz 1454786 RMD160 5d25e1b899a072fcd23aadd7fd1b701a26c4ba0f SHA1 93a71bad8ad0c16a6e79edaae0489c372f442bcf SHA256 def5bc2887d506d3f7b14c47bb6ccbd59532e535ab333b38456955b00a3f5da6
-EBUILD gdl-0.9-r1.ebuild 2501 RMD160 f8643c56b8ce2f40b3dd9ef3817de1d67358f040 SHA1 e0d9ede26c88b2acaff4e0378d0087cd83a42876 SHA256 d47fdc1de071625ee8eca95fe33e9c4197a1e4fb5f67300584edf255f31b4079
-MISC ChangeLog 5351 RMD160 6b148c03dcc8fb621f16147fe88ae510d0ec3bae SHA1 3004a11506b459142f44acf28e4d36c5674fda3d SHA256 6a3cce19f3b618eefbada09aad3ce4feaf127538e43f6c328ff892131cd958c8
+EBUILD gdl-0.9-r1.ebuild 2503 RMD160 cb7add51e3707ebabf85cb3a1ce9585076646725 SHA1 c92a268f3c3c410e7caf5bdfa8450bb2f2afebcf SHA256 5353b595d683e821c4984d024b8a314c4216a1ccaf5206a1ddc1da0a9940c16b
+EBUILD gdl-0.9.1.ebuild 2475 RMD160 991c89d3b977ed148dce48355ed2bb4d36b6d57c SHA1 ff3415811e5fc0d7abcfa0b7d7be1bc5e0a298f9 SHA256 ef2b442248868003ce9a4b7cabf3ab2d0b03420a9acd5e3ebf7ee88d6ced59c4
+MISC ChangeLog 5545 RMD160 c477d064bf7ef9f5306fdf2b8aef785762fe5970 SHA1 f81cdb843f66404b846ba3c137f823730fe87380 SHA256 6d22b0629dd62203c5bb2642b9b924d847e8714de05fd1da1d029b3845f69aac
 MISC metadata.xml 712 RMD160 60ac7c45aeb084c6a4a9bb12ffe74d5337ce4d80 SHA1 71d0a54d4967de3f21ca235592a6f027e2c84e50 SHA256 cc726f9cdf42b1f5cc6446aa48247c614f1e41755f4d50b98cb4960f89e24f2b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0iqlkACgkQ1ycZbhPLE2B1CQCeJonPLzHrDbZu0Xkmn0CistJg
-towAn1pGcmWwx/O514buOUxjEIW+zmyh
-=iU4l
+iEYEARECAAYFAk2fgBoACgkQ1ycZbhPLE2CGVACeIjeqE6EoOBz297JaHuRc+ksv
+hlcAn1Z6CSm21nGIAreFfpnZ23tGXprI
+=Y/KL
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/files/gdl-0.9.1-antlr.patch b/dev-lang/gdl/files/gdl-0.9.1-antlr.patch
new file mode 100644
index 000000000000..24e69e51dc77
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9.1-antlr.patch
@@ -0,0 +1,38 @@
+--- gnudatalanguage-0.9.1.orig/src/Makefile.am
++++ gnudatalanguage-0.9.1/src/Makefile.am
+@@ -1,6 +1,6 @@
+ # set the include path found by configure
+ INCLUDES = $(EXT_INCLUDES) $(all_includes)
+-SUBDIRS = antlr pro
++SUBDIRS = pro
+ noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
+ 
+ cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
+@@ -57,7 +57,7 @@ gdl_SOURCES = $(cpp_hpp_files) gdl.cpp l
+ gdl_CXXFLAGS = $(AM_CXXFLAGS)
+ # the library search path.
+ gdl_LDFLAGS = $(all_libraries)
+-gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
++gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ endif
+ 
+ # build as library (for python module)
+@@ -73,6 +73,6 @@ else
+ libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
+ endif 
+ 
+-libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
++libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ endif
+ 
+--- gnudatalanguage-0.9.orig/configure.in
++++ gnudatalanguage-0.9/configure.in
+@@ -1074,7 +1074,7 @@ dnl AC_CHECK_FUNCS(strdup strtod strtol
+ dnl perform program name transformation
+ dnl AC_ARG_PROGRAM
+ 
+-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
++AC_CONFIG_FILES(Makefile src/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
+ AC_OUTPUT
+ 
+ dnl == summary table =======================================
diff --git a/dev-lang/gdl/gdl-0.9-r1.ebuild b/dev-lang/gdl/gdl-0.9-r1.ebuild
index 0874d4f87bcf..71bda1b75bb7 100644
--- a/dev-lang/gdl/gdl-0.9-r1.ebuild
+++ b/dev-lang/gdl/gdl-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9-r1.ebuild,v 1.1 2011/01/04 05:04:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9-r1.ebuild,v 1.2 2011/04/08 21:37:21 bicatali Exp $
 
 EAPI=3
 
@@ -36,7 +36,7 @@ RDEPEND="sys-libs/readline
 	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
 
 DEPEND="${RDEPEND}
-	dev-java/antlr"
+	dev-java/antlr:0"
 
 pkg_setup() {
 	use wxwidgets && wxwidgets_pkg_setup
diff --git a/dev-lang/gdl/gdl-0.9.1.ebuild b/dev-lang/gdl/gdl-0.9.1.ebuild
new file mode 100644
index 000000000000..67cc73d7cb9e
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.1.ebuild,v 1.1 2011/04/08 21:37:21 bicatali Exp $
+
+EAPI=3
+
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit autotools eutils wxwidgets python
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+DESCRIPTION="An Interactive Data Language compatible incremental compiler"
+HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fftw grib hdf hdf5 imagemagick netcdf openmp python udunits wxwidgets X"
+
+RDEPEND="sys-libs/readline
+	sys-libs/ncurses
+	sci-libs/gsl
+	sci-libs/plplot
+	fftw? ( >=sci-libs/fftw-3 )
+	grib? ( sci-libs/grib_api )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( sci-libs/hdf5 )
+	imagemagick? ( media-gfx/imagemagick )
+	netcdf? ( sci-libs/netcdf )
+	python? ( dev-python/matplotlib )
+	udunits? ( >=sci-libs/udunits-2 )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
+
+DEPEND="${RDEPEND}
+	>=dev-java/antlr-2.7.7-r2:0[cxx]"
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_pkg_setup
+}
+
+src_prepare() {
+	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch \
+		"${FILESDIR}"/${PN}-0.9_rc4-gcc4.3.patch \
+		"${FILESDIR}"/${PN}-0.9.1-antlr.patch
+
+	rm -rf src/antlr
+	# adjust the *.pro file install path
+	sed -i \
+		-e "s:datasubdir=.*$:datasubdir=\"${PN}\":" \
+		configure.in || die "Failed to fix *.pro install patch."
+	eautoreconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		econf \
+			$(use_with X x) \
+			$(use_with fftw) \
+			$(use_with grib) \
+			$(use_with hdf) \
+			$(use_with hdf5) \
+			$(use_with netcdf) \
+			$(use_with imagemagick Magick) \
+			$(use_with openmp) \
+			$(use_with udunits) \
+			$(use_with wxwidgets wxWidgets) \
+			$@
+	}
+	configuration --disable-python_module
+	use python && \
+		python_execute_function -s configuration --enable-python_module
+}
+
+src_compile() {
+	default
+	use python && python_src_compile
+}
+
+src_test() {
+	cd "${S}"/testsuite
+	echo ".r test_suite" | ../src/gdl
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if use python; then
+		installation() {
+			exeinto $(python_get_sitedir)
+			newexe src/.libs/libgdl.so.0.0.0 GDL.so
+		}
+		python_execute_function -s installation
+		dodoc PYTHON.txt
+	fi
+	dodoc README AUTHORS ChangeLog NEWS TODO HACKING
+}