Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-lang/gdl/ChangeLog11
-rw-r--r--dev-lang/gdl/files/gdl-0.9_rc1-gcc4.3.patch58
-rw-r--r--dev-lang/gdl/files/gdl-0.9_rc1-magick.patch21
-rw-r--r--dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch31
-rw-r--r--dev-lang/gdl/files/gdl-0.9_rc2-antlr.patch40
-rw-r--r--dev-lang/gdl/files/gdl-0.9_rc3-proj4.patch118
-rw-r--r--dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch58
-rw-r--r--dev-lang/gdl/gdl-0.9_rc2.ebuild98
-rw-r--r--dev-lang/gdl/gdl-0.9_rc3.ebuild97
-rw-r--r--dev-lang/gdl/gdl-0.9_rc4.ebuild58
-rw-r--r--dev-lang/gdl/metadata.xml2
11 files changed, 101 insertions, 491 deletions
diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index dde2e615399d..929fa4c9582a 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,15 @@
# 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.19 2010/02/27 05:28:16 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.20 2010/07/04 19:57:26 jlec Exp $
+
+ 04 Jul 2010; Justin Lecher <jlec@gentoo.org> -gdl-0.9_rc2.ebuild,
+ -gdl-0.9_rc3.ebuild, gdl-0.9_rc4.ebuild, -files/gdl-0.9_rc1-gcc4.3.patch,
+ -files/gdl-0.9_rc1-magick.patch, -files/gdl-0.9_rc1-proj4.patch,
+ -files/gdl-0.9_rc2-antlr.patch, -files/gdl-0.9_rc3-proj4.patch,
+ +files/gdl-0.9_rc4-wxwidgets.patch:
+ Removed python support untils numarray -> numpy is changed by upstream,
+ #326781; removed old, #286634; correcting RDEPEND for imagemagick support,
+ #314237
27 Feb 2010; Markus Dittrich <markusle@gentoo.org> gdl-0.9_rc4.ebuild,
files/gdl-0.9_rc4-antlr.patch:
diff --git a/dev-lang/gdl/files/gdl-0.9_rc1-gcc4.3.patch b/dev-lang/gdl/files/gdl-0.9_rc1-gcc4.3.patch
deleted file mode 100644
index 34e0641abf38..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc1-gcc4.3.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur gdl-0.9rc1/src/antlr/CharScanner.hpp gdl-0.9rc1.new/src/antlr/CharScanner.hpp
---- gdl-0.9rc1/src/antlr/CharScanner.hpp 2008-04-03 18:09:26.000000000 -0400
-+++ gdl-0.9rc1.new/src/antlr/CharScanner.hpp 2008-05-24 13:30:50.000000000 -0400
-@@ -11,6 +11,10 @@
- #include <antlr/config.hpp>
-
- #include <map>
-+#include <cstdlib>
-+#include <cstring>
-+
-+
-
- #ifdef HAS_NOT_CCTYPE_H
- #include <ctype.h>
-diff -Naur gdl-0.9rc1/src/antlr/Parser.cpp gdl-0.9rc1.new/src/antlr/Parser.cpp
---- gdl-0.9rc1/src/antlr/Parser.cpp 2008-04-03 18:09:26.000000000 -0400
-+++ gdl-0.9rc1.new/src/antlr/Parser.cpp 2008-05-24 13:31:51.000000000 -0400
-@@ -12,6 +12,7 @@
- #include "antlr/MismatchedTokenException.hpp"
- //#include "antlr/ASTFactory.hpp"
- #include <iostream>
-+#include <cstdlib>
-
- #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
- namespace antlr {
-diff -Naur gdl-0.9rc1/src/antlr/TreeParser.cpp gdl-0.9rc1.new/src/antlr/TreeParser.cpp
---- gdl-0.9rc1/src/antlr/TreeParser.cpp 2008-04-03 18:09:26.000000000 -0400
-+++ gdl-0.9rc1.new/src/antlr/TreeParser.cpp 2008-05-24 13:32:28.000000000 -0400
-@@ -9,6 +9,7 @@
- #include "antlr/ASTNULLType.hpp"
- #include "antlr/MismatchedTokenException.hpp"
- #include <iostream>
-+#include <cstdlib>
- #include <stdio.h>
-
- #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE
-diff -Naur gdl-0.9rc1/src/basic_op.cpp gdl-0.9rc1.new/src/basic_op.cpp
---- gdl-0.9rc1/src/basic_op.cpp 2008-04-03 18:09:27.000000000 -0400
-+++ gdl-0.9rc1.new/src/basic_op.cpp 2008-05-24 13:34:56.000000000 -0400
-@@ -26,6 +26,7 @@
-
- //#include <csignal>
- #include "sigfpehandler.hpp"
-+#include <iterator>
-
- using namespace std;
-
-diff -Naur gdl-0.9rc1/src/basic_pro.cpp gdl-0.9rc1.new/src/basic_pro.cpp
---- gdl-0.9rc1/src/basic_pro.cpp 2008-04-05 22:06:34.000000000 -0400
-+++ gdl-0.9rc1.new/src/basic_pro.cpp 2008-05-24 13:35:13.000000000 -0400
-@@ -21,6 +21,7 @@
- #include <fstream>
- #include <memory>
- #include <set>
-+#include <iterator>
-
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/dev-lang/gdl/files/gdl-0.9_rc1-magick.patch b/dev-lang/gdl/files/gdl-0.9_rc1-magick.patch
deleted file mode 100644
index da36c86efcb8..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc1-magick.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur gdl-0.9rc1/configure.in gdl-0.9rc1.new/configure.in
---- gdl-0.9rc1/configure.in 2008-04-05 22:16:09.000000000 -0400
-+++ gdl-0.9rc1.new/configure.in 2008-05-24 13:20:50.000000000 -0400
-@@ -278,14 +278,14 @@
-
- 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
-
-- AC_CHECK_LIB(Magick, GetMagickVersion, [AC_DEFINE([USE_MAGICK], [1], [Define if you want to use ImageMagick])], [
-+ AC_CHECK_LIB(Magick++, GetMagickVersion, [AC_DEFINE([USE_MAGICK], [1], [Define if you want to use ImageMagick])], [
- echo ""
- echo "Error! ImageMagick version 5.5.7 or later is required but was not found"
- echo " Use --with-Magick=DIR to specify the ImageMagick directory tree"
diff --git a/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch b/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch
deleted file mode 100644
index 80227f317992..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc1-proj4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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/files/gdl-0.9_rc2-antlr.patch b/dev-lang/gdl/files/gdl-0.9_rc2-antlr.patch
deleted file mode 100644
index b644eb2154df..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc2-antlr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur gdl-0.9rc2/configure.in gdl-0.9rc2.new/configure.in
---- gdl-0.9rc2/configure.in 2009-01-22 17:31:48.000000000 -0500
-+++ gdl-0.9rc2.new/configure.in 2009-08-25 18:38:10.000000000 -0400
-@@ -755,7 +755,7 @@
- dnl perform program name transformation
- dnl AC_ARG_PROGRAM
-
--AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile)
-+AC_CONFIG_FILES(Makefile src/Makefile)
-
- AC_OUTPUT
-
-diff -Naur gdl-0.9rc2/src/Makefile.am gdl-0.9rc2.new/src/Makefile.am
---- gdl-0.9rc2/src/Makefile.am 2009-01-20 14:33:56.000000000 -0500
-+++ gdl-0.9rc2.new/src/Makefile.am 2009-08-25 21:36:55.000000000 -0400
-@@ -1,6 +1,6 @@
- # set the include path found by configure
- INCLUDES = $(EXT_INCLUDES) $(all_includes)
--SUBDIRS = antlr
-+SUBDIRS =
- noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
-
- cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
-@@ -53,7 +53,7 @@
- gdl_CXXFLAGS = $(AM_CXXFLAGS)
- # the library search path.
- gdl_LDFLAGS = $(all_libraries)
--gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
-+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
- endif
-
- # build as library (for python module)
-@@ -69,6 +69,6 @@
- libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
- endif
-
--libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
-+libgdl_la_LIBADD = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
- endif
-
diff --git a/dev-lang/gdl/files/gdl-0.9_rc3-proj4.patch b/dev-lang/gdl/files/gdl-0.9_rc3-proj4.patch
deleted file mode 100644
index 67ab61126620..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc3-proj4.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur gdl-0.9rc3/configure.in gdl-0.9rc3.new/configure.in
---- gdl-0.9rc3/configure.in 2009-09-11 12:04:15.000000000 -0400
-+++ gdl-0.9rc3.new/configure.in 2010-01-11 22:40:55.000000000 -0500
-@@ -534,20 +534,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
-
-- AC_CHECK_LIB(proj4, proj_init, [AC_DEFINE([USE_LIBPROJ4], [1],
-+ AC_CHECK_LIB(proj, proj_init, [AC_DEFINE([USE_LIBPROJ4], [1],
- [Define if you want to use LIBPROJ4])], [])
-
-- AC_CHECK_LIB(proj4, proj_init, [AC_DEFINE([USE_LIBPROJ4_NEW], [1],
-+ AC_CHECK_LIB(proj, proj_init, [AC_DEFINE([USE_LIBPROJ4_NEW], [1],
- [Define if you want to use new LIBPROJ4])], [
-
-- AC_CHECK_LIB(proj4, pj_init, [AC_DEFINE([USE_LIBPROJ4], [1],
-+ 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"
-diff -Naur gdl-0.9rc3/src/math_utl.hpp gdl-0.9rc3.new/src/math_utl.hpp
---- gdl-0.9rc3/src/math_utl.hpp 2009-09-11 12:04:10.000000000 -0400
-+++ gdl-0.9rc3.new/src/math_utl.hpp 2010-01-11 22:37:48.000000000 -0500
-@@ -58,7 +58,7 @@
- #endif
-
- extern "C" {
--#include "lib_proj.h"
-+#include <projects.h>
- }
-
- PROJTYPE *map_init();
-diff -Naur gdl-0.9rc3/src/math_utl.hpp.orig gdl-0.9rc3.new/src/math_utl.hpp.orig
---- gdl-0.9rc3/src/math_utl.hpp.orig 1969-12-31 19:00:00.000000000 -0500
-+++ gdl-0.9rc3.new/src/math_utl.hpp.orig 2009-09-11 12:04:10.000000000 -0400
-@@ -0,0 +1,73 @@
-+/***************************************************************************
-+ math_utl.hpp - math utilities GDL library function
-+ -------------------
-+ begin : Feb 11 2004
-+ copyright : (C) 2004 by Joel Gales
-+ email : jomoga@users.sourceforge.net
-+ ***************************************************************************/
-+
-+/***************************************************************************
-+ * *
-+ * This program is free software; you can redistribute it and/or modify *
-+ * it under the terms of the GNU General Public License as published by *
-+ * the Free Software Foundation; either version 2 of the License, or *
-+ * (at your option) any later version. *
-+ * *
-+ ***************************************************************************/
-+
-+#ifndef MATH_UTL_HPP_
-+#define MATH_UTL_HPP_
-+
-+#include "basegdl.hpp"
-+
-+//#define ABS(xxx) (( xxx > -xxx)?(xxx):(-xxx))
-+
-+template< typename T>
-+inline T abs( T a) { return (a>=T(0))?a:-a;}
-+
-+namespace lib {
-+
-+// int trans513(char *, int, int, int, DType);
-+// int transpose(char *, SizeT, SizeT [], SizeT, DType);
-+// int transpose_perm(char *, SizeT, SizeT [], SizeT, DType, long []);
-+
-+ void machar_s ( long int *ibeta, long int *it, long int *irnd, long int *ngrd,
-+ long int *machep, long int *negep, long int *iexp, long int *minexp,
-+ long int *maxexp, float *eps, float *epsneg, float *xmin, float *xmax );
-+ void machar_d ( long int *ibeta, long int *it, long int *irnd, long int *ngrd,
-+ long int *machep, long int *negep, long int *iexp, long int *minexp,
-+ long int *maxexp, double *eps, double *epsneg, double *xmin, double *xmax );
-+
-+#ifdef USE_LIBPROJ4
-+#define COMPLEX COMPLEX2
-+
-+#ifdef USE_LIBPROJ4_NEW
-+#define PROJTYPE PROJ
-+#define LPTYPE PROJ_LP
-+#define XYTYPE PROJ_XY
-+#define PJ_INIT proj_init
-+#define PJ_FWD proj_fwd
-+#define PJ_INV proj_inv
-+#else
-+#define PROJTYPE PJ
-+#define LPTYPE LP
-+#define XYTYPE XY
-+#define PJ_INIT pj_init
-+#define PJ_FWD pj_fwd
-+#define PJ_INV pj_inv
-+#endif
-+
-+extern "C" {
-+#include "lib_proj.h"
-+}
-+
-+ PROJTYPE *map_init();
-+ static PROJTYPE *ref;
-+ static PROJTYPE *prev_ref;
-+
-+#define COMPLEX2 COMPLEX
-+#endif
-+
-+} // namespace
-+
-+#endif
diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch b/dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch
new file mode 100644
index 000000000000..0d9b87b6246b
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch
@@ -0,0 +1,58 @@
+diff --git a/configure.in b/configure.in
+index e77afe3..a012c7c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -324,21 +324,25 @@ if test "x$with_wxWidgets" != "xno"; then
+ dnl LDFLAGS="$LDFLAGS -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
+ fi
+
+- tmp="`wx-config --basename`-`wx-config --release`"
+- AC_CHECK_LIB($tmp, wxFatalSignalHandler,
+- [AC_DEFINE([HAVE_LIBWXWIDGETS], [1], [wxWidgets library])], [
+- dnl SA: handling the multi-port wxWidgets installation case
+- tmp="`wx-config --basename --toolkit=base`-`wx-config --release`"
+- AC_CHECK_LIB($tmp, wxInteger_compare, [AC_DEFINE([HAVE_LIBWXWIDGETS], [1])], [
+- echo ""
+- echo "Error! wxWidgets version 2.8 or later is required but was not found"
+- echo " Use --with-wxWidgets=DIR to specify the wxWidgets directory tree"
+- echo " Use --with-wxWidgets=no to not use it"
+- echo " Check the README or use configure --help for other libraries needed"
+- echo " (--with-xxxdir = obligatory, --with-xxx = optional (--with-xxx=no to disable))"
+- exit -1
+- ])
+- ])
++ AC_DEFINE([HAVE_LIBWXWIDGETS], [1], [wxWidgets library])
++
++ # SA: the code below worked for me on Ubuntu and Macports... but it does not work e.g. on Fedora
++ #
++ #tmp="`wx-config --basename`-`wx-config --release`"
++ #AC_CHECK_LIB($tmp, wxFatalSignalHandler,
++ # [AC_DEFINE([HAVE_LIBWXWIDGETS], [1], [wxWidgets library])], [
++ # dnl SA: handling the multi-port wxWidgets installation case
++ # tmp="`wx-config --basename --toolkit=base`-`wx-config --release`"
++ # AC_CHECK_LIB($tmp, wxInteger_compare, [AC_DEFINE([HAVE_LIBWXWIDGETS], [1])], [
++ # echo ""
++ # echo "Error! wxWidgets version 2.8 or later is required but was not found"
++ # echo " Use --with-wxWidgets=DIR to specify the wxWidgets directory tree"
++ # echo " Use --with-wxWidgets=no to not use it"
++ # echo " Check the README or use configure --help for other libraries needed"
++ # echo " (--with-xxxdir = obligatory, --with-xxx = optional (--with-xxx=no to disable))"
++ # exit -1
++ # ])
++ #])
+ fi
+
+ dnl == ImageMagick =========================================
+diff --git a/src/widget.cpp b/src/widget.cpp
+index dc65ad1..316d599 100644
+--- a/src/widget.cpp
++++ b/src/widget.cpp
+@@ -589,7 +589,7 @@ namespace lib {
+
+ RefDNode theAST;
+
+- GDLLexer lexer(istr, "");
++ GDLLexer lexer(istr, "", GDLParser::NONE);
+ GDLParser& parser = lexer.Parser();
+ parser.interactive();
+
diff --git a/dev-lang/gdl/gdl-0.9_rc2.ebuild b/dev-lang/gdl/gdl-0.9_rc2.ebuild
deleted file mode 100644
index eb79ba923334..000000000000
--- a/dev-lang/gdl/gdl-0.9_rc2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc2.ebuild,v 1.2 2009/10/04 14:42:21 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic autotools
-
-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
- =dev-java/antlr-2.7*[cxx]
- >=sci-libs/plplot-5.3
- imagemagick? ( media-gfx/imagemagick )
- hdf? ( sci-libs/hdf )
- hdf5? ( sci-libs/hdf5 )
- netcdf? ( sci-libs/netcdf )
- 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_prepare() {
- epatch "${FILESDIR}"/${PN}-0.9_rc1-proj4.patch
- epatch "${FILESDIR}"/${PN}-0.9_rc1-magick.patch
- epatch "${FILESDIR}"/${P}-gcc4.4.patch
- epatch "${FILESDIR}"/${P}-antlr.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"
-
- eautoreconf
-}
-
-src_configure() {
- # need to check for old plplot
- local myconf
- if has_version '<sci-libs/plplot-5.9.0'; then
- myconf="${myconf} --enable-oldplplot"
- fi
-
- # sorry, but even configure barfs with --as-needed
- # when linking against imagemagick - have yet to
- # figure out what the problem is
- use imagemagick && append-ldflags $(no-as-needed)
-
- # make sure we're hdf5-1.6 backward compatible
- use hdf5 && append-flags -DH5_USE_16_API
-
- 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) \
- ${myconf} \
- || die "econf 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 "Failed to install docs"
-
- # add GDL provided routines to IDL_PATH
- echo "GDL_STARTUP=/usr/share/${PN}/pro" > 99gdl
- echo "GDL_PATH=/usr/share/${PN}" >> 99gdl
- doenvd 99gdl || die "doenvd failed"
-}
diff --git a/dev-lang/gdl/gdl-0.9_rc3.ebuild b/dev-lang/gdl/gdl-0.9_rc3.ebuild
deleted file mode 100644
index 6772458753db..000000000000
--- a/dev-lang/gdl/gdl-0.9_rc3.ebuild
+++ /dev/null
@@ -1,97 +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_rc3.ebuild,v 1.1 2010/01/12 03:52:29 markusle Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic autotools
-
-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
- =dev-java/antlr-2.7*[cxx]
- >=sci-libs/plplot-5.3
- imagemagick? ( media-gfx/imagemagick )
- hdf? ( sci-libs/hdf )
- hdf5? ( sci-libs/hdf5 )
- netcdf? ( sci-libs/netcdf )
- 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_prepare() {
- epatch "${FILESDIR}"/${P}-proj4.patch
- epatch "${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch
- epatch "${FILESDIR}"/${PN}-0.9_rc2-antlr.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"
-
- eautoreconf
-}
-
-src_configure() {
- # need to check for old plplot
- local myconf
- if has_version '<sci-libs/plplot-5.9.0'; then
- myconf="${myconf} --enable-oldplplot"
- fi
-
- # sorry, but even configure barfs with --as-needed
- # when linking against imagemagick - have yet to
- # figure out what the problem is
- use imagemagick && append-ldflags $(no-as-needed)
-
- # make sure we're hdf5-1.6 backward compatible
- use hdf5 && append-flags -DH5_USE_16_API
-
- 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) \
- ${myconf} \
- || die "econf 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 "Failed to install docs"
-
- # add GDL provided routines to IDL_PATH
- echo "GDL_STARTUP=/usr/share/${PN}/pro" > 99gdl
- echo "GDL_PATH=/usr/share/${PN}" >> 99gdl
- doenvd 99gdl || die "doenvd failed"
-}
diff --git a/dev-lang/gdl/gdl-0.9_rc4.ebuild b/dev-lang/gdl/gdl-0.9_rc4.ebuild
index d71db6298153..9db4cb8e9d48 100644
--- a/dev-lang/gdl/gdl-0.9_rc4.ebuild
+++ b/dev-lang/gdl/gdl-0.9_rc4.ebuild
@@ -1,42 +1,51 @@
# 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.5 2010/02/27 05:28:16 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.6 2010/07/04 19:57:26 jlec Exp $
EAPI="2"
-inherit eutils flag-o-matic autotools multilib
+WX_GTK_VER="2.8"
+
+inherit autotools eutils flag-o-matic multilib wxwidgets
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"
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="python fftw hdf hdf5 netcdf imagemagick"
+IUSE="fftw hdf hdf5 imagemagick netcdf openmp udunits wxwidgets X"
-RDEPEND=">=sys-libs/readline-4.3
+RDEPEND="
+ >=sys-libs/readline-4.3
sci-libs/gsl
=dev-java/antlr-2.7*[cxx]
- >=sci-libs/plplot-5.3
- imagemagick? ( media-gfx/imagemagick )
+ >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 )
- python? ( dev-python/numarray dev-python/matplotlib )
- fftw? ( >=sci-libs/fftw-3 )"
-
+ 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
epatch "${FILESDIR}"/${P}-gcc4.3.patch
epatch "${FILESDIR}"/${P}-antlr.patch
+ epatch "${FILESDIR}"/${P}-wxwidgets.patch
# we need to blow away the directory with antlr
# otherwise the build system picks up bogus
@@ -56,26 +65,23 @@ src_prepare() {
}
src_configure() {
- # need to check for old plplot
- local myconf
- if has_version '<sci-libs/plplot-5.9.0'; then
- myconf="${myconf} --enable-oldplplot"
- fi
-
# make sure we're hdf5-1.6 backward compatible
use hdf5 && append-flags -DH5_USE_16_API
- use proj && append-cppflags -DPJ_LIB__
+#Remove Python support until upstream uses numpy instead of numarray
+# $(use_with python) \
econf \
- $(use_with python) \
- $(use_with fftw) \
- $(use_with hdf) \
- $(use_with hdf5) \
- $(use_with netcdf) \
- $(use_with imagemagick Magick) \
- ${myconf} \
- || die "econf failed"
-
+ --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() {
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index ad624232715e..847679206bc1 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -13,6 +13,6 @@ Information Solutions.
</longdescription>
<use>
<flag name='hdf'>Adds support for the Hierarchical Data Format</flag>
- <flag name='proj'>Adds proj library support (geographic projections)</flag>
+ <flag name='udunits'>Support for manipulating units of physical quantities</flag>
</use>
</pkgmetadata>