From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- sci-geosciences/grass/Manifest | 8 +- sci-geosciences/grass/grass-7.2.0-r1.ebuild | 6 +- sci-geosciences/grass/grass-7.4.0.ebuild | 6 +- sci-geosciences/grass/grass-7.4.1.ebuild | 6 +- sci-geosciences/grass/grass-7.4.4.ebuild | 278 ++++++++++++++++++++++++++++ 5 files changed, 292 insertions(+), 12 deletions(-) create mode 100644 sci-geosciences/grass/grass-7.4.4.ebuild (limited to 'sci-geosciences/grass') diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index 5a6b97e6b6d9..cc7fa6759869 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -5,7 +5,9 @@ AUX grass-7.2.0-glibc-2.26-2.patch 1238 BLAKE2B 93dca4f61321f7d721171a0eb079d805 DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321 DIST grass-7.4.1.tar.gz 57969640 BLAKE2B 1d3d0fd20611971ec349bf0e26ef7d886b7047e1ec48f48584f8ba2e5562f352433c9869420d7e030e66fb5a9e60de20e6a78d1fd5142380fbcab51f700766d8 SHA512 66616e495aa798cd1ad7a0284a386f7e99741918596b816a712788114e7dc491be0b5f19551f102b436518a5cabcdedbc61042acf0a9b06b9d8df12b4de26c90 -EBUILD grass-7.2.0-r1.ebuild 6838 BLAKE2B 30bdb9299483718e9fe2872496dd3a8b6e62f22cd452c229fe358da8d3920bd9634fd74ddf53abde208f5ee9b1fd399c28640e1a4b8f1b76a88c072a6240e83a SHA512 cc6b010ee705b3e09b90e0bbabffa4ed94b3d2da4012d8f87381cf44b645a542809035549f87b0b2afc7a5b35a698bfbcac9e9392006d625d02003c1b1319702 -EBUILD grass-7.4.0.ebuild 7316 BLAKE2B 0ccddb16ffb1d3e6e8cb566fd2f3cb435419bd70a69cb62550f65c9647f32251fbbaae281e3cb1eb2ed5807eafa067345deace268acd49f90a412e6522d0aaca SHA512 22cfbca1d55a73c1429bdc14d880f92c08b06f8875751497262b197d1f8f3f250777edeabeb23962312d8beffd856d7a45f83cc975c46807c5057adff4d1fa1e -EBUILD grass-7.4.1.ebuild 7526 BLAKE2B e9ee810c6078942b4ee923aa47f1ded25fc18f4c66b131ea6f208affa3b42384384749ded1ac41d4648504ca41834c5f0095fdfd3c72b952022f91b98ed7a604 SHA512 cff8267419a71d3c7b241c0c1f0499984876d6e70a130f1533c5e3376cb0e95cb162854d2206f6b7cd9c9e3d6f4f8f83d598222f99e16b4b4f002d047f88e165 +DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83 +EBUILD grass-7.2.0-r1.ebuild 6837 BLAKE2B acf0edfd8446fdcec8472da00e43a586d232b7b79491a74411fb78b756f7ef1548033af0865445e252f9a6296f96540d64a822ff4b4a1eeebc7dcee5232ed474 SHA512 18a871959cbc426a5c7e443e0aed1f77f2396784682260ed5bc195cc73073eea1a939e63a594915cf6d02840da6b848d171bd5bd2a8282c18ac564adb12b3456 +EBUILD grass-7.4.0.ebuild 7315 BLAKE2B b7722198a4b64815d0649fbd146d877d65de5ec7ed423fd92a165dd5cc9e61ddbc7bc4cb4804523ad16f7e1c1becbc65d3749557e6253de68b6692efc902b4a9 SHA512 e11e91e434b55005b99bfc9accfb057beb89a0a9818f4cc9b409ce695ab6b8080bfe4e3be6bc0c204eb921002c16507876213d2cd04bfcd766f658b801285857 +EBUILD grass-7.4.1.ebuild 7525 BLAKE2B 3652695a03ed74ba6d4b3032caefaad116087d81cc80db9de0c7016fb3dec092a9620d5530e4b9b66af634c34ff10550e0895dce58046ac417b5bb0b9f88020e SHA512 9c89d98cd121e05222f9305867113c111f82959409f35c7c281e53a0174b875179a75b6112bba0cbb219300aaa7fae6b727409e0cdf28c6f3476a524bcf1bce5 +EBUILD grass-7.4.4.ebuild 7333 BLAKE2B b42f1776211b07f341982bad5f2153e30d67a8e7f7d30171795cda9fc3880212f7762e621359df049d550cd0f64c659f8a8cbcc085f4848eaf8c360a36f716a9 SHA512 0343ff9a4e7451c9c074b10cb4f10e559ab613172d4c4eca41e48e17ad55ef085a925b04e84746c5c4d39bc62ddb032be55a4f2d62b04811e79d20f8dc5ef83b MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635 diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild index 4c924ed16592..6b99aa466e7b 100644 --- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild +++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,8 +15,8 @@ MY_PM=${MY_PM/.} MY_P=${P/_rc/RC} DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="http://grass.osgeo.org/" -SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" +HOMEPAGE="https://grass.osgeo.org/" +SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0/7.2.0" diff --git a/sci-geosciences/grass/grass-7.4.0.ebuild b/sci-geosciences/grass/grass-7.4.0.ebuild index a5e3ddaf60ef..4b0679f5b2c9 100644 --- a/sci-geosciences/grass/grass-7.4.0.ebuild +++ b/sci-geosciences/grass/grass-7.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,8 +15,8 @@ MY_PM=${MY_PM/.} MY_P=${P/_rc/RC} DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="http://grass.osgeo.org/" -SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" +HOMEPAGE="https://grass.osgeo.org/" +SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0/7.4.0" diff --git a/sci-geosciences/grass/grass-7.4.1.ebuild b/sci-geosciences/grass/grass-7.4.1.ebuild index 5c45e10e1744..7c4d6e63529f 100644 --- a/sci-geosciences/grass/grass-7.4.1.ebuild +++ b/sci-geosciences/grass/grass-7.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,8 +15,8 @@ MY_PM=${MY_PM/.} MY_P=${P/_rc/RC} DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" -HOMEPAGE="http://grass.osgeo.org/" -SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" +HOMEPAGE="https://grass.osgeo.org/" +SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0/7.4.0" diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild new file mode 100644 index 000000000000..e067fbf0aaa6 --- /dev/null +++ b/sci-geosciences/grass/grass-7.4.4.ebuild @@ -0,0 +1,278 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" # bug 572440 +WANT_AUTOCONF="2.1" +WX_GTK_VER=3.0 + +inherit autotools desktop eapi7-ver python-single-r1 wxwidgets xdg + +MY_PM=${PN}$(ver_cut 1-2 ${PV}) +MY_PM=${MY_PM/.} +MY_P=${P/_rc/RC} + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="https://grass.osgeo.org/" +SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/7.4.0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X" + +RDEPEND="${PYTHON_DEPS} + >=app-admin/eselect-1.2 + dev-python/numpy[${PYTHON_USEDEP}] + media-libs/libprojectm + sci-libs/gdal + sys-libs/gdbm + sys-libs/ncurses:0= + sci-libs/proj + sci-libs/xdrfile + sys-libs/zlib + blas? ( + sci-libs/cblas-reference + virtual/blas + ) + fftw? ( sci-libs/fftw:3.0= ) + geos? ( sci-libs/geos ) + lapack? ( virtual/lapack ) + liblas? ( sci-geosciences/liblas ) + mysql? ( dev-db/mysql-connector-c:= ) + netcdf? ( sci-libs/netcdf ) + odbc? ( dev-db/unixODBC ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + png? ( media-libs/libpng:0= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + readline? ( sys-libs/readline:0= ) + sqlite? ( dev-db/sqlite:3 ) + tiff? ( media-libs/tiff:0= ) + truetype? ( media-libs/freetype:2 ) + X? ( + dev-python/wxpython:3.0[cairo,opengl?] + x11-libs/cairo[X,opengl?] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + ) +" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + X? ( + dev-lang/swig + x11-base/xorg-proto + ) +" + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + opengl? ( X )" + +PATCHES=( "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch ) + +pkg_setup() { + if use lapack; then + local mylapack + mylapack=$(eselect lapack show) || die + if [[ -z "${mylapack/.*reference.*/}" ]] && \ + [[ -z "${mylapack/.*atlas.*/}" ]]; then + ewarn "You need to set lapack to atlas or reference. Do:" + ewarn " eselect lapack set " + ewarn "where is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + if use blas; then + local myblas + myblas=$(eselect blas show) || die + if [[ -z "${myblas/.*reference.*/}" ]] && \ + [[ -z "${myblas/.*atlas.*/}" ]]; then + ewarn "You need to set blas to atlas or reference. Do:" + ewarn " eselect blas set " + ewarn "where is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix unversioned python calls + local pyver=${EPYTHON/python/} + sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die + sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die + + # fix header being unconditionally included + # see upstream https://trac.osgeo.org/grass/ticket/2779 + sed -e 's:\(#include \):#ifdef HAVE_OGR\n\1\n#endif:' \ + -i "${S}/vector/v.external/main.c" || die "failed to sed main.c" + + default + eautoconf + + ebegin "Fixing python shebangs" + python_fix_shebang -q "${S}" + eend $? + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + shopt -s nullglob + mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl + +} + +src_configure() { + if use X; then + WX_BUILD=yes + setup-wxwidgets + fi + + addwrite "${EPREFIX%/}/dev/dri/renderD128" + + local myeconfargs=( + --enable-shared + --disable-w11 + --without-opendwg + --with-regex + --with-gdal="${EPREFIX%/}/usr/bin/gdal-config" + --with-proj-includes="${EPREFIX%/}/usr/include/libprojectM" + --with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)" + --with-proj-share="${EPREFIX%/}/usr/share/proj/" + $(use_with cxx) + $(use_with tiff) + $(use_with png) + $(use_with postgres) + $(use_with mysql) + $(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql") + $(use_with sqlite) + $(use_with opengl) + $(use_with odbc) + $(use_with fftw) + $(use_with blas) + $(use_with lapack) + $(use_with X cairo) + $(use_with truetype freetype) + $(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2") + $(use_with nls) + $(use_with readline) + $(use_with threads pthread) + $(use_with openmp) + $(use_with opencl) + $(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config") + $(use_with X wxwidgets "${WX_CONFIG}") + $(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config") + $(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config") + $(use_with X x) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # we don't want to link against embedded mysql lib + emake CC="$(tc-getCC)" MYSQLDLIB="" +} + +src_install() { + emake DESTDIR="${D}" \ + INST_DIR="${D}/usr/$(get_libdir)/${MY_PM}" \ + prefix="${D}/usr/" BINDIR="${D}/usr/bin" \ + PREFIX="${D}/usr/" \ + install + + pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die + + local HTML_DOCS=( docs/html/. ) + einstalldocs + + # manuals + dodir /usr/share/man/man1 + rm -rf man/ || die + + # translations + if use nls; then + dodir /usr/share/locale/ + mv locale/* "${D}/usr/share/locale/" || die + fi + + popd &> /dev/null || die + + # link libraries in the ~standard~ place + for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do + dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}" + done + + # link headers in the ~standard~ place + dodir "/usr/include/" + dosym "../$(get_libdir)/${MY_PM}/include/grass" "/usr/include/grass" + + # fix paths in addons makefile includes + local scriptMakeDir + scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/" + for mkFile in $(ls "${scriptMakeDir}"); do + echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die + sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die + done + + # get proper folder for grass path in script + local gisbase + gisbase="${ROOT}/usr/$(get_libdir)/${MY_PM}" + sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \ + -i "${D}/usr/bin/${MY_PM}" || die + + # get proper fonts path for fontcap + sed -i \ + -e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \ + "${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die + + # set proper python interpreter + sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}/usr/bin/${MY_PM}" || die + + if use X; then + local GUI="-gui" + [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" + make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" + doicon -s 48 gui/icons/${PN}-48x48.png + fi + + # install .pc file so other apps know where to look for grass + insinto /usr/$(get_libdir)/pkgconfig/ + doins grass.pc + + # fix weird +x on tcl scripts + find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \; +} + +pkg_postinst() { + use X && xdg_pkg_postinst + + ewarn "GRASS addons may fail due to Python 3 incompatibility." + ewarn "If that is tha case you can change the shebang a the beginning of" + ewarn "the script to enforce Python 2 usage." + ewarn "#!/usr/bin/env python" + ewarn "Should be changed into" + ewarn "#!/usr/bin/env python2" +} + +pkg_postrm() { + use X && xdg_pkg_postrm +} -- cgit v1.2.3