* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/
@ 2015-10-14 15:22 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2015-10-14 15:22 UTC (permalink / raw
To: gentoo-commits
commit: 7d94d8eb5d7af9cfed628bf2305380ac7611a20c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 15:14:30 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 15:22:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d94d8eb
dev-lang/gdl: Remove old
Package-Manager: portage-2.2.20.1
dev-lang/gdl/Manifest | 1 -
dev-lang/gdl/files/0.9.2-antlr.patch | 76 -------
dev-lang/gdl/files/0.9.2-proj4.patch | 27 ---
dev-lang/gdl/files/0.9.2-semaphore.patch | 22 --
dev-lang/gdl/files/0.9.3-plwidth.patch | 158 -------------
dev-lang/gdl/files/0.9.4-gsl.patch | 62 -----
dev-lang/gdl/files/0.9.4-plplot.patch | 18 --
dev-lang/gdl/files/0.9.4-python.patch | 12 -
dev-lang/gdl/files/0.9.4-python2.patch | 17 --
dev-lang/gdl/files/0.9.4-reorder.patch | 380 -------------------------------
dev-lang/gdl/files/0.9.5-proj4.patch | 41 ----
dev-lang/gdl/gdl-0.9.4.ebuild | 161 -------------
dev-lang/gdl/gdl-0.9.5.ebuild | 156 -------------
13 files changed, 1131 deletions(-)
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 4a390d7..6c3ef62 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,2 +1 @@
-DIST gdl-0.9.4.tar.gz 2191342 SHA256 e18010cd874cad7b1fd8c752e9386571156e1fb066f2d27ecbcc15bbfc9514fa SHA512 46921eb3333a6b890187a6c75f71758e5e234b76d61a194e17de81ace10760659a4a676060490a5ef7374fd1acadf47c7f565133c19ea165e04c54a577b3c723 WHIRLPOOL a760fcf37e47235e3d21c8c852b65560894e29cfe3684bfee6e83f2d1d060dcaa41a2f9e60e41cbae55d9e5a2036518a5aad22cfd6f07b951a978e1ba2446eae
DIST gdl-0.9.5.tar.gz 2341992 SHA256 cc9635e836b5ea456cad93f8a07d589aed8649668fbd14c4aad22091991137e2 SHA512 10f004956fedc1ae5a99a9398f82e64982267a59637fc8823591b9573df9ce136b303a0fcebd774475b9bea266a640e2b66cd590c85b57b6cf505f40448e0d3a WHIRLPOOL 6ef59fc574ce26e798d30e9b4fdec9f49b82933b500901c8013c60de884ed6601d99c58ecd17221191cea121914dffce4c59211ce86b2c43fb40d43ce7ce033b
diff --git a/dev-lang/gdl/files/0.9.2-antlr.patch b/dev-lang/gdl/files/0.9.2-antlr.patch
deleted file mode 100644
index 9c8e6ab..0000000
--- a/dev-lang/gdl/files/0.9.2-antlr.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Nur gdl-0.9.2.orig/CMakeLists.txt gdl-0.9.2/CMakeLists.txt
---- gdl-0.9.2.orig/CMakeLists.txt 2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/CMakeLists.txt 2011-12-22 20:32:20.000000000 +0000
-@@ -94,6 +94,8 @@
-
- set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "Choose data install directory relative to CMAKE_INSTALL_PREFIX")
-
-+set(BUNDLED_ANTLR OFF CACHE BOOL "Use bundled ANTLR grammar ?")
-+set(ANTLRDIR "" CACHE PATH "Specify the system ANTLR directory tree")
-
- # check for 64-bit OS
- if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-@@ -143,9 +145,15 @@
- # mpi
- check_include_file(mpi.h HAVE_MPI_H)
-
--# SA: whithout it compilation of antlr fails if there's a conflicting
--# version of antlr in system-wide directories
--include_directories(src)
-+if(BUNDLED_ANTLR)
-+ # SA: whithout it compilation of antlr fails if there's a conflicting
-+ # version of antlr in system-wide directories
-+ include_directories(src)
-+else(BUNDLED_ANTLR)
-+ find_package(ANTLR QUIET)
-+ set(LIBRARIES ${LIBRARIES} ${ANTLR_LIBRARIES})
-+ include_directories(${ANTLR_INCLUDE_DIR})
-+endif(BUNDLED_ANTLR)
-
- # Ncurses MANDATORY
- # -DNCURSESDIR=DIR
-diff -Nur gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake gdl-0.9.2/CMakeModules/FindANTLR.cmake
---- gdl-0.9.2.orig/CMakeModules/FindANTLR.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ gdl-0.9.2/CMakeModules/FindANTLR.cmake 2011-12-22 21:03:34.000000000 +0000
-@@ -0,0 +1,11 @@
-+
-+
-+find_library(ANTLR_LIBRARIES NAMES antlr)
-+find_path(ANTLR_INCLUDE_DIR NAMES antlr/ANTLRUtil.hpp)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(ANTLR DEFAULT_MSG ANTLR_LIBRARIES ANTLR_INCLUDE_DIR)
-+
-+mark_as_advanced(
-+ANTLR_LIBRARIES
-+ANTLR_INCLUDE_DIR
-+)
-diff -Nur gdl-0.9.2.orig/src/CMakeLists.txt gdl-0.9.2/src/CMakeLists.txt
---- gdl-0.9.2.orig/src/CMakeLists.txt 2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/src/CMakeLists.txt 2011-12-22 20:31:27.000000000 +0000
-@@ -224,9 +224,8 @@
- widget.cpp
- )
-
--add_subdirectory(antlr)
-
--include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
-+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
- link_directories(${LINK_DIRECTORIES})
-
- if(PYTHON_MODULE) #libgdl
-@@ -237,8 +236,13 @@
- add_executable(gdl ${SOURCES})
- endif(PYTHON_MODULE)
-
--add_dependencies(gdl antlr) # be sure that antlr is built before gdl
--target_link_libraries(gdl antlr) # link antlr against gdl
-+if(BUNDLED_ANTLR)
-+ add_subdirectory(antlr)
-+ include_directories(${CMAKE_SOURCE_DIR}/src/antlr)
-+ add_dependencies(gdl antlr) # be sure that antlr is built before gdl
-+ target_link_libraries(gdl antlr) # link antlr against gdl
-+endif(BUNDLED_ANTLR)
-+
- target_link_libraries(gdl ${LIBRARIES})
- add_definitions(-DHAVE_CONFIG_H)
-
diff --git a/dev-lang/gdl/files/0.9.2-proj4.patch b/dev-lang/gdl/files/0.9.2-proj4.patch
deleted file mode 100644
index 594b6d5..0000000
--- a/dev-lang/gdl/files/0.9.2-proj4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- gdl-0.9.2.orig/CMakeLists.txt 2011-12-22 20:18:17.000000000 +0000
-+++ gdl-0.9.2/CMakeLists.txt 2011-12-24 06:12:08.000000000 +0000
-@@ -412,17 +420,17 @@
- find_package(Libproj4 QUIET)
- if(LIBPROJ4_FOUND)
- set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES} ${GSL_LIBRARIES} m)
-- check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4_NEW)
-- if(USE_LIBPROJ4_NEW)
-+ check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
-+ if(USE_LIBPROJ4)
- set(USE_LIBPROJ4 1)
-- else(USE_LIBPROJ4_NEW)
-- check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4)
-- if(NOT USE_LIBPROJ4)
-+ else(USE_LIBPROJ4)
-+ check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
-+ if(NOT USE_LIBPROJ4_NEW)
- message(FATAL_ERROR "Libproj4 is required but was not found.\n"
- "Use -DLIBPROJ4DIR=DIR to specify the Libproj4 directory tree.\n"
- "Use -DLIBPRJ4=OFF to not use it.")
-- endif(NOT USE_LIBPROJ4)
-- endif(USE_LIBPROJ4_NEW)
-+ endif(NOT USE_LIBPROJ4_NEW)
-+ endif(USE_LIBPROJ4)
- include_directories(${LIBPROJ4_INCLUDE_DIR})
- set(LIBRARIES ${LIBRARIES} ${LIBPROJ4_LIBRARIES})
- set(CMAKE_REQUIRED_LIBRARIES)
diff --git a/dev-lang/gdl/files/0.9.2-semaphore.patch b/dev-lang/gdl/files/0.9.2-semaphore.patch
deleted file mode 100644
index f2a2804..0000000
--- a/dev-lang/gdl/files/0.9.2-semaphore.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gdl-0.9.2/CMakeLists.txt 2011-11-06 22:39:45.000000000 +0000
-+++ gdl-0.9.2/CMakeLists.txt.new 2012-06-21 00:02:42.000000000 +0100
-@@ -217,6 +217,19 @@
- add_definitions(${OpenMP_CXX_FLAGS})
- set(LIBRARIES ${LIBRARIES} ${OpenMP_CXX_FLAGS})
- endif(OPENMP_FOUND)
-+else(OPENMP)
-+ # we need to define those semaphore posix symbols, do it with threads libs
-+ find_package(Threads)
-+ if(THREADS_FOUND)
-+ set(LIBRARIES ${LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-+ else(THREADS_FOUND)
-+ check_library_exists(rt sem_unlink "" HAVE_RT)
-+ if(HAVE_RT)
-+ set(LIBRARIES ${LIBRARIES} rt)
-+ else(HAVE_RT)
-+ message(FATAL_ERROR "Missing a POSIX semaphore symbols (rt or threads).\n")
-+ endif(HAVE_RT)
-+ endif(THREADS_FOUND)
- endif(OPENMP)
-
- # GSL MANDATORY
diff --git a/dev-lang/gdl/files/0.9.3-plwidth.patch b/dev-lang/gdl/files/0.9.3-plwidth.patch
deleted file mode 100644
index b09e1a8..0000000
--- a/dev-lang/gdl/files/0.9.3-plwidth.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -up gdl-0.9.3/CMakeLists.txt.plwidth gdl-0.9.3/CMakeLists.txt
---- gdl-0.9.3/CMakeLists.txt.plwidth 2013-08-27 16:55:33.806600443 -0600
-+++ gdl-0.9.3/CMakeLists.txt 2013-08-27 16:55:36.589590528 -0600
-@@ -23,6 +23,7 @@ include(CheckLibraryExists)
- include(CheckFunctionExists)
- include(CheckSymbolExists)
- include(CheckCSourceRuns)
-+include(CheckCXXSourceCompiles)
- include(FindPkgConfig)
- include(FindPackageHandleStandardArgs)
-
-@@ -302,6 +303,18 @@ if(PLPLOT_FOUND)
- message(STATUS "warning, due to old plplot library, [XYZ]TICKFORMAT option for plot axis will not be supported.\n"
- "you should upgrade to plplot version > 5.9.6")
- endif(HAVE_PLPLOT_SLABELFUNC)
-+ set(CMAKE_REQUIRED_INCLUDES "${PLPLOT_INCLUDE_DIR}")
-+ set(CMAKE_REQUIRED_LIBRARIES "${PLPLOT_LIBRARIES}")
-+ check_cxx_source_compiles("
-+#include <plplot/plstream.h>
-+int main(int argc, char **argv) {
-+ plstream *p = new plstream();
-+ PLFLT w = 0.5;
-+ p->width(w);
-+}" HAVE_PLPLOT_WIDTH)
-+ if(HAVE_PLPLOT_WIDTH)
-+ set(HAVE_PLPLOT_WIDTH 1)
-+ endif(HAVE_PLPLOT_WIDTH)
- check_library_exists("${PLPLOT_LIBRARIES}" plstrl "" PLPLOT_PRIVATE_NOT_HIDDEN)
- if(PLPLOT_PRIVATE_NOT_HIDDEN)
- set(PLPLOT_PRIVATE_NOT_HIDDEN 1)
-diff -up gdl-0.9.3/config.h.cmake.plwidth gdl-0.9.3/config.h.cmake
---- gdl-0.9.3/config.h.cmake.plwidth 2013-08-27 16:55:33.808600436 -0600
-+++ gdl-0.9.3/config.h.cmake 2013-08-27 16:55:36.589590528 -0600
-@@ -28,6 +28,7 @@
- #cmakedefine HAVE_NEXTTOWARD 1
- #cmakedefine HAVE_OLDPLPLOT 1
- #cmakedefine HAVE_PLPLOT_SLABELFUNC 1
-+#cmakedefine HAVE_PLPLOT_WIDTH 1
- #cmakedefine PLPLOT_PRIVATE_NOT_HIDDEN 1
- #cmakedefine PLPLOT_HAS_LEGEND
- #ifndef HAVE_STDINT_H
-diff -up gdl-0.9.3/src/plotting_contour.cpp.plwidth gdl-0.9.3/src/plotting_contour.cpp
---- gdl-0.9.3/src/plotting_contour.cpp.plwidth 2013-08-27 16:55:33.883600169 -0600
-+++ gdl-0.9.3/src/plotting_contour.cpp 2013-08-27 16:55:36.590590524 -0600
-@@ -705,7 +705,11 @@ namespace lib
- actStream->pat(1,&ori,&spa);
-
- if (docolors) actStream->Color ( ( *colors )[i%colors->N_Elements ( )], decomposed, (PLINT)colorindex_table_0_color );
-+#if (HAVE_PLPLOT_WIDTH)
-+ if (dothick) actStream->width ( static_cast<PLFLT>(( *thick )[i%thick->N_Elements ( )]));
-+#else
- if (dothick) actStream->wid ( ( *thick )[i%thick->N_Elements ( )]);
-+#endif
- if (dostyle) gdlLineStyle(actStream, ( *style )[i%style->N_Elements ( )]);
- actStream->shade( map, xEl, yEl, isLog?doIt:NULL, xStart, xEnd, yStart, yEnd,
- clevel[i], clevel[i+1],
-@@ -788,7 +792,11 @@ namespace lib
- actStream->stransform(gdl3dTo2dTransformContour, &Data3d);
- }
- if (docolors) actStream->Color ( ( *colors )[i%colors->N_Elements ( )], decomposed, 2);
-+#if (HAVE_PLPLOT_WIDTH)
-+ if (dothick) actStream->width ( static_cast<PLFLT>(( *thick )[i%thick->N_Elements ( )]));
-+#else
- if (dothick) actStream->wid ( ( *thick )[i%thick->N_Elements ( )]);
-+#endif
- if (dostyle) gdlLineStyle(actStream, ( *style )[i%style->N_Elements ( )]);
- if (dolabels) actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING,
- (PLINT)(*labels)[i%labels->N_Elements()] );
-diff -up gdl-0.9.3/src/plotting.cpp.plwidth gdl-0.9.3/src/plotting.cpp
---- gdl-0.9.3/src/plotting.cpp.plwidth 2013-08-27 16:55:33.886600158 -0600
-+++ gdl-0.9.3/src/plotting.cpp 2013-08-27 16:58:33.707952697 -0600
-@@ -1891,7 +1891,11 @@ namespace lib
- DFloatGDL* charthickVect=e->GetKWAs<DFloatGDL>( charthickIx );
- charthick=(*charthickVect)[0];
- }
-+#if (HAVE_PLPLOT_WIDTH)
-+ a->width(static_cast<PLFLT>(charthick));
-+#else
- a->wid(charthick);
-+#endif
- }
-
- void gdlSetAxisCharsize(EnvT *e, GDLGStream *a, string axis)
-@@ -1919,7 +1923,11 @@ namespace lib
-
- e->AssureFloatScalarKWIfPresent("THICK", thick);
- if ( thick<=0.0 ) thick=1.0;
-+#if (HAVE_PLPLOT_WIDTH)
-+ a->width(static_cast<PLFLT>(thick));
-+#else
- a->wid(static_cast<PLINT>(floor(thick-0.5)));
-+#endif
- }
-
- //LINESTYLE
-@@ -2932,7 +2940,11 @@ namespace lib
- a->smaj((PLFLT)OtherAxisSizeInMm, 1.0); //set base ticks to default 0.02 viewport converted to mm.
- a->smin((PLFLT)OtherAxisSizeInMm/2.0,1.0); //idem min (plplt defaults)
- //thick for box and ticks.
-+#if (HAVE_PLPLOT_WIDTH)
-+ a->width(static_cast<PLFLT>(Thick));
-+#else
- a->wid(Thick);
-+#endif
- //ticks or grid eventually with style and length:
- if (abs(TickLen)<1e-6) Opt=""; else Opt="st"; //remove ticks if ticklen=0
- if (TickLen<0) {Opt+="i"; TickLen=-TickLen;}
-@@ -2977,7 +2989,11 @@ namespace lib
- else if (axis=="Y") a->box("", 0.0, 0 , Opt.c_str(), 0.0, 0);
- }
- //reset charsize & thick
-+#if (HAVE_PLPLOT_WIDTH)
-+ a->width(1.0);
-+#else
- a->wid(1);
-+#endif
- a->sizeChar(1.0);
- }
- return 0;
-@@ -3120,7 +3136,11 @@ namespace lib
- a->smaj((PLFLT)OtherAxisSizeInMm, 1.0); //set base ticks to default 0.02 viewport converted to mm.
- a->smin((PLFLT)OtherAxisSizeInMm/2.0,1.0); //idem min (plplt defaults)
- //thick for box and ticks.
-+#if (HAVE_PLPLOT_WIDTH)
-+ a->width(static_cast<PLFLT>(Thick));
-+#else
- a->wid(Thick);
-+#endif
- //ticks or grid eventually with style and length:
- if (abs(TickLen)<1e-6) Opt=""; else Opt="st"; //remove ticks if ticklen=0
- if (TickLen<0) {Opt+="i"; TickLen=-TickLen;}
-@@ -3145,7 +3165,11 @@ namespace lib
- else if (axis=="Z") a->box3("","",0,0,"","",0,0, Opt.c_str(), "", TickInterval, Minor);
- }
- //reset charsize & thick
-+#if (HAVE_PLPLOT_WIDTH)
-+ a->width(1.0);
-+#else
- a->wid(1);
-+#endif
- a->sizeChar(1.0);
- }
- return 0;
-diff -up gdl-0.9.3/src/plotting_xyouts.cpp.plwidth gdl-0.9.3/src/plotting_xyouts.cpp
---- gdl-0.9.3/src/plotting_xyouts.cpp.plwidth 2013-08-27 16:55:33.892600137 -0600
-+++ gdl-0.9.3/src/plotting_xyouts.cpp 2013-08-27 16:55:36.591590521 -0600
-@@ -339,7 +339,11 @@ namespace lib
- //plot!
- if (docharsize) actStream->sizeChar(( *size )[i%size->N_Elements ( )]);
- if (docolor) actStream->Color ( ( *color )[i%color->N_Elements ( )], decomposed, 2);
-+#if (HAVE_PLPLOT_WIDTH)
-+ if (docharthick) actStream->width ( static_cast<PLFLT>(( *charthick )[i%charthick->N_Elements ( )]));
-+#else
- if (docharthick) actStream->wid ( ( *charthick )[i%charthick->N_Elements ( )]);
-+#endif
- //orientation word is not orientation page depending on axes increment direction [0..1] vs. [1..0]
- PLFLT oriD=(( *orientation )[i%orientation->N_Elements ( )]); //ori DEVICE
- PLFLT oriW=oriD; //ori WORLD
diff --git a/dev-lang/gdl/files/0.9.4-gsl.patch b/dev-lang/gdl/files/0.9.4-gsl.patch
deleted file mode 100644
index 3a96a41..0000000
--- a/dev-lang/gdl/files/0.9.4-gsl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -up gdl-0.9.4/src/gsl_matrix.cpp.gsl gdl-0.9.4/src/gsl_matrix.cpp
---- gdl-0.9.4/src/gsl_matrix.cpp.gsl 2013-09-20 10:10:02.000000000 -0600
-+++ gdl-0.9.4/src/gsl_matrix.cpp 2013-10-03 13:50:41.089660703 -0600
-@@ -41,10 +41,11 @@ namespace lib {
- const int szdbl=sizeof(DDouble);
- const int szflt=sizeof(DFloat);
- const int szlng=sizeof(DLong);
-+ const int szlng64=sizeof(DLong64);
-
- void ludc_pro( EnvT* e)
- {
-- // cout << szdbl << " " <<szflt << " " << szlng << endl;
-+ // cout << szdbl << " " <<szflt << " " << szlng << " " szlng64 << endl;
-
- SizeT nParam=e->NParam(1);
- // if( nParam == 0)
-@@ -120,9 +121,15 @@ namespace lib {
- dimension dim1(&n, (SizeT) 1);
- BaseGDL** p1D = &e->GetPar( 1);
- GDLDelete((*p1D));
-- *p1D = new DLongGDL(dim1, BaseGDL::NOZERO);
-- memcpy(&(*(DLongGDL*) *p1D)[0], p->data,
-- p0->Dim(0)*szlng);
-+ if (sizeof(size_t) == szlng) {
-+ *p1D = new DLongGDL(dim1, BaseGDL::NOZERO);
-+ memcpy(&(*(DLongGDL*) *p1D)[0], p->data,
-+ p0->Dim(0)*szlng);
-+ } else {
-+ *p1D = new DLong64GDL(dim1, BaseGDL::NOZERO);
-+ memcpy(&(*(DLong64GDL*) *p1D)[0], p->data,
-+ p0->Dim(0)*szlng64);
-+ }
-
- // gsl_matrix_free(mat);
- // gsl_permutation_free(p);
-@@ -189,10 +196,15 @@ namespace lib {
- GDLGuard<gsl_matrix> g1(mat,gsl_matrix_free);
- memcpy(mat->data, &(*p0D)[0], nEl*szdbl);
-
-- DLongGDL* p1L =e->GetParAs<DLongGDL>(1);
- gsl_permutation *p = gsl_permutation_alloc (nEl1);
- GDLGuard<gsl_permutation> g2(p,gsl_permutation_free);
-- memcpy(p->data, &(*p1L)[0], nEl1*szlng);
-+ if (sizeof(size_t) == szlng) {
-+ DLongGDL* p1L =e->GetParAs<DLongGDL>(1);
-+ memcpy(p->data, &(*p1L)[0], nEl1*szlng);
-+ } else {
-+ DLong64GDL* p1L =e->GetParAs<DLong64GDL>(1);
-+ memcpy(p->data, &(*p1L)[0], nEl1*szlng64);
-+ }
-
- DDoubleGDL *p2D = e->GetParAs<DDoubleGDL>(2);
- gsl_vector *b = gsl_vector_alloc(nEl2);
-@@ -222,7 +234,7 @@ namespace lib {
- DDoubleGDL* res = new DDoubleGDL( p2->Dim(), BaseGDL::NOZERO);
- memcpy(&(*res)[0], x->data, nEl1*szdbl);
-
--// gsl_matrix_free(mat);
-+// gsl_matrix_free(mat);Parameter
- // gsl_vector_free(x);
- // gsl_permutation_free(p);
- // b ???
diff --git a/dev-lang/gdl/files/0.9.4-plplot.patch b/dev-lang/gdl/files/0.9.4-plplot.patch
deleted file mode 100644
index fac18ec..0000000
--- a/dev-lang/gdl/files/0.9.4-plplot.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- CMakeModules/FindPlplot.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeModules/FindPlplot.cmake b/CMakeModules/FindPlplot.cmake
-index a503f8c..cdaeb24 100644
---- a/CMakeModules/FindPlplot.cmake
-+++ b/CMakeModules/FindPlplot.cmake
-@@ -9,8 +9,8 @@
- #
-
-
--find_library(PLPLOT_LIBRARY NAMES plplotd)
--find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd)
-+find_library(PLPLOT_LIBRARY NAMES plplotd plplot)
-+find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd plplotcxx)
- set(PLPLOT_LIBRARIES ${PLPLOT_LIBRARY} ${PLPLOTCXX_LIBRARY})
- find_path(PLPLOT_INCLUDE_DIR NAMES plplot/plplot.h)
- include(FindPackageHandleStandardArgs)
diff --git a/dev-lang/gdl/files/0.9.4-python.patch b/dev-lang/gdl/files/0.9.4-python.patch
deleted file mode 100644
index 709f8c1..0000000
--- a/dev-lang/gdl/files/0.9.4-python.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gdl-0.9.4/src/pythongdl.cpp.python gdl-0.9.4/src/pythongdl.cpp
---- gdl-0.9.4/src/pythongdl.cpp.python 2013-07-26 03:30:32.000000000 -0600
-+++ gdl-0.9.4/src/pythongdl.cpp 2013-09-30 10:24:27.092666180 -0600
-@@ -373,7 +373,7 @@ PyObject *GDLSub( PyObject *self, PyObje
- if( libCall)
- e = new EnvT( NULL, sub);
- else
-- e = new EnvUDT( NULL, sub);
-+ e = new EnvUDT( NULL, static_cast<DSubUD*>(sub));
-
- Guard< EnvBaseT> e_guard( e);
-
diff --git a/dev-lang/gdl/files/0.9.4-python2.patch b/dev-lang/gdl/files/0.9.4-python2.patch
deleted file mode 100644
index 8dc9232..0000000
--- a/dev-lang/gdl/files/0.9.4-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1fda8ee..e2170b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -615,8 +615,8 @@ if(PYTHON OR PYTHON_MODULE)
- else()
- set(PythonLibs_FIND_VERSION 2)
- endif()
-- find_package(PythonLibs)
- include(FindPythonInterp)
-+ find_package(PythonLibs)
- endif()
- set(USE_PYTHON ${PYTHONLIBS_FOUND})
- if(PYTHONLIBS_FOUND)
diff --git a/dev-lang/gdl/files/0.9.4-reorder.patch b/dev-lang/gdl/files/0.9.4-reorder.patch
deleted file mode 100644
index d871757..0000000
--- a/dev-lang/gdl/files/0.9.4-reorder.patch
+++ /dev/null
@@ -1,380 +0,0 @@
-diff -up gdl-0.9.4/src/allix.hpp.reorder gdl-0.9.4/src/allix.hpp
---- gdl-0.9.4/src/allix.hpp.reorder 2012-12-11 10:39:35.000000000 -0700
-+++ gdl-0.9.4/src/allix.hpp 2013-10-04 10:59:22.666594845 -0600
-@@ -344,9 +344,9 @@ private:
- public:
- AllIxAllIndexedT( ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_)
- : ixList( ixList_)
-+ , varStride( varStride_)
- , acRank( acRank_)
- , nIx( nIx_)
-- , varStride( varStride_)
- {}
- ~AllIxAllIndexedT() {}
-
-@@ -384,11 +384,11 @@ private:
- public:
- AllIxNewMultiT( ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
- : ixList( ixList_)
-- , acRank( acRank_)
-- , nIx( nIx_)
- , varStride( varStride_)
- , nIterLimit( nIterLimit_)
- , stride( stride_)
-+ , acRank( acRank_)
-+ , nIx( nIx_)
- {
- add = 0;
- assert( varStride[0] == 1);
-@@ -440,10 +440,10 @@ private:
- public:
- AllIxNewMulti2DT( ArrayIndexVectorT* ixList_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
- : ixList( ixList_)
-- , nIx( nIx_)
- , varStride( varStride_)
- , nIterLimit( nIterLimit_)
- , stride( stride_)
-+ , nIx( nIx_)
- {
- add = 0;
- if( !(*ixList)[0]->Indexed())
-@@ -499,11 +499,11 @@ private:
- public:
- AllIxNewMultiNoneIndexedT( ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
- : ixList( ixList_)
-- , acRank( acRank_)
-- , nIx( nIx_)
- , varStride( varStride_)
- , nIterLimit( nIterLimit_)
- , stride( stride_)
-+ , acRank( acRank_)
-+ , nIx( nIx_)
- {
- assert( varStride[0] == 1);
- add = 0;
-@@ -548,10 +548,10 @@ private:
- public:
- AllIxNewMultiNoneIndexed2DT( ArrayIndexVectorT* ixList_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
- : ixList( ixList_)
-- , nIx( nIx_)
- , varStride( varStride_)
- , nIterLimit( nIterLimit_)
- , stride( stride_)
-+ , nIx( nIx_)
- {
- assert( varStride[0] == 1);
- ixListStride[0] = (*ixList)[0]->GetStride();
-@@ -593,11 +593,11 @@ public:
- AllIxNewMultiOneVariableIndexNoIndexT( RankT gt1Rank, SizeT add_,
- ArrayIndexVectorT* ixList_, SizeT acRank_, SizeT nIx_, const SizeT* varStride_, SizeT* nIterLimit_, SizeT* stride_)
- : ixList( ixList_)
-- , acRank( acRank_)
-- , nIx( nIx_)
- , varStride( varStride_)
- , nIterLimit( nIterLimit_)
- , stride( stride_)
-+ , acRank( acRank_)
-+ , nIx( nIx_)
- , add( add_)
- , variableIndex( gt1Rank)
- {
-@@ -642,11 +642,11 @@ public:
- SizeT acRank_, SizeT nIx_, const SizeT* varStride_,
- SizeT* nIterLimit_, SizeT* stride_)
- : ixList( ixList_)
-- , acRank( acRank_)
-- , nIx( nIx_)
- , varStride( varStride_)
- , nIterLimit( nIterLimit_)
- , stride( stride_)
-+ , acRank( acRank_)
-+ , nIx( nIx_)
- , add( add_)
- , variableIndex( gt1Rank)
- {
-diff -up gdl-0.9.4/src/arrayindex.hpp.reorder gdl-0.9.4/src/arrayindex.hpp
---- gdl-0.9.4/src/arrayindex.hpp.reorder 2013-09-17 10:46:19.000000000 -0600
-+++ gdl-0.9.4/src/arrayindex.hpp 2013-10-04 11:00:58.849879562 -0600
-@@ -303,7 +303,7 @@ private:
- RangeT s;
- BaseGDL* rawData; // for overloaded object indexing
-
-- CArrayIndexScalar( const CArrayIndexScalar& c): s( c.s), sInit( c.sInit)
-+ CArrayIndexScalar( const CArrayIndexScalar& c): sInit( c.sInit), s( c.s)
- {
- assert( c.rawData != NULL);
- rawData = c.rawData->Dup();
-diff -up gdl-0.9.4/src/arrayindexlistnoassoct.hpp.reorder gdl-0.9.4/src/arrayindexlistnoassoct.hpp
---- gdl-0.9.4/src/arrayindexlistnoassoct.hpp.reorder 2013-07-04 17:24:44.000000000 -0600
-+++ gdl-0.9.4/src/arrayindexlistnoassoct.hpp 2013-10-04 11:24:02.893867004 -0600
-@@ -59,8 +59,8 @@ public:
- { nParam = 0;}
-
- ArrayIndexListOneNoAssocT( const ArrayIndexListOneNoAssocT& cp):
-- cleanupIx(),
- ArrayIndexListT( cp),
-+ cleanupIx(),
- ix( cp.ix->Dup()),
- allIx( NULL)
- {
-diff -up gdl-0.9.4/src/arrayindexlistt.hpp.reorder gdl-0.9.4/src/arrayindexlistt.hpp
---- gdl-0.9.4/src/arrayindexlistt.hpp.reorder 2013-09-17 10:46:19.000000000 -0600
-+++ gdl-0.9.4/src/arrayindexlistt.hpp 2013-10-04 11:23:35.607069888 -0600
-@@ -130,8 +130,8 @@ public:
- { nParam = 0;}
-
- ArrayIndexListOneT( const ArrayIndexListOneT& cp):
-- cleanupIx(),
- ArrayIndexListT( cp),
-+ cleanupIx(),
- ix( cp.ix->Dup()),
- allIx( NULL)
- {
-diff -up gdl-0.9.4/src/deviceps.hpp.reorder gdl-0.9.4/src/deviceps.hpp
---- gdl-0.9.4/src/deviceps.hpp.reorder 2013-07-03 15:48:06.000000000 -0600
-+++ gdl-0.9.4/src/deviceps.hpp 2013-10-04 13:14:48.283746779 -0600
-@@ -441,9 +441,9 @@ private:
- }
-
- public:
-- DevicePS(): Graphics(), fileName( "gdl.ps"), actStream( NULL), color(0),
-- decomposed( 0), encapsulated(false), scale(1.), XPageSize(17.78), YPageSize(12.7),
-- XOffset(0.0),YOffset(0.0)
-+ DevicePS(): Graphics(), fileName( "gdl.ps"), actStream( NULL),
-+ XPageSize(17.78), YPageSize(12.7), XOffset(0.0),YOffset(0.0),
-+ color(0), decomposed( 0), encapsulated(false), scale(1.)
- {
- name = "PS";
-
-diff -up gdl-0.9.4/src/dnode.cpp.reorder gdl-0.9.4/src/dnode.cpp
---- gdl-0.9.4/src/dnode.cpp.reorder 2012-09-18 08:19:18.000000000 -0600
-+++ gdl-0.9.4/src/dnode.cpp 2013-10-04 12:02:48.601416601 -0600
-@@ -55,9 +55,10 @@ DNode::DNode( const DNode& cp):
- // keepRight( false),
- CommonAST( cp), //down(), right(),
- lineNumber( cp.getLine()), cData(NULL),
-- var(cp.var), arrIxList(NULL),arrIxListNoAssoc(NULL),
-+ var(cp.var),
- libFun( cp.libFun),
- libPro( cp.libPro),
-+ arrIxList(NULL),arrIxListNoAssoc(NULL),
- labelStart( cp.labelStart), labelEnd( cp.labelEnd)
- {
- if( cp.cData != NULL) cData = cp.cData->Dup();
-diff -up gdl-0.9.4/src/dnode.hpp.reorder gdl-0.9.4/src/dnode.hpp
-diff -up gdl-0.9.4/src/dpro.cpp.reorder gdl-0.9.4/src/dpro.cpp
---- gdl-0.9.4/src/dpro.cpp.reorder 2013-09-17 03:03:25.000000000 -0600
-+++ gdl-0.9.4/src/dpro.cpp 2013-10-04 13:05:23.169223727 -0600
-@@ -200,8 +200,8 @@ DSubUD::~DSubUD()
- DSubUD::DSubUD(const string& n,const string& o,const string& f) :
- DSub(n,o), file(f),
- tree( NULL),
-- labelList(),
- compileOpt(GDLParser::NONE),
-+ labelList(),
- nForLoops( 0)
- {
- if( o != "")
-diff -up gdl-0.9.4/src/envt.cpp.reorder gdl-0.9.4/src/envt.cpp
---- gdl-0.9.4/src/envt.cpp.reorder 2013-09-25 05:55:21.000000000 -0600
-+++ gdl-0.9.4/src/envt.cpp 2013-10-04 13:08:17.081114086 -0600
-@@ -107,15 +107,15 @@ void EnvUDT::operator delete( void *ptr)
-
-
- EnvBaseT::EnvBaseT( ProgNodeP cN, DSub* pro_):
-- env(),
- toDestroy(),
-+ env(),
- pro(pro_),
-- extra(NULL),
-- newEnv(NULL),
- callingNode( cN),
- lineNumber( 0),
-- obj(false)
-- ,ptrToReturnValue(NULL)
-+ obj(false),
-+ extra(NULL),
-+ newEnv(NULL),
-+ ptrToReturnValue(NULL)
- //, toDestroyInitialIndex( toDestroy.size())
- {}
-
-diff -up gdl-0.9.4/src/envt.hpp.reorder gdl-0.9.4/src/envt.hpp
---- gdl-0.9.4/src/envt.hpp.reorder 2013-09-26 04:47:48.000000000 -0600
-+++ gdl-0.9.4/src/envt.hpp 2013-10-04 10:55:21.892428311 -0600
-@@ -863,7 +863,7 @@ public:
- typedef SizeT size_type;
- typedef EnvUDT* pointer_type;
-
-- EnvStackT(): sz(defaultStackDepth), top(0)
-+ EnvStackT(): top(0), sz(defaultStackDepth)
- {
- envStackFrame = new EnvUDT* [ sz+1];
- envStack = envStackFrame + 1;
-diff -up gdl-0.9.4/src/gdlexception.cpp.reorder gdl-0.9.4/src/gdlexception.cpp
---- gdl-0.9.4/src/gdlexception.cpp.reorder 2013-06-23 17:07:32.000000000 -0600
-+++ gdl-0.9.4/src/gdlexception.cpp 2013-10-04 14:00:32.102348401 -0600
-@@ -43,9 +43,9 @@ GDLException::GDLException(DLong eC, con
- errorNodeP( NULL),
- errorCode(eC),
- line( 0), col( 0), prefix( pre),
-+ arrayexprIndexeeFailed(false),
- ioException( false),
-- targetEnv( NULL),
-- arrayexprIndexeeFailed(false)
-+ targetEnv( NULL)
- {
- if(decorate && interpreter!=NULL && interpreter->CallStack().size()>0)
- {
-@@ -97,9 +97,9 @@ GDLException::GDLException(const RefDNod
- errorNodeP( NULL),
- errorCode(-1),
- line( 0), col( 0), prefix( true),
-+ arrayexprIndexeeFailed(false),
- ioException( false),
-- targetEnv( NULL),
-- arrayexprIndexeeFailed(false)
-+ targetEnv( NULL)
- {
- if(interpreter!=NULL && interpreter->CallStack().size()>0)
- {
-@@ -122,9 +122,9 @@ GDLException::GDLException(DLong eC, con
- errorNodeP( NULL),
- errorCode(eC),
- line( 0), col( 0), prefix( true),
-+ arrayexprIndexeeFailed(false),
- ioException( false),
-- targetEnv( NULL),
-- arrayexprIndexeeFailed(false)
-+ targetEnv( NULL)
- {
- if(interpreter!=NULL && interpreter->CallStack().size()>0)
- {
-@@ -148,9 +148,9 @@ GDLException::GDLException(const ProgNod
- errorNodeP( eN),
- errorCode(-1),
- line( 0), col( 0), prefix( true),
-+ arrayexprIndexeeFailed(false),
- ioException( false),
-- targetEnv( NULL),
-- arrayexprIndexeeFailed(false)
-+ targetEnv( NULL)
- {
- if( overWriteNode && interpreter!=NULL && interpreter->CallStack().size()>0)
- {
-@@ -177,9 +177,9 @@ GDLException::GDLException(DLong eC, con
- errorNodeP( eN),
- errorCode(eC),
- line( 0), col( 0), prefix( true),
-+ arrayexprIndexeeFailed(false),
- ioException( false),
-- targetEnv( NULL),
-- arrayexprIndexeeFailed(false)
-+ targetEnv( NULL)
- {
- if( overWriteNode && interpreter!=NULL && interpreter->CallStack().size()>0)
- {
-@@ -207,9 +207,9 @@ GDLException::GDLException(SizeT l, Size
- errorNodeP( NULL),
- errorCode(-1),
- line( l), col( c), prefix( true),
-+ arrayexprIndexeeFailed(false),
- ioException( false),
-- targetEnv( NULL),
-- arrayexprIndexeeFailed(false)
-+ targetEnv( NULL)
- {
- if(interpreter!=NULL && interpreter->CallStack().size()>0)
- {
-@@ -232,8 +232,8 @@ GDLException::GDLException(DLong eC, Siz
- errorNodeP( NULL),
- errorCode(eC),
- line( l), col( c), prefix( true),
-- targetEnv( NULL),
-- arrayexprIndexeeFailed(false)
-+ arrayexprIndexeeFailed(false),
-+ targetEnv( NULL)
- {
- if(interpreter!=NULL && interpreter->CallStack().size()>0)
- {
-diff -up gdl-0.9.4/src/gdlexception.hpp.reorder gdl-0.9.4/src/gdlexception.hpp
---- gdl-0.9.4/src/gdlexception.hpp.reorder 2013-06-23 17:07:32.000000000 -0600
-+++ gdl-0.9.4/src/gdlexception.hpp 2013-10-04 11:12:58.332125288 -0600
-@@ -66,18 +66,18 @@ public:
- errorNodeP( NULL),
- errorCode(-1),
- line( 0), col( 0), prefix( true),
-+ arrayexprIndexeeFailed(false),
- ioException( false),
-- targetEnv( NULL),
-- arrayexprIndexeeFailed(false)
-+ targetEnv( NULL)
- {}
- GDLException( DLong eC): ANTLRException(),
- errorNode(static_cast<RefDNode>(antlr::nullAST)),
- errorNodeP( NULL),
- errorCode(eC),
- line( 0), col( 0), prefix( true),
-+ arrayexprIndexeeFailed(false),
- ioException( false),
-- targetEnv( NULL),
-- arrayexprIndexeeFailed(false)
-+ targetEnv( NULL)
- {}
- GDLException(const std::string& s, bool pre = true, bool decorate=true);
- GDLException(const RefDNode eN, const std::string& s);
-diff -up gdl-0.9.4/src/prognode.cpp.reorder gdl-0.9.4/src/prognode.cpp
---- gdl-0.9.4/src/prognode.cpp.reorder 2013-09-27 18:47:49.000000000 -0600
-+++ gdl-0.9.4/src/prognode.cpp 2013-10-04 14:01:11.490342867 -0600
-@@ -54,19 +54,19 @@ return nonCopyNodeLookupArray;
-
- // tanslation RefDNode -> ProgNode
- ProgNode::ProgNode( const RefDNode& refNode):
-+ ttype( refNode->getType()),
-+ text( refNode->getText()),
- keepRight( false),
- keepDown( false),
- breakTarget( NULL),
-- ttype( refNode->getType()),
-- text( refNode->getText()),
- down( NULL),
- right( NULL),
-- lineNumber( refNode->getLine()),
- cData( refNode->StealCData()), // stealing is crucial here because references might exist
-+ var( refNode->var),
- // as arrayindices
-- libPro( refNode->libPro),
- libFun( refNode->libFun),
-- var( refNode->var),
-+ libPro( refNode->libPro),
-+ lineNumber( refNode->getLine()),
- arrIxList( refNode->StealArrIxList()),
- arrIxListNoAssoc( refNode->StealArrIxNoAssocList()),
- // arrIxList( refNode->CloneArrIxList()),
-diff -up gdl-0.9.4/src/prognodeexpr.cpp.reorder gdl-0.9.4/src/prognodeexpr.cpp
---- gdl-0.9.4/src/prognodeexpr.cpp.reorder 2013-09-26 05:08:39.000000000 -0600
-+++ gdl-0.9.4/src/prognodeexpr.cpp 2013-10-04 13:20:36.660155916 -0600
-@@ -49,18 +49,18 @@ BinaryExprNC::BinaryExprNC( const RefDNo
- }
-
- ProgNode::ProgNode(): // for NULLProgNode
-+ ttype( antlr::Token::NULL_TREE_LOOKAHEAD),
-+ text( "NULLProgNode"),
- keepRight( false),
- keepDown( false),
- breakTarget( NULL),
-- ttype( antlr::Token::NULL_TREE_LOOKAHEAD),
-- text( "NULLProgNode"),
- down( NULL),
- right( NULL),
-- lineNumber( 0),
- cData( NULL),
-- libPro( NULL),
-- libFun( NULL),
- var( NULL),
-+ libFun( NULL),
-+ libPro( NULL),
-+ lineNumber( 0),
- labelStart( 0),
- labelEnd( 0)
- {}
diff --git a/dev-lang/gdl/files/0.9.5-proj4.patch b/dev-lang/gdl/files/0.9.5-proj4.patch
deleted file mode 100644
index 4b2ebcc..0000000
--- a/dev-lang/gdl/files/0.9.5-proj4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- CMakeLists.txt | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c4b3278..f9ed49d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -637,17 +637,17 @@ if(LIBPROJ4)
- if(LIBPROJ4_FOUND)
- set(CMAKE_REQUIRED_LIBRARIES ${LIBPROJ4_LIBRARIES} ${GSL_LIBRARIES} m)
-
-- check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
-- if(USE_LIBPROJ4_NEW)
-+ check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4)
-+ if(USE_LIBPROJ4)
- # check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
- # if(USE_LIBPROJ4)
-
- # define USE_LIB_PROJ4 in any case
- set(USE_LIBPROJ4 1)
-
-- else(USE_LIBPROJ4_NEW)
-- check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4)
-- if(NOT USE_LIBPROJ4)
-+ else(USE_LIBPROJ4)
-+ check_library_exists("${LIBPROJ4_LIBRARIES}" proj_init "" USE_LIBPROJ4_NEW)
-+ if(NOT USE_LIBPROJ4_NEW)
- # else(USE_LIBPROJ4)
- # check_library_exists("${LIBPROJ4_LIBRARIES}" pj_init "" USE_LIBPROJ4_NEW)
- # if(NOT USE_LIBPROJ4_NEW)
-@@ -656,8 +656,8 @@ if(LIBPROJ4)
- "Use -DLIBPROJ4DIR=DIR to specify the Libproj4 directory tree.\n"
- "Use -DLIBPRJ4=OFF to not use it.")
-
-- endif(NOT USE_LIBPROJ4)
-- endif(USE_LIBPROJ4_NEW)
-+ endif(NOT USE_LIBPROJ4_NEW)
-+ endif(USE_LIBPROJ4)
- # endif(NOT USE_LIBPROJ4_NEW)
- # endif(USE_LIBPROJ4)
-
diff --git a/dev-lang/gdl/gdl-0.9.4.ebuild b/dev-lang/gdl/gdl-0.9.4.ebuild
deleted file mode 100644
index 30bb04c..0000000
--- a/dev-lang/gdl/gdl-0.9.4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
- proj postscript python static-libs udunits wxwidgets"
-
-RDEPEND="
- sci-libs/gsl:0=
- sci-libs/plplot:0=[-dynamic]
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- sys-libs/zlib:0=
- x11-libs/libX11:0=
- fftw? ( sci-libs/fftw:3.0= )
- grib? ( sci-libs/grib_api:0= )
- gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
- hdf? ( sci-libs/hdf:0= )
- hdf5? ( sci-libs/hdf5:0= )
- imagemagick? (
- || (
- media-gfx/graphicsmagick[cxx]
- media-gfx/imagemagick[cxx]
- )
- )
- netcdf? ( sci-libs/netcdf )
- proj? ( sci-libs/proj )
- postscript? ( dev-libs/pslib )
- python? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- udunits? ( sci-libs/udunits )
- wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
-
-DEPEND="${RDEPEND}
- >=dev-java/antlr-2.7.7-r5:0[cxx,java,script]
- virtual/pkgconfig
- eigen? ( dev-cpp/eigen:3 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}"/0.9.2-antlr.patch
- "${FILESDIR}"/0.9.2-include.patch
- "${FILESDIR}"/0.9.2-proj4.patch
- "${FILESDIR}"/0.9.2-semaphore.patch
- "${FILESDIR}"/0.9.3-plwidth.patch
- "${FILESDIR}"/0.9.4-gsl.patch
- "${FILESDIR}"/0.9.4-python.patch
- "${FILESDIR}"/0.9.4-reorder.patch
- "${FILESDIR}"/0.9.4-plplot.patch
- "${FILESDIR}"/0.9.4-python2.patch
-)
-
-pkg_setup() {
- use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
- die "You have openmp enabled but your current g++ does not support it"
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
- # make sure antlr includes are from system and rebuild the sources with it
- # https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
- rm -r src/antlr || die
- einfo "Regenerating grammar"
- pushd src > /dev/null
- local i
- for i in *.g; do antlr ${i} || die ; done
- popd > /dev/null
-
- # gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
- sed -i \
- -e 's:proj4:proj:' \
- -e 's:lib_proj\.h:proj_api\.h:g' \
- CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
-
- # gentoo: avoid install files in datadir directory
- sed -i \
- -e '/AUTHORS/d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- # MPI is still very buggy
- # x11=off does not compile
- local mycmakeargs=(
- -DMPICH=OFF
- -DBUNDLED_ANTLR=OFF
- -DX11=ON
- $(cmake-utils_use fftw)
- $(cmake-utils_use eigen EIGEN3)
- $(cmake-utils_use grib)
- $(cmake-utils_use gshhs)
- $(cmake-utils_use hdf)
- $(cmake-utils_use hdf5)
- $(cmake-utils_use netcdf)
- $(cmake-utils_use openmp)
- $(cmake-utils_use proj LIBPROJ4)
- $(cmake-utils_use postscript PSLIB)
- $(cmake-utils_use udunits)
- $(cmake-utils_use wxwidgets)
- )
- if use imagemagick; then
- if has_version media-gfx/graphicsmagick[cxx]; then
- mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
- else
- mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
- fi
- else
- mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
- fi
- configuration() {
- mycmakeargs+=( $@ )
- cmake-utils_src_configure
- }
- configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
- use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
- cmake-utils_src_compile
- use python && python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
- # there is check target instead of the ctest to define some LDPATH
- Xemake -C "${BUILD_DIR}" check
-}
-
-src_install() {
- cmake-utils_src_install
- if use python; then
- installation() {
- mv src/libgdl.so GDL.so || die
- python_domodule GDL.so
- }
- python_foreach_impl run_in_build_dir installation
- dodoc PYTHON.txt
- fi
-
- echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
- doenvd 50gdl
-}
diff --git a/dev-lang/gdl/gdl-0.9.5.ebuild b/dev-lang/gdl/gdl-0.9.5.ebuild
deleted file mode 100644
index 01fc741..0000000
--- a/dev-lang/gdl/gdl-0.9.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
- png proj postscript python static-libs udunits wxwidgets"
-
-RDEPEND="
- sci-libs/gsl:0=
- sci-libs/plplot:0=[-dynamic]
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- sys-libs/zlib:0=
- x11-libs/libX11:0=
- fftw? ( sci-libs/fftw:3.0= )
- grib? ( sci-libs/grib_api:0= )
- gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
- hdf? ( sci-libs/hdf:0= )
- hdf5? ( sci-libs/hdf5:0= )
- imagemagick? (
- || (
- media-gfx/graphicsmagick[cxx]
- media-gfx/imagemagick[cxx]
- )
- )
- netcdf? ( sci-libs/netcdf )
- proj? ( sci-libs/proj )
- postscript? ( dev-libs/pslib )
- python? (
- ${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- udunits? ( sci-libs/udunits )
- wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
-
-DEPEND="${RDEPEND}
- >=dev-java/antlr-2.7.7-r5:0[cxx,java,script]
- virtual/pkgconfig
- eigen? ( dev-cpp/eigen:3 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}"/0.9.5-antlr.patch
- "${FILESDIR}"/0.9.2-include.patch
- "${FILESDIR}"/0.9.5-plplot.patch
- "${FILESDIR}"/0.9.5-png.patch
-)
-
-pkg_setup() {
- use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
- die "You have openmp enabled but your current g++ does not support it"
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
- # make sure antlr includes are from system and rebuild the sources with it
- # https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
- rm -r src/antlr || die
- einfo "Regenerating grammar"
- pushd src > /dev/null
- local i
- for i in *.g; do antlr ${i} || die ; done
- popd > /dev/null
-
- # gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
- sed -i \
- -e 's:proj4:proj:' \
- -e 's:lib_proj\.h:proj_api\.h:g' \
- CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
-
- # gentoo: avoid install files in datadir directory
- sed -i \
- -e '/AUTHORS/d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- # MPI is still very buggy
- # x11=off does not compile
- local mycmakeargs=(
- -DMPICH=OFF
- -DBUNDLED_ANTLR=OFF
- -DX11=ON
- $(cmake-utils_use fftw)
- $(cmake-utils_use eigen EIGEN3)
- $(cmake-utils_use grib)
- $(cmake-utils_use gshhs)
- $(cmake-utils_use hdf)
- $(cmake-utils_use hdf5)
- $(cmake-utils_use netcdf)
- $(cmake-utils_use openmp)
- $(cmake-utils_use png PNGLIB)
- $(cmake-utils_use proj LIBPROJ4)
- $(cmake-utils_use postscript PSLIB)
- $(cmake-utils_use udunits)
- $(cmake-utils_use wxwidgets)
- )
- if use imagemagick; then
- if has_version media-gfx/graphicsmagick[cxx]; then
- mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
- else
- mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
- fi
- else
- mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
- fi
- configuration() {
- mycmakeargs+=( $@ )
- cmake-utils_src_configure
- }
- configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
- use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
- cmake-utils_src_compile
- use python && python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
- # there is check target instead of the ctest to define some LDPATH
- Xemake -C "${BUILD_DIR}" check
-}
-
-src_install() {
- cmake-utils_src_install
- if use python; then
- installation() {
- mv src/libgdl.so GDL.so || die
- python_domodule GDL.so
- }
- python_foreach_impl run_in_build_dir installation
- dodoc PYTHON.txt
- fi
-
- echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
- doenvd 50gdl
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/
@ 2020-09-27 19:17 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-09-27 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 1a6e53137d2d93f8d7291c17f5c9c6c70b5d23a4
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 19:17:06 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 19:17:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a6e5313
dev-lang/gdl: Bump version to 1.0.0_rc3
Bug: https://bugs.gentoo.org/735280
Bug: https://bugs.gentoo.org/741096
Bug: https://bugs.gentoo.org/741402
Closes: https://bugs.gentoo.org/704026
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-lang/gdl/Manifest | 1 +
dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch | 94 +++++++++++++++++
dev-lang/gdl/gdl-1.0.0_rc3.ebuild | 152 +++++++++++++++++++++++++++
dev-lang/gdl/metadata.xml | 1 +
4 files changed, 248 insertions(+)
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 0c6f89abb8a..72b22e14515 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1 +1,2 @@
DIST gdl-0.9.6v2.tgz 1777167 BLAKE2B 4d92ed93f12e0979d591959d60ae9fa6785400e4f169a00f462103d263bce1aa02e615cc8467b53146791a12045850f9dae1da113f9caff4d6b44dd2a5798b3b SHA512 a816ee2e3822af380a1131a6138263c33560db7286cd699b864da305a1103d5afc881a1cd3574d2e243bfb7e65e759e46322c5e55c66ec15620d9c514565c2c5
+DIST gdl-1.0.0_rc3.tar.gz 32650313 BLAKE2B cdecfe0646e2271e2389e0a04f8da1e8de4534faf743f233169bccf326198025eff7fd7a7b62ed8bd05fa4a0222c6fd30f9469e3edf0f5b2991ef3ef545e616b SHA512 3fde22c7e709b9cdc72a23d2317c043037379c7903418211a699c7e5caa2ed17e78e32e6d2f9b4aa89200e729fc21555821140dfdd58a5a636a858e2841f6335
diff --git a/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch b/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
new file mode 100644
index 00000000000..dd7abcc54d9
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
@@ -0,0 +1,94 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,10 +206,6 @@
+ # mpi
+ check_include_file(mpi.h HAVE_MPI_H)
+
+-# SA: whithout it compilation of antlr fails if there's a conflicting
+-# version of antlr in system-wide directories
+-include_directories(src)
+-
+ if (NOT WIN32)
+ # Ncurses MANDATORY for readline on POSIX
+ # -DNCURSESDIR=DIR
+@@ -399,8 +395,10 @@
+
+ # PLplot MANDATORY
+ # -DPLPLOTDIR=DIR
+-set(CMAKE_PREFIX_PATH ${PLPLOTDIR})
+-find_package(Plplot QUIET)
++
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PLPLOT REQUIRED plplot plplot-c++)
++
+ set(HAVE_LIBPLPLOTCXXD ${PLPLOT_FOUND})
+ if(PLPLOT_FOUND)
+ set(LIBRARIES ${LIBRARIES} ${PLPLOT_LIBRARIES})
+@@ -490,33 +488,16 @@
+ # -DMAGICK=ON|OFF
+ # -DMAGICKDIR=DIR
+ if(MAGICK)
+- set(CMAKE_PREFIX_PATH ${MAGICKDIR})
+- find_package(ImageMagick QUIET COMPONENTS Magick++ MagickWand MagickCore)
+- mark_as_advanced(ImageMagick_EXECUTABLE_DIR ImageMagick_Magick++_INCLUDE_DIR ImageMagick_Magick++_LIBRARY
+- ImageMagick_MagickCore_INCLUDE_DIR ImageMagick_MagickCore_LIBRARY ImageMagick_MagickWand_INCLUDE_DIR ImageMagick_MagickWand_LIBRARY)
+- set(USE_MAGICK ${ImageMagick_FOUND})
+- if(ImageMagick_FOUND)
+- find_program(MAGICKXXCONFIG Magick++-config)
+- if(MAGICKXXCONFIG)
+- execute_process(COMMAND ${MAGICKXXCONFIG} "--libs" OUTPUT_VARIABLE MAGICKXXCONFIGLIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+- set(LIBRARIES ${LIBRARIES} ${MAGICKXXCONFIGLIBS})
+- else(MAGICKXXCONFIG)
+- message(FATAL_ERROR "ImageMagick is required but was not found (Magick++-config).\n"
+- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+- "Use -DMAGICK=OFF to not use it.\n"
+- "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+- endif(MAGICKXXCONFIG)
+- set(LIBRARIES ${LIBRARIES} ${ImageMagick_LIBRARIES})
+- include_directories(${ImageMagick_INCLUDE_DIRS})
+- set(MAGICK_LIBRARIES ${ImageMagick_LIBRARIES})
+- else(ImageMagick_FOUND)
+- message(FATAL_ERROR "ImageMagick is required but was not found.\n"
+- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+- "Use -DMAGICK=OFF to not use it.\n"
+- "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+- endif(ImageMagick_FOUND)
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(Magick++ REQUIRED Magick++)
++ pkg_check_modules(MagickWand REQUIRED MagickWand)
++ pkg_check_modules(MagickCore REQUIRED MagickCore)
++
++ set(MAGICK_LIBRARIES ${Magick++_LIBRARIES} ${MagickWand_LIBRARIES} ${MagickCore_LIBRARIES})
++ set(LIBRARIES ${LIBRARIES} ${MAGICK_LIBRARIES})
++ include_directories(${Magick++_INCLUDE_DIRS})
++ include_directories(${MagickWand_INCLUDE_DIRS})
++ include_directories(${MagickCore_INCLUDE_DIRS})
+ endif(MAGICK)
+
+ # if GM or IM activated, we check whether Plplot is OK for that
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -186,9 +186,9 @@
+ )
+ endif(USE_EXPAT)
+
+-add_subdirectory(antlr)
++find_library(ANTLR_LIBRARY NAMES antlr)
+
+-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
++include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+ link_directories(${LINK_DIRECTORIES})
+
+ if(PYTHON_MODULE) #GDL.so
+@@ -203,8 +203,7 @@
+ add_executable(gdl ${SOURCES})
+ endif(PYTHON_MODULE)
+
+-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
+-target_link_libraries(gdl antlr) # link antlr against gdl
++target_link_libraries(gdl ${ANTLR_LIBRARY}) # link antlr against gdl
+ if (MINGW)
+ target_link_libraries(gdl ws2_32)
+ endif (MINGW)
diff --git a/dev-lang/gdl/gdl-1.0.0_rc3.ebuild b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
new file mode 100644
index 00000000000..b5fb1c358bc
--- /dev/null
+++ b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{6..9} )
+
+# gdl's build system is a travesty, and actually calls
+# itself in the testsuite, which is something that ninja
+# obviously doesn't support.
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake python-r1 toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="GNU Data Language"
+HOMEPAGE="https://github.com/gnudatalanguage/gdl"
+SRC_URI="https://github.com/gnudatalanguage/gdl/archive/v$(ver_cut 1-3)-rc.$(ver_cut 5).tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf
+ openmp png proj postscript python tiff udunits wxwidgets"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-cpp/antlr-cpp:2=
+ dev-libs/expat
+ sci-libs/gsl:0=
+ sci-libs/plplot:0=[cxx,-dynamic]
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ sys-libs/zlib
+ x11-libs/libX11
+ fftw? ( sci-libs/fftw:3.0= )
+ glpk? ( sci-mathematics/glpk:= )
+ gshhs? (
+ sci-geosciences/gshhs-data
+ sci-geosciences/gshhs:0=
+ )
+ hdf? ( sci-libs/hdf:0= )
+ hdf5? ( sci-libs/hdf5:0= )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ )
+ netcdf? ( sci-libs/netcdf )
+ proj? ( sci-libs/proj )
+ postscript? ( dev-libs/pslib )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ tiff? (
+ media-libs/tiff
+ sci-libs/libgeotiff
+ )
+ udunits? ( sci-libs/udunits )
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+ eigen? ( dev-cpp/eigen:3 )"
+BDEPEND="
+ virtual/pkgconfig
+ python? ( app-admin/chrpath )"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)-rc.$(ver_cut 5)"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0_rc3-cmake.patch )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ use wxwidgets && setup-wxwidgets unicode
+ use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+ # remove bundled antlr
+ rm -r src/antlr || die
+
+ # gentoo: avoid install files in datadir directory
+ # and manually install them in src_install
+ sed -e '/AUTHORS/d' -i CMakeLists.txt || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ # MPI is still very buggy
+ # x11=off does not compile
+ local mycmakeargs=(
+ -DMPI=OFF
+ -DREADLINE=ON
+ -DX11=ON
+ -DEXPAT=ON
+ -DEIGEN3=$(usex eigen)
+ -DFFTW=$(usex fftw)
+ -DGRIB=OFF
+ -DGLPK=$(usex glpk)
+ -DHDF=$(usex hdf)
+ -DHDF5=$(usex hdf5)
+ -DLIBPROJ4=$(usex proj)
+ -DNETCDF=$(usex netcdf)
+ -DOPENMP=$(usex openmp)
+ -DPNGLIB=$(usex png)
+ -DUDUNITS2=$(usex udunits)
+ -DWXWIDGETS=$(usex wxwidgets)
+ -DGRAPHICSMAGICK=$(usex imagemagick $(usex graphicsmagick))
+ -DMAGICK=$(usex imagemagick $(usex !graphicsmagick))
+ -DTIFF=$(usex tiff)
+ -DGEOTIFF=$(usex tiff)
+ -DSHAPELIB=OFF
+ -DPLPLOTDIR="${EPREFIX}"/usr/$(get_libdir)
+ )
+
+ configuration() {
+ mycmakeargs+=( "$@" )
+ cmake_src_configure
+ }
+ configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+ use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+ cmake_src_compile
+ use python && python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+ # there is check target instead of the ctest to define some LDPATH
+ virtx cmake_build check
+}
+
+src_install() {
+ cmake_src_install
+ if use python; then
+ installation() {
+ chrpath -d src/GDL.so || die
+ python_domodule src/GDL.so
+ }
+ python_foreach_impl run_in_build_dir installation
+ dodoc PYTHON.txt
+ fi
+
+ newenvd - 50gdl <<-_EOF_
+ GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage"
+ _EOF_
+}
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index a0c94d34188..16e4a758b28 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -13,6 +13,7 @@
<use>
<flag name="eigen">Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></flag>
<flag name="hdf">Add support for the Hierarchical Data Format v.4</flag>
+ <flag name="glpk">Use GNU Linear Programming Kit <pkg>sci-mathematics/glpk</pkg></flag>
<flag name="gshhs">Add support for projection adn continent maps with <pkg>sci-geosciences/gshhs-data</pkg></flag>
<flag name="proj">Add support for <pkg>sci-libs/proj</pkg> (geographic projections)</flag>
<flag name="udunits">Add support for manipulating units of physical quantities</flag>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/
@ 2022-10-06 13:00 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2022-10-06 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 15ee6aa862be7cb1cf32b401ebac12cb55d16eaa
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 12:56:12 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 13:00:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ee6aa8
dev-lang/gdl: add 1.0.1, enable python3_{10,11}
switch to python-single-r1 to avoid compiling the whole
package two or three times when python support is enabled
add flag for shapelib support
add missing dep on net-libs/libtirpc
tests still need some work
Closes: https://bugs.gentoo.org/845642
Closes: https://bugs.gentoo.org/830817
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-lang/gdl/Manifest | 1 +
dev-lang/gdl/files/gdl-1.0.1-cmake.patch | 110 +++++++++++++++++++++++
dev-lang/gdl/gdl-1.0.1.ebuild | 146 +++++++++++++++++++++++++++++++
dev-lang/gdl/metadata.xml | 1 +
4 files changed, 258 insertions(+)
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 868fcd3bef4c..659e647babeb 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1 +1,2 @@
DIST gdl-1.0.0_rc3.tar.gz 32650313 BLAKE2B cdecfe0646e2271e2389e0a04f8da1e8de4534faf743f233169bccf326198025eff7fd7a7b62ed8bd05fa4a0222c6fd30f9469e3edf0f5b2991ef3ef545e616b SHA512 3fde22c7e709b9cdc72a23d2317c043037379c7903418211a699c7e5caa2ed17e78e32e6d2f9b4aa89200e729fc21555821140dfdd58a5a636a858e2841f6335
+DIST gdl-1.0.1.tar.gz 32775655 BLAKE2B 3428f33300403c98ae1f8f88cfa0e2346abe53d53b9f00c82ee5bf7f09f1f2f7d3021fa81173221ddd41ec29c94c2757cd1dc39b6e4d919c29d70af2e5045e6a SHA512 9d15f114d26d03c34dce6177a5d5115e81c128ec21752c01d171f8427e6cb21b9d0b69a44e29891b5e8fc2bd4d0b89d1a8dcd189f362a13c6e59182528b5842d
diff --git a/dev-lang/gdl/files/gdl-1.0.1-cmake.patch b/dev-lang/gdl/files/gdl-1.0.1-cmake.patch
new file mode 100644
index 000000000000..66c895250f97
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-1.0.1-cmake.patch
@@ -0,0 +1,110 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6c07596..31dcaf2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -459,8 +459,10 @@ endif(CYGWIN OR NOT WIN32)
+
+ # PLplot MANDATORY
+ # -DPLPLOTDIR=DIR
+-set(CMAKE_PREFIX_PATH ${PLPLOTDIR})
+-find_package(Plplot QUIET)
++
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PLPLOT REQUIRED plplot plplot-c++)
++
+ set(HAVE_LIBPLPLOTCXXD ${PLPLOT_FOUND})
+ if(PLPLOT_FOUND)
+ set(LIBRARIES ${LIBRARIES} ${PLPLOT_LIBRARIES})
+@@ -635,33 +637,16 @@ endif(GRAPHICSMAGICK_FOUND)
+ # -DMAGICK=ON|OFF
+ # -DMAGICKDIR=DIR
+ if(MAGICK)
+- set(CMAKE_PREFIX_PATH ${MAGICKDIR})
+- find_package(ImageMagick QUIET COMPONENTS Magick++ MagickWand MagickCore)
+- mark_as_advanced(ImageMagick_EXECUTABLE_DIR ImageMagick_Magick++_INCLUDE_DIR ImageMagick_Magick++_LIBRARY
+- ImageMagick_MagickCore_INCLUDE_DIR ImageMagick_MagickCore_LIBRARY ImageMagick_MagickWand_INCLUDE_DIR ImageMagick_MagickWand_LIBRARY)
+- set(USE_MAGICK ${ImageMagick_FOUND})
+- if(ImageMagick_FOUND)
+- find_program(MAGICKXXCONFIG Magick++-config)
+- if(MAGICKXXCONFIG)
+- execute_process(COMMAND ${MAGICKXXCONFIG} "--libs" OUTPUT_VARIABLE MAGICKXXCONFIGLIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+- set(LIBRARIES ${LIBRARIES} ${MAGICKXXCONFIGLIBS})
+- else(MAGICKXXCONFIG)
+- message(FATAL_ERROR "ImageMagick is required but was not found (Magick++-config).\n"
+- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+- "Use -DMAGICK=OFF to not use it.\n"
+- "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+- endif(MAGICKXXCONFIG)
+- set(LIBRARIES ${LIBRARIES} ${ImageMagick_LIBRARIES})
+- include_directories(${ImageMagick_INCLUDE_DIRS})
+- set(MAGICK_LIBRARIES ${ImageMagick_LIBRARIES})
+- else(ImageMagick_FOUND)
+- message(FATAL_ERROR "ImageMagick is required but was not found.\n"
+- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+- "Use -DMAGICK=OFF to not use it.\n"
+- "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+- endif(ImageMagick_FOUND)
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(Magick++ REQUIRED Magick++)
++ pkg_check_modules(MagickWand REQUIRED MagickWand)
++ pkg_check_modules(MagickCore REQUIRED MagickCore)
++
++ set(MAGICK_LIBRARIES ${Magick++_LIBRARIES} ${MagickWand_LIBRARIES} ${MagickCore_LIBRARIES})
++ set(LIBRARIES ${LIBRARIES} ${MAGICK_LIBRARIES})
++ include_directories(${Magick++_INCLUDE_DIRS})
++ include_directories(${MagickWand_INCLUDE_DIRS})
++ include_directories(${MagickCore_INCLUDE_DIRS})
+ endif(MAGICK)
+
+ ## not valid anymore I bet ## if GM or IM activated, we check whether Plplot is OK for that
+@@ -1037,20 +1022,8 @@ endif(GLPK)
+ # -DSHAPELIB=ON|OFF
+ # -DSHAPELIBDIR=DIR
+ if(SHAPELIB)
+- set(CMAKE_PREFIX_PATH ${SHAPELIBDIR})
+- find_package(SHAPELIB QUIET)
+- set(USE_SHAPELIB ${SHAPELIB_FOUND})
+- if(SHAPELIB_FOUND)
+- set(LIBRARIES ${LIBRARIES} ${SHAPELIB_LIBRARIES})
+- include_directories(${SHAPELIB_INCLUDE_DIR})
+- else(SHAPELIB_FOUND)
+- message(FATAL_ERROR "SHAPELIB (http://shapelib.maptools.org/) is required but was not found.\n"
+- "Use -DSHAPELIBDIR=DIR to specify the SHAPELIB-devel directory tree.\n"
+- "Use -DSHAPELIB=OFF to not use it.\n"
+- "shapelib is often in package libshp-devel.\n"
+- "(suitable Debian/Ubuntu package: libshp-dev)\n"
+- "(suitable Fedora/CentOS package: shapelib-devel)\n")
+- endif(SHAPELIB_FOUND)
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(shapelib REQUIRED shapelib)
+ endif(SHAPELIB)
+ # EXPAT for IDLffXMLSAX and IDLffXMLDOM
+ # -DEXPAT=ON|OFF
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f1923d2..6f1343e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -193,9 +193,9 @@ ${WX_RC}
+ )
+ endif(HAVE_LIBWXWIDGETS AND WIN32)
+
+-add_subdirectory(antlr)
++find_library(ANTLR_LIBRARY NAMES antlr)
+
+-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
++include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
+ link_directories(${LINK_DIRECTORIES})
+
+ if(PYTHON_MODULE) #GDL.so
+@@ -213,8 +213,7 @@ if(USE_OPENMP)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+ endif(USE_OPENMP)
+
+-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
+-target_link_libraries(gdl antlr) # link antlr against gdl
++target_link_libraries(gdl ${ANTLR_LIBRARY}) # link antlr against gdl
+ if (MINGW)
+ target_link_libraries(gdl ws2_32)
+ endif (MINGW)
diff --git a/dev-lang/gdl/gdl-1.0.1.ebuild b/dev-lang/gdl/gdl-1.0.1.ebuild
new file mode 100644
index 000000000000..3dd1b363bd8f
--- /dev/null
+++ b/dev-lang/gdl/gdl-1.0.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-single-r1 toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="GNU Data Language"
+HOMEPAGE="https://github.com/gnudatalanguage/gdl"
+SRC_URI="https://github.com/gnudatalanguage/gdl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+ +eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf
+ openmp png proj postscript python shapelib tiff udunits wxwidgets
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-cpp/antlr-cpp:2=
+ dev-libs/expat
+ net-libs/libtirpc:=
+ sci-libs/gsl:0=
+ sci-libs/plplot:0=[cxx,-dynamic,wxwidgets?]
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ sys-libs/zlib
+ x11-libs/libX11
+ fftw? ( sci-libs/fftw:3.0= )
+ glpk? ( sci-mathematics/glpk:= )
+ gshhs? (
+ sci-geosciences/gshhs-data
+ sci-geosciences/gshhs:0=
+ )
+ hdf? ( sci-libs/hdf:0= )
+ hdf5? ( sci-libs/hdf5:0= )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ )
+ netcdf? ( sci-libs/netcdf:= )
+ proj? ( sci-libs/proj:= )
+ postscript? ( dev-libs/pslib )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ')
+ )
+ shapelib? ( sci-libs/shapelib:= )
+ tiff? (
+ media-libs/tiff
+ sci-libs/libgeotiff
+ )
+ udunits? ( sci-libs/udunits )
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+DEPEND="${RDEPEND}
+ eigen? ( dev-cpp/eigen:3 )
+"
+BDEPEND="
+ dev-util/intltool
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.1-cmake.patch )
+DOCS=( AUTHORS HACKING NEWS PYTHON.txt README README.md )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ use wxwidgets && setup-wxwidgets unicode
+ use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+ # remove bundled antlr
+ rm -r src/antlr || die
+
+ # gentoo: avoid install files in datadir directory
+ # and manually install them in src_install
+ sed -e '/AUTHORS/d' -i CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # MPI is still very buggy
+ # x11=off does not compile
+ local mycmakeargs=(
+ -DMPI=OFF
+ -DREADLINE=ON
+ -DX11=ON
+ -DEXPAT=ON
+ -DEIGEN3=$(usex eigen)
+ -DFFTW=$(usex fftw)
+ -DGRIB=OFF
+ -DGLPK=$(usex glpk)
+ -DHDF=$(usex hdf)
+ -DHDF5=$(usex hdf5)
+ -DLIBPROJ=$(usex proj)
+ -DNETCDF=$(usex netcdf)
+ -DOPENMP=$(usex openmp)
+ -DPNGLIB=$(usex png)
+ -DUDUNITS2=$(usex udunits)
+ -DWXWIDGETS=$(usex wxwidgets)
+ -DGRAPHICSMAGICK=$(usex imagemagick $(usex graphicsmagick))
+ -DMAGICK=$(usex imagemagick $(usex !graphicsmagick))
+ -DTIFF=$(usex tiff)
+ -DGEOTIFF=$(usex tiff)
+ -DPYTHON_MODULE=$(usex python)
+ -DPYTHON=$(usex python)
+ -DSHAPELIB=$(usex shapelib)
+ )
+
+ if use python; then
+ # automatically selection ignores EPYTHON
+ mycmakeargs+=(
+ -DPYTHONVERSION="${EPYTHON#python}"
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ newenvd - 50gdl <<-_EOF_
+ GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage"
+ _EOF_
+}
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index 18c3a80ae8f9..7babf54e25d6 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -16,6 +16,7 @@
<flag name="glpk">Use GNU Linear Programming Kit <pkg>sci-mathematics/glpk</pkg></flag>
<flag name="gshhs">Add support for projection adn continent maps with <pkg>sci-geosciences/gshhs-data</pkg></flag>
<flag name="proj">Add support for <pkg>sci-libs/proj</pkg> (geographic projections)</flag>
+ <flag name="shapelib">Add support for manipulating ESRI Shapefiles with <pkg>sci-libs/shapelib</pkg></flag>
<flag name="udunits">Add support for manipulating units of physical quantities</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/
@ 2024-03-09 18:30 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2024-03-09 18:30 UTC (permalink / raw
To: gentoo-commits
commit: fd97f1479bc28d47bc39181e8cab79015831bde0
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 18:29:59 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 18:30:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd97f147
dev-lang/gdl: add 1.0.4
Closes: https://bugs.gentoo.org/917444
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-lang/gdl/Manifest | 1 +
dev-lang/gdl/files/gdl-1.0.4-cmake.patch | 100 +++++++++++++++++++++
dev-lang/gdl/gdl-1.0.4.ebuild | 149 +++++++++++++++++++++++++++++++
3 files changed, 250 insertions(+)
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 36cba2f543cc..831f6ebc2a32 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1 +1,2 @@
DIST gdl-1.0.1.tar.gz 32775655 BLAKE2B 3428f33300403c98ae1f8f88cfa0e2346abe53d53b9f00c82ee5bf7f09f1f2f7d3021fa81173221ddd41ec29c94c2757cd1dc39b6e4d919c29d70af2e5045e6a SHA512 9d15f114d26d03c34dce6177a5d5115e81c128ec21752c01d171f8427e6cb21b9d0b69a44e29891b5e8fc2bd4d0b89d1a8dcd189f362a13c6e59182528b5842d
+DIST gdl-1.0.4.tar.gz 33219638 BLAKE2B db0e843cf2e3f07d6f53d3a8b46cb95303cd0ae199c98099f45bbdfe5d206f325a8f9814935e876a3dfee3a46da0144766b18fa54b38a653567a429a88f06250 SHA512 3206bdd88b0478493221c0552e62620f1c9acbfec6f1900d73d932caae12401bf825e8893c81f844965f79e332bedb6ea99e6ea6f2b21427022efa60d1326eb0
diff --git a/dev-lang/gdl/files/gdl-1.0.4-cmake.patch b/dev-lang/gdl/files/gdl-1.0.4-cmake.patch
new file mode 100644
index 000000000000..93d0e38f50a0
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-1.0.4-cmake.patch
@@ -0,0 +1,100 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f7b8801d..8281aee1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -596,36 +598,16 @@ endif(GRAPHICSMAGICK_FOUND)
+ # -DMAGICK=ON|OFF
+ # -DMAGICKDIR=DIR
+ if(MAGICK)
+- set(CMAKE_PREFIX_PATH ${MAGICKDIR})
+- find_package(ImageMagick QUIET COMPONENTS Magick++ MagickWand MagickCore)
+- mark_as_advanced(ImageMagick_EXECUTABLE_DIR ImageMagick_Magick++_INCLUDE_DIR ImageMagick_Magick++_LIBRARY
+- ImageMagick_MagickCore_INCLUDE_DIR ImageMagick_MagickCore_LIBRARY ImageMagick_MagickWand_INCLUDE_DIR ImageMagick_MagickWand_LIBRARY)
+- set(USE_MAGICK ${ImageMagick_FOUND})
+- set(HAS_IMAGEMAGICK ${ImageMagick_FOUND})
+- if(ImageMagick_FOUND)
+- find_program(MAGICKXXCONFIG Magick++-config)
+- if(MAGICKXXCONFIG)
+- execute_process(COMMAND ${MAGICKXXCONFIG} "--libs" OUTPUT_VARIABLE MAGICKXXCONFIGLIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+- set(LIBRARIES ${LIBRARIES} ${MAGICKXXCONFIGLIBS})
+- execute_process(COMMAND ${MAGICKXXCONFIG} "--cxxflags" OUTPUT_VARIABLE MAGICKXXCONFIGCXXFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MAGICKXXCONFIGCXXFLAGS}")
+- else(MAGICKXXCONFIG)
+- message(FATAL_ERROR "ImageMagick is required but was not found (Magick++-config).\n"
+- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+- "Use -DMAGICK=OFF to not use it.\n"
+- "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+- endif(MAGICKXXCONFIG)
+- set(LIBRARIES ${LIBRARIES} ${ImageMagick_LIBRARIES})
+- include_directories(${ImageMagick_INCLUDE_DIRS} ${ImageMagick_MagickCore_INCLUDE_DIRS})
+- set(MAGICK_LIBRARIES ${ImageMagick_LIBRARIES})
+- else(ImageMagick_FOUND)
+- message(FATAL_ERROR "ImageMagick is required but was not found.\n"
+- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+- "Use -DMAGICK=OFF to not use it.\n"
+- "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+- endif(ImageMagick_FOUND)
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(Magick++ REQUIRED Magick++)
++ pkg_check_modules(MagickWand REQUIRED MagickWand)
++ pkg_check_modules(MagickCore REQUIRED MagickCore)
++
++ set(MAGICK_LIBRARIES ${Magick++_LIBRARIES} ${MagickWand_LIBRARIES} ${MagickCore_LIBRARIES})
++ set(LIBRARIES ${LIBRARIES} ${MAGICK_LIBRARIES})
++ include_directories(${Magick++_INCLUDE_DIRS})
++ include_directories(${MagickWand_INCLUDE_DIRS})
++ include_directories(${MagickCore_INCLUDE_DIRS})
+ endif(MAGICK)
+
+ # libtiff
+@@ -994,20 +976,8 @@ endif(GLPK)
+ # -DSHAPELIB=ON|OFF
+ # -DSHAPELIBDIR=DIR
+ if(SHAPELIB)
+- set(CMAKE_PREFIX_PATH ${SHAPELIBDIR})
+- find_package(SHAPELIB QUIET)
+- set(USE_SHAPELIB ${SHAPELIB_FOUND})
+- if(SHAPELIB_FOUND)
+- set(LIBRARIES ${LIBRARIES} ${SHAPELIB_LIBRARIES})
+- include_directories(${SHAPELIB_INCLUDE_DIR})
+- else(SHAPELIB_FOUND)
+- message(FATAL_ERROR "SHAPELIB (http://shapelib.maptools.org/) is required but was not found.\n"
+- "Use -DSHAPELIBDIR=DIR to specify the SHAPELIB-devel directory tree.\n"
+- "Use -DSHAPELIB=OFF to not use it.\n"
+- "shapelib is often in package libshp-devel.\n"
+- "(suitable Debian/Ubuntu package: libshp-dev)\n"
+- "(suitable Fedora/CentOS package: shapelib-devel)\n")
+- endif(SHAPELIB_FOUND)
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(shapelib REQUIRED shapelib)
+ endif(SHAPELIB)
+ # EXPAT for IDLffXMLSAX and IDLffXMLDOM
+ # -DEXPAT=ON|OFF
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 968ead9d..b0623de4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -200,9 +200,9 @@ add_subdirectory(plplotdriver)
+ #whereami
+ add_library(whereami STATIC ${CMAKE_SOURCE_DIR}/src/whereami/src/whereami.c)
+
+-add_subdirectory(antlr)
++find_library(ANTLR_LIBRARY NAMES antlr)
+
+-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_SOURCE_DIR}/src/plplotdriver ${CMAKE_SOURCE_DIR}/src/whereami/src ${CMAKE_BINARY_DIR})
++include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/plplotdriver ${CMAKE_SOURCE_DIR}/src/whereami/src ${CMAKE_BINARY_DIR})
+ link_directories(${LINK_DIRECTORIES})
+
+ if(PYTHON_MODULE) #GDL.so
+@@ -220,8 +220,7 @@ if(USE_OPENMP)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+ endif(USE_OPENMP)
+
+-add_dependencies(gdl antlr whereami) # be sure that antlr is built before gdl
+-target_link_libraries(gdl antlr whereami) # link antlr against gdl
++target_link_libraries(gdl ${ANTLR_LIBRARY} whereami) # link antlr against gdl
+ if (MINGW)
+ target_link_libraries(gdl ws2_32)
+ endif (MINGW)
diff --git a/dev-lang/gdl/gdl-1.0.4.ebuild b/dev-lang/gdl/gdl-1.0.4.ebuild
new file mode 100644
index 000000000000..95e4cdaec158
--- /dev/null
+++ b/dev-lang/gdl/gdl-1.0.4.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-single-r1 toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="GNU Data Language"
+HOMEPAGE="https://github.com/gnudatalanguage/gdl"
+SRC_URI="https://github.com/gnudatalanguage/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+ +eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf
+ openmp png proj postscript python shapelib tiff udunits wxwidgets
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-cpp/antlr-cpp:2=
+ dev-libs/expat
+ media-libs/libpng:=
+ net-libs/libtirpc:=
+ sci-libs/gsl:=
+ sci-libs/plplot:=[X,cxx,-dynamic,wxwidgets?]
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ sys-libs/zlib
+ x11-libs/libX11
+ fftw? ( sci-libs/fftw:3.0= )
+ glpk? ( sci-mathematics/glpk:= )
+ gshhs? (
+ sci-geosciences/gshhs-data
+ sci-geosciences/gshhs:=
+ )
+ hdf? ( sci-libs/hdf:= )
+ hdf5? ( sci-libs/hdf5:= )
+ imagemagick? (
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+ )
+ netcdf? ( sci-libs/netcdf:= )
+ proj? ( sci-libs/proj:= )
+ postscript? ( dev-libs/pslib )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ')
+ )
+ shapelib? ( sci-libs/shapelib:= )
+ tiff? (
+ media-libs/tiff:=
+ sci-libs/libgeotiff:=
+ )
+ udunits? ( sci-libs/udunits )
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+DEPEND="${RDEPEND}
+ eigen? ( dev-cpp/eigen:3 )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.4-cmake.patch )
+DOCS=( AUTHORS HACKING NEWS PYTHON.txt README README.md )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ use wxwidgets && setup-wxwidgets unicode
+ use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+ # remove bundled antlr
+ rm -r src/antlr || die
+
+ # gentoo: avoid install files in datadir directory
+ # and manually install them in src_install
+ sed -e '/AUTHORS/d' -i CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # MPI is still very buggy
+ # x11=off does not compile
+ local mycmakeargs=(
+ -DMPI=OFF
+ -DREADLINE=ON
+ -DX11=ON
+ -DEXPAT=ON
+ -DPNGLIB=ON
+ -DEIGEN3=$(usex eigen)
+ -DFFTW=$(usex fftw)
+ -DGRIB=OFF
+ -DGLPK=$(usex glpk)
+ -DHDF=$(usex hdf)
+ -DHDF5=$(usex hdf5)
+ -DLIBPROJ=$(usex proj)
+ -DNETCDF=$(usex netcdf)
+ -DOPENMP=$(usex openmp)
+ -DPNGLIB=$(usex png)
+ -DUDUNITS2=$(usex udunits)
+ -DWXWIDGETS=$(usex wxwidgets)
+ -DGRAPHICSMAGICK=$(usex imagemagick $(usex graphicsmagick))
+ -DMAGICK=$(usex imagemagick $(usex !graphicsmagick))
+ -DTIFF=$(usex tiff)
+ -DGEOTIFF=$(usex tiff)
+ -DPYTHON_MODULE=$(usex python)
+ -DPYTHON=$(usex python)
+ -DSHAPELIB=$(usex shapelib)
+ -DQHULL=OFF
+ )
+
+ if use python; then
+ # automatically selection ignores EPYTHON
+ mycmakeargs+=(
+ -DPYTHONVERSION="${EPYTHON#python}"
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ newenvd - 50gdl <<-_EOF_
+ GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage"
+ _EOF_
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/
@ 2024-06-16 9:37 Pacho Ramos
0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2024-06-16 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 2adbc898334e68b210ca5c359f3fbd0b1dd3a43e
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 09:34:37 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 09:34:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2adbc898
dev-lang/gdl: drop 1.0.1-r2, 1.0.4
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
dev-lang/gdl/Manifest | 1 -
dev-lang/gdl/files/gdl-1.0.1-cmake.patch | 110 -----------------------
dev-lang/gdl/gdl-1.0.1-r2.ebuild | 145 ------------------------------
dev-lang/gdl/gdl-1.0.4.ebuild | 149 -------------------------------
4 files changed, 405 deletions(-)
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 831f6ebc2a32..bfd53a5db451 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,2 +1 @@
-DIST gdl-1.0.1.tar.gz 32775655 BLAKE2B 3428f33300403c98ae1f8f88cfa0e2346abe53d53b9f00c82ee5bf7f09f1f2f7d3021fa81173221ddd41ec29c94c2757cd1dc39b6e4d919c29d70af2e5045e6a SHA512 9d15f114d26d03c34dce6177a5d5115e81c128ec21752c01d171f8427e6cb21b9d0b69a44e29891b5e8fc2bd4d0b89d1a8dcd189f362a13c6e59182528b5842d
DIST gdl-1.0.4.tar.gz 33219638 BLAKE2B db0e843cf2e3f07d6f53d3a8b46cb95303cd0ae199c98099f45bbdfe5d206f325a8f9814935e876a3dfee3a46da0144766b18fa54b38a653567a429a88f06250 SHA512 3206bdd88b0478493221c0552e62620f1c9acbfec6f1900d73d932caae12401bf825e8893c81f844965f79e332bedb6ea99e6ea6f2b21427022efa60d1326eb0
diff --git a/dev-lang/gdl/files/gdl-1.0.1-cmake.patch b/dev-lang/gdl/files/gdl-1.0.1-cmake.patch
deleted file mode 100644
index 66c895250f97..000000000000
--- a/dev-lang/gdl/files/gdl-1.0.1-cmake.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6c07596..31dcaf2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -459,8 +459,10 @@ endif(CYGWIN OR NOT WIN32)
-
- # PLplot MANDATORY
- # -DPLPLOTDIR=DIR
--set(CMAKE_PREFIX_PATH ${PLPLOTDIR})
--find_package(Plplot QUIET)
-+
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PLPLOT REQUIRED plplot plplot-c++)
-+
- set(HAVE_LIBPLPLOTCXXD ${PLPLOT_FOUND})
- if(PLPLOT_FOUND)
- set(LIBRARIES ${LIBRARIES} ${PLPLOT_LIBRARIES})
-@@ -635,33 +637,16 @@ endif(GRAPHICSMAGICK_FOUND)
- # -DMAGICK=ON|OFF
- # -DMAGICKDIR=DIR
- if(MAGICK)
-- set(CMAKE_PREFIX_PATH ${MAGICKDIR})
-- find_package(ImageMagick QUIET COMPONENTS Magick++ MagickWand MagickCore)
-- mark_as_advanced(ImageMagick_EXECUTABLE_DIR ImageMagick_Magick++_INCLUDE_DIR ImageMagick_Magick++_LIBRARY
-- ImageMagick_MagickCore_INCLUDE_DIR ImageMagick_MagickCore_LIBRARY ImageMagick_MagickWand_INCLUDE_DIR ImageMagick_MagickWand_LIBRARY)
-- set(USE_MAGICK ${ImageMagick_FOUND})
-- if(ImageMagick_FOUND)
-- find_program(MAGICKXXCONFIG Magick++-config)
-- if(MAGICKXXCONFIG)
-- execute_process(COMMAND ${MAGICKXXCONFIG} "--libs" OUTPUT_VARIABLE MAGICKXXCONFIGLIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
-- set(LIBRARIES ${LIBRARIES} ${MAGICKXXCONFIGLIBS})
-- else(MAGICKXXCONFIG)
-- message(FATAL_ERROR "ImageMagick is required but was not found (Magick++-config).\n"
-- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
-- "Use -DMAGICK=OFF to not use it.\n"
-- "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
-- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
-- endif(MAGICKXXCONFIG)
-- set(LIBRARIES ${LIBRARIES} ${ImageMagick_LIBRARIES})
-- include_directories(${ImageMagick_INCLUDE_DIRS})
-- set(MAGICK_LIBRARIES ${ImageMagick_LIBRARIES})
-- else(ImageMagick_FOUND)
-- message(FATAL_ERROR "ImageMagick is required but was not found.\n"
-- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
-- "Use -DMAGICK=OFF to not use it.\n"
-- "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
-- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
-- endif(ImageMagick_FOUND)
-+ find_package(PkgConfig REQUIRED)
-+ pkg_check_modules(Magick++ REQUIRED Magick++)
-+ pkg_check_modules(MagickWand REQUIRED MagickWand)
-+ pkg_check_modules(MagickCore REQUIRED MagickCore)
-+
-+ set(MAGICK_LIBRARIES ${Magick++_LIBRARIES} ${MagickWand_LIBRARIES} ${MagickCore_LIBRARIES})
-+ set(LIBRARIES ${LIBRARIES} ${MAGICK_LIBRARIES})
-+ include_directories(${Magick++_INCLUDE_DIRS})
-+ include_directories(${MagickWand_INCLUDE_DIRS})
-+ include_directories(${MagickCore_INCLUDE_DIRS})
- endif(MAGICK)
-
- ## not valid anymore I bet ## if GM or IM activated, we check whether Plplot is OK for that
-@@ -1037,20 +1022,8 @@ endif(GLPK)
- # -DSHAPELIB=ON|OFF
- # -DSHAPELIBDIR=DIR
- if(SHAPELIB)
-- set(CMAKE_PREFIX_PATH ${SHAPELIBDIR})
-- find_package(SHAPELIB QUIET)
-- set(USE_SHAPELIB ${SHAPELIB_FOUND})
-- if(SHAPELIB_FOUND)
-- set(LIBRARIES ${LIBRARIES} ${SHAPELIB_LIBRARIES})
-- include_directories(${SHAPELIB_INCLUDE_DIR})
-- else(SHAPELIB_FOUND)
-- message(FATAL_ERROR "SHAPELIB (http://shapelib.maptools.org/) is required but was not found.\n"
-- "Use -DSHAPELIBDIR=DIR to specify the SHAPELIB-devel directory tree.\n"
-- "Use -DSHAPELIB=OFF to not use it.\n"
-- "shapelib is often in package libshp-devel.\n"
-- "(suitable Debian/Ubuntu package: libshp-dev)\n"
-- "(suitable Fedora/CentOS package: shapelib-devel)\n")
-- endif(SHAPELIB_FOUND)
-+ find_package(PkgConfig REQUIRED)
-+ pkg_check_modules(shapelib REQUIRED shapelib)
- endif(SHAPELIB)
- # EXPAT for IDLffXMLSAX and IDLffXMLDOM
- # -DEXPAT=ON|OFF
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f1923d2..6f1343e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -193,9 +193,9 @@ ${WX_RC}
- )
- endif(HAVE_LIBWXWIDGETS AND WIN32)
-
--add_subdirectory(antlr)
-+find_library(ANTLR_LIBRARY NAMES antlr)
-
--include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
-+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
- link_directories(${LINK_DIRECTORIES})
-
- if(PYTHON_MODULE) #GDL.so
-@@ -213,8 +213,7 @@ if(USE_OPENMP)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- endif(USE_OPENMP)
-
--add_dependencies(gdl antlr) # be sure that antlr is built before gdl
--target_link_libraries(gdl antlr) # link antlr against gdl
-+target_link_libraries(gdl ${ANTLR_LIBRARY}) # link antlr against gdl
- if (MINGW)
- target_link_libraries(gdl ws2_32)
- endif (MINGW)
diff --git a/dev-lang/gdl/gdl-1.0.1-r2.ebuild b/dev-lang/gdl/gdl-1.0.1-r2.ebuild
deleted file mode 100644
index fa0c8e92f4d9..000000000000
--- a/dev-lang/gdl/gdl-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-single-r1 toolchain-funcs virtualx wxwidgets
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="https://github.com/gnudatalanguage/gdl"
-SRC_URI="https://github.com/gnudatalanguage/gdl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="
- +eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf
- openmp png proj postscript python shapelib tiff udunits wxwidgets
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-cpp/antlr-cpp:2=
- dev-libs/expat
- net-libs/libtirpc:=
- sci-libs/gsl:=
- sci-libs/plplot:=[X,cxx,-dynamic,wxwidgets?]
- sys-libs/ncurses:=
- sys-libs/readline:=
- sys-libs/zlib
- x11-libs/libX11
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:= )
- gshhs? (
- sci-geosciences/gshhs-data
- sci-geosciences/gshhs:=
- )
- hdf? ( sci-libs/hdf:= )
- hdf5? ( sci-libs/hdf5:= )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- )
- netcdf? ( sci-libs/netcdf:= )
- proj? ( sci-libs/proj:= )
- postscript? ( dev-libs/pslib )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- ')
- )
- shapelib? ( sci-libs/shapelib:= )
- tiff? (
- media-libs/tiff:=
- sci-libs/libgeotiff:=
- )
- udunits? ( sci-libs/udunits )
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
- eigen? ( dev-cpp/eigen:3 )
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.1-cmake.patch )
-DOCS=( AUTHORS HACKING NEWS PYTHON.txt README README.md )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- use wxwidgets && setup-wxwidgets unicode
- use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
- # remove bundled antlr
- rm -r src/antlr || die
-
- # gentoo: avoid install files in datadir directory
- # and manually install them in src_install
- sed -e '/AUTHORS/d' -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- # MPI is still very buggy
- # x11=off does not compile
- local mycmakeargs=(
- -DMPI=OFF
- -DREADLINE=ON
- -DX11=ON
- -DEXPAT=ON
- -DEIGEN3=$(usex eigen)
- -DFFTW=$(usex fftw)
- -DGRIB=OFF
- -DGLPK=$(usex glpk)
- -DHDF=$(usex hdf)
- -DHDF5=$(usex hdf5)
- -DLIBPROJ=$(usex proj)
- -DNETCDF=$(usex netcdf)
- -DOPENMP=$(usex openmp)
- -DPNGLIB=$(usex png)
- -DUDUNITS2=$(usex udunits)
- -DWXWIDGETS=$(usex wxwidgets)
- -DGRAPHICSMAGICK=$(usex imagemagick $(usex graphicsmagick))
- -DMAGICK=$(usex imagemagick $(usex !graphicsmagick))
- -DTIFF=$(usex tiff)
- -DGEOTIFF=$(usex tiff)
- -DPYTHON_MODULE=$(usex python)
- -DPYTHON=$(usex python)
- -DSHAPELIB=$(usex shapelib)
- )
-
- if use python; then
- # automatically selection ignores EPYTHON
- mycmakeargs+=(
- -DPYTHONVERSION="${EPYTHON#python}"
- )
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- newenvd - 50gdl <<-_EOF_
- GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage"
- _EOF_
-}
diff --git a/dev-lang/gdl/gdl-1.0.4.ebuild b/dev-lang/gdl/gdl-1.0.4.ebuild
deleted file mode 100644
index 95e4cdaec158..000000000000
--- a/dev-lang/gdl/gdl-1.0.4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake python-single-r1 toolchain-funcs virtualx wxwidgets
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="https://github.com/gnudatalanguage/gdl"
-SRC_URI="https://github.com/gnudatalanguage/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="
- +eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf
- openmp png proj postscript python shapelib tiff udunits wxwidgets
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-cpp/antlr-cpp:2=
- dev-libs/expat
- media-libs/libpng:=
- net-libs/libtirpc:=
- sci-libs/gsl:=
- sci-libs/plplot:=[X,cxx,-dynamic,wxwidgets?]
- sys-libs/ncurses:=
- sys-libs/readline:=
- sys-libs/zlib
- x11-libs/libX11
- fftw? ( sci-libs/fftw:3.0= )
- glpk? ( sci-mathematics/glpk:= )
- gshhs? (
- sci-geosciences/gshhs-data
- sci-geosciences/gshhs:=
- )
- hdf? ( sci-libs/hdf:= )
- hdf5? ( sci-libs/hdf5:= )
- imagemagick? (
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
- )
- netcdf? ( sci-libs/netcdf:= )
- proj? ( sci-libs/proj:= )
- postscript? ( dev-libs/pslib )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- ')
- )
- shapelib? ( sci-libs/shapelib:= )
- tiff? (
- media-libs/tiff:=
- sci-libs/libgeotiff:=
- )
- udunits? ( sci-libs/udunits )
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-"
-DEPEND="${RDEPEND}
- eigen? ( dev-cpp/eigen:3 )
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.4-cmake.patch )
-DOCS=( AUTHORS HACKING NEWS PYTHON.txt README README.md )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- use wxwidgets && setup-wxwidgets unicode
- use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
- # remove bundled antlr
- rm -r src/antlr || die
-
- # gentoo: avoid install files in datadir directory
- # and manually install them in src_install
- sed -e '/AUTHORS/d' -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- # MPI is still very buggy
- # x11=off does not compile
- local mycmakeargs=(
- -DMPI=OFF
- -DREADLINE=ON
- -DX11=ON
- -DEXPAT=ON
- -DPNGLIB=ON
- -DEIGEN3=$(usex eigen)
- -DFFTW=$(usex fftw)
- -DGRIB=OFF
- -DGLPK=$(usex glpk)
- -DHDF=$(usex hdf)
- -DHDF5=$(usex hdf5)
- -DLIBPROJ=$(usex proj)
- -DNETCDF=$(usex netcdf)
- -DOPENMP=$(usex openmp)
- -DPNGLIB=$(usex png)
- -DUDUNITS2=$(usex udunits)
- -DWXWIDGETS=$(usex wxwidgets)
- -DGRAPHICSMAGICK=$(usex imagemagick $(usex graphicsmagick))
- -DMAGICK=$(usex imagemagick $(usex !graphicsmagick))
- -DTIFF=$(usex tiff)
- -DGEOTIFF=$(usex tiff)
- -DPYTHON_MODULE=$(usex python)
- -DPYTHON=$(usex python)
- -DSHAPELIB=$(usex shapelib)
- -DQHULL=OFF
- )
-
- if use python; then
- # automatically selection ignores EPYTHON
- mycmakeargs+=(
- -DPYTHONVERSION="${EPYTHON#python}"
- )
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- newenvd - 50gdl <<-_EOF_
- GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage"
- _EOF_
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-16 9:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-27 19:17 [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-06-16 9:37 Pacho Ramos
2024-03-09 18:30 Andrew Ammerlaan
2022-10-06 13:00 Andrew Ammerlaan
2015-10-14 15:22 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox