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

2024-04-18 Thread Pacho Ramos 
commit: 41f3bd64af8e0843f4578c838537c9fa33ef2be2
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Apr 18 16:58:17 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Apr 18 17:03:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f3bd64

dev-lang/gdl: Use wxGTK 3.2

Signed-off-by: Pacho Ramos  gentoo.org>

 dev-lang/gdl/gdl-1.0.4-r1.ebuild | 149 +++
 1 file changed, 149 insertions(+)

diff --git a/dev-lang/gdl/gdl-1.0.4-r1.ebuild b/dev-lang/gdl/gdl-1.0.4-r1.ebuild
new file mode 100644
index ..37797d0e9d71
--- /dev/null
+++ b/dev-lang/gdl/gdl-1.0.4-r1.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.2-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_
+

[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/

2023-05-06 Thread Sam James 
commit: 4a83c9c99f49404c89317bffd3fa3762189c4eac
Author: Sam James  gentoo  org>
AuthorDate: Sat May  6 11:30:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  6 11:33:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a83c9c9

dev-lang/gdl: drop stale dev-util/intltool dep

Signed-off-by: Sam James  gentoo.org>

 dev-lang/gdl/{gdl-1.0.1-r1.ebuild => gdl-1.0.1-r2.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-lang/gdl/gdl-1.0.1-r1.ebuild b/dev-lang/gdl/gdl-1.0.1-r2.ebuild
similarity index 99%
rename from dev-lang/gdl/gdl-1.0.1-r1.ebuild
rename to dev-lang/gdl/gdl-1.0.1-r2.ebuild
index 08bc06d11634..fa0c8e92f4d9 100644
--- a/dev-lang/gdl/gdl-1.0.1-r1.ebuild
+++ b/dev-lang/gdl/gdl-1.0.1-r2.ebuild
@@ -64,7 +64,6 @@ DEPEND="${RDEPEND}
eigen? ( dev-cpp/eigen:3 )
 "
 BDEPEND="
-   dev-util/intltool
virtual/pkgconfig
 "

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

2023-05-06 Thread Sam James 
commit: a368bccf94173009eb1e64c5df8130a7e70527f9
Author: Sam James  gentoo  org>
AuthorDate: Sat May  6 11:33:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  6 11:33:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a368bccf

dev-lang/gdl: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-lang/gdl/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index 7babf54e25d6..056456030706 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -21,5 +21,6 @@


gnudatalanguage
+   gnudatalanguage/gdl

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

2022-12-17 Thread Sam James 
commit: 5ee11a53fa00e44c01cd794fa408f79113afbdb4
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 07:53:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 07:53:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee11a53

dev-lang/gdl: drop 1.0.0_rc3-r3

Signed-off-by: Sam James  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-r3.ebuild | 153 ---
 3 files changed, 248 deletions(-)

diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 659e647babeb..36cba2f543cc 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,2 +1 @@
-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.0_rc3-cmake.patch 
b/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
deleted file mode 100644
index dd7abcc54d90..
--- a/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
+++ /dev/null
@@ -1,94 +0,0 @@
 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})
-

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

2022-10-07 Thread Andrew Ammerlaan 
commit: 10c2ff23f74fa37cff59486272be2cf3aef1d0ea
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Oct  7 09:44:04 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Oct  7 09:44:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c2ff23

dev-lang/gdl: depend on plplot[X]

Closes: https://bugs.gentoo.org/875818
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild | 4 ++--
 dev-lang/gdl/gdl-1.0.1.ebuild| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild 
b/dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild
index 8ad53af5da65..3ddd3c10fb22 100644
--- a/dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild
+++ b/dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ RDEPEND="
dev-cpp/antlr-cpp:2=
dev-libs/expat
sci-libs/gsl:0=
-   sci-libs/plplot:0=[cxx,-dynamic]
+   sci-libs/plplot:0=[X,cxx,-dynamic]
sys-libs/ncurses:0=
sys-libs/readline:0=
sys-libs/zlib

