diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
| commit | 71deace00d1a2b091313fe137ab7092418c6f87c (patch) | |
| tree | 9f1f0dee23e13658e52f49437befe78427148c51 /sci-geosciences/grass/grass-7.4.4.ebuild | |
| parent | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff) | |
gentoo resync : 10.02.2020
Diffstat (limited to 'sci-geosciences/grass/grass-7.4.4.ebuild')
| -rw-r--r-- | sci-geosciences/grass/grass-7.4.4.ebuild | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild index e875e74c7586..af8e8a283be9 100644 --- a/sci-geosciences/grass/grass-7.4.4.ebuild +++ b/sci-geosciences/grass/grass-7.4.4.ebuild @@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm RDEPEND="${PYTHON_DEPS} >=app-admin/eselect-1.2 - || ( - dev-python/numpy-python2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep ' + || ( + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ) + ') media-libs/libprojectm sci-libs/gdal sys-libs/gdbm @@ -150,23 +152,23 @@ src_configure() { setup-wxwidgets fi - addwrite "${EPREFIX%/}/dev/dri/renderD128" + 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/" + --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 mysql mysql-includes "${EPREFIX}/usr/include/mysql") $(use_with sqlite) $(use_with opengl) $(use_with odbc) @@ -175,16 +177,16 @@ src_configure() { $(use_with lapack) $(use_with X cairo) $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2") + $(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 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 netcdf netcdf "${EPREFIX}/usr/bin/nc-config") + $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") $(use_with X x) ) econf "${myeconfargs[@]}" @@ -244,7 +246,7 @@ src_install() { # get proper fonts path for fontcap sed -i \ - -e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \ + -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 |