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

["Sam James" <sam@gentoo.org>]

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

sci-geosciences/grass: add GVERSION global var

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

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

diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index b7c94db005af..d0b73c80b283 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -9,15 +9,15 @@ WX_GTK_VER="3.0-gtk3"
 
 inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
 
-MY_P="${PN}8.1"
-MY_PM="${MY_P/.}"
-
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
 HOMEPAGE="https://grass.osgeo.org/"
 EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
 
 LICENSE="GPL-2"
 SLOT="0/8.1"
+GVERSION=${SLOT#*/}
+MY_P="${PN}${GVERSION}"
+MY_PM="${MY_P/.}"
 IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -234,9 +234,9 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
 os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
 		-i "${ED}"/usr/bin/grass || die
 
-	# set proper GISDBASE directory path in the demolocation .grassrc80 file
+	# set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file
 	sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
-		-i "${ED}"${gisbase}/demolocation/.grassrc81 || die
+		-i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die
 
 	if use X; then
 		local GUI="-gui"