Version bump

Package-Manager: portage-2.1.5.2

4 files changed, 66 insertions, 15 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 58eaffee74c3..b8f93a22639c 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.6 2008/04/13 18:31:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.7 2008/05/22 15:29:37 bicatali Exp $
+
+*gdl-0.9_rc1 (22 May 2008)
+
+  22 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/gdl-0.9_rc1-proj4.patch, -gdl-0.9_pre5.ebuild, +gdl-0.9_rc1.ebuild:
+  Version bump
 
   13 Apr 2008; Markus Dittrich <markusle@gentoo.org>
   +files/gdl-0.9_pre6-plplot-5.9.patch, gdl-0.9_pre6.ebuild:
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 5e27fea10b42..5ababc1b1d18 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdl-0.8.11-gcc4-gentoo.patch 1402 RMD160 2cb002f9cc60e5910a106dfeb0ab079dcb2f212d SHA1 4b22d29098141a26fc089dbd98b5ae0190731f7b SHA256 42765b45b82bd56c46d7d2aa1726b97f47a95f3eee37a934ac600ba2e5fba0a1
 AUX gdl-0.9_pre5-proj4.patch 1215 RMD160 d82806674601555145d6b2e3deb3bd637f8d52ec SHA1 85cecd68c965ede96615ba6ca3e3ce9d87ce5600 SHA256 6767956f44e1c3d8bf2d137e6348d06bbcd8ee5f340ca3ab1c3d6b881b050931
 AUX gdl-0.9_pre6-magick.patch 886 RMD160 a22e6c3e65dc044785130b90a07c5ed0ff7dfc94 SHA1 a2f6c0e8dbad4742c3a571a279c54a1f677b1fa2 SHA256 b6b6f57d708167232173020d5edc94a8aee6949ec75406b6d80d887fa2f06633
 AUX gdl-0.9_pre6-plplot-5.9.patch 1025 RMD160 bbab8e93af80c3efe6e2ce43575350119f566237 SHA1 e3dbc4145f649cc0a18b53bddfc765fe5ad5f786 SHA256 94a92bc41e401db50c2c8f5da13a99c2bd76c479577da165d28a079cf8808eb2
 AUX gdl-0.9_pre6-proj4.patch 1205 RMD160 0a486ea0e669d682b49416f2a78611b074e4279d SHA1 f9a4cbaceb7d16adb8d33bbb6e34ded20eab039e SHA256 dd4c6749297d80c84f63426d374659d84e2941f65fa193e1a4820f8e6a299707
+AUX gdl-0.9_rc1-proj4.patch 1087 RMD160 222d10268dc3d99de76312a1e1ccef3b9f1af015 SHA1 4e4cb8e23421f73a2764bcc3ea259e9a45b0872f SHA256 cd903dd710c37a0f7ce4582625ba0339e6e16e6918dcc55b3b040e68ad3df4cf
 DIST gdl-0.8.11.tar.gz 827194 RMD160 f392dea396bc6ab56a2360bfda02ea684aa2ce3f SHA1 8904075d9297ea54cfbdf66cc69d55c472d784c1 SHA256 3872fdbf5ec76632cad1fe1a488728592d72244c9c0553c96f265bdc78bb5906
-DIST gdl-0.9pre5.tar.gz 1131751 RMD160 458bf014c909e43bfe6bdf5f5c834bcbbd48dd52 SHA1 2df7c0fd619b78c8c59052306348dfd665f9e0e7 SHA256 81121a4e7e217dc986b4827ce690a8650f264dd648108ffde8f1eb77633d41cb
 DIST gdl-0.9pre6.tar.gz 1183644 RMD160 b8d59a06adba8be864d0cdbd00eb8bf677a2093b SHA1 d05835c066bc3f0e35c1fbaee0415c57f817af1e SHA256 a6a597f2cb5fea889b32f99fba595c3535e47ee219a334fd274ab704133e35ea
+DIST gdl-0.9rc1.tar.gz 1184049 RMD160 cce312116805b667e9aa83bcc09520606934f0da SHA1 a897a3696c635eb7703ff53955924c70c17bcb26 SHA256 60ac94cb7c278919a851c7c4f8aa459b76190c919d7ecfc25d906b316cd2afa4
 EBUILD gdl-0.8.11.ebuild 1525 RMD160 15c6dbe3c0923b2ababd3b9c0366f69da9ed1a4c SHA1 eaaf5b5eaae8a14ac7050c2c036edeb8bc096e66 SHA256 e9299b0b74d3ca0ec01318db64e357721cdc8f214e7a7fc4727504a7fa67ddd7
