[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-08-25 Thread Eli Schwartz
commit: d177adc1020d00665ce8d4f5a9cbf9bbe5c19ab5
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Aug 23 08:09:01 2024 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Sun Aug 25 20:23:24 2024 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/38255
Signed-off-by: Eli Schwartz  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..
--- 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} =~ "" ]]; 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} =~ "" ]]; 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-

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-08-25 Thread Eli Schwartz
commit: 85fa61eb98aa53bb2f652d0fbe93d6c75cb10cce
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Aug 23 08:07:41 2024 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Sun Aug 25 20:23:24 2024 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Eli Schwartz  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-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 0844f7c7bbff..558ef152545b 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-08-10 Thread Joonas Niilola
commit: faf22ed7ae82e4911cdecc1b63a832126b1ef046
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Jul 31 14:32:27 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Aug 10 07:22:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf22ed7

sci-geosciences/grass: drop 8.3.1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/37883
Signed-off-by: Joonas Niilola  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..
--- 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} =~ "" ]]; 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} =~ "" ]]; 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}]
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-08-10 Thread Joonas Niilola
commit: 00178b6892fcc9ae59b0d0c38c2264b056e5a658
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Jul 31 14:28:07 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Aug 10 07:22:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00178b68

sci-geosciences/grass: add 8.4.0

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola  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 ..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} =~ "" ]]; 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} =~ "" ]]; 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}]
+

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-07-31 Thread Arthur Zamarin
commit: 91e161028f2ce50674a4e7fdb7e9fe1a52dcfe37
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jul 31 19:14:30 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jul 31 19:14:30 2024 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-07-18 Thread Joonas Niilola
commit: 2fecc72142781706daec6be01b4ba225e2d334f4
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Jun 12 15:18:57 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 18 07:37:37 2024 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../grass/{grass-.ebuild => grass-8.3.2-r1.ebuild}   | 9 +++--
 sci-geosciences/grass/grass-.ebuild  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-8.3.2-r1.ebuild
similarity index 98%
copy from sci-geosciences/grass/grass-.ebuild
copy to sci-geosciences/grass/grass-8.3.2-r1.ebuild
index ed68dea0c142..1d2d329b7e3c 100644
--- a/sci-geosciences/grass/grass-.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} =~ "" ]]; 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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index ed68dea0c142..1c0613f94251 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-07-18 Thread Joonas Niilola
commit: 06f93e3484d7682df7116ab966d240feaa2029e0
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Tue Jun 18 16:16:46 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 18 07:37:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f93e34

sci-geosciences/grass: sync live

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/37131
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 1c0613f94251..0844f7c7bbff 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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)
)



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-07-18 Thread Joonas Niilola
commit: 473b961b7e9c627638b8578d58f0960f3a329dd4
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Tue Jun 18 16:16:12 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 18 07:37:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473b961b

sci-geosciences/grass: add 8.4.0_rc1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola  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 ..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} =~ "" ]]; 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} =~ "" ]]; 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/zs

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-04-23 Thread Sam James
commit: 7418ebc441e0ce548a35a9f6f8667bd5d6644460
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 23 21:33:41 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 23 21:33:41 2024 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-03-20 Thread Andrew Ammerlaan
commit: 83a3f963eb5b843e8c8f41d7c7970952d76dcfcb
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Mar  7 10:12:46 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Mar 20 22:12:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a3f963

sci-geosciences/grass: add 8.3.2

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/35478
Signed-off-by: Andrew Ammerlaan  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 ..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} =~ "" ]]; 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} =~ "" ]]; 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 us

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-03-14 Thread Sam James
commit: eecdd47e4d8acbe92493140b2ba0a80358d28791
Author: Eli Schwartz  gmail  com>
AuthorDate: Fri Mar 15 06:33:56 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 15 06:46:15 2024 +
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  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-8.3.1.ebuild | 10 +-
 sci-geosciences/grass/grass-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 850b3a402fe1..ed68dea0c142 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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=(



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2024-01-04 Thread Sam James
commit: 624df2ff2dabdb8074447752491d73761a7acb53
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 06:31:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 06:31:20 2024 +
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  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 
dc91895887356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415
 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..
--- 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} =~ "" ]]; 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} =~ "" ]]; 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-pr

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-11-29 Thread Sam James
commit: 173406f1e1fb4348351234c2434094d29e9a6e10
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 30 03:07:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 30 03:07:17 2023 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-10-27 Thread Andrew Ammerlaan
commit: 9b3371d8d085d8295386ae8399c08710209c05e7
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Oct 25 17:37:33 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Oct 27 08:04:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b3371d8

sci-geosciences/grass: add 8.3.1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/33510
Signed-off-by: Andrew Ammerlaan  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 
dc91895887356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415
 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 ..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} =~ "" ]]; 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} =~ "" ]]; 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="${RD

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-10-17 Thread Andrew Ammerlaan
commit: d607eced0d69d5e64d32b2888048354ecc769730
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Oct 14 13:55:59 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Oct 17 07:57:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d607eced

sci-geosciences/grass: add 8.3.1_rc1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Andrew Ammerlaan  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 
dc91895887356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415
 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 ..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} =~ "" ]]; 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} =~ "" ]]; 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[${PYTHO

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-10-17 Thread Andrew Ammerlaan
commit: ba2219f02ff9aa8f86179eaa5416f43c7aeda2df
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Oct 15 07:07:43 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Oct 17 07:57:28 2023 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/33328
Signed-off-by: Andrew Ammerlaan  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 
dc91895887356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415
 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..
--- 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} =~ "" ]]; 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} =~ "" ]]; 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
-  

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-10-17 Thread Andrew Ammerlaan
commit: 68321f3943e9890679816bef35ed9ab97f6e69bc
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Oct 14 13:56:37 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Oct 17 07:57:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68321f39

sci-geosciences/grass: disable py3.9

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index a4a84ca2dae9..f4aeb3ef85ed 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-10-04 Thread Conrad Kostecki
commit: 0da6faa380899eea9d7a5abd2f97169f088752a1
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Oct  4 21:20:13 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Oct  4 21:55:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da6faa3

sci-geosciences/grass: drop 8.2.0-r7

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/33197
Signed-off-by: Conrad Kostecki  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 
dc91895887356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415
 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..
--- 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} =~ "" ]]; 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 )"
-

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-08-24 Thread Sam James
commit: 374bb271601a4af10a024945c823f345d4379567
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 24 17:46:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 24 17:46:27 2023 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-07-16 Thread Sam James
commit: e88117f56d87593ab271d706a7c70eccf9bc7c41
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Jul 16 12:43:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 16 13:23:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88117f5

sci-geosciences/grass: bump development subslot version

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31906
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 337cf8efb27d..a4a84ca2dae9 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://grass.osgeo.org/";
 LICENSE="GPL-2"
 
 if [[ ${PV} =~ "" ]]; then
-   SLOT="0/8.3"
+   SLOT="0/8.4"
 else
SLOT="0/$(ver_cut 1-2 ${PV})"
 fi



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-07-16 Thread Sam James
commit: 06dc20558d6372d03ac0925c3fa508bcaa2e41cc
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Jul 16 12:43:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 16 13:23:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06dc2055

sci-geosciences/grass: remove sed no-ops

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-8.3.0.ebuild | 23 ---
 sci-geosciences/grass/grass-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 4a055a1fe3ea..337cf8efb27d 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-07-15 Thread Viorel Munteanu
commit: 3102049d02df68c571f76108b99c6eefaba0
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Jun 25 17:16:02 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jul 16 06:41:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3102049d

sci-geosciences/grass: add 8.3.0

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31603
Signed-off-by: Viorel Munteanu  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 
dc91895887356ec655c0f12f18654522976ab0b942fb1751fca5b49d4d06a7ec63f83e890b75f7c509ba128da58587e532554ba99d59b6cefd6bbf111415
 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 ..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} =~ "" ]]; 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} =~ "" ]]; 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-pytho

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-06-15 Thread Andrew Ammerlaan
commit: ca7a8f1ece3f2d3b2b3528a375f37aea5f4b1b66
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Jun  8 21:52:52 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jun 15 08:51:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7a8f1e

sci-geosciences/grass: add 8.3.0_rc1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31360
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-geosciences/grass/Manifest|  1 +
 .../grass/{grass-.ebuild => grass-8.3.0_rc1.ebuild}   | 15 +--
 sci-geosciences/grass/grass-.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-.ebuild 
b/sci-geosciences/grass/grass-8.3.0_rc1.ebuild
similarity index 95%
copy from sci-geosciences/grass/grass-.ebuild
copy to sci-geosciences/grass/grass-8.3.0_rc1.ebuild
index 4b7fab7cb764..212d805be495 100644
--- a/sci-geosciences/grass/grass-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 4b7fab7cb764..4a055a1fe3ea 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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-sha

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-05-05 Thread Sam James
commit: 5f751b8ea4d3234c5e8bc3b6a387f43b3a1bf690
Author: Sam James  gentoo  org>
AuthorDate: Sat May  6 03:52:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  6 03:52:36 2023 +
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  gentoo.org>

 sci-geosciences/grass/grass-8.2.1-r2.ebuild | 2 +-
 sci-geosciences/grass/grass-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index c335853ae4e4..4b7fab7cb764 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-05-05 Thread Sam James
commit: 68b0ddef297012ac3ec785162dff911612a9e0e7
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon May  1 16:22:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  6 03:47:42 2023 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/30824
Signed-off-by: Sam James  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..
--- 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} =~ "" ]]; 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} =~ "" ]]; 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 "
-   ewarn "where  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 "
-   ewarn "where  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

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-05-01 Thread Sam James
commit: 132d76469dbf12f93ce40e311afaccd366478cf8
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 09:21:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 09:21:51 2023 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-05-01 Thread Sam James
commit: 9ffa9b8b58a09e0a5abee77d0b42816bc0ef1ed0
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 09:19:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 09:19:17 2023 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-03-19 Thread David Seifert
commit: 2f3009471298ba0cf590774806c00af880dc4ecc
Author: David Seifert  gentoo  org>
AuthorDate: Sun Mar 19 17:13:59 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Mar 19 17:13:59 2023 +
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  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-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 45c10f8e8cd3..c335853ae4e4 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-03-07 Thread Joonas Niilola
commit: cd7a1032c62f7cd7dfa3fe736b3860c4eceb5f0b
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Feb 19 22:16:01 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar  7 09:09:23 2023 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/29674
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-geosciences/grass/{grass-8.2.1.ebuild => grass-8.2.1-r1.ebuild} | 4 ++--
 sci-geosciences/grass/grass-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 80491b81b91a..45c10f8e8cd3 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-02-07 Thread Sam James
commit: 91e79c4852d808c79d435ef0afadd4386a1dfb02
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Tue Feb  7 17:04:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  8 04:11:06 2023 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/29333
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-8.2.1.ebuild | 4 +++-
 sci-geosciences/grass/grass-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 4c29251814aa..80491b81b91a 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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)



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-02-07 Thread Sam James
commit: e40338171ba06b88bb26cec045421eab9bf54877
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Jan 29 18:34:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  8 04:11:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4033817

sci-geosciences/grass: add 8.2.1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  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 ..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} =~ "" ]]; 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} =~ "" ]]; 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 "
+   ewarn "where  is atlas, threaded-atlas or 
reference"
+   die "setup failed"
+

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-02-07 Thread Sam James
commit: 1d5832ee940cb0b6635d29bf2e9be39d20ce696b
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Jan 29 18:27:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  8 04:11:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5832ee

sci-geosciences/grass: fix variable assignment order

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-8.2.0-r6.ebuild | 8 ++--
 sci-geosciences/grass/grass-.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} =~ "" ]]; 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} =~ "" ]]; 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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index ed97dc748c64..9adfe1854258 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.ebuild
@@ -13,17 +13,21 @@ HOMEPAGE="https://grass.osgeo.org/";
 
 LICENSE="GPL-2"
 
+if [[ ${PV} =~ "" ]]; 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} =~ "" ]]; 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"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-02-07 Thread Sam James
commit: 5cc364bc7f92347c86f01301e534c6df314220c0
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Jan 29 18:31:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  8 04:11:06 2023 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 9adfe1854258..4c29251814aa 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2023-01-31 Thread Sam James
commit: 85c442167a9b5b8a2cd2802c509f78b40336209c
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb  1 07:22:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  1 07:22:38 2023 +
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  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-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 85b945b7a22b..ed97dc748c64 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-12-17 Thread Sam James
commit: 5af756cf74c3848e541c9bd1fabbad0cb010bd74
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 07:42:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 07:46:36 2022 +
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  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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-12-15 Thread Sam James
commit: 99f8f1d4bcdef7f00ea96113fd615a8207ad0d00
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 04:24:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 04:29:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f8f1d4

sci-geosciences/grass: unrevbump 

Unintentional, was defect in script for libtiff revbumps (fixed already for next
time.)

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/{grass--r1.ebuild => grass-.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-geosciences/grass/grass--r1.ebuild 
b/sci-geosciences/grass/grass-.ebuild
similarity index 100%
rename from sci-geosciences/grass/grass--r1.ebuild
rename to sci-geosciences/grass/grass-.ebuild



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-12-15 Thread Sam James
commit: 7b8b1ce137eb602bafe40515dbbe63a01e7d1256
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 01:31:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 01:38:47 2022 +
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  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-.ebuild => grass--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-.ebuild 
b/sci-geosciences/grass/grass--r1.ebuild
similarity index 97%
rename from sci-geosciences/grass/grass-.ebuild
rename to sci-geosciences/grass/grass--r1.ebuild
index f104afc0e3a8..3b2547db0e11 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass--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="



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-11-18 Thread Joonas Niilola
commit: f0a989860180ae3ff1a05c08d935e6afc2e373be
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Mon Oct 31 10:17:51 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov 18 08:22:51 2022 +
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  slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/28050
Signed-off-by: Joonas Niilola  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-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 1746efefa7c6..f104afc0e3a8 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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
- 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-10-12 Thread Sam James
commit: a7205f326221890117447f9214188e236e762120
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Oct 12 16:34:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 12 23:24:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7205f32

sci-geosciences/grass: remove obsolete warning

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27753
Signed-off-by: Sam James  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-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 7b5ec1408e74..1746efefa7c6 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.ebuild
@@ -20,8 +20,8 @@ MY_PM="${MY_PM/.}"
 
 if [[ ${PV} =~ "" ]]; 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() {



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-10-09 Thread Andreas Sturmlechner
commit: 8ea7589d7b3ae942069a243393d05a2fd7e566f9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct  7 13:43:05 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  9 18:29:19 2022 +
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  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 
496dab376b38c74d2206096f8b1bf84c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f
 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..
--- 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

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-09-27 Thread Jakov Smolić
commit: 21ab50ec310dfb205db3c791178fc0a94fe8e1fb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Sep 28 06:30:43 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Sep 28 06:30:43 2022 +
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ć  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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-09-27 Thread Jakov Smolić
commit: 479067c62076b264c058000edd7f23cee7bfe4f2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Sep 28 06:30:44 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Sep 28 06:30:44 2022 +
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ć  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-09-27 Thread Jakov Smolić
commit: e76c35e5932533a6935a343ddb14cf6f055cf220
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Sep 28 06:30:45 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Sep 28 06:30:45 2022 +
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ć  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-08-27 Thread Sam James
commit: 99201b14faf305a88326bbb59343cc4e3b272d1c
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Aug 27 08:04:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 27 10:52:46 2022 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27030
Signed-off-by: Sam James  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-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 8b286969e78a..7b5ec1408e74 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-07-14 Thread Sam James
commit: 2514ba75cc3dec365f87e90d0eabef6b5b88bee8
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Jul  1 12:13:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 15 01:48:14 2022 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/26186
Signed-off-by: Sam James  gentoo.org>

 .../{grass-.ebuild => grass-7.8.7-r1.ebuild}   | 55 ++
 .../{grass-.ebuild => grass-8.0.2-r1.ebuild}   | 14 --
 .../{grass-.ebuild => grass-8.2.0-r1.ebuild}   | 14 --
 sci-geosciences/grass/grass-.ebuild|  7 ++-
 sci-geosciences/grass/metadata.xml |  1 +
 5 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-7.8.7-r1.ebuild
similarity index 86%
copy from sci-geosciences/grass/grass-.ebuild
copy to sci-geosciences/grass/grass-7.8.7-r1.ebuild
index 33808453c9c7..d254c88caf17 100644
--- a/sci-geosciences/grass/grass-.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} =~ "" ]]; 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? ( =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
+

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-07-07 Thread Sam James
commit: b3a23b9b590ee247253f02a6a17348e834a26127
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul  7 19:43:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul  7 19:43:41 2022 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-07-07 Thread Sam James
commit: db2fa8d3e7df4d71eae1b4e426e6ce55207fc475
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul  7 19:42:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul  7 19:43:18 2022 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/

2022-06-19 Thread Sam James
commit: 37de76d39fbddf96349d29aeeec9338b809052ed
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Jun 18 11:16:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 20 02:49:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37de76d3

sci-geosciences/grass: remove old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/25953
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/Manifest |   1 -
 .../grass/files/grass-8.0.1-lib_imagery.patch  |  11 -
 sci-geosciences/grass/grass-8.0.1-r1.ebuild| 282 -
 3 files changed, 294 deletions(-)

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 4fa939f09a8e..745b3b8081b9 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +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.1.tar.gz 64928098 BLAKE2B 
81512a5e95727202705a06e11dcb243a393bb6d7b5756957ffe055c867aa18933d84a31ed5e006e8c25bff558aa3ce5acab9e90660b1537192ffa11c92cdf4cc
 SHA512 
ec0e52bfe22179c85bb7119980ab4d5b96278fc85d1fc5c0781aea1864e89a302677fa008b65f0398d564fd6ffc05cee0da1b81affb489c89c20a3bd9f6b089f
 DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 
496dab376b38c74d2206096f8b1bf84c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f
 SHA512 
fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c
 DIST grass-8.2.0.tar.gz 66819726 BLAKE2B 
e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3
 SHA512 
8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930

diff --git a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch 
b/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
deleted file mode 100644
index 1eca86750ecd..
--- a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://github.com/OSGeo/grass/pull/2269
 a/lib/imagery/Makefile
-+++ b/lib/imagery/Makefile
-@@ -7,7 +7,6 @@
- 
- include $(MODULE_TOPDIR)/include/Make/Lib.make
- include $(MODULE_TOPDIR)/include/Make/Doxygen.make
--include $(MODULE_TOPDIR)/include/Make/Grass.make
- 
- # images
- IMGSRC := $(wildcard *.png) $(wildcard *.jpg) $(wildcard *.gif)

diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild 
b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
deleted file mode 100644
index 3d92d0c246f7..
--- a/sci-geosciences/grass/grass-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,282 +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} =~ "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/OSGeo/grass.git";
-else
-   MY_P="${P/_rc/RC}"
-   SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz";
-   if [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="amd64 ~ppc x86"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-fi
-
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl 
openmp png postgres readline sqlite threads tiff truetype X zstd"
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-   opengl? ( X )"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=app-admin/eselect-1.2
-   $(python_gen_cond_dep '
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   ')
-   sci-libs/gdal:=
-   sys-libs/gdbm:=
-   sys-libs/ncurses:0=
-   sci-libs/proj:=
-   sci-libs/xdrfile
-   sys-libs/zlib
-   media-libs/libglvnd
-   media-libs/glu
-   blas? (
-   virtual/cblas[eselect-ldso(+)]
-   virtual/blas[esele

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-06-15 Thread Sam James
commit: 05075cc2157a25d52ba0df005567873e8aa32bc9
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 15 18:17:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 15 18:17:07 2022 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-06-15 Thread Jakov Smolić
commit: 02ec45e88a8d05427c7ff3ff24e4c74b7feaf24d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jun 15 09:46:19 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jun 15 09:46:19 2022 +
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ć  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-06-03 Thread Sam James
commit: 4f754696082002eb5a4debed1b0b61e4404246cb
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Jun  3 21:19:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  4 03:27:32 2022 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/25744
Signed-off-by: Sam James  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 
496dab376b38c74d2206096f8b1bf84c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f
 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 ..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} =~ "" ]]; 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}
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/

2022-05-23 Thread Conrad Kostecki
commit: dbee876ddee6b184f5b21b877d3de462fefe6202
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon May 23 10:04:35 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon May 23 11:59:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbee876d

sci-geosciences/grass: remove old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/25605
Signed-off-by: Conrad Kostecki  gentoo.org>

 sci-geosciences/grass/Manifest |   1 -
 .../grass/files/grass-8.0.0-mkhtml.patch   | 316 -
 sci-geosciences/grass/grass-8.0.0.ebuild   | 274 --
 sci-geosciences/grass/grass-8.0.1.ebuild   | 281 --
 4 files changed, 872 deletions(-)

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index a0364e0e9b96..cd51431391bf 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +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
 DIST grass-8.0.2.tar.gz 65665825 BLAKE2B 
496dab376b38c74d2206096f8b1bf84c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f
 SHA512 
fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c

diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch 
b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
deleted file mode 100644
index 1eb46012f6a4..
--- a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
+++ /dev/null
@@ -1,316 +0,0 @@
 a/lib/init/variables.html
-+++ b/lib/init/variables.html
-@@ -234,12 +234,7 @@ PERMANENT
-   GRASS_PERL
-   [used during install process for generating man pages]
- set Perl with path.
--
--  GRASS_PROXY
--  [used during addon install/reinstall process for generating man
--pages (download commit from GitHub API server and remote modules.xml 
file)]
--set the proxy with: 
GRASS_PROXY="http=,ftp=".
--
-+  
-   GRASS_SKIP_MAPSET_OWNER_CHECK
-   By default it is not possible to work with MAPSETs that are
- not owned by current user. Setting this variable to any non-empty value
 a/scripts/g.extension/g.extension.py
