8 files changed, 7 insertions, 314 deletions
diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 28309a38e021..dffca6817033 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.10 2008/08/23 05:18:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.11 2008/09/02 09:32:03 bicatali Exp $
+
+  02 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/gdl-0.8.11-gcc4-gentoo.patch, -files/gdl-0.9_pre5-proj4.patch,
+  -files/gdl-0.9_pre6-magick.patch, -files/gdl-0.9_pre6-plplot-5.9.patch,
+  -files/gdl-0.9_pre6-proj4.patch, -gdl-0.8.11.ebuild, -gdl-0.9_pre6.ebuild:
+  Cleaning from old versions
 
   23 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Add GLEP 56 USE flag descriptions.
diff --git a/dev-lang/gdl/files/gdl-0.8.11-gcc4-gentoo.patch b/dev-lang/gdl/files/gdl-0.8.11-gcc4-gentoo.patch
deleted file mode 100644
index 5d8edea61fdc..000000000000
--- a/dev-lang/gdl/files/gdl-0.8.11-gcc4-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- gdl-0.8.11/src/specializations.hpp	2005-10-17 04:22:04.000000000 -0400
-+++ gdl-0.8.11-new/src/specializations.hpp	2006-09-28 22:04:04.000000000 -0400
-@@ -106,10 +106,10 @@
- template<> 
- Data_<SpDPtr>* Data_<SpDPtr>::XorOp( BaseGDL* r);
- template<> 
--Data_<SpDByte>* Data_<SpDPtr>::EqOp( BaseGDL* r);
--template<> 
--Data_<SpDByte>* Data_<SpDPtr>::NeOp( BaseGDL* r);
--template<> 
-+//Data_<SpDByte>* Data_<SpDPtr>::EqOp( BaseGDL* r);
-+//template<> 
-+//Data_<SpDByte>* Data_<SpDPtr>::NeOp( BaseGDL* r);
-+//template<> 
- Data_<SpDByte>* Data_<SpDPtr>::LeOp( BaseGDL* r);
- template<> 
- Data_<SpDByte>* Data_<SpDComplex>::LeOp( BaseGDL* r);
-@@ -237,9 +237,16 @@
- Data_<SpDByte>* Data_<SpDComplexDbl>::LogNeg();
- 
- // datatypes.cpp
-+template<>
-+Data_<SpDString>::Data_(const dimension& dim_, BaseGDL::InitType iT);
-+template<>
-+Data_<SpDPtr>::Data_(const dimension& dim_, BaseGDL::InitType iT);
-+template<>
-+Data_<SpDObj>::Data_(const dimension& dim_, BaseGDL::InitType iT);
-+
- template<>  const SizeT Data_<SpDString>::NBytes() const;
--template<>  const SizeT Data_<SpDObj>::NBytes() const;
--template<>  const SizeT Data_<SpDPtr>::NBytes() const;
-+//template<>  const SizeT Data_<SpDObj>::NBytes() const;
-+//template<>  const SizeT Data_<SpDPtr>::NBytes() const;
- template<>  const SizeT Data_<SpDComplex>::ToTransfer() const;
- template<>  const SizeT Data_<SpDComplexDbl>::ToTransfer() const;
- template<> 
diff --git a/dev-lang/gdl/files/gdl-0.9_pre5-proj4.patch b/dev-lang/gdl/files/gdl-0.9_pre5-proj4.patch
deleted file mode 100644
index c3991aba1e2e..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_pre5-proj4.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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/files/gdl-0.9_pre6-magick.patch b/dev-lang/gdl/files/gdl-0.9_pre6-magick.patch
deleted file mode 100644
index ec22bdef825b..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_pre6-magick.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gdl-0.9pre6/configure gdl-0.9pre6.new/configure
---- gdl-0.9pre6/configure	2007-10-29 19:27:12.000000000 -0400
-+++ gdl-0.9pre6.new/configure	2008-03-21 15:43:20.000000000 -0400
-@@ -19666,11 +19666,11 @@
- 
- if test "x$with_Magick" != "xno"; then
-   if test "x$with_Magick" != "xyes"; then
--    LIBS="$LIBS -L$with_Magick/lib -lMagick++"
-+    LIBS="$LIBS $(Magick++-config --libs)"
-     INCLUDES="$INCLUDES -I$with_Magick/include"
-   else
-     LIBS="$LIBS -lMagick++"
--    INCLUDES="$INCLUDES -I/usr/include/magick"
-+    INCLUDES="$INCLUDES $(Magick++-config --cppflags)"
-   fi
- 
-   echo "$as_me:$LINENO: checking for GetMagickVersion in -lMagick" >&5
-@@ -19679,7 +19679,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lMagick  $LIBS"
-+LIBS="$(Magick++-config --libs)  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch b/dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch
deleted file mode 100644
index 24e88eb0f2f8..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_pre6-plplot-5.9.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur gdl-0.9pre6/src/gdlgstream.cpp gdl-0.9pre6.new/src/gdlgstream.cpp
---- gdl-0.9pre6/src/gdlgstream.cpp	2007-10-29 19:10:47.000000000 -0400
-+++ gdl-0.9pre6.new/src/gdlgstream.cpp	2008-04-13 12:45:19.000000000 -0400
-@@ -25,12 +25,12 @@
- 
- using namespace std;
- 
--void PLPlotAbortHandler(char *c)
-+void PLPlotAbortHandler(const char *c)
- {
-   cout << "PLPlot abort handler: " << c << endl;
- }
- 
--int PLPlotExitHandler(char *c)
-+int PLPlotExitHandler(const char *c)
- {
-   cout << "PLPlot exit handler: " << c << endl;
-   return 0;
-diff -Naur gdl-0.9pre6/src/plot3d_nr.cpp gdl-0.9pre6.new/src/plot3d_nr.cpp
---- gdl-0.9pre6/src/plot3d_nr.cpp	2007-10-29 19:10:47.000000000 -0400
-+++ gdl-0.9pre6.new/src/plot3d_nr.cpp	2008-04-13 13:01:38.000000000 -0400
-@@ -217,7 +217,7 @@
-     zmin = (zmax_in > zmin_in) ? zmin_in: zmax_in;
-     zmax = (zmax_in > zmin_in) ? zmax_in: zmin_in;
- 
--    pldtik(zmin, zmax, &tick, &nsub);
-+    pldtik(zmin, zmax, &tick, &nsub, 0);
-     tp = tick * floor(zmin / tick) + tick;
-     pl3upv = 0;
- 
diff --git a/dev-lang/gdl/files/gdl-0.9_pre6-proj4.patch b/dev-lang/gdl/files/gdl-0.9_pre6-proj4.patch
deleted file mode 100644
index 001036f21189..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_pre6-proj4.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig	2007-11-05 11:31:21.378858885 +0000
-+++ configure	2007-11-05 11:32:50.947161645 +0000
-@@ -20370,20 +20370,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-11-05 11:35:17.000000000 +0000
-+++ src/math_utl.hpp	2007-11-05 11:35:44.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.8.11.ebuild b/dev-lang/gdl/gdl-0.8.11.ebuild
deleted file mode 100644
index 1e3761e07eb1..000000000000
--- a/dev-lang/gdl/gdl-0.8.11.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.4 2007/08/21 08:58:21 bicatali Exp $
-
-inherit eutils
-
-DESCRIPTION="An Interactive Data Language compatible incremental compiler"
-LICENSE="GPL-2"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python fftw hdf hdf5 netcdf imagemagick"
-
-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? ( dev-lang/python
-			dev-python/numarray
-			dev-python/matplotlib )
-	fftw? ( sci-libs/fftw )"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-RESTRICT=test
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4-gentoo.patch
-}
-
-src_compile() {
-	econf \
-	  $(use_with python) \
-	  $(use_with fftw) \
-	  $(use_with hdf) \
-	  $(use_with hdf5) \
-	  $(use_with netcdf) \
-	  $(use_with imagemagick Magick) \
-	  || die "econf failed!"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
-
-	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/gdl-0.9_pre6.ebuild b/dev-lang/gdl/gdl-0.9_pre6.ebuild
deleted file mode 100644
index e09d8c7155e0..000000000000
--- a/dev-lang/gdl/gdl-0.9_pre6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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_pre6.ebuild,v 1.3 2008/04/13 18:31:51 markusle 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
-	epatch "${FILESDIR}"/${P}-magick.patch
-
-	if has_version ">=sci-libs/plplot-5.9.0"; then
-		epatch "${FILESDIR}"/${P}-plplot-5.9.patch
-	fi
-}
-
-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 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
-	echo "GDL_PATH=/usr/share/${PN}" >> 99gdl
-	doenvd 99gdl
-}