From: Justin Lecher Date: Sun, 4 Jul 2010 19:57:27 +0000 (+0000) Subject: Removed python support untils numarray -> numpy is changed by upstream, #326781;... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f74a0731e20ca458cd5b9604e3c2ad299b629b45;p=gentoo.git Removed python support untils numarray -> numpy is changed by upstream, #326781; removed old, #286634; correcting RDEPEND for imagemagick support, #314237 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- 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 -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 gdl-0.9_rc4.ebuild, files/gdl-0.9_rc4-antlr.patch: diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest index 80fbfaf1e4a0..35ac5f7caec5 100644 --- a/dev-lang/gdl/Manifest +++ b/dev-lang/gdl/Manifest @@ -1,16 +1,18 @@ -AUX gdl-0.9_rc1-gcc4.3.patch 1958 RMD160 478b337439cd34012a6ce4e082729c34a9247e5e SHA1 fa673c4630e77f507f22542445fd84741e9b9cfb SHA256 c03546e074b89a33ab45df21c0799da726789db107296a533822c09f3432b1d6 -AUX gdl-0.9_rc1-magick.patch 1008 RMD160 3190ee3213e060d493be516151d6eca7745560e2 SHA1 fc369e262d8f859df959277b1b367f5c93df410c SHA256 be3fefd9e66ad45f0480403b12831d0d7023c1ff519a0e6d03f2868d00bfd2bf -AUX gdl-0.9_rc1-proj4.patch 1087 RMD160 222d10268dc3d99de76312a1e1ccef3b9f1af015 SHA1 4e4cb8e23421f73a2764bcc3ea259e9a45b0872f SHA256 cd903dd710c37a0f7ce4582625ba0339e6e16e6918dcc55b3b040e68ad3df4cf -AUX gdl-0.9_rc2-antlr.patch 1437 RMD160 3f74655e528d03c72d806e836cb932b047c14d65 SHA1 8c9aa2befb652a47bfe56ae5d620f187e2d506c1 SHA256 1814491c3f2c63ac60ac3a35df90857e3551bbe95e6a627f572fecd213765945 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX gdl-0.9_rc2-gcc4.4.patch 372 RMD160 e1f5eed5e509981f5f408b0091eee25fac2ec913 SHA1 44fbcbb7c60ed9efd3145b983a7d8549a1b3a4be SHA256 57a1bab2e97953a7181c9da325c5d9fa17755568d2c4df1febbcc64035a11ac6 -AUX gdl-0.9_rc3-proj4.patch 4261 RMD160 83d80b4010b301a504b0bc5adb926c719faa723c SHA1 375a2ac3f050ceb3461cf39df0c3cf509c3870bd SHA256 2dc32635273ab8d58c84e45839c50acee2d942ba1fffdd5f1ef442c03e836870 AUX gdl-0.9_rc4-antlr.patch 1660 RMD160 29b275369d39e1ce53a8844c7cfeb2a897246220 SHA1 34d42ac6a2af794fac47ffa9578eae99b5f6cd63 SHA256 82f6211f9171438802372d7d1cd2fd141036bcc4abd8364e84a8b036c811f7d0 AUX gdl-0.9_rc4-gcc4.3.patch 377 RMD160 b32e74d24fde6c37292b5a70450ad892a8ebbe46 SHA1 223bfc83e74f3ef788fd8e0c78f3cc82019834b4 SHA256 81d769b09bead8a103b85ff17083d3a8aac1b68b06db8d7cf2d2330787dd5f1c -DIST gdl-0.9rc2.tar.gz 1310414 RMD160 79a92daa6167ed45bedc06668dd86682ee2758cb SHA1 f2c87e0a6cecc9dab1e98232cf154d0c78771aa9 SHA256 0a3f0b5e1e70d3d1fc2356eebe1eead5c61baaf5675931f06898c2a1e621aba3 -DIST gdl-0.9rc3.tar.gz 1899718 RMD160 d5e47420462a200853fc6b33447181e477218368 SHA1 bce9b091b17ede0675f347a3aef1a46c9b0abec9 SHA256 468db2ee2533d665eebcb5dca32aad526b0af788aaa43614be371b7ef11d8daa +AUX gdl-0.9_rc4-wxwidgets.patch 2713 RMD160 66f4367194459e92261a99b9edfb63eccaf3a24a SHA1 9323d77de686f1ec41c891ce97962dc6c56278c3 SHA256 902d80ab95b22d5ba9f334289e2a8709e947815a301d3d3dc10918a138d5a86a DIST gdl-0.9rc4.tar.gz 1486747 RMD160 504f072d4dbf30403a2e9e0ed18223537619f01a SHA1 ffd133b9bc213613c89952f341defb447a87bf1d SHA256 b4b6c64c0d6b208d0a1c577986740308b388ef31b6960cf6c9cc93618b8b97b2 -EBUILD gdl-0.9_rc2.ebuild 2572 RMD160 bbeecf52a18f58b8bd41fe6439763fbba8e2053a SHA1 65fb5917c65e80e7a5db2400e1a6a38b144fa283 SHA256 6777ca6ccde758c164e5aa646786200765471eca86de8dc5f9f716ddb46c7527 -EBUILD gdl-0.9_rc3.ebuild 2531 RMD160 c5a841936c78ee220c139441d72275182d0ff285 SHA1 077e8fe0df9d9301af19da35cdad3a0bed64f6c7 SHA256 3ab77be6e7478a29d6a4c493ce8ae239bd5fe8ed9ce26138c13bb9cd860209fc -EBUILD gdl-0.9_rc4.ebuild 2519 RMD160 a23224ab62c9c9d1a9f869cfdd4c38dcd9656a52 SHA1 4772f19dcd02c6b257ffc39167a2a241c1ae4ac6 SHA256 ba44a0b3851f1f4577c459318988fe7231e26b094ac2c8abbe9f58f7e610c022 -MISC ChangeLog 4134 RMD160 4eb296c7b22919a67d83da8d53a4166467d34457 SHA1 c12862910d302d1d108b952079836afdf070b912 SHA256 82b7195205717685f9e1190566710dedc072153acfe82d0ed7864c16423cf1af -MISC metadata.xml 626 RMD160 88f7a1519569b5dca8e3f1b8817c5d34a82e56f3 SHA1 9751e41c6656a74f9f0776f8f93edbef0f147392 SHA256 68cd2fff8c6ff4c79d58d36ea648bf133b90df9b579bb8f968ed3edce7a57bc4 +EBUILD gdl-0.9_rc4.ebuild 2758 RMD160 5959149b06c62e3ae6cbc02f02f0639695a657ef SHA1 9486dac803f55fbdef8996165d1c242d48c1aab8 SHA256 2e2a167d4cde23f18e8d336290625a38b854b5bc5d826c1c2d703face790738a +MISC ChangeLog 4607 RMD160 a66a223aaa2e1b0647b4feb5d378536297b8e29f SHA1 70c30bd423df396dda4e44be5a69b70393530d4f SHA256 5fb351d07c0bed3983fab3b25ccaaf1b0a33b8c46c45b93175af8535bea5febf +MISC metadata.xml 632 RMD160 0426399f3337be71e1bb6f3ff54d2e78e1a27cdb SHA1 e9cea925da8e0a89020d35a0fe5ca285bde877f5 SHA256 b575202c0cd320efee3a0f37050f0dd960214c1f971d5b0a917d4c48dc81eb94 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkww560ACgkQgAnW8HDreRbfNwCgvjee6578S6FY4pD8q0Ay9Zlv +c0sAn3wOvH9/sPfIocTQP/VtGPKu/e1Q +=WmJa +-----END PGP SIGNATURE----- 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 - - #include -+#include -+#include -+ -+ - - #ifdef HAS_NOT_CCTYPE_H - #include -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 -+#include - - #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 -+#include - #include - - #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 - #include "sigfpehandler.hpp" -+#include - - 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 - #include - #include -+#include - - #include - #include 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 - } - - 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 - } - - 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 ' 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 ' 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 ' Adds support for the Hierarchical Data Format - Adds proj library support (geographic projections) + Support for manipulating units of physical quantities