-+++ b/scripts/g.extension/g.extension.py
-@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format, 
*args, **kwargs):
- ),
- )
- return response
-+
- except HTTPError as err:
- if err.code == 403 and err.msg == "rate limit exceeded":
- gscript.warning(
-@@ -2588,8 +2589,6 @@ def main():
- proxy = urlrequest.ProxyHandler(PROXIES)
- opener = urlrequest.build_opener(proxy)
- urlrequest.install_opener(opener)
--# Required for mkhtml.py script (get addon git commit from GitHub API 
server)
--os.environ["GRASS_PROXY"] = options["proxy"]
- 
- # define path
- options["prefix"] = resolve_install_prefix(
 a/utils/mkhtml.py
-+++ b/utils/mkhtml.py
-@@ -16,7 +16,6 @@
- #
- #
- 
--import http
- import sys
- import os
- import string
-@@ -25,9 +24,6 @@ from datetime import datetime
- import locale
- import json
- import pathlib
--import shutil
--import subprocess
--import time
- 
- try:
- # Python 2 import
-@@ -35,26 +31,11 @@ try:
- except ImportError:
- # Python 3 import
- from html.parser import HTMLParser
--
--from six.moves.urllib import request as urlrequest
--from six.moves.urllib.error import HTTPError, URLError
--
- try:
- import urlparse
- except ImportError:
- import urllib.parse as urlparse
- 
--try:
--   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-05-22 Thread Jakov Smolić
commit: 1cbe8f536f5c7e5ac9eafdf47acf3280462ef50a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 22 20:08:22 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 22 20:08:22 2022 +
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ć  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-05-22 Thread Jakov Smolić
commit: 5655f2a150d97b0b105cdd78862b0fe983a5f296
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 22 20:08:40 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 22 20:08:40 2022 +
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ć  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-05-12 Thread Andrew Ammerlaan
commit: f3d70f239ea104f3151fead3a8037d7324bab0b0
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Sat May  7 04:13:08 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu May 12 14:56:32 2022 +
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  slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/25364
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 31ad3a913914..f0e2a49326c0 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-05-12 Thread Andrew Ammerlaan
commit: 5bdc6d89ee08ba95a7202ee153350464cd9e0727
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu May 12 14:48:20 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu May 12 14:56:32 2022 +
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  gentoo.org>

 sci-geosciences/grass/Manifest|  1 +
 .../grass/{grass-.ebuild => grass-8.0.2.ebuild}   | 15 +++
 sci-geosciences/grass/grass-.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 
496dab376b38c74d2206096f8b1bf84c328be3871fca5173042d7368f5c40cdbb6908ed69ec9f2c0669b25f3cfc50b4105f9bb7b375c379b9cc518ebfe8f
 SHA512 
fc6f45f2b6ac2507c70a14baa931d5c66f0b115c914081d24c95f40afa6c266a718026df895f7a182ea837c6abf70da15b09dccba39eedd6a71ba7b6301edf7c

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-8.0.2.ebuild
similarity index 93%
copy from sci-geosciences/grass/grass-.ebuild
copy to sci-geosciences/grass/grass-8.0.2.ebuild
index f0e2a49326c0..bda087019d91 100644
--- a/sci-geosciences/grass/grass-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index f0e2a49326c0..33808453c9c7 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-04-18 Thread Sam James
commit: 142921c229c89c2ece05f03f2eeebbaf6257028b
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 18 07:14:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 18 07:15:37 2022 +
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  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() {



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/, sci-geosciences/grass/files/

2022-04-17 Thread Sam James
commit: 9cd5e5afcc90e9dd353e4763567606b9685d5ec2
Author: Thomas Bettler  gmail  com>
AuthorDate: Sat Apr 16 21:28:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 16:24:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd5e5af

sci-geosciences/grass: backport fix for soname

backport https://github.com/OSGeo/grass/pull/2269

Signed-off-by: Thomas Bettler  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25050
Signed-off-by: Sam James  gentoo.org>

 .../grass/files/grass-8.0.1-lib_imagery.patch  |  11 +
 sci-geosciences/grass/grass-8.0.1-r1.ebuild| 282 +
 2 files changed, 293 insertions(+)

diff --git a/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch 
b/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
new file mode 100644
index ..1eca86750ecd
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-8.0.1-lib_imagery.patch
@@ -0,0 +1,11 @@
+https://github.com/OSGeo/grass/pull/2269
+--- a/lib/imagery/Makefile
 b/lib/imagery/Makefile
+@@ -7,7 +7,6 @@
+ 
+ include $(MODULE_TOPDIR)/include/Make/Lib.make
+ include $(MODULE_TOPDIR)/include/Make/Doxygen.make
+-include $(MODULE_TOPDIR)/include/Make/Grass.make
+ 
+ # images
+ IMGSRC := $(wildcard *.png) $(wildcard *.jpg) $(wildcard *.gif)

diff --git a/sci-geosciences/grass/grass-8.0.1-r1.ebuild 
b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
new file mode 100644
index ..81b7d01d2c77
--- /dev/null
+++ b/sci-geosciences/grass/grass-8.0.1-r1.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D 
vizualization"
+HOMEPAGE="https://grass.osgeo.org/";
+
+LICENSE="GPL-2"
+SLOT="0/8.0"
+
+GVERSION=${SLOT#*/}
+MY_PM="${PN}${GVERSION}"
+MY_PM="${MY_PM/.}"
+
+if [[ ${PV} =~ "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/OSGeo/grass.git";
+else
+   MY_P="${P/_rc/RC}"
+   SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz";
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~amd64 ~ppc ~x86"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl 
openmp png postgres readline sqlite threads tiff truetype X zstd"
+REQUIRED_USE="
+   ${PYTHON_REQUIRED_USE}
+   opengl? ( X )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   >=app-admin/eselect-1.2
+   $(python_gen_cond_dep '
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   ')
+   sci-libs/gdal:=
+   sys-libs/gdbm:=
+   sys-libs/ncurses:0=
+   sci-libs/proj:=
+   sci-libs/xdrfile
+   sys-libs/zlib
+   media-libs/libglvnd
+   media-libs/glu
+   blas? (
+   virtual/cblas[eselect-ldso(+)]
+   virtual/blas[eselect-ldso(+)]
+   )
+   fftw? ( sci-libs/fftw:3.0= )
+   geos? ( sci-libs/geos:= )
+   lapack? ( virtual/lapack[eselect-ldso(+)] )
+   liblas? ( sci-geosciences/liblas )
+   mysql? ( dev-db/mysql-connector-c:= )
+   netcdf? ( sci-libs/netcdf:= )
+   odbc? ( dev-db/unixODBC )
+   opencl? ( virtual/opencl )
+   opengl? ( virtual/opengl )
+   png? ( media-libs/libpng:0= )
+   postgres? ( >=dev-db/postgresql-8.4:= )
+   readline? ( sys-libs/readline:0= )
+   sqlite? ( dev-db/sqlite:3 )
+   tiff? ( media-libs/tiff:0= )
+   truetype? ( media-libs/freetype:2 )
+   X? (
+   dev-python/wxpython:4.0
+   x11-libs/cairo[X,opengl?]
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXt
+   )
+   zstd? ( app-arch/zstd )"
+DEPEND="${RDEPEND}
+   X? ( x11-base/xorg-proto )"
+BDEPEND="
+   sys-devel/bison
+   sys-devel/flex
+   sys-devel/gettext
+   virtual/pkgconfig
+   X? ( dev-lang/swig )"
+
+PATCHES=(
+   # bug 746590
+   "${FILESDIR}/${PN}-flock.patch"
+   "${FILESDIR}/${PN}-lib_imagery.patch"
+)
+
+pkg_setup() {
+   if use lapack; then
+   local mylapack=$(eselect lapack show)
+   if [[ -z "${mylapack/.*reference.*/}" ]] && \
+   [[ -z "${mylapack/.*atlas.*/}" ]]; then
+   ewarn "You need to set lapack to atlas or reference. 
Do:"
+   ewarn "   eselect lapack set "
+   ewarn "where  is atlas, threaded-atlas or 
reference"
+   die "setup failed"
+   fi
+   fi
+
+   if use blas; then
+   local myblas=$(eselect blas s

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-04-05 Thread Agostino Sarubbo
commit: 30d5934b9c2e976162da277b3c933c3a74aea2ce
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Apr  6 06:32:54 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Apr  6 06:32:54 2022 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-04-05 Thread Agostino Sarubbo
commit: 7ca193414dc90beba23f21ca704a5955ed912005
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Apr  6 06:32:02 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Apr  6 06:32:02 2022 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-03-09 Thread Jakov Smolić
commit: dae04a45c2f931169d1cd396eb6497c37654118e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Mar 10 07:50:50 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Mar 10 07:50:50 2022 +
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ć  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="



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-03-09 Thread Jakov Smolić
commit: 333ca925ba4e530e70b51cedbb330a616825e743
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Mar 10 07:51:08 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Mar 10 07:51:08 2022 +
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ć  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="



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-02-25 Thread Sam James
commit: c025a5cc57243c1b2304fb250af235b012a95a53
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Feb 23 20:47:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 26 02:25:22 2022 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/24332
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/Manifest |  1 +
 .../{grass-.ebuild => grass-8.0.1.ebuild}  | 31 +-
 sci-geosciences/grass/grass-.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-.ebuild 
b/sci-geosciences/grass/grass-8.0.1.ebuild
similarity index 92%
copy from sci-geosciences/grass/grass-.ebuild
copy to sci-geosciences/grass/grass-8.0.1.ebuild
index d0b73c80b283..42780861df19 100644
--- a/sci-geosciences/grass/grass-.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} =~ "" ]]; 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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index d0b73c80b283..31ad3a913914 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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} =~ "" ]]; then
+   inherit git

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-02-25 Thread Sam James
commit: 2ffabee7b66b17939f290a33324ec1bbfc91f913
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Feb 23 20:36:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 26 02:25:17 2022 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  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 ..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 "
+   ewarn "where  is atlas, threaded-atlas or 
reference"
+   die "set

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/

2022-01-28 Thread Sam James
commit: 7c473887fbc1dfbc393930e612cfc811e0f7e077
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Jan 28 22:59:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 29 06:18:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c473887

sci-geosciences/grass: version bump 8.0.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/24003
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/Manifest |   2 +-
 .../grass/files/grass-8.0.0-mkhtml.patch   | 316 +
 .../{grass-8.0.0_rc2.ebuild => grass-8.0.0.ebuild} |   1 +
 3 files changed, 318 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ff32202d3394..85de9606c6e5 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.0RC2.tar.gz 64942585 BLAKE2B 
fc7499def2029acb9b547c688eaaad986daae5c80b085bbe876d7bca4d4c7547867375edee752705e30ab215d0b8e0c7f017e94802a549569a525196bbd7bcb4
 SHA512 
9e624c54974e253dce1b93a0ce1c51eaa421d8baacdf61b03893d34c5cd36af76915ab035fb9bb78af4c16e1efc12bb501a707e335e312a12cf2c17a2b0d6f61
+DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 
61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1
 SHA512 
29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42

diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch 
b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
new file mode 100644
index ..1eb46012f6a4
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
@@ -0,0 +1,316 @@
+--- a/lib/init/variables.html
 b/lib/init/variables.html
+@@ -234,12 +234,7 @@ PERMANENT
+   GRASS_PERL
+   [used during install process for generating man pages]
+ set Perl with path.
+-
+-  GRASS_PROXY
+-  [used during addon install/reinstall process for generating man
+-pages (download commit from GitHub API server and remote modules.xml 
file)]
+-set the proxy with: 
GRASS_PROXY="http=,ftp=".
+-
++  
+   GRASS_SKIP_MAPSET_OWNER_CHECK
+   By default it is not possible to work with MAPSETs that are
+ not owned by current user. Setting this variable to any non-empty value
+--- a/scripts/g.extension/g.extension.py
 b/scripts/g.extension/g.extension.py
+@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format, 
*args, **kwargs):
+ ),
+ )
+ return response
++
+ except HTTPError as err:
+ if err.code == 403 and err.msg == "rate limit exceeded":
+ gscript.warning(
+@@ -2588,8 +2589,6 @@ def main():
+ proxy = urlrequest.ProxyHandler(PROXIES)
+ opener = urlrequest.build_opener(proxy)
+ urlrequest.install_opener(opener)
+-# Required for mkhtml.py script (get addon git commit from GitHub API 
server)
+-os.environ["GRASS_PROXY"] = options["proxy"]
+ 
+ # define path
+ options["prefix"] = resolve_install_prefix(
+--- a/utils/mkhtml.py
 b/utils/mkhtml.py
+@@ -16,7 +16,6 @@
+ #
+ #
+ 
+-import http
+ import sys
+ import os
+ import string
+@@ -25,9 +24,6 @@ from datetime import datetime
+ import locale
+ import json
+ import pathlib
+-import shutil
+-import subprocess
+-import time
+ 
+ try:
+ # Python 2 import
+@@ -35,26 +31,11 @@ try:
+ except ImportError:
+ # Python 3 import
+ from html.parser import HTMLParser
+-
+-from six.moves.urllib import request as urlrequest
+-from six.moves.urllib.error import HTTPError, URLError
+-
+ try:
+ import urlparse
+ except ImportError:
+ import urllib.parse as urlparse
+ 
+-try:
+-import grass.script as gs
+-except ImportError:
+-# During compilation GRASS GIS
+-gs = None
+-
+-HEADERS = {
+-"User-Agent": "Mozilla/5.0",
+-}
+-HTTP_STATUS_CODES = list(http.HTTPStatus)
+-
+ if sys.version_info[0] == 2:
+ PY2 = True
+ else:
+@@ -65,24 +46,6 @@ if not PY2:
+ unicode = str
+ 
+ 
+-grass_version = os.getenv("VERSION_NUMBER", "unknown")
+-trunk_url = ""
+-addons_url = ""
+-if grass_version != "unknown":
+-major, minor, patch = grass_version.split(".")
+-grass_git_branch = "releasebranch_{major}_{minor}".format(
+-major=major,
+-minor=minor,
+-)
+-base_url = "https://github.com/OSGeo";
+-trunk_url = "{base_url}/grass/tree/

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/

2022-01-15 Thread Sam James
commit: 6098e0d0f5b07be22c74f49841a29cd930ab5de8
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Jan 15 18:44:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:46:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6098e0d0

sci-geosciences/grass: remove old files

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/23811
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/files/grass-7.8.5-bool.patch | 164 -
 1 file changed, 164 deletions(-)

diff --git a/sci-geosciences/grass/files/grass-7.8.5-bool.patch 
b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
deleted file mode 100644
index fddcb9f6df88..
--- a/sci-geosciences/grass/files/grass-7.8.5-bool.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git a/include/gis.h b/include/gis.h
-index 46bb06c52f..333651b938 100644
 a/include/gis.h
-+++ b/include/gis.h
-@@ -23,6 +23,8 @@
- /* System include files */
- #include 
- #include 
-+#include 
-+
- 
- /* Grass and local include files */
- #include 
-@@ -51,13 +53,14 @@ static const char *GRASS_copyright __attribute__ ((unused))
- #define G_gisinit(pgm) G__gisinit(GIS_H_VERSION, (pgm))
- #define G_no_gisinit() G__no_gisinit(GIS_H_VERSION)
- 
--/* Define TRUE and FALSE for boolean comparisons */
-+/* For boolean values and comparisons use the C99 type 'bool' with values 
'true' */
-+/* and 'false' For historical reasons 'TRUE' and 'FALSE' are still valid. 
   */
- #ifndef TRUE
--#define TRUE 1
-+#define TRUE true
- #endif
- 
- #ifndef FALSE
--#define FALSE 0
-+#define FALSE false
- #endif
- 
- #if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || (__APPLE__ && 
__LP64__)
-diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
-index 89a25de3bf..978894ea74 100644
 a/lib/lidar/lidar.h
