From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1358283-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 61DB4158088
for <garchives@archives.gentoo.org>; Sun, 16 Jan 2022 01:47:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2B7232BC017;
Sun, 16 Jan 2022 01:47:33 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0D5D7E0823
for <gentoo-commits@lists.gentoo.org>; Sun, 16 Jan 2022 01:47:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7F3CA343035
for <gentoo-commits@lists.gentoo.org>; Sun, 16 Jan 2022 01:47:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 092712A0
for <gentoo-commits@lists.gentoo.org>; Sun, 16 Jan 2022 01:47:30 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1642297577.07f7fc6cffd2f50c1b375efbcb97dcfea04cf427.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-geosciences/grass/grass-9999.ebuild
X-VCS-Directories: sci-geosciences/grass/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 07f7fc6cffd2f50c1b375efbcb97dcfea04cf427
X-VCS-Branch: master
Date: Sun, 16 Jan 2022 01:47:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f40664b1-9d36-4cf7-a046-7e63a49f8dcf
X-Archives-Hash: 0ec797cf650fa8d1167a53ca8aa109c2
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"