[patch] diff between grass-7.8.2.ebuild and grass-7.8.2-r2.ebuild

grass-7.8.2-r2.diff (text/plain), 5.31 KB, created by UlvHare on 2020-03-13 17:02:33 UTC

--- /home/reserve/Linux_reserve/Gentoo/local_overlay/sci-geosciences/grass/grass-7.8.2.ebuild.bkp	2020-02-28 14:35:33.000000000 +0300
+++ /home/reserve/Linux_reserve/Gentoo/local_overlay/sci-geosciences/grass/grass-7.8.2-r2.ebuild	2020-03-13 18:17:40.000000000 +0300
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="sqlite"  # bug 572440
 WANT_AUTOCONF="2.1"
 WX_GTK_VER=3.0
@@ -21,12 +21,11 @@
 LICENSE="GPL-2"
 SLOT="0/7.8.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"
+IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 
 RDEPEND="${PYTHON_DEPS}
         >=app-admin/eselect-1.2
         $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_MULTI_USEDEP}]')
-        media-libs/libprojectm
         sci-libs/gdal
         sys-libs/gdbm
         sys-libs/ncurses:0=
@@ -34,15 +33,12 @@
         sci-libs/xdrfile
         sys-libs/zlib
         blas? (
-                || ( ( virtual/cblas virtual/blas )
-                        sci-libs/openblas )
+                virtual/cblas
+                virtual/blas
         )
         fftw? ( sci-libs/fftw:3.0= )
         geos? ( sci-libs/geos )
-        lapack? (
-                || ( virtual/lapack
-                        sci-libs/lapack-reference )
-                )
+        lapack? ( virtual/lapack )
         liblas? ( sci-geosciences/liblas )
         mysql? ( dev-db/mysql-connector-c:= )
         netcdf? ( sci-libs/netcdf )
@@ -64,6 +60,7 @@
                 x11-libs/libXext
                 x11-libs/libXt
         )
+        zstd? ( app-arch/zstd )
 "
 DEPEND="${RDEPEND}
         sys-devel/bison
@@ -83,7 +80,6 @@
 
 PATCHES=(
         "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
-        "${FILESDIR}"/grass-7.8.1-pyversion.patch
         )
 
 pkg_setup() {
@@ -91,10 +87,10 @@
                 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:"
+                        [[ -z "${mylapack/.*openblas.*/}" ]]; then
+                        ewarn "You need to set lapack to openblas or reference. Do:"
                         ewarn "   eselect lapack set <impl>"
-                        ewarn "where <impl> is atlas, threaded-atlas or reference"
+                        ewarn "where <impl> is openblas or reference"
                         die "setup failed"
                 fi
         fi
@@ -103,10 +99,10 @@
                 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:"
+                        [[ -z "${myblas/.*openblas.*/}" ]]; then
+                        ewarn "You need to set blas to openblas or reference. Do:"
                         ewarn "   eselect blas set <impl>"
-                        ewarn "where <impl> is atlas, threaded-atlas or reference"
+                        ewarn "where <impl> is openblas or reference"
                         die "setup failed"
                 fi
         fi
@@ -115,15 +111,6 @@
 }
 
 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 <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
-                -i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
 
         default
         eautoconf
@@ -161,7 +148,7 @@
                 --without-opendwg
                 --with-regex
                 --with-gdal="${EPREFIX%/}/usr/bin/gdal-config"
-                --with-proj-includes="${EPREFIX%/}/usr/include/libprojectM"
+                --with-proj-includes="${EPREFIX%/}/usr/include/proj"
                 --with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)"
                 --with-proj-share="${EPREFIX%/}/usr/share/proj/"
                 $(use_with cxx)
@@ -189,6 +176,7 @@
                 $(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config")
                 $(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config")
                 $(use_with X x)
+                $(use_with zstd)
         )
         econf "${myeconfargs[@]}"
 }
@@ -259,7 +247,7 @@
         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"
+                make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Geoscience"
                 doicon -s 48 gui/icons/${PN}-48x48.png
         fi