From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1484858-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 8156915800F
for <garchives@archives.gentoo.org>; Wed, 8 Feb 2023 04:11:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CC48EE07E2;
Wed, 8 Feb 2023 04:11:52 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B23E1E07E2
for <gentoo-commits@lists.gentoo.org>; Wed, 8 Feb 2023 04:11:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CF3B8340E24
for <gentoo-commits@lists.gentoo.org>; Wed, 8 Feb 2023 04:11:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E91828A7
for <gentoo-commits@lists.gentoo.org>; Wed, 8 Feb 2023 04:11:47 +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: <1675829465.1d5832ee940cb0b6635d29bf2e9be39d20ce696b.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-8.2.0-r6.ebuild 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: 1d5832ee940cb0b6635d29bf2e9be39d20ce696b
X-VCS-Branch: master
Date: Wed, 8 Feb 2023 04:11:47 +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: 36b76e3c-aff0-4e33-ad1f-a6b465776823
X-Archives-Hash: 60fc62a4525500c8f1992a21eccc31bb
commit: 1d5832ee940cb0b6635d29bf2e9be39d20ce696b
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Jan 29 18:27:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 8 04:11:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5832ee
sci-geosciences/grass: fix variable assignment order
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-geosciences/grass/grass-8.2.0-r6.ebuild | 8 ++++++--
sci-geosciences/grass/grass-9999.ebuild | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/sci-geosciences/grass/grass-8.2.0-r6.ebuild b/sci-geosciences/grass/grass-8.2.0-r6.ebuild
index 2439b5ce2439..89da9d5144ac 100644
--- a/sci-geosciences/grass/grass-8.2.0-r6.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r6.ebuild
@@ -13,17 +13,21 @@ HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
+if [[ ${PV} =~ "9999" ]]; then
+ SLOT="0/8.3"
+else
+ SLOT="0/$(ver_cut 1-2 ${PV})"
+fi
+
GVERSION=${SLOT#*/}
MY_PM="${PN}${GVERSION}"
MY_PM="${MY_PM/.}"
if [[ ${PV} =~ "9999" ]]; then
inherit git-r3
- SLOT="0/8.3"
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
else
MY_P="${P/_rc/RC}"
- SLOT="0/$(ver_cut 1-2 ${PV})"
SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="amd64 ~x86"
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index ed97dc748c64..9adfe1854258 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -13,17 +13,21 @@ HOMEPAGE="https://grass.osgeo.org/"
LICENSE="GPL-2"
+if [[ ${PV} =~ "9999" ]]; then
+ SLOT="0/8.3"
+else
+ SLOT="0/$(ver_cut 1-2 ${PV})"
+fi
+
GVERSION=${SLOT#*/}
MY_PM="${PN}${GVERSION}"
MY_PM="${MY_PM/.}"
if [[ ${PV} =~ "9999" ]]; then
inherit git-r3
- SLOT="0/8.3"
EGIT_REPO_URI="https://github.com/OSGeo/grass.git"
else
MY_P="${P/_rc/RC}"
- SLOT="0/$(ver_cut 1-2 ${PV})"
SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~amd64 ~ppc ~x86"