Version bump

(Portage version: 2.1.2.11)

6 files changed, 142 insertions, 9 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 7fd2b244736b..e76a9ddc5a30 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gdl
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.2 2006/09/29 02:51:07 markusle Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.3 2007/08/21 08:58:21 bicatali Exp $
+
+*gdl-0.9_pre5 (21 Aug 2007)
+
+  21 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gdl-0.9_pre5-proj4.patch, metadata.xml, +gdl-0.9_pre5.ebuild:
+  Version bump.
 
   29 Sep 2006; Markus Dittrich <markusle@gentoo.org>
   +files/gdl-0.8.11-gcc4-gentoo.patch, gdl-0.8.11.ebuild:
diff --git a/dev-lang/gdl/files/digest-gdl-0.9_pre5 b/dev-lang/gdl/files/digest-gdl-0.9_pre5
new file mode 100644
index 000000000000..5931529ff938
--- /dev/null
+++ b/dev-lang/gdl/files/digest-gdl-0.9_pre5
@@ -0,0 +1,3 @@
+MD5 d2a740ba633ff7ace23f452d34a9c42c gdl-0.9pre5.tar.gz 1131751
+RMD160 458bf014c909e43bfe6bdf5f5c834bcbbd48dd52 gdl-0.9pre5.tar.gz 1131751
+SHA256 81121a4e7e217dc986b4827ce690a8650f264dd648108ffde8f1eb77633d41cb gdl-0.9pre5.tar.gz 1131751
diff --git a/dev-lang/gdl/files/gdl-0.9_pre5-proj4.patch b/dev-lang/gdl/files/gdl-0.9_pre5-proj4.patch
new file mode 100644
index 000000000000..c3991aba1e2e
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_pre5-proj4.patch
@@ -0,0 +1,39 @@
+--- configure.orig	2007-07-05 20:53:22.000000000 +0100
++++ configure	2007-08-01 11:42:25.853492000 +0100
+@@ -20805,20 +20805,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
+ 
+-  { echo "$as_me:$LINENO: checking for pj_init in -lproj4" >&5
+-echo $ECHO_N "checking for pj_init in -lproj4... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: checking for pj_init in -lproj" >&5
++echo $ECHO_N "checking for pj_init in -lproj... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_proj4_pj_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lproj4  $LIBS"
++LIBS="-lproj  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+--- src/math_utl.hpp.orig	2007-07-05 19:09:24.000000000 +0100
++++ src/math_utl.hpp	2007-08-01 12:33:11.118722250 +0100
+@@ -42,7 +42,7 @@
+ #define COMPLEX COMPLEX2
+ 
+ extern "C" {
+-#include "lib_proj.h"
++#include "projects.h"
+ }
+ 
+   PJ *map_init();
diff --git a/dev-lang/gdl/gdl-0.8.11.ebuild b/dev-lang/gdl/gdl-0.8.11.ebuild
index fc468970068c..1e3761e07eb1 100644
--- a/dev-lang/gdl/gdl-0.8.11.ebuild
+++ b/dev-lang/gdl/gdl-0.8.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.8.11.ebuild,v 1.3 2007/07/13 06:25:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.8.11.ebuild,v 1.4 2007/08/21 08:58:21 bicatali Exp $
 
 inherit eutils
 
@@ -10,12 +10,11 @@ HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="python fftw hdf hdf5 netcdf imagemagick"
 
-DEPEND=">=sys-libs/readline-4.3
+RDEPEND=">=sys-libs/readline-4.3
 	sci-libs/gsl
-	sys-devel/libtool
 	>=sci-libs/plplot-5.3
 	imagemagick? ( media-gfx/imagemagick )
 	hdf? ( sci-libs/hdf )
@@ -26,6 +25,11 @@ DEPEND=">=sys-libs/readline-4.3
 			dev-python/matplotlib )
 	fftw? ( sci-libs/fftw )"
 
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+RESTRICT=test
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -46,7 +50,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "failed to install"
+	emake DESTDIR="${D}" install || die "failed to install"
 
 	insinto /usr/share/${PN}
 	doins -r src/pro
@@ -54,6 +58,7 @@ src_install() {
 	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING
 
 	# add GDL provided routines to IDL_PATH
-	echo "IDL_STARTUP=/usr/share/${PN}/pro" > 99gdl
+	echo "GDL_STARTUP=/usr/share/${PN}/pro" > 99gdl
+	echo "GDL_PATH=/usr/share/${PN}" >> 99gdl
 	doenvd 99gdl
 }
diff --git a/dev-lang/gdl/gdl-0.9_pre5.ebuild b/dev-lang/gdl/gdl-0.9_pre5.ebuild
new file mode 100644
index 000000000000..b6985c475607
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9_pre5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_pre5.ebuild,v 1.1 2007/08/21 08:58:21 bicatali Exp $
+
+inherit eutils flag-o-matic
+
+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
+	>=sci-libs/plplot-5.3
+	imagemagick? ( media-gfx/imagemagick )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( sci-libs/hdf5 )
+	netcdf? ( sci-libs/netcdf )
+	python? ( virtual/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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-proj4.patch
+}
+
+src_compile() {
+	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) \
+	  || die "econf failed"
+
+	emake || die "emake 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
+	doins -r src/py
+	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING
+
+	# add GDL provided routines to IDL_PATH
+	echo "GDL_STARTUP=/usr/share/${PN}/pro" > 99gdl
+	echo "GDL_PATH=/usr/share/${PN}" >> 99gdl
+	doenvd 99gdl
+}
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index a3ced4f52edf..ea422fac26df 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -6,4 +6,9 @@
 		<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.
+</longdescription>
 </pkgmetadata>