From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1654181-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 56409158170 for <garchives@archives.gentoo.org>; Thu, 18 Jul 2024 07:41:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A379E2B21; Thu, 18 Jul 2024 07:41:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 691E9E2B21 for <gentoo-commits@lists.gentoo.org>; Thu, 18 Jul 2024 07:41:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A62A8343008 for <gentoo-commits@lists.gentoo.org>; Thu, 18 Jul 2024 07:41:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A70471E40 for <gentoo-commits@lists.gentoo.org>; Thu, 18 Jul 2024 07:41:18 +0000 (UTC) From: "Joonas Niilola" <juippis@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" <juippis@gentoo.org> Message-ID: <1721288258.473b961b7e9c627638b8578d58f0960f3a329dd4.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/grass/Manifest sci-geosciences/grass/grass-8.4.0_rc1.ebuild sci-geosciences/grass/metadata.xml X-VCS-Directories: sci-geosciences/grass/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 473b961b7e9c627638b8578d58f0960f3a329dd4 X-VCS-Branch: master Date: Thu, 18 Jul 2024 07:41:18 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c9236d27-6a82-426b-abf5-a6fcda53476c X-Archives-Hash: 2e6838eef38fca4852bb75f0bd1e3481 commit: 473b961b7e9c627638b8578d58f0960f3a329dd4 Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> AuthorDate: Tue Jun 18 16:16:12 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Jul 18 07:37:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473b961b sci-geosciences/grass: add 8.4.0_rc1 Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sci-geosciences/grass/Manifest | 1 + sci-geosciences/grass/grass-8.4.0_rc1.ebuild | 277 +++++++++++++++++++++++++++ sci-geosciences/grass/metadata.xml | 1 + 3 files changed, 279 insertions(+) diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest index bc17e20a6fdd..d114ffd902c2 100644 --- a/sci-geosciences/grass/Manifest +++ b/sci-geosciences/grass/Manifest @@ -1,2 +1,3 @@ DIST grass-8.3.1.tar.gz 68491177 BLAKE2B 58513c8c273b55831bca764c9e61e54b92c075ea2f4ff3c2f059ebcce98f25694ee03a25bef7a3e1c443165dd9493d3ce469233be3b65596dc28da166c12d174 SHA512 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793 DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0 +DIST grass-8.4.0RC1.tar.gz 70272599 BLAKE2B a292336e8eb657fadc4a54b6045b529df883fe4d49d784551d5e5d948e74a69f48a0508a862d9df47cd60172b20d97a4603a377afec2faceb98b35e8023d377c SHA512 c64576305476e60d8525418f973512dd71d2586ac7712f36560d9fe31a10bd1532b91351d3dc81bfd7c32073ddc1631a8e922d56e0e27159f59e37a1399e4c21 diff --git a/sci-geosciences/grass/grass-8.4.0_rc1.ebuild b/sci-geosciences/grass/grass-8.4.0_rc1.ebuild new file mode 100644 index 000000000000..bd3d41da509b --- /dev/null +++ b/sci-geosciences/grass/grass-8.4.0_rc1.ebuild @@ -0,0 +1,277 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite" # bug 572440 + +inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg + +DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" +HOMEPAGE="https://grass.osgeo.org/" + +LICENSE="GPL-2" + +if [[ ${PV} =~ "9999" ]]; then + SLOT="0/8.4" +else + SLOT="0/$(ver_cut 1-2 ${PV})" +fi + +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 bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite svm 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/ply[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + ') + sci-libs/gdal:= + sys-libs/gdbm:= + sys-libs/ncurses:= + sci-libs/proj:= + sys-libs/zlib + media-libs/libglvnd + media-libs/glu + blas? ( + virtual/cblas[eselect-ldso(+)] + virtual/blas[eselect-ldso(+)] + ) + bzip2? ( app-arch/bzip2:= ) + fftw? ( sci-libs/fftw:3.0= ) + geos? ( sci-libs/geos:= ) + lapack? ( virtual/lapack[eselect-ldso(+)] ) + las? ( sci-geosciences/liblas ) + mysql? ( dev-db/mysql-connector-c:= ) + netcdf? ( sci-libs/netcdf:= ) + odbc? ( dev-db/unixODBC ) + opencl? ( virtual/opencl ) + opengl? ( virtual/opengl ) + pdal? ( >=sci-libs/pdal-2.0.0:= ) + png? ( media-libs/libpng:= ) + postgres? ( >=dev-db/postgresql-8.4:= ) + readline? ( sys-libs/readline:= ) + sqlite? ( dev-db/sqlite:3 ) + svm? ( sci-libs/libsvm:= ) + tiff? ( media-libs/tiff:= ) + truetype? ( media-libs/freetype:2 ) + X? ( + $(python_gen_cond_dep ' + >=dev-python/matplotlib-1.2[wxwidgets,${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + >=dev-python/wxpython-4.1:4.0[${PYTHON_USEDEP}] + ') + x11-libs/cairo[X] + 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=" + app-alternatives/yacc + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + X? ( dev-lang/swig )" + +PATCHES=( + # bug 746590 + "${FILESDIR}/${PN}-flock.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 + + # When patching the build system, avoid running autoheader here. The file + # config.in.h is maintained manually upstream. Changes to it may lead to + # undefined behavior. See bug #866554. + # AT_NOEAUTOHEADER=1 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() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/862579 + # https://github.com/OSGeo/grass/issues/3506 + # + # Do not trust it with LTO either + append-flags -fno-strict-aliasing + filter-lto + + 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 libpng "${EPREFIX}"/usr/bin/libpng-config) + $(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 bzip2 bzlib) + $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config) + $(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config) + $(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config) + $(use_with geos geos "${EPREFIX}"/usr/bin/geos-config) + $(use_with svm libsvm) + $(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 + + # set proper python interpreter + sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ +os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ + -i "${ED}"/usr/bin/grass || die + + if use X; then + local GUI="--gui" + 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 +} diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml index 4dffe6c5b468..4b90fd219c90 100644 --- a/sci-geosciences/grass/metadata.xml +++ b/sci-geosciences/grass/metadata.xml @@ -22,6 +22,7 @@ <flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag> <flag name="las">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag> <flag name="pdal">Enable support for PDAL for point clouds via <pkg>sci-libs/pdal</pkg></flag> + <flag name="svm">Enable support for the Support Vector Machine library <pkg>sci-libs/libsvm</pkg></flag> </use> <upstream> <remote-id type="github">OSGeo/grass</remote-id>