Version bump

Package-Manager: portage-2.1.2.11

7 files changed, 176 insertions, 21 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/Manifest b/dev-lang/gdl/Manifest
index dabec2d04e2d..b022664ed810 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,20 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdl-0.8.11-gcc4-gentoo.patch 1402 RMD160 2cb002f9cc60e5910a106dfeb0ab079dcb2f212d SHA1 4b22d29098141a26fc089dbd98b5ae0190731f7b SHA256 42765b45b82bd56c46d7d2aa1726b97f47a95f3eee37a934ac600ba2e5fba0a1
 MD5 454fd063524edae773e573b6d05b8e58 files/gdl-0.8.11-gcc4-gentoo.patch 1402
 RMD160 2cb002f9cc60e5910a106dfeb0ab079dcb2f212d files/gdl-0.8.11-gcc4-gentoo.patch 1402
 SHA256 42765b45b82bd56c46d7d2aa1726b97f47a95f3eee37a934ac600ba2e5fba0a1 files/gdl-0.8.11-gcc4-gentoo.patch 1402
+AUX gdl-0.9_pre5-proj4.patch 1215 RMD160 d82806674601555145d6b2e3deb3bd637f8d52ec SHA1 85cecd68c965ede96615ba6ca3e3ce9d87ce5600 SHA256 6767956f44e1c3d8bf2d137e6348d06bbcd8ee5f340ca3ab1c3d6b881b050931
+MD5 a224ede4b5b2a160d20e81e65b09424c files/gdl-0.9_pre5-proj4.patch 1215
+RMD160 d82806674601555145d6b2e3deb3bd637f8d52ec files/gdl-0.9_pre5-proj4.patch 1215
+SHA256 6767956f44e1c3d8bf2d137e6348d06bbcd8ee5f340ca3ab1c3d6b881b050931 files/gdl-0.9_pre5-proj4.patch 1215
 DIST gdl-0.8.11.tar.gz 827194 RMD160 f392dea396bc6ab56a2360bfda02ea684aa2ce3f SHA1 8904075d9297ea54cfbdf66cc69d55c472d784c1 SHA256 3872fdbf5ec76632cad1fe1a488728592d72244c9c0553c96f265bdc78bb5906