-+++ b/lib/lidar/lidar.h
-@@ -62,9 +62,6 @@
- /* INTERPOLATOR */
- #define P_BILINEAR1
- #define P_BICUBIC 0
--/* Boolean definitions */
--#define TRUE  1
--#define FALSE 0
- 
- 
/*--*/
- /*STRUCTS DECLARATION */
-diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
-index 9c1dab4e81..2512fedaa2 100644
 a/raster/r.param.scale/param.h
-+++ b/raster/r.param.scale/param.h
-@@ -18,8 +18,6 @@
-   /* 'blank' edge around raster.  */
- #define MAX_WSIZE 499 /* Maximum dimensions of window.*/
-   /* Some useful labels.  */
--#define TRUE 1
--#define FALSE 0
- 
- #define RAD2DEG M_R2D
- #define DEG2RAD M_D2R
-diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
-index 33164f43cb..47028e7444 100644
 a/raster/r.surf.idw/main.h
-+++ b/raster/r.surf.idw/main.h
-@@ -1,8 +1,6 @@
- #include 
- 
- #define SHORT   short
--#define TRUE1
--#define FALSE   0
- 
- #define MELEMENTstruct Melement
- MELEMENT {
-diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
-index fb3b79882f..ae3ec3933a 100644
 a/raster3d/r3.showdspf/Ball.c
-+++ b/raster3d/r3.showdspf/Ball.c
-@@ -7,8 +7,6 @@
- #include "Ball.h"
- #include "BallMath.h"
- #include 
--#define TRUE 1
--#define FALSE 0
- 
- HMatrix mId = { {1, 0, 0, 0}
- , {0, 1, 0, 0}
-diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
-index 589f243a8d..b48236b33f 100644
 a/raster3d/r3.showdspf/togif.c
-+++ b/raster3d/r3.showdspf/togif.c
-@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, 
unsigned short *b,
-  *
-  
*/
- 
--#define TRUE 1
--#define FALSE 0
--
- 
- /** BumpPixel() /
- /*
-diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
-index 1ad97396fa..584af5d8ba 100644
 a/vector/v.hull/chull.c
-+++ b/vector/v.hull/chull.c
-@@ -29,10 +29,6 @@
- 
- #include "globals.h"
- 
--/*Define Boolean type */
--typedef enum
--{ BFALSE, BTRUE } bool;
--
- /* Define vertex indices. */
- #define X   0
- #define Y   1
-@@ -76,10 +72,10 @@ struct tFaceStructure
- };
- 
- /* Define flags */
--#define ONHULLBTRUE
--#define REMOVED   BTRUE
--#define VISIBLE   BTRUE
--#define PROCESSED BTRUE
-+#define ONHULLtrue
-+#define REMOVED   true
-+#define VISIBLE   true
-+#define PROCESSED true
- 
- /* Global variable definitions */
- tVertex vertices = NULL;
-@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
- tFace f;
- tEdge e, temp;
- long int vol;
--bool vis = BFALSE;
-+bool vis = false;
- 
- 
- /* Mark faces visible from p. */
-@@ -446,7 +442,7 @@ bool AddOne(tVertex p)
- 
-   if (vol < 0)

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-01-15 Thread Sam James
commit: 13caada8dee3a528d79a6191df7a5597ed3ff2c7
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Thu Jan 13 07:30:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:46:16 2022 +
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  slovanet.sk>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 4e0eaf89a49f..b7c94db005af 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-01-15 Thread Sam James
commit: 07f7fc6cffd2f50c1b375efbcb97dcfea04cf427
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Thu Jan 13 09:12:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:46:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f7fc6c

sci-geosciences/grass: add GVERSION global var

Signed-off-by: Tomas Zigo  slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/23769
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index b7c94db005af..d0b73c80b283 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-01-15 Thread Sam James
commit: 4587d9512263332f86ba567285baf13836ca534e
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Jan 15 18:25:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:46:05 2022 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-01-15 Thread Sam James
commit: 8b6d0b9aeadeacb39b7490798dd05304b235723d
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Thu Jan 13 07:26:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:46:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6d0b9a

sci-geosciences/grass: fix metadata long description

Signed-off-by: Tomas Zigo  slovanet.sk>
Signed-off-by: Sam James  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 @@


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/.


Use sci-libs/geos for v.buffer and 
adds extended options to the v.select module



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/

2022-01-01 Thread Sam James
commit: 5c4e2c2692b53050f93dcd5afd349dd34df64797
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Dec 30 20:11:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 07:02:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4e2c26

sci-geosciences/grass: rename patch file

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 .../grass/files/{grass-7.8-flock.patch => grass-flock.patch}| 0
 sci-geosciences/grass/grass-7.8.6-r1.ebuild | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/files/grass-7.8-flock.patch 
b/sci-geosciences/grass/files/grass-flock.patch
similarity index 100%
rename from sci-geosciences/grass/files/grass-7.8-flock.patch
rename to sci-geosciences/grass/files/grass-flock.patch

diff --git a/sci-geosciences/grass/grass-7.8.6-r1.ebuild 
b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
index 4332f826c81a..c751961cabf0 100644
--- a/sci-geosciences/grass/grass-7.8.6-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6-r1.ebuild
@@ -81,7 +81,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
# bug 746590
-   "${FILESDIR}/${PN}-7.8-flock.patch"
+   "${FILESDIR}/${PN}-flock.patch"
 )
 
 pkg_setup() {



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-01-01 Thread Sam James
commit: ea8f17e7ca45c0eb1225cf2e2ded0207e9db4514
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Dec 30 20:30:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 07:02:57 2022 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index f2d4abfd423d..4e0eaf89a49f 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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
 



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-01-01 Thread Sam James
commit: fc7f1aa7f52a1b0c3de1f0342802d871a3388450
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  2 07:04:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 07:05:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7f1aa7

sci-geosciences/grass: don't keyword RC version

Signed-off-by: Sam James  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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-01-01 Thread Sam James
commit: 4db707b07e1e3c905187a8023a0c255ab294d9a0
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Dec 30 20:48:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 07:02:55 2022 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  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..
--- 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 "
-   ewarn "where  is atlas, threaded-atlas or 
reference"
-   die "setup failed"
-   fi
-   fi
-
-   if use blas; then
-   local myblas=$(eselect blas show)
-   if [[ -z "${myblas/.*reference.*/}" ]] && \
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-01-01 Thread Sam James
commit: 1828364baa48f3f236a14981ed4b6199e1a99741
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Dec 30 20:34:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 07:03:06 2022 +
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  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  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 ..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 "
+   ewarn "where  is atlas, threaded-atlas or 
reference"
+   die "setup failed"
+   fi
+   fi
+
+   if use blas; then
+   local myblas=$(eselect blas show)
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2022-01-01 Thread Sam James
commit: 1d5d1d1083c35580ba71c0fe62d5b2582a0859a3
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Dec 30 20:29:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 07:02:57 2022 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index e91faa8e4ab6..f2d4abfd423d 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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)



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-12-28 Thread Sam James
commit: 6d94f3c48ee0aca4dc534a254ce8c98fcf694fac
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 28 21:58:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 28 22:00:44 2021 +
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  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-.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-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 965bd4beb28c..e91faa8e4ab6 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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= )



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-12-09 Thread Agostino Sarubbo
commit: 56660d30f89560d0aef103e7db06569e1c9e1a8a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Dec  9 16:24:29 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Dec  9 16:24:29 2021 +
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  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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-12-06 Thread Agostino Sarubbo
commit: fb5ef2a279d2b97e77cbea3e322e4b5f1e92ad44
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec  7 07:26:34 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec  7 07:26:34 2021 +
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  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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-10-19 Thread Sam James
commit: a1ea2719b0460486b46f11a681995ee09694c585
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 20 02:36:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 20 02:36:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ea2719

