Version bump, replaced numarray by numpy support

(Portage version: 2.1.9.25/cvs/Linux x86_64)

6 files changed, 374 insertions, 111 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/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>