diff --git a/dev-lang/gdl/gdl-1.0.1.ebuild b/dev-lang/gdl/gdl-1.0.1.ebuild
index 3dd1b363bd8f..e6c87cb4a0cc 100644
--- a/dev-lang/gdl/gdl-1.0.1.ebuild
+++ b/dev-lang/gdl/gdl-1.0.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
dev-libs/expat
net-libs/libtirpc:=
sci-libs/gsl:0=
-   sci-libs/plplot:0=[cxx,-dynamic,wxwidgets?]
+   sci-libs/plplot:0=[X,cxx,-dynamic,wxwidgets?]
sys-libs/ncurses:0=
sys-libs/readline:0=
sys-libs/zlib

[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/

2021-12-28 Thread Sam James 
commit: 763068f1345ab9e60737530f649e48feb455ddb1
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 28 21:56:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 28 22:00:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763068f1

dev-lang/gdl: depend on netcdf subslot

need to be rebuilt when its subslot changes

Signed-off-by: Sam James  gentoo.org>

 dev-lang/gdl/{gdl-1.0.0_rc3.ebuild => gdl-1.0.0_rc3-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/gdl/gdl-1.0.0_rc3.ebuild 
b/dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild
similarity index 98%
rename from dev-lang/gdl/gdl-1.0.0_rc3.ebuild
rename to dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild
index f87b63dfef64..8ad53af5da65 100644
--- a/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
+++ b/dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild
@@ -45,8 +45,8 @@ RDEPEND="
!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
)
-   netcdf? ( sci-libs/netcdf )
-   proj? ( sci-libs/proj )
+   netcdf? ( sci-libs/netcdf:= )
+   proj? ( sci-libs/proj:= )
postscript? ( dev-libs/pslib )
python? (
${PYTHON_DEPS}

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

2021-11-04 Thread Sam James 
commit: a03bf48ac72e5ba6dcc0de4e4b179e9c4bb4c963
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov  4 19:50:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov  4 19:51:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03bf48a

dev-lang/gdl: add missing dev-util/intltool dependency

Signed-off-by: Sam James  gentoo.org>

 dev-lang/gdl/gdl-1.0.0_rc3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-lang/gdl/gdl-1.0.0_rc3.ebuild 
b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
index fd8b8966192..f87b63dfef6 100644
--- a/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
+++ b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,6 +61,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
eigen? ( dev-cpp/eigen:3 )"
 BDEPEND="
+   dev-util/intltool
virtual/pkgconfig
python? ( app-admin/chrpath )"

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

2020-09-27 Thread David Seifert 
commit: f38b0bb1db2a273c85a641624a3f5f2515058102
Author: David Seifert  gentoo  org>
AuthorDate: Sun Sep 27 19:17:09 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Sep 27 19:17:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f38b0bb1

dev-lang/gdl: Remove old 0.9.6

Closes: https://bugs.gentoo.org/735280
Closes: https://bugs.gentoo.org/741096
Closes: https://bugs.gentoo.org/741402
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/0.9.2-include.patch |  10 --
 dev-lang/gdl/files/0.9.5-antlr.patch   |  91 
 dev-lang/gdl/files/0.9.5-png.patch |  15 --
 9.6-disable-tests-hanging-under-xvfb-run.patch |  80 --
 dev-lang/gdl/files/0.9.6-fix-file-move.patch   |  14 --
 .../gdl/files/0.9.6-fix-python-function-call.patch |  30 
 dev-lang/gdl/files/0.9.6-formats.patch | 111 --
 dev-lang/gdl/files/0.9.6-fun-fix.patch |  56 ---
 dev-lang/gdl/files/0.9.6-gcc6.patch|  31 
 .../files/0.9.6-python-use-path-and-startup.patch  |  20 ---
 dev-lang/gdl/gdl-0.9.6-r3.ebuild   | 161 -
 12 files changed, 620 deletions(-)

diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 72b22e14515..868fcd3bef4 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,2 +1 @@
-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/0.9.2-include.patch 
b/dev-lang/gdl/files/0.9.2-include.patch
deleted file mode 100644
index 49613da16e2..000
--- a/dev-lang/gdl/files/0.9.2-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 gdl-0.9.2.orig/src/cformat.g   2010-07-25 17:59:19.0 +0100
-+++ gdl-0.9.2/src/cformat.g2012-06-21 16:34:12.0 +0100
-@@ -16,6 +16,7 @@
-  ***/
- 
- header "pre_include_cpp" {
-+#include 
- #include "includefirst.hpp"
- }
- 

diff --git a/dev-lang/gdl/files/0.9.5-antlr.patch 
b/dev-lang/gdl/files/0.9.5-antlr.patch
deleted file mode 100644
index f5b627ab444..000
--- a/dev-lang/gdl/files/0.9.5-antlr.patch
+++ /dev/null
@@ -1,91 +0,0 @@
- CMakeLists.txt   | 14 +++---
- CMakeModules/FindANTLR.cmake | 11 +++
- src/CMakeLists.txt   | 18 +++---
- 3 files changed, 33 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 407e39a..c4b3278 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,6 +111,8 @@ set(SZIPDIR "" CACHE PATH "GDL: Specify the SZip directory 
tree")
- 
- set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "GDL: data 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)
-@@ -174,9 +176,15 @@ check_library_exists(m nexttoward "" HAVE_NEXTTOWARD)
- # 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)
- 
- if(WIN32 AND NOT CYGWIN)
-   # For Win32 find Pdcureses instead of (N)Curses
-diff --git a/CMakeModules/FindANTLR.cmake b/CMakeModules/FindANTLR.cmake
-new file mode 100644
-index 000..b61cc5b
 /dev/null
-+++ b/CMakeModules/FindANTLR.cmake
-@@ -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 --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1f7ffec..776a1fd 100644
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt

[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/

2020-01-22 Thread Michał Górny 
commit: 2b49f68327548dcd00704da701db3bcd2f74189a
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:46:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:50:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b49f683

dev-lang/gdl: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 dev-lang/gdl/{gdl-0.9.6-r2.ebuild => gdl-0.9.6-r3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-lang/gdl/gdl-0.9.6-r2.ebuild b/dev-lang/gdl/gdl-0.9.6-r3.ebuild
similarity index 100%
rename from dev-lang/gdl/gdl-0.9.6-r2.ebuild
rename to dev-lang/gdl/gdl-0.9.6-r3.ebuild

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

2020-01-15 Thread Michał Górny 
commit: 8465c5506792439c60e64280d4ad8c04f78410ff
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 05:02:02 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 05:16:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8465c550

dev-lang/gdl: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 dev-lang/gdl/gdl-0.9.6-r2.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-lang/gdl/gdl-0.9.6-r2.ebuild b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
index 7e72f15aef0..3a51f5b1f4b 100644
--- a/dev-lang/gdl/gdl-0.9.6-r2.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -39,7 +39,10 @@ RDEPEND="
postscript? ( dev-libs/pslib )
python? (
${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
)
udunits? ( sci-libs/udunits )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"

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

2018-08-20 Thread Patrice Clement 
commit: 8d62023073d1ac94e515b672e4ee109745c24192
Author: Francesco Turco  fastmail  fm>
AuthorDate: Sun Aug 12 16:56:50 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Aug 20 09:45:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d620230

dev-lang/gdl: update link in comments.

 dev-lang/gdl/gdl-0.9.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/gdl/gdl-0.9.6-r2.ebuild b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
index c477c6d3942..f4b9dc99063 100644
--- a/dev-lang/gdl/gdl-0.9.6-r2.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
@@ -77,7 +77,7 @@ 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=618685=3465878_id=97659
+   # https://sourceforge.net/p/gnudatalanguage/patches/39/
rm -r src/antlr || die
einfo "Regenerating grammar"
pushd src >/dev/null || die

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

2018-08-20 Thread Patrice Clement 
commit: 1614725316504a589519589a9cebcbb0dfa327fc
Author: Francesco Turco  fastmail  fm>
AuthorDate: Sun Aug 12 16:55:34 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Aug 20 09:45:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16147253

dev-lang/gdl: update HOMEPAGE.

Closes: https://github.com/gentoo/gentoo/pull/9549

 dev-lang/gdl/gdl-0.9.6-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/gdl/gdl-0.9.6-r2.ebuild b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
index 04689db30c0..c477c6d3942 100644
--- a/dev-lang/gdl/gdl-0.9.6-r2.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
 
 DESCRIPTION="GNU Data Language"
-HOMEPAGE="http://gnudatalanguage.sourceforge.net/;
+HOMEPAGE="https://github.com/gnudatalanguage/gdl;
 SRC_URI="mirror://sourceforge/gnudatalanguage/${P}v2.tgz"
 
 LICENSE="GPL-2"

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

2017-02-11 Thread David Seifert 
commit: ef664cf5291561a96a3da9b42e3cd41940ff2f4f
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 11 19:21:57 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 11 19:47:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef664cf5

dev-lang/gdl: Use sub-slot operators for imagemagick

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

 .../{gdl-0.9.6-r1.ebuild => gdl-0.9.6-r2.ebuild}   | 33 --
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/dev-lang/gdl/gdl-0.9.6-r1.ebuild b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
similarity index 86%
rename from dev-lang/gdl/gdl-0.9.6-r1.ebuild
rename to dev-lang/gdl/gdl-0.9.6-r2.ebuild
index fc6add89ad..1dd13833fa 100644
--- a/dev-lang/gdl/gdl-0.9.6-r1.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gnudatalanguage/${P}v2.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp
+IUSE="+eigen fftw graphicsmagick grib gshhs hdf hdf5 +imagemagick netcdf openmp
  png proj postscript python static-libs udunits wxwidgets"
 
 RDEPEND="
@@ -33,10 +33,8 @@ RDEPEND="
hdf? ( sci-libs/hdf:0= )
hdf5? ( sci-libs/hdf5:0= )
imagemagick? (
-   || (
-   media-gfx/graphicsmagick[cxx]
-   media-gfx/imagemagick[cxx]
-   )
+   !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+   graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
)
netcdf? ( sci-libs/netcdf )
proj? ( sci-libs/proj )
@@ -47,7 +45,6 @@ RDEPEND="
)
udunits? ( sci-libs/udunits )
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-
 DEPEND="${RDEPEND}
dev-java/antlr:0[java(+),script(+)]
virtual/pkgconfig
@@ -69,9 +66,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-   use openmp && [[ $(tc-getCXX)$ == *g++* ]] && \
-   [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp && \
-   die "You are using gcc but without OpenMP capabilities that you 
requested"
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
@@ -82,10 +81,12 @@ src_prepare() {
# 
https://sourceforge.net/tracker/?func=detail=618685=3465878_id=97659
rm -r src/antlr || die
einfo "Regenerating grammar"
-   pushd src > /dev/null
+   pushd src >/dev/null || die
local i
-   for i in *.g; do antlr ${i} || die ; done
-   popd > /dev/null
+   for i in *.g; do
+   antlr ${i} || die
+   done
+   popd >/dev/null || die
 
# gentoo: avoid install files in datadir directory
# and manually install them in src_install
@@ -114,8 +115,9 @@ src_configure() {
-DUDUNITS="$(usex udunits)"
-DWXWIDGETS="$(usex wxwidgets)"
)
+
if use imagemagick; then
-   if has_version media-gfx/graphicsmagick[cxx]; then
+   if use graphicsmagick; then
mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
else
mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
@@ -123,6 +125,7 @@ src_configure() {
else
mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
fi
+
configuration() {
mycmakeargs+=( $@ )
cmake-utils_src_configure
@@ -152,6 +155,6 @@ src_install() {
dodoc PYTHON.txt
fi
#dodoc AUTHORS README
-   echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
+   echo "GDL_PATH=\"+${EPREFIX}/usr/share/gnudatalanguage\"" > 50gdl || die
doenvd 50gdl
 }

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

2016-08-30 Thread David Seifert 
commit: cabb72703f081a2a0978caef6edf4ba3e2c33955
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Sat Aug  6 14:48:18 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Aug 30 17:26:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cabb7270

dev-lang/gdl: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/2162

Signed-off-by: David Seifert  gentoo.org>

 dev-lang/gdl/files/0.9.5-plplot.patch | 134 --
 1 file changed, 134 deletions(-)

diff --git a/dev-lang/gdl/files/0.9.5-plplot.patch 
b/dev-lang/gdl/files/0.9.5-plplot.patch
deleted file mode 100644
index 70ad1bd..
--- a/dev-lang/gdl/files/0.9.5-plplot.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -up gdl-0.9.5/CMakeLists.txt.plplot gdl-0.9.5/CMakeLists.txt
 gdl-0.9.5/CMakeLists.txt.plplot2014-10-07 07:21:14.0 -0600
-+++ gdl-0.9.5/CMakeLists.txt   2015-04-24 14:29:15.588067694 -0600
-@@ -386,7 +386,7 @@ if(PLPLOT_FOUND)
- #}" HAVE_PLPLOT_WIDTH)
- 
- #give it a 2nd try...
--   check_library_exists("${PLPLOT_LIBRARIES}" c_plwidth "" 
HAVE_PLPLOT_WIDTH)
-+  check_library_exists("${PLPLOT_LIBRARIES}" c_plwidth "" 
HAVE_PLPLOT_WIDTH)
-   if(HAVE_PLPLOT_WIDTH)
- set(HAVE_PLPLOT_WIDTH 1)
-   endif(HAVE_PLPLOT_WIDTH)
-@@ -402,6 +402,11 @@ if(PLPLOT_FOUND)
-   else(PLPLOT_HAS_LEGEND)
- message(STATUS "Your plplot lib is too old for some gdl functions, 
please upgrade.")
-   endif(PLPLOT_HAS_LEGEND)
-+  check_cxx_source_compiles("#include 
-+ main(){PLINT n; PLFLT 
x,y;plcallback::fill(n,,);}" PLPLOT_HAS_PLCALLBACK)
-+  if(PLPLOT_HAS_PLCALLBACK)
-+set(PLPLOT_HAS_PLCALLBACK 1)
-+  endif(PLPLOT_HAS_PLCALLBACK)
- endif(PLPLOT_FOUND)
-   
- # GRAPHICSMAGICK is an alternative to the classical ImageMagick Lib.
-diff -up gdl-0.9.5/CMakeModules/FindPlplot.cmake.plplot 
gdl-0.9.5/CMakeModules/FindPlplot.cmake
 gdl-0.9.5/CMakeModules/FindPlplot.cmake.plplot 2011-08-19 
04:18:51.0 -0600
-+++ gdl-0.9.5/CMakeModules/FindPlplot.cmake2015-04-24 13:54:56.915632230 
-0600
-@@ -9,8 +9,12 @@
- #
- 
- 
--find_library(PLPLOT_LIBRARY NAMES plplotd)
--find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd)
-+find_library(PLPLOT_LIBRARY NAMES plplot)
-+find_library(PLPLOTCXX_LIBRARY NAMES plplotcxx)
-+if(NOT PLPLOT_LIBRARY)
-+find_library(PLPLOT_LIBRARY NAMES plplotd)
-+find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd)
-+endif(NOT PLPLOT_LIBRARY)
- set(PLPLOT_LIBRARIES ${PLPLOT_LIBRARY} ${PLPLOTCXX_LIBRARY})
- find_path(PLPLOT_INCLUDE_DIR NAMES plplot/plplot.h)
- include(FindPackageHandleStandardArgs)
-diff -up gdl-0.9.5/config.h.cmake.plplot gdl-0.9.5/config.h.cmake
 gdl-0.9.5/config.h.cmake.plplot2014-08-30 14:13:43.0 -0600
-+++ gdl-0.9.5/config.h.cmake   2015-04-24 13:39:22.259704608 -0600
-@@ -31,6 +31,12 @@
- #cmakedefine HAVE_PLPLOT_WIDTH 1
- #cmakedefine PLPLOT_PRIVATE_NOT_HIDDEN 1
- #cmakedefine PLPLOT_HAS_LEGEND
-+#cmakedefine PLPLOT_HAS_PLCALLBACK
-+#ifdef PLPLOT_HAS_PLCALLBACK
-+#define PLCALLBACK plcallback
-+#else
-+#define PLCALLBACK plstream
-+#endif
- #ifndef HAVE_STDINT_H
- #cmakedefine HAVE_STDINT_H 1
- #endif
-diff -up gdl-0.9.5/src/plotting_contour.cpp.plplot 
gdl-0.9.5/src/plotting_contour.cpp
 gdl-0.9.5/src/plotting_contour.cpp.plplot  2014-09-29 11:03:12.0 
-0600
-+++ gdl-0.9.5/src/plotting_contour.cpp 2015-04-24 13:39:22.267705191 -0600
-@@ -789,8 +789,8 @@ namespace lib
-   1, value, 
-   static_cast(( *thick )[i%thick->N_Elements()]),
-   0,0,0,0,
--  (plstream::fill), (oneDim),
--  (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void 
*):(void *));
-+  (PLCALLBACK::fill), (oneDim),
-+  (oneDim)?(PLCALLBACK::tr1):(PLCALLBACK::tr2), (oneDim)?(void 
*):(void *));
- }
- actStream->psty(0);
- //if (docolors) gdlSetGraphicsForegroundColorFromKw( e, actStream 
);
-@@ -808,8 +808,8 @@ namespace lib
-   clevel[i], maxmax, 
-   1,value,
-   0,0,0,0,0,
--  plstream::fill, (oneDim), //Onedim is accelerator since 
rectangles are kept rectangles see plplot doc
--  (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void 
*):(void *));
-+  PLCALLBACK::fill, (oneDim), //Onedim is accelerator since 
rectangles are kept rectangles see plplot doc
-+  (oneDim)?(PLCALLBACK::tr1):(PLCALLBACK::tr2), 
(oneDim)?(void *):(void *));
- }
-   } else {  //every other case of fill 
- // note that plshades is not protected against 1 level (color 
formula is
-@@ -818,8 +818,8 @@ namespace lib
- if (nlevel>2 && !(docolors)) { //acceleration with shades when no 
c_colors are given. use continuous table1, decomposed or not.
-

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

2016-05-24 Thread Pacho Ramos 
commit: 9c55aab863f06bc0479eb149765d18f21cb5a846
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue May 24 19:10:35 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue May 24 19:12:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c55aab8

dev-lang/gdl: Drop old version relying on obsolete wxGTK

Package-Manager: portage-2.3.0_rc1

 dev-lang/gdl/Manifest|   1 -
 dev-lang/gdl/gdl-0.9.5-r1.ebuild | 157 --
 dev-lang/gdl/gdl-0.9.5-r2.ebuild | 158 ---
 3 files changed, 316 deletions(-)

diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index d8a611f..a23331d 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,2 +1 @@
-DIST gdl-0.9.5.tar.gz 2341992 SHA256 
cc9635e836b5ea456cad93f8a07d589aed8649668fbd14c4aad22091991137e2 SHA512 
10f004956fedc1ae5a99a9398f82e64982267a59637fc8823591b9573df9ce136b303a0fcebd774475b9bea266a640e2b66cd590c85b57b6cf505f40448e0d3a
 WHIRLPOOL 
6ef59fc574ce26e798d30e9b4fdec9f49b82933b500901c8013c60de884ed6601d99c58ecd17221191cea121914dffce4c59211ce86b2c43fb40d43ce7ce033b
 DIST gdl-0.9.6v2.tgz 1777167 SHA256 
cfb005ee1d9c843b26cc474618225ce68a1f0bfaeddcd45bf63a0a8fb62eedb4 SHA512 
a816ee2e3822af380a1131a6138263c33560db7286cd699b864da305a1103d5afc881a1cd3574d2e243bfb7e65e759e46322c5e55c66ec15620d9c514565c2c5
 WHIRLPOOL 
1437816b807b8414b423c777ad0a3af4088a885548526741a5cf31f2ad802087efc52d1db6555d3a09c9e94baec526443e55182b6a1088f58d2843d8ffb47df6

diff --git a/dev-lang/gdl/gdl-0.9.5-r1.ebuild b/dev-lang/gdl/gdl-0.9.5-r1.ebuild
deleted file mode 100644
index 60c87fc..000
--- a/dev-lang/gdl/gdl-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,157 +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="
-   dev-cpp/antlr-cpp:2=
-   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:0[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=618685=3465878_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)
-

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

2016-04-04 Thread Sebastien Fabbro 
commit: 106e8debddee16f1d6aee4c3661240df09e1c20e
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Mon Apr  4 19:38:40 2016 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Mon Apr  4 19:40:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106e8deb

dev-lang/gdl: fix bad syntax preventing USE flag switches

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=578806

Package-Manager: portage-2.2.28

 .../gdl/{gdl-0.9.6.ebuild => gdl-0.9.6-r1.ebuild}  | 26 +++---
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/dev-lang/gdl/gdl-0.9.6.ebuild b/dev-lang/gdl/gdl-0.9.6-r1.ebuild
similarity index 91%
rename from dev-lang/gdl/gdl-0.9.6.ebuild
rename to dev-lang/gdl/gdl-0.9.6-r1.ebuild
index e656de4..fc6add8 100644
--- a/dev-lang/gdl/gdl-0.9.6.ebuild
+++ b/dev-lang/gdl/gdl-0.9.6-r1.ebuild
@@ -100,19 +100,19 @@ src_configure() {
-DMPICH=OFF
-DBUNDLED_ANTLR=OFF
-DX11=ON
-   -DEIGEN3="(usex eigen)"
-   -DFFTW="(usex fftw)"
-   -DGRIB="(usex grib)"
-   -DGSHHS="(usex gshhs)"
-   -DHDF="(usex hdf)"
-   -DHDF5="(usex hdf5)"
-   -DLIBPROJ4="(usex proj)"
-   -DNETCDF="(usex netcdf)"
-   -DOPENMP="(usex openmp)"
-   -DPNGLIB="(usex png)"
-   -DPSLIB="(usex postscript)"
-   -DUDUNITS="(usex udunits)"
-   -DWXWIDGETS="(usex wxwidgets)"
+   -DEIGEN3="$(usex eigen)"
+   -DFFTW="$(usex fftw)"
+   -DGRIB="$(usex grib)"
+   -DGSHHS="$(usex gshhs)"
+   -DHDF="$(usex hdf)"
+   -DHDF5="$(usex hdf5)"
+   -DLIBPROJ4="$(usex proj)"
+   -DNETCDF="$(usex netcdf)"
+   -DOPENMP="$(usex openmp)"
+   -DPNGLIB="$(usex png)"
+   -DPSLIB="$(usex postscript)"
+   -DUDUNITS="$(usex udunits)"
+   -DWXWIDGETS="$(usex wxwidgets)"
)
if use imagemagick; then
if has_version media-gfx/graphicsmagick[cxx]; then

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

2015-10-25 Thread Pacho Ramos 
commit: ab4024108ed35572063780f70879de588b085d9f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 25 14:12:20 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 25 14:12:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab402410

dev-lang/gdl: Support wxGTK:3.0

Package-Manager: portage-2.2.23

 dev-lang/gdl/gdl-0.9.5-r2.ebuild | 158 +++
 1 file changed, 158 insertions(+)

diff --git a/dev-lang/gdl/gdl-0.9.5-r2.ebuild b/dev-lang/gdl/gdl-0.9.5-r2.ebuild
new file mode 100644
index 000..76b7dfa
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.5-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+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="
+   dev-cpp/antlr-cpp:2=
+   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:${WX_GTK_VER}[X] )"
+
+DEPEND="${RDEPEND}
+   dev-java/antlr:0[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() {
+   use wxwidgets && need-wxwidgets unicode
+   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=618685=3465878_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

[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/

2015-10-14 Thread James Le Cuirot 
commit: d50549b87f3b9369d4012148d510214abea0f8c7
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Oct 14 14:48:29 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct 14 15:22:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50549b8

dev-lang/gdl: Use dev-cpp/antlr-cpp as well as dev-java/antlr

The old dependency was wrong anyway because it was missing from
RDEPEND. We now need USE defaults on antlr to avoid conflicts until
the older version is removed.

Package-Manager: portage-2.2.20.1

 dev-lang/gdl/gdl-0.9.5-r1.ebuild | 157 +++
 1 file changed, 157 insertions(+)

diff --git a/dev-lang/gdl/gdl-0.9.5-r1.ebuild b/dev-lang/gdl/gdl-0.9.5-r1.ebuild
new file mode 100644
index 000..60c87fc
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.5-r1.ebuild
@@ -0,0 +1,157 @@
+# 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="
+   dev-cpp/antlr-cpp:2=
+   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:0[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=618685=3465878_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
+