sci-geosciences/grass: drop WANT_AUTOCONF from 

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 68ab67f5dad..965bd4beb28 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-10-19 Thread Sam James
commit: 935ba7e0506b1709b0a47869bc54de1503766139
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Oct 10 16:40:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 20 02:23:36 2021 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/22553
Signed-off-by: Sam James  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 000..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 "
+   ewarn "where  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
+   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-09-24 Thread Sam James
commit: 8bdbb56951d9747ae466f24bfac9930a59d04a40
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 24 23:37:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 24 23:37:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdbb569

sci-geosciences/grass: drop unused flag-o-matic from 

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 9c8670fef28..68ab67f5dad 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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/.}"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-09-24 Thread Sam James
commit: 861c790f2beb2ea20f1e99535a64abcb3f7776cf
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Fri Sep 24 11:17:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 24 23:34:51 2021 +
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  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index b0087078be5..fd30b1deb55 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-09-24 Thread Sam James
commit: e8cef9238270fcd394e032616ab9b9c3e420cdfc
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Sun Sep 19 15:17:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 24 23:34:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8cef923

sci-geosciences/grass: fix install version  (changes from 7.9 dev version 
to 8.0)

Closes: https://bugs.gentoo.org/813879
Signed-off-by: Tomas Zigo  slovanet.sk>
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index a77634827df..b0087078be5 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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"



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-09-24 Thread Sam James
commit: d13dc84528529b18de02c34bcd99afd1988a0061
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Fri Sep 24 12:19:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 24 23:35:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d13dc845

sci-geosciences/grass: Add missing OR condition

Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index fd30b1deb55..96940103bfd 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-09-24 Thread Sam James
commit: 2ccaae3b5887aa7fd4b402ea7ca77a8633ec6e49
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Fri Sep 24 12:22:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 24 23:35:58 2021 +
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  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 96940103bfd..9c8670fef28 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-08-05 Thread Sam James
commit: 9157469db72a8fad7d8f174f02a481ecec40df94
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug  6 04:10:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug  6 04:10:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9157469d

sci-geosciences/grass: add github upstream metadata

Signed-off-by: Sam James  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 @@
Include support for LAS and LAZ encoded 
LiDAR files through sci-geosciences/liblas
Enable OpenCL support

+   
+   OSGeo/grass
+   
 



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-05-29 Thread Sam James
commit: 18663a5b35cceb93dee5aad6f26bd428120645ca
Author: Sam James  gentoo  org>
AuthorDate: Sat May 29 17:47:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 29 17:47:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18663a5b

sci-geosciences/grass: restore stable keywords

Fixes: d849efc7539748cecb34c3d6e69ca30e0a58f5b4
Signed-off-by: Sam James  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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/files/, sci-geosciences/grass/

2021-05-29 Thread Sam James
commit: d849efc7539748cecb34c3d6e69ca30e0a58f5b4
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat May 29 17:35:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 29 17:45:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d849efc7

sci-geosciences/grass: fix build failure with GCC 11

Closes: https://bugs.gentoo.org/792801
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/21039
Signed-off-by: Sam James  gentoo.org>

 sci-geosciences/grass/files/grass-7.8.5-bool.patch | 164 +
 sci-geosciences/grass/grass-7.8.5.ebuild   |   4 +-
 2 files changed, 167 insertions(+), 1 deletion(-)

diff --git a/sci-geosciences/grass/files/grass-7.8.5-bool.patch 
b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
new file mode 100644
index 000..fddcb9f6df8
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.8.5-bool.patch
@@ -0,0 +1,164 @@
+diff --git a/include/gis.h b/include/gis.h
+index 46bb06c52f..333651b938 100644
+--- a/include/gis.h
 b/include/gis.h
+@@ -23,6 +23,8 @@
+ /* System include files */
+ #include 
+ #include 
++#include 
++
+ 
+ /* Grass and local include files */
+ #include 
+@@ -51,13 +53,14 @@ static const char *GRASS_copyright __attribute__ ((unused))
+ #define G_gisinit(pgm) G__gisinit(GIS_H_VERSION, (pgm))
+ #define G_no_gisinit() G__no_gisinit(GIS_H_VERSION)
+ 
+-/* Define TRUE and FALSE for boolean comparisons */
++/* For boolean values and comparisons use the C99 type 'bool' with values 
'true' */
++/* and 'false' For historical reasons 'TRUE' and 'FALSE' are still valid. 
   */
+ #ifndef TRUE
+-#define TRUE 1
++#define TRUE true
+ #endif
+ 
+ #ifndef FALSE
+-#define FALSE 0
++#define FALSE false
+ #endif
+ 
+ #if (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || (__APPLE__ && 
__LP64__)
+diff --git a/lib/lidar/lidar.h b/lib/lidar/lidar.h
+index 89a25de3bf..978894ea74 100644
+--- a/lib/lidar/lidar.h
 b/lib/lidar/lidar.h
+@@ -62,9 +62,6 @@
+ /* INTERPOLATOR */
+ #define P_BILINEAR1
+ #define P_BICUBIC 0
+-/* Boolean definitions */
+-#define TRUE  1
+-#define FALSE 0
+ 
+ 
/*--*/
+ /*STRUCTS DECLARATION */
+diff --git a/raster/r.param.scale/param.h b/raster/r.param.scale/param.h
+index 9c1dab4e81..2512fedaa2 100644
+--- a/raster/r.param.scale/param.h
 b/raster/r.param.scale/param.h
+@@ -18,8 +18,6 @@
+   /* 'blank' edge around raster.  */
+ #define MAX_WSIZE 499 /* Maximum dimensions of window.*/
+   /* Some useful labels.  */
+-#define TRUE 1
+-#define FALSE 0
+ 
+ #define RAD2DEG M_R2D
+ #define DEG2RAD M_D2R
+diff --git a/raster/r.surf.idw/main.h b/raster/r.surf.idw/main.h
+index 33164f43cb..47028e7444 100644
+--- a/raster/r.surf.idw/main.h
 b/raster/r.surf.idw/main.h
+@@ -1,8 +1,6 @@
+ #include 
+ 
+ #define SHORT   short
+-#define TRUE1
+-#define FALSE   0
+ 
+ #define MELEMENTstruct Melement
+ MELEMENT {
+diff --git a/raster3d/r3.showdspf/Ball.c b/raster3d/r3.showdspf/Ball.c
+index fb3b79882f..ae3ec3933a 100644
+--- a/raster3d/r3.showdspf/Ball.c
 b/raster3d/r3.showdspf/Ball.c
+@@ -7,8 +7,6 @@
+ #include "Ball.h"
+ #include "BallMath.h"
+ #include 
+-#define TRUE 1
+-#define FALSE 0
+ 
+ HMatrix mId = { {1, 0, 0, 0}
+ , {0, 1, 0, 0}
+diff --git a/raster3d/r3.showdspf/togif.c b/raster3d/r3.showdspf/togif.c
+index 589f243a8d..b48236b33f 100644
+--- a/raster3d/r3.showdspf/togif.c
 b/raster3d/r3.showdspf/togif.c
+@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short *g, 
unsigned short *b,
+  *
+  
*/
+ 
+-#define TRUE 1
+-#define FALSE 0
+-
+ 
+ /** BumpPixel() /
+ /*
+diff --git a/vector/v.hull/chull.c b/vector/v.hull/chull.c
+index 1ad97396fa..584af5d8ba 100644
+--- a/vector/v.hull/chull.c
 b/vector/v.hull/chull.c
+@@ -29,10 +29,6 @@
+ 
+ #include "globals.h"
+ 
+-/*Define Boolean type */
+-typedef enum
+-{ BFALSE, BTRUE } bool;
+-
+ /* Define vertex indices. */
+ #define X   0
+ #define Y   1
+@@ -76,10 +72,10 @@ struct tFaceStructure
+ };
+ 
+ /* Define flags */
+-#define ONHULLBTRUE
+-#define REMOVED   BTRUE
+-#define VISIBLE   BTRUE
+-#define PROCESSED BTRUE
++#define ONHULLtrue
++#define REMOVED   true
++#define VISIBLE   true
++#define PROCESSED true
+ 
+ /* Global variable definitions */
+ tVertex vertices = NULL;
+@@ -436,7 +432,7 @@ bool AddOne(tVertex p)
+ tFace f;
+ tEdge e, temp;
+ long int vol;
+-bool vis = BFALSE;
++bool v

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-03-07 Thread Joonas Niilola
commit: d956b5866f1da4610846448a0b9b7965255f3c77
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Mar  8 07:22:02 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Mar  8 07:35:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d956b586

sci-geosciences/grass: drop 7.8.4

Signed-off-by: Joonas Niilola  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..000
--- 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 "
-   ewarn "where  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 "
-   

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-03-07 Thread Sam James
commit: c7c2508c439855fd38e77866a58f27846696417e
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  7 19:44:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  7 19:44:57 2021 +
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  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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-03-07 Thread Thomas Deutschmann
commit: edad018c38ae62fb5aefba75f3d0dac6fb884729
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Mar  7 15:53:32 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Mar  7 15:53:32 2021 +
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  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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-03-07 Thread Joonas Niilola
commit: 325c36bc2114d5111f8a82ba0813d4bc7de7abf2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Mar  7 15:15:44 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar  7 15:17:20 2021 +
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  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index 70b94da0445..a77634827df 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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/";



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-03-06 Thread Joonas Niilola
commit: 9b5ccdb288795c917ed3843220d43a84e726d179
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Fri Mar  5 19:59:16 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar  6 14:07:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b5ccdb2

sci-geosciences/grass: fix install version  (7.9 dev)

Closes: https://bugs.gentoo.org/774330
Signed-off-by: Tomas Zigo  slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/19785
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
index b2455ab8dc8..70b94da0445 100644
--- a/sci-geosciences/grass/grass-.ebuild
+++ b/sci-geosciences/grass/grass-.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



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-02-14 Thread Joonas Niilola
commit: 95c6e2c58745cc79ffeb4cfab85523bc58f2099a
Author: Tomas Zigo  slovanet  sk>
AuthorDate: Fri Jan 22 16:03:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Feb 14 14:28:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c6e2c5

sci-geosciences/grass: add version  (7.9 dev)

Signed-off-by: Tomas Zigo  slovanet.sk>
Closes: https://github.com/gentoo/gentoo/pull/19160
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-geosciences/grass/grass-.ebuild | 262 
 1 file changed, 262 insertions(+)

diff --git a/sci-geosciences/grass/grass-.ebuild 
b/sci-geosciences/grass/grass-.ebuild
new file mode 100644
index 000..b2455ab8dc8
--- /dev/null
+++ b/sci-geosciences/grass/grass-.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 "
+   ewarn "where  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 "
+   ewarn "where  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
+  

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-01-20 Thread Joonas Niilola
commit: 8f11c6038f858cc6ae60df12ee37f0bc0b462fb5
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon Dec 21 20:04:49 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jan 20 14:13:38 2021 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola  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 000..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 "
+   ewarn "where  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 n

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2021-01-05 Thread Sam James
commit: 303a921f23fc7394c60d24f5db93b09c7c8a4254
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  6 06:33:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  6 06:33:02 2021 +
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  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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2020-12-29 Thread Sam James
commit: 47dbf9d95e1c1b06c6808c814183d78cebced242
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 29 20:20:32 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 29 20:20:32 2020 +
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  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}



[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

2020-11-25 Thread Joonas Niilola
commit: 67768459cb8bcd7a8a2341b2697f0558afbd26d1
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Oct 10 19:34:25 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov 25 08:16:46 2020 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/17879
Signed-off-by: Joonas Niilola  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 
4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf327525f9c35f32e317677b05809ab3d7aeb03dc84
+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 000..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 "
+   ewarn "where  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/.*atla

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/, sci-geosciences/grass/files/

2020-11-25 Thread Joonas Niilola
commit: 55963a3f7ff33af3182040c076132590fc9be166
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Oct 10 14:34:30 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov 25 08:16:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55963a3f

sci-geosciences/grass: fix build failure

Fix build failure during highly parallel build.

Closes: https://bugs.gentoo.org/746590
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-geosciences/grass/files/grass-7.8-flock.patch | 17 +
 sci-geosciences/grass/grass-7.8.3.ebuild  |  5 +
 2 files changed, 22 insertions(+)

diff --git a/sci-geosciences/grass/files/grass-7.8-flock.patch 
b/sci-geosciences/grass/files/grass-7.8-flock.patch
new file mode 100644
index 000..4070f228dbb
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.8-flock.patch
@@ -0,0 +1,17 @@
+diff -Naur grass-7.8.3.org/include/Make/HtmlRules.make 
grass-7.8.3/include/Make/HtmlRules.make
+--- grass-7.8.3.org/include/Make/HtmlRules.make2020-05-05 
10:51:50.0 +0200
 grass-7.8.3/include/Make/HtmlRules.make2020-10-10 13:43:42.800880621 
+0200
+@@ -11,10 +11,10 @@
+ endif
+ 
+ $(HTMLDIR)/%.png: %.png | $(HTMLDIR)
+-  $(INSTALL_DATA) $< $@
++  flock $@ $(INSTALL_DATA) $< $@
+ 
+ $(HTMLDIR)/%.jpg: %.jpg | $(HTMLDIR)
+-  $(INSTALL_DATA) $< $@
++  flock $@ $(INSTALL_DATA) $< $@
+ 
+ $(HTMLDIR)/%.gif: %.gif | $(HTMLDIR)
+-  $(INSTALL_DATA) $< $@
++  flock $@ $(INSTALL_DATA) $< $@

diff --git a/sci-geosciences/grass/grass-7.8.3.ebuild 
b/sci-geosciences/grass/grass-7.8.3.ebuild
index ab8ab4cf98a..e8911d37392 100644
--- a/sci-geosciences/grass/grass-7.8.3.ebuild
+++ b/sci-geosciences/grass/grass-7.8.3.ebuild
@@ -79,6 +79,11 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   # bug 746590
+   "${FILESDIR}/${PN}-7.8-flock.patch"
+)
+
 pkg_setup() {
if use lapack; then
local mylapack=$(eselect lapack show)



  1   2   >