Version bump.

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

4 files changed, 72 insertions, 20 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 9e29865230ab..f1368270d86b 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.14 2010/01/12 03:52:29 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.15 2010/02/05 04:22:45 markusle Exp $
+
+*gdl-0.9_rc4 (05 Feb 2010)
+
+  05 Feb 2010; Markus Dittrich <markusle@gentoo.org> -gdl-0.9_rc1.ebuild,
+  +files/gdl-0.9_rc4-antlr.patch, +gdl-0.9_rc4.ebuild:
+  Version bump.
 
 *gdl-0.9_rc3 (12 Jan 2010)
 
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index c061ffb67015..af27f446c10f 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -4,11 +4,12 @@ AUX gdl-0.9_rc1-proj4.patch 1087 RMD160 222d10268dc3d99de76312a1e1ccef3b9f1af015
 AUX gdl-0.9_rc2-antlr.patch 1437 RMD160 3f74655e528d03c72d806e836cb932b047c14d65 SHA1 8c9aa2befb652a47bfe56ae5d620f187e2d506c1 SHA256 1814491c3f2c63ac60ac3a35df90857e3551bbe95e6a627f572fecd213765945
 AUX gdl-0.9_rc2-gcc4.4.patch 372 RMD160 e1f5eed5e509981f5f408b0091eee25fac2ec913 SHA1 44fbcbb7c60ed9efd3145b983a7d8549a1b3a4be SHA256 57a1bab2e97953a7181c9da325c5d9fa17755568d2c4df1febbcc64035a11ac6
 AUX gdl-0.9_rc3-proj4.patch 4261 RMD160 83d80b4010b301a504b0bc5adb926c719faa723c SHA1 375a2ac3f050ceb3461cf39df0c3cf509c3870bd SHA256 2dc32635273ab8d58c84e45839c50acee2d942ba1fffdd5f1ef442c03e836870
-DIST gdl-0.9rc1.tar.gz 1184049 RMD160 cce312116805b667e9aa83bcc09520606934f0da SHA1 a897a3696c635eb7703ff53955924c70c17bcb26 SHA256 60ac94cb7c278919a851c7c4f8aa459b76190c919d7ecfc25d906b316cd2afa4
+AUX gdl-0.9_rc4-antlr.patch 1656 RMD160 d0668acb50fb36a168a1031bad9e9e158f5e8e31 SHA1 3c95f45adcc0e1d2c88064159a5d3b171c29e4f0 SHA256 c8a40bc14302bec331c36204dbdabcf675c4df2f50a8b1430156e7629d5b8f9b
 DIST gdl-0.9rc2.tar.gz 1310414 RMD160 79a92daa6167ed45bedc06668dd86682ee2758cb SHA1 f2c87e0a6cecc9dab1e98232cf154d0c78771aa9 SHA256 0a3f0b5e1e70d3d1fc2356eebe1eead5c61baaf5675931f06898c2a1e621aba3
 DIST gdl-0.9rc3.tar.gz 1899718 RMD160 d5e47420462a200853fc6b33447181e477218368 SHA1 bce9b091b17ede0675f347a3aef1a46c9b0abec9 SHA256 468db2ee2533d665eebcb5dca32aad526b0af788aaa43614be371b7ef11d8daa
-EBUILD gdl-0.9_rc1.ebuild 2129 RMD160 ab7c22d407d20be1a22f8fc189d1c73a9965a7de SHA1 6eb01bb73a8c13accb99a9c23b7ea3126a530818 SHA256 239ff306e311f5563d5ab024ef44fa99e3dc2cb3f4fc9d940a9de12fa1a8ac5a
+DIST gdl-0.9rc4.tar.gz 1486747 RMD160 504f072d4dbf30403a2e9e0ed18223537619f01a SHA1 ffd133b9bc213613c89952f341defb447a87bf1d SHA256 b4b6c64c0d6b208d0a1c577986740308b388ef31b6960cf6c9cc93618b8b97b2
 EBUILD gdl-0.9_rc2.ebuild 2572 RMD160 bbeecf52a18f58b8bd41fe6439763fbba8e2053a SHA1 65fb5917c65e80e7a5db2400e1a6a38b144fa283 SHA256 6777ca6ccde758c164e5aa646786200765471eca86de8dc5f9f716ddb46c7527
 EBUILD gdl-0.9_rc3.ebuild 2531 RMD160 c5a841936c78ee220c139441d72275182d0ff285 SHA1 077e8fe0df9d9301af19da35cdad3a0bed64f6c7 SHA256 3ab77be6e7478a29d6a4c493ce8ae239bd5fe8ed9ce26138c13bb9cd860209fc
-MISC ChangeLog 3140 RMD160 1a3c21625627478d6d4e21365af64d9616482988 SHA1 7a86e4aed5453827b5ae79b3d5b898991563a3e2 SHA256 af89e4af6017ef84a15ddb246071723b26634f47b28205042b2b9671b502b0bb
+EBUILD gdl-0.9_rc4.ebuild 2343 RMD160 b4faa9138aea55ba3ccb08b320213a77968b7c2b SHA1 069eec013073bdf2b467d67b8e7e516a08f9be9d SHA256 6ab359f28a28fb57f614d63ad1a5788c50fcc8796cac912ee1af511042f42e56
+MISC ChangeLog 3314 RMD160 d2d712ac64ac95517f3bdba5fbf5ab4ac122a901 SHA1 5bf303ec095c33306e9299879d311f3a83171dbd SHA256 d793e1906674ba39adb942c3f1a86903595feccff8aa631b6cf25a89ad347c09
 MISC metadata.xml 626 RMD160 88f7a1519569b5dca8e3f1b8817c5d34a82e56f3 SHA1 9751e41c6656a74f9f0776f8f93edbef0f147392 SHA256 68cd2fff8c6ff4c79d58d36ea648bf133b90df9b579bb8f968ed3edce7a57bc4
diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch b/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch
new file mode 100644
index 000000000000..47baaebd8cac
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch
@@ -0,0 +1,40 @@
+diff -Naur gdl-0.9rc4/configure.in gdl-0.9rc4.new/configure.in
+--- gdl-0.9rc4/configure.in	2010-02-02 13:13:51.000000000 -0500
++++ gdl-0.9rc4.new/configure.in	2010-02-04 22:39:56.000000000 -0500
+@@ -989,7 +989,7 @@
+ 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 -Naur gdl-0.9rc4/src/Makefile.am gdl-0.9rc4.new/src/Makefile.am
+--- gdl-0.9rc4/src/Makefile.am	2010-02-02 13:13:51.000000000 -0500
++++ gdl-0.9rc4.new/src/Makefile.am	2010-02-04 22:40:42.000000000 -0500
+@@ -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 \
+@@ -56,7 +56,7 @@
+ 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)
+@@ -72,6 +72,6 @@
+ 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
+ 
diff --git a/dev-lang/gdl/gdl-0.9_rc1.ebuild b/dev-lang/gdl/gdl-0.9_rc4.ebuild
index 9e1cbbf065d2..535a824d4448 100644
--- a/dev-lang/gdl/gdl-0.9_rc1.ebuild
+++ b/dev-lang/gdl/gdl-0.9_rc4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc1.ebuild,v 1.5 2009/08/26 02:46:16 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.1 2010/02/05 04:22:45 markusle Exp $
+
+EAPI="2"
 
 inherit eutils flag-o-matic autotools
 
@@ -16,6 +18,7 @@ IUSE="python fftw hdf hdf5 netcdf imagemagick proj"
 
 RDEPEND=">=sys-libs/readline-4.3
 	sci-libs/gsl
+	=dev-java/antlr-2.7*[cxx]
 	>=sci-libs/plplot-5.3
 	imagemagick? ( media-gfx/imagemagick )
 	hdf? ( sci-libs/hdf )
@@ -30,27 +33,29 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MYP}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-proj4.patch
-	epatch "${FILESDIR}"/${P}-magick.patch
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9_rc3-proj4.patch
+	epatch "${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch
+	epatch "${FILESDIR}"/${P}-antlr.patch
+
+	# we need to blow away the directory with antlr
+	# otherwise the build system picks up bogus
+	# header files
+	rm -fr "${S}"/src/antlr || die "failed to remove antlr directory"
 
-	#if has_version ">=sci-libs/plplot-5.9.0"; then
-		#epatch "${FILESDIR}"/${PN}-0.9_pre6-plplot-5.9.patch
-	#fi
 	eautoreconf
 }
 
-src_compile() {
-
+src_configure() {
 	# need to check for old plplot
 	local myconf
 	if has_version '<sci-libs/plplot-5.9.0'; then
 		myconf="${myconf} --enable-oldplplot"
 	fi
 
+	# make sure we're hdf5-1.6 backward compatible
+	use hdf5 && append-flags -DH5_USE_16_API
+
 	use proj && append-cppflags -DPJ_LIB__
 	econf \
 	  $(use_with python) \
@@ -63,7 +68,6 @@ src_compile() {
 	  ${myconf} \
 	  || die "econf failed"
 
-	emake || die "emake failed"
 }
 
 src_test() {
@@ -78,10 +82,11 @@ src_install() {
 
 	insinto /usr/share/${PN}
 	doins -r src/pro src/py || die "install pro and py files failed"
-	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING || die
+	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING \
+		|| die "Failed to install docs"
 
 	# add GDL provided routines to IDL_PATH
 	echo "GDL_STARTUP=/usr/share/${PN}/pro" > 99gdl
 	echo "GDL_PATH=/usr/share/${PN}" >> 99gdl
-	doenvd 99gdl
+	doenvd 99gdl || die "doenvd failed"
 }