From 09c2f01a31e87bafbc05f8f064e4ab3163481b84 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 22 Jan 2020 22:43:18 +0100 Subject: sci-geosciences/grass: Revbump post dep change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sci-geosciences/grass/grass-7.4.4-r1.ebuild | 281 ---------------------------- sci-geosciences/grass/grass-7.4.4-r2.ebuild | 281 ++++++++++++++++++++++++++++ 2 files changed, 281 insertions(+), 281 deletions(-) delete mode 100644 sci-geosciences/grass/grass-7.4.4-r1.ebuild create mode 100644 sci-geosciences/grass/grass-7.4.4-r2.ebuild (limited to 'sci-geosciences/grass') diff --git a/sci-geosciences/grass/grass-7.4.4-r1.ebuild b/sci-geosciences/grass/grass-7.4.4-r1.ebuild deleted file mode 100644 index 4fc916183868..000000000000 --- a/sci-geosciences/grass/grass-7.4.4-r1.ebuild +++ /dev/null @@ -1,281 +0,0 @@ -# Copyright 1999-2020 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-python2[${PYTHON_USEDEP}] - 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? ( - virtual/cblas - 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 -} diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild b/sci-geosciences/grass/grass-7.4.4-r2.ebuild new file mode 100644 index 000000000000..4fc916183868 --- /dev/null +++ b/sci-geosciences/grass/grass-7.4.4-r2.ebuild @@ -0,0 +1,281 @@ +# Copyright 1999-2020 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-python2[${PYTHON_USEDEP}] + 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? ( + virtual/cblas + 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-65-gdbad