commit: 9cd5e5afcc90e9dd353e4763567606b9685d5ec2 Author: Thomas Bettler <thomas.bettler <AT> gmail <DOT> com> AuthorDate: Sat Apr 16 21:28:13 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 17 16:24:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd5e5af
sci-geosciences/grass: backport fix for soname backport https://github.com/OSGeo/grass/pull/2269 Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/25050 Signed-off-by: Sam James <sam <AT> gentoo.org> .../grass/files/grass-8.0.1-lib_imagery.patch | 11 + sci-geosciences/grass/grass-8.0.1-r1.ebuild | 282 +++++++++++++++++++++ 2 files changed, 293 insertions(+) diff --git a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch b/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch new file mode 100644 index 000000000000..1eca86750ecd --- /dev/null +++ b/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch @@ -0,0 +1,11 @@ +https://github.com/OSGeo/grass/pull/2269 +--- a/lib/imagery/Makefile ++++ b/lib/imagery/Makefile +@@ -7,7 +7,6 @@ + + include $(MODULE_TOPDIR)/include/Make/Lib.make + include $(MODULE_TOPDIR)/include/Make/Doxygen.make +-include $(MODULE_TOPDIR)/include/Make/Grass.make + + # images + IMGSRC := $(wildcard *.png) $(wildcard *.jpg) $(wildcard *.gif) diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild b/sci-geosciences/grass/grass-8.0.1-r1.ebuild new file mode 100644 index 000000000000..81b7d01d2c77 --- /dev/null +++ b/sci-geosciences/grass/grass-8.0.1-r1.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="sqlite" # bug 572440 +WX_GTK_VER="3.0-gtk3" + +inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="https://grass.osgeo.org/"; + +LICENSE="GPL-2" +SLOT="0/8.0" + +GVERSION=${SLOT#*/} +MY_PM="${PN}${GVERSION}" +MY_PM="${MY_PM/.}" + +if [[ ${PV} =~ "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/OSGeo/grass.git"; +else + MY_P="${P/_rc/RC}" + SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"; + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~ppc ~x86" + fi + + S="${WORKDIR}/${MY_P}" +fi + +IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + opengl? ( X )" + +RDEPEND=" + ${PYTHON_DEPS} + >=app-admin/eselect-1.2 + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + sci-libs/gdal:= + sys-libs/gdbm:= + sys-libs/ncurses:0= + sci-libs/proj:= + sci-libs/xdrfile + sys-libs/zlib + media-libs/libglvnd + media-libs/glu + blas? ( + virtual/cblas[eselect-ldso(+)] + virtual/blas[eselect-ldso(+)] + ) + fftw? ( sci-libs/fftw:3.0= ) + geos? ( sci-libs/geos:= ) + lapack? ( virtual/lapack[eselect-ldso(+)] ) + 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:4.0 + x11-libs/cairo[X,opengl?] + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt + ) + zstd? ( app-arch/zstd )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + X? ( dev-lang/swig )" + +PATCHES=( + # bug 746590 + "${FILESDIR}/${PN}-flock.patch" + "${FILESDIR}/${PN}-lib_imagery.patch" +) + +pkg_setup() { + if use lapack; then + local mylapack=$(eselect lapack show) + if [[ -z "${mylapack/.*reference.*/}" ]] && \ + [[ -z "${mylapack/.*atlas.*/}" ]]; then + ewarn "You need to set lapack to atlas or reference. Do:" + ewarn " eselect lapack set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + if use blas; then + local myblas=$(eselect blas show) + if [[ -z "${myblas/.*reference.*/}" ]] && \ + [[ -z "${myblas/.*atlas.*/}" ]]; then + ewarn "You need to set blas to atlas or reference. Do:" + ewarn " eselect blas set <impl>" + ewarn "where <impl> is atlas, threaded-atlas or reference" + die "setup failed" + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix unversioned python calls + sed -e "s:=python3:=${EPYTHON}:" -i "${S}/lib/init/grass.sh" || die + sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die + + default + eautoreconf + + 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 + local mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + local 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 + local WX_BUILD=yes + setup-wxwidgets + fi + + addwrite /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/proj + --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) + $(use_with zstd) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # we don't want to link against embedded mysql lib + emake CC="$(tc-getCC)" MYSQLDLIB="" +} + +src_install() { + emake DESTDIR="${ED}" \ + INST_DIR=/usr/$(get_libdir)/${MY_PM} \ + prefix=/usr/ BINDIR=/usr/bin \ + install + + pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die + + local HTML_DOCS=( docs/html/. ) + einstalldocs + + # translations + if use nls; then + insinto /usr/share/locale + doins -r locale/. + fi + + popd >/dev/null || die + + # link libraries in the ~standard~ place + local f file + for f in "${ED}"/usr/$(get_libdir)/${MY_PM}/lib/*; do + file="${f##*/}" + dosym ${MY_PM}/lib/${file} /usr/$(get_libdir)/${file} + 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="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/ + for f in "${scriptMakeDir}"/*; do + file="${f##*/}" + echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die + sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die + done + + # get proper folder for grass path in script + local gisbase=/usr/$(get_libdir)/${MY_PM} + sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\ +GISBASE = os.path.normpath(\"${gisbase}\"):" \ + -i "${ED}"/usr/bin/grass || die + + # get proper fonts path for fontcap + sed -i \ + -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ + "${ED}"${gisbase}/etc/fontcap || die + + # set proper python interpreter + sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ +os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ + -i "${ED}"/usr/bin/grass || die + + # set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file + sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \ + -i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die + + if use X; then + local GUI="-gui" + [[ ${WX_BUILD} == yes ]] && GUI="-wxpython" + make_desktop_entry "/usr/bin/grass ${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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die +} + +pkg_postinst() { + use X && xdg_pkg_postinst +} + +pkg_postrm() { + use X && xdg_pkg_postrm +}
