subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-lang\/gdl\/, dev\-lang\/gdl\/files\/"

[gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/

2024-03-09 Thread Andrew Ammerlaan

commit: fd97f1479bc28d47bc39181e8cab79015831bde0
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Mar  9 18:29:59 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Mar  9 18:30:17 2024 +
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  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 ..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

[gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/

2022-10-06 Thread Andrew Ammerlaan

commit: 15ee6aa862be7cb1cf32b401ebac12cb55d16eaa
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Oct  6 12:56:12 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Oct  6 13:00:32 2022 +
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  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 ..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})
+-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/

2020-09-27 Thread David Seifert

commit: 1a6e53137d2d93f8d7291c17f5c9c6c70b5d23a4
Author: David Seifert  gentoo  org>
AuthorDate: Sun Sep 27 19:17:06 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Sep 27 19:17:06 2020 +
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  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 000..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)
+

[gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/

2015-10-14 Thread James Le Cuirot

commit: 7d94d8eb5d7af9cfed628bf2305380ac7611a20c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Oct 14 15:14:30 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct 14 15:22:25 2015 +
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 
46921eba6b890187a6c75f71758e5e234b76d61a194e17de81ace10760659a4a676060490a5ef7374fd1acadf47c7f565133c19ea165e04c54a577b3c723
 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..000
--- 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.0 +
-+++ gdl-0.9.2/CMakeLists.txt   2011-12-22 20:32:20.0 +
-@@ -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.cmake1970-01-01 
01:00:00.0 +0100
-+++ gdl-0.9.2/CMakeModules/FindANTLR.cmake 2011-12-22 21:03:34.0 
+
-@@ -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.0 +
-+++ gdl-0.9.2/src/CMakeLists.txt   2011-12-22 20:31:27.0 +
-@@ -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

[gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/, dev-lang/gdl/files/

4 matches

Site Navigation

Mail list logo

Footer information