Version bump. This will hopefully also fix bug #286634.

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

4 files changed, 227 insertions, 3 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 003f0b0db6cb..9e29865230ab 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gdl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.13 2009/10/04 14:42:21 ssuominen Exp $
+# 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 $
+
+*gdl-0.9_rc3 (12 Jan 2010)
+
+  12 Jan 2010; Markus Dittrich <markusle@gentoo.org> +gdl-0.9_rc3.ebuild,
+  +files/gdl-0.9_rc3-proj4.patch:
+  Version bump. This will hopefully also fix bug #286634.
 
   04 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> gdl-0.9_rc2.ebuild:
   Replace -Wl,--no-as-needed with function from flag-o-matic eclass.
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 3553069fecfa..c061ffb67015 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -3,9 +3,12 @@ AUX gdl-0.9_rc1-magick.patch 1008 RMD160 3190ee3213e060d493be516151d6eca7745560e
 AUX gdl-0.9_rc1-proj4.patch 1087 RMD160 222d10268dc3d99de76312a1e1ccef3b9f1af015 SHA1 4e4cb8e23421f73a2764bcc3ea259e9a45b0872f SHA256 cd903dd710c37a0f7ce4582625ba0339e6e16e6918dcc55b3b040e68ad3df4cf
 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
 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
 EBUILD gdl-0.9_rc2.ebuild 2572 RMD160 bbeecf52a18f58b8bd41fe6439763fbba8e2053a SHA1 65fb5917c65e80e7a5db2400e1a6a38b144fa283 SHA256 6777ca6ccde758c164e5aa646786200765471eca86de8dc5f9f716ddb46c7527
-MISC ChangeLog 2946 RMD160 f4ce0961447339730237b54779cde1b7e78a4a88 SHA1 4d6de043d8b32f2d71f80f7a9ebc69eb634a599a SHA256 d13108f639e3c69d7e263605c4854ec2bc210e7d723097d0a90cc60a1ba49558
+EBUILD gdl-0.9_rc3.ebuild 2531 RMD160 c5a841936c78ee220c139441d72275182d0ff285 SHA1 077e8fe0df9d9301af19da35cdad3a0bed64f6c7 SHA256 3ab77be6e7478a29d6a4c493ce8ae239bd5fe8ed9ce26138c13bb9cd860209fc
+MISC ChangeLog 3140 RMD160 1a3c21625627478d6d4e21365af64d9616482988 SHA1 7a86e4aed5453827b5ae79b3d5b898991563a3e2 SHA256 af89e4af6017ef84a15ddb246071723b26634f47b28205042b2b9671b502b0bb
 MISC metadata.xml 626 RMD160 88f7a1519569b5dca8e3f1b8817c5d34a82e56f3 SHA1 9751e41c6656a74f9f0776f8f93edbef0f147392 SHA256 68cd2fff8c6ff4c79d58d36ea648bf133b90df9b579bb8f968ed3edce7a57bc4
