From d42200bec37eef2a7478d88988ff00addd0a9202 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Jan 2020 11:50:47 +0000 Subject: gentoo resync : 25.01.2020 --- dev-lang/gdl/Manifest | 2 +- dev-lang/gdl/gdl-0.9.6-r2.ebuild | 161 --------------------------------------- dev-lang/gdl/gdl-0.9.6-r3.ebuild | 161 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+), 162 deletions(-) delete mode 100644 dev-lang/gdl/gdl-0.9.6-r2.ebuild create mode 100644 dev-lang/gdl/gdl-0.9.6-r3.ebuild (limited to 'dev-lang/gdl') diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest index bb4eb9785dcb..34149157162d 100644 --- a/dev-lang/gdl/Manifest +++ b/dev-lang/gdl/Manifest @@ -9,5 +9,5 @@ AUX 0.9.6-fun-fix.patch 2064 BLAKE2B 45d2f76e437cbd557460a51a6fd49881a8dde5c200b AUX 0.9.6-gcc6.patch 1255 BLAKE2B a529b29d007a0b71f1a1f2ecfc0940d73696ba97dc2a48bfd3be995d3d9e37b788b1fa6c1d13a7c63f2c5dbe2b07accfd86766f56f495f984baf0acb7ab6f27f SHA512 870231a918cd2d114ac31973bbd2c53733c3e64811c48eadf88c78f82a353aecf4d604e28dfa3a532efb3b0480e5d7209e8fad1fef793212027e89f53608c619 AUX 0.9.6-python-use-path-and-startup.patch 682 BLAKE2B f4a3f07c7757e297a8a40056aad3f36705f035f8ca63dfd0d8c75dec15953b826d8074fbbf1b698ec8d9c92a4e364993c2eced1df3c86ef4a3915a17b2ed65ba SHA512 f6e20eadb6acfd3805d5f41bba8d90e9dba5230211577e0b47217638b97745dd921c657dad7adf935abeeb9316989554858976d915f14b79dc2082eb132f9418 DIST gdl-0.9.6v2.tgz 1777167 BLAKE2B 4d92ed93f12e0979d591959d60ae9fa6785400e4f169a00f462103d263bce1aa02e615cc8467b53146791a12045850f9dae1da113f9caff4d6b44dd2a5798b3b SHA512 a816ee2e3822af380a1131a6138263c33560db7286cd699b864da305a1103d5afc881a1cd3574d2e243bfb7e65e759e46322c5e55c66ec15620d9c514565c2c5 -EBUILD gdl-0.9.6-r2.ebuild 4120 BLAKE2B 754ad88aab633d014a8c0bc16700001bc72bc4271792765ac7ea648f6a7ba33fee58fbe26694471cac44803a794181ac5163108c07a12310b072361837f856f9 SHA512 e639db3b5a75e450ef15fb54f8c2e90b3d9cedf19382f99a6ea4cd5e23903bbfa5c87029b976d357032b06a229243aa1217da8240ce3b2a3e54849e5072b9dc0 +EBUILD gdl-0.9.6-r3.ebuild 4120 BLAKE2B 754ad88aab633d014a8c0bc16700001bc72bc4271792765ac7ea648f6a7ba33fee58fbe26694471cac44803a794181ac5163108c07a12310b072361837f856f9 SHA512 e639db3b5a75e450ef15fb54f8c2e90b3d9cedf19382f99a6ea4cd5e23903bbfa5c87029b976d357032b06a229243aa1217da8240ce3b2a3e54849e5072b9dc0 MISC metadata.xml 1028 BLAKE2B bf82665c331acc8ebe611ea473e0ce9e68bef85cae01a89a5356c5db4a7b5c611fc580f5abbf116492d1b49c2f54379644c30cff099d2c0a7c6c317cb3a76aff SHA512 bbf8bafc0aa727148a15b800c096037ef4ad4f17de36ee76082fd51355d7e60a211faf57ddeb9ee1012258a78e67f948fca4c8a010dce891b1e0875cb088e23d diff --git a/dev-lang/gdl/gdl-0.9.6-r2.ebuild b/dev-lang/gdl/gdl-0.9.6-r2.ebuild deleted file mode 100644 index 3a51f5b1f4b9..000000000000 --- a/dev-lang/gdl/gdl-0.9.6-r2.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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="https://github.com/gnudatalanguage/gdl" -SRC_URI="mirror://sourceforge/gnudatalanguage/${P}v2.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+eigen fftw graphicsmagick 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= ) - gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= ) - hdf? ( sci-libs/hdf:0= ) - hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - netcdf? ( sci-libs/netcdf ) - proj? ( sci-libs/proj ) - postscript? ( dev-libs/pslib ) - python? ( - ${PYTHON_DEPS} - || ( - dev-python/numpy-python2[${PYTHON_USEDEP}] - 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.2-include.patch - "${FILESDIR}"/0.9.5-antlr.patch - "${FILESDIR}"/0.9.5-png.patch - "${FILESDIR}"/0.9.6-fix-file-move.patch - "${FILESDIR}"/0.9.6-fix-python-function-call.patch - "${FILESDIR}"/0.9.6-fun-fix.patch - "${FILESDIR}"/0.9.6-python-use-path-and-startup.patch - "${FILESDIR}"/0.9.6-disable-tests-hanging-under-xvfb-run.patch - "${FILESDIR}"/0.9.6-gcc6.patch - "${FILESDIR}"/0.9.6-formats.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - use wxwidgets && need-wxwidgets unicode - 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/p/gnudatalanguage/patches/39/ - rm -r src/antlr || die - einfo "Regenerating grammar" - pushd src >/dev/null || die - local i - 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 - sed -e '/AUTHORS/d' -i CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - # MPI is still very buggy - # x11=off does not compile - local mycmakeargs=( - -DMPICH=OFF - -DBUNDLED_ANTLR=OFF - -DX11=ON - -DEIGEN3="$(usex eigen)" - -DFFTW="$(usex fftw)" - -DGRIB=OFF - -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 use graphicsmagick; 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 - virtx emake -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 - #dodoc AUTHORS README - echo "GDL_PATH=\"+${EPREFIX}/usr/share/gnudatalanguage\"" > 50gdl || die - doenvd 50gdl -} diff --git a/dev-lang/gdl/gdl-0.9.6-r3.ebuild b/dev-lang/gdl/gdl-0.9.6-r3.ebuild new file mode 100644 index 000000000000..3a51f5b1f4b9 --- /dev/null +++ b/dev-lang/gdl/gdl-0.9.6-r3.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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="https://github.com/gnudatalanguage/gdl" +SRC_URI="mirror://sourceforge/gnudatalanguage/${P}v2.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+eigen fftw graphicsmagick 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= ) + gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= ) + hdf? ( sci-libs/hdf:0= ) + hdf5? ( sci-libs/hdf5:0= ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + netcdf? ( sci-libs/netcdf ) + proj? ( sci-libs/proj ) + postscript? ( dev-libs/pslib ) + python? ( + ${PYTHON_DEPS} + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + 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.2-include.patch + "${FILESDIR}"/0.9.5-antlr.patch + "${FILESDIR}"/0.9.5-png.patch + "${FILESDIR}"/0.9.6-fix-file-move.patch + "${FILESDIR}"/0.9.6-fix-python-function-call.patch + "${FILESDIR}"/0.9.6-fun-fix.patch + "${FILESDIR}"/0.9.6-python-use-path-and-startup.patch + "${FILESDIR}"/0.9.6-disable-tests-hanging-under-xvfb-run.patch + "${FILESDIR}"/0.9.6-gcc6.patch + "${FILESDIR}"/0.9.6-formats.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + use wxwidgets && need-wxwidgets unicode + 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/p/gnudatalanguage/patches/39/ + rm -r src/antlr || die + einfo "Regenerating grammar" + pushd src >/dev/null || die + local i + 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 + sed -e '/AUTHORS/d' -i CMakeLists.txt || die + cmake-utils_src_prepare +} + +src_configure() { + # MPI is still very buggy + # x11=off does not compile + local mycmakeargs=( + -DMPICH=OFF + -DBUNDLED_ANTLR=OFF + -DX11=ON + -DEIGEN3="$(usex eigen)" + -DFFTW="$(usex fftw)" + -DGRIB=OFF + -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 use graphicsmagick; 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 + virtx emake -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 + #dodoc AUTHORS README + echo "GDL_PATH=\"+${EPREFIX}/usr/share/gnudatalanguage\"" > 50gdl || die + doenvd 50gdl +} -- cgit v1.2.3