Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/files/, dev-lang/gdl/
Date: Sun, 27 Sep 2020 19:17:31
Message-Id: 1601234229.f38b0bb1db2a273c85a641624a3f5f2515058102.soap@gentoo
1 commit: f38b0bb1db2a273c85a641624a3f5f2515058102
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 27 19:17:09 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 27 19:17:09 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f38b0bb1
7
8 dev-lang/gdl: Remove old 0.9.6
9
10 Closes: https://bugs.gentoo.org/735280
11 Closes: https://bugs.gentoo.org/741096
12 Closes: https://bugs.gentoo.org/741402
13 Package-Manager: Portage-3.0.8, Repoman-3.0.1
14 Signed-off-by: David Seifert <soap <AT> gentoo.org>
15
16 dev-lang/gdl/Manifest | 1 -
17 dev-lang/gdl/files/0.9.2-include.patch | 10 --
18 dev-lang/gdl/files/0.9.5-antlr.patch | 91 ------------
19 dev-lang/gdl/files/0.9.5-png.patch | 15 --
20 ....9.6-disable-tests-hanging-under-xvfb-run.patch | 80 ----------
21 dev-lang/gdl/files/0.9.6-fix-file-move.patch | 14 --
22 .../gdl/files/0.9.6-fix-python-function-call.patch | 30 ----
23 dev-lang/gdl/files/0.9.6-formats.patch | 111 --------------
24 dev-lang/gdl/files/0.9.6-fun-fix.patch | 56 -------
25 dev-lang/gdl/files/0.9.6-gcc6.patch | 31 ----
26 .../files/0.9.6-python-use-path-and-startup.patch | 20 ---
27 dev-lang/gdl/gdl-0.9.6-r3.ebuild | 161 ---------------------
28 12 files changed, 620 deletions(-)
29
30 diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
31 index 72b22e14515..868fcd3bef4 100644
32 --- a/dev-lang/gdl/Manifest
33 +++ b/dev-lang/gdl/Manifest
34 @@ -1,2 +1 @@
35 -DIST gdl-0.9.6v2.tgz 1777167 BLAKE2B 4d92ed93f12e0979d591959d60ae9fa6785400e4f169a00f462103d263bce1aa02e615cc8467b53146791a12045850f9dae1da113f9caff4d6b44dd2a5798b3b SHA512 a816ee2e3822af380a1131a6138263c33560db7286cd699b864da305a1103d5afc881a1cd3574d2e243bfb7e65e759e46322c5e55c66ec15620d9c514565c2c5
36 DIST gdl-1.0.0_rc3.tar.gz 32650313 BLAKE2B cdecfe0646e2271e2389e0a04f8da1e8de4534faf743f233169bccf326198025eff7fd7a7b62ed8bd05fa4a0222c6fd30f9469e3edf0f5b2991ef3ef545e616b SHA512 3fde22c7e709b9cdc72a23d2317c043037379c7903418211a699c7e5caa2ed17e78e32e6d2f9b4aa89200e729fc21555821140dfdd58a5a636a858e2841f6335
37
38 diff --git a/dev-lang/gdl/files/0.9.2-include.patch b/dev-lang/gdl/files/0.9.2-include.patch
39 deleted file mode 100644
40 index 49613da16e2..00000000000
41 --- a/dev-lang/gdl/files/0.9.2-include.patch
42 +++ /dev/null
43 @@ -1,10 +0,0 @@
44 ---- gdl-0.9.2.orig/src/cformat.g 2010-07-25 17:59:19.000000000 +0100
45 -+++ gdl-0.9.2/src/cformat.g 2012-06-21 16:34:12.000000000 +0100
46 -@@ -16,6 +16,7 @@
47 - ***************************************************************************/
48 -
49 - header "pre_include_cpp" {
50 -+#include <cstdlib>
51 - #include "includefirst.hpp"
52 - }
53 -
54
55 diff --git a/dev-lang/gdl/files/0.9.5-antlr.patch b/dev-lang/gdl/files/0.9.5-antlr.patch
56 deleted file mode 100644
57 index f5b627ab444..00000000000
58 --- a/dev-lang/gdl/files/0.9.5-antlr.patch
59 +++ /dev/null
60 @@ -1,91 +0,0 @@
61 - CMakeLists.txt | 14 +++++++++++---
62 - CMakeModules/FindANTLR.cmake | 11 +++++++++++
63 - src/CMakeLists.txt | 18 +++++++++++-------
64 - 3 files changed, 33 insertions(+), 10 deletions(-)
65 -
66 -diff --git a/CMakeLists.txt b/CMakeLists.txt
67 -index 407e39a..c4b3278 100644
68 ---- a/CMakeLists.txt
69 -+++ b/CMakeLists.txt
70 -@@ -111,6 +111,8 @@ set(SZIPDIR "" CACHE PATH "GDL: Specify the SZip directory tree")
71 -
72 - set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "GDL: data directory relative to CMAKE_INSTALL_PREFIX")
73 -
74 -+set(BUNDLED_ANTLR OFF CACHE BOOL "Use bundled ANTLR grammar ?")
75 -+set(ANTLRDIR "" CACHE PATH "Specify the system ANTLR directory tree")
76 -
77 - # check for 64-bit OS
78 - if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
79 -@@ -174,9 +176,15 @@ check_library_exists(m nexttoward "" HAVE_NEXTTOWARD)
80 - # mpi
81 - check_include_file(mpi.h HAVE_MPI_H)
82 -
83 --# SA: whithout it compilation of antlr fails if there's a conflicting
84 --# version of antlr in system-wide directories
85 --include_directories(src)
86 -+if(BUNDLED_ANTLR)
87 -+ # SA: whithout it compilation of antlr fails if there's a conflicting
88 -+ # version of antlr in system-wide directories
89 -+ include_directories(src)
90 -+else(BUNDLED_ANTLR)
91 -+ find_package(ANTLR QUIET)
92 -+ set(LIBRARIES ${LIBRARIES} ${ANTLR_LIBRARIES})
93 -+ include_directories(${ANTLR_INCLUDE_DIR})
94 -+endif(BUNDLED_ANTLR)
95 -
96 - if(WIN32 AND NOT CYGWIN)
97 - # For Win32 find Pdcureses instead of (N)Curses
98 -diff --git a/CMakeModules/FindANTLR.cmake b/CMakeModules/FindANTLR.cmake
99 -new file mode 100644
100 -index 0000000..b61cc5b
101 ---- /dev/null
102 -+++ b/CMakeModules/FindANTLR.cmake
103 -@@ -0,0 +1,11 @@
104 -+
105 -+
106 -+find_library(ANTLR_LIBRARIES NAMES antlr)
107 -+find_path(ANTLR_INCLUDE_DIR NAMES antlr/ANTLRUtil.hpp)
108 -+include(FindPackageHandleStandardArgs)
109 -+find_package_handle_standard_args(ANTLR DEFAULT_MSG ANTLR_LIBRARIES ANTLR_INCLUDE_DIR)
110 -+
111 -+mark_as_advanced(
112 -+ANTLR_LIBRARIES
113 -+ANTLR_INCLUDE_DIR
114 -+)
115 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
116 -index 1f7ffec..776a1fd 100644
117 ---- a/src/CMakeLists.txt
118 -+++ b/src/CMakeLists.txt
119 -@@ -262,9 +262,8 @@ widget.cpp
120 - widget.hpp
121 - )
122 -
123 --add_subdirectory(antlr)
124 -
125 --include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
126 -+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
127 - link_directories(${LINK_DIRECTORIES})
128 -
129 - if(PYTHON_MODULE) #libgdl
130 -@@ -275,11 +274,16 @@ else(PYTHON_MODULE) #gdl
131 - add_executable(gdl ${SOURCES})
132 - endif(PYTHON_MODULE)
133 -
134 --add_dependencies(gdl antlr) # be sure that antlr is built before gdl
135 --target_link_libraries(gdl antlr) # link antlr against gdl
136 --if (MINGW)
137 --target_link_libraries(gdl ws2_32)
138 --endif (MINGW)
139 -+if(BUNDLED_ANTLR)
140 -+ add_subdirectory(antlr)
141 -+ include_directories(${CMAKE_SOURCE_DIR}/src/antlr)
142 -+ add_dependencies(gdl antlr) # be sure that antlr is built before gdl
143 -+ target_link_libraries(gdl antlr) # link antlr against gdl
144 -+ if (MINGW)
145 -+ target_link_libraries(gdl ws2_32)
146 -+ endif (MINGW)
147 -+endif(BUNDLED_ANTLR)
148 -+
149 - target_link_libraries(gdl ${LIBRARIES})
150 - add_definitions(-DHAVE_CONFIG_H)
151 -
152
153 diff --git a/dev-lang/gdl/files/0.9.5-png.patch b/dev-lang/gdl/files/0.9.5-png.patch
154 deleted file mode 100644
155 index 1140fcc9ac7..00000000000
156 --- a/dev-lang/gdl/files/0.9.5-png.patch
157 +++ /dev/null
158 @@ -1,15 +0,0 @@
159 - CMakeLists.txt | 1 -
160 - 1 file changed, 1 deletion(-)
161 -
162 -diff --git a/CMakeLists.txt b/CMakeLists.txt
163 -index 407e39a..f24a087 100644
164 ---- a/CMakeLists.txt
165 -+++ b/CMakeLists.txt
166 -@@ -270,7 +270,6 @@ if(PNGLIB)
167 - set(USE_PNGLIB ${PNG_FOUND})
168 - if(PNG_FOUND)
169 - set(LIBRARIES ${LIBRARIES} ${PNG_LIBRARIES})
170 -- set(LINK_DIRECTORIES ${LINK_DIRECTORIES} ${PNG_LIBRARY_DIRS})
171 - include_directories(${PNG_INCLUDE_DIRS})
172 - else(PNG_FOUND)
173 - message(FATAL_ERROR "libpng is required but was not found.\n"
174
175 diff --git a/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch b/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch
176 deleted file mode 100644
177 index 6ce92aff0ab..00000000000
178 --- a/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch
179 +++ /dev/null
180 @@ -1,80 +0,0 @@
181 -Description: Disable tests which work fine with local X but hang under xvfb-run
182 -Author: Axel Beckert <abe@××××××.org>
183 -Last-Update: 2014-10-10
184 -
185 ---- a/testsuite/Makefile.am
186 -+++ b/testsuite/Makefile.am
187 -@@ -18,7 +18,6 @@
188 - test_bug_2876372.pro \
189 - test_bug_2892631.pro \
190 - test_bug_2949487.pro \
191 -- test_bug_2974380.pro \
192 - test_bug_3033108.pro \
193 - test_bug_3054361.pro \
194 - test_bug_3055720.pro \
195 -@@ -43,7 +42,6 @@
196 - test_bug_3152899.pro \
197 - test_bug_3189072.pro \
198 - test_bug_3199465.pro \
199 -- test_bug_3275334.pro \
200 - test_bug_3285659.pro \
201 - test_bug_3286031.pro \
202 - test_bug_3288652.pro \
203 -@@ -74,16 +72,12 @@
204 - test_ce.pro \
205 - test_clip.pro \
206 - test_common.pro \
207 -- test_congrid.pro \
208 - test_constants.pro \
209 - test_convert_coord.pro \
210 - test_correlate.pro \
211 - test_deriv.pro \
212 -- test_device.pro \
213 - test_dicom.pro \
214 - test_erfinv.pro \
215 -- test_execute.pro \
216 -- test_extra_keywords.pro \
217 - test_fft.pro \
218 - test_fft_dim.pro \
219 - test_fft_leak.pro \
220 -@@ -122,7 +116,6 @@
221 - test_memory.pro \
222 - test_message.pro \
223 - test_modulo.pro \
224 -- test_moment.pro \
225 - test_mpfit.pro \
226 - test_multiroots.pro \
227 - test_nans_in_sort_and_median.pro \
228 -@@ -130,10 +123,8 @@
229 - test_netcdf.pro \
230 - test_null.pro \
231 - test_obj_new.pro \
232 -- test_plot_oo.pro \
233 - test_plotting_ranges.pro \
234 - test_pmulti.pro \
235 -- test_pmulti_basic.pro \
236 - test_postscript.pro \
237 - test_product.pro \
238 - test_ps_decomposed.pro \
239 -@@ -144,7 +135,6 @@
240 - test_python_module_2.pro \
241 - test_qromb.pro \
242 - test_qromo.pro \
243 -- test_random.pro \
244 - test_readf.pro \
245 - test_reads.pro \
246 - test_rebin.pro \
247 -@@ -167,13 +157,11 @@
248 - test_suite.pro \
249 - test_systime.pro \
250 - test_trisol.pro \
251 -- test_tv.pro \
252 - test_typename.pro \
253 - test_url.pro \
254 - test_voigt.pro \
255 - test_wait.pro \
256 - test_wavelet.pro \
257 -- test_window_background.pro \
258 - test_where.pro \
259 - test_zeropoly.pro \
260 - test_zip.pro \
261
262 diff --git a/dev-lang/gdl/files/0.9.6-fix-file-move.patch b/dev-lang/gdl/files/0.9.6-fix-file-move.patch
263 deleted file mode 100644
264 index 31d4f066f49..00000000000
265 --- a/dev-lang/gdl/files/0.9.6-fix-file-move.patch
266 +++ /dev/null
267 @@ -1,14 +0,0 @@
268 -Author: Ole Streicher <olebole@××××××.org>
269 -Description: Remove trailing slash at the end of dir when moving files specified by wildcard
270 -Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/97/
271 ---- a/src/pro/file_move.pro
272 -+++ b/src/pro/file_move.pro
273 -@@ -31,7 +31,7 @@
274 - res=FILE_SEARCH(dir, FILE_BASENAME(source[ii]), /fully)
275 -
276 - for jj=0,N_ELEMENTS(res)-1 do begin
277 -- if(FILE_DIRNAME(res[jj], /MARK_DIRECTORY) eq dir) then flist=[flist, res[jj]] ;
278 -+ if(FILE_DIRNAME(res[jj]) eq dir) then flist=[flist, res[jj]] ;
279 - ;print, 'dir ', dir, ' res ', FILE_DIRNAME(res[jj])
280 - endfor
281 -
282
283 diff --git a/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch b/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch
284 deleted file mode 100644
285 index fe90774e5c7..00000000000
286 --- a/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch
287 +++ /dev/null
288 @@ -1,30 +0,0 @@
289 -Author: Ole Streicher <olebole@××××××.org>
290 -Bug: https://sourceforge.net/p/gnudatalanguage/bugs/377
291 -Bug: https://sourceforge.net/p/gnudatalanguage/bugs/679
292 -Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/91
293 - https://sourceforge.net/p/gnudatalanguage/patches/92
294 -Description: Fix Python calling GDL functions
295 - * user defined functions crash
296 - * data arrays of 64 bit element size are not completely converted to Python
297 ---- a/src/pythongdl.cpp
298 -+++ b/src/pythongdl.cpp
299 -@@ -329,7 +329,7 @@
300 - }
301 - }
302 -
303 -- sub = proList[ proIx];
304 -+ sub = funList[ proIx];
305 - }
306 - }
307 - else
308 ---- a/src/topython.cpp
309 -+++ b/src/topython.cpp
310 -@@ -67,7 +67,7 @@
311 - // TODO: free the memory: PyArray_Free(PyObject* op, void* ptr) ?
312 - throw GDLException("Failed to convert array to python.");
313 - }
314 -- memcpy(PyArray_DATA(ret), DataAddr(), this->N_Elements() * sizeof(Sp::t));
315 -+ memcpy(PyArray_DATA(ret), DataAddr(), this->N_Elements() * Data_<Sp>::Sizeof());
316 - return ret;
317 - }
318 -
319
320 diff --git a/dev-lang/gdl/files/0.9.6-formats.patch b/dev-lang/gdl/files/0.9.6-formats.patch
321 deleted file mode 100644
322 index 105fa9cb8ef..00000000000
323 --- a/dev-lang/gdl/files/0.9.6-formats.patch
324 +++ /dev/null
325 @@ -1,111 +0,0 @@
326 -diff -up gdl-0.9.6/testsuite/test_formats.pro.formats gdl-0.9.6/testsuite/test_formats.pro
327 ---- gdl-0.9.6/testsuite/test_formats.pro.formats 2015-09-06 13:15:01.000000000 -0600
328 -+++ gdl-0.9.6/testsuite/test_formats.pro 2016-01-12 14:26:18.811283030 -0700
329 -@@ -13,6 +13,10 @@
330 - ; is OK for negative input, wrong for positive one !!
331 - ; -- extra "\ ^J" added in GDL between the Re/Im parts for (D)Complex
332 - ;
333 -+; Changes:
334 -+; 2016-01612 : AC various changes for better managing paths,
335 -+; expecially for Cmake automatic tests !
336 -+;
337 - ; md5sum of current version of "formats.idl" (-1 et 12 ...)
338 - ; 5d1cfbc31312a833f62033e297f986a2 formats.idl
339 - ;
340 -@@ -53,7 +57,10 @@ end
341 - pro GENERATE_FORMATS_FILE, nb_cases, verbose=verbose, test=test
342 - ;
343 - filename='formats.'+GDL_IDL_FL()
344 --;
345 -+if FILE_TEST(filename) then begin
346 -+ FILE_MOVE, filename, filename+'_old', /overwrite
347 -+ MESSAGE,/cont, 'Copy of old file <<'+filename+'_old'+'>> done.'
348 -+endif
349 - ; value to be write : one negative, one positive
350 - ;
351 - struct_neg = {BYTE:-1b,short:-1us,ushort:-1us, $
352 -@@ -104,17 +111,53 @@ soft=GDL_IDL_FL(/verbose)
353 - ;
354 - GENERATE_FORMATS_FILE, nb_cases, verbose=verbose
355 - ;
356 --if (soft NE 'idl') AND ~FILE_TEST("formats.idl") then MESSAGE, "missing reference file <<formats.idl>>"
357 -+; locating then read back the reference idl.xdr:
358 -+;
359 -+; we need to add the current dir. into the path because new file(s)
360 -+; are writtent in it. Do we have a simple way to check whether a dir
361 -+; is already in !PATH ?
362 -+;
363 -+CD, current=current
364 -+new_path=!path+PATH_SEP(/SEARCH_PATH)+current
365 -+list_of_dirs=STRSPLIT(new_path, PATH_SEP(/SEARCH_PATH), /EXTRACT)
366 -+;
367 -+; only this reference file is mandatory !
368 -+;
369 -+filename='formats.idl'
370 -+file_fmt_idl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
371 -+;
372 -+if (soft NE 'idl') AND (STRLEN(file_fmt_idl) EQ 0) then begin
373 -+ MESSAGE, 'reference file <<'+filename+'>> not found in the !PATH', /continue
374 -+ if KEYWORD_SET(no_exit) OR KEYWORD_SET(test) then STOP
375 -+ EXIT, status=1
376 -+endif
377 -+if N_ELEMENTS(file_fmt_idl) GT 1 then print, 'multiple reference file <<'+filename+'>> found !'
378 -+file_fmt_idl=file_fmt_idl[0]
379 -+;
380 -+filename='formats.gdl'
381 -+file_fmt_gdl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
382 -+if N_ELEMENTS(file_fmt_gdl) GT 1 then begin
383 -+ print, 'multiple reference file <<'+filename+'>> found ! First used !!'
384 -+ print, TRANSPOSE(file_fmt_gdl)
385 -+ file_fmt_gdl=file_fmt_gdl[0]
386 -+endif
387 -+;
388 -+filename='formats.fl'
389 -+file_fmt_fl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
390 -+if N_ELEMENTS(file_fmt_fl) GT 1 then begin
391 -+ print, 'multiple reference file <<'+filename+'>> found !'
392 -+ print, TRANSPOSE(file_fmt_fl)
393 -+ file_fmt_fl=file_fmt_fl[0]
394 -+endif
395 - ;
396 - if (soft EQ 'idl') then begin
397 -- if ~FILE_TEST("formats.gdl") then MESSAGE, /cont, "missing file <<formats.gdl>>"
398 -- if ~FILE_TEST("formats.fl") then MESSAGE, /cont, "missing file <<formats.fl>>"
399 -- if ~FILE_TEST("formats.gdl") AND ~FILE_TEST("formats.fl") then begin
400 -- MESSAGE, /cont, "No useful file found for comparison. Just Reference file written."
401 -- endif
402 -- if FILE_TEST("formats.gdl") then soft='gdl' else begin
403 -- if FILE_TEST("formats.fl") then soft='fl'
404 -- endelse
405 -+ soft=''
406 -+ if ~FILE_TEST(file_fmt_fl) then MESSAGE, /cont, "missing file <<formats.fl>>" else soft='fl'
407 -+ if ~FILE_TEST(file_fmt_gdl) then MESSAGE, /cont, "missing file <<formats.gdl>>" else soft='gdl'
408 -+ if (soft EQ '') then begin
409 -+ MESSAGE, /cont, "No useful file found for comparison. Just Reference file written."
410 -+ return
411 -+ endif
412 - endif
413 - ;
414 - ; reading back the 2 files : one created ("formats.gdl" or
415 -@@ -123,9 +166,10 @@ endif
416 - print, "Files to be compared : formats.idl, formats."+soft
417 - ;
418 - GET_LUN, lun1
419 --OPENR, lun1, "formats.idl"
420 -+OPENR, lun1, file_fmt_idl
421 - GET_LUN, lun2
422 --OPENR, lun2, "formats."+soft
423 -+if (soft EQ 'gdl') then OPENR, lun2, file_fmt_gdl
424 -+if (soft EQ 'fl') then OPENR, lun2, file_fmt_fl
425 - ;
426 - ref=STRING("")
427 - val=STRING("")
428 -@@ -155,7 +199,7 @@ CLOSE, lun1, lun2
429 - FREE_LUN, lun1, lun2
430 - ;
431 - if (nb_errors GT 0) then begin
432 -- MESSAGE, /continue, 'Using a "diff formats.idl formats.gdl" in a shell'
433 -+ MESSAGE, /continue, 'Using a "diff formats.idl formats.{gdl|fl}" in a shell'
434 - MESSAGE, /continue, 'should help to debug !'
435 - endif
436 - ;
437
438 diff --git a/dev-lang/gdl/files/0.9.6-fun-fix.patch b/dev-lang/gdl/files/0.9.6-fun-fix.patch
439 deleted file mode 100644
440 index a3a4118ceb0..00000000000
441 --- a/dev-lang/gdl/files/0.9.6-fun-fix.patch
442 +++ /dev/null
443 @@ -1,56 +0,0 @@
444 -Author: Vitaliy Tomin <highwaystar@××××××××.net>
445 -Description: Fix direct calling of direct function calls from Python
446 -Bug: https://sourceforge.net/p/gnudatalanguage/bugs/678
447 ---- a/src/pythongdl.cpp
448 -+++ b/src/pythongdl.cpp
449 -@@ -392,25 +392,31 @@
450 -
451 - BaseGDL* retValGDL = NULL;
452 - Guard<BaseGDL> retValGDL_guard;
453 -- if( functionCall)
454 -- {
455 -- if( libCall)
456 -- retValGDL = static_cast<DLibFun*>(static_cast<EnvT*>(e)->
457 -- GetPro())->Fun()( static_cast<EnvT*>(e));
458 -- else
459 -- retValGDL = interpreter->call_fun(static_cast<DSubUD*>
460 -- (static_cast<EnvUDT*>(e)
461 -- ->GetPro())->GetTree());
462 -- retValGDL_guard.Reset( retValGDL);
463 -- }
464 -- else
465 -- {
466 -- if( libCall)
467 -- static_cast<DLibPro*>(e->GetPro())->Pro()(static_cast<EnvT*>(e)); // throws
468 -- else
469 -- interpreter->call_pro(static_cast<DSubUD*>
470 -- (e->GetPro())->GetTree()); //throws
471 -- }
472 -+
473 -+ if (functionCall) {
474 -+ DLibFun* sub_fun_chk = dynamic_cast<DLibFun *>(static_cast<EnvT *>(e)->GetPro());
475 -+ if (sub_fun_chk) {
476 -+ //handle direct call function first
477 -+ if (sub_fun_chk->DirectCall()) {
478 -+ BaseGDL* directCallParameter = e->GetParDefined(0);
479 -+ retValGDL = static_cast<DLibFunDirect*>(sub_fun_chk)->FunDirect()(directCallParameter, true /*isReference*/);
480 -+ }
481 -+ } else if (libCall)
482 -+ retValGDL = static_cast<DLibFun *>(static_cast<EnvT *>(e)->GetPro())
483 -+ ->Fun()(static_cast<EnvT *>(e));
484 -+ else
485 -+ retValGDL = interpreter->call_fun(
486 -+ static_cast<DSubUD *>(static_cast<EnvUDT *>(e)->GetPro())
487 -+ ->GetTree());
488 -+ retValGDL_guard.Reset(retValGDL);
489 -+ } else {
490 -+ if (libCall)
491 -+ static_cast<DLibPro *>(e->GetPro())
492 -+ ->Pro()(static_cast<EnvT *>(e)); // throws
493 -+ else
494 -+ interpreter->call_pro(
495 -+ static_cast<DSubUD *>(e->GetPro())->GetTree()); // throws
496 -+ }
497 -
498 - // copy back args and keywords
499 - success = CopyArgToPython( parRef, kwRef, *e, argTuple, kwDict);
500
501 diff --git a/dev-lang/gdl/files/0.9.6-gcc6.patch b/dev-lang/gdl/files/0.9.6-gcc6.patch
502 deleted file mode 100644
503 index e017255b0be..00000000000
504 --- a/dev-lang/gdl/files/0.9.6-gcc6.patch
505 +++ /dev/null
506 @@ -1,31 +0,0 @@
507 -diff -up gdl-0.9.6/src/specializations.hpp.gcc6 gdl-0.9.6/src/specializations.hpp
508 ---- gdl-0.9.6/src/specializations.hpp.gcc6 2015-08-24 15:26:47.000000000 -0600
509 -+++ gdl-0.9.6/src/specializations.hpp 2016-03-03 16:30:46.694379312 -0700
510 -@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* mi
511 -
512 - // default_io.cpp
513 - template<>
514 --std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_);
515 --template<>
516 --std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_);
517 --template<>
518 --std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_);
519 --template<>
520 --std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_);
521 --template<>
522 --std::istream& operator>>(std::istream& is, Data_<SpDString>& data_);
523 --template<>
524 - std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);
525 - template<>
526 - std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);
527 ---- gdl-0.9.6/src/typedefs.hpp.gcc6 2014/08/09 15:33:29 1.76
528 -+++ gdl-0.9.6/src/typedefs.hpp 2016/02/04 22:48:46 1.77
529 -@@ -235,7 +235,7 @@
530 -
531 - Guard& operator=( Guard& r)
532 - {
533 -- if( &r == this) return;
534 -+ if( &r == this) return *this;
535 - delete guarded;
536 - guarded = r.guarded;
537 - r.guarded = NULL;
538
539 diff --git a/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch b/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch
540 deleted file mode 100644
541 index a76cd8cb627..00000000000
542 --- a/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch
543 +++ /dev/null
544 @@ -1,20 +0,0 @@
545 -Author: Ole Streicher <olebole@××××××.org>
546 -Description: Initialize GDL path if one is defined
547 -Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/93/
548 ---- a/src/pythongdl.cpp
549 -+++ b/src/pythongdl.cpp
550 -@@ -537,6 +537,14 @@
551 - // instantiate the interpreter (creates $MAIN$ environment)
552 - interpreter = new DInterpreter();
553 -
554 -+ string gdlPath=GetEnvString("GDL_PATH");
555 -+ if( gdlPath == "") gdlPath=GetEnvString("IDL_PATH");
556 -+ if( gdlPath == "")
557 -+ {
558 -+ gdlPath = "+" GDLDATADIR "/lib";
559 -+ }
560 -+ SysVar::SetGDLPath( gdlPath);
561 -+
562 - PyObject* m = Py_InitModule("GDL", GDLMethods);
563 -
564 - gdlError = PyErr_NewException((char*)"GDL.error", NULL, NULL);
565
566 diff --git a/dev-lang/gdl/gdl-0.9.6-r3.ebuild b/dev-lang/gdl/gdl-0.9.6-r3.ebuild
567 deleted file mode 100644
568 index 3a51f5b1f4b..00000000000
569 --- a/dev-lang/gdl/gdl-0.9.6-r3.ebuild
570 +++ /dev/null
571 @@ -1,161 +0,0 @@
572 -# Copyright 1999-2020 Gentoo Authors
573 -# Distributed under the terms of the GNU General Public License v2
574 -
575 -EAPI=5
576 -
577 -WX_GTK_VER="3.0"
578 -PYTHON_COMPAT=( python2_7 )
579 -
580 -inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
581 -
582 -DESCRIPTION="GNU Data Language"
583 -HOMEPAGE="https://github.com/gnudatalanguage/gdl"
584 -SRC_URI="mirror://sourceforge/gnudatalanguage/${P}v2.tgz"
585 -
586 -LICENSE="GPL-2"
587 -SLOT="0"
588 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
589 -IUSE="+eigen fftw graphicsmagick gshhs hdf hdf5 +imagemagick netcdf openmp
590 - png proj postscript python static-libs udunits wxwidgets"
591 -
592 -RDEPEND="
593 - dev-cpp/antlr-cpp:2=
594 - sci-libs/gsl:0=
595 - sci-libs/plplot:0=[-dynamic]
596 - sys-libs/ncurses:0=
597 - sys-libs/readline:0=
598 - sys-libs/zlib:0=
599 - x11-libs/libX11:0=
600 - fftw? ( sci-libs/fftw:3.0= )
601 - gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
602 - hdf? ( sci-libs/hdf:0= )
603 - hdf5? ( sci-libs/hdf5:0= )
604 - imagemagick? (
605 - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
606 - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
607 - )
608 - netcdf? ( sci-libs/netcdf )
609 - proj? ( sci-libs/proj )
610 - postscript? ( dev-libs/pslib )
611 - python? (
612 - ${PYTHON_DEPS}
613 - || (
614 - dev-python/numpy-python2[${PYTHON_USEDEP}]
615 - dev-python/numpy[${PYTHON_USEDEP}]
616 - )
617 - )
618 - udunits? ( sci-libs/udunits )
619 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
620 -DEPEND="${RDEPEND}
621 - dev-java/antlr:0[java(+),script(+)]
622 - virtual/pkgconfig
623 - eigen? ( dev-cpp/eigen:3 )"
624 -
625 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
626 -
627 -PATCHES=(
628 - "${FILESDIR}"/0.9.2-include.patch
629 - "${FILESDIR}"/0.9.5-antlr.patch
630 - "${FILESDIR}"/0.9.5-png.patch
631 - "${FILESDIR}"/0.9.6-fix-file-move.patch
632 - "${FILESDIR}"/0.9.6-fix-python-function-call.patch
633 - "${FILESDIR}"/0.9.6-fun-fix.patch
634 - "${FILESDIR}"/0.9.6-python-use-path-and-startup.patch
635 - "${FILESDIR}"/0.9.6-disable-tests-hanging-under-xvfb-run.patch
636 - "${FILESDIR}"/0.9.6-gcc6.patch
637 - "${FILESDIR}"/0.9.6-formats.patch
638 -)
639 -
640 -pkg_pretend() {
641 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
642 -}
643 -
644 -pkg_setup() {
645 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
646 -}
647 -
648 -src_prepare() {
649 - use wxwidgets && need-wxwidgets unicode
650 - use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
651 -
652 - # make sure antlr includes are from system and rebuild the sources with it
653 - # https://sourceforge.net/p/gnudatalanguage/patches/39/
654 - rm -r src/antlr || die
655 - einfo "Regenerating grammar"
656 - pushd src >/dev/null || die
657 - local i
658 - for i in *.g; do
659 - antlr ${i} || die
660 - done
661 - popd >/dev/null || die
662 -
663 - # gentoo: avoid install files in datadir directory
664 - # and manually install them in src_install
665 - sed -e '/AUTHORS/d' -i CMakeLists.txt || die
666 - cmake-utils_src_prepare
667 -}
668 -
669 -src_configure() {
670 - # MPI is still very buggy
671 - # x11=off does not compile
672 - local mycmakeargs=(
673 - -DMPICH=OFF
674 - -DBUNDLED_ANTLR=OFF
675 - -DX11=ON
676 - -DEIGEN3="$(usex eigen)"
677 - -DFFTW="$(usex fftw)"
678 - -DGRIB=OFF
679 - -DGSHHS="$(usex gshhs)"
680 - -DHDF="$(usex hdf)"
681 - -DHDF5="$(usex hdf5)"
682 - -DLIBPROJ4="$(usex proj)"
683 - -DNETCDF="$(usex netcdf)"
684 - -DOPENMP="$(usex openmp)"
685 - -DPNGLIB="$(usex png)"
686 - -DPSLIB="$(usex postscript)"
687 - -DUDUNITS="$(usex udunits)"
688 - -DWXWIDGETS="$(usex wxwidgets)"
689 - )
690 -
691 - if use imagemagick; then
692 - if use graphicsmagick; then
693 - mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
694 - else
695 - mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
696 - fi
697 - else
698 - mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
699 - fi
700 -
701 - configuration() {
702 - mycmakeargs+=( $@ )
703 - cmake-utils_src_configure
704 - }
705 - configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
706 - use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
707 -}
708 -
709 -src_compile() {
710 - cmake-utils_src_compile
711 - use python && python_foreach_impl cmake-utils_src_make
712 -}
713 -
714 -src_test() {
715 - # there is check target instead of the ctest to define some LDPATH
716 - virtx emake -C "${BUILD_DIR}" check
717 -}
718 -
719 -src_install() {
720 - cmake-utils_src_install
721 - if use python; then
722 - installation() {
723 - mv src/libgdl.so GDL.so || die
724 - python_domodule GDL.so
725 - }
726 - python_foreach_impl run_in_build_dir installation
727 - dodoc PYTHON.txt
728 - fi
729 - #dodoc AUTHORS README
730 - echo "GDL_PATH=\"+${EPREFIX}/usr/share/gnudatalanguage\"" > 50gdl || die
731 - doenvd 50gdl
732 -}