diff --git a/dev-lang/gdl/files/gdl-0.9_rc3-proj4.patch b/dev-lang/gdl/files/gdl-0.9_rc3-proj4.patch
new file mode 100644
index 000000000000..67ab61126620
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_rc3-proj4.patch
@@ -0,0 +1,118 @@
+diff -Naur gdl-0.9rc3/configure.in gdl-0.9rc3.new/configure.in
+--- gdl-0.9rc3/configure.in	2009-09-11 12:04:15.000000000 -0400
++++ gdl-0.9rc3.new/configure.in	2010-01-11 22:40:55.000000000 -0500
+@@ -534,20 +534,20 @@
+ 
+ if test "x$with_libproj4" != "xno"; then
+   if test "x$with_libproj4" != "xyes"; then
+-    LIBS="$LIBS -L$with_libproj4/lib -lproj4"
++    LIBS="$LIBS -L$with_libproj4/lib -lproj"
+     INCLUDES="$INCLUDES -I$with_libproj4/include"
+   else
+     INCLUDES="$INCLUDES -I/usr/include"
+-    LIBS="$LIBS -lproj4"
++    LIBS="$LIBS -lproj"
+   fi
+ 
+-  AC_CHECK_LIB(proj4, proj_init, [AC_DEFINE([USE_LIBPROJ4], [1], 
++  AC_CHECK_LIB(proj, proj_init, [AC_DEFINE([USE_LIBPROJ4], [1], 
+   [Define if you want to use LIBPROJ4])], [])
+ 
+-  AC_CHECK_LIB(proj4, proj_init, [AC_DEFINE([USE_LIBPROJ4_NEW], [1], 
++  AC_CHECK_LIB(proj, proj_init, [AC_DEFINE([USE_LIBPROJ4_NEW], [1], 
+   [Define if you want to use new LIBPROJ4])], [
+ 
+-     AC_CHECK_LIB(proj4, pj_init, [AC_DEFINE([USE_LIBPROJ4], [1], 
++     AC_CHECK_LIB(proj, pj_init, [AC_DEFINE([USE_LIBPROJ4], [1], 
+      [Define if you want to use LIBPROJ4])], [
+        echo ""
+        echo "Error! LIBPROJ4 is required but was not found"
+diff -Naur gdl-0.9rc3/src/math_utl.hpp gdl-0.9rc3.new/src/math_utl.hpp
+--- gdl-0.9rc3/src/math_utl.hpp	2009-09-11 12:04:10.000000000 -0400
++++ gdl-0.9rc3.new/src/math_utl.hpp	2010-01-11 22:37:48.000000000 -0500
+@@ -58,7 +58,7 @@
+ #endif
+ 
+ extern "C" {
+-#include "lib_proj.h"
++#include <projects.h>
+ }
+ 
+   PROJTYPE *map_init();
+diff -Naur gdl-0.9rc3/src/math_utl.hpp.orig gdl-0.9rc3.new/src/math_utl.hpp.orig
+--- gdl-0.9rc3/src/math_utl.hpp.orig	1969-12-31 19:00:00.000000000 -0500
++++ gdl-0.9rc3.new/src/math_utl.hpp.orig	2009-09-11 12:04:10.000000000 -0400
+@@ -0,0 +1,73 @@
++/***************************************************************************
++                        math_utl.hpp  -  math utilities GDL library function
++                             -------------------
++    begin                : Feb 11 2004
++    copyright            : (C) 2004 by Joel Gales
++    email                : jomoga@users.sourceforge.net
++ ***************************************************************************/
++
++/***************************************************************************
++ *                                                                         *
++ *   This program is free software; you can redistribute it and/or modify  *
++ *   it under the terms of the GNU General Public License as published by  *
++ *   the Free Software Foundation; either version 2 of the License, or     *
++ *   (at your option) any later version.                                   *
++ *                                                                         *
++ ***************************************************************************/
++
++#ifndef MATH_UTL_HPP_
++#define MATH_UTL_HPP_
++
++#include "basegdl.hpp"
++
++//#define ABS(xxx) (( xxx > -xxx)?(xxx):(-xxx))
++
++template< typename T>
++inline T abs( T a) { return (a>=T(0))?a:-a;}
++
++namespace lib {
++
++//   int trans513(char *, int, int, int, DType);
++//   int transpose(char *, SizeT, SizeT [], SizeT, DType);
++//   int transpose_perm(char *, SizeT, SizeT [], SizeT, DType, long []);
++
++  void machar_s ( long int *ibeta, long int *it, long int *irnd, long int *ngrd,
++		  long int *machep, long int *negep, long int *iexp, long int *minexp,
++		  long int *maxexp, float *eps, float *epsneg, float *xmin, float *xmax );
++  void machar_d ( long int *ibeta, long int *it, long int *irnd, long int *ngrd,
++		  long int *machep, long int *negep, long int *iexp, long int *minexp,
++		  long int *maxexp, double *eps, double *epsneg, double *xmin, double *xmax );
++
++#ifdef USE_LIBPROJ4
++#define COMPLEX COMPLEX2
++
++#ifdef USE_LIBPROJ4_NEW
++#define PROJTYPE PROJ
++#define LPTYPE PROJ_LP
++#define XYTYPE PROJ_XY
++#define PJ_INIT proj_init
++#define PJ_FWD proj_fwd
++#define PJ_INV proj_inv
++#else
++#define PROJTYPE PJ
++#define LPTYPE LP
++#define XYTYPE XY
++#define PJ_INIT pj_init
++#define PJ_FWD pj_fwd
++#define PJ_INV pj_inv
++#endif
++
++extern "C" {
++#include "lib_proj.h"
++}
++
++  PROJTYPE *map_init();
++  static PROJTYPE *ref;
++  static PROJTYPE *prev_ref;
++
++#define COMPLEX2 COMPLEX
++#endif
++
++} // namespace
++
++#endif
diff --git a/dev-lang/gdl/gdl-0.9_rc3.ebuild b/dev-lang/gdl/gdl-0.9_rc3.ebuild
new file mode 100644
index 000000000000..6772458753db
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9_rc3.ebuild
@@ -0,0 +1,97 @@
+# 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_rc3.ebuild,v 1.1 2010/01/12 03:52:29 markusle Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic autotools
+
+MYP=${P/_/}
+DESCRIPTION="An Interactive Data Language compatible incremental compiler"
+LICENSE="GPL-2"
+HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnudatalanguage/${MYP}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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 )
+	hdf5? ( sci-libs/hdf5 )
+	netcdf? ( sci-libs/netcdf )
+	python? ( dev-python/numarray dev-python/matplotlib )
+	fftw? ( >=sci-libs/fftw-3 )
+	proj? ( sci-libs/proj )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-proj4.patch
+	epatch "${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch
+	epatch "${FILESDIR}"/${PN}-0.9_rc2-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"
+
+	eautoreconf
+}
+
+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
+
+	# sorry, but even configure barfs with --as-needed
+	# when linking against imagemagick - have yet to
+	# figure out what the problem is
+	use imagemagick && append-ldflags $(no-as-needed)
+
+	# 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) \
+	  $(use_with fftw) \
+	  $(use_with hdf) \
+	  $(use_with hdf5) \
+	  $(use_with netcdf) \
+	  $(use_with imagemagick Magick) \
+	  $(use_with proj libproj4) \
+	  ${myconf} \
+	  || die "econf failed"
+
+}
+
+src_test() {
+	cd "${S}"/testsuite
+	PATH="${S}"/src gdl <<-EOF
+		test_suite
+	EOF
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	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 "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 || die "doenvd failed"
+}