-EBUILD gdl-0.9_pre5.ebuild 1739 RMD160 4eb98f3ba51c35a6392eacfcdf4b9fce45629017 SHA1 06694e44bbf7e050dca058e35e53b7fe538ab8ec SHA256 1055923f9070ca0609f7ea75eb7f9723eb74ea0fb19588ac8dc2afddf4517d10
 EBUILD gdl-0.9_pre6.ebuild 1921 RMD160 0eda7822bf1cbbbb42e3e3cda22602cfb1ca91ff SHA1 55c9a7b42d0eee8f3b5ca8c307c70ab3be912c00 SHA256 a0fcc0f23501ecb4bdf887463a09487f2e623b98b91fd9d1840f78140674cd8b
-MISC ChangeLog 1456 RMD160 a81aedf693b0209f0c043d8a30e1da54cbcdc310 SHA1 3946839eb75f4a2723613e14b2c8c9eb895248ab SHA256 52acd7fb3600af636891111e21456519d7fce6006772a017793f31a34d16741c
+EBUILD gdl-0.9_rc1.ebuild 1945 RMD160 50da57a5e745123a94fa568473e8d12a65fa23ab SHA1 dc8d903a2abee4731f7fd12efd358347042393df SHA256 89abd71238c83bcdda2e4fe889129891fe4cbbc49f8a86025067cbe2b53ebac6
+MISC ChangeLog 1632 RMD160 c6523a53a1ed73570737bec25590928172cbcf4b SHA1 354f27b0a62a4dfe32ebc08d6a7e3349afa4ce01 SHA256 abd49627c12b0e224e8bee51b482cfd2c622773eb449202449ab1c2f5441b6a9
 MISC metadata.xml 465 RMD160 6a916eadbb20bfec9af5dd276967d236e946b87e SHA1 5ae91cde758c6a9ec3532914fd63a2584aa42060 SHA256 3922d11656f03d422639ae3bfbcc74eb47044292687d63c2a80379b994a083bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkg1kXEACgkQ1ycZbhPLE2D7dQCeMgapGA8/jxjhF6nGyu6bvN8F
+Q9sAoJVZL/njCjGR7cALA5qYCfv3iA2G
+=GnpK
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch b/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch
new file mode 100644
index 000000000000..80227f317992
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch
@@ -0,0 +1,31 @@
+--- configure.in.orig	2008-05-22 15:03:04.000000000 +0000
++++ configure.in	2008-05-22 15:03:19.000000000 +0000
+@@ -482,14 +482,14 @@
+ 
+ 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, pj_init, [AC_DEFINE([USE_LIBPROJ4], [1], [Define if you want to use LIBPROJ4])], [
++  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"
+     echo "       Use --with-libproj4=DIR to specify the LIBPROJ4 directory tree"
+--- src/math_utl.hpp.orig	2008-05-22 15:00:39.000000000 +0000
++++ src/math_utl.hpp	2008-05-22 15:01:46.000000000 +0000
+@@ -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.9_pre5.ebuild b/dev-lang/gdl/gdl-0.9_rc1.ebuild
index ff1a83d6cceb..98151c57c454 100644
--- a/dev-lang/gdl/gdl-0.9_pre5.ebuild
+++ b/dev-lang/gdl/gdl-0.9_rc1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 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.2 2008/03/21 20:43:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc1.ebuild,v 1.1 2008/05/22 15:29:37 bicatali Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic autotools
 
 MYP=${P/_/}
 DESCRIPTION="An Interactive Data Language compatible incremental compiler"
@@ -21,9 +21,7 @@ RDEPEND=">=sys-libs/readline-4.3
 	hdf? ( sci-libs/hdf )
 	hdf5? ( sci-libs/hdf5 )
 	netcdf? ( sci-libs/netcdf )
-	python? ( virtual/python
-			dev-python/numarray
-			dev-python/matplotlib )
+	python? ( dev-python/numarray dev-python/matplotlib )
 	fftw? ( >=sci-libs/fftw-3 )
 	proj? ( sci-libs/proj )"
 
@@ -36,6 +34,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-proj4.patch
+	epatch "${FILESDIR}"/${PN}-0.9_pre6-magick.patch
+
+	#if has_version ">=sci-libs/plplot-5.9.0"; then
+		#epatch "${FILESDIR}"/${PN}-0.9_pre6-plplot-5.9.patch
+	#fi
+	eautoreconf
 }
 
 src_compile() {
@@ -55,18 +59,17 @@ src_compile() {
 
 src_test() {
 	cd "${S}"/testsuite
-	PATH=${S}/src gdl <<EOF
-test_suite
-EOF
+	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
+	doins -r src/pro src/py || die "install pro and py files failed"
+	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING || die
 
 	# add GDL provided routines to IDL_PATH
 	echo "GDL_STARTUP=/usr/share/${PN}/pro" > 99gdl