Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
Date: Fri, 24 Sep 2021 23:36:59
Message-Id: 1632526475.e8cef9238270fcd394e032616ab9b9c3e420cdfc.sam@gentoo
1 commit: e8cef9238270fcd394e032616ab9b9c3e420cdfc
2 Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk>
3 AuthorDate: Sun Sep 19 15:17:35 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 24 23:34:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8cef923
7
8 sci-geosciences/grass: fix install version 9999 (changes from 7.9 dev version to 8.0)
9
10 Closes: https://bugs.gentoo.org/813879
11 Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 sci-geosciences/grass/grass-9999.ebuild | 10 ++++++----
15 1 file changed, 6 insertions(+), 4 deletions(-)
16
17 diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
18 index a77634827df..b0087078be5 100644
19 --- a/sci-geosciences/grass/grass-9999.ebuild
20 +++ b/sci-geosciences/grass/grass-9999.ebuild
21 @@ -3,14 +3,14 @@
22
23 EAPI=7
24
25 -PYTHON_COMPAT=( python3_{6..9} )
26 +PYTHON_COMPAT=( python3_{8,9} )
27 PYTHON_REQ_USE="sqlite" # bug 572440
28 WANT_AUTOCONF="2.1"
29 WX_GTK_VER="3.0-gtk3"
30
31 inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
32
33 -MY_P="${PN}7.9"
34 +MY_P="${PN}8.0"
35 MY_PM="${MY_P/.}"
36
37 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
38 @@ -216,6 +216,8 @@ src_install() {
39 sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
40 done
41
42 + mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM}
43 +
44 # get proper folder for grass path in script
45 local gisbase=/usr/$(get_libdir)/${MY_PM}
46 sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
47 @@ -232,9 +234,9 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
48 os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
49 -i "${ED}"/usr/bin/${MY_PM} || die
50
51 - # set proper GISDBASE directory path in the demolocation .grassrc79 file
52 + # set proper GISDBASE directory path in the demolocation .grassrc80 file
53 sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
54 - -i "${ED}"${gisbase}/demolocation/.grassrc79 || die
55 + -i "${ED}"${gisbase}/demolocation/.grassrc80 || die
56
57 if use X; then
58 local GUI="-gui"