commit: e6aa9c8102454529aa033d761539f8df55e3b847
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 6 12:22:03 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 7 21:42:02 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6aa9c81
sci-geosciences/grass: Drop IUSE las
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../{grass-9999.ebuild => grass-8.4.1-r1.ebuild} | 20 ++++++++++++--------
sci-geosciences/grass/grass-9999.ebuild | 13 ++++++-------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/sci-geosciences/grass/grass-9999.ebuild
b/sci-geosciences/grass/grass-8.4.1-r1.ebuild
similarity index 93%
copy from sci-geosciences/grass/grass-9999.ebuild
copy to sci-geosciences/grass/grass-8.4.1-r1.ebuild
index 35f6a21bac82..cffa52162eed 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-8.4.1-r1.ebuild
@@ -3,17 +3,17 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
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"
+DESCRIPTION="Free GIS with raster and vector functionality, as well as 3D
vizualization"
HOMEPAGE="https://grass.osgeo.org/";
LICENSE="GPL-2"
-if [[ ${PV} =~ "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
SLOT="0/8.4"
else
SLOT="0/$(ver_cut 1-2 ${PV})"
@@ -23,20 +23,20 @@ GVERSION=${SLOT#*/}
MY_PM="${PN}${GVERSION}"
MY_PM="${MY_PM/.}"
-if [[ ${PV} =~ "9999" ]]; then
+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"
+ 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"
+IUSE="blas bzip2 cxx fftw geos lapack 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 )
@@ -65,7 +65,6 @@ RDEPEND="
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 )
@@ -102,6 +101,11 @@ BDEPEND="
virtual/pkgconfig
X? ( dev-lang/swig )"
+PATCHES=(
+ # bug 746590
+ "${FILESDIR}/${PN}-flock.patch"
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
@@ -188,6 +192,7 @@ src_configure() {
local myeconfargs=(
--enable-shared
--disable-w11
+ --without-liblas
--without-opendwg
--with-regex
--with-gdal="${EPREFIX}"/usr/bin/gdal-config
@@ -216,7 +221,6 @@ src_configure() {
$(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)
diff --git a/sci-geosciences/grass/grass-9999.ebuild
b/sci-geosciences/grass/grass-9999.ebuild
index 35f6a21bac82..edecf0ff84e0 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,17 +3,17 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..13} )
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"
+DESCRIPTION="Free GIS with raster and vector functionality, as well as 3D
vizualization"
HOMEPAGE="https://grass.osgeo.org/";
LICENSE="GPL-2"
-if [[ ${PV} =~ "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
SLOT="0/8.4"
else
SLOT="0/$(ver_cut 1-2 ${PV})"
@@ -23,7 +23,7 @@ GVERSION=${SLOT#*/}
MY_PM="${PN}${GVERSION}"
MY_PM="${MY_PM/.}"
-if [[ ${PV} =~ "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/OSGeo/grass.git";
else
@@ -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 svm threads tiff truetype X zstd"
+IUSE="blas bzip2 cxx fftw geos lapack 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 )
@@ -65,7 +65,6 @@ RDEPEND="
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 )
@@ -188,6 +187,7 @@ src_configure() {
local myeconfargs=(
--enable-shared
--disable-w11
+ --without-liblas
--without-opendwg
--with-regex
--with-gdal="${EPREFIX}"/usr/bin/gdal-config
@@ -216,7 +216,6 @@ src_configure() {
$(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)
