commit: e8cef9238270fcd394e032616ab9b9c3e420cdfc Author: Tomas Zigo <tomas.zigo <AT> slovanet <DOT> sk> AuthorDate: Sun Sep 19 15:17:35 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Sep 24 23:34:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8cef923
sci-geosciences/grass: fix install version 9999 (changes from 7.9 dev version to 8.0) Closes: https://bugs.gentoo.org/813879 Signed-off-by: Tomas Zigo <tomas.zigo <AT> slovanet.sk> Signed-off-by: Sam James <sam <AT> gentoo.org> sci-geosciences/grass/grass-9999.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index a77634827df..b0087078be5 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -3,14 +3,14 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) +PYTHON_COMPAT=( python3_{8,9} ) PYTHON_REQ_USE="sqlite" # bug 572440 WANT_AUTOCONF="2.1" WX_GTK_VER="3.0-gtk3" inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg -MY_P="${PN}7.9" +MY_P="${PN}8.0" MY_PM="${MY_P/.}" DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" @@ -216,6 +216,8 @@ src_install() { sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die done + mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM} + # get proper folder for grass path in script local gisbase=/usr/$(get_libdir)/${MY_PM} sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\ @@ -232,9 +234,9 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \ os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \ -i "${ED}"/usr/bin/${MY_PM} || die - # set proper GISDBASE directory path in the demolocation .grassrc79 file + # set proper GISDBASE directory path in the demolocation .grassrc80 file sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \ - -i "${ED}"${gisbase}/demolocation/.grassrc79 || die + -i "${ED}"${gisbase}/demolocation/.grassrc80 || die if use X; then local GUI="-gui"
