Version bump, replaced numarray by numpy support

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

7 files changed, 383 insertions, 120 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index c110243ca528..bca397a09b97 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2010/08/25 16:21:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.22 2010/12/21 19:52:08 bicatali Exp $
+
+*gdl-0.9 (21 Dec 2010)
+
+  21 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> -gdl-0.9_rc4.ebuild,
+  +gdl-0.9.ebuild, +files/gdl-0.9-configure.patch, +files/gdl-0.9-numpy.patch,
+  metadata.xml:
+  Version bump, replaced numarray by numpy support
 
   25 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> gdl-0.9_rc4.ebuild,
   +files/gdl-0.9_rc4-gcc4.5.patch:
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 983daa6aa6bb..464178f32d1f 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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_rc2-gcc4.4.patch 372 RMD160 e1f5eed5e509981f5f408b0091eee25fac2ec913 SHA1 44fbcbb7c60ed9efd3145b983a7d8549a1b3a4be SHA256 57a1bab2e97953a7181c9da325c5d9fa17755568d2c4df1febbcc64035a11ac6
 AUX gdl-0.9_rc4-antlr.patch 1660 RMD160 29b275369d39e1ce53a8844c7cfeb2a897246220 SHA1 34d42ac6a2af794fac47ffa9578eae99b5f6cd63 SHA256 82f6211f9171438802372d7d1cd2fd141036bcc4abd8364e84a8b036c811f7d0
 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
 AUX gdl-0.9_rc4-wxwidgets.patch 2713 RMD160 66f4367194459e92261a99b9edfb63eccaf3a24a SHA1 9323d77de686f1ec41c891ce97962dc6c56278c3 SHA256 902d80ab95b22d5ba9f334289e2a8709e947815a301d3d3dc10918a138d5a86a
