From 1d5832ee940cb0b6635d29bf2e9be39d20ce696b Mon Sep 17 00:00:00 2001 From: Mario Haustein Date: Sun, 29 Jan 2023 19:27:55 +0100 Subject: sci-geosciences/grass: fix variable assignment order Signed-off-by: Mario Haustein Signed-off-by: Sam James --- sci-geosciences/grass/grass-8.2.0-r6.ebuild | 8 ++++++-- sci-geosciences/grass/grass-9999.ebuild | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'sci-geosciences') 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" -- cgit v1.2.3-65-gdbad