-EBUILD gdl-0.8.11.ebuild 1436 RMD160 4d6f6466f6bac8a3c91bb757a19a793f3c45f311 SHA1 9f724381e5bc1a75760974471eb479b22fc0a06b SHA256 1f529754ba7356f2e237f413bfcae1fdb72d3f7b84150f5d89848e6c44b987d7
-MD5 47a4fa25922eee6f339153b271a1b20d gdl-0.8.11.ebuild 1436
-RMD160 4d6f6466f6bac8a3c91bb757a19a793f3c45f311 gdl-0.8.11.ebuild 1436
-SHA256 1f529754ba7356f2e237f413bfcae1fdb72d3f7b84150f5d89848e6c44b987d7 gdl-0.8.11.ebuild 1436
-MISC ChangeLog 734 RMD160 1397a6314111b0277ccf7dd5c6c5b97ec4e7c23d SHA1 daee28cb5198232d1e01123d59b7bd73c0711be4 SHA256 d11a799f701b06369f668827e0ce92107eaa0acef53560cdbe0fd96fd2f3dda0
-MD5 66692304715b441031fd87bbc77e7940 ChangeLog 734
-RMD160 1397a6314111b0277ccf7dd5c6c5b97ec4e7c23d ChangeLog 734
-SHA256 d11a799f701b06369f668827e0ce92107eaa0acef53560cdbe0fd96fd2f3dda0 ChangeLog 734
-MISC metadata.xml 254 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 SHA1 83928b80dc644941d59b64e04e0964b1c1fa3005 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454
-MD5 041650a939ada57b9df1755a488ad1b7 metadata.xml 254
-RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 metadata.xml 254
-SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454 metadata.xml 254
+DIST gdl-0.9pre5.tar.gz 1131751 RMD160 458bf014c909e43bfe6bdf5f5c834bcbbd48dd52 SHA1 2df7c0fd619b78c8c59052306348dfd665f9e0e7 SHA256 81121a4e7e217dc986b4827ce690a8650f264dd648108ffde8f1eb77633d41cb
+EBUILD gdl-0.8.11.ebuild 1525 RMD160 15c6dbe3c0923b2ababd3b9c0366f69da9ed1a4c SHA1 eaaf5b5eaae8a14ac7050c2c036edeb8bc096e66 SHA256 e9299b0b74d3ca0ec01318db64e357721cdc8f214e7a7fc4727504a7fa67ddd7
+MD5 81c9c110ee067da1f0e851e389519347 gdl-0.8.11.ebuild 1525
+RMD160 15c6dbe3c0923b2ababd3b9c0366f69da9ed1a4c gdl-0.8.11.ebuild 1525
+SHA256 e9299b0b74d3ca0ec01318db64e357721cdc8f214e7a7fc4727504a7fa67ddd7 gdl-0.8.11.ebuild 1525
+EBUILD gdl-0.9_pre5.ebuild 1737 RMD160 ed7c70de8d997f2a087030e101b4c092d63b1b1c SHA1 5af49b913ebd8497a904adbd747a68b2ac73d78b SHA256 934cf8dfe44f99f77b562413eb921b5f4acff9a58409cd195506aa7e72c014b8
+MD5 f197ad4b47a6de2b52014076f558ccf3 gdl-0.9_pre5.ebuild 1737
+RMD160 ed7c70de8d997f2a087030e101b4c092d63b1b1c gdl-0.9_pre5.ebuild 1737
+SHA256 934cf8dfe44f99f77b562413eb921b5f4acff9a58409cd195506aa7e72c014b8 gdl-0.9_pre5.ebuild 1737
+MISC ChangeLog 906 RMD160 78a312deb80080929952e27c036300df803891eb SHA1 738a72ff799b721b85f85ceb1dc1117048341d8c SHA256 57815f3ee91fd57c303b3c03205b7b0c345a4b7628a1f959d91ecf0f0e584a66
+MD5 2ad127b5034cd5ffe6acaddf05434e46 ChangeLog 906
+RMD160 78a312deb80080929952e27c036300df803891eb ChangeLog 906
+SHA256 57815f3ee91fd57c303b3c03205b7b0c345a4b7628a1f959d91ecf0f0e584a66 ChangeLog 906
+MISC metadata.xml 465 RMD160 6a916eadbb20bfec9af5dd276967d236e946b87e SHA1 5ae91cde758c6a9ec3532914fd63a2584aa42060 SHA256 3922d11656f03d422639ae3bfbcc74eb47044292687d63c2a80379b994a083bb
+MD5 c25a583fd369c7fd737b304d8bd071d3 metadata.xml 465
+RMD160 6a916eadbb20bfec9af5dd276967d236e946b87e metadata.xml 465
+SHA256 3922d11656f03d422639ae3bfbcc74eb47044292687d63c2a80379b994a083bb metadata.xml 465
 MD5 073199440288ef33b12cfa2389404105 files/digest-gdl-0.8.11 232
 RMD160 292e35cfc55648a8de53e66b72dafe27af099504 files/digest-gdl-0.8.11 232
 SHA256 39765dcc3da808523684973ed19d91c504cb94003ba65181df41da0bf5b148aa files/digest-gdl-0.8.11 232
+MD5 392c12bafab1b5879f74cd55829e29f3 files/digest-gdl-0.9_pre5 238
+RMD160 99a650a2e87d4ab3255112fd896034037522451f files/digest-gdl-0.9_pre5 238
+SHA256 e405d55f3a2b9860b1771d84c307d9f23e9d9406e31697bd25de10e101916790 files/digest-gdl-0.9_pre5 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGyqk01ycZbhPLE2ARAtndAJ9Oj0dOIDtH3dfbyzeXTLUoHx3kCACcDyeS
+Em448b2jg9KGAQvtyK5mV8c=
+=CRb3
+-----END PGP SIGNATURE-----
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>