-DIST gdl-0.9rc4.tar.gz 1486747 RMD160 504f072d4dbf30403a2e9e0ed18223537619f01a SHA1 ffd133b9bc213613c89952f341defb447a87bf1d SHA256 b4b6c64c0d6b208d0a1c577986740308b388ef31b6960cf6c9cc93618b8b97b2
-EBUILD gdl-0.9_rc4.ebuild 2788 RMD160 9fd445dea40b9f405fa026ad09dfcb81109409da SHA1 1e65199e4f9c0732ffea4173c6fd49cc9950e315 SHA256 e06a10def940d675d0eaae7843a332f0fe06b796ebef21705b1b1d75e47d207b
-MISC ChangeLog 4792 RMD160 4fca4128e027460d30d45b6e1dba65d5844b7fa2 SHA1 7de65815bda932ea3d991e655e67a1a1b66c1e41 SHA256 d1bd4b59430cef2db38ed785e1749962180f3febd8e6e8cf8392e96dd4201e81
-MISC metadata.xml 632 RMD160 0426399f3337be71e1bb6f3ff54d2e78e1a27cdb SHA1 e9cea925da8e0a89020d35a0fe5ca285bde877f5 SHA256 b575202c0cd320efee3a0f37050f0dd960214c1f971d5b0a917d4c48dc81eb94
+DIST gdl-0.9.tar.gz 1454786 RMD160 5d25e1b899a072fcd23aadd7fd1b701a26c4ba0f SHA1 93a71bad8ad0c16a6e79edaae0489c372f442bcf SHA256 def5bc2887d506d3f7b14c47bb6ccbd59532e535ab333b38456955b00a3f5da6
+EBUILD gdl-0.9.ebuild 2322 RMD160 fc83aed092c5ba0a6d43dfe1d17241879937117a SHA1 4546e225bf2063eff0bb0e28a45fbb48915fd070 SHA256 4d83cd97f74ad3a26de67f28c1f58c5f19aae7123d31826095724911efc9fb17
+MISC ChangeLog 5037 RMD160 aec78717ac28b8f2443b3a9bc35d0c6954cc7ed9 SHA1 6895936366fa3220d6dfe740a633e7220ab05a66 SHA256 3541af6a67bfc6293cec71a11c221dde3202b6989568437329a2e01408c01359
+MISC metadata.xml 712 RMD160 60ac7c45aeb084c6a4a9bb12ffe74d5337ce4d80 SHA1 71d0a54d4967de3f21ca235592a6f027e2c84e50 SHA256 cc726f9cdf42b1f5cc6446aa48247c614f1e41755f4d50b98cb4960f89e24f2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkx1QxwACgkQIiMqcbOVdxTonwP9GMFVnfb1e5Hbdh3dV2GmN6sY
-ubGdiG9I6zWO2sRi/ZPyf0hs+UVkCzS2hpCLI2CYIVgCIKHABYlmpjvJ5axfiUcT
-W/XRw4Qnh6q/uql/rPBHsFb1PeXeHIik8JTJbwluPN/8hCPSNZHuxdoEcfTV1Clx
-Jurg0McOlgCu6o56JOs=
-=Uzsu
+iEYEARECAAYFAk0RBXIACgkQ1ycZbhPLE2CjLgCfc41zZTl3NmHN3NVGWwdK3Axu
+1OkAoJtFalUzrZEZsz4JIKvN+zqJXMhd
+=LNXP
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/files/gdl-0.9-configure.patch b/dev-lang/gdl/files/gdl-0.9-configure.patch
new file mode 100644
index 000000000000..e3b6d221fa6e
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9-configure.patch
@@ -0,0 +1,49 @@
+diff -Nu gdl-0.9.orig/configure.in gdl-0.9/configure.in
+--- gdl-0.9.orig/configure.in	2010-10-05 17:45:00.000000000 +0100
++++ gdl-0.9/configure.in	2010-12-21 18:17:14.000000000 +0000
+@@ -693,7 +693,7 @@
+ 	[with_python="$withval" ])
+ 
+ if test "x$with_python" != "xno"; then
+-
++   AM_PATH_PYTHON
+   dnl  PYTHON_VERSION="2.3"
+   AC_ARG_ENABLE(python_version,	
+  	[  --enable-python_version set explicit python version to use (eg. 2.4)],
+@@ -724,7 +724,6 @@
+ dnl    LIBS="$LIBS -lpython2.3"
+     PYTHON_INCLUDES="/usr/include/python$PYTHON_VERSION"
+   fi
+-  INCLUDES="$INCLUDES -I$PYTHON_INCLUDES"
+ 
+   AC_CHECK_LIB(python$PYTHON_VERSION, Py_Initialize, 
+   [AC_DEFINE([USE_PYTHON],[1],[Define if you want to use python])], 
+@@ -752,17 +751,21 @@
+     exit -1
+   ])
+ 
+-  OLDCXXFLAGS=$CXXFLAGS
+-  CXXFLAGS="$CXXFLAGS -I$PYTHON_INCLUDES"
+-  AC_CHECK_HEADER($PYTHON_INCLUDES/numarray/libnumarray.h, [], [
++  OLDCPPFLAGS=$CPPFLAGS
++  AC_MSG_CHECKING([for Numpy include directory])
++  pinc=`echo "import numpy; print numpy.get_include()" | $PYTHON - 2>/dev/null`
++  AC_MSG_RESULT([${pinc:-unknown}])
++  test -n "$pinc" && PYTHON_INCLUDES="-I$PYTHON_INCLUDES -I$pinc"
++  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
++  AC_CHECK_HEADER([numpy/arrayobject.h], [], [
+     echo ""
+-    echo "Error! Python numarray package was not found"
++    echo "Error! Python numpy package was not found"
+     echo "  Use --with-python=no to disable Python support"
+     exit -1
+   ], [#include <Python.h>])
+-  CXXFLAGS=$OLDCXXFLAGS
+-  unset OLDCXXFLAGS
+-
++  CPPFLAGS=$OLDCPPFLAGS
++  unset OLDCPPFLAGS
++  INCLUDES="$INCLUDES $PYTHON_INCLUDES"
+ fi
+ 
+ dnl == UDUNITS-2 ===========================================
diff --git a/dev-lang/gdl/files/gdl-0.9-numpy.patch b/dev-lang/gdl/files/gdl-0.9-numpy.patch
new file mode 100644
index 000000000000..a8845f83c60b
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9-numpy.patch
@@ -0,0 +1,219 @@
+diff -up gdl-0.9.orig/src/basic_fun.cpp gdl-0.9/src/basic_fun.cpp
+--- gdl-0.9.orig/src/basic_fun.cpp	2010-08-23 15:47:44.771403710 -0600
++++ gdl-0.9/src/basic_fun.cpp	2010-08-23 16:25:25.183341935 -0600
+@@ -6165,6 +6165,7 @@ BaseGDL* transpose( EnvT* e)
+ #endif
+   }
+ 
++#ifndef PYTHON_MODULE
+   // SA: relies on the contents of the lib::command_line_args vector
+   //     defined and filled with data (pointers) in gdl.cpp
+   BaseGDL* command_line_args_fun(EnvT* e)
+@@ -6189,6 +6190,7 @@ BaseGDL* transpose( EnvT* e)
+       return ret;
+     }
+   }
++#endif
+ 
+   // SA: relies in the uname() from libc (must be there if POSIX)
+   BaseGDL* get_login_info( EnvT* e)
+diff -up gdl-0.9.orig/src/datatypes.cpp gdl-0.9/src/datatypes.cpp
+--- gdl-0.9.orig/src/datatypes.cpp	2010-08-23 15:47:44.801403511 -0600
++++ gdl-0.9/src/datatypes.cpp	2010-08-23 15:47:45.211342292 -0600
+@@ -18,11 +18,7 @@
+ #include "includefirst.hpp"
+ 
+ #if defined(USE_PYTHON) || defined(PYTHON_MODULE)
+-#if defined(USE_NUMPY)
+-#include <numpy/libnumarray.h>
+-#else
+-#include <numarray/libnumarray.h>
+-#endif
++#include <numpy/arrayobject.h>
+ #endif
+ 
+ #include <iomanip>
+diff -up gdl-0.9.orig/src/gdlpython.cpp gdl-0.9/src/gdlpython.cpp
+--- gdl-0.9.orig/src/gdlpython.cpp	2010-08-23 15:47:44.937406250 -0600
++++ gdl-0.9/src/gdlpython.cpp	2010-08-23 15:47:45.214343155 -0600
+@@ -43,8 +43,6 @@ void PythonInit()
+   static char* arg0 = "./py/python.exe";
+   static char* argv[] = {arg0};
+   PySys_SetArgv(argc, argv);
+-
+-  import_libnumarray();
+ }
+ 
+ // don't use, as numarray cannot be restarted
+@@ -60,7 +58,7 @@ T* NewFromPyArrayObject( const dimension
+   T* res = new T( dim, BaseGDL::NOZERO);
+   SizeT nEl = res->N_Elements();
+   typename T::Ty* dPtr = 
+-    reinterpret_cast<typename T::Ty*>( NA_OFFSETDATA(array));
++    reinterpret_cast<typename T::Ty*>( PyArray_DATA(array));
+   for( SizeT i=0; i<nEl; ++i) (*res)[i] = dPtr[i];
+   Py_DECREF(array); // must be decremented
+   return res;
+@@ -68,8 +66,7 @@ T* NewFromPyArrayObject( const dimension
+ 
+ BaseGDL* FromPython( PyObject* pyObj)
+ {
+-  int isArray = NA_NumArrayCheck( pyObj);
+-  if( !isArray)
++  if( !PyArray_Check( pyObj))
+     {
+       if( PyString_Check( pyObj))
+ 	{
+@@ -97,11 +94,9 @@ BaseGDL* FromPython( PyObject* pyObj)
+       throw GDLException( "Cannot convert python scalar.") ;
+     }
+ 
+-  PyArrayObject* array = reinterpret_cast< PyArrayObject*>( pyObj); 
+-  NumarrayType item_type = static_cast< NumarrayType>( array->descr->type_num);
+-
+   // make array contiguous
+-  array = NA_InputArray( pyObj, item_type, C_ARRAY);
++  PyArrayObject* array = PyArray_GETCONTIGUOUS( reinterpret_cast< PyArrayObject *>( pyObj));
++
+   if( array == NULL)
+     throw GDLException( "Error getting python array.") ;
+   
+@@ -125,35 +120,26 @@ BaseGDL* FromPython( PyObject* pyObj)
+     }
+   dimension dim( dimArr, nDim);
+ 
+-  switch( item_type) 
++  switch( array->descr->type_num) 
+     {
+-      // case tAny:  //UNDEF***
+-    case tUInt8:   //BYTE
++    case NPY_UINT8:   //BYTE
+       return NewFromPyArrayObject< DByteGDL>( dim, array);
+-    case tInt16:   //INT
++    case NPY_INT16:   //INT
+       return NewFromPyArrayObject< DIntGDL>( dim, array);
+-    case tInt32:     //LONG	
++    case NPY_INT32:     //LONG	
+       return NewFromPyArrayObject< DLongGDL>( dim, array);
+-    case tFloat32:   //FLOAT	
++    case NPY_FLOAT32:   //FLOAT	
+       return NewFromPyArrayObject< DFloatGDL>( dim, array);
+-    case tFloat64:  //DOUBLE	
++    case NPY_FLOAT64:  //DOUBLE	
+       return NewFromPyArrayObject< DDoubleGDL>( dim, array);
+-    case tComplex32:  //COMPLEX	
++    case NPY_COMPLEX64:  //COMPLEX	
+       return NewFromPyArrayObject< DComplexGDL>( dim, array);
+-      // case tAny:  //STRING***	
+-      // case tAny:  //STRUCT***	
+-    case tComplex64: //COMPLEXDBL	
++    case NPY_COMPLEX128: //COMPLEXDBL	
+       return NewFromPyArrayObject< DComplexDblGDL>( dim, array);
+-      // case tAny:  //PTR***		
+-      // case tAny:  //OBJECT***
+-    case tUInt16:         //UINT*
++    case NPY_UINT16:         //UINT*
+       return NewFromPyArrayObject< DUIntGDL>( dim, array);
+-    case tUInt32:         //ULONG*
++    case NPY_UINT32:         //ULONG*
+       return NewFromPyArrayObject< DULongGDL>( dim, array);
+-//     case tLong64:          //LONG64*
+-//       return NewFromPyArrayObject< DLong64GDL>( dim, array);
+-//     case tULong64:         //ULONG64*
+-//       return NewFromPyArrayObject< DULong64GDL>( dim, array);
+     default:
+       Py_DECREF(array); // must be decremented
+       throw GDLException( "FromPython: Unknown array type.") ;
+diff -up gdl-0.9.orig/src/libinit.cpp gdl-0.9/src/libinit.cpp
+--- gdl-0.9.orig/src/libinit.cpp	2010-08-23 15:47:45.008404687 -0600
++++ gdl-0.9/src/libinit.cpp	2010-08-23 16:25:06.318403703 -0600
+@@ -761,8 +761,10 @@ void LibInit()
+   const string ll_arc_distanceKey[] = {"DEGREES", KLISTEND };
+   new DLibFun(lib::ll_arc_distance, string("LL_ARC_DISTANCE"), 3, ll_arc_distanceKey);
+ 
++#ifndef PYTHON_MODULE
+   const string command_line_argsKey[] = {"COUNT", KLISTEND };
+   new DLibFun(lib::command_line_args_fun, string("COMMAND_LINE_ARGS"), 0, command_line_argsKey);
++#endif
+ 
+   const string pmKey[] = {"FORMAT", "TITLE", KLISTEND };
+   new DLibPro(lib::pm, string("PM"), -1, pmKey);
+diff -up gdl-0.9.orig/src/pythongdl.cpp gdl-0.9/src/pythongdl.cpp
+--- gdl-0.9.orig/src/pythongdl.cpp	2010-08-23 15:47:45.105342921 -0600
++++ gdl-0.9/src/pythongdl.cpp	2010-08-23 15:47:45.215342738 -0600
+@@ -537,8 +537,6 @@ extern "C" {
+     Py_INCREF(gdlError);
+     PyModule_AddObject(m, "error", gdlError);
+ 
+-    import_libnumarray(); // obligatory with GDL
+-
+     // GDL event handling
+     oldInputHook = PyOS_InputHook;
+     PyOS_InputHook = GDLEventHandlerPy;
+diff -up gdl-0.9.orig/src/topython.cpp gdl-0.9/src/topython.cpp
+--- gdl-0.9.orig/src/topython.cpp	2010-02-02 11:13:51.000000000 -0700
++++ gdl-0.9/src/topython.cpp	2010-08-23 15:47:45.217342044 -0600
+@@ -58,23 +58,23 @@ using namespace std;
+ // 	char *         wptr;   /* working pointer for getitem/setitem MACROS */
+ // };       
+ 
+-const NumarrayType pyType[] = {
+-  tAny,     //UNDEF***
+-  tUInt8,   //BYTE
+-  tInt16,   //INT
+-  tInt32,   //LONG,	
+-  tFloat32, //FLOAT,	
+-  tFloat64, //DOUBLE,	
+-  tComplex32,  //COMPLEX,	
+-  tAny,        //STRING***	
+-  tAny,        //STRUCT***	
+-  tComplex64,  //COMPLEXDBL,	
+-  tAny,        //PTR***		
+-  tAny,        //OBJECT***
+-  tUInt16,     //UINT*
+-  tUInt32,     //ULONG*
+-  tInt64,      //LONG64*
+-  tUInt64      //ULONG64*
++const int pyType[] = {
++  NPY_NOTYPE,     //UNDEF***
++  NPY_UINT8,   //BYTE
++  NPY_INT16,   //INT
++  NPY_INT32,   //LONG,	
++  NPY_FLOAT32, //FLOAT,	
++  NPY_FLOAT64, //DOUBLE,	
++  NPY_COMPLEX64,  //COMPLEX,	
++  NPY_NOTYPE,        //STRING***	
++  NPY_NOTYPE,        //STRUCT***	
++  NPY_COMPLEX128,  //COMPLEXDBL,	
++  NPY_NOTYPE,        //PTR***		
++  NPY_NOTYPE,        //OBJECT***
++  NPY_UINT32,     //UINT*
++  NPY_UINT32,     //ULONG*
++  NPY_INT64,      //LONG64*
++  NPY_UINT64      //ULONG64*
+ };	
+ 
+ template < typename Sp>
+@@ -87,16 +87,17 @@ PyObject* Data_<Sp>::ToPython()
+       return ToPythonScalar();
+     }
+ 
+-  const NumarrayType item_type = pyType[ Sp::t];
+-  if( item_type == tAny)
++  const int item_type = pyType[ Sp::t];
++  if( item_type == NPY_NOTYPE)
+     throw GDLException("Cannot convert "+this->TypeStr()+" array to python.");
+ 
+   int n_dim = this->Rank();
+-  maybelong dimArr[ MAXRANK];
++  npy_intp dimArr[MAXRANK];
+   for( int i=0; i<n_dim; ++i) dimArr[i]=this->dim[i];
+ 
+-  return reinterpret_cast< PyObject*>
+-    (NA_vNewArray( DataAddr(), item_type, n_dim, dimArr));
++  return 
++//reinterpret_cast< PyObject*>
++    (PyArray_SimpleNewFromData( n_dim, dimArr, item_type, DataAddr()));
+ }
+ 
+ template < typename Sp>
diff --git a/dev-lang/gdl/gdl-0.9.ebuild b/dev-lang/gdl/gdl-0.9.ebuild
new file mode 100644
index 000000000000..2cf4ca46ce1c
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.ebuild
@@ -0,0 +1,87 @@
+# 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.ebuild,v 1.1 2010/12/21 19:52:08 bicatali Exp $
+
+EAPI="2"
+
+WX_GTK_VER="2.8"
+
+inherit autotools eutils wxwidgets
+
+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[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_rc4-antlr.patch \
+		"${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch \
+		"${FILESDIR}"/${PN}-0.9_rc4-gcc4.3.patch \
+		"${FILESDIR}"/${PN}-0.9-numpy.patch \
+		"${FILESDIR}"/${PN}-0.9-configure.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"
+
+	# adjust the *.pro file install path
+	sed -i -e "s:datasubdir=.*$:datasubdir=\"${PN}\":" configure.in \
+		|| die "Failed to fix *.pro install patch."
+
+	sed -i -e "s:ANTLR_LIB:-lantlr:" src/Makefile.am \
+		|| die "Failed to adjust link to libantlr."
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable python python_module) \
+		$(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)
+}
+
+src_test() {
+	cd "${S}"/testsuite
+	echo ".r test_suite" | ../src/gdl
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING
+}
diff --git a/dev-lang/gdl/gdl-0.9_rc4.ebuild b/dev-lang/gdl/gdl-0.9_rc4.ebuild
deleted file mode 100644
index 2bb051e86f13..000000000000
--- a/dev-lang/gdl/gdl-0.9_rc4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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_rc4.ebuild,v 1.7 2010/08/25 16:21:38 xarthisius Exp $
-
-EAPI="2"
-
-WX_GTK_VER="2.8"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MYP=${P/_/}
-DESCRIPTION="An Interactive Data Language compatible incremental compiler"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw hdf hdf5 imagemagick netcdf openmp udunits wxwidgets X"
-
-RDEPEND="
-	>=sys-libs/readline-4.3
-	sci-libs/gsl
-	=dev-java/antlr-2.7*[cxx]
-	>sci-libs/plplot-5.9
-	fftw? ( >=sci-libs/fftw-3 )
-	hdf? ( sci-libs/hdf )
-	hdf5? ( sci-libs/hdf5 )
-	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
-	netcdf? ( sci-libs/netcdf )
-	udunits? ( sci-libs/udunits )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
-#	python? ( dev-python/numarray dev-python/matplotlib )
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/${MYP}"
-
-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}"/${P}-gcc4.3.patch \
-		"${FILESDIR}"/${P}-antlr.patch \
-		"${FILESDIR}"/${P}-wxwidgets.patch \
-		"${FILESDIR}"/${P}-gcc4.5.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"
-
-	# adjust the *.pro file install path
-	sed -i -e "s:datasubdir=.*$:datasubdir=\"${PN}\":" configure.in \
-		|| die "Failed to fix *.pro install patch."
-
-	# set path to libantlr. Note that we need to explicitly link against
-	# libantlr.a since kde-sdk provides libantlr.so which we can not
-	# use (see bug #286630).
-	sed -i -e "s:ANTLR_LIB:/usr/$(get_libdir)/libantlr.a:" src/Makefile.am \
-		|| die "Failed to adjust link to libantlr."
-	eautoreconf
-}
-
-src_configure() {
-	# make sure we're hdf5-1.6 backward compatible
-	use hdf5 && append-flags -DH5_USE_16_API
-
-#Remove Python support until upstream uses numpy instead of numarray
-#	  $(use_with python) \
-	econf \
-		--with-python=no \
-		$(use_with X x) \
-		$(use_with fftw) \
-		$(use_with hdf) \
-		$(use_with hdf5) \
-		$(use_with netcdf) \
-		$(use_with imagemagick Magick) \
-		$(use_with openmp) \
-		$(use_with udunits) \
-		$(use_with wxwidgets wxWidgets) \
-		${myconf}
-}
-
-src_test() {
-	cd "${S}"/testsuite
-	PATH="${S}"/src gdl <<-EOF
-		test_suite
-	EOF
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING \
-		|| die "Failed to install docs"
-}
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index 847679206bc1..45a183f9fe6a 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>markusle@gentoo.org</email>
-		<name>Markus Dittrich</name>
-	</maintainer>
-	<herd>sci</herd>
+<maintainer>
+  <email>markusle@gentoo.org</email>
+  <name>Markus Dittrich</name>
+</maintainer>
+<herd>sci</herd>
 <longdescription lang="en">
-A free IDL (Interactive Data Language) compatible incremental compiler
-(ie. runs IDL programs). IDL is a registered trademark of ITT Visual 
-Information Solutions.
+  A free IDL (Interactive Data Language) compatible incremental compiler
+  (ie. runs IDL programs). IDL is a registered trademark of ITT Visual 
+  Information Solutions.
 </longdescription>
 <use>
-	<flag name='hdf'>Adds support for the Hierarchical Data Format</flag>
-	<flag name='udunits'>Support for manipulating units of physical quantities</flag>
+  <flag name='hdf'>Adds support for the Hierarchical Data Format</flag>
+  <flag name='grib'>Adds support for the meteorological GRIB format</flag>
+  <flag name='udunits'>Support for manipulating units of physical quantities</flag>
 </use>
 </pkgmetadata>