* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2015-10-14 15:22 James Le Cuirot
0 siblings, 0 replies; 16+ messages in thread
From: James Le Cuirot @ 2015-10-14 15:22 UTC (permalink / raw
To: gentoo-commits
commit: d50549b87f3b9369d4012148d510214abea0f8c7
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 14:48:29 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 15:22:23 2015 +0000
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 0000000..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&atid=618685&aid=3465878&group_id=97659
+ rm -r src/antlr || die
+ einfo "Regenerating grammar"
+ pushd src > /dev/null
+ local i
+ for i in *.g; do antlr ${i} || die ; done
+ popd > /dev/null
+
+ # gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
+ sed -i \
+ -e 's:proj4:proj:' \
+ -e 's:lib_proj\.h:proj_api\.h:g' \
+ CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
+
+ # gentoo: avoid install files in datadir directory
+ sed -i \
+ -e '/AUTHORS/d' \
+ CMakeLists.txt || die
+}
+
+src_configure() {
+ # MPI is still very buggy
+ # x11=off does not compile
+ local mycmakeargs=(
+ -DMPICH=OFF
+ -DBUNDLED_ANTLR=OFF
+ -DX11=ON
+ $(cmake-utils_use fftw)
+ $(cmake-utils_use eigen EIGEN3)
+ $(cmake-utils_use grib)
+ $(cmake-utils_use gshhs)
+ $(cmake-utils_use hdf)
+ $(cmake-utils_use hdf5)
+ $(cmake-utils_use netcdf)
+ $(cmake-utils_use openmp)
+ $(cmake-utils_use png PNGLIB)
+ $(cmake-utils_use proj LIBPROJ4)
+ $(cmake-utils_use postscript PSLIB)
+ $(cmake-utils_use udunits)
+ $(cmake-utils_use wxwidgets)
+ )
+ if use imagemagick; then
+ if has_version media-gfx/graphicsmagick[cxx]; then
+ mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
+ else
+ mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
+ fi
+ else
+ mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
+ fi
+ configuration() {
+ mycmakeargs+=( $@ )
+ cmake-utils_src_configure
+ }
+ configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+ use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use python && python_foreach_impl cmake-utils_src_make
+}
+
+src_test() {
+ # there is check target instead of the ctest to define some LDPATH
+ Xemake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use python; then
+ installation() {
+ mv src/libgdl.so GDL.so || die
+ python_domodule GDL.so
+ }
+ python_foreach_impl run_in_build_dir installation
+ dodoc PYTHON.txt
+ fi
+
+ echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
+ doenvd 50gdl
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2015-10-25 14:12 Pacho Ramos
0 siblings, 0 replies; 16+ messages in thread
From: Pacho Ramos @ 2015-10-25 14:12 UTC (permalink / raw
To: gentoo-commits
commit: ab4024108ed35572063780f70879de588b085d9f
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 25 14:12:20 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 14:12:20 2015 +0000
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 0000000..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&atid=618685&aid=3465878&group_id=97659
+ rm -r src/antlr || die
+ einfo "Regenerating grammar"
+ pushd src > /dev/null
+ local i
+ for i in *.g; do antlr ${i} || die ; done
+ popd > /dev/null
+
+ # gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
+ sed -i \
+ -e 's:proj4:proj:' \
+ -e 's:lib_proj\.h:proj_api\.h:g' \
+ CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
+
+ # gentoo: avoid install files in datadir directory
+ sed -i \
+ -e '/AUTHORS/d' \
+ CMakeLists.txt || die
+}
+
+src_configure() {
+ # MPI is still very buggy
+ # x11=off does not compile
+ local mycmakeargs=(
+ -DMPICH=OFF
+ -DBUNDLED_ANTLR=OFF
+ -DX11=ON
+ $(cmake-utils_use fftw)
+ $(cmake-utils_use eigen EIGEN3)
+ $(cmake-utils_use grib)
+ $(cmake-utils_use gshhs)
+ $(cmake-utils_use hdf)
+ $(cmake-utils_use hdf5)
+ $(cmake-utils_use netcdf)
+ $(cmake-utils_use openmp)
+ $(cmake-utils_use png PNGLIB)
+ $(cmake-utils_use proj LIBPROJ4)
+ $(cmake-utils_use postscript PSLIB)
+ $(cmake-utils_use udunits)
+ $(cmake-utils_use wxwidgets)
+ )
+ if use imagemagick; then
+ if has_version media-gfx/graphicsmagick[cxx]; then
+ mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
+ else
+ mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
+ fi
+ else
+ mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
+ fi
+ configuration() {
+ mycmakeargs+=( $@ )
+ cmake-utils_src_configure
+ }
+ configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+ use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use python && python_foreach_impl cmake-utils_src_make
+}
+
+src_test() {
+ # there is check target instead of the ctest to define some LDPATH
+ Xemake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use python; then
+ installation() {
+ mv src/libgdl.so GDL.so || die
+ python_domodule GDL.so
+ }
+ python_foreach_impl run_in_build_dir installation
+ dodoc PYTHON.txt
+ fi
+
+ echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
+ doenvd 50gdl
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2016-04-04 18:45 Sebastien Fabbro
0 siblings, 0 replies; 16+ messages in thread
From: Sebastien Fabbro @ 2016-04-04 18:45 UTC (permalink / raw
To: gentoo-commits
commit: 106e8debddee16f1d6aee4c3661240df09e1c20e
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 19:38:40 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 19:40:19 2016 +0000
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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2016-05-24 19:15 Pacho Ramos
0 siblings, 0 replies; 16+ messages in thread
From: Pacho Ramos @ 2016-05-24 19:15 UTC (permalink / raw
To: gentoo-commits
commit: 9c55aab863f06bc0479eb149765d18f21cb5a846
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 19:10:35 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue May 24 19:12:50 2016 +0000
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..0000000
--- 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&atid=618685&aid=3465878&group_id=97659
- rm -r src/antlr || die
- einfo "Regenerating grammar"
- pushd src > /dev/null
- local i
- for i in *.g; do antlr ${i} || die ; done
- popd > /dev/null
-
- # gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
- sed -i \
- -e 's:proj4:proj:' \
- -e 's:lib_proj\.h:proj_api\.h:g' \
- CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
-
- # gentoo: avoid install files in datadir directory
- sed -i \
- -e '/AUTHORS/d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- # MPI is still very buggy
- # x11=off does not compile
- local mycmakeargs=(
- -DMPICH=OFF
- -DBUNDLED_ANTLR=OFF
- -DX11=ON
- $(cmake-utils_use fftw)
- $(cmake-utils_use eigen EIGEN3)
- $(cmake-utils_use grib)
- $(cmake-utils_use gshhs)
- $(cmake-utils_use hdf)
- $(cmake-utils_use hdf5)
- $(cmake-utils_use netcdf)
- $(cmake-utils_use openmp)
- $(cmake-utils_use png PNGLIB)
- $(cmake-utils_use proj LIBPROJ4)
- $(cmake-utils_use postscript PSLIB)
- $(cmake-utils_use udunits)
- $(cmake-utils_use wxwidgets)
- )
- if use imagemagick; then
- if has_version media-gfx/graphicsmagick[cxx]; then
- mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
- else
- mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
- fi
- else
- mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
- fi
- configuration() {
- mycmakeargs+=( $@ )
- cmake-utils_src_configure
- }
- configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
- use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
- cmake-utils_src_compile
- use python && python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
- # there is check target instead of the ctest to define some LDPATH
- Xemake -C "${BUILD_DIR}" check
-}
-
-src_install() {
- cmake-utils_src_install
- if use python; then
- installation() {
- mv src/libgdl.so GDL.so || die
- python_domodule GDL.so
- }
- python_foreach_impl run_in_build_dir installation
- dodoc PYTHON.txt
- fi
-
- echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
- doenvd 50gdl
-}
diff --git a/dev-lang/gdl/gdl-0.9.5-r2.ebuild b/dev-lang/gdl/gdl-0.9.5-r2.ebuild
deleted file mode 100644
index 76b7dfa..0000000
--- a/dev-lang/gdl/gdl-0.9.5-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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&atid=618685&aid=3465878&group_id=97659
- rm -r src/antlr || die
- einfo "Regenerating grammar"
- pushd src > /dev/null
- local i
- for i in *.g; do antlr ${i} || die ; done
- popd > /dev/null
-
- # gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
- sed -i \
- -e 's:proj4:proj:' \
- -e 's:lib_proj\.h:proj_api\.h:g' \
- CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
-
- # gentoo: avoid install files in datadir directory
- sed -i \
- -e '/AUTHORS/d' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- # MPI is still very buggy
- # x11=off does not compile
- local mycmakeargs=(
- -DMPICH=OFF
- -DBUNDLED_ANTLR=OFF
- -DX11=ON
- $(cmake-utils_use fftw)
- $(cmake-utils_use eigen EIGEN3)
- $(cmake-utils_use grib)
- $(cmake-utils_use gshhs)
- $(cmake-utils_use hdf)
- $(cmake-utils_use hdf5)
- $(cmake-utils_use netcdf)
- $(cmake-utils_use openmp)
- $(cmake-utils_use png PNGLIB)
- $(cmake-utils_use proj LIBPROJ4)
- $(cmake-utils_use postscript PSLIB)
- $(cmake-utils_use udunits)
- $(cmake-utils_use wxwidgets)
- )
- if use imagemagick; then
- if has_version media-gfx/graphicsmagick[cxx]; then
- mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
- else
- mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
- fi
- else
- mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
- fi
- configuration() {
- mycmakeargs+=( $@ )
- cmake-utils_src_configure
- }
- configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
- use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
- cmake-utils_src_compile
- use python && python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
- # there is check target instead of the ctest to define some LDPATH
- Xemake -C "${BUILD_DIR}" check
-}
-
-src_install() {
- cmake-utils_src_install
- if use python; then
- installation() {
- mv src/libgdl.so GDL.so || die
- python_domodule GDL.so
- }
- python_foreach_impl run_in_build_dir installation
- dodoc PYTHON.txt
- fi
-
- echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl
- doenvd 50gdl
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2017-02-11 19:47 David Seifert
0 siblings, 0 replies; 16+ messages in thread
From: David Seifert @ 2017-02-11 19:47 UTC (permalink / raw
To: gentoo-commits
commit: ef664cf5291561a96a3da9b42e3cd41940ff2f4f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 19:21:57 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 19:47:03 2017 +0000
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&atid=618685&aid=3465878&group_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
}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2018-08-20 9:45 Patrice Clement
0 siblings, 0 replies; 16+ messages in thread
From: Patrice Clement @ 2018-08-20 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 8d62023073d1ac94e515b672e4ee109745c24192
Author: Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Sun Aug 12 16:56:50 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Aug 20 09:45:03 2018 +0000
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&atid=618685&aid=3465878&group_id=97659
+ # https://sourceforge.net/p/gnudatalanguage/patches/39/
rm -r src/antlr || die
einfo "Regenerating grammar"
pushd src >/dev/null || die
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2018-08-20 9:45 Patrice Clement
0 siblings, 0 replies; 16+ messages in thread
From: Patrice Clement @ 2018-08-20 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 1614725316504a589519589a9cebcbb0dfa327fc
Author: Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Sun Aug 12 16:55:34 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Aug 20 09:45:01 2018 +0000
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"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2020-01-16 5:17 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2020-01-16 5:17 UTC (permalink / raw
To: gentoo-commits
commit: 8465c5506792439c60e64280d4ad8c04f78410ff
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 05:02:02 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 05:16:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8465c550
dev-lang/gdl: Permit numpy-python2
Signed-off-by: Michał Górny <mgorny <AT> 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] )"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2020-01-22 21:50 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2020-01-22 21:50 UTC (permalink / raw
To: gentoo-commits
commit: 2b49f68327548dcd00704da701db3bcd2f74189a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 21:46:57 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 21:50:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b49f683
dev-lang/gdl: Revbump post dep change
Signed-off-by: Michał Górny <mgorny <AT> 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
^ permalink raw reply [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2021-11-04 19:54 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-11-04 19:54 UTC (permalink / raw
To: gentoo-commits
commit: a03bf48ac72e5ba6dcc0de4e4b179e9c4bb4c963
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 4 19:50:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 4 19:51:19 2021 +0000
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 <sam <AT> 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 )"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2021-12-28 22:00 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-12-28 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 763068f1345ab9e60737530f649e48feb455ddb1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 21:56:31 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 22:00:42 2021 +0000
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 <sam <AT> 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}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2022-10-07 9:44 Andrew Ammerlaan
0 siblings, 0 replies; 16+ messages in thread
From: Andrew Ammerlaan @ 2022-10-07 9:44 UTC (permalink / raw
To: gentoo-commits
commit: 10c2ff23f74fa37cff59486272be2cf3aef1d0ea
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 09:44:04 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Oct 7 09:44:04 2022 +0000
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 <andrewammerlaan <AT> 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2023-05-06 11:34 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-05-06 11:34 UTC (permalink / raw
To: gentoo-commits
commit: 4a83c9c99f49404c89317bffd3fa3762189c4eac
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 11:30:50 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 6 11:33:52 2023 +0000
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 <sam <AT> 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
"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2023-05-06 11:34 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2023-05-06 11:34 UTC (permalink / raw
To: gentoo-commits
commit: a368bccf94173009eb1e64c5df8130a7e70527f9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 11:33:45 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 6 11:33:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a368bccf
dev-lang/gdl: add github upstream metadata
Signed-off-by: Sam James <sam <AT> 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 @@
</use>
<upstream>
<remote-id type="sourceforge">gnudatalanguage</remote-id>
+ <remote-id type="github">gnudatalanguage/gdl</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2024-04-18 17:03 Pacho Ramos
0 siblings, 0 replies; 16+ messages in thread
From: Pacho Ramos @ 2024-04-18 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 41f3bd64af8e0843f4578c838537c9fa33ef2be2
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 16:58:17 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 17:03:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f3bd64
dev-lang/gdl: Use wxGTK 3.2
Signed-off-by: Pacho Ramos <pacho <AT> 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 000000000000..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_
+ GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage"
+ _EOF_
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/
@ 2024-07-11 16:29 Eli Schwartz
0 siblings, 0 replies; 16+ messages in thread
From: Eli Schwartz @ 2024-07-11 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 4200dd6f56df960800718dae10d37ef5c04e972c
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 03:57:12 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 16:28:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4200dd6f
dev-lang/gdl: mark as LTO-unsafe, strict-aliasing unsafe
Closes: https://bugs.gentoo.org/930966
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
dev-lang/gdl/gdl-1.0.4-r1.ebuild | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/dev-lang/gdl/gdl-1.0.4-r1.ebuild b/dev-lang/gdl/gdl-1.0.4-r1.ebuild
index 37797d0e9d71..e0d6af34f1d0 100644
--- a/dev-lang/gdl/gdl-1.0.4-r1.ebuild
+++ b/dev-lang/gdl/gdl-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
WX_GTK_VER="3.2-gtk3"
PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake python-single-r1 toolchain-funcs virtualx wxwidgets
+inherit cmake flag-o-matic python-single-r1 toolchain-funcs virtualx wxwidgets
DESCRIPTION="GNU Data Language"
HOMEPAGE="https://github.com/gnudatalanguage/gdl"
@@ -96,6 +96,14 @@ src_prepare() {
}
src_configure() {
+ # -Werror=strict-aliasing
+ # https://bugs.gentoo.org/930966
+ # https://github.com/gnudatalanguage/gdl/issues/1852
+ #
+ # Do not trust with LTO either.
+ append-flags -fno-strict-aliasing
+ filter-lto
+
# MPI is still very buggy
# x11=off does not compile
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-07-11 16:30 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-06 11:34 [gentoo-commits] repo/gentoo:master commit in: dev-lang/gdl/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-07-11 16:29 Eli Schwartz
2024-04-18 17:03 Pacho Ramos
2023-05-06 11:34 Sam James
2022-10-07 9:44 Andrew Ammerlaan
2021-12-28 22:00 Sam James
2021-11-04 19:54 Sam James
2020-01-22 21:50 Michał Górny
2020-01-16 5:17 Michał Górny
2018-08-20 9:45 Patrice Clement
2018-08-20 9:45 Patrice Clement
2017-02-11 19:47 David Seifert
2016-05-24 19:15 Pacho Ramos
2016-04-04 18:45 Sebastien Fabbro
2015-10-25 14:12 Pacho Ramos
2015-10-14 15:22 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox