* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-04-06 6:32 Agostino Sarubbo
0 siblings, 0 replies; 129+ messages in thread
From: Agostino Sarubbo @ 2022-04-06 6:32 UTC (permalink / raw
To: gentoo-commits
commit: 7ca193414dc90beba23f21ca704a5955ed912005
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 06:32:02 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 06:32:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca19341
sci-geosciences/grass: amd64 stable wrt bug #836849
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.1.ebuild b/sci-geosciences/grass/grass-8.0.1.ebuild
index 42780861df19..271aed05e3e5 100644
--- a/sci-geosciences/grass/grass-8.0.1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.1.ebuild
@@ -26,7 +26,7 @@ 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"
+ KEYWORDS="amd64 ~ppc ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-09-28 9:38 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2024-09-28 9:38 UTC (permalink / raw
To: gentoo-commits
commit: e5fd9ea5c11afa8d471fea6331edf454c24c7767
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 09:37:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 09:37:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5fd9ea5
sci-geosciences/grass: Stabilize 8.4.0 amd64, #940337
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.4.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.4.0.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild
index 9903823c07a3..51d356ba10d0 100644
--- a/sci-geosciences/grass/grass-8.4.0.ebuild
+++ b/sci-geosciences/grass/grass-8.4.0.ebuild
@@ -30,7 +30,7 @@ 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"
+ KEYWORDS="amd64 ~ppc ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-08-25 20:27 Eli Schwartz
0 siblings, 0 replies; 129+ messages in thread
From: Eli Schwartz @ 2024-08-25 20:27 UTC (permalink / raw
To: gentoo-commits
commit: d177adc1020d00665ce8d4f5a9cbf9bbe5c19ab5
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Aug 23 08:09:01 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 20:23:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d177adc1
sci-geosciences/grass: drop 8.3.2, 8.4.0_rc1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/38255
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 -
sci-geosciences/grass/grass-8.3.2.ebuild | 276 --------------------------
sci-geosciences/grass/grass-8.4.0_rc1.ebuild | 277 ---------------------------
3 files changed, 554 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index aaa5cf87fe30..379362cf62ee 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,2 @@
DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0
DIST grass-8.4.0.tar.gz 70245687 BLAKE2B 0f8283d215cc5412abcf4bc984aa94b5ca3de6de0d3d240fb533a4a0d2b335438269524462f3c4ede5ebec5cfc0348246571216dbc16f8658d88db28159bf360 SHA512 c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4
-DIST grass-8.4.0RC1.tar.gz 70272599 BLAKE2B a292336e8eb657fadc4a54b6045b529df883fe4d49d784551d5e5d948e74a69f48a0508a862d9df47cd60172b20d97a4603a377afec2faceb98b35e8023d377c SHA512 c64576305476e60d8525418f973512dd71d2586ac7712f36560d9fe31a10bd1532b91351d3dc81bfd7c32073ddc1631a8e922d56e0e27159f59e37a1399e4c21
diff --git a/sci-geosciences/grass/grass-8.3.2.ebuild b/sci-geosciences/grass/grass-8.3.2.ebuild
deleted file mode 100644
index 8a3ea23d393d..000000000000
--- a/sci-geosciences/grass/grass-8.3.2.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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.3"
-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 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}]
- dev-python/six[${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 )
- 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 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/grass-8.4.0_rc1.ebuild b/sci-geosciences/grass/grass-8.4.0_rc1.ebuild
deleted file mode 100644
index bd3d41da509b..000000000000
--- a/sci-geosciences/grass/grass-8.4.0_rc1.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-08-25 20:27 Eli Schwartz
0 siblings, 0 replies; 129+ messages in thread
From: Eli Schwartz @ 2024-08-25 20:27 UTC (permalink / raw
To: gentoo-commits
commit: 85fa61eb98aa53bb2f652d0fbe93d6c75cb10cce
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Aug 23 08:07:41 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 20:23:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fa61eb
sci-geosciences/grass: sci-libs/pdal requires cxx USE flag
Closes: https://bugs.gentoo.org/922102
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
sci-geosciences/grass/grass-8.3.2-r1.ebuild | 3 ++-
sci-geosciences/grass/grass-8.4.0.ebuild | 3 ++-
sci-geosciences/grass/grass-9999.ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.3.2-r1.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
index 5fa3915b850b..0871bb02df0d 100644
--- a/sci-geosciences/grass/grass-8.3.2-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
@@ -39,7 +39,8 @@ fi
IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
- opengl? ( X )"
+ opengl? ( X )
+ pdal? ( cxx )"
RDEPEND="
${PYTHON_DEPS}
diff --git a/sci-geosciences/grass/grass-8.4.0.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild
index bd3d41da509b..9903823c07a3 100644
--- a/sci-geosciences/grass/grass-8.4.0.ebuild
+++ b/sci-geosciences/grass/grass-8.4.0.ebuild
@@ -39,7 +39,8 @@ 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 )"
+ opengl? ( X )
+ pdal? ( cxx )"
RDEPEND="
${PYTHON_DEPS}
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 0844f7c7bbff..558ef152545b 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -39,7 +39,8 @@ 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 )"
+ opengl? ( X )
+ pdal? ( cxx )"
RDEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-08-10 7:24 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2024-08-10 7:24 UTC (permalink / raw
To: gentoo-commits
commit: 00178b6892fcc9ae59b0d0c38c2264b056e5a658
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Jul 31 14:28:07 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 07:22:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00178b68
sci-geosciences/grass: add 8.4.0
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.ebuild | 277 +++++++++++++++++++++++++++++++
2 files changed, 278 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index d114ffd902c2..adb6804e3a73 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,4 @@
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.0.tar.gz 70245687 BLAKE2B 0f8283d215cc5412abcf4bc984aa94b5ca3de6de0d3d240fb533a4a0d2b335438269524462f3c4ede5ebec5cfc0348246571216dbc16f8658d88db28159bf360 SHA512 c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4
DIST grass-8.4.0RC1.tar.gz 70272599 BLAKE2B a292336e8eb657fadc4a54b6045b529df883fe4d49d784551d5e5d948e74a69f48a0508a862d9df47cd60172b20d97a4603a377afec2faceb98b35e8023d377c SHA512 c64576305476e60d8525418f973512dd71d2586ac7712f36560d9fe31a10bd1532b91351d3dc81bfd7c32073ddc1631a8e922d56e0e27159f59e37a1399e4c21
diff --git a/sci-geosciences/grass/grass-8.4.0.ebuild b/sci-geosciences/grass/grass-8.4.0.ebuild
new file mode 100644
index 000000000000..bd3d41da509b
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.4.0.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
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-08-10 7:24 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2024-08-10 7:24 UTC (permalink / raw
To: gentoo-commits
commit: faf22ed7ae82e4911cdecc1b63a832126b1ef046
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Jul 31 14:32:27 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 07:22:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf22ed7
sci-geosciences/grass: drop 8.3.1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/37883
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 -
sci-geosciences/grass/grass-8.3.1.ebuild | 276 -------------------------------
2 files changed, 277 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index adb6804e3a73..aaa5cf87fe30 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,4 +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.0.tar.gz 70245687 BLAKE2B 0f8283d215cc5412abcf4bc984aa94b5ca3de6de0d3d240fb533a4a0d2b335438269524462f3c4ede5ebec5cfc0348246571216dbc16f8658d88db28159bf360 SHA512 c31ea7dc79cee1a2a3e668fa79b93a5a7683bcd1ae1b467b4938aee81ed023e82a643d3acf3f8e67265c46b9f86dd37c62f15e4b5f210d36672c8986a69d71e4
DIST grass-8.4.0RC1.tar.gz 70272599 BLAKE2B a292336e8eb657fadc4a54b6045b529df883fe4d49d784551d5e5d948e74a69f48a0508a862d9df47cd60172b20d97a4603a377afec2faceb98b35e8023d377c SHA512 c64576305476e60d8525418f973512dd71d2586ac7712f36560d9fe31a10bd1532b91351d3dc81bfd7c32073ddc1631a8e922d56e0e27159f59e37a1399e4c21
diff --git a/sci-geosciences/grass/grass-8.3.1.ebuild b/sci-geosciences/grass/grass-8.3.1.ebuild
deleted file mode 100644
index 8a3ea23d393d..000000000000
--- a/sci-geosciences/grass/grass-8.3.1.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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.3"
-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 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}]
- dev-python/six[${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 )
- 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 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
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-07-31 19:14 Arthur Zamarin
0 siblings, 0 replies; 129+ messages in thread
From: Arthur Zamarin @ 2024-07-31 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 91e161028f2ce50674a4e7fdb7e9fe1a52dcfe37
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 19:14:30 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 19:14:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e16102
sci-geosciences/grass: Stabilize 8.3.2-r1 amd64, #937006
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sci-geosciences/grass/grass-8.3.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.3.2-r1.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
index 1d2d329b7e3c..5fa3915b850b 100644
--- a/sci-geosciences/grass/grass-8.3.2-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
@@ -30,7 +30,7 @@ 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"
+ KEYWORDS="amd64 ~ppc ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-07-18 7:41 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2024-07-18 7:41 UTC (permalink / raw
To: gentoo-commits
commit: 2fecc72142781706daec6be01b4ba225e2d334f4
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Jun 12 15:18:57 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 07:37:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fecc721
sci-geosciences/grass: enable py3.12
Closes: https://bugs.gentoo.org/933472
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../grass/{grass-9999.ebuild => grass-8.3.2-r1.ebuild} | 9 +++++++--
sci-geosciences/grass/grass-9999.ebuild | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
similarity index 98%
copy from sci-geosciences/grass/grass-9999.ebuild
copy to sci-geosciences/grass/grass-8.3.2-r1.ebuild
index ed68dea0c142..1d2d329b7e3c 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="sqlite" # bug 572440
inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
@@ -14,7 +14,7 @@ HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
if [[ ${PV} =~ "9999" ]]; then
- SLOT="0/8.4"
+ SLOT="0/8.3"
else
SLOT="0/$(ver_cut 1-2 ${PV})"
fi
@@ -101,6 +101,11 @@ BDEPEND="
virtual/pkgconfig
X? ( dev-lang/swig )"
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-flock.patch"
+)
+
pkg_setup() {
if use lapack; then
local mylapack=$(eselect lapack show)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index ed68dea0c142..1c0613f94251 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="sqlite" # bug 572440
inherit desktop flag-o-matic python-single-r1 toolchain-funcs xdg
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-07-18 7:41 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2024-07-18 7:41 UTC (permalink / raw
To: gentoo-commits
commit: 06f93e3484d7682df7116ab966d240feaa2029e0
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Tue Jun 18 16:16:46 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=06f93e34
sci-geosciences/grass: sync live
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/37131
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 1c0613f94251..0844f7c7bbff 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -36,7 +36,7 @@ else
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 threads tiff truetype X zstd"
+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 )"
@@ -48,7 +48,6 @@ RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/ply[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
')
sci-libs/gdal:=
sys-libs/gdbm:=
@@ -76,6 +75,7 @@ RDEPEND="
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? (
@@ -202,6 +202,7 @@ src_configure() {
$(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)
)
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-07-18 7:41 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2024-07-18 7:41 UTC (permalink / raw
To: gentoo-commits
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>
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-04-23 21:33 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2024-04-23 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 7418ebc441e0ce548a35a9f6f8667bd5d6644460
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 21:33:41 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 21:33:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7418ebc4
sci-geosciences/grass: Stabilize 8.3.2 amd64, #930486
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.3.2.ebuild b/sci-geosciences/grass/grass-8.3.2.ebuild
index b719d57f438c..8a3ea23d393d 100644
--- a/sci-geosciences/grass/grass-8.3.2.ebuild
+++ b/sci-geosciences/grass/grass-8.3.2.ebuild
@@ -30,7 +30,7 @@ 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"
+ KEYWORDS="amd64 ~ppc ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-03-20 22:12 Andrew Ammerlaan
0 siblings, 0 replies; 129+ messages in thread
From: Andrew Ammerlaan @ 2024-03-20 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 83a3f963eb5b843e8c8f41d7c7970952d76dcfcb
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Mar 7 10:12:46 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 22:12:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a3f963
sci-geosciences/grass: add 8.3.2
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/35478
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-8.3.2.ebuild | 276 +++++++++++++++++++++++++++++++
2 files changed, 277 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 1e6dbe195903..bc17e20a6fdd 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
DIST grass-8.3.1.tar.gz 68491177 BLAKE2B 58513c8c273b55831bca764c9e61e54b92c075ea2f4ff3c2f059ebcce98f25694ee03a25bef7a3e1c443165dd9493d3ce469233be3b65596dc28da166c12d174 SHA512 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793
+DIST grass-8.3.2.tar.gz 68662576 BLAKE2B 214bc6aea6904e88339e7f2d80f5dbc1c549928eed08ae0734789165af9e4cd7d8a882c67607c2670f2fdd4584615eac95c1ada9e5312abc6b59e0cb48124615 SHA512 6523e2c0eae183fddeaa015e63283febfbae4953e809ff41bcc4ab95aa1055162b08c65365f973124608ff7b01aa907a1a0ec96c9f31884c657f236e56c0eab0
diff --git a/sci-geosciences/grass/grass-8.3.2.ebuild b/sci-geosciences/grass/grass-8.3.2.ebuild
new file mode 100644
index 000000000000..b719d57f438c
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.3.2.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+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.3"
+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 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}]
+ dev-python/six[${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 )
+ 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 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
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-03-15 6:47 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2024-03-15 6:47 UTC (permalink / raw
To: gentoo-commits
commit: eecdd47e4d8acbe92493140b2ba0a80358d28791
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 15 06:33:56 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 06:46:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eecdd47e
sci-geosciences/grass: mark as LTO-unsafe, strict-aliasing unsafe
Closes: https://bugs.gentoo.org/862579
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.3.1.ebuild | 10 +++++++++-
sci-geosciences/grass/grass-9999.ebuild | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.3.1.ebuild b/sci-geosciences/grass/grass-8.3.1.ebuild
index 166049f1b309..8a3ea23d393d 100644
--- a/sci-geosciences/grass/grass-8.3.1.ebuild
+++ b/sci-geosciences/grass/grass-8.3.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="sqlite" # bug 572440
-inherit desktop python-single-r1 toolchain-funcs xdg
+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/"
@@ -163,6 +163,14 @@ src_prepare() {
}
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=(
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 850b3a402fe1..ed68dea0c142 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="sqlite" # bug 572440
-inherit desktop python-single-r1 toolchain-funcs xdg
+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/"
@@ -158,6 +158,14 @@ src_prepare() {
}
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=(
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2024-01-05 6:42 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2024-01-05 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 624df2ff2dabdb8074447752491d73761a7acb53
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 06:31:20 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 06:31:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624df2ff
sci-geosciences/grass: drop 8.3.0, 8.3.1_rc1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/Manifest | 2 -
sci-geosciences/grass/grass-8.3.0.ebuild | 268 ---------------------------
sci-geosciences/grass/grass-8.3.1_rc1.ebuild | 268 ---------------------------
3 files changed, 538 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index fe8a84587e84..1e6dbe195903 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1 @@
-DIST grass-8.3.0.tar.gz 68481826 BLAKE2B dc918958333387356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415 SHA512 0d6c0a9ec7038cf707f868144aec3fb4c59c72c56b9cff4c7b2f256c90cbd7e45c1851a7f7a37e7b9ac42f6bbaecb4e8fa4ad7d5eb0f88adf9c2b3bfa23ecf15
DIST grass-8.3.1.tar.gz 68491177 BLAKE2B 58513c8c273b55831bca764c9e61e54b92c075ea2f4ff3c2f059ebcce98f25694ee03a25bef7a3e1c443165dd9493d3ce469233be3b65596dc28da166c12d174 SHA512 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793
-DIST grass-8.3.1RC1.tar.gz 68506635 BLAKE2B 5b016f19a23359b3d9e0bf599a28e3985bed3b053759f0d396bbc02a40791c3ce344b7ba2b66d094660ae22effec439007c5ffbbbee06cc2b2c86786c21dcf22 SHA512 fc3de4581300ff8d55d971308b4bc6ed7414d65cb1d74413f90bbde49692206b63982f113c9c60045f6acbe50e5d88975c291a945e265b9052e3b03a8bd2d87b
diff --git a/sci-geosciences/grass/grass-8.3.0.ebuild b/sci-geosciences/grass/grass-8.3.0.ebuild
deleted file mode 100644
index c245ef335bc9..000000000000
--- a/sci-geosciences/grass/grass-8.3.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-
-inherit desktop 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.3"
-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 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}]
- dev-python/six[${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 )
- 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="
- sys-devel/bison
- sys-devel/flex
- 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() {
- 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 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/grass-8.3.1_rc1.ebuild b/sci-geosciences/grass/grass-8.3.1_rc1.ebuild
deleted file mode 100644
index 5934af4107b0..000000000000
--- a/sci-geosciences/grass/grass-8.3.1_rc1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-
-inherit desktop 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.3"
-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 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}]
- dev-python/six[${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 )
- 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="
- sys-devel/bison
- sys-devel/flex
- 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() {
- 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 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
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-11-30 3:07 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-11-30 3:07 UTC (permalink / raw
To: gentoo-commits
commit: 173406f1e1fb4348351234c2434094d29e9a6e10
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 03:07:17 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 03:07:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=173406f1
sci-geosciences/grass: Stabilize 8.3.1 amd64, #918880
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.3.1.ebuild b/sci-geosciences/grass/grass-8.3.1.ebuild
index 5934af4107b0..5fd44524ddd8 100644
--- a/sci-geosciences/grass/grass-8.3.1.ebuild
+++ b/sci-geosciences/grass/grass-8.3.1.ebuild
@@ -30,7 +30,7 @@ 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"
+ KEYWORDS="amd64 ~ppc ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-10-27 8:13 Andrew Ammerlaan
0 siblings, 0 replies; 129+ messages in thread
From: Andrew Ammerlaan @ 2023-10-27 8:13 UTC (permalink / raw
To: gentoo-commits
commit: 9b3371d8d085d8295386ae8399c08710209c05e7
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Oct 25 17:37:33 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 08:04:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b3371d8
sci-geosciences/grass: add 8.3.1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/33510
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-8.3.1.ebuild | 268 +++++++++++++++++++++++++++++++
2 files changed, 269 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 0894f5eaee83..fe8a84587e84 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,3 @@
DIST grass-8.3.0.tar.gz 68481826 BLAKE2B dc918958333387356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415 SHA512 0d6c0a9ec7038cf707f868144aec3fb4c59c72c56b9cff4c7b2f256c90cbd7e45c1851a7f7a37e7b9ac42f6bbaecb4e8fa4ad7d5eb0f88adf9c2b3bfa23ecf15
+DIST grass-8.3.1.tar.gz 68491177 BLAKE2B 58513c8c273b55831bca764c9e61e54b92c075ea2f4ff3c2f059ebcce98f25694ee03a25bef7a3e1c443165dd9493d3ce469233be3b65596dc28da166c12d174 SHA512 416a1b3eccb71f63576b36b963b7ddd8063ae73cefb8aa94431ade0ad74d699beb28635de8ba3a73cbd28304e5049dde2e75fb0f4c2747c81cb62c86b25c3793
DIST grass-8.3.1RC1.tar.gz 68506635 BLAKE2B 5b016f19a23359b3d9e0bf599a28e3985bed3b053759f0d396bbc02a40791c3ce344b7ba2b66d094660ae22effec439007c5ffbbbee06cc2b2c86786c21dcf22 SHA512 fc3de4581300ff8d55d971308b4bc6ed7414d65cb1d74413f90bbde49692206b63982f113c9c60045f6acbe50e5d88975c291a945e265b9052e3b03a8bd2d87b
diff --git a/sci-geosciences/grass/grass-8.3.1.ebuild b/sci-geosciences/grass/grass-8.3.1.ebuild
new file mode 100644
index 000000000000..5934af4107b0
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.3.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+
+inherit desktop 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.3"
+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 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}]
+ dev-python/six[${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 )
+ 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="
+ sys-devel/bison
+ sys-devel/flex
+ 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() {
+ 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 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
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-10-17 7:57 Andrew Ammerlaan
0 siblings, 0 replies; 129+ messages in thread
From: Andrew Ammerlaan @ 2023-10-17 7:57 UTC (permalink / raw
To: gentoo-commits
commit: 68321f3943e9890679816bef35ed9ab97f6e69bc
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat Oct 14 13:56:37 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 07:57:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68321f39
sci-geosciences/grass: disable py3.9
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index a4a84ca2dae9..f4aeb3ef85ed 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="sqlite" # bug 572440
inherit desktop python-single-r1 toolchain-funcs xdg
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-10-17 7:57 Andrew Ammerlaan
0 siblings, 0 replies; 129+ messages in thread
From: Andrew Ammerlaan @ 2023-10-17 7:57 UTC (permalink / raw
To: gentoo-commits
commit: d607eced0d69d5e64d32b2888048354ecc769730
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat Oct 14 13:55:59 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 07:57:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d607eced
sci-geosciences/grass: add 8.3.1_rc1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-8.3.1_rc1.ebuild | 268 +++++++++++++++++++++++++++
2 files changed, 269 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index b14cd23e527a..ebb5413dbd5e 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,4 @@
DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661
DIST grass-8.3.0.tar.gz 68481826 BLAKE2B dc918958333387356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415 SHA512 0d6c0a9ec7038cf707f868144aec3fb4c59c72c56b9cff4c7b2f256c90cbd7e45c1851a7f7a37e7b9ac42f6bbaecb4e8fa4ad7d5eb0f88adf9c2b3bfa23ecf15
DIST grass-8.3.0RC1.tar.gz 67872978 BLAKE2B 5394d929e5d9aaed157a87a5eef720403cbb82e0900a591f38d7e88c570dbcc22e4aa4cd6bd060f09736700f48426c40da6cdcc22abc6bee8d04af886aa9b805 SHA512 6a74d142061b9b6d7eebc9226ae7b3c0201f8153c5e9d95236ceab143a6a6613d6aba03de59180817ff73f64ed34c5c289bd2d370352f52a8d5eab4d61044ac7
+DIST grass-8.3.1RC1.tar.gz 68506635 BLAKE2B 5b016f19a23359b3d9e0bf599a28e3985bed3b053759f0d396bbc02a40791c3ce344b7ba2b66d094660ae22effec439007c5ffbbbee06cc2b2c86786c21dcf22 SHA512 fc3de4581300ff8d55d971308b4bc6ed7414d65cb1d74413f90bbde49692206b63982f113c9c60045f6acbe50e5d88975c291a945e265b9052e3b03a8bd2d87b
diff --git a/sci-geosciences/grass/grass-8.3.1_rc1.ebuild b/sci-geosciences/grass/grass-8.3.1_rc1.ebuild
new file mode 100644
index 000000000000..5934af4107b0
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.3.1_rc1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+
+inherit desktop 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.3"
+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 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}]
+ dev-python/six[${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 )
+ 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="
+ sys-devel/bison
+ sys-devel/flex
+ 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() {
+ 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 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
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-10-17 7:57 Andrew Ammerlaan
0 siblings, 0 replies; 129+ messages in thread
From: Andrew Ammerlaan @ 2023-10-17 7:57 UTC (permalink / raw
To: gentoo-commits
commit: ba2219f02ff9aa8f86179eaa5416f43c7aeda2df
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Oct 15 07:07:43 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 07:57:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2219f0
sci-geosciences/grass: drop 8.2.1-r2, 8.3.0_rc1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/33328
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/grass/Manifest | 2 -
sci-geosciences/grass/grass-8.2.1-r2.ebuild | 285 --------------------------
sci-geosciences/grass/grass-8.3.0_rc1.ebuild | 291 ---------------------------
3 files changed, 578 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ebb5413dbd5e..0894f5eaee83 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,4 +1,2 @@
-DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661
DIST grass-8.3.0.tar.gz 68481826 BLAKE2B dc918958333387356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415 SHA512 0d6c0a9ec7038cf707f868144aec3fb4c59c72c56b9cff4c7b2f256c90cbd7e45c1851a7f7a37e7b9ac42f6bbaecb4e8fa4ad7d5eb0f88adf9c2b3bfa23ecf15
-DIST grass-8.3.0RC1.tar.gz 67872978 BLAKE2B 5394d929e5d9aaed157a87a5eef720403cbb82e0900a591f38d7e88c570dbcc22e4aa4cd6bd060f09736700f48426c40da6cdcc22abc6bee8d04af886aa9b805 SHA512 6a74d142061b9b6d7eebc9226ae7b3c0201f8153c5e9d95236ceab143a6a6613d6aba03de59180817ff73f64ed34c5c289bd2d370352f52a8d5eab4d61044ac7
DIST grass-8.3.1RC1.tar.gz 68506635 BLAKE2B 5b016f19a23359b3d9e0bf599a28e3985bed3b053759f0d396bbc02a40791c3ce344b7ba2b66d094660ae22effec439007c5ffbbbee06cc2b2c86786c21dcf22 SHA512 fc3de4581300ff8d55d971308b4bc6ed7414d65cb1d74413f90bbde49692206b63982f113c9c60045f6acbe50e5d88975c291a945e265b9052e3b03a8bd2d87b
diff --git a/sci-geosciences/grass/grass-8.2.1-r2.ebuild b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
deleted file mode 100644
index 0dbf5e7b2da1..000000000000
--- a/sci-geosciences/grass/grass-8.2.1-r2.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-
-inherit desktop 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.3"
-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 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:=
- 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 )
- tiff? ( media-libs/tiff:= )
- truetype? ( media-libs/freetype:2 )
- X? (
- >=dev-python/wxpython-4.1:4.0
- 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="
- sys-devel/bison
- sys-devel/flex
- 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() {
- 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 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 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"
- 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/grass-8.3.0_rc1.ebuild b/sci-geosciences/grass/grass-8.3.0_rc1.ebuild
deleted file mode 100644
index 212d805be495..000000000000
--- a/sci-geosciences/grass/grass-8.3.0_rc1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-
-inherit desktop 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.3"
-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 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}]
- dev-python/six[${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 )
- 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="
- sys-devel/bison
- sys-devel/flex
- 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() {
- 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 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"
- 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
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-10-04 21:56 Conrad Kostecki
0 siblings, 0 replies; 129+ messages in thread
From: Conrad Kostecki @ 2023-10-04 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 0da6faa380899eea9d7a5abd2f97169f088752a1
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Oct 4 21:20:13 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 21:55:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da6faa3
sci-geosciences/grass: drop 8.2.0-r7
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/33197
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 -
sci-geosciences/grass/grass-8.2.0-r7.ebuild | 272 ----------------------------
2 files changed, 273 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 5b4153d86306..b14cd23e527a 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,4 +1,3 @@
-DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930
DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661
DIST grass-8.3.0.tar.gz 68481826 BLAKE2B dc918958333387356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415 SHA512 0d6c0a9ec7038cf707f868144aec3fb4c59c72c56b9cff4c7b2f256c90cbd7e45c1851a7f7a37e7b9ac42f6bbaecb4e8fa4ad7d5eb0f88adf9c2b3bfa23ecf15
DIST grass-8.3.0RC1.tar.gz 67872978 BLAKE2B 5394d929e5d9aaed157a87a5eef720403cbb82e0900a591f38d7e88c570dbcc22e4aa4cd6bd060f09736700f48426c40da6cdcc22abc6bee8d04af886aa9b805 SHA512 6a74d142061b9b6d7eebc9226ae7b3c0201f8153c5e9d95236ceab143a6a6613d6aba03de59180817ff73f64ed34c5c289bd2d370352f52a8d5eab4d61044ac7
diff --git a/sci-geosciences/grass/grass-8.2.0-r7.ebuild b/sci-geosciences/grass/grass-8.2.0-r7.ebuild
deleted file mode 100644
index 356ff4cb62b9..000000000000
--- a/sci-geosciences/grass/grass-8.2.0-r7.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-
-inherit autotools desktop 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"
-SLOT="0/8.2"
-
-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 las 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:=
- sci-libs/proj:=
- 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(+)] )
- las? ( 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:= )
- postgres? ( >=dev-db/postgresql-8.4:= )
- readline? ( sys-libs/readline:= )
- sqlite? ( dev-db/sqlite:3 )
- tiff? ( media-libs/tiff:= )
- truetype? ( media-libs/freetype:2 )
- X? (
- dev-python/wxpython:4.0
- 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="
- sys-devel/bison
- sys-devel/flex
- 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
- 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() {
- 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 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 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"
- 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
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-08-24 17:46 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-08-24 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 374bb271601a4af10a024945c823f345d4379567
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 17:46:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 17:46:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=374bb271
sci-geosciences/grass: Stabilize 8.3.0 amd64, #912971
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.3.0.ebuild b/sci-geosciences/grass/grass-8.3.0.ebuild
index e80a47292e49..c245ef335bc9 100644
--- a/sci-geosciences/grass/grass-8.3.0.ebuild
+++ b/sci-geosciences/grass/grass-8.3.0.ebuild
@@ -30,7 +30,7 @@ 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"
+ KEYWORDS="amd64 ~ppc ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-07-16 13:26 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-07-16 13:26 UTC (permalink / raw
To: gentoo-commits
commit: e88117f56d87593ab271d706a7c70eccf9bc7c41
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Jul 16 12:43:44 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 13:23:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88117f5
sci-geosciences/grass: bump development subslot version
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31906
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 337cf8efb27d..a4a84ca2dae9 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
if [[ ${PV} =~ "9999" ]]; then
- SLOT="0/8.3"
+ SLOT="0/8.4"
else
SLOT="0/$(ver_cut 1-2 ${PV})"
fi
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-07-16 13:26 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-07-16 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 06dc20558d6372d03ac0925c3fa508bcaa2e41cc
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Jul 16 12:43:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 13:23:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06dc2055
sci-geosciences/grass: remove sed no-ops
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.3.0.ebuild | 23 -----------------------
sci-geosciences/grass/grass-9999.ebuild | 23 -----------------------
2 files changed, 46 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.3.0.ebuild b/sci-geosciences/grass/grass-8.3.0.ebuild
index 212d805be495..e80a47292e49 100644
--- a/sci-geosciences/grass/grass-8.3.0.ebuild
+++ b/sci-geosciences/grass/grass-8.3.0.ebuild
@@ -240,34 +240,11 @@ src_install() {
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"
make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 4a055a1fe3ea..337cf8efb27d 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -235,34 +235,11 @@ src_install() {
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"
make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-07-16 6:47 Viorel Munteanu
0 siblings, 0 replies; 129+ messages in thread
From: Viorel Munteanu @ 2023-07-16 6:47 UTC (permalink / raw
To: gentoo-commits
commit: 3102049d02d6666f68c571f76108b99c6eefaba0
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Jun 25 17:16:02 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 06:41:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3102049d
sci-geosciences/grass: add 8.3.0
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31603
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-8.3.0.ebuild | 291 +++++++++++++++++++++++++++++++
2 files changed, 292 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 3ce763026094..5b4153d86306 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,4 @@
DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930
DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661
+DIST grass-8.3.0.tar.gz 68481826 BLAKE2B dc918958333387356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415 SHA512 0d6c0a9ec7038cf707f868144aec3fb4c59c72c56b9cff4c7b2f256c90cbd7e45c1851a7f7a37e7b9ac42f6bbaecb4e8fa4ad7d5eb0f88adf9c2b3bfa23ecf15
DIST grass-8.3.0RC1.tar.gz 67872978 BLAKE2B 5394d929e5d9aaed157a87a5eef720403cbb82e0900a591f38d7e88c570dbcc22e4aa4cd6bd060f09736700f48426c40da6cdcc22abc6bee8d04af886aa9b805 SHA512 6a74d142061b9b6d7eebc9226ae7b3c0201f8153c5e9d95236ceab143a6a6613d6aba03de59180817ff73f64ed34c5c289bd2d370352f52a8d5eab4d61044ac7
diff --git a/sci-geosciences/grass/grass-8.3.0.ebuild b/sci-geosciences/grass/grass-8.3.0.ebuild
new file mode 100644
index 000000000000..212d805be495
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.3.0.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+
+inherit desktop 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.3"
+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 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}]
+ dev-python/six[${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 )
+ 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="
+ sys-devel/bison
+ sys-devel/flex
+ 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() {
+ 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 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"
+ 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
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-06-15 9:04 Andrew Ammerlaan
0 siblings, 0 replies; 129+ messages in thread
From: Andrew Ammerlaan @ 2023-06-15 9:04 UTC (permalink / raw
To: gentoo-commits
commit: ca7a8f1ece3f2d3b2b3528a375f37aea5f4b1b66
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Jun 8 21:52:52 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 08:51:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7a8f1e
sci-geosciences/grass: add 8.3.0_rc1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31360
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
.../grass/{grass-9999.ebuild => grass-8.3.0_rc1.ebuild} | 15 +++++++++++++--
sci-geosciences/grass/grass-9999.ebuild | 10 ++++++++--
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 72d4208c6be4..3ce763026094 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,3 @@
DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930
DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661
+DIST grass-8.3.0RC1.tar.gz 67872978 BLAKE2B 5394d929e5d9aaed157a87a5eef720403cbb82e0900a591f38d7e88c570dbcc22e4aa4cd6bd060f09736700f48426c40da6cdcc22abc6bee8d04af886aa9b805 SHA512 6a74d142061b9b6d7eebc9226ae7b3c0201f8153c5e9d95236ceab143a6a6613d6aba03de59180817ff73f64ed34c5c289bd2d370352f52a8d5eab4d61044ac7
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.3.0_rc1.ebuild
similarity index 95%
copy from sci-geosciences/grass/grass-9999.ebuild
copy to sci-geosciences/grass/grass-8.3.0_rc1.ebuild
index 4b7fab7cb764..212d805be495 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-8.3.0_rc1.ebuild
@@ -46,6 +46,8 @@ RDEPEND="
>=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}]
dev-python/six[${PYTHON_USEDEP}]
')
sci-libs/gdal:=
@@ -77,7 +79,11 @@ RDEPEND="
tiff? ( media-libs/tiff:= )
truetype? ( media-libs/freetype:2 )
X? (
- >=dev-python/wxpython-4.1:4.0
+ $(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
@@ -95,6 +101,11 @@ BDEPEND="
virtual/pkgconfig
X? ( dev-lang/swig )"
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-flock.patch"
+)
+
pkg_setup() {
if use lapack; then
local mylapack=$(eselect lapack show)
@@ -165,7 +176,7 @@ src_configure() {
--with-proj-share="${EPREFIX}"/usr/share/proj/
$(use_with cxx)
$(use_with tiff)
- $(use_with png)
+ $(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
$(use_with postgres)
$(use_with mysql)
$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 4b7fab7cb764..4a055a1fe3ea 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -46,6 +46,8 @@ RDEPEND="
>=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}]
dev-python/six[${PYTHON_USEDEP}]
')
sci-libs/gdal:=
@@ -77,7 +79,11 @@ RDEPEND="
tiff? ( media-libs/tiff:= )
truetype? ( media-libs/freetype:2 )
X? (
- >=dev-python/wxpython-4.1:4.0
+ $(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
@@ -165,7 +171,7 @@ src_configure() {
--with-proj-share="${EPREFIX}"/usr/share/proj/
$(use_with cxx)
$(use_with tiff)
- $(use_with png)
+ $(use_with png libpng "${EPREFIX}"/usr/bin/libpng-config)
$(use_with postgres)
$(use_with mysql)
$(use_with mysql mysql-includes "${EPREFIX}"/usr/include/mysql)
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-05-06 3:52 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-05-06 3:52 UTC (permalink / raw
To: gentoo-commits
commit: 5f751b8ea4d3234c5e8bc3b6a387f43b3a1bf690
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 03:52:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 6 03:52:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f751b8e
sci-geosciences/grass: restore ~ppc now that gdal is masked there
Closes: https://bugs.gentoo.org/858098
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.1-r2.ebuild | 2 +-
sci-geosciences/grass/grass-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.1-r2.ebuild b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
index 3f2fa48bc572..491dfe74bf6b 100644
--- a/sci-geosciences/grass/grass-8.2.1-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
@@ -30,7 +30,7 @@ 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 x86"
+ KEYWORDS="amd64 ~ppc x86"
fi
S="${WORKDIR}/${MY_P}"
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index c335853ae4e4..4b7fab7cb764 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -30,7 +30,7 @@ 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 ~x86"
+ KEYWORDS="~amd64 ~ppc ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-05-06 3:52 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-05-06 3:52 UTC (permalink / raw
To: gentoo-commits
commit: 68b0ddef297012ac3ec785162dff911612a9e0e7
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Mon May 1 16:22:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 6 03:47:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b0ddef
sci-geosciences/grass: drop 8.2.0-r8
Closes: https://bugs.gentoo.org/893130
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/30824
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.0-r8.ebuild | 283 ----------------------------
1 file changed, 283 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r8.ebuild b/sci-geosciences/grass/grass-8.2.0-r8.ebuild
deleted file mode 100644
index 037ead627c64..000000000000
--- a/sci-geosciences/grass/grass-8.2.0-r8.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-
-inherit desktop 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.3"
-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 ~x86"
- fi
-
- S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal 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:=
- sci-libs/proj:=
- 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(+)] )
- 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 )
- tiff? ( media-libs/tiff:= )
- truetype? ( media-libs/freetype:2 )
- X? (
- dev-python/wxpython:4.0
- 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="
- sys-devel/bison
- sys-devel/flex
- 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() {
- 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 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 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"
- 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
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-05-01 9:22 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-05-01 9:22 UTC (permalink / raw
To: gentoo-commits
commit: 132d76469dbf12f93ce40e311afaccd366478cf8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 09:21:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 1 09:21:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132d7646
sci-geosciences/grass: Stabilize 8.2.1-r2 x86, #904564
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.2.1-r2.ebuild b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
index 837a69b044eb..3f2fa48bc572 100644
--- a/sci-geosciences/grass/grass-8.2.1-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
@@ -30,7 +30,7 @@ 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 ~x86"
+ KEYWORDS="amd64 x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-05-01 9:22 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-05-01 9:22 UTC (permalink / raw
To: gentoo-commits
commit: 9ffa9b8b58a09e0a5abee77d0b42816bc0ef1ed0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 09:19:17 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 1 09:19:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ffa9b8b
sci-geosciences/grass: Stabilize 8.2.1-r2 amd64, #904564
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.2.1-r2.ebuild b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
index b3f26da18821..837a69b044eb 100644
--- a/sci-geosciences/grass/grass-8.2.1-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
@@ -30,7 +30,7 @@ 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 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-03-19 17:14 David Seifert
0 siblings, 0 replies; 129+ messages in thread
From: David Seifert @ 2023-03-19 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 2f3009471298ba0cf590774806c00af880dc4ecc
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 17:13:59 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 17:13:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f300947
sci-geosciences/grass: remove spurious dep on sci-libs/xdrfile
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-geosciences/grass/{grass-8.2.0-r5.ebuild => grass-8.2.0-r7.ebuild} | 1 -
sci-geosciences/grass/{grass-8.2.0-r6.ebuild => grass-8.2.0-r8.ebuild} | 1 -
sci-geosciences/grass/{grass-8.2.1-r1.ebuild => grass-8.2.1-r2.ebuild} | 1 -
sci-geosciences/grass/grass-9999.ebuild | 1 -
4 files changed, 4 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r5.ebuild b/sci-geosciences/grass/grass-8.2.0-r7.ebuild
similarity index 99%
rename from sci-geosciences/grass/grass-8.2.0-r5.ebuild
rename to sci-geosciences/grass/grass-8.2.0-r7.ebuild
index 67c415a6fb83..e30ecf9a377f 100644
--- a/sci-geosciences/grass/grass-8.2.0-r5.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r7.ebuild
@@ -47,7 +47,6 @@ RDEPEND="
sys-libs/gdbm:=
sys-libs/ncurses:=
sci-libs/proj:=
- sci-libs/xdrfile
sys-libs/zlib
media-libs/libglvnd
media-libs/glu
diff --git a/sci-geosciences/grass/grass-8.2.0-r6.ebuild b/sci-geosciences/grass/grass-8.2.0-r8.ebuild
similarity index 99%
rename from sci-geosciences/grass/grass-8.2.0-r6.ebuild
rename to sci-geosciences/grass/grass-8.2.0-r8.ebuild
index 89da9d5144ac..037ead627c64 100644
--- a/sci-geosciences/grass/grass-8.2.0-r6.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r8.ebuild
@@ -52,7 +52,6 @@ RDEPEND="
sys-libs/gdbm:=
sys-libs/ncurses:=
sci-libs/proj:=
- sci-libs/xdrfile
sys-libs/zlib
media-libs/libglvnd
media-libs/glu
diff --git a/sci-geosciences/grass/grass-8.2.1-r1.ebuild b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
similarity index 99%
rename from sci-geosciences/grass/grass-8.2.1-r1.ebuild
rename to sci-geosciences/grass/grass-8.2.1-r2.ebuild
index d2f60e00ca0e..b3f26da18821 100644
--- a/sci-geosciences/grass/grass-8.2.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
@@ -52,7 +52,6 @@ RDEPEND="
sys-libs/gdbm:=
sys-libs/ncurses:=
sci-libs/proj:=
- sci-libs/xdrfile
sys-libs/zlib
media-libs/libglvnd
media-libs/glu
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 45c10f8e8cd3..c335853ae4e4 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -52,7 +52,6 @@ RDEPEND="
sys-libs/gdbm:=
sys-libs/ncurses:=
sci-libs/proj:=
- sci-libs/xdrfile
sys-libs/zlib
media-libs/libglvnd
media-libs/glu
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-03-07 9:09 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2023-03-07 9:09 UTC (permalink / raw
To: gentoo-commits
commit: cd7a1032c62f7cd7dfa3fe736b3860c4eceb5f0b
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Feb 19 22:16:01 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 09:09:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7a1032
sci-geosciences/grass: bump dependency to >=dev-python/wxpython-4.1
Closes: https://bugs.gentoo.org/858548
Closes: https://bugs.gentoo.org/897210
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/29674
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-geosciences/grass/{grass-8.2.1.ebuild => grass-8.2.1-r1.ebuild} | 4 ++--
sci-geosciences/grass/grass-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.1.ebuild b/sci-geosciences/grass/grass-8.2.1-r1.ebuild
similarity index 99%
rename from sci-geosciences/grass/grass-8.2.1.ebuild
rename to sci-geosciences/grass/grass-8.2.1-r1.ebuild
index 0b77a9524bf5..d2f60e00ca0e 100644
--- a/sci-geosciences/grass/grass-8.2.1.ebuild
+++ b/sci-geosciences/grass/grass-8.2.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="sqlite" # bug 572440
inherit desktop python-single-r1 toolchain-funcs xdg
@@ -78,7 +78,7 @@ RDEPEND="
tiff? ( media-libs/tiff:= )
truetype? ( media-libs/freetype:2 )
X? (
- dev-python/wxpython:4.0
+ >=dev-python/wxpython-4.1:4.0
x11-libs/cairo[X]
x11-libs/libICE
x11-libs/libSM
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 80491b81b91a..45c10f8e8cd3 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="sqlite" # bug 572440
inherit desktop python-single-r1 toolchain-funcs xdg
@@ -78,7 +78,7 @@ RDEPEND="
tiff? ( media-libs/tiff:= )
truetype? ( media-libs/freetype:2 )
X? (
- dev-python/wxpython:4.0
+ >=dev-python/wxpython-4.1:4.0
x11-libs/cairo[X]
x11-libs/libICE
x11-libs/libSM
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-02-08 4:11 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-02-08 4:11 UTC (permalink / raw
To: gentoo-commits
commit: e40338171ba06b88bb26cec045421eab9bf54877
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Jan 29 18:34:09 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 04:11:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4033817
sci-geosciences/grass: add 8.2.1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-8.2.1.ebuild | 284 +++++++++++++++++++++++++++++++
2 files changed, 285 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 3e0f3220fd5c..72d4208c6be4 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930
+DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661
diff --git a/sci-geosciences/grass/grass-8.2.1.ebuild b/sci-geosciences/grass/grass-8.2.1.ebuild
new file mode 100644
index 000000000000..70d3a66f7e30
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.2.1.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+
+inherit desktop 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.3"
+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 ~x86"
+ fi
+
+ S="${WORKDIR}/${MY_P}"
+fi
+
+IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal 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:=
+ 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(+)] )
+ 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 )
+ tiff? ( media-libs/tiff:= )
+ truetype? ( media-libs/freetype:2 )
+ X? (
+ dev-python/wxpython:4.0
+ 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="
+ sys-devel/bison
+ sys-devel/flex
+ 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() {
+ 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 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 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"
+ 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
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-02-08 4:11 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-02-08 4:11 UTC (permalink / raw
To: gentoo-commits
commit: 91e79c4852d808c79d435ef0afadd4386a1dfb02
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Tue Feb 7 17:04:11 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 04:11:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e79c48
sci-geosciences/grass: add bzip2 use flag
Bug: https://bugs.gentoo.org/893134
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/29333
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.1.ebuild | 4 +++-
sci-geosciences/grass/grass-9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.1.ebuild b/sci-geosciences/grass/grass-8.2.1.ebuild
index 70d3a66f7e30..0b77a9524bf5 100644
--- a/sci-geosciences/grass/grass-8.2.1.ebuild
+++ b/sci-geosciences/grass/grass-8.2.1.ebuild
@@ -36,7 +36,7 @@ else
S="${WORKDIR}/${MY_P}"
fi
-IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
+IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
opengl? ( X )"
@@ -60,6 +60,7 @@ RDEPEND="
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(+)] )
@@ -188,6 +189,7 @@ src_configure() {
$(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)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 4c29251814aa..80491b81b91a 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -36,7 +36,7 @@ else
S="${WORKDIR}/${MY_P}"
fi
-IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
+IUSE="blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
opengl? ( X )"
@@ -60,6 +60,7 @@ RDEPEND="
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(+)] )
@@ -183,6 +184,7 @@ src_configure() {
$(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)
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-02-08 4:11 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-02-08 4:11 UTC (permalink / raw
To: gentoo-commits
commit: 5cc364bc7f92347c86f01301e534c6df314220c0
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Jan 29 18:31:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 04:11:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc364bc
sci-geosciences/grass: drop ppc keyword from live ebuild
Mandatory dependency sci-libs/pdal lacks ppc keyword. Keywording is in
progress (see https://bugs.gentoo.org/858098).
See: https://bugs.gentoo.org/858098
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 9adfe1854258..4c29251814aa 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -30,7 +30,7 @@ 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"
+ KEYWORDS="~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-02-08 4:11 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-02-08 4:11 UTC (permalink / raw
To: gentoo-commits
commit: 1d5832ee940cb0b6635d29bf2e9be39d20ce696b
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Jan 29 18:27:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 04:11:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5832ee
sci-geosciences/grass: fix variable assignment order
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.0-r6.ebuild | 8 ++++++--
sci-geosciences/grass/grass-9999.ebuild | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r6.ebuild b/sci-geosciences/grass/grass-8.2.0-r6.ebuild
index 2439b5ce2439..89da9d5144ac 100644
--- a/sci-geosciences/grass/grass-8.2.0-r6.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r6.ebuild
@@ -13,17 +13,21 @@ HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
+if [[ ${PV} =~ "9999" ]]; then
+ SLOT="0/8.3"
+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
- SLOT="0/8.3"
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
else
MY_P="${P/_rc/RC}"
- SLOT="0/$(ver_cut 1-2 ${PV})"
SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="amd64 ~x86"
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index ed97dc748c64..9adfe1854258 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -13,17 +13,21 @@ HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
+if [[ ${PV} =~ "9999" ]]; then
+ SLOT="0/8.3"
+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
- SLOT="0/8.3"
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
else
MY_P="${P/_rc/RC}"
- SLOT="0/$(ver_cut 1-2 ${PV})"
SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~amd64 ~ppc ~x86"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2023-02-01 7:23 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2023-02-01 7:23 UTC (permalink / raw
To: gentoo-commits
commit: 85c442167a9b5b8a2cd2802c509f78b40336209c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 07:22:18 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 07:22:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c44216
sci-geosciences/grass: fix x11-libs/cairo dep
Nothing should've actually needed opengl on, so let's drop the dep,
as it's almost certainly bogus.
Bug: https://bugs.gentoo.org/892782
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/{grass-8.2.0-r3.ebuild => grass-8.2.0-r5.ebuild} | 2 +-
sci-geosciences/grass/{grass-8.2.0-r4.ebuild => grass-8.2.0-r6.ebuild} | 2 +-
sci-geosciences/grass/grass-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r3.ebuild b/sci-geosciences/grass/grass-8.2.0-r5.ebuild
similarity index 99%
rename from sci-geosciences/grass/grass-8.2.0-r3.ebuild
rename to sci-geosciences/grass/grass-8.2.0-r5.ebuild
index 314798b0e0ca..67c415a6fb83 100644
--- a/sci-geosciences/grass/grass-8.2.0-r3.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r5.ebuild
@@ -72,7 +72,7 @@ RDEPEND="
truetype? ( media-libs/freetype:2 )
X? (
dev-python/wxpython:4.0
- x11-libs/cairo[X,opengl?]
+ x11-libs/cairo[X]
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
diff --git a/sci-geosciences/grass/grass-8.2.0-r4.ebuild b/sci-geosciences/grass/grass-8.2.0-r6.ebuild
similarity index 99%
rename from sci-geosciences/grass/grass-8.2.0-r4.ebuild
rename to sci-geosciences/grass/grass-8.2.0-r6.ebuild
index c3cb5275fec2..2439b5ce2439 100644
--- a/sci-geosciences/grass/grass-8.2.0-r4.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r6.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
truetype? ( media-libs/freetype:2 )
X? (
dev-python/wxpython:4.0
- x11-libs/cairo[X,opengl?]
+ x11-libs/cairo[X]
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 85b945b7a22b..ed97dc748c64 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -74,7 +74,7 @@ RDEPEND="
truetype? ( media-libs/freetype:2 )
X? (
dev-python/wxpython:4.0
- x11-libs/cairo[X,opengl?]
+ x11-libs/cairo[X]
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-12-18 7:46 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-12-18 7:46 UTC (permalink / raw
To: gentoo-commits
commit: 5af756cf74c3848e541c9bd1fabbad0cb010bd74
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 07:42:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 07:46:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af756cf
sci-geosciences/grass: fix revbump order
Sorry for the noise. The script didn't get ordering right
in all cases.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/{grass-8.2.0-r2.ebuild => grass-8.2.0-r4.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r2.ebuild b/sci-geosciences/grass/grass-8.2.0-r4.ebuild
similarity index 100%
rename from sci-geosciences/grass/grass-8.2.0-r2.ebuild
rename to sci-geosciences/grass/grass-8.2.0-r4.ebuild
^ permalink raw reply [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-12-16 4:30 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-12-16 4:30 UTC (permalink / raw
To: gentoo-commits
commit: 99f8f1d4bcdef7f00ea96113fd615a8207ad0d00
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 04:24:34 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 04:29:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f8f1d4
sci-geosciences/grass: unrevbump 9999
Unintentional, was defect in script for libtiff revbumps (fixed already for next
time.)
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/{grass-9999-r1.ebuild => grass-9999.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999-r1.ebuild b/sci-geosciences/grass/grass-9999.ebuild
similarity index 100%
rename from sci-geosciences/grass/grass-9999-r1.ebuild
rename to sci-geosciences/grass/grass-9999.ebuild
^ permalink raw reply [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-12-16 1:40 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-12-16 1:40 UTC (permalink / raw
To: gentoo-commits
commit: 7b8b1ce137eb602bafe40515dbbe63a01e7d1256
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 01:31:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 01:38:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8b1ce1
sci-geosciences/grass: add media-libs/libtiff subslot dep
libtiff changed SONAME.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.0-r2.ebuild | 12 ++++++------
.../grass/{grass-8.2.0.ebuild => grass-8.2.0-r3.ebuild} | 10 +++++-----
.../grass/{grass-9999.ebuild => grass-9999-r1.ebuild} | 12 ++++++------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r2.ebuild b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
index 40184550c75b..b0256920d260 100644
--- a/sci-geosciences/grass/grass-8.2.0-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
')
sci-libs/gdal:=
sys-libs/gdbm:=
- sys-libs/ncurses:0=
+ sys-libs/ncurses:=
sci-libs/proj:=
sci-libs/xdrfile
sys-libs/zlib
@@ -65,12 +65,12 @@ RDEPEND="
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
opengl? ( virtual/opengl )
- pdal? ( >=sci-libs/pdal-2.0.0:0= )
- png? ( media-libs/libpng:0= )
+ pdal? ( >=sci-libs/pdal-2.0.0:= )
+ png? ( media-libs/libpng:= )
postgres? ( >=dev-db/postgresql-8.4:= )
- readline? ( sys-libs/readline:0= )
+ readline? ( sys-libs/readline:= )
sqlite? ( dev-db/sqlite:3 )
- tiff? ( media-libs/tiff:0= )
+ tiff? ( media-libs/tiff:= )
truetype? ( media-libs/freetype:2 )
X? (
dev-python/wxpython:4.0
@@ -81,7 +81,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
)
- zstd? ( app-arch/zstd )"
+ zstd? ( app-arch/zstd:= )"
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
BDEPEND="
diff --git a/sci-geosciences/grass/grass-8.2.0.ebuild b/sci-geosciences/grass/grass-8.2.0-r3.ebuild
similarity index 97%
rename from sci-geosciences/grass/grass-8.2.0.ebuild
rename to sci-geosciences/grass/grass-8.2.0-r3.ebuild
index b5338b1fef9b..659d40ae4b5a 100644
--- a/sci-geosciences/grass/grass-8.2.0.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r3.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
')
sci-libs/gdal:=
sys-libs/gdbm:=
- sys-libs/ncurses:0=
+ sys-libs/ncurses:=
sci-libs/proj:=
sci-libs/xdrfile
sys-libs/zlib
@@ -64,11 +64,11 @@ RDEPEND="
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0= )
+ png? ( media-libs/libpng:= )
postgres? ( >=dev-db/postgresql-8.4:= )
- readline? ( sys-libs/readline:0= )
+ readline? ( sys-libs/readline:= )
sqlite? ( dev-db/sqlite:3 )
- tiff? ( media-libs/tiff:0= )
+ tiff? ( media-libs/tiff:= )
truetype? ( media-libs/freetype:2 )
X? (
dev-python/wxpython:4.0
@@ -79,7 +79,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
)
- zstd? ( app-arch/zstd )"
+ zstd? ( app-arch/zstd:= )"
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
BDEPEND="
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999-r1.ebuild
similarity index 97%
rename from sci-geosciences/grass/grass-9999.ebuild
rename to sci-geosciences/grass/grass-9999-r1.ebuild
index f104afc0e3a8..3b2547db0e11 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
')
sci-libs/gdal:=
sys-libs/gdbm:=
- sys-libs/ncurses:0=
+ sys-libs/ncurses:=
sci-libs/proj:=
sci-libs/xdrfile
sys-libs/zlib
@@ -65,12 +65,12 @@ RDEPEND="
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
opengl? ( virtual/opengl )
- pdal? ( >=sci-libs/pdal-2.0.0:0= )
- png? ( media-libs/libpng:0= )
+ pdal? ( >=sci-libs/pdal-2.0.0:= )
+ png? ( media-libs/libpng:= )
postgres? ( >=dev-db/postgresql-8.4:= )
- readline? ( sys-libs/readline:0= )
+ readline? ( sys-libs/readline:= )
sqlite? ( dev-db/sqlite:3 )
- tiff? ( media-libs/tiff:0= )
+ tiff? ( media-libs/tiff:= )
truetype? ( media-libs/freetype:2 )
X? (
dev-python/wxpython:4.0
@@ -81,7 +81,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
)
- zstd? ( app-arch/zstd )"
+ zstd? ( app-arch/zstd:= )"
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
BDEPEND="
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-11-18 8:23 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2022-11-18 8:23 UTC (permalink / raw
To: gentoo-commits
commit: f0a989860180ae3ff1a05c08d935e6afc2e373be
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Mon Oct 31 10:17:51 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 08:22:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a98986
sci-geosciences/grass: remove unused compilation configuration --with-wxwidgets option
Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/28050
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.0-r2.ebuild | 12 ++----------
sci-geosciences/grass/grass-8.2.0.ebuild | 12 ++----------
sci-geosciences/grass/grass-9999.ebuild | 12 ++----------
3 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r2.ebuild b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
index 284209a9365c..40184550c75b 100644
--- a/sci-geosciences/grass/grass-8.2.0-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
@@ -5,9 +5,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite" # bug 572440
-WX_GTK_VER="3.0-gtk3"
-inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg
+inherit desktop 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/"
@@ -154,11 +153,6 @@ src_prepare() {
}
src_configure() {
- if use X; then
- local WX_BUILD=yes
- setup-wxwidgets
- fi
-
addwrite /dev/dri/renderD128
local myeconfargs=(
@@ -192,7 +186,6 @@ src_configure() {
$(use_with opencl)
$(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
$(use_with las 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)
@@ -265,8 +258,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
if use X; then
- local GUI="-gui"
- [[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+ local GUI="--gui"
make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
doicon -s 48 gui/icons/${PN}-48x48.png
fi
diff --git a/sci-geosciences/grass/grass-8.2.0.ebuild b/sci-geosciences/grass/grass-8.2.0.ebuild
index 2fa97add74b3..b5338b1fef9b 100644
--- a/sci-geosciences/grass/grass-8.2.0.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0.ebuild
@@ -5,9 +5,8 @@ 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
+inherit autotools desktop 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/"
@@ -148,11 +147,6 @@ src_prepare() {
}
src_configure() {
- if use X; then
- local WX_BUILD=yes
- setup-wxwidgets
- fi
-
addwrite /dev/dri/renderD128
local myeconfargs=(
@@ -185,7 +179,6 @@ src_configure() {
$(use_with openmp)
$(use_with opencl)
$(use_with las 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)
@@ -258,8 +251,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
if use X; then
- local GUI="-gui"
- [[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+ local GUI="--gui"
make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
doicon -s 48 gui/icons/${PN}-48x48.png
fi
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 1746efefa7c6..f104afc0e3a8 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -5,9 +5,8 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite" # bug 572440
-WX_GTK_VER="3.0-gtk3"
-inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg
+inherit desktop 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/"
@@ -149,11 +148,6 @@ src_prepare() {
}
src_configure() {
- if use X; then
- local WX_BUILD=yes
- setup-wxwidgets
- fi
-
addwrite /dev/dri/renderD128
local myeconfargs=(
@@ -187,7 +181,6 @@ src_configure() {
$(use_with opencl)
$(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
$(use_with las 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)
@@ -260,8 +253,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
if use X; then
- local GUI="-gui"
- [[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+ local GUI="--gui"
make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
doicon -s 48 gui/icons/${PN}-48x48.png
fi
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-10-12 23:32 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-10-12 23:32 UTC (permalink / raw
To: gentoo-commits
commit: a7205f326221890117447f9214188e236e762120
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Oct 12 16:34:16 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 23:24:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7205f32
sci-geosciences/grass: remove obsolete warning
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27753
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.0-r2.ebuild | 2 --
sci-geosciences/grass/grass-8.2.0.ebuild | 2 --
sci-geosciences/grass/grass-9999.ebuild | 4 +---
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r2.ebuild b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
index fe41dd56ef63..284209a9365c 100644
--- a/sci-geosciences/grass/grass-8.2.0-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
@@ -281,8 +281,6 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
pkg_postinst() {
use X && xdg_pkg_postinst
- ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
- ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
}
pkg_postrm() {
diff --git a/sci-geosciences/grass/grass-8.2.0.ebuild b/sci-geosciences/grass/grass-8.2.0.ebuild
index 6edce360ce6a..2fa97add74b3 100644
--- a/sci-geosciences/grass/grass-8.2.0.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0.ebuild
@@ -274,8 +274,6 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
pkg_postinst() {
use X && xdg_pkg_postinst
- ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
- ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
}
pkg_postrm() {
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 7b5ec1408e74..1746efefa7c6 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -20,8 +20,8 @@ MY_PM="${MY_PM/.}"
if [[ ${PV} =~ "9999" ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
SLOT="0/8.3"
+ EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
else
MY_P="${P/_rc/RC}"
SLOT="0/$(ver_cut 1-2 ${PV})"
@@ -276,8 +276,6 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
pkg_postinst() {
use X && xdg_pkg_postinst
- ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
- ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-10-09 18:29 Andreas Sturmlechner
0 siblings, 0 replies; 129+ messages in thread
From: Andreas Sturmlechner @ 2022-10-09 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 8ea7589d7b3ae942069a243393d05a2fd7e566f9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 13:43:05 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 18:29:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea7589d
sci-geosciences/grass: drop 7.8.6-r1, 7.8.7, 7.8.7-r2, 8.0.2, 8.0.2-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/grass/Manifest | 3 -
sci-geosciences/grass/grass-7.8.6-r1.ebuild | 270 --------------------------
sci-geosciences/grass/grass-7.8.7-r2.ebuild | 275 --------------------------
sci-geosciences/grass/grass-7.8.7.ebuild | 269 --------------------------
sci-geosciences/grass/grass-8.0.2-r2.ebuild | 290 ----------------------------
sci-geosciences/grass/grass-8.0.2.ebuild | 283 ---------------------------
sci-geosciences/grass/metadata.xml | 1 -
7 files changed, 1391 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 745b3b8081b9..3e0f3220fd5c 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,4 +1 @@
-DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
-DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
-DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 496dab376b38c74d2206096f8b1bf848888c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f SHA512 fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c
DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930
diff --git a/sci-geosciences/grass/grass-7.8.6-r1.ebuild b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
deleted file mode 100644
index c751961cabf0..000000000000
--- a/sci-geosciences/grass/grass-7.8.6-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-WANT_AUTOCONF="2.5"
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop python-single-r1 toolchain-funcs 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.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 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
- 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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-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
- 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/${MY_PM} || 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/${MY_PM} || die
-
- # set proper GISDBASE directory path in the demolocation .grassrc78 file
- sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
- -i "${ED}"${gisbase}/demolocation/.grassrc78 || 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 "${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/grass-7.8.7-r2.ebuild b/sci-geosciences/grass/grass-7.8.7-r2.ebuild
deleted file mode 100644
index 743e945bef6c..000000000000
--- a/sci-geosciences/grass/grass-7.8.7-r2.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# 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 desktop python-single-r1 toolchain-funcs 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.8.0"
-KEYWORDS="amd64 ~x86"
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp pdal 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
- 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 )
- pdal? ( <sci-libs/pdal-2.4.0:0= )
- 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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-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() {
- 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 pdal pdal "${EPREFIX}"/usr/bin/pdal-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 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/${MY_PM} || 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/${MY_PM} || die
-
- # set proper GISDBASE directory path in the demolocation .grassrc78 file
- sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
- -i "${ED}"${gisbase}/demolocation/.grassrc78 || 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 "${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/grass-7.8.7.ebuild b/sci-geosciences/grass/grass-7.8.7.ebuild
deleted file mode 100644
index eeef656e6c64..000000000000
--- a/sci-geosciences/grass/grass-7.8.7.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop python-single-r1 toolchain-funcs 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.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 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
- 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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-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
- 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/${MY_PM} || 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/${MY_PM} || die
-
- # set proper GISDBASE directory path in the demolocation .grassrc78 file
- sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
- -i "${ED}"${gisbase}/demolocation/.grassrc78 || 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 "${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/grass-8.0.2-r2.ebuild b/sci-geosciences/grass/grass-8.0.2-r2.ebuild
deleted file mode 100644
index f9b386382977..000000000000
--- a/sci-geosciences/grass/grass-8.0.2-r2.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# 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 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"
-
-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"
- SLOT="0/8.1"
-else
- MY_P="${P/_rc/RC}"
- SLOT="0/$(ver_cut 1-2 ${PV})"
- SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
- if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="amd64 ~x86"
- fi
-
- S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal 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(+)] )
- 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:0= )
- 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"
-)
-
-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() {
- 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 pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
- $(use_with las 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
- ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
- ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
-}
-
-pkg_postrm() {
- use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/grass-8.0.2.ebuild b/sci-geosciences/grass/grass-8.0.2.ebuild
deleted file mode 100644
index ff4658b5ba17..000000000000
--- a/sci-geosciences/grass/grass-8.0.2.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# 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 las 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(+)] )
- las? ( 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"
-)
-
-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 las 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
- ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
- ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
-}
-
-pkg_postrm() {
- use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 5d58259db818..f34cf7145499 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -20,7 +20,6 @@
</longdescription>
<use>
<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag>
- <flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
<flag name="las">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
<flag name="opencl">Enable OpenCL support</flag>
<flag name="pdal">Enable support for PDAL for point clouds via <pkg>sci-libs/pdal</pkg></flag>
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-09-28 6:31 Jakov Smolić
0 siblings, 0 replies; 129+ messages in thread
From: Jakov Smolić @ 2022-09-28 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 21ab50ec310dfb205db3c791178fc0a94fe8e1fb
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 06:30:43 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 06:30:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ab50ec
sci-geosciences/grass: Stabilize 7.8.7-r2 amd64, #873229
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-geosciences/grass/grass-7.8.7-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.8.7-r2.ebuild b/sci-geosciences/grass/grass-7.8.7-r2.ebuild
index 2055352416fa..743e945bef6c 100644
--- a/sci-geosciences/grass/grass-7.8.7-r2.ebuild
+++ b/sci-geosciences/grass/grass-7.8.7-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-09-28 6:31 Jakov Smolić
0 siblings, 0 replies; 129+ messages in thread
From: Jakov Smolić @ 2022-09-28 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 479067c62076b264c058000edd7f23cee7bfe4f2
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 06:30:44 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 06:30:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479067c6
sci-geosciences/grass: Stabilize 8.0.2-r2 amd64, #873229
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.2-r2.ebuild b/sci-geosciences/grass/grass-8.0.2-r2.ebuild
index 64fdec42f03c..f9b386382977 100644
--- a/sci-geosciences/grass/grass-8.0.2-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.0.2-r2.ebuild
@@ -27,7 +27,7 @@ else
SLOT="0/$(ver_cut 1-2 ${PV})"
SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-09-28 6:31 Jakov Smolić
0 siblings, 0 replies; 129+ messages in thread
From: Jakov Smolić @ 2022-09-28 6:31 UTC (permalink / raw
To: gentoo-commits
commit: e76c35e5932533a6935a343ddb14cf6f055cf220
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 06:30:45 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 06:30:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76c35e5
sci-geosciences/grass: Stabilize 8.2.0-r2 amd64, #873229
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r2.ebuild b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
index 71dfdbf59d7f..fe41dd56ef63 100644
--- a/sci-geosciences/grass/grass-8.2.0-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
@@ -27,7 +27,7 @@ else
SLOT="0/$(ver_cut 1-2 ${PV})"
SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-08-27 10:53 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-08-27 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 99201b14faf305a88326bbb59343cc4e3b272d1c
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat Aug 27 08:04:49 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 10:52:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99201b14
sci-geosciences/grass: don't call eautoreconf
Upstream have their own header which autoheader conflicts
with. Just use the dist tarball's build system files instead.
Closes: https://bugs.gentoo.org/866554
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27030
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../grass/{grass-7.8.7-r1.ebuild => grass-7.8.7-r2.ebuild} | 8 ++++++--
.../grass/{grass-8.0.2-r1.ebuild => grass-8.0.2-r2.ebuild} | 8 ++++++--
.../grass/{grass-8.2.0-r1.ebuild => grass-8.2.0-r2.ebuild} | 8 ++++++--
sci-geosciences/grass/grass-9999.ebuild | 8 ++++++--
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.8.7-r1.ebuild b/sci-geosciences/grass/grass-7.8.7-r2.ebuild
similarity index 96%
rename from sci-geosciences/grass/grass-7.8.7-r1.ebuild
rename to sci-geosciences/grass/grass-7.8.7-r2.ebuild
index d254c88caf17..2055352416fa 100644
--- a/sci-geosciences/grass/grass-7.8.7-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.8.7-r2.ebuild
@@ -7,7 +7,7 @@ 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
+inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg
MY_PM=${PN}$(ver_cut 1-2 ${PV})
MY_PM=${MY_PM/.}
@@ -116,7 +116,11 @@ src_prepare() {
sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
default
- eautoreconf
+
+ # 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}"
diff --git a/sci-geosciences/grass/grass-8.0.2-r1.ebuild b/sci-geosciences/grass/grass-8.0.2-r2.ebuild
similarity index 96%
rename from sci-geosciences/grass/grass-8.0.2-r1.ebuild
rename to sci-geosciences/grass/grass-8.0.2-r2.ebuild
index 4bb9a92f3ba1..64fdec42f03c 100644
--- a/sci-geosciences/grass/grass-8.0.2-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.2-r2.ebuild
@@ -7,7 +7,7 @@ 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
+inherit 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/"
@@ -129,7 +129,11 @@ src_prepare() {
sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
default
- eautoreconf
+
+ # 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}"
diff --git a/sci-geosciences/grass/grass-8.2.0-r1.ebuild b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
similarity index 96%
rename from sci-geosciences/grass/grass-8.2.0-r1.ebuild
rename to sci-geosciences/grass/grass-8.2.0-r2.ebuild
index 581cd7fa78cb..71dfdbf59d7f 100644
--- a/sci-geosciences/grass/grass-8.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r2.ebuild
@@ -7,7 +7,7 @@ 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
+inherit 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/"
@@ -129,7 +129,11 @@ src_prepare() {
sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
default
- eautoreconf
+
+ # 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}"
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 8b286969e78a..7b5ec1408e74 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -7,7 +7,7 @@ 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
+inherit 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/"
@@ -124,7 +124,11 @@ src_prepare() {
sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die
default
- eautoreconf
+
+ # 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}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-07-15 1:56 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-07-15 1:56 UTC (permalink / raw
To: gentoo-commits
commit: 2514ba75cc3dec365f87e90d0eabef6b5b88bee8
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Jul 1 12:13:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 01:48:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2514ba75
sci-geosciences/grass: add support for sci-libs/pdal
Closes: https://bugs.gentoo.org/855509
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/26186
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{grass-9999.ebuild => grass-7.8.7-r1.ebuild} | 55 ++++++++++------------
.../{grass-9999.ebuild => grass-8.0.2-r1.ebuild} | 14 ++++--
.../{grass-9999.ebuild => grass-8.2.0-r1.ebuild} | 14 ++++--
sci-geosciences/grass/grass-9999.ebuild | 7 ++-
sci-geosciences/grass/metadata.xml | 1 +
5 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-7.8.7-r1.ebuild
similarity index 86%
copy from sci-geosciences/grass/grass-9999.ebuild
copy to sci-geosciences/grass/grass-7.8.7-r1.ebuild
index 33808453c9c7..d254c88caf17 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-7.8.7-r1.ebuild
@@ -9,30 +9,18 @@ WX_GTK_VER="3.0-gtk3"
inherit autotools desktop python-single-r1 toolchain-funcs 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/8.3"
-
-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 las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
+SLOT="0/7.8.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
opengl? ( X )"
@@ -50,8 +38,6 @@ RDEPEND="
sci-libs/proj:=
sci-libs/xdrfile
sys-libs/zlib
- media-libs/libglvnd
- media-libs/glu
blas? (
virtual/cblas[eselect-ldso(+)]
virtual/blas[eselect-ldso(+)]
@@ -59,12 +45,13 @@ RDEPEND="
fftw? ( sci-libs/fftw:3.0= )
geos? ( sci-libs/geos:= )
lapack? ( virtual/lapack[eselect-ldso(+)] )
- las? ( sci-geosciences/liblas )
+ liblas? ( 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.4.0:0= )
png? ( media-libs/libpng:0= )
postgres? ( >=dev-db/postgresql-8.4:= )
readline? ( sys-libs/readline:0= )
@@ -90,6 +77,13 @@ BDEPEND="
virtual/pkgconfig
X? ( dev-lang/swig )"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-flock.patch"
+)
+
pkg_setup() {
if use lapack; then
local mylapack=$(eselect lapack show)
@@ -179,7 +173,8 @@ src_configure() {
$(use_with threads pthread)
$(use_with openmp)
$(use_with opencl)
- $(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
+ $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-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)
@@ -236,7 +231,7 @@ src_install() {
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
+ -i "${ED}"/usr/bin/${MY_PM} || die
# get proper fonts path for fontcap
sed -i \
@@ -246,16 +241,16 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
# set proper python interpreter
sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
- -i "${ED}"/usr/bin/grass || die
+ -i "${ED}"/usr/bin/${MY_PM} || die
- # set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
+ # set proper GISDBASE directory path in the demolocation .grassrc78 file
sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
- -i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
+ -i "${ED}"${gisbase}/demolocation/.grassrc78 || 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"
+ make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
doicon -s 48 gui/icons/${PN}-48x48.png
fi
@@ -269,8 +264,6 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
pkg_postinst() {
use X && xdg_pkg_postinst
- ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
- ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
}
pkg_postrm() {
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.0.2-r1.ebuild
similarity index 95%
copy from sci-geosciences/grass/grass-9999.ebuild
copy to sci-geosciences/grass/grass-8.0.2-r1.ebuild
index 33808453c9c7..4bb9a92f3ba1 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-8.0.2-r1.ebuild
@@ -13,7 +13,6 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu
HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
-SLOT="0/8.3"
GVERSION=${SLOT#*/}
MY_PM="${PN}${GVERSION}"
@@ -22,17 +21,19 @@ MY_PM="${MY_PM/.}"
if [[ ${PV} =~ "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
+ SLOT="0/8.1"
else
MY_P="${P/_rc/RC}"
+ SLOT="0/$(ver_cut 1-2 ${PV})"
SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
fi
-IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
+IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
opengl? ( X )"
@@ -65,6 +66,7 @@ RDEPEND="
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
opengl? ( virtual/opengl )
+ pdal? ( >=sci-libs/pdal-2.0.0:0= )
png? ( media-libs/libpng:0= )
postgres? ( >=dev-db/postgresql-8.4:= )
readline? ( sys-libs/readline:0= )
@@ -90,6 +92,11 @@ BDEPEND="
virtual/pkgconfig
X? ( dev-lang/swig )"
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-flock.patch"
+)
+
pkg_setup() {
if use lapack; then
local mylapack=$(eselect lapack show)
@@ -179,6 +186,7 @@ src_configure() {
$(use_with threads pthread)
$(use_with openmp)
$(use_with opencl)
+ $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
$(use_with X wxwidgets "${WX_CONFIG}")
$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.2.0-r1.ebuild
similarity index 95%
copy from sci-geosciences/grass/grass-9999.ebuild
copy to sci-geosciences/grass/grass-8.2.0-r1.ebuild
index 33808453c9c7..581cd7fa78cb 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r1.ebuild
@@ -13,7 +13,6 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu
HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
-SLOT="0/8.3"
GVERSION=${SLOT#*/}
MY_PM="${PN}${GVERSION}"
@@ -21,18 +20,20 @@ MY_PM="${MY_PM/.}"
if [[ ${PV} =~ "9999" ]]; then
inherit git-r3
+ SLOT="0/8.3"
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
else
MY_P="${P/_rc/RC}"
+ SLOT="0/$(ver_cut 1-2 ${PV})"
SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
fi
-IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
+IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
opengl? ( X )"
@@ -65,6 +66,7 @@ RDEPEND="
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
opengl? ( virtual/opengl )
+ pdal? ( >=sci-libs/pdal-2.0.0:0= )
png? ( media-libs/libpng:0= )
postgres? ( >=dev-db/postgresql-8.4:= )
readline? ( sys-libs/readline:0= )
@@ -90,6 +92,11 @@ BDEPEND="
virtual/pkgconfig
X? ( dev-lang/swig )"
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-flock.patch"
+)
+
pkg_setup() {
if use lapack; then
local mylapack=$(eselect lapack show)
@@ -179,6 +186,7 @@ src_configure() {
$(use_with threads pthread)
$(use_with openmp)
$(use_with opencl)
+ $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
$(use_with X wxwidgets "${WX_CONFIG}")
$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 33808453c9c7..8b286969e78a 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -13,7 +13,6 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu
HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
-SLOT="0/8.3"
GVERSION=${SLOT#*/}
MY_PM="${PN}${GVERSION}"
@@ -22,8 +21,10 @@ MY_PM="${MY_PM/.}"
if [[ ${PV} =~ "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
+ SLOT="0/8.3"
else
MY_P="${P/_rc/RC}"
+ SLOT="0/$(ver_cut 1-2 ${PV})"
SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~amd64 ~ppc ~x86"
@@ -32,7 +33,7 @@ else
S="${WORKDIR}/${MY_P}"
fi
-IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
+IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
opengl? ( X )"
@@ -65,6 +66,7 @@ RDEPEND="
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
opengl? ( virtual/opengl )
+ pdal? ( >=sci-libs/pdal-2.0.0:0= )
png? ( media-libs/libpng:0= )
postgres? ( >=dev-db/postgresql-8.4:= )
readline? ( sys-libs/readline:0= )
@@ -179,6 +181,7 @@ src_configure() {
$(use_with threads pthread)
$(use_with openmp)
$(use_with opencl)
+ $(use_with pdal pdal "${EPREFIX}"/usr/bin/pdal-config)
$(use_with las liblas "${EPREFIX}"/usr/bin/liblas-config)
$(use_with X wxwidgets "${WX_CONFIG}")
$(use_with netcdf netcdf "${EPREFIX}"/usr/bin/nc-config)
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 66b650a3707b..5d58259db818 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -23,6 +23,7 @@
<flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
<flag name="las">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
<flag name="opencl">Enable OpenCL support</flag>
+ <flag name="pdal">Enable support for PDAL for point clouds via <pkg>sci-libs/pdal</pkg></flag>
</use>
<upstream>
<remote-id type="github">OSGeo/grass</remote-id>
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-07-07 19:44 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-07-07 19:44 UTC (permalink / raw
To: gentoo-commits
commit: b3a23b9b590ee247253f02a6a17348e834a26127
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 7 19:43:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 7 19:43:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a23b9b
sci-geosciences/grass: Stabilize 8.2.0 amd64, #856862
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.2.0.ebuild b/sci-geosciences/grass/grass-8.2.0.ebuild
index 3ccc3349178a..6edce360ce6a 100644
--- a/sci-geosciences/grass/grass-8.2.0.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0.ebuild
@@ -26,7 +26,7 @@ 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"
+ KEYWORDS="amd64 ~ppc x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-07-07 19:44 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-07-07 19:44 UTC (permalink / raw
To: gentoo-commits
commit: db2fa8d3e7df4d71eae1b4e426e6ce55207fc475
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 7 19:42:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 7 19:43:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db2fa8d3
sci-geosciences/grass: Stabilize 8.2.0 x86, #856862
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.2.0.ebuild b/sci-geosciences/grass/grass-8.2.0.ebuild
index d326298a52b2..3ccc3349178a 100644
--- a/sci-geosciences/grass/grass-8.2.0.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0.ebuild
@@ -26,7 +26,7 @@ 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"
+ KEYWORDS="~amd64 ~ppc x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-06-15 18:17 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-06-15 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 05075cc2157a25d52ba0df005567873e8aa32bc9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 18:17:07 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 18:17:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05075cc2
sci-geosciences/grass: Stabilize 8.0.2 amd64, #852011
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.2.ebuild b/sci-geosciences/grass/grass-8.0.2.ebuild
index 79ce1434cfd3..ff4658b5ba17 100644
--- a/sci-geosciences/grass/grass-8.0.2.ebuild
+++ b/sci-geosciences/grass/grass-8.0.2.ebuild
@@ -26,7 +26,7 @@ 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"
+ KEYWORDS="amd64 ~ppc x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-06-15 9:46 Jakov Smolić
0 siblings, 0 replies; 129+ messages in thread
From: Jakov Smolić @ 2022-06-15 9:46 UTC (permalink / raw
To: gentoo-commits
commit: 02ec45e88a8d05427c7ff3ff24e4c74b7feaf24d
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 09:46:19 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 09:46:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ec45e8
sci-geosciences/grass: Stabilize 8.0.2 x86, #852011
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.2.ebuild b/sci-geosciences/grass/grass-8.0.2.ebuild
index bda087019d91..79ce1434cfd3 100644
--- a/sci-geosciences/grass/grass-8.0.2.ebuild
+++ b/sci-geosciences/grass/grass-8.0.2.ebuild
@@ -26,7 +26,7 @@ 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"
+ KEYWORDS="~amd64 ~ppc x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-06-04 3:58 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-06-04 3:58 UTC (permalink / raw
To: gentoo-commits
commit: 4f754696082002eb5a4debed1b0b61e4404246cb
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Jun 3 21:19:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 03:27:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f754696
sci-geosciences/grass: version bump 8.2.0
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/25744
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-8.2.0.ebuild | 283 +++++++++++++++++++++++++++++++
2 files changed, 284 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index cd51431391bf..4fa939f09a8e 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -2,3 +2,4 @@ DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8
DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 496dab376b38c74d2206096f8b1bf848888c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f SHA512 fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c
+DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930
diff --git a/sci-geosciences/grass/grass-8.2.0.ebuild b/sci-geosciences/grass/grass-8.2.0.ebuild
new file mode 100644
index 000000000000..d326298a52b2
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.2.0.ebuild
@@ -0,0 +1,283 @@
+# 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.2"
+
+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 las 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(+)] )
+ las? ( 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"
+)
+
+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 las 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
+ ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
+ ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
+}
+
+pkg_postrm() {
+ use X && xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-05-22 20:08 Jakov Smolić
0 siblings, 0 replies; 129+ messages in thread
From: Jakov Smolić @ 2022-05-22 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 5655f2a150d97b0b105cdd78862b0fe983a5f296
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 20:08:40 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun May 22 20:08:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5655f2a1
sci-geosciences/grass: Stabilize 8.0.1-r1 x86, #846902
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
index d7b29b106ee8..3d92d0c246f7 100644
--- a/sci-geosciences/grass/grass-8.0.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
@@ -26,7 +26,7 @@ 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"
+ KEYWORDS="amd64 ~ppc x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-05-22 20:08 Jakov Smolić
0 siblings, 0 replies; 129+ messages in thread
From: Jakov Smolić @ 2022-05-22 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 1cbe8f536f5c7e5ac9eafdf47acf3280462ef50a
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 20:08:22 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun May 22 20:08:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbe8f53
sci-geosciences/grass: Stabilize 8.0.1-r1 amd64, #846902
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
index 92ed99c98cc2..d7b29b106ee8 100644
--- a/sci-geosciences/grass/grass-8.0.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
@@ -26,7 +26,7 @@ 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"
+ KEYWORDS="amd64 ~ppc ~x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-05-12 14:56 Andrew Ammerlaan
0 siblings, 0 replies; 129+ messages in thread
From: Andrew Ammerlaan @ 2022-05-12 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 5bdc6d89ee08ba95a7202ee153350464cd9e0727
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 14:48:20 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu May 12 14:56:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdc6d89
sci-geosciences/grass: add 8.0.2, liblas flag --> las
Now the flag name matches dev-games/openscenegraph,
added corresponding warning
Closes: https://bugs.gentoo.org/680854
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
.../grass/{grass-9999.ebuild => grass-8.0.2.ebuild} | 15 +++++++++++----
sci-geosciences/grass/grass-9999.ebuild | 8 +++++---
sci-geosciences/grass/metadata.xml | 1 +
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index fb06ff6d00f4..a0364e0e9b96 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -2,3 +2,4 @@ DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8
DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
+DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 496dab376b38c74d2206096f8b1bf848888c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f SHA512 fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.0.2.ebuild
similarity index 93%
copy from sci-geosciences/grass/grass-9999.ebuild
copy to sci-geosciences/grass/grass-8.0.2.ebuild
index f0e2a49326c0..bda087019d91 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-8.0.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu
HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
-SLOT="0/8.3"
+SLOT="0/8.0"
GVERSION=${SLOT#*/}
MY_PM="${PN}${GVERSION}"
@@ -32,7 +32,7 @@ else
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"
+IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
opengl? ( X )"
@@ -59,7 +59,7 @@ RDEPEND="
fftw? ( sci-libs/fftw:3.0= )
geos? ( sci-libs/geos:= )
lapack? ( virtual/lapack[eselect-ldso(+)] )
- liblas? ( sci-geosciences/liblas )
+ las? ( sci-geosciences/liblas )
mysql? ( dev-db/mysql-connector-c:= )
netcdf? ( sci-libs/netcdf:= )
odbc? ( dev-db/unixODBC )
@@ -90,6 +90,11 @@ BDEPEND="
virtual/pkgconfig
X? ( dev-lang/swig )"
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-flock.patch"
+)
+
pkg_setup() {
if use lapack; then
local mylapack=$(eselect lapack show)
@@ -179,7 +184,7 @@ src_configure() {
$(use_with threads pthread)
$(use_with openmp)
$(use_with opencl)
- $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
+ $(use_with las 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)
@@ -269,6 +274,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
pkg_postinst() {
use X && xdg_pkg_postinst
+ ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
+ ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
}
pkg_postrm() {
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index f0e2a49326c0..33808453c9c7 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -32,7 +32,7 @@ else
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"
+IUSE="blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
opengl? ( X )"
@@ -59,7 +59,7 @@ RDEPEND="
fftw? ( sci-libs/fftw:3.0= )
geos? ( sci-libs/geos:= )
lapack? ( virtual/lapack[eselect-ldso(+)] )
- liblas? ( sci-geosciences/liblas )
+ las? ( sci-geosciences/liblas )
mysql? ( dev-db/mysql-connector-c:= )
netcdf? ( sci-libs/netcdf:= )
odbc? ( dev-db/unixODBC )
@@ -179,7 +179,7 @@ src_configure() {
$(use_with threads pthread)
$(use_with openmp)
$(use_with opencl)
- $(use_with liblas liblas "${EPREFIX}"/usr/bin/liblas-config)
+ $(use_with las 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)
@@ -269,6 +269,8 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
pkg_postinst() {
use X && xdg_pkg_postinst
+ ewarn 'Starting with version 8.0.2 the "liblas" USE flag has been renamed'
+ ewarn 'to "las" in order to match dev-games/openscenegraph (Bug 680854)'
}
pkg_postrm() {
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 5114a3d95217..66b650a3707b 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -21,6 +21,7 @@
<use>
<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag>
<flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
+ <flag name="las">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
<flag name="opencl">Enable OpenCL support</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-05-12 14:56 Andrew Ammerlaan
0 siblings, 0 replies; 129+ messages in thread
From: Andrew Ammerlaan @ 2022-05-12 14:56 UTC (permalink / raw
To: gentoo-commits
commit: f3d70f239ea104f3151fead3a8037d7324bab0b0
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Sat May 7 04:13:08 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu May 12 14:56:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3d70f23
sci-geosciences/grass: bump dev version to 8.3
Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/25364
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 31ad3a913914..f0e2a49326c0 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizu
HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
-SLOT="0/8.1"
+SLOT="0/8.3"
GVERSION=${SLOT#*/}
MY_PM="${PN}${GVERSION}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-04-18 7:15 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-04-18 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 142921c229c89c2ece05f03f2eeebbaf6257028b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 07:14:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 07:15:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142921c2
sci-geosciences/grass: fix patch
Closes: https://bugs.gentoo.org/839072
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
index 81b7d01d2c77..92ed99c98cc2 100644
--- a/sci-geosciences/grass/grass-8.0.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
@@ -93,7 +93,7 @@ BDEPEND="
PATCHES=(
# bug 746590
"${FILESDIR}/${PN}-flock.patch"
- "${FILESDIR}/${PN}-lib_imagery.patch"
+ "${FILESDIR}/${P}-lib_imagery.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-04-06 6:32 Agostino Sarubbo
0 siblings, 0 replies; 129+ messages in thread
From: Agostino Sarubbo @ 2022-04-06 6:32 UTC (permalink / raw
To: gentoo-commits
commit: 30d5934b9c2e976162da277b3c933c3a74aea2ce
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 06:32:54 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 06:32:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d5934b
sci-geosciences/grass: x86 stable wrt bug #836849
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.1.ebuild b/sci-geosciences/grass/grass-8.0.1.ebuild
index 271aed05e3e5..f2a791cdcee7 100644
--- a/sci-geosciences/grass/grass-8.0.1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.1.ebuild
@@ -26,7 +26,7 @@ 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"
+ KEYWORDS="amd64 ~ppc x86"
fi
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-03-10 7:51 Jakov Smolić
0 siblings, 0 replies; 129+ messages in thread
From: Jakov Smolić @ 2022-03-10 7:51 UTC (permalink / raw
To: gentoo-commits
commit: 333ca925ba4e530e70b51cedbb330a616825e743
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 07:51:08 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 07:51:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=333ca925
sci-geosciences/grass: Stabilize 8.0.0 x86, #834841
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.0.ebuild b/sci-geosciences/grass/grass-8.0.0.ebuild
index 38213a36b890..3ab8a5a5d5f2 100644
--- a/sci-geosciences/grass/grass-8.0.0.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ~ppc x86"
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="
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-03-10 7:51 Jakov Smolić
0 siblings, 0 replies; 129+ messages in thread
From: Jakov Smolić @ 2022-03-10 7:51 UTC (permalink / raw
To: gentoo-commits
commit: dae04a45c2f931169d1cd396eb6497c37654118e
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 07:50:50 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 07:50:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae04a45
sci-geosciences/grass: Stabilize 8.0.0 amd64, #834841
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-8.0.0.ebuild b/sci-geosciences/grass/grass-8.0.0.ebuild
index 598e8b0ea52d..38213a36b890 100644
--- a/sci-geosciences/grass/grass-8.0.0.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0"
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ~ppc ~x86"
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="
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-02-26 2:29 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-02-26 2:29 UTC (permalink / raw
To: gentoo-commits
commit: 2ffabee7b66b17939f290a33324ec1bbfc91f913
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Feb 23 20:36:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 02:25:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffabee7
sci-geosciences/grass: version bump 7.8.7
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.8.7.ebuild | 269 +++++++++++++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 85de9606c6e5..4c2956704d54 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,3 @@
DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
+DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
diff --git a/sci-geosciences/grass/grass-7.8.7.ebuild b/sci-geosciences/grass/grass-7.8.7.ebuild
new file mode 100644
index 000000000000..eeef656e6c64
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.8.7.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools desktop python-single-r1 toolchain-funcs 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.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 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
+ 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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+ 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/${MY_PM} || 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/${MY_PM} || die
+
+ # set proper GISDBASE directory path in the demolocation .grassrc78 file
+ sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
+ -i "${ED}"${gisbase}/demolocation/.grassrc78 || 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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+ use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ use X && xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-02-26 2:29 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-02-26 2:29 UTC (permalink / raw
To: gentoo-commits
commit: c025a5cc57243c1b2304fb250af235b012a95a53
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Wed Feb 23 20:47:38 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 02:25:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c025a5cc
sci-geosciences/grass: version bump 8.0.1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/24332
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
.../{grass-9999.ebuild => grass-8.0.1.ebuild} | 31 +++++++++++++++++-----
sci-geosciences/grass/grass-9999.ebuild | 24 +++++++++++++----
3 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 4c2956704d54..fb06ff6d00f4 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,4 @@
DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
DIST grass-7.8.7.tar.gz 66333084 BLAKE2B 809daed6992838cd89b7f913c92bb588db05ae933c6e05b6fbd1add135dc36238260222f338df023c402b411b6c0338a56e06268d1fb736e9d9f6779bc2e4c42 SHA512 8c890b34a64c3a52285a8d99e2a2ec61b41de0258ae5b70d1876499988a9a8229925b82f4595df6b5cf21b77ecc8529feb75f765d4e92f324a734293dffc7303
DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
+DIST grass-8.0.1.tar.gz 64928098 BLAKE2B 81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc SHA512 ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-8.0.1.ebuild
similarity index 92%
copy from sci-geosciences/grass/grass-9999.ebuild
copy to sci-geosciences/grass/grass-8.0.1.ebuild
index d0b73c80b283..42780861df19 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-8.0.1.ebuild
@@ -3,21 +3,35 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite" # bug 572440
WX_GTK_VER="3.0-gtk3"
-inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
+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/"
-EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
LICENSE="GPL-2"
-SLOT="0/8.1"
+SLOT="0/8.0"
+
GVERSION=${SLOT#*/}
-MY_P="${PN}${GVERSION}"
-MY_PM="${MY_P/.}"
+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}
@@ -76,6 +90,11 @@ BDEPEND="
virtual/pkgconfig
X? ( dev-lang/swig )"
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-flock.patch"
+)
+
pkg_setup() {
if use lapack; then
local mylapack=$(eselect lapack show)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index d0b73c80b283..31ad3a913914 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,21 +3,35 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite" # bug 572440
WX_GTK_VER="3.0-gtk3"
-inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
+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/"
-EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
LICENSE="GPL-2"
SLOT="0/8.1"
+
GVERSION=${SLOT#*/}
-MY_P="${PN}${GVERSION}"
-MY_PM="${MY_P/.}"
+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}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-01-16 1:47 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-01-16 1:47 UTC (permalink / raw
To: gentoo-commits
commit: 07f7fc6cffd2f50c1b375efbcb97dcfea04cf427
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Thu Jan 13 09:12:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 01:46:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f7fc6c
sci-geosciences/grass: add GVERSION global var
Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/23769
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index b7c94db005af..d0b73c80b283 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -9,15 +9,15 @@ WX_GTK_VER="3.0-gtk3"
inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
-MY_P="${PN}8.1"
-MY_PM="${MY_P/.}"
-
DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
HOMEPAGE="https://grass.osgeo.org/"
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
LICENSE="GPL-2"
SLOT="0/8.1"
+GVERSION=${SLOT#*/}
+MY_P="${PN}${GVERSION}"
+MY_PM="${MY_P/.}"
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}
@@ -234,9 +234,9 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-i "${ED}"/usr/bin/grass || die
- # set proper GISDBASE directory path in the demolocation .grassrc80 file
+ # set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
- -i "${ED}"${gisbase}/demolocation/.grassrc81 || die
+ -i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
if use X; then
local GUI="-gui"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-01-16 1:47 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-01-16 1:47 UTC (permalink / raw
To: gentoo-commits
commit: 4587d9512263332f86ba567285baf13836ca534e
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat Jan 15 18:25:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 01:46:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4587d951
sci-geosciences/grass: version bump 8.0.0RC2
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/Manifest | 2 +-
.../grass/{grass-8.0.0_rc1.ebuild => grass-8.0.0_rc2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 6224a6231512..ff32202d3394 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,2 @@
DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
-DIST grass-8.0.0RC1.tar.gz 64800389 BLAKE2B b17282f8465bc62979867aa6a8402912901189dc8f9584aacb3b47553874e08fd98572aa34ad6885b5361246f4620775075cc6fcbad66a7e1bb7c6d9acd9196c SHA512 fe7497d362539c0e4241cfe5a98d7f79f8c3e7376f7a630f6aa260195bf8eb546d0b8821208255ae831da31de4dfe988bbdb5c89273ba6ebc0566d99a3c5e664
+DIST grass-8.0.0RC2.tar.gz 64942585 BLAKE2B fc7499def2029acb9b547c688eaaad986daae5c80b085bbe876d7bca4d4c7547867375edee752705e30ab215d0b8e0c7f017e94802a549569a525196bbd7bcb4 SHA512 9e624c54974e253dce1b93a0ce1c51eaa421d8baacdf61b03893d34c5cd36af76915ab035fb9bb78af4c16e1efc12bb501a707e335e312a12cf2c17a2b0d6f61
diff --git a/sci-geosciences/grass/grass-8.0.0_rc1.ebuild b/sci-geosciences/grass/grass-8.0.0_rc2.ebuild
similarity index 100%
rename from sci-geosciences/grass/grass-8.0.0_rc1.ebuild
rename to sci-geosciences/grass/grass-8.0.0_rc2.ebuild
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-01-16 1:47 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-01-16 1:47 UTC (permalink / raw
To: gentoo-commits
commit: 8b6d0b9aeadeacb39b7490798dd05304b235723d
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Thu Jan 13 07:26:38 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 01:46:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6d0b9a
sci-geosciences/grass: fix metadata long description
Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/metadata.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index b1f11eec9478..5114a3d95217 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -15,8 +15,8 @@
</maintainer>
<longdescription>
The original GIS, yes the first one, developed by the US
- Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation
- Project for more info http://grass.itc.it/gdp/index.php
+ Army Corp of Engineers, now an active free and open source GIS. See the GRASS Documentation
+ Project for more info https://grass.osgeo.org/.
</longdescription>
<use>
<flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag>
^ permalink raw reply related [flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-01-16 1:47 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-01-16 1:47 UTC (permalink / raw
To: gentoo-commits
commit: 13caada8dee3a528d79a6191df7a5597ed3ff2c7
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Thu Jan 13 07:30:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 01:46:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13caada8
sci-geosciences/grass: bump dev version to 8.1
Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 4e0eaf89a49f..b7c94db005af 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ WX_GTK_VER="3.0-gtk3"
inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
-MY_P="${PN}8.0"
+MY_P="${PN}8.1"
MY_PM="${MY_P/.}"
DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
@@ -17,7 +17,7 @@ HOMEPAGE="https://grass.osgeo.org/"
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
LICENSE="GPL-2"
-SLOT="0/8.0"
+SLOT="0/8.1"
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}
@@ -236,7 +236,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
# set proper GISDBASE directory path in the demolocation .grassrc80 file
sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
- -i "${ED}"${gisbase}/demolocation/.grassrc80 || die
+ -i "${ED}"${gisbase}/demolocation/.grassrc81 || die
if use X; then
local GUI="-gui"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-01-02 7:05 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-01-02 7:05 UTC (permalink / raw
To: gentoo-commits
commit: fc7f1aa7f52a1b0c3de1f0342802d871a3388450
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 2 07:04:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 07:05:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7f1aa7
sci-geosciences/grass: don't keyword RC version
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.0.0_rc1.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.0.0_rc1.ebuild b/sci-geosciences/grass/grass-8.0.0_rc1.ebuild
index 4fd4a64582bc..1a9dc30646ec 100644
--- a/sci-geosciences/grass/grass-8.0.0_rc1.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,9 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~ppc ~x86"
+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}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-01-02 7:05 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-01-02 7:05 UTC (permalink / raw
To: gentoo-commits
commit: 1d5d1d1083c35580ba71c0fe62d5b2582a0859a3
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Dec 30 20:29:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 07:02:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5d1d10
sci-geosciences/grass: update live ebuild
* add opengl use flag
* bump EAPI
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index e91faa8e4ab6..f2d4abfd423d 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="sqlite" # bug 572440
@@ -17,10 +17,11 @@ HOMEPAGE="https://grass.osgeo.org/"
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
LICENSE="GPL-2"
-SLOT="0/7.9"
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl openmp png postgres readline sqlite threads tiff truetype X zstd"
+SLOT="0/8.0"
+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}"
+ ${PYTHON_REQUIRED_USE}
+ opengl? ( X )"
RDEPEND="
${PYTHON_DEPS}
@@ -42,13 +43,14 @@ RDEPEND="
virtual/blas[eselect-ldso(+)]
)
fftw? ( sci-libs/fftw:3.0= )
- geos? ( sci-libs/geos )
+ 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= )
@@ -57,7 +59,7 @@ RDEPEND="
truetype? ( media-libs/freetype:2 )
X? (
dev-python/wxpython:4.0
- x11-libs/cairo[X,opengl]
+ x11-libs/cairo[X,opengl?]
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -150,6 +152,7 @@ src_configure() {
$(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)
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-01-02 7:05 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-01-02 7:05 UTC (permalink / raw
To: gentoo-commits
commit: ea8f17e7ca45c0eb1225cf2e2ded0207e9db4514
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Dec 30 20:30:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 07:02:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8f17e7
sci-geosciences/grass: rename binary
Upstream decided to drop the version number from the binary.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index f2d4abfd423d..4e0eaf89a49f 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -218,13 +218,11 @@ src_install() {
sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
done
- mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM} || die
-
# 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/${MY_PM} || die
+ -i "${ED}"/usr/bin/grass || die
# get proper fonts path for fontcap
sed -i \
@@ -234,7 +232,7 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
# set proper python interpreter
sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
- -i "${ED}"/usr/bin/${MY_PM} || die
+ -i "${ED}"/usr/bin/grass || die
# set proper GISDBASE directory path in the demolocation .grassrc80 file
sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
@@ -243,7 +241,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
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/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
doicon -s 48 gui/icons/${PN}-48x48.png
fi
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-01-02 7:05 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-01-02 7:05 UTC (permalink / raw
To: gentoo-commits
commit: 1828364baa48f3f236a14981ed4b6199e1a99741
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Dec 30 20:34:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 07:03:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1828364b
sci-geosciences/grass: version bump to 8.0.0_rc1
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/23592
Closes: https://github.com/gentoo/gentoo/pull/23338
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-8.0.0_rc1.ebuild | 271 +++++++++++++++++++++++++++
2 files changed, 272 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index fb08af1e1a26..6224a6231512 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
+DIST grass-8.0.0RC1.tar.gz 64800389 BLAKE2B b17282f8465bc62979867aa6a8402912901189dc8f9584aacb3b47553874e08fd98572aa34ad6885b5361246f4620775075cc6fcbad66a7e1bb7c6d9acd9196c SHA512 fe7497d362539c0e4241cfe5a98d7f79f8c3e7376f7a630f6aa260195bf8eb546d0b8821208255ae831da31de4dfe988bbdb5c89273ba6ebc0566d99a3c5e664
diff --git a/sci-geosciences/grass/grass-8.0.0_rc1.ebuild b/sci-geosciences/grass/grass-8.0.0_rc1.ebuild
new file mode 100644
index 000000000000..4fd4a64582bc
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.0.0_rc1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2021 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
+
+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/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 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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+ 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 .grassrc80 file
+ sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
+ -i "${ED}"${gisbase}/demolocation/.grassrc80 || 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
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2022-01-02 7:05 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2022-01-02 7:05 UTC (permalink / raw
To: gentoo-commits
commit: 4db707b07e1e3c905187a8023a0c255ab294d9a0
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Dec 30 20:48:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 2 07:02:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db707b0
sci-geosciences/grass: remove old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 -
sci-geosciences/grass/grass-7.8.5-r1.ebuild | 269 ----------------------------
2 files changed, 270 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index a899a616598a..fb08af1e1a26 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1 @@
-DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
diff --git a/sci-geosciences/grass/grass-7.8.5-r1.ebuild b/sci-geosciences/grass/grass-7.8.5-r1.ebuild
deleted file mode 100644
index d1341ec38da6..000000000000
--- a/sci-geosciences/grass/grass-7.8.5-r1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs 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.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 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
- 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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- # bug 746590
- "${FILESDIR}/${PN}-7.8-flock.patch"
- # bug 792801
- "${FILESDIR}/${PN}-7.8.5-bool.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="${ED}"/usr/$(get_libdir)/${MY_PM} \
- prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
- PREFIX="${ED}"/usr/ \
- 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/${MY_PM} || die
-
- # get proper fonts path for fontcap
- sed -i \
- -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
- "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
-
- # set proper python interpreter
- sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
-os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
- -i "${ED}"/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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
- use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
- use X && xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-12-28 22:00 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-12-28 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 6d94f3c48ee0aca4dc534a254ce8c98fcf694fac
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 21:58:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 22:00:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d94f3c4
sci-geosciences/grass: depend on netcdf subslot
need to be rebuilt when its subslot changes
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../grass/{grass-7.8.5.ebuild => grass-7.8.5-r1.ebuild} | 12 ++++++------
.../grass/{grass-7.8.6.ebuild => grass-7.8.6-r1.ebuild} | 10 +++++-----
sci-geosciences/grass/grass-9999.ebuild | 8 ++++----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5-r1.ebuild
similarity index 98%
rename from sci-geosciences/grass/grass-7.8.5.ebuild
rename to sci-geosciences/grass/grass-7.8.5-r1.ebuild
index 755437aec9cf..d1341ec38da6 100644
--- a/sci-geosciences/grass/grass-7.8.5.ebuild
+++ b/sci-geosciences/grass/grass-7.8.5-r1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
')
- sci-libs/gdal
- sys-libs/gdbm
+ sci-libs/gdal:=
+ sys-libs/gdbm:=
sys-libs/ncurses:0=
- sci-libs/proj
+ sci-libs/proj:=
sci-libs/xdrfile
sys-libs/zlib
blas? (
@@ -44,11 +44,11 @@ RDEPEND="
virtual/blas[eselect-ldso(+)]
)
fftw? ( sci-libs/fftw:3.0= )
- geos? ( sci-libs/geos )
+ geos? ( sci-libs/geos:= )
lapack? ( virtual/lapack[eselect-ldso(+)] )
liblas? ( sci-geosciences/liblas )
mysql? ( dev-db/mysql-connector-c:= )
- netcdf? ( sci-libs/netcdf )
+ netcdf? ( sci-libs/netcdf:= )
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
opengl? ( virtual/opengl )
@@ -67,7 +67,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
)
- zstd? ( app-arch/zstd )"
+ zstd? ( app-arch/zstd:= )"
DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )"
BDEPEND="
diff --git a/sci-geosciences/grass/grass-7.8.6.ebuild b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
similarity index 98%
rename from sci-geosciences/grass/grass-7.8.6.ebuild
rename to sci-geosciences/grass/grass-7.8.6-r1.ebuild
index 5f6717ab03ef..4332f826c81a 100644
--- a/sci-geosciences/grass/grass-7.8.6.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
')
- sci-libs/gdal
- sys-libs/gdbm
+ sci-libs/gdal:=
+ sys-libs/gdbm:=
sys-libs/ncurses:0=
- sci-libs/proj
+ sci-libs/proj:=
sci-libs/xdrfile
sys-libs/zlib
blas? (
@@ -44,11 +44,11 @@ RDEPEND="
virtual/blas[eselect-ldso(+)]
)
fftw? ( sci-libs/fftw:3.0= )
- geos? ( sci-libs/geos )
+ geos? ( sci-libs/geos:= )
lapack? ( virtual/lapack[eselect-ldso(+)] )
liblas? ( sci-geosciences/liblas )
mysql? ( dev-db/mysql-connector-c:= )
- netcdf? ( sci-libs/netcdf )
+ netcdf? ( sci-libs/netcdf:= )
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
opengl? ( virtual/opengl )
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 965bd4beb28c..e91faa8e4ab6 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -29,10 +29,10 @@ RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
')
- sci-libs/gdal
- sys-libs/gdbm
+ sci-libs/gdal:=
+ sys-libs/gdbm:=
sys-libs/ncurses:0=
- sci-libs/proj
+ sci-libs/proj:=
sci-libs/xdrfile
sys-libs/zlib
media-libs/libglvnd
@@ -46,7 +46,7 @@ RDEPEND="
lapack? ( virtual/lapack[eselect-ldso(+)] )
liblas? ( sci-geosciences/liblas )
mysql? ( dev-db/mysql-connector-c:= )
- netcdf? ( sci-libs/netcdf )
+ netcdf? ( sci-libs/netcdf:= )
odbc? ( dev-db/unixODBC )
opencl? ( virtual/opencl )
png? ( media-libs/libpng:0= )
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-12-09 16:24 Agostino Sarubbo
0 siblings, 0 replies; 129+ messages in thread
From: Agostino Sarubbo @ 2021-12-09 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 56660d30f89560d0aef103e7db06569e1c9e1a8a
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 16:24:29 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 16:24:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56660d30
sci-geosciences/grass: x86 stable wrt bug #828382
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sci-geosciences/grass/grass-7.8.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.8.6.ebuild b/sci-geosciences/grass/grass-7.8.6.ebuild
index 6f851f4ee8b5..5f6717ab03ef 100644
--- a/sci-geosciences/grass/grass-7.8.6.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.8.0"
-KEYWORDS="amd64 ~ppc ~x86"
+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 zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-12-07 7:26 Agostino Sarubbo
0 siblings, 0 replies; 129+ messages in thread
From: Agostino Sarubbo @ 2021-12-07 7:26 UTC (permalink / raw
To: gentoo-commits
commit: fb5ef2a279d2b97e77cbea3e322e4b5f1e92ad44
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 7 07:26:34 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 7 07:26:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb5ef2a2
sci-geosciences/grass: amd64 stable wrt bug #828382
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sci-geosciences/grass/grass-7.8.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.8.6.ebuild b/sci-geosciences/grass/grass-7.8.6.ebuild
index 3cb671b723e1..6f851f4ee8b5 100644
--- a/sci-geosciences/grass/grass-7.8.6.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+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 zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-10-20 2:42 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-10-20 2:42 UTC (permalink / raw
To: gentoo-commits
commit: 935ba7e0506b1709b0a47869bc54de1503766139
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Oct 10 16:40:41 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 02:23:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=935ba7e0
sci-geosciences/grass: version bump 7.8.6
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/22553
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.8.6.ebuild | 270 +++++++++++++++++++++++++++++++
2 files changed, 271 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 70795544ec0..a899a616598 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
+DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
diff --git a/sci-geosciences/grass/grass-7.8.6.ebuild b/sci-geosciences/grass/grass-7.8.6.ebuild
new file mode 100644
index 00000000000..3cb671b723e
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.8.6.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WANT_AUTOCONF="2.5"
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools desktop python-single-r1 toolchain-funcs 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.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 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
+ 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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-7.8-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
+ 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/${MY_PM} || 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/${MY_PM} || die
+
+ # set proper GISDBASE directory path in the demolocation .grassrc78 file
+ sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
+ -i "${ED}"${gisbase}/demolocation/.grassrc78 || 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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+ use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ use X && xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-10-20 2:42 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-10-20 2:42 UTC (permalink / raw
To: gentoo-commits
commit: a1ea2719b0460486b46f11a681995ee09694c585
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 02:36:45 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 02:36:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ea2719
sci-geosciences/grass: drop WANT_AUTOCONF from 9999
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 68ab67f5dad..965bd4beb28 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -5,7 +5,6 @@ EAPI=7
PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="sqlite" # bug 572440
-WANT_AUTOCONF="2.5"
WX_GTK_VER="3.0-gtk3"
inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-09-24 23:37 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-09-24 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 8bdbb56951d9747ae466f24bfac9930a59d04a40
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 24 23:37:12 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 23:37:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdbb569
sci-geosciences/grass: drop unused flag-o-matic from 9999
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 9c8670fef28..68ab67f5dad 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite" # bug 572440
WANT_AUTOCONF="2.5"
WX_GTK_VER="3.0-gtk3"
-inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
+inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
MY_P="${PN}8.0"
MY_PM="${MY_P/.}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-09-24 23:36 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-09-24 23:36 UTC (permalink / raw
To: gentoo-commits
commit: 2ccaae3b5887aa7fd4b402ea7ca77a8633ec6e49
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Fri Sep 24 12:22:58 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 23:35:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ccaae3b
sci-geosciences/grass: Fix search and replace "GRASS_PYTHON" variable
Fix search & replace "GRASS_PYTHON" shell environment variable
* GRASS GIS use Python Black code formatter tool (single quotation mark -> double quotation mark)
* fix error if you launch 'd.mon start=wx0' command: 'main.py: no python-exec wrapped executable found in /usr/lib/python-exec.'
Closes: https://github.com/gentoo/gentoo/pull/22333
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 96940103bfd..9c8670fef28 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -230,8 +230,8 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
"${ED}"${gisbase}/etc/fontcap || die
# set proper python interpreter
- sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
-os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
+ sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
+os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-i "${ED}"/usr/bin/${MY_PM} || die
# set proper GISDBASE directory path in the demolocation .grassrc80 file
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-09-24 23:36 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-09-24 23:36 UTC (permalink / raw
To: gentoo-commits
commit: e8cef9238270fcd394e032616ab9b9c3e420cdfc
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Sun Sep 19 15:17:35 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 23:34:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8cef923
sci-geosciences/grass: fix install version 9999 (changes from 7.9 dev version to 8.0)
Closes: https://bugs.gentoo.org/813879
Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index a77634827df..b0087078be5 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,14 +3,14 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="sqlite" # bug 572440
WANT_AUTOCONF="2.1"
WX_GTK_VER="3.0-gtk3"
inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
-MY_P="${PN}7.9"
+MY_P="${PN}8.0"
MY_PM="${MY_P/.}"
DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
@@ -216,6 +216,8 @@ src_install() {
sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
done
+ mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM}
+
# 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}\"):\
@@ -232,9 +234,9 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
-i "${ED}"/usr/bin/${MY_PM} || die
- # set proper GISDBASE directory path in the demolocation .grassrc79 file
+ # set proper GISDBASE directory path in the demolocation .grassrc80 file
sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
- -i "${ED}"${gisbase}/demolocation/.grassrc79 || die
+ -i "${ED}"${gisbase}/demolocation/.grassrc80 || die
if use X; then
local GUI="-gui"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-09-24 23:36 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-09-24 23:36 UTC (permalink / raw
To: gentoo-commits
commit: d13dc84528529b18de02c34bcd99afd1988a0061
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Fri Sep 24 12:19:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 23:35:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d13dc845
sci-geosciences/grass: Add missing OR condition
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index fd30b1deb55..96940103bfd 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -216,7 +216,7 @@ src_install() {
sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
done
- mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM}
+ mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM} || die
# get proper folder for grass path in script
local gisbase=/usr/$(get_libdir)/${MY_PM}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-09-24 23:36 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-09-24 23:36 UTC (permalink / raw
To: gentoo-commits
commit: 861c790f2beb2ea20f1e99535a64abcb3f7776cf
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Fri Sep 24 11:17:45 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 23:34:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=861c790f
sci-geosciences/grass: upgrade autoconf version >= 2.69
https://github.com/OSGeo/grass/commit/dca9364c64d7dac5b4ae9262f016708a97c979d7
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index b0087078be5..fd30b1deb55 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="sqlite" # bug 572440
-WANT_AUTOCONF="2.1"
+WANT_AUTOCONF="2.5"
WX_GTK_VER="3.0-gtk3"
inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-08-06 4:10 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-08-06 4:10 UTC (permalink / raw
To: gentoo-commits
commit: 9157469db72a8fad7d8f174f02a481ecec40df94
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 6 04:10:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 6 04:10:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9157469d
sci-geosciences/grass: add github upstream metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index e62b0339f08..28e7e4392ff 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -23,4 +23,7 @@
<flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
<flag name="opencl">Enable OpenCL support</flag>
</use>
+ <upstream>
+ <remote-id type="github">OSGeo/grass</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-05-29 17:47 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-05-29 17:47 UTC (permalink / raw
To: gentoo-commits
commit: 18663a5b35cceb93dee5aad6f26bd428120645ca
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 17:47:42 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 29 17:47:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18663a5b
sci-geosciences/grass: restore stable keywords
Fixes: d849efc7539748cecb34c3d6e69ca30e0a58f5b4
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-7.8.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild
index 7b96039d1d7..755437aec9c 100644
--- a/sci-geosciences/grass/grass-7.8.5.ebuild
+++ b/sci-geosciences/grass/grass-7.8.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+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 zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-03-08 7:35 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2021-03-08 7:35 UTC (permalink / raw
To: gentoo-commits
commit: d956b5866f1da4610846448a0b9b7965255f3c77
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 8 07:22:02 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 8 07:35:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d956b586
sci-geosciences/grass: drop 7.8.4
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 -
sci-geosciences/grass/grass-7.8.4.ebuild | 269 -------------------------------
2 files changed, 270 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 983f9b9086c..70795544ec0 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1 @@
-DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1
DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
diff --git a/sci-geosciences/grass/grass-7.8.4.ebuild b/sci-geosciences/grass/grass-7.8.4.ebuild
deleted file mode 100644
index 8b203f7441c..00000000000
--- a/sci-geosciences/grass/grass-7.8.4.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite" # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs 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.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 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
- 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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- # bug 746590
- "${FILESDIR}/${PN}-7.8-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
- 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
-
- eapply_user
-}
-
-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="${ED}"/usr/$(get_libdir)/${MY_PM} \
- prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
- PREFIX="${ED}"/usr/ \
- 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/${MY_PM} || die
-
- # get proper fonts path for fontcap
- sed -i \
- -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
- "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
-
- # set proper python interpreter
- sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
-os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
- -i "${ED}"/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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
-}
-
-pkg_postinst() {
- use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
- use X && xdg_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-03-07 19:46 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-03-07 19:46 UTC (permalink / raw
To: gentoo-commits
commit: c7c2508c439855fd38e77866a58f27846696417e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 7 19:44:57 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 19:44:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c2508c
sci-geosciences/grass: Stabilize 7.8.5 amd64, #774459
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-7.8.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild
index 8cf3e318437..eb00d1ab6a8 100644
--- a/sci-geosciences/grass/grass-7.8.5.ebuild
+++ b/sci-geosciences/grass/grass-7.8.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~ppc x86"
+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 zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-03-07 15:54 Thomas Deutschmann
0 siblings, 0 replies; 129+ messages in thread
From: Thomas Deutschmann @ 2021-03-07 15:54 UTC (permalink / raw
To: gentoo-commits
commit: edad018c38ae62fb5aefba75f3d0dac6fb884729
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 7 15:53:32 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 15:53:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edad018c
sci-geosciences/grass: x86 stable (bug #774459)
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sci-geosciences/grass/grass-7.8.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild
index d75683b80dc..8cf3e318437 100644
--- a/sci-geosciences/grass/grass-7.8.5.ebuild
+++ b/sci-geosciences/grass/grass-7.8.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+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 zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-03-07 15:17 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2021-03-07 15:17 UTC (permalink / raw
To: gentoo-commits
commit: 325c36bc2114d5111f8a82ba0813d4bc7de7abf2
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 7 15:15:44 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 15:17:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=325c36bc
sci-geosciences/grass: replace assignment to read-only variable
Bug: https://bugs.gentoo.org/774459
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index 70b94da0445..a77634827df 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -10,9 +10,8 @@ WX_GTK_VER="3.0-gtk3"
inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
-PV="7.9"
-MY_PM=${PN}$(ver_cut 1-2 ${PV})
-MY_PM=${MY_PM/.}
+MY_P="${PN}7.9"
+MY_PM="${MY_P/.}"
DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
HOMEPAGE="https://grass.osgeo.org/"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-03-06 14:07 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2021-03-06 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 9b5ccdb288795c917ed3843220d43a84e726d179
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Fri Mar 5 19:59:16 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 14:07:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b5ccdb2
sci-geosciences/grass: fix install version 9999 (7.9 dev)
Closes: https://bugs.gentoo.org/774330
Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/19785
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index b2455ab8dc8..70b94da0445 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -181,9 +181,8 @@ src_compile() {
src_install() {
emake DESTDIR="${ED}" \
- INST_DIR="${ED}"/usr/$(get_libdir)/${MY_PM} \
- prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
- PREFIX="${ED}"/usr/ \
+ INST_DIR=/usr/$(get_libdir)/${MY_PM} \
+ prefix=/usr/ BINDIR=/usr/bin \
install
pushd "${ED}"/usr/$(get_libdir)/${MY_PM} >/dev/null || die
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-02-14 14:28 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2021-02-14 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 95c6e2c58745cc79ffeb4cfab85523bc58f2099a
Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
AuthorDate: Fri Jan 22 16:03:49 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 14:28:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c6e2c5
sci-geosciences/grass: add version 9999 (7.9 dev)
Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/19160
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-geosciences/grass/grass-9999.ebuild | 262 ++++++++++++++++++++++++++++++++
1 file changed, 262 insertions(+)
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
new file mode 100644
index 00000000000..b2455ab8dc8
--- /dev/null
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WANT_AUTOCONF="2.1"
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
+
+PV="7.9"
+MY_PM=${PN}$(ver_cut 1-2 ${PV})
+MY_PM=${MY_PM/.}
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="https://grass.osgeo.org/"
+EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
+
+LICENSE="GPL-2"
+SLOT="0/7.9"
+IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl openmp png postgres readline sqlite threads tiff truetype X zstd"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}"
+
+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 )
+ 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 )"
+
+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 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="${ED}"/usr/$(get_libdir)/${MY_PM} \
+ prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
+ PREFIX="${ED}"/usr/ \
+ 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/${MY_PM} || 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/${MY_PM} || die
+
+ # set proper GISDBASE directory path in the demolocation .grassrc79 file
+ sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
+ -i "${ED}"${gisbase}/demolocation/.grassrc79 || 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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+ use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ use X && xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-01-20 14:13 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2021-01-20 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 8f11c6038f858cc6ae60df12ee37f0bc0b462fb5
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Mon Dec 21 20:04:49 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 14:13:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f11c603
sci-geosciences/grass: version bump 7.8.5
Package-Manager: Portage-3.0.9, Repoman-3.0.2
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-7.8.5.ebuild | 267 +++++++++++++++++++++++++++++++
2 files changed, 268 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ace40911202..983f9b9086c 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1
+DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
diff --git a/sci-geosciences/grass/grass-7.8.5.ebuild b/sci-geosciences/grass/grass-7.8.5.ebuild
new file mode 100644
index 00000000000..93a559c4a1e
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.8.5.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WANT_AUTOCONF="2.1"
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs 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.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 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
+ 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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-7.8-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
+ 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="${ED}"/usr/$(get_libdir)/${MY_PM} \
+ prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
+ PREFIX="${ED}"/usr/ \
+ 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/${MY_PM} || die
+
+ # get proper fonts path for fontcap
+ sed -i \
+ -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
+ "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
+
+ # set proper python interpreter
+ sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
+os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
+ -i "${ED}"/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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+ use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ use X && xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2021-01-06 6:34 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2021-01-06 6:34 UTC (permalink / raw
To: gentoo-commits
commit: 303a921f23fc7394c60d24f5db93b09c7c8a4254
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 06:33:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 06:33:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303a921f
sci-geosciences/grass: Stabilize 7.8.4 x86, #762436
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-7.8.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.8.4.ebuild b/sci-geosciences/grass/grass-7.8.4.ebuild
index 25b4f871366..888ec0b7e1d 100644
--- a/sci-geosciences/grass/grass-7.8.4.ebuild
+++ b/sci-geosciences/grass/grass-7.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.8.0"
-KEYWORDS="amd64 ~ppc ~x86"
+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 zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2020-12-29 20:20 Sam James
0 siblings, 0 replies; 129+ messages in thread
From: Sam James @ 2020-12-29 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 47dbf9d95e1c1b06c6808c814183d78cebced242
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 20:20:32 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 20:20:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dbf9d9
sci-geosciences/grass: Stabilize 7.8.4 amd64, #762436
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-7.8.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.8.4.ebuild b/sci-geosciences/grass/grass-7.8.4.ebuild
index b2b81638ae3..25b4f871366 100644
--- a/sci-geosciences/grass/grass-7.8.4.ebuild
+++ b/sci-geosciences/grass/grass-7.8.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+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 zstd"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2020-11-25 8:16 Joonas Niilola
0 siblings, 0 replies; 129+ messages in thread
From: Joonas Niilola @ 2020-11-25 8:16 UTC (permalink / raw
To: gentoo-commits
commit: 67768459cb8bcd7a8a2341b2697f0558afbd26d1
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat Oct 10 19:34:25 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 08:16:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67768459
sci-geosciences/grass: version bump 7.8.4
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/17879
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.8.4.ebuild | 269 +++++++++++++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 300f80c8a3e..93cc6b1b694 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
DIST grass-7.8.3.tar.gz 60292787 BLAKE2B e62fdeb5fa8cc64e59eff1a5cb33dbede7a62a30ed6ef08ced5d11e452e7b0109889105ae88ea28fb667b54fceca69729771eca6acf3e8d281487b1e53b1a3aa SHA512 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84
+DIST grass-7.8.4.tar.gz 61791074 BLAKE2B 9234ff11c9f780c350d26c94b92b1dd87e00b84cee857fd6c8d0abb4f5977871c936dbf6818f7ba174aff0b846b9a27417de4ea1edbd6f2a0b0ba65efe8a842a SHA512 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1
diff --git a/sci-geosciences/grass/grass-7.8.4.ebuild b/sci-geosciences/grass/grass-7.8.4.ebuild
new file mode 100644
index 00000000000..b2b81638ae3
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.8.4.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WANT_AUTOCONF="2.1"
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs 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.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 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
+ 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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-7.8-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
+ 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
+
+ eapply_user
+}
+
+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="${ED}"/usr/$(get_libdir)/${MY_PM} \
+ prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
+ PREFIX="${ED}"/usr/ \
+ 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/${MY_PM} || die
+
+ # get proper fonts path for fontcap
+ sed -i \
+ -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
+ "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
+
+ # set proper python interpreter
+ sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
+os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
+ -i "${ED}"/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 "${ED}" -name "*.tcl" -exec chmod +r-x '{}' \; || die
+}
+
+pkg_postinst() {
+ use X && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ use X && xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2020-10-04 15:24 David Seifert
0 siblings, 0 replies; 129+ messages in thread
From: David Seifert @ 2020-10-04 15:24 UTC (permalink / raw
To: gentoo-commits
commit: b91a9b0c0e3e42ad10ed685981d1468046dceaeb
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Oct 4 15:23:51 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 15:23:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91a9b0c
sci-geosciences/grass: readd package
* Readd package for the GRASS Geographic Information System. GRASS was
removed from the tree due to dropping Python 2 Support. This commit
readds a recent version of GRASS which doesn't depends on Python 2.
Bug: https://bugs.gentoo.org/682188
Bug: https://bugs.gentoo.org/735458
Closes: https://bugs.gentoo.org/744724
Closes: https://github.com/gentoo/gentoo/pull/15399
Closes: https://github.com/gentoo/gentoo/pull/17361
Closes: https://github.com/gentoo/gentoo/pull/17666
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.8.3.ebuild | 268 +++++++++++++++++++++++++++++++
sci-geosciences/grass/metadata.xml | 26 +++
3 files changed, 295 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
new file mode 100644
index 00000000000..300f80c8a3e
--- /dev/null
+++ b/sci-geosciences/grass/Manifest
@@ -0,0 +1 @@
+DIST grass-7.8.3.tar.gz 60292787 BLAKE2B e62fdeb5fa8cc64e59eff1a5cb33dbede7a62a30ed6ef08ced5d11e452e7b0109889105ae88ea28fb667b54fceca69729771eca6acf3e8d281487b1e53b1a3aa SHA512 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84
diff --git a/sci-geosciences/grass/grass-7.8.3.ebuild b/sci-geosciences/grass/grass-7.8.3.ebuild
new file mode 100644
index 00000000000..ab8ab4cf98a
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.8.3.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WANT_AUTOCONF="2.1"
+WX_GTK_VER=3.0
+
+inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs 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.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 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
+ 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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+
+ eapply_user
+}
+
+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="${ED}"/usr/$(get_libdir)/${MY_PM} \
+ prefix="${ED}"/usr/ BINDIR="${ED}"/usr/bin \
+ PREFIX="${ED}"/usr/ \
+ install
+
+ pushd "${ED}"/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
+ 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/${MY_PM} || die
+
+ # get proper fonts path for fontcap
+ sed -i \
+ -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
+ "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
+
+ # set proper python interpreter
+ sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
+os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
+ -i "${ED}"/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 "${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
new file mode 100644
index 00000000000..0f889711e12
--- /dev/null
+++ b/sci-geosciences/grass/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mario.haustein@hrz.tu-chemnitz.de</email>
+ <name>Mario Haustein</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sci-geosciences@gentoo.org</email>
+ <name>Gentoo Geosciences Project</name>
+ </maintainer>
+ <longdescription>
+ The original GIS, yes the first one, developed by the US
+ Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation
+ Project for more info http://grass.itc.it/gdp/index.php
+ </longdescription>
+ <use>
+ <flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds extended options to the v.select module</flag>
+ <flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
+ <flag name="opencl">Enable OpenCL support</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2020-02-09 16:36 Michał Górny
0 siblings, 0 replies; 129+ messages in thread
From: Michał Górny @ 2020-02-09 16:36 UTC (permalink / raw
To: gentoo-commits
commit: cbba69141db111820efc98edd6464b2f8e1bccfb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 19:01:56 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:35:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbba6914
sci-geosciences/grass: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../grass/{grass-7.4.4-r2.ebuild => grass-7.4.4-r3.ebuild} | 10 ++++++----
sci-geosciences/grass/grass-7.4.4.ebuild | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
similarity index 98%
rename from sci-geosciences/grass/grass-7.4.4-r2.ebuild
rename to sci-geosciences/grass/grass-7.4.4-r3.ebuild
index 1eae3bc22a9..595f714b7b8 100644
--- a/sci-geosciences/grass/grass-7.4.4-r2.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4-r3.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
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
index 7ab6f3281d1..af8e8a283be 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
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2020-02-08 16:53 David Seifert
0 siblings, 0 replies; 129+ messages in thread
From: David Seifert @ 2020-02-08 16:53 UTC (permalink / raw
To: gentoo-commits
commit: 222fafb83d3fb05a934596d5ab648e8dce440c56
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 16:52:08 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 16:52:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222fafb8
sci-geosciences/grass: [QA] Fix UnnecessarySlashStrip
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-geosciences/grass/grass-7.4.4-r2.ebuild | 22 +++++++++++-----------
sci-geosciences/grass/grass-7.4.4.ebuild | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild b/sci-geosciences/grass/grass-7.4.4-r2.ebuild
index 4fc91618386..1eae3bc22a9 100644
--- a/sci-geosciences/grass/grass-7.4.4-r2.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4-r2.ebuild
@@ -150,23 +150,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 +175,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 +244,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
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
index e875e74c758..7ab6f3281d1 100644
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -150,23 +150,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 +175,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 +244,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
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2020-01-22 21:50 Michał Górny
0 siblings, 0 replies; 129+ messages in thread
From: Michał Górny @ 2020-01-22 21:50 UTC (permalink / raw
To: gentoo-commits
commit: 09c2f01a31e87bafbc05f8f064e4ab3163481b84
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 21:43:18 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 21:49:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c2f01a
sci-geosciences/grass: Revbump post dep change
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-geosciences/grass/{grass-7.4.4-r1.ebuild => grass-7.4.4-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.4.4-r1.ebuild b/sci-geosciences/grass/grass-7.4.4-r2.ebuild
similarity index 100%
rename from sci-geosciences/grass/grass-7.4.4-r1.ebuild
rename to sci-geosciences/grass/grass-7.4.4-r2.ebuild
^ permalink raw reply [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2020-01-16 6:39 Michał Górny
0 siblings, 0 replies; 129+ messages in thread
From: Michał Górny @ 2020-01-16 6:39 UTC (permalink / raw
To: gentoo-commits
commit: d9ef686a07fc0837f740a0b3f3063e6cc9b7b0f5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 06:29:12 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 06:38:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ef686a
sci-geosciences/grass: Permit numpy-python2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-geosciences/grass/grass-7.4.4-r1.ebuild | 7 +++++--
sci-geosciences/grass/grass-7.4.4.ebuild | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.4.4-r1.ebuild b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
index 5c87d32bf2a..4fc91618386 100644
--- a/sci-geosciences/grass/grass-7.4.4-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,7 +25,10 @@ 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[${PYTHON_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
media-libs/libprojectm
sci-libs/gdal
sys-libs/gdbm
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
index e067fbf0aaa..e875e74c758 100644
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,7 +25,10 @@ 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[${PYTHON_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
media-libs/libprojectm
sci-libs/gdal
sys-libs/gdbm
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2019-07-05 8:22 Benda XU
0 siblings, 0 replies; 129+ messages in thread
From: Benda XU @ 2019-07-05 8:22 UTC (permalink / raw
To: gentoo-commits
commit: 86df2030c1da04c98f79591db92d199c49c5cefb
Author: Mo Zhou <cdluminate <AT> gmail <DOT> com>
AuthorDate: Wed Jul 3 05:48:56 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Jul 5 08:22:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86df2030
sci-geosciences/grass: DEPEND on virtual/cblas.
This fixes dependency confliction between the BLAS/LAPACK runtime
switching mechanism and the old cblas-reference package.
Closes: https://github.com/gentoo/gentoo/pull/12381
Signed-off-by: Mo Zhou <cdluminate <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-geosciences/grass/grass-7.4.4-r1.ebuild | 278 ++++++++++++++++++++++++++++
1 file changed, 278 insertions(+)
diff --git a/sci-geosciences/grass/grass-7.4.4-r1.ebuild b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
new file mode 100644
index 00000000000..5c87d32bf2a
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.4.4-r1.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2019 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[${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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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
+
+ 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
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2019-02-21 10:29 Andreas Sturmlechner
0 siblings, 0 replies; 129+ messages in thread
From: Andreas Sturmlechner @ 2019-02-21 10:29 UTC (permalink / raw
To: gentoo-commits
commit: c0c3fa564359c8b4c14eceecdeb3355e0a9970d9
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Feb 19 19:25:38 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 10:29:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c3fa56
sci-geosciences/grass: use HTTPS
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/grass/grass-7.2.0-r1.ebuild | 6 +++---
sci-geosciences/grass/grass-7.4.0.ebuild | 6 +++---
sci-geosciences/grass/grass-7.4.1.ebuild | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
index 4c924ed1659..6b99aa466e7 100644
--- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,8 +15,8 @@ MY_PM=${MY_PM/.}
MY_P=${P/_rc/RC}
DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+HOMEPAGE="https://grass.osgeo.org/"
+SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.2.0"
diff --git a/sci-geosciences/grass/grass-7.4.0.ebuild b/sci-geosciences/grass/grass-7.4.0.ebuild
index a5e3ddaf60e..4b0679f5b2c 100644
--- a/sci-geosciences/grass/grass-7.4.0.ebuild
+++ b/sci-geosciences/grass/grass-7.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,8 +15,8 @@ MY_PM=${MY_PM/.}
MY_P=${P/_rc/RC}
DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+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"
diff --git a/sci-geosciences/grass/grass-7.4.1.ebuild b/sci-geosciences/grass/grass-7.4.1.ebuild
index 5c45e10e174..7c4d6e63529 100644
--- a/sci-geosciences/grass/grass-7.4.1.ebuild
+++ b/sci-geosciences/grass/grass-7.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,8 +15,8 @@ MY_PM=${MY_PM/.}
MY_P=${P/_rc/RC}
DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+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"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2019-02-21 10:29 Andreas Sturmlechner
0 siblings, 0 replies; 129+ messages in thread
From: Andreas Sturmlechner @ 2019-02-21 10:29 UTC (permalink / raw
To: gentoo-commits
commit: 81531bb2c743a288b03122d58b9abd01c6b0e27f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 09:11:44 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 10:29:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81531bb2
sci-geosciences/grass: 7.4.4 version bump, fix USE mysql, EAPI-7 prep
Add missing desktop.eclass
Drop bogus gnome2.eclass
Switch to xdg.utils
Use eapi7-ver
Fix trailing slashes
Sort IUSE and DEPENDs
Fix mysql lib path
Closes: https://bugs.gentoo.org/658888
Closes: https://bugs.gentoo.org/666052
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.4.4.ebuild | 278 +++++++++++++++++++++++++++++++
2 files changed, 279 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 0f4623b3d19..ab09e66a39f 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,4 @@
DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321
DIST grass-7.4.1.tar.gz 57969640 BLAKE2B 1d3d0fd20611971ec349bf0e26ef7d886b7047e1ec48f48584f8ba2e5562f352433c9869420d7e030e66fb5a9e60de20e6a78d1fd5142380fbcab51f700766d8 SHA512 66616e495aa798cd1ad7a0284a386f7e99741918596b816a712788114e7dc491be0b5f19551f102b436518a5cabcdedbc61042acf0a9b06b9d8df12b4de26c90
+DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
new file mode 100644
index 00000000000..e067fbf0aaa
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2019 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[${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? (
+ sci-libs/cblas-reference
+ 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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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
+
+ 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
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2018-09-09 15:41 Amy Liffey
0 siblings, 0 replies; 129+ messages in thread
From: Amy Liffey @ 2018-09-09 15:41 UTC (permalink / raw
To: gentoo-commits
commit: 3ced847e135e475663778074f797538cb6e3464a
Author: Gioacchino Mazzurco <gio <AT> eigenlab <DOT> org>
AuthorDate: Fri Aug 31 22:48:45 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Sep 9 15:39:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ced847e
sci-geosciences/grass-7.4.1 version bump
Update to new version and avoid breaking addons installation by not
deleting too much things in src_install
Closes: https://bugs.gentoo.org/664886
Closes: https://bugs.gentoo.org/665006
Closes: https://github.com/gentoo/gentoo/pull/9748
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.4.1.ebuild | 284 +++++++++++++++++++++++++++++++
2 files changed, 285 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 9aaa7fc6c7a..0f4623b3d19 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,3 @@
DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321
+DIST grass-7.4.1.tar.gz 57969640 BLAKE2B 1d3d0fd20611971ec349bf0e26ef7d886b7047e1ec48f48584f8ba2e5562f352433c9869420d7e030e66fb5a9e60de20e6a78d1fd5142380fbcab51f700766d8 SHA512 66616e495aa798cd1ad7a0284a386f7e99741918596b816a712788114e7dc491be0b5f19551f102b436518a5cabcdedbc61042acf0a9b06b9d8df12b4de26c90
diff --git a/sci-geosciences/grass/grass-7.4.1.ebuild b/sci-geosciences/grass/grass-7.4.1.ebuild
new file mode 100644
index 00000000000..5c45e10e174
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.4.1.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 gnome2 python-single-r1 versionator wxwidgets xdg-utils
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sci-libs/gdal
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib:=
+ fftw? ( sci-libs/fftw:3.0= )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ 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}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ 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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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
+
+ 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"
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(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-libs "${EPREFIX}/usr/$(get_libdir)/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) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ --with-gdal="${EPREFIX}/usr/bin/gdal-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") \
+ --with-proj-includes="${EPREFIX}/usr/include/libprojectM" \
+ --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" \
+ --with-proj-share="${EPREFIX}/usr/share/proj/" \
+ $(use_with X x)
+}
+
+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
+
+ dodoc AUTHORS CHANGES
+ docinto html
+ dodoc -r docs/html/*
+
+ # 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() {
+ if use X; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+
+ 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() {
+ if use X; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2018-05-24 9:36 Amy Liffey
0 siblings, 0 replies; 129+ messages in thread
From: Amy Liffey @ 2018-05-24 9:36 UTC (permalink / raw
To: gentoo-commits
commit: 61b391d8ec3b65bba588f2ea645bf1f8e8ed4417
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 08:05:28 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu May 24 09:35:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b391d8
sci-geosciences/grass: fdo-mime to xdg-utils eclass
- Remove epatch
- Add = to zlib and fftw3
- Remove multilib eclass
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sci-geosciences/grass/grass-7.2.0-r1.ebuild | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
index 233823e1fa4..4c924ed1659 100644
--- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite" # bug 572440
WANT_AUTOCONF="2.1"
WX_GTK_VER=3.0
-inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
+inherit autotools gnome2 python-single-r1 versionator wxwidgets xdg-utils
MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
MY_PM=${MY_PM/.}
@@ -32,8 +32,8 @@ RDEPEND="${PYTHON_DEPS}
sci-libs/gdal
sys-libs/gdbm
sys-libs/ncurses:0=
- sys-libs/zlib
- fftw? ( sci-libs/fftw:3.0 )
+ sys-libs/zlib:=
+ fftw? ( sci-libs/fftw:3.0= )
geos? ( sci-libs/geos )
blas? ( virtual/blas
sci-libs/cblas-reference )
@@ -121,9 +121,7 @@ src_prepare() {
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"
- epatch "${PATCHES[@]}"
-
- eapply_user
+ default
eautoconf
ebegin "Fixing python shebangs"
@@ -254,14 +252,14 @@ src_install() {
pkg_postinst() {
if use X; then
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
gnome2_icon_cache_update
fi
}
pkg_postrm() {
if use X; then
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
gnome2_icon_cache_update
fi
}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2018-05-24 9:36 Amy Liffey
0 siblings, 0 replies; 129+ messages in thread
From: Amy Liffey @ 2018-05-24 9:36 UTC (permalink / raw
To: gentoo-commits
commit: dcd269d46b29948c6cefc0ca5a855a5180ff87d2
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 21:44:10 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu May 24 09:35:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd269d4
sci-geosciences/grass: version bump 7.4.0
Suggested-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Closes: https://bugs.gentoo.org/645892
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.4.0.ebuild | 281 +++++++++++++++++++++++++++++++
2 files changed, 282 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 78918b930a1..9aaa7fc6c7a 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
+DIST grass-7.4.0.tar.gz 56329374 BLAKE2B 924ecd9ad073dd3c59542a871780397a2516e1f0d912b4644978154ea6305ccf50229655aa7f38ab20f2bf85e4a4783cd793fff5101423dd6c212108d638d1df SHA512 b0393ec5d149e2146cc1f30cdcea00e31039bf0a2541486ab0ecd5debe260d267d74e60761b45ce306ad9942264cce9134dbafbf3c75a55df1c610499877d321
diff --git a/sci-geosciences/grass/grass-7.4.0.ebuild b/sci-geosciences/grass/grass-7.4.0.ebuild
new file mode 100644
index 00000000000..a5e3ddaf60e
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.4.0.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 gnome2 python-single-r1 versionator wxwidgets xdg-utils
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sci-libs/gdal
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib:=
+ fftw? ( sci-libs/fftw:3.0= )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ 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}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ 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
+)
+
+#pre_pkg_setup() {
+# export LIBS="$(pkg-config --libs libtirpc) ${LIBS}"
+# export CPPFLAGS="$(pkg-config --cflags libtirpc) ${CPPFLAGS}"
+# einfo "LIBS='${LIBS}' CPPFLAGS='${CPPFLAGS}' # bug #588980"
+#}
+
+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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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
+
+ 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"
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(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-libs "${EPREFIX}/usr/$(get_libdir)/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) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ --with-gdal="${EPREFIX}/usr/bin/gdal-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") \
+ --with-proj-includes="${EPREFIX}/usr/include/libprojectM" \
+ --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" \
+ --with-proj-share="${EPREFIX}/usr/share/proj/" \
+ $(use_with X x)
+}
+
+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/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ docinto html
+ dodoc -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # 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
+ rm -rf locale/ || die
+ fi
+
+ popd &> /dev/null || die
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # 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() {
+ if use X; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2018-04-10 1:19 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2018-04-10 1:19 UTC (permalink / raw
To: gentoo-commits
commit: efc84f82c065d474e08b296e507eafe7e98c5084
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 10 01:06:20 2018 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Tue Apr 10 01:18:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc84f82
sci-geosciences/grass: remove from maintainer
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-geosciences/grass/metadata.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 76412950449..61353627f8d 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>wraeth@gentoo.org</email>
- <name>Sam Jorna</name>
- </maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
<name>Gentoo Geosciences Project</name>
</maintainer>
^ permalink raw reply related [flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2018-04-01 22:27 Matt Turner
0 siblings, 0 replies; 129+ messages in thread
From: Matt Turner @ 2018-04-01 22:27 UTC (permalink / raw
To: gentoo-commits
commit: 3260e5ad5c5fcc7ddd9f3da9d414c0b55ec42b8d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 22:25:30 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 22:27:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3260e5ad
sci-geosciences/grass: Clean up X11 dependencies
Xaw, Xmu, Xpm, and Xp are unused. Also switch to depending on xorg-proto
directly while we're here.
Closes: https://bugs.gentoo.org/649096
.../grass/{grass-7.2.0.ebuild => grass-7.2.0-r1.ebuild} | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.2.0.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
similarity index 97%
rename from sci-geosciences/grass/grass-7.2.0.ebuild
rename to sci-geosciences/grass/grass-7.2.0-r1.ebuild
index f62fa1a2565..be625fa853d 100644
--- a/sci-geosciences/grass/grass-7.2.0.ebuild
+++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -56,11 +56,7 @@ RDEPEND="${PYTHON_DEPS}
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- x11-libs/libXaw
x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
x11-libs/libXt
)"
@@ -71,8 +67,7 @@ DEPEND="${RDEPEND}
sys-devel/bison
X? (
dev-lang/swig
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
)"
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2018-03-05 22:14 Andreas Sturmlechner
0 siblings, 0 replies; 129+ messages in thread
From: Andreas Sturmlechner @ 2018-03-05 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 0cde45fd530693283e771d57d7f3ebb41f258bc2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 5 20:24:29 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 5 22:13:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cde45fd
sci-geosciences/grass: Drop 7.0.5-r1
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sci-geosciences/grass/Manifest | 1 -
sci-geosciences/grass/grass-7.0.5-r1.ebuild | 270 ----------------------------
2 files changed, 271 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 0c5293fccaa..78918b930a1 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1 @@
-DIST grass-7.0.5.tar.gz 40862798 BLAKE2B 4d581929f0aae706eb1129201acd62211296ba73b2f077a4141799afaa6522a481c8ff218edaf713b152f8728f7e23fe780c8f3e5d07e9a66105f1d86c0a55ef SHA512 42ff0577ca4fb1fe5f370090b94bec82eec1be65883152d64eacae6b3628e91e67ced045ca2a299f32e9d773995b35cc98b4cceaee6518c788f9366f3c7371bd
DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
diff --git a/sci-geosciences/grass/grass-7.0.5-r1.ebuild b/sci-geosciences/grass/grass-7.0.5-r1.ebuild
deleted file mode 100644
index 9be8c956e38..00000000000
--- a/sci-geosciences/grass/grass-7.0.5-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# 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 eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
-
-MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.0.5"
-KEYWORDS="~amd64 ~x86"
-IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
-
-RDEPEND="${PYTHON_DEPS}
- >=app-admin/eselect-1.2
- dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/libprojectm
- sci-libs/proj
- sci-libs/xdrfile
- sci-libs/gdal
- sys-libs/gdbm
- sys-libs/ncurses:0=
- sys-libs/zlib
- fftw? ( sci-libs/fftw:3.0 )
- geos? ( sci-libs/geos )
- blas? ( virtual/blas
- sci-libs/cblas-reference )
- lapack? ( virtual/lapack )
- liblas? ( sci-geosciences/liblas )
- mysql? ( virtual/mysql )
- 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/libXaw
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- x11-libs/libXt
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- sys-devel/gettext
- sys-devel/bison
- X? (
- dev-lang/swig
- x11-proto/xextproto
- x11-proto/xproto
- )"
-
-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 <impl>"
- ewarn "where <impl> 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 <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
- 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"
-
- epatch "${PATCHES[@]}"
-
- eapply_user
- eautoconf
-
- ebegin "Fixing python shebangs"
- python_fix_shebang -q "${S}"
- eend $?
-}
-
-src_configure() {
- if use X; then
- WX_BUILD=yes
- setup-wxwidgets
- fi
-
- addwrite "${ROOT}dev/dri/renderD128"
-
- econf \
- --enable-shared \
- --disable-w11 \
- $(use_with cxx) \
- $(use_with tiff) \
- $(use_with png) \
- $(use_with postgres) \
- $(use_with mysql) \
- $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
- $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
- $(use_with nls) \
- $(use_with readline) \
- --without-opendwg \
- --with-regex \
- $(use_with threads pthread) \
- $(use_with openmp) \
- $(use_with opencl) \
- --with-gdal="${ROOT}usr/bin/gdal-config" \
- $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
- $(use_with X wxwidgets "${WX_CONFIG}") \
- $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
- $(use_with geos geos "${ROOT}usr/bin/geos-config") \
- --with-proj-includes="${ROOT}usr/include/libprojectM" \
- --with-proj-libs="${ROOT}usr/$(get_libdir)" \
- --with-proj-share="${ROOT}usr/share/proj/" \
- $(use_with X x)
-}
-
-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/${MY_PM}" \
- prefix="${D}usr" BINDIR="${D}usr/bin" \
- PREFIX="${D}usr/" \
- install
-
- pushd "${D}usr/${MY_PM}" &> /dev/null || die
-
- # fix docs
- dodoc AUTHORS CHANGES
- docinto html
- dodoc -r docs/html/*
- rm -rf docs/ || die
- rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
- # 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
- rm -rf locale/ || die
- # pt_BR is broken
- mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
- fi
-
- popd &> /dev/null || die
-
- # place libraries where they belong
- mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
-
- # place header files where they belong
- mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
- # make rules are not required on installed system
- rm -rf "${D}usr/include/Make" || die
-
- # mv remaining gisbase stuff to libdir
- mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
-
- # 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() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2017-05-24 7:06 Michael Weber
0 siblings, 0 replies; 129+ messages in thread
From: Michael Weber @ 2017-05-24 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 5e0e1d04375142a28221e27ff1d28a53a2384607
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 07:02:41 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed May 24 07:06:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e0e1d04
sci-geosciences/grass: add ~ppc keyword (bug 563378)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --include-arches="amd64 arm arm64 ppc ppc64"
sci-geosciences/grass/grass-7.2.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.2.0.ebuild b/sci-geosciences/grass/grass-7.2.0.ebuild
index 3ed122166e6..f62fa1a2565 100644
--- a/sci-geosciences/grass/grass-7.2.0.ebuild
+++ b/sci-geosciences/grass/grass-7.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/7.2.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
RDEPEND="${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2017-04-18 23:25 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2017-04-18 23:25 UTC (permalink / raw
To: gentoo-commits
commit: a731471948b52704467b4dce88fa448505b21b00
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 23:23:39 2017 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 23:24:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7314719
sci-geosciences/grass: remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sci-geosciences/grass/Manifest | 1 -
sci-geosciences/grass/grass-7.0.4-r1.ebuild | 270 ----------------------------
2 files changed, 271 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 24138832790..b90b90cc19e 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,2 @@
-DIST grass-7.0.4.tar.gz 40601012 SHA256 657188dc640b8482d16f889ff281abe424a0b232d03328086ba28cbf02c65af2 SHA512 5ac1359f1d1d6602a567f4d85eb4f92f665788ebba51767696894228b31b5d65c1fa343e068b5c2990c12ff023b5c09ff441b7c2e1e1d990956be3250fe45658 WHIRLPOOL b2b81aca710419f22476660462ba6c47d953621d0d02ea3b4d8ee64deec047d7947698073270d778a308782f89575ec897707db8139d85743a1eb22714ee203e
DIST grass-7.0.5.tar.gz 40862798 SHA256 60de3ba67eaf4f05dcff4f48ef710113f9efa9367ece784c13423bc620246f3c SHA512 42ff0577ca4fb1fe5f370090b94bec82eec1be65883152d64eacae6b3628e91e67ced045ca2a299f32e9d773995b35cc98b4cceaee6518c788f9366f3c7371bd WHIRLPOOL fb0077dd81074721e9ad53d0e3d7a76260a237426e37bb9e2ab393c7647e2204ee5f85e7936fe94e59f4e9413442e86f6ba6cf40bf31be9b833e70cebaa781bd
DIST grass-7.2.0.tar.gz 48315008 SHA256 f0bc0c3cfccc98330ce01547bd86d8281f93f05a45b6115eb33044a07cf70750 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b WHIRLPOOL dfee9a8ca203a5c969b48e57ab8e97dfbb92bbe70cbc6b31d3734e2ddb21fb06402f83f9c3e1cafc4b139056fc0f601d9d6361c165b39b384e1da93382233db1
diff --git a/sci-geosciences/grass/grass-7.0.4-r1.ebuild b/sci-geosciences/grass/grass-7.0.4-r1.ebuild
deleted file mode 100644
index dd1ae7758cf..00000000000
--- a/sci-geosciences/grass/grass-7.0.4-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
-
-MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.0.4"
-KEYWORDS="~amd64 ~x86"
-IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
-
-RDEPEND="${PYTHON_DEPS}
- >=app-admin/eselect-1.2
- dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/libprojectm
- sci-libs/proj
- sci-libs/xdrfile
- sci-libs/gdal
- sys-libs/gdbm
- sys-libs/ncurses:0=
- sys-libs/zlib
- fftw? ( sci-libs/fftw:3.0 )
- geos? ( sci-libs/geos )
- blas? ( virtual/blas
- sci-libs/cblas-reference )
- lapack? ( virtual/lapack )
- liblas? ( sci-geosciences/liblas )
- mysql? ( virtual/mysql )
- 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/libXaw
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- x11-libs/libXt
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- sys-devel/gettext
- sys-devel/bison
- X? (
- dev-lang/swig
- x11-proto/xextproto
- x11-proto/xproto
- )"
-
-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 <impl>"
- ewarn "where <impl> 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 <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
- 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"
-
- epatch "${PATCHES[@]}"
-
- eapply_user
- eautoconf
-
- ebegin "Fixing python shebangs"
- python_fix_shebang -q "${S}"
- eend $?
-}
-
-src_configure() {
- if use X; then
- WX_BUILD=yes
- setup-wxwidgets
- fi
-
- addwrite "${ROOT}dev/dri/renderD128"
-
- econf \
- --enable-shared \
- --disable-w11 \
- $(use_with cxx) \
- $(use_with tiff) \
- $(use_with png) \
- $(use_with postgres) \
- $(use_with mysql) \
- $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
- $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
- $(use_with nls) \
- $(use_with readline) \
- --without-opendwg \
- --with-regex \
- $(use_with threads pthread) \
- $(use_with openmp) \
- $(use_with opencl) \
- --with-gdal="${ROOT}usr/bin/gdal-config" \
- $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
- $(use_with X wxwidgets "${WX_CONFIG}") \
- $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
- $(use_with geos geos "${ROOT}usr/bin/geos-config") \
- --with-proj-includes="${ROOT}usr/include/libprojectM" \
- --with-proj-libs="${ROOT}usr/$(get_libdir)" \
- --with-proj-share="${ROOT}usr/share/proj/" \
- $(use_with X x)
-}
-
-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/${MY_PM}" \
- prefix="${D}usr" BINDIR="${D}usr/bin" \
- PREFIX="${D}usr/" \
- install
-
- pushd "${D}usr/${MY_PM}" &> /dev/null || die
-
- # fix docs
- dodoc AUTHORS CHANGES
- docinto html
- dodoc -r docs/html/*
- rm -rf docs/ || die
- rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
- # 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
- rm -rf locale/ || die
- # pt_BR is broken
- mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
- fi
-
- popd &> /dev/null || die
-
- # place libraries where they belong
- mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
-
- # place header files where they belong
- mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
- # make rules are not required on installed system
- rm -rf "${D}usr/include/Make" || die
-
- # mv remaining gisbase stuff to libdir
- mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
-
- # 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() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2017-04-18 23:25 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2017-04-18 23:25 UTC (permalink / raw
To: gentoo-commits
commit: 99ef59f9a1aacadacd8af07c3c56e52ece07c20c
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 23:20:36 2017 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 23:24:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ef59f9
sci-geosciences/grass: bump to 7.2.0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.2.0.ebuild | 270 +++++++++++++++++++++++++++++++
2 files changed, 271 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index dcf1c4b64f5..24138832790 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,3 @@
DIST grass-7.0.4.tar.gz 40601012 SHA256 657188dc640b8482d16f889ff281abe424a0b232d03328086ba28cbf02c65af2 SHA512 5ac1359f1d1d6602a567f4d85eb4f92f665788ebba51767696894228b31b5d65c1fa343e068b5c2990c12ff023b5c09ff441b7c2e1e1d990956be3250fe45658 WHIRLPOOL b2b81aca710419f22476660462ba6c47d953621d0d02ea3b4d8ee64deec047d7947698073270d778a308782f89575ec897707db8139d85743a1eb22714ee203e
DIST grass-7.0.5.tar.gz 40862798 SHA256 60de3ba67eaf4f05dcff4f48ef710113f9efa9367ece784c13423bc620246f3c SHA512 42ff0577ca4fb1fe5f370090b94bec82eec1be65883152d64eacae6b3628e91e67ced045ca2a299f32e9d773995b35cc98b4cceaee6518c788f9366f3c7371bd WHIRLPOOL fb0077dd81074721e9ad53d0e3d7a76260a237426e37bb9e2ab393c7647e2204ee5f85e7936fe94e59f4e9413442e86f6ba6cf40bf31be9b833e70cebaa781bd
+DIST grass-7.2.0.tar.gz 48315008 SHA256 f0bc0c3cfccc98330ce01547bd86d8281f93f05a45b6115eb33044a07cf70750 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b WHIRLPOOL dfee9a8ca203a5c969b48e57ab8e97dfbb92bbe70cbc6b31d3734e2ddb21fb06402f83f9c3e1cafc4b139056fc0f601d9d6361c165b39b384e1da93382233db1
diff --git a/sci-geosciences/grass/grass-7.2.0.ebuild b/sci-geosciences/grass/grass-7.2.0.ebuild
new file mode 100644
index 00000000000..3ed122166e6
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.2.0.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sci-libs/gdal
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ 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/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ X? (
+ dev-lang/swig
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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"
+
+ epatch "${PATCHES[@]}"
+
+ eapply_user
+ eautoconf
+
+ ebegin "Fixing python shebangs"
+ python_fix_shebang -q "${S}"
+ eend $?
+}
+
+src_configure() {
+ if use X; then
+ WX_BUILD=yes
+ setup-wxwidgets
+ fi
+
+ addwrite "${ROOT}dev/dri/renderD128"
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(use_with cxx) \
+ $(use_with tiff) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with mysql) \
+ $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+ $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
+ $(use_with nls) \
+ $(use_with readline) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ --with-gdal="${ROOT}usr/bin/gdal-config" \
+ $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+ $(use_with X wxwidgets "${WX_CONFIG}") \
+ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+ $(use_with geos geos "${ROOT}usr/bin/geos-config") \
+ --with-proj-includes="${ROOT}usr/include/libprojectM" \
+ --with-proj-libs="${ROOT}usr/$(get_libdir)" \
+ --with-proj-share="${ROOT}usr/share/proj/" \
+ $(use_with X x)
+}
+
+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/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ docinto html
+ dodoc -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # 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
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+ fi
+
+ popd &> /dev/null || die
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # 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() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2017-01-11 1:51 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2017-01-11 1:51 UTC (permalink / raw
To: gentoo-commits
commit: 01adcf95566153df774190fcb9faf1320e99c461
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 01:37:46 2017 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 01:49:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01adcf95
sci-geosciences/grass: revbump 7.0.4 to use wxGTK-3
Gentoo-bug: 600986
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../grass/{grass-7.0.4.ebuild => grass-7.0.4-r1.ebuild} | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.0.4.ebuild b/sci-geosciences/grass/grass-7.0.4-r1.ebuild
similarity index 97%
rename from sci-geosciences/grass/grass-7.0.4.ebuild
rename to sci-geosciences/grass/grass-7.0.4-r1.ebuild
index 828fa14..6ccff6e 100644
--- a/sci-geosciences/grass/grass-7.0.4.ebuild
+++ b/sci-geosciences/grass/grass-7.0.4-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite" # bug 572440
WANT_AUTOCONF="2.1"
+WX_GTK_VER=3.0
inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
@@ -19,7 +20,7 @@ HOMEPAGE="http://grass.osgeo.org/"
SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
-SLOT="0/7.0.3"
+SLOT="0/7.0.4"
KEYWORDS="~amd64 ~x86"
IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
@@ -51,7 +52,7 @@ RDEPEND="${PYTHON_DEPS}
tiff? ( media-libs/tiff:0= )
truetype? ( media-libs/freetype:2 )
X? (
- >=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?]
+ dev-python/wxpython:3.0[cairo,opengl?]
x11-libs/cairo[X,opengl?]
x11-libs/libICE
x11-libs/libSM
@@ -126,7 +127,7 @@ src_prepare() {
epatch "${PATCHES[@]}"
- epatch_user
+ eapply_user
eautoconf
ebegin "Fixing python shebangs"
@@ -137,8 +138,7 @@ src_prepare() {
src_configure() {
if use X; then
WX_BUILD=yes
- WX_GTK_VER=2.8
- need-wxwidgets unicode
+ setup-wxwidgets
fi
addwrite "${ROOT}dev/dri/renderD128"
@@ -196,7 +196,8 @@ src_install() {
# fix docs
dodoc AUTHORS CHANGES
- dohtml -r docs/html/*
+ docinto html
+ dodoc -r docs/html/*
rm -rf docs/ || die
rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2017-01-11 1:51 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2017-01-11 1:51 UTC (permalink / raw
To: gentoo-commits
commit: c056c27abe722b72411125761eb959e0339f70d8
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 01:48:07 2017 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 01:49:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c056c27a
sci-geosciences/grass: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-geosciences/grass/Manifest | 1 -
sci-geosciences/grass/grass-7.0.3.ebuild | 270 -------------------------------
sci-geosciences/grass/grass-7.0.5.ebuild | 270 -------------------------------
3 files changed, 541 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 897afde..dcf1c4b 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,2 @@
-DIST grass-7.0.3.tar.gz 40022685 SHA256 6c414938d831583b97554cb49698529310defba467b11f6a85caf6ca405680df SHA512 93d9e5c2983b41f88f5170923267eb54328124a179fc391893e88eaa9670a608b4b7d339d0043d338a98cb5ef532e19411cd46155a69e6f06a6b28696056add6 WHIRLPOOL 2f171e056c179fc31845dc28e5d354ab8f990c462b65ce5a4b26c89261b6757b781c86bb1ab6f29efb3bde0df29bfa432e4f13d7dc61166b761a6edfa3614246
DIST grass-7.0.4.tar.gz 40601012 SHA256 657188dc640b8482d16f889ff281abe424a0b232d03328086ba28cbf02c65af2 SHA512 5ac1359f1d1d6602a567f4d85eb4f92f665788ebba51767696894228b31b5d65c1fa343e068b5c2990c12ff023b5c09ff441b7c2e1e1d990956be3250fe45658 WHIRLPOOL b2b81aca710419f22476660462ba6c47d953621d0d02ea3b4d8ee64deec047d7947698073270d778a308782f89575ec897707db8139d85743a1eb22714ee203e
DIST grass-7.0.5.tar.gz 40862798 SHA256 60de3ba67eaf4f05dcff4f48ef710113f9efa9367ece784c13423bc620246f3c SHA512 42ff0577ca4fb1fe5f370090b94bec82eec1be65883152d64eacae6b3628e91e67ced045ca2a299f32e9d773995b35cc98b4cceaee6518c788f9366f3c7371bd WHIRLPOOL fb0077dd81074721e9ad53d0e3d7a76260a237426e37bb9e2ab393c7647e2204ee5f85e7936fe94e59f4e9413442e86f6ba6cf40bf31be9b833e70cebaa781bd
diff --git a/sci-geosciences/grass/grass-7.0.3.ebuild b/sci-geosciences/grass/grass-7.0.3.ebuild
deleted file mode 100644
index 828fa14..00000000
--- a/sci-geosciences/grass/grass-7.0.3.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite" # bug 572440
-WANT_AUTOCONF="2.1"
-
-inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
-
-MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.0.3"
-KEYWORDS="~amd64 ~x86"
-IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
-
-RDEPEND="${PYTHON_DEPS}
- >=app-admin/eselect-1.2
- dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/libprojectm
- sci-libs/proj
- sci-libs/xdrfile
- sci-libs/gdal
- sys-libs/gdbm
- sys-libs/ncurses:0=
- sys-libs/zlib
- fftw? ( sci-libs/fftw:3.0 )
- geos? ( sci-libs/geos )
- blas? ( virtual/blas
- sci-libs/cblas-reference )
- lapack? ( virtual/lapack )
- liblas? ( sci-geosciences/liblas )
- mysql? ( virtual/mysql )
- 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-2.8.10.1:2.8[cairo,opengl?]
- x11-libs/cairo[X,opengl?]
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- x11-libs/libXt
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- sys-devel/gettext
- sys-devel/bison
- X? (
- dev-lang/swig
- x11-proto/xextproto
- x11-proto/xproto
- )"
-
-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 <impl>"
- ewarn "where <impl> 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 <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
- 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"
-
- epatch "${PATCHES[@]}"
-
- epatch_user
- eautoconf
-
- ebegin "Fixing python shebangs"
- python_fix_shebang -q "${S}"
- eend $?
-}
-
-src_configure() {
- if use X; then
- WX_BUILD=yes
- WX_GTK_VER=2.8
- need-wxwidgets unicode
- fi
-
- addwrite "${ROOT}dev/dri/renderD128"
-
- econf \
- --enable-shared \
- --disable-w11 \
- $(use_with cxx) \
- $(use_with tiff) \
- $(use_with png) \
- $(use_with postgres) \
- $(use_with mysql) \
- $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
- $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
- $(use_with nls) \
- $(use_with readline) \
- --without-opendwg \
- --with-regex \
- $(use_with threads pthread) \
- $(use_with openmp) \
- $(use_with opencl) \
- --with-gdal="${ROOT}usr/bin/gdal-config" \
- $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
- $(use_with X wxwidgets "${WX_CONFIG}") \
- $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
- $(use_with geos geos "${ROOT}usr/bin/geos-config") \
- --with-proj-includes="${ROOT}usr/include/libprojectM" \
- --with-proj-libs="${ROOT}usr/$(get_libdir)" \
- --with-proj-share="${ROOT}usr/share/proj/" \
- $(use_with X x)
-}
-
-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/${MY_PM}" \
- prefix="${D}usr" BINDIR="${D}usr/bin" \
- PREFIX="${D}usr/" \
- install
-
- pushd "${D}usr/${MY_PM}" &> /dev/null || die
-
- # fix docs
- dodoc AUTHORS CHANGES
- dohtml -r docs/html/*
- rm -rf docs/ || die
- rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
- # 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
- rm -rf locale/ || die
- # pt_BR is broken
- mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
- fi
-
- popd &> /dev/null || die
-
- # place libraries where they belong
- mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
-
- # place header files where they belong
- mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
- # make rules are not required on installed system
- rm -rf "${D}usr/include/Make" || die
-
- # mv remaining gisbase stuff to libdir
- mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
-
- # 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() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
diff --git a/sci-geosciences/grass/grass-7.0.5.ebuild b/sci-geosciences/grass/grass-7.0.5.ebuild
deleted file mode 100644
index 828fa14..00000000
--- a/sci-geosciences/grass/grass-7.0.5.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite" # bug 572440
-WANT_AUTOCONF="2.1"
-
-inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
-
-MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.0.3"
-KEYWORDS="~amd64 ~x86"
-IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
-
-RDEPEND="${PYTHON_DEPS}
- >=app-admin/eselect-1.2
- dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/libprojectm
- sci-libs/proj
- sci-libs/xdrfile
- sci-libs/gdal
- sys-libs/gdbm
- sys-libs/ncurses:0=
- sys-libs/zlib
- fftw? ( sci-libs/fftw:3.0 )
- geos? ( sci-libs/geos )
- blas? ( virtual/blas
- sci-libs/cblas-reference )
- lapack? ( virtual/lapack )
- liblas? ( sci-geosciences/liblas )
- mysql? ( virtual/mysql )
- 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-2.8.10.1:2.8[cairo,opengl?]
- x11-libs/cairo[X,opengl?]
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- x11-libs/libXt
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- sys-devel/gettext
- sys-devel/bison
- X? (
- dev-lang/swig
- x11-proto/xextproto
- x11-proto/xproto
- )"
-
-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 <impl>"
- ewarn "where <impl> 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 <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
- 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"
-
- epatch "${PATCHES[@]}"
-
- epatch_user
- eautoconf
-
- ebegin "Fixing python shebangs"
- python_fix_shebang -q "${S}"
- eend $?
-}
-
-src_configure() {
- if use X; then
- WX_BUILD=yes
- WX_GTK_VER=2.8
- need-wxwidgets unicode
- fi
-
- addwrite "${ROOT}dev/dri/renderD128"
-
- econf \
- --enable-shared \
- --disable-w11 \
- $(use_with cxx) \
- $(use_with tiff) \
- $(use_with png) \
- $(use_with postgres) \
- $(use_with mysql) \
- $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
- $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
- $(use_with nls) \
- $(use_with readline) \
- --without-opendwg \
- --with-regex \
- $(use_with threads pthread) \
- $(use_with openmp) \
- $(use_with opencl) \
- --with-gdal="${ROOT}usr/bin/gdal-config" \
- $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
- $(use_with X wxwidgets "${WX_CONFIG}") \
- $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
- $(use_with geos geos "${ROOT}usr/bin/geos-config") \
- --with-proj-includes="${ROOT}usr/include/libprojectM" \
- --with-proj-libs="${ROOT}usr/$(get_libdir)" \
- --with-proj-share="${ROOT}usr/share/proj/" \
- $(use_with X x)
-}
-
-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/${MY_PM}" \
- prefix="${D}usr" BINDIR="${D}usr/bin" \
- PREFIX="${D}usr/" \
- install
-
- pushd "${D}usr/${MY_PM}" &> /dev/null || die
-
- # fix docs
- dodoc AUTHORS CHANGES
- dohtml -r docs/html/*
- rm -rf docs/ || die
- rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
- # 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
- rm -rf locale/ || die
- # pt_BR is broken
- mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
- fi
-
- popd &> /dev/null || die
-
- # place libraries where they belong
- mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
-
- # place header files where they belong
- mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
- # make rules are not required on installed system
- rm -rf "${D}usr/include/Make" || die
-
- # mv remaining gisbase stuff to libdir
- mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
-
- # 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() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2016-11-30 2:29 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2016-11-30 2:29 UTC (permalink / raw
To: gentoo-commits
commit: 667b2671b03ab82506bd58e05853a15baab6f5c1
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 02:28:41 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 02:28:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667b2671
sci-geosciences/grass: use wxGTK:3.0 per #600986
Now builds against wxGTK:3.0 as per the bug. Bumped to EAPI 6,
corrected subslot.
Gentoo-Bug: 600986
Package-Manager: portage-2.3.2
sci-geosciences/grass/grass-7.0.5-r1.ebuild | 271 ++++++++++++++++++++++++++++
1 file changed, 271 insertions(+)
diff --git a/sci-geosciences/grass/grass-7.0.5-r1.ebuild b/sci-geosciences/grass/grass-7.0.5-r1.ebuild
new file mode 100644
index 00000000..7fb913c
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.5-r1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WANT_AUTOCONF="2.1"
+WX_GTK_VER=3.0
+
+inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.0.5"
+KEYWORDS="~amd64 ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sci-libs/gdal
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ 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/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ X? (
+ dev-lang/swig
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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"
+
+ epatch "${PATCHES[@]}"
+
+ eapply_user
+ eautoconf
+
+ ebegin "Fixing python shebangs"
+ python_fix_shebang -q "${S}"
+ eend $?
+}
+
+src_configure() {
+ if use X; then
+ WX_BUILD=yes
+ setup-wxwidgets
+ fi
+
+ addwrite "${ROOT}dev/dri/renderD128"
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(use_with cxx) \
+ $(use_with tiff) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with mysql) \
+ $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+ $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
+ $(use_with nls) \
+ $(use_with readline) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ --with-gdal="${ROOT}usr/bin/gdal-config" \
+ $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+ $(use_with X wxwidgets "${WX_CONFIG}") \
+ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+ $(use_with geos geos "${ROOT}usr/bin/geos-config") \
+ --with-proj-includes="${ROOT}usr/include/libprojectM" \
+ --with-proj-libs="${ROOT}usr/$(get_libdir)" \
+ --with-proj-share="${ROOT}usr/share/proj/" \
+ $(use_with X x)
+}
+
+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/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ docinto html
+ dodoc -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # 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
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+ fi
+
+ popd &> /dev/null || die
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # 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() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2016-11-26 1:07 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2016-11-26 1:07 UTC (permalink / raw
To: gentoo-commits
commit: d5c0e4d7469ada44f0ffb82bfea34682c76565dc
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 01:03:08 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 01:03:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c0e4d7
sci-geosciences/grass: bump to 7.0.5
Package-Manager: portage-2.3.2
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.0.5.ebuild | 270 +++++++++++++++++++++++++++++++
2 files changed, 271 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ba0eaf1..897afde 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,3 @@
DIST grass-7.0.3.tar.gz 40022685 SHA256 6c414938d831583b97554cb49698529310defba467b11f6a85caf6ca405680df SHA512 93d9e5c2983b41f88f5170923267eb54328124a179fc391893e88eaa9670a608b4b7d339d0043d338a98cb5ef532e19411cd46155a69e6f06a6b28696056add6 WHIRLPOOL 2f171e056c179fc31845dc28e5d354ab8f990c462b65ce5a4b26c89261b6757b781c86bb1ab6f29efb3bde0df29bfa432e4f13d7dc61166b761a6edfa3614246
DIST grass-7.0.4.tar.gz 40601012 SHA256 657188dc640b8482d16f889ff281abe424a0b232d03328086ba28cbf02c65af2 SHA512 5ac1359f1d1d6602a567f4d85eb4f92f665788ebba51767696894228b31b5d65c1fa343e068b5c2990c12ff023b5c09ff441b7c2e1e1d990956be3250fe45658 WHIRLPOOL b2b81aca710419f22476660462ba6c47d953621d0d02ea3b4d8ee64deec047d7947698073270d778a308782f89575ec897707db8139d85743a1eb22714ee203e
+DIST grass-7.0.5.tar.gz 40862798 SHA256 60de3ba67eaf4f05dcff4f48ef710113f9efa9367ece784c13423bc620246f3c SHA512 42ff0577ca4fb1fe5f370090b94bec82eec1be65883152d64eacae6b3628e91e67ced045ca2a299f32e9d773995b35cc98b4cceaee6518c788f9366f3c7371bd WHIRLPOOL fb0077dd81074721e9ad53d0e3d7a76260a237426e37bb9e2ab393c7647e2204ee5f85e7936fe94e59f4e9413442e86f6ba6cf40bf31be9b833e70cebaa781bd
diff --git a/sci-geosciences/grass/grass-7.0.5.ebuild b/sci-geosciences/grass/grass-7.0.5.ebuild
new file mode 100644
index 00000000..828fa14
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.5.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.0.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sci-libs/gdal
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ 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-2.8.10.1:2.8[cairo,opengl?]
+ x11-libs/cairo[X,opengl?]
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ X? (
+ dev-lang/swig
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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"
+
+ epatch "${PATCHES[@]}"
+
+ epatch_user
+ eautoconf
+
+ ebegin "Fixing python shebangs"
+ python_fix_shebang -q "${S}"
+ eend $?
+}
+
+src_configure() {
+ if use X; then
+ WX_BUILD=yes
+ WX_GTK_VER=2.8
+ need-wxwidgets unicode
+ fi
+
+ addwrite "${ROOT}dev/dri/renderD128"
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(use_with cxx) \
+ $(use_with tiff) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with mysql) \
+ $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+ $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
+ $(use_with nls) \
+ $(use_with readline) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ --with-gdal="${ROOT}usr/bin/gdal-config" \
+ $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+ $(use_with X wxwidgets "${WX_CONFIG}") \
+ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+ $(use_with geos geos "${ROOT}usr/bin/geos-config") \
+ --with-proj-includes="${ROOT}usr/include/libprojectM" \
+ --with-proj-libs="${ROOT}usr/$(get_libdir)" \
+ --with-proj-share="${ROOT}usr/share/proj/" \
+ $(use_with X x)
+}
+
+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/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ dohtml -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # 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
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+ fi
+
+ popd &> /dev/null || die
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # 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() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2016-06-06 7:00 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2016-06-06 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 5fce4bf6e2c1aa91413eee4840122a7748e37315
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 06:52:03 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 06:59:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fce4bf6
sci-geosciences/grass: bump to 7.0.4
Package-Manager: portage-2.3.0_rc1
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.0.4.ebuild | 270 +++++++++++++++++++++++++++++++
2 files changed, 271 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index f620e10..108e35e 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,4 @@
DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266
DIST grass-7.0.2.tar.gz 38102415 SHA256 2eabd84c5426c675b7f3046213bbacb0cee9d0225df15e1530b93f43ec6b190b SHA512 5f6432263e4d52c914dfdd2bc8199f32c8f366b0ffae6a178033af7eee7b3c2632668b3d3cd70219969ecfd5ad6abefe6e65f0eaf72f27784fea3b4b9d51acfe WHIRLPOOL e1f5a90e793db74bcdf891b5f5a00c2bafa2842a6415ec433a45d6604d4943aa3d95b6e4d95265753a4ee8fc6819ec1b66ddea2d11802ac1c7a37150f7cea6d1
DIST grass-7.0.3.tar.gz 40022685 SHA256 6c414938d831583b97554cb49698529310defba467b11f6a85caf6ca405680df SHA512 93d9e5c2983b41f88f5170923267eb54328124a179fc391893e88eaa9670a608b4b7d339d0043d338a98cb5ef532e19411cd46155a69e6f06a6b28696056add6 WHIRLPOOL 2f171e056c179fc31845dc28e5d354ab8f990c462b65ce5a4b26c89261b6757b781c86bb1ab6f29efb3bde0df29bfa432e4f13d7dc61166b761a6edfa3614246
+DIST grass-7.0.4.tar.gz 40601012 SHA256 657188dc640b8482d16f889ff281abe424a0b232d03328086ba28cbf02c65af2 SHA512 5ac1359f1d1d6602a567f4d85eb4f92f665788ebba51767696894228b31b5d65c1fa343e068b5c2990c12ff023b5c09ff441b7c2e1e1d990956be3250fe45658 WHIRLPOOL b2b81aca710419f22476660462ba6c47d953621d0d02ea3b4d8ee64deec047d7947698073270d778a308782f89575ec897707db8139d85743a1eb22714ee203e
diff --git a/sci-geosciences/grass/grass-7.0.4.ebuild b/sci-geosciences/grass/grass-7.0.4.ebuild
new file mode 100644
index 0000000..828fa14
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.4.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.0.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sci-libs/gdal
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ 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-2.8.10.1:2.8[cairo,opengl?]
+ x11-libs/cairo[X,opengl?]
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ X? (
+ dev-lang/swig
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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"
+
+ epatch "${PATCHES[@]}"
+
+ epatch_user
+ eautoconf
+
+ ebegin "Fixing python shebangs"
+ python_fix_shebang -q "${S}"
+ eend $?
+}
+
+src_configure() {
+ if use X; then
+ WX_BUILD=yes
+ WX_GTK_VER=2.8
+ need-wxwidgets unicode
+ fi
+
+ addwrite "${ROOT}dev/dri/renderD128"
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(use_with cxx) \
+ $(use_with tiff) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with mysql) \
+ $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+ $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
+ $(use_with nls) \
+ $(use_with readline) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ --with-gdal="${ROOT}usr/bin/gdal-config" \
+ $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+ $(use_with X wxwidgets "${WX_CONFIG}") \
+ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+ $(use_with geos geos "${ROOT}usr/bin/geos-config") \
+ --with-proj-includes="${ROOT}usr/include/libprojectM" \
+ --with-proj-libs="${ROOT}usr/$(get_libdir)" \
+ --with-proj-share="${ROOT}usr/share/proj/" \
+ $(use_with X x)
+}
+
+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/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ dohtml -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # 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
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+ fi
+
+ popd &> /dev/null || die
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # 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() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2016-03-15 23:26 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2016-03-15 23:26 UTC (permalink / raw
To: gentoo-commits
commit: eeffd18a64671df7b3fde34445c5f23775021ac9
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 23:26:02 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 23:26:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeffd18a
sci-geosciences/grass: bump to 7.0.3
Version bump to 7.0.3, make usedep on python sqlite unconditional as
per bug #572440, add missing dep.
Gentoo-bug: 574494
Gentoo-bug: 572440
Package-Manager: portage-2.2.28
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.0.3.ebuild | 270 +++++++++++++++++++++++++++++++
2 files changed, 271 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 09a6c76..f620e10 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1,3 @@
DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266
DIST grass-7.0.2.tar.gz 38102415 SHA256 2eabd84c5426c675b7f3046213bbacb0cee9d0225df15e1530b93f43ec6b190b SHA512 5f6432263e4d52c914dfdd2bc8199f32c8f366b0ffae6a178033af7eee7b3c2632668b3d3cd70219969ecfd5ad6abefe6e65f0eaf72f27784fea3b4b9d51acfe WHIRLPOOL e1f5a90e793db74bcdf891b5f5a00c2bafa2842a6415ec433a45d6604d4943aa3d95b6e4d95265753a4ee8fc6819ec1b66ddea2d11802ac1c7a37150f7cea6d1
+DIST grass-7.0.3.tar.gz 40022685 SHA256 6c414938d831583b97554cb49698529310defba467b11f6a85caf6ca405680df SHA512 93d9e5c2983b41f88f5170923267eb54328124a179fc391893e88eaa9670a608b4b7d339d0043d338a98cb5ef532e19411cd46155a69e6f06a6b28696056add6 WHIRLPOOL 2f171e056c179fc31845dc28e5d354ab8f990c462b65ce5a4b26c89261b6757b781c86bb1ab6f29efb3bde0df29bfa432e4f13d7dc61166b761a6edfa3614246
diff --git a/sci-geosciences/grass/grass-7.0.3.ebuild b/sci-geosciences/grass/grass-7.0.3.ebuild
new file mode 100644
index 0000000..828fa14
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.3.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite" # bug 572440
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.0.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sci-libs/gdal
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ 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-2.8.10.1:2.8[cairo,opengl?]
+ x11-libs/cairo[X,opengl?]
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ X? (
+ dev-lang/swig
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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"
+
+ epatch "${PATCHES[@]}"
+
+ epatch_user
+ eautoconf
+
+ ebegin "Fixing python shebangs"
+ python_fix_shebang -q "${S}"
+ eend $?
+}
+
+src_configure() {
+ if use X; then
+ WX_BUILD=yes
+ WX_GTK_VER=2.8
+ need-wxwidgets unicode
+ fi
+
+ addwrite "${ROOT}dev/dri/renderD128"
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(use_with cxx) \
+ $(use_with tiff) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with mysql) \
+ $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+ $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
+ $(use_with nls) \
+ $(use_with readline) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ --with-gdal="${ROOT}usr/bin/gdal-config" \
+ $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+ $(use_with X wxwidgets "${WX_CONFIG}") \
+ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+ $(use_with geos geos "${ROOT}usr/bin/geos-config") \
+ --with-proj-includes="${ROOT}usr/include/libprojectM" \
+ --with-proj-libs="${ROOT}usr/$(get_libdir)" \
+ --with-proj-share="${ROOT}usr/share/proj/" \
+ $(use_with X x)
+}
+
+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/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ dohtml -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # 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
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+ fi
+
+ popd &> /dev/null || die
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # 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() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2016-03-14 23:37 Sam Jorna
0 siblings, 0 replies; 129+ messages in thread
From: Sam Jorna @ 2016-03-14 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 2c59901ebb6488a4d4477c8ec150db2b37dc49d4
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 23:26:47 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 23:26:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c59901e
sci-geosciences/grass: update metadata
Package-Manager: portage-2.2.28
sci-geosciences/grass/metadata.xml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 5489ecf..7641295 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -2,18 +2,13 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>wraeth@wraeth.id.au</email>
+ <email>wraeth@gentoo.org</email>
<name>Sam Jorna</name>
- <description>Proxy maintainer - assign bugs to him</description>
</maintainer>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
<name>Gentoo Geosciences Project</name>
</maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<longdescription>The original GIS, yes the first one, developed by the US
Army Corp of Engineers, now an active open source GIS. See the GRASS Documentation
Project for more info http://grass.itc.it/gdp/index.php
^ permalink raw reply related [flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-12-26 22:31 Amy Winston
0 siblings, 0 replies; 129+ messages in thread
From: Amy Winston @ 2015-12-26 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 3c68bee97f3bf28065252ed8dde34c62a8bb7ea0
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 22:26:24 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 22:29:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c68bee9
sci-geosciences/grass: version bump 7.0.2 bug #566314.By wraeth
Package-Manager: portage-2.2.24
sci-geosciences/grass/Manifest | 1 +
sci-geosciences/grass/grass-7.0.2.ebuild | 270 +++++++++++++++++++++++++++++++
2 files changed, 271 insertions(+)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 4fc483a..09a6c76 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1 +1,2 @@
DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266
+DIST grass-7.0.2.tar.gz 38102415 SHA256 2eabd84c5426c675b7f3046213bbacb0cee9d0225df15e1530b93f43ec6b190b SHA512 5f6432263e4d52c914dfdd2bc8199f32c8f366b0ffae6a178033af7eee7b3c2632668b3d3cd70219969ecfd5ad6abefe6e65f0eaf72f27784fea3b4b9d51acfe WHIRLPOOL e1f5a90e793db74bcdf891b5f5a00c2bafa2842a6415ec433a45d6604d4943aa3d95b6e4d95265753a4ee8fc6819ec1b66ddea2d11802ac1c7a37150f7cea6d1
diff --git a/sci-geosciences/grass/grass-7.0.2.ebuild b/sci-geosciences/grass/grass-7.0.2.ebuild
new file mode 100644
index 0000000..c63746b
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.2.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite(-)?"
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.0.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sci-libs/gdal
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ 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-2.8.10.1:2.8[cairo,opengl?]
+ x11-libs/cairo[X,opengl?]
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ X? (
+ dev-lang/swig
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ opengl? ( X )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
+ "${FILESDIR}/${PN}"-7.0.1-soname.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 <impl>"
+ ewarn "where <impl> 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 <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
+ 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"
+
+ epatch "${PATCHES[@]}"
+
+ epatch_user
+ eautoconf
+
+ ebegin "Fixing python shebangs"
+ python_fix_shebang -q "${S}"
+ eend $?
+}
+
+src_configure() {
+ if use X; then
+ WX_BUILD=yes
+ WX_GTK_VER=2.8
+ need-wxwidgets unicode
+ fi
+
+ addwrite "${ROOT}dev/dri/renderD128"
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(use_with cxx) \
+ $(use_with tiff) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with mysql) \
+ $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+ $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
+ $(use_with nls) \
+ $(use_with readline) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ --with-gdal="${ROOT}usr/bin/gdal-config" \
+ $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+ $(use_with X wxwidgets "${WX_CONFIG}") \
+ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+ $(use_with geos geos "${ROOT}usr/bin/geos-config") \
+ --with-proj-includes="${ROOT}usr/include/libprojectM" \
+ --with-proj-libs="${ROOT}usr/$(get_libdir)" \
+ --with-proj-share="${ROOT}usr/share/proj/" \
+ $(use_with X x)
+}
+
+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/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null || die
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ dohtml -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # 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
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+ fi
+
+ popd &> /dev/null || die
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # 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() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-12-26 22:31 Amy Winston
0 siblings, 0 replies; 129+ messages in thread
From: Amy Winston @ 2015-12-26 22:31 UTC (permalink / raw
To: gentoo-commits
commit: b9156a7f39e6501aa3a4e3363abb1301b95c35f6
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 22:22:29 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 22:29:42 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9156a7f
sci-geosciences/grass: Update DEPEND and add missing eclass inheretance bug #567734.By wraeth
Package-Manager: portage-2.2.24
.../grass/{grass-7.0.1-r4.ebuild => grass-7.0.1-r5.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.0.1-r4.ebuild b/sci-geosciences/grass/grass-7.0.1-r5.ebuild
similarity index 98%
rename from sci-geosciences/grass/grass-7.0.1-r4.ebuild
rename to sci-geosciences/grass/grass-7.0.1-r5.ebuild
index 1c6a17b..2f1201c 100644
--- a/sci-geosciences/grass/grass-7.0.1-r4.ebuild
+++ b/sci-geosciences/grass/grass-7.0.1-r5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite(-)?"
WANT_AUTOCONF="2.1"
-inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools
+inherit eutils gnome2 fdo-mime multilib python-single-r1 versionator wxwidgets autotools
MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
MY_PM=${MY_PM/.}
@@ -19,7 +19,7 @@ HOMEPAGE="http://grass.osgeo.org/"
SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/7.0.1-r5"
KEYWORDS="~amd64 ~x86"
IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-12-01 8:38 Ian Delaney
0 siblings, 0 replies; 129+ messages in thread
From: Ian Delaney @ 2015-12-01 8:38 UTC (permalink / raw
To: gentoo-commits
commit: 7b7292c071b7e6f0c8be5952cf2a05691d072222
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 1 08:38:06 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 08:38:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7292c0
sci-geosciences/grass: remove pmasked and broken vn. 6.4.2
Package-Manager: portage-2.2.24
sci-geosciences/grass/Manifest | 1 -
sci-geosciences/grass/grass-6.4.2.ebuild | 327 -------------------------------
2 files changed, 328 deletions(-)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index f520f8f..4fc483a 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,2 +1 @@
-DIST grass-6.4.2.tar.gz 24097202 SHA256 670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca SHA512 537905942965ca949ce241c9e147bb340837f1815d36a1d0170cf18482f66936cb24bda540345d8287a98e4a9275fc129bbc4decf7c3053d123e0f90819b2e5b WHIRLPOOL 65e71c9846f59226bf2ccb3cf224628ac4065dfb2385454083e1db21361e1872192e05763c8a28154f1b536d9b276084efdeb58d730a40f99402ff3e5bf13eb4
DIST grass-7.0.1.tar.gz 33733368 SHA256 0987dd1618fde24b05785a502c7db8c09401a522a7a3ee50543068fab4eb405f SHA512 cb1c356eb19f793530e4e313cc5e81b3be27817eea8961c6e5673b955726e7ae26c38942d6a620dc89c60b8051cdb0ed549c70fdfab8c65f5d17c901521ffaff WHIRLPOOL ed97e45873ea39df32e4ad9ed663087e0077d4bfbbbc9f1fc89729c1d411d550e3354fbc937741c465d94929b6da30311e44926db53fe0f1edb3ce7b850b2266
diff --git a/sci-geosciences/grass/grass-6.4.2.ebuild b/sci-geosciences/grass/grass-6.4.2.ebuild
deleted file mode 100644
index d76e8bf..0000000
--- a/sci-geosciences/grass/grass-6.4.2.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2"
-WANT_AUTOCONF="2.1"
-
-inherit eutils gnome2 multilib python versionator wxwidgets autotools
-
-MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="6"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="X cairo cxx ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png postgres python readline sqlite tiff truetype wxwidgets"
-
-TCL_DEPS="
- >=dev-lang/tcl-8.5:0
- >=dev-lang/tk-8.5:0
- "
-
-RDEPEND="
- >=app-admin/eselect-1.2
- sci-libs/gdal
- sci-libs/proj
- sys-libs/gdbm
- sys-libs/ncurses
- sys-libs/zlib
- cairo? ( x11-libs/cairo[X?,opengl?] )
- ffmpeg? ( >=virtual/ffmpeg-0.10 )
- fftw? ( sci-libs/fftw:3.0 )
- gmath? (
- virtual/blas
- virtual/lapack
- )
- jpeg? ( virtual/jpeg:0 )
- mysql? ( virtual/mysql )
- odbc? ( dev-db/unixODBC )
- opengl? (
- virtual/opengl
- ${TCL_DEPS}
- )
- 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 )
- wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- x11-libs/libXt
- motif? (
- >=x11-libs/motif-2.3:0
- opengl? (
- || (
- media-libs/mesa[motif]
- ( media-libs/mesa x11-libs/libGLw )
- )
- )
- )
- !python? ( ${TCL_DEPS} )
- !wxwidgets? ( ${TCL_DEPS} )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- sys-devel/gettext
- sys-devel/bison
- wxwidgets? ( dev-lang/swig )
- X? (
- x11-proto/xextproto
- x11-proto/xproto
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-pkgconf.patch
- "${FILESDIR}"/${PN}-6.4.1-libav-0.8.patch
- "${FILESDIR}"/${PN}-6.4.2-ffmpeg-1.patch
- "${FILESDIR}"/${PN}-6.4.2-configure.patch
- "${FILESDIR}"/${PN}-6.4.2-libav-9.patch
-)
-
-REQUIRED_USE="
- motif? ( X )
- opengl? ( X )
- wxwidgets? ( X python )
-"
-
-pkg_setup() {
- local myblas
-
- # check correct gmath profiles (this must sadly die)
- if use gmath; then
- for d in $(eselect lapack show); do myblas=${d}; done
- if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/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
- for d in $(eselect blas show); do myblas=${d}; done
- 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
-
- if use python; then
- # only py2 is supported
- python_set_active_version 2
- fi
-}
-
-src_prepare() {
- use opengl || epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
- epatch ${PATCHES[@]}
- epatch_user
- eautoconf
-}
-
-src_configure() {
- local myconf TCL_LIBDIR
-
- if use X; then
- TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5"
- myconf+="
- --with-tcltk-libs=${TCL_LIBDIR}
- $(use_with motif)
- $(use_with opengl)
- --with-x
- "
-
- use opengl && myconf+=" --with-tcltk"
- use motif && use opengl && myconf+=" --with-glw"
- use motif || myconf+=" --without-glw"
-
- if use wxwidgets; then
- WX_BUILD=yes
- WX_GTK_VER=2.8
- need-wxwidgets unicode
- myconf+="
- --without-tcltk
- --with-wxwidgets=${WX_CONFIG}
- "
- else
- WX_BUILD=no
- # use tcl gui if wxwidgets are disabled
- myconf+="
- --with-tcltk
- --without-wxwidgets
- "
- fi
- else
- myconf+="
- --without-glw
- --without-opengl
- --without-tcltk
- --without-wxwidgets
- --without-x
- "
- fi
-
- econf \
- --with-gdal=$(type -P gdal-config) \
- --with-curses \
- --with-proj \
- --with-proj-share="/usr/share/proj/" \
- --without-glw \
- --enable-shared \
- $(use_enable amd64 64bit) \
- $(use_enable ppc64 64bit) \
- $(use_with cairo) \
- $(use_with cxx) \
- $(use_with fftw) \
- $(use_with ffmpeg) \
- $(use_with gmath blas) \
- $(use_with gmath lapack) \
- $(use_with jpeg) \
- $(use_with mysql) \
- --with-mysql-includes=/usr/include/mysql \
- --with-mysql-libs=/usr/$(get_libdir)/mysql \
- $(use_with nls) \
- $(use_with odbc) \
- $(use_with png) \
- $(use_with postgres) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with sqlite) \
- $(use_with tiff) \
- $(use_with truetype freetype) \
- --with-freetype-includes="/usr/include/freetype2/" \
- --enable-largefile \
- ${myconf}
-}
-
-src_compile() {
- # we don't want to link against embeded mysql lib
- emake MYSQLDLIB=""
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- INST_DIR="${D}"/usr/${MY_PM} \
- prefix="${D}"/usr BINDIR="${D}"/usr/bin \
- PREFIX="${D}"/usr/ \
- install
-
- pushd "${ED}"/usr/${MY_PM} &> /dev/null
-
- # fix docs
- dodoc AUTHORS CHANGES
- dohtml -r docs/html/*
- rm -rf docs/ || die
- rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
- # manuals
- dodir /usr/share/man/man1
- mv man/man1/* "${ED}"/usr/share/man/man1/ || die
- rm -rf man/ || die
- mv -vf "${ED}"/usr/share/man/man1/sql.1{,grass} || die #381599
-
- # translations
- if use nls; then
- dodir /usr/share/locale/
- mv locale/* "${ED}"/usr/share/locale/ || die
- rm -rf locale/ || die
- # pt_BR is broken
- mv "${ED}"/usr/share/locale/pt_br "${ED}"/usr/share/locale/pt_BR || die
- fi
-
- popd &> /dev/null
-
- # place libraries where they belong
- mv "${ED}"/usr/${MY_PM}/lib/ "${ED}"/usr/$(get_libdir)/ || die
-
- # place header files where they belong
- mv "${ED}"/usr/${MY_PM}/include/ "${ED}"/usr/include/ || die
- # make rules are not required on installed system
- rm -rf "${ED}"/usr/include/Make || die
-
- # mv remaining gisbase stuff to libdir
- mv "${ED}"/usr/${MY_PM} "${ED}"/usr/$(get_libdir) || die
-
- # set proper default window renderer
- if [[ ${WX_BUILD} == yes ]]; then
- sed -i \
- -e "1,\$s:^DEFAULT_GUI.*:DEFAULT_GUI=\"wxpython\":" \
- "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/Init.sh || die
- fi
-
- # get proper folder for grass path in script
- sed -i \
- -e "1,\$s:^GISBASE.*:GISBASE=/usr/$(get_libdir)/${MY_PM}:" \
- "${ED}"usr/bin/${MY_PM} || die
-
- # get proper fonts path for fontcap
- sed -i \
- -e "s|${ED}/usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
- "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
-
- if use X; then
- generate_files
- doicon gui/icons/${PN}-48x48.png
- domenu ${MY_PM}-grass.desktop
- 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() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-generate_files() {
- local GUI="-gui"
- [[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-
- cat <<-EOF > ${MY_PM}-grass.desktop
- [Desktop Entry]
- Encoding=UTF-8
- Version=1.0
- Name=Grass ${PV}
- Type=Application
- Comment=GRASS (Geographic Resources Analysis Support System), the original GIS.
- Exec=${TERM} -T Grass -e /usr/bin/${MY_PM} ${GUI}
- Path=
- Icon=${PN}-48x48.png
- Categories=Science;Education;
- Terminal=false
-EOF
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-10-30 6:19 Jeroen Roovers
0 siblings, 0 replies; 129+ messages in thread
From: Jeroen Roovers @ 2015-10-30 6:19 UTC (permalink / raw
To: gentoo-commits
commit: 40db39ab81cbcc4998891ddad305710ac3704b68
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 06:19:18 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 06:19:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40db39ab
sci-geosciences/grass: Mark ~ppc64 (bug #563378).
Package-Manager: portage-2.2.23
RepoMan-Options: --ignore-arches
sci-geosciences/grass/grass-7.0.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.0.1-r3.ebuild b/sci-geosciences/grass/grass-7.0.1-r3.ebuild
index 07e7d43..e4dd7e6 100644
--- a/sci-geosciences/grass/grass-7.0.1-r3.ebuild
+++ b/sci-geosciences/grass/grass-7.0.1-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
RDEPEND="${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-10-28 15:04 Amy Winston
0 siblings, 0 replies; 129+ messages in thread
From: Amy Winston @ 2015-10-28 15:04 UTC (permalink / raw
To: gentoo-commits
commit: a1243d0b81a0a940591d795faf84b9bc27d8e6e4
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 15:03:38 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 15:03:38 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1243d0b
sci-geosciences/grass: revbump to 7.0.1-r3
Fixes sandbox violation when build with USE=opencl, remove USE=gdal and
add hard dependency based on upstream requirements to resolve build
failure, tidy patches into to PATCHES array, ebuild submitted by wraeth.
Gentoo-bug: 563854
Gentoo-bug: 564188
Package-Manager: portage-2.2.20.1
sci-geosciences/grass/grass-7.0.1-r1.ebuild | 263 ---------------------
...grass-7.0.1-r2.ebuild => grass-7.0.1-r3.ebuild} | 31 +--
2 files changed, 17 insertions(+), 277 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.0.1-r1.ebuild b/sci-geosciences/grass/grass-7.0.1-r1.ebuild
deleted file mode 100644
index 797d5cd..0000000
--- a/sci-geosciences/grass/grass-7.0.1-r1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite(-)?"
-WANT_AUTOCONF="2.1"
-
-inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools
-
-MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-IUSE="X blas cxx fftw gdal geos lapack mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
-
-RDEPEND="${PYTHON_DEPS}
- >=app-admin/eselect-1.2
- media-libs/libprojectm
- sci-libs/proj
- sci-libs/xdrfile
- sys-libs/gdbm
- sys-libs/ncurses:0=
- sys-libs/zlib
- fftw? ( sci-libs/fftw:3.0 )
- gdal? ( sci-libs/gdal )
- geos? ( sci-libs/geos )
- blas? ( virtual/blas
- sci-libs/cblas-reference )
- lapack? ( virtual/lapack )
- mysql? ( virtual/mysql )
- 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-2.8.10.1:2.8[cairo,opengl?]
- x11-libs/cairo[X,opengl?]
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- x11-libs/libXt
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- sys-devel/gettext
- sys-devel/bison
- X? (
- dev-lang/swig
- x11-proto/xextproto
- x11-proto/xproto
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- opengl? ( X )"
-
-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 <impl>"
- ewarn "where <impl> 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 <impl>"
- ewarn "where <impl> is atlas, threaded-atlas or reference"
- die "setup failed"
- fi
- fi
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Fix undefined reference to errno in lib/raster/open.c
- # see http://trac.osgeo.org/grass/changeset/66398
- epatch "${FILESDIR}/${P}"-include-errno.patch
-
- # Fix undeclared variable if OSG is disabled
- epatch "${FILESDIR}/${P}"-declare-inespg.patch
-
- # Bug #563490
- epatch "${FILESDIR}/${PV}"-sec-format.patch
-
- # 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
-
- epatch_user
- eautoconf
-
- python_fix_shebang "${S}"
-}
-
-src_configure() {
- if use X; then
- WX_BUILD=yes
- WX_GTK_VER=2.8
- need-wxwidgets unicode
- fi
-
- econf \
- --enable-shared \
- --disable-w11 \
- $(use_with cxx) \
- $(use_with tiff) \
- $(use_with png) \
- $(use_with postgres) \
- $(use_with mysql) \
- $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
- $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
- $(use_with nls) \
- $(use_with readline) \
- --without-opendwg \
- --with-regex \
- $(use_with threads pthread) \
- $(use_with openmp) \
- $(use_with opencl) \
- $(use_with gdal gdal "${ROOT}usr/bin/gdal-config") \
- --without-liblas \
- $(use_with X wxwidgets "${WX_CONFIG}") \
- $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
- $(use_with geos geos "${ROOT}usr/bin/geos-config") \
- --with-proj-includes="${ROOT}usr/include/libprojectM" \
- --with-proj-libs="${ROOT}usr/$(get_libdir)" \
- --with-proj-share="${ROOT}usr/share/proj/" \
- $(use_with X x)
-}
-
-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/${MY_PM}" \
- prefix="${D}usr" BINDIR="${D}usr/bin" \
- PREFIX="${D}usr/" \
- install
-
- pushd "${D}usr/${MY_PM}" &> /dev/null
-
- # fix docs
- dodoc AUTHORS CHANGES
- dohtml -r docs/html/*
- rm -rf docs/ || die
- rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
- # 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
- rm -rf locale/ || die
- # pt_BR is broken
- mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
- fi
-
- popd &> /dev/null
-
- # place libraries where they belong
- mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
-
- # place header files where they belong
- mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
- # make rules are not required on installed system
- rm -rf "${D}usr/include/Make" || die
-
- # mv remaining gisbase stuff to libdir
- mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
-
- # 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 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() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
diff --git a/sci-geosciences/grass/grass-7.0.1-r2.ebuild b/sci-geosciences/grass/grass-7.0.1-r3.ebuild
similarity index 91%
rename from sci-geosciences/grass/grass-7.0.1-r2.ebuild
rename to sci-geosciences/grass/grass-7.0.1-r3.ebuild
index 0083447..07e7d43 100644
--- a/sci-geosciences/grass/grass-7.0.1-r2.ebuild
+++ b/sci-geosciences/grass/grass-7.0.1-r3.ebuild
@@ -21,18 +21,18 @@ SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="7"
KEYWORDS="~amd64 ~x86"
-IUSE="X blas cxx fftw gdal geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
RDEPEND="${PYTHON_DEPS}
>=app-admin/eselect-1.2
media-libs/libprojectm
sci-libs/proj
sci-libs/xdrfile
+ sci-libs/gdal
sys-libs/gdbm
sys-libs/ncurses:0=
sys-libs/zlib
fftw? ( sci-libs/fftw:3.0 )
- gdal? ( sci-libs/gdal )
geos? ( sci-libs/geos )
blas? ( virtual/blas
sci-libs/cblas-reference )
@@ -80,6 +80,12 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}
opengl? ( X )"
+PATCHES=(
+ "${FILESDIR}/${P}"-include-errno.patch
+ "${FILESDIR}/${P}"-declare-inespg.patch
+ "${FILESDIR}/${PV}"-sec-format.patch
+)
+
pkg_setup() {
if use lapack; then
local mylapack
@@ -109,21 +115,16 @@ pkg_setup() {
}
src_prepare() {
- # Fix undefined reference to errno in lib/raster/open.c
- # see http://trac.osgeo.org/grass/changeset/66398
- epatch "${FILESDIR}/${P}"-include-errno.patch
-
- # Fix undeclared variable if OSG is disabled
- epatch "${FILESDIR}/${P}"-declare-inespg.patch
-
- # Bug #563490
- epatch "${FILESDIR}/${PV}"-sec-format.patch
-
# 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"
+
epatch_user
eautoconf
@@ -137,6 +138,8 @@ src_configure() {
need-wxwidgets unicode
fi
+ use opencl && addwrite "${ROOT}dev/dri/renderD128"
+
econf \
--enable-shared \
--disable-w11 \
@@ -163,7 +166,7 @@ src_configure() {
$(use_with threads pthread) \
$(use_with openmp) \
$(use_with opencl) \
- $(use_with gdal gdal "${ROOT}usr/bin/gdal-config") \
+ --with-gdal="${ROOT}usr/bin/gdal-config" \
$(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
$(use_with X wxwidgets "${WX_CONFIG}") \
$(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
@@ -261,4 +264,4 @@ pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
fi
-}
+}
\ No newline at end of file
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-10-24 13:58 Amy Winston
0 siblings, 0 replies; 129+ messages in thread
From: Amy Winston @ 2015-10-24 13:58 UTC (permalink / raw
To: gentoo-commits
commit: 1471d440792a94bb6937315bf9b961503451e107
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 13:57:24 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 13:57:24 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1471d440
sci-geosciences/grass: fix icon location, add die. By wraeth.
Package-Manager: portage-2.2.20.1
sci-geosciences/grass/grass-7.0.1-r2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.0.1-r2.ebuild b/sci-geosciences/grass/grass-7.0.1-r2.ebuild
index b211da2..0083447 100644
--- a/sci-geosciences/grass/grass-7.0.1-r2.ebuild
+++ b/sci-geosciences/grass/grass-7.0.1-r2.ebuild
@@ -186,7 +186,7 @@ src_install() {
PREFIX="${D}usr/" \
install
- pushd "${D}usr/${MY_PM}" &> /dev/null
+ pushd "${D}usr/${MY_PM}" &> /dev/null || die
# fix docs
dodoc AUTHORS CHANGES
@@ -207,7 +207,7 @@ src_install() {
mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
fi
- popd &> /dev/null
+ popd &> /dev/null || die
# place libraries where they belong
mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
@@ -238,7 +238,7 @@ src_install() {
local GUI="-gui"
[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
- doicon gui/icons/${PN}-48x48.png
+ doicon -s 48 gui/icons/${PN}-48x48.png
fi
# install .pc file so other apps know where to look for grass
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-10-24 5:57 Ian Delaney
0 siblings, 0 replies; 129+ messages in thread
From: Ian Delaney @ 2015-10-24 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 597abdf5c729d1370b1ce672150dc7133c3da873
Author: wraeth <wraeth <AT> wraeth <DOT> id <DOT> au>
AuthorDate: Sat Oct 24 05:13:08 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 05:57:24 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597abdf5
sci-geosciences/grass: revbump to -7.0.1-r2; add dep on liblas
Adds new USE flag and update configure options to support new ebuild
sci-geosciences/liblas.
Package-Manager: portage-2.2.23
sci-geosciences/grass/grass-7.0.1-r2.ebuild | 264 ++++++++++++++++++++++++++++
sci-geosciences/grass/metadata.xml | 2 +
2 files changed, 266 insertions(+)
diff --git a/sci-geosciences/grass/grass-7.0.1-r2.ebuild b/sci-geosciences/grass/grass-7.0.1-r2.ebuild
new file mode 100644
index 0000000..b211da2
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.1-r2.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite(-)?"
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+IUSE="X blas cxx fftw gdal geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+ gdal? ( sci-libs/gdal )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ liblas? ( sci-geosciences/liblas )
+ mysql? ( virtual/mysql )
+ 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-2.8.10.1:2.8[cairo,opengl?]
+ x11-libs/cairo[X,opengl?]
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ X? (
+ dev-lang/swig
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ opengl? ( X )"
+
+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 <impl>"
+ ewarn "where <impl> 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 <impl>"
+ ewarn "where <impl> is atlas, threaded-atlas or reference"
+ die "setup failed"
+ fi
+ fi
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix undefined reference to errno in lib/raster/open.c
+ # see http://trac.osgeo.org/grass/changeset/66398
+ epatch "${FILESDIR}/${P}"-include-errno.patch
+
+ # Fix undeclared variable if OSG is disabled
+ epatch "${FILESDIR}/${P}"-declare-inespg.patch
+
+ # Bug #563490
+ epatch "${FILESDIR}/${PV}"-sec-format.patch
+
+ # 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
+
+ epatch_user
+ eautoconf
+
+ python_fix_shebang "${S}"
+}
+
+src_configure() {
+ if use X; then
+ WX_BUILD=yes
+ WX_GTK_VER=2.8
+ need-wxwidgets unicode
+ fi
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(use_with cxx) \
+ $(use_with tiff) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with mysql) \
+ $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+ $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
+ $(use_with nls) \
+ $(use_with readline) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ $(use_with gdal gdal "${ROOT}usr/bin/gdal-config") \
+ $(use_with liblas liblas "${ROOT}usr/bin/liblas-config") \
+ $(use_with X wxwidgets "${WX_CONFIG}") \
+ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+ $(use_with geos geos "${ROOT}usr/bin/geos-config") \
+ --with-proj-includes="${ROOT}usr/include/libprojectM" \
+ --with-proj-libs="${ROOT}usr/$(get_libdir)" \
+ --with-proj-share="${ROOT}usr/share/proj/" \
+ $(use_with X x)
+}
+
+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/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ dohtml -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # 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
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+ fi
+
+ popd &> /dev/null
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # 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 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() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 4f00c18..3dc849a 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -18,6 +18,8 @@ Project for more info http://grass.itc.it/gdp/index.php
extended options to the v.select module</flag>
<flag name="gmath">Enable gmath wrapper for BLAS/Lapack
(<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
+ <flag name="liblas">Include support for LAS and LAZ encoded LiDAR
+ files through <pkg>sci-geosciences/liblas</pkg></flag>
<flag name="opencl">Enable OpenCL support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-10-22 4:37 Ian Delaney
0 siblings, 0 replies; 129+ messages in thread
From: Ian Delaney @ 2015-10-22 4:37 UTC (permalink / raw
To: gentoo-commits
commit: d1ce67fd7e7a7e3518e9ed1131c54bb6d30e7498
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 04:36:32 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 04:37:09 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ce67fd
sci-geosciences/grass: address qa issue to -7.0.1-r1, fixes gentoo bug
issue; does not respect CC
Gentoo bug: #563492
Package-Manager: portage-2.2.20.1
sci-geosciences/grass/grass-7.0.1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.0.1-r1.ebuild b/sci-geosciences/grass/grass-7.0.1-r1.ebuild
index 5589327..68af821 100644
--- a/sci-geosciences/grass/grass-7.0.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.0.1-r1.ebuild
@@ -173,7 +173,7 @@ src_configure() {
src_compile() {
# we don't want to link against embedded mysql lib
- emake MYSQLDLIB=""
+ emake CC="$(tc-getCC)" MYSQLDLIB=""
}
src_install() {
@@ -258,4 +258,4 @@ pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
fi
-}
\ No newline at end of file
+}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-10-18 10:31 Amy Winston
0 siblings, 0 replies; 129+ messages in thread
From: Amy Winston @ 2015-10-18 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 817028c686a8bb2e89cd4e205201950a243a66b6
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 10:17:01 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 10:17:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=817028c6
sci-geosciences/grass: Remove broken version.
Package-Manager: portage-2.2.20.1
sci-geosciences/grass/grass-7.0.1.ebuild | 246 -------------------------------
1 file changed, 246 deletions(-)
diff --git a/sci-geosciences/grass/grass-7.0.1.ebuild b/sci-geosciences/grass/grass-7.0.1.ebuild
deleted file mode 100644
index c3e2052..0000000
--- a/sci-geosciences/grass/grass-7.0.1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WANT_AUTOCONF="2.1"
-
-inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools
-
-MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
-SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X cairo cxx fftw gdal geos blas lapack regex mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype wxwidgets"
-
-RDEPEND="
- >=app-admin/eselect-1.2
- sci-libs/proj
- sys-libs/gdbm
- sys-libs/ncurses:0=
- sys-libs/zlib
- cairo? ( x11-libs/cairo[X?,opengl?] )
- fftw? ( sci-libs/fftw:3.0 )
- geos? ( sci-libs/geos )
- gdal? ( sci-libs/gdal )
- blas? ( virtual/blas )
- lapack? ( virtual/lapack )
- mysql? ( virtual/mysql )
- 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 )
- wxwidgets? ( >=dev-python/wxpython-2.8.10.1:2.8[cairo,opengl?] )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- x11-libs/libXt
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- sys-devel/gettext
- sys-devel/bison
- wxwidgets? ( dev-lang/swig )
- X? (
- x11-proto/xextproto
- x11-proto/xproto
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- opengl? ( X )
- wxwidgets? ( X )
-"
-
-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 <impl>"
- ewarn "where <impl> 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 <impl>"
- ewarn "where <impl> is atlas, threaded-atlas or reference"
- die "setup failed"
- fi
- fi
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Fix undefined reference to errno in lib/raster/open.c
- # see http://trac.osgeo.org/grass/changeset/66398
- epatch "${FILESDIR}/${P}-include-errno.patch"
-
- # Fix undeclared variable if OSG is disabled
- epatch "${FILESDIR}/${P}-declare-inespg.patch"
-
- epatch_user
- eautoconf
-}
-
-src_configure() {
- if use wxwidgets; then
- WX_BUILD=yes
- WX_GTK_VER=2.8
- need-wxwidgets unicode
- fi
-
- econf \
- --enable-shared \
- --disable-w11 \
- $(use_with cxx) \
- $(use_with tiff) \
- $(use_with png) \
- $(use_with postgres) \
- $(use_with mysql) \
- $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
- $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/mysql") \
- $(use_with sqlite) \
- $(use_with opengl) \
- $(use_with odbc) \
- $(use_with fftw) \
- $(use_with blas) \
- $(use_with lapack) \
- $(use_with cairo) \
- $(use_with truetype freetype) \
- $(use_with truetype freetype-includes "${ROOT}usr/include/freetype2") \
- $(use_with nls) \
- $(use_with readline) \
- --without-opendwg \
- $(use_with regex) \
- $(use_with threads pthread) \
- $(use_with openmp) \
- $(use_with opencl) \
- $(use_with gdal gdal "${ROOT}usr/bin/gdal-config") \
- --without-liblas \
- $(use_with wxwidgets wxwidgets "${WX_CONFIG}") \
- $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
- $(use_with geos geos "${ROOT}usr/bin/geos-config") \
- --with-proj-includes="${ROOT}usr/include/libprojectM" \
- --with-proj-libs="${ROOT}usr/$(get_libdir)" \
- --with-proj-share="${ROOT}usr/share/proj/" \
- $(use_with X x)
-}
-
-src_compile() {
- # we don't want to link against embedded mysql lib
- emake MYSQLDLIB=""
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- INST_DIR="${D}"/usr/${MY_PM} \
- prefix="${D}"/usr BINDIR="${D}"/usr/bin \
- PREFIX="${D}"/usr/ \
- install
-
- pushd "${D}"/usr/${MY_PM} &> /dev/null
-
- # fix docs
- dodoc AUTHORS CHANGES
- dohtml -r docs/html/*
- rm -rf docs/ || die
- rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
-
- # 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
- rm -rf locale/ || die
- # pt_BR is broken
- mv "${D}"/usr/share/locale/pt_br "${D}"/usr/share/locale/pt_BR || die
- fi
-
- popd &> /dev/null
-
- # place libraries where they belong
- mv "${D}"/usr/${MY_PM}/lib/ "${D}"/usr/$(get_libdir)/ || die
-
- # place header files where they belong
- mv "${D}"/usr/${MY_PM}/include/ "${D}"/usr/include/ || die
- # make rules are not required on installed system
- rm -rf "${D}"/usr/include/Make || die
-
- # mv remaining gisbase stuff to libdir
- mv "${D}"/usr/${MY_PM} "${D}"/usr/$(get_libdir) || die
-
- # get proper folder for grass path in script
- sed -i \
- -e "1,\$s:^GISBASE.*:GISBASE=/usr/$(get_libdir)/${MY_PM}:" \
- "${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
-
- 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 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() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-10-18 10:31 Amy Winston
0 siblings, 0 replies; 129+ messages in thread
From: Amy Winston @ 2015-10-18 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 9414c99785922923ebad88294e17917b1e22dd4d
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 10:21:22 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 10:21:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9414c997
sci-geosciences/grass: unused useflag regex removed from metadata.
Package-Manager: portage-2.2.20.1
sci-geosciences/grass/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index d60eb17..4f00c18 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -19,6 +19,5 @@ Project for more info http://grass.itc.it/gdp/index.php
<flag name="gmath">Enable gmath wrapper for BLAS/Lapack
(<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
<flag name="opencl">Enable OpenCL support</flag>
- <flag name="regex">Include support regex functionality</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 129+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-10-18 8:14 Pacho Ramos
0 siblings, 0 replies; 129+ messages in thread
From: Pacho Ramos @ 2015-10-18 8:14 UTC (permalink / raw
To: gentoo-commits
commit: 2736fbb8e95436c75c3773721a3ee68674b8acba
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 08:14:26 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 08:14:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2736fbb8
sci-geosciences/grass: Drop keywords that need more deps to be keyworded too
Package-Manager: portage-2.2.23
sci-geosciences/grass/grass-7.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-geosciences/grass/grass-7.0.1-r1.ebuild b/sci-geosciences/grass/grass-7.0.1-r1.ebuild
index 2ff57fc..5589327 100644
--- a/sci-geosciences/grass/grass-7.0.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.0.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="X blas cxx fftw gdal geos lapack mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
RDEPEND="${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 129+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
@ 2015-10-17 17:39 Amy Winston
0 siblings, 0 replies; 129+ messages in thread
From: Amy Winston @ 2015-10-17 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 36f6a17dad0bbc976682e88c849da5a7682d7e4f
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 17:37:35 2015 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 17:37:35 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f6a17d
sci-geosciences/grass: revbump to -7.0.1-r1 wrt the gentoo bugs. By wraeth.
Add missing dependencies, reset USE flag to set the gui, fix calls to
wrong python version and shebangs, hardcode configure options to
ensure runtime operations, all changes written by proxy maintainer
Gentoo bugs: #541622 #563264
Package-Manager: portage-2.2.20.1
sci-geosciences/grass/grass-7.0.1-r1.ebuild | 261 ++++++++++++++++++++++++++++
1 file changed, 261 insertions(+)
diff --git a/sci-geosciences/grass/grass-7.0.1-r1.ebuild b/sci-geosciences/grass/grass-7.0.1-r1.ebuild
new file mode 100644
index 0000000..2ff57fc
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.0.1-r1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite(-)?"
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 multilib python-single-r1 versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 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="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X blas cxx fftw gdal geos lapack mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-admin/eselect-1.2
+ media-libs/libprojectm
+ sci-libs/proj
+ sci-libs/xdrfile
+ sys-libs/gdbm
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ fftw? ( sci-libs/fftw:3.0 )
+ gdal? ( sci-libs/gdal )
+ geos? ( sci-libs/geos )
+ blas? ( virtual/blas
+ sci-libs/cblas-reference )
+ lapack? ( virtual/lapack )
+ mysql? ( virtual/mysql )
+ 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-2.8.10.1:2.8[cairo,opengl?]
+ x11-libs/cairo[X,opengl?]
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ X? (
+ dev-lang/swig
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ opengl? ( X )
+"
+
+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 <impl>"
+ ewarn "where <impl> 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 <impl>"
+ ewarn "where <impl> is atlas, threaded-atlas or reference"
+ die "setup failed"
+ fi
+ fi
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix undefined reference to errno in lib/raster/open.c
+ # see http://trac.osgeo.org/grass/changeset/66398
+ epatch "${FILESDIR}/${P}-include-errno.patch"
+
+ # Fix undeclared variable if OSG is disabled
+ epatch "${FILESDIR}/${P}-declare-inespg.patch"
+
+ # 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
+
+ epatch_user
+ eautoconf
+
+ python_fix_shebang "${S}"
+}
+
+src_configure() {
+ if use X; then
+ WX_BUILD=yes
+ WX_GTK_VER=2.8
+ need-wxwidgets unicode
+ fi
+
+ econf \
+ --enable-shared \
+ --disable-w11 \
+ $(use_with cxx) \
+ $(use_with tiff) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with mysql) \
+ $(use_with mysql mysql-includes "${ROOT}usr/include/mysql") \
+ $(use_with mysql mysql-libs "${ROOT}usr/$(get_libdir)/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 "${ROOT}usr/include/freetype2") \
+ $(use_with nls) \
+ $(use_with readline) \
+ --without-opendwg \
+ --with-regex \
+ $(use_with threads pthread) \
+ $(use_with openmp) \
+ $(use_with opencl) \
+ $(use_with gdal gdal "${ROOT}usr/bin/gdal-config") \
+ --without-liblas \
+ $(use_with X wxwidgets "${WX_CONFIG}") \
+ $(use_with netcdf netcdf "${ROOT}usr/bin/nc-config") \
+ $(use_with geos geos "${ROOT}usr/bin/geos-config") \
+ --with-proj-includes="${ROOT}usr/include/libprojectM" \
+ --with-proj-libs="${ROOT}usr/$(get_libdir)" \
+ --with-proj-share="${ROOT}usr/share/proj/" \
+ $(use_with X x)
+}
+
+src_compile() {
+ # we don't want to link against embedded mysql lib
+ emake MYSQLDLIB=""
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ INST_DIR="${D}usr/${MY_PM}" \
+ prefix="${D}usr" BINDIR="${D}usr/bin" \
+ PREFIX="${D}usr/" \
+ install
+
+ pushd "${D}usr/${MY_PM}" &> /dev/null
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ dohtml -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # 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
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${D}usr/share/locale/pt_br" "${D}usr/share/locale/pt_BR" || die
+ fi
+
+ popd &> /dev/null
+
+ # place libraries where they belong
+ mv "${D}usr/${MY_PM}/lib/" "${D}usr/$(get_libdir)/" || die
+
+ # place header files where they belong
+ mv "${D}usr/${MY_PM}/include/" "${D}usr/include/" || die
+ # make rules are not required on installed system
+ rm -rf "${D}usr/include/Make" || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${D}usr/${MY_PM}" "${D}usr/$(get_libdir)" || die
+
+ # 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 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() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
\ No newline at end of file
^ permalink raw reply related [flat|nested] 129+ messages in thread
end of thread, other threads:[~2024-09-28 9:38 UTC | newest]
Thread overview: 129+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-06 6:32 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/ Agostino Sarubbo
-- strict thread matches above, loose matches on Subject: below --
2024-09-28 9:38 Sam James
2024-08-25 20:27 Eli Schwartz
2024-08-25 20:27 Eli Schwartz
2024-08-10 7:24 Joonas Niilola
2024-08-10 7:24 Joonas Niilola
2024-07-31 19:14 Arthur Zamarin
2024-07-18 7:41 Joonas Niilola
2024-07-18 7:41 Joonas Niilola
2024-07-18 7:41 Joonas Niilola
2024-04-23 21:33 Sam James
2024-03-20 22:12 Andrew Ammerlaan
2024-03-15 6:47 Sam James
2024-01-05 6:42 Sam James
2023-11-30 3:07 Sam James
2023-10-27 8:13 Andrew Ammerlaan
2023-10-17 7:57 Andrew Ammerlaan
2023-10-17 7:57 Andrew Ammerlaan
2023-10-17 7:57 Andrew Ammerlaan
2023-10-04 21:56 Conrad Kostecki
2023-08-24 17:46 Sam James
2023-07-16 13:26 Sam James
2023-07-16 13:26 Sam James
2023-07-16 6:47 Viorel Munteanu
2023-06-15 9:04 Andrew Ammerlaan
2023-05-06 3:52 Sam James
2023-05-06 3:52 Sam James
2023-05-01 9:22 Sam James
2023-05-01 9:22 Sam James
2023-03-19 17:14 David Seifert
2023-03-07 9:09 Joonas Niilola
2023-02-08 4:11 Sam James
2023-02-08 4:11 Sam James
2023-02-08 4:11 Sam James
2023-02-08 4:11 Sam James
2023-02-01 7:23 Sam James
2022-12-18 7:46 Sam James
2022-12-16 4:30 Sam James
2022-12-16 1:40 Sam James
2022-11-18 8:23 Joonas Niilola
2022-10-12 23:32 Sam James
2022-10-09 18:29 Andreas Sturmlechner
2022-09-28 6:31 Jakov Smolić
2022-09-28 6:31 Jakov Smolić
2022-09-28 6:31 Jakov Smolić
2022-08-27 10:53 Sam James
2022-07-15 1:56 Sam James
2022-07-07 19:44 Sam James
2022-07-07 19:44 Sam James
2022-06-15 18:17 Sam James
2022-06-15 9:46 Jakov Smolić
2022-06-04 3:58 Sam James
2022-05-22 20:08 Jakov Smolić
2022-05-22 20:08 Jakov Smolić
2022-05-12 14:56 Andrew Ammerlaan
2022-05-12 14:56 Andrew Ammerlaan
2022-04-18 7:15 Sam James
2022-04-06 6:32 Agostino Sarubbo
2022-03-10 7:51 Jakov Smolić
2022-03-10 7:51 Jakov Smolić
2022-02-26 2:29 Sam James
2022-02-26 2:29 Sam James
2022-01-16 1:47 Sam James
2022-01-16 1:47 Sam James
2022-01-16 1:47 Sam James
2022-01-16 1:47 Sam James
2022-01-02 7:05 Sam James
2022-01-02 7:05 Sam James
2022-01-02 7:05 Sam James
2022-01-02 7:05 Sam James
2022-01-02 7:05 Sam James
2021-12-28 22:00 Sam James
2021-12-09 16:24 Agostino Sarubbo
2021-12-07 7:26 Agostino Sarubbo
2021-10-20 2:42 Sam James
2021-10-20 2:42 Sam James
2021-09-24 23:37 Sam James
2021-09-24 23:36 Sam James
2021-09-24 23:36 Sam James
2021-09-24 23:36 Sam James
2021-09-24 23:36 Sam James
2021-08-06 4:10 Sam James
2021-05-29 17:47 Sam James
2021-03-08 7:35 Joonas Niilola
2021-03-07 19:46 Sam James
2021-03-07 15:54 Thomas Deutschmann
2021-03-07 15:17 Joonas Niilola
2021-03-06 14:07 Joonas Niilola
2021-02-14 14:28 Joonas Niilola
2021-01-20 14:13 Joonas Niilola
2021-01-06 6:34 Sam James
2020-12-29 20:20 Sam James
2020-11-25 8:16 Joonas Niilola
2020-10-04 15:24 David Seifert
2020-02-09 16:36 Michał Górny
2020-02-08 16:53 David Seifert
2020-01-22 21:50 Michał Górny
2020-01-16 6:39 Michał Górny
2019-07-05 8:22 Benda XU
2019-02-21 10:29 Andreas Sturmlechner
2019-02-21 10:29 Andreas Sturmlechner
2018-09-09 15:41 Amy Liffey
2018-05-24 9:36 Amy Liffey
2018-05-24 9:36 Amy Liffey
2018-04-10 1:19 Sam Jorna
2018-04-01 22:27 Matt Turner
2018-03-05 22:14 Andreas Sturmlechner
2017-05-24 7:06 Michael Weber
2017-04-18 23:25 Sam Jorna
2017-04-18 23:25 Sam Jorna
2017-01-11 1:51 Sam Jorna
2017-01-11 1:51 Sam Jorna
2016-11-30 2:29 Sam Jorna
2016-11-26 1:07 Sam Jorna
2016-06-06 7:00 Sam Jorna
2016-03-15 23:26 Sam Jorna
2016-03-14 23:37 Sam Jorna
2015-12-26 22:31 Amy Winston
2015-12-26 22:31 Amy Winston
2015-12-01 8:38 Ian Delaney
2015-10-30 6:19 Jeroen Roovers
2015-10-28 15:04 Amy Winston
2015-10-24 13:58 Amy Winston
2015-10-24 5:57 Ian Delaney
2015-10-22 4:37 Ian Delaney
2015-10-18 10:31 Amy Winston
2015-10-18 10:31 Amy Winston
2015-10-18 8:14 Pacho Ramos
2015-10-17 17:39 Amy Winston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox