[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/

[Sam James]

commit:     ea8f17e7ca45c0eb1225cf2e2ded0207e9db4514
Author:     Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Dec 30 20:30:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  2 07:02:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8f17e7

sci-geosciences/grass: rename binary

Upstream decided to drop the version number from the binary.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
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-9999.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sci-geosciences/grass/grass-9999.ebuild 
b/sci-geosciences/grass/grass-9999.ebuild
index f2d4abfd423d..4e0eaf89a49f 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -218,13 +218,11 @@ src_install() {
                sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
        done
 
-       mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM} || die
-
        # 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}\"):\
 GISBASE = os.path.normpath(\"${gisbase}\"):" \
-               -i "${ED}"/usr/bin/${MY_PM} || die
+               -i "${ED}"/usr/bin/grass || die
 
        # get proper fonts path for fontcap
        sed -i \
@@ -234,7 +232,7 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
        # set proper python interpreter
        sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
 os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-               -i "${ED}"/usr/bin/${MY_PM} || die
+               -i "${ED}"/usr/bin/grass || die
 
        # set proper GISDBASE directory path in the demolocation .grassrc80 file
        sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
@@ -243,7 +241,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
        if use X; then
                local GUI="-gui"
                [[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-               make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" 
"${PN}-48x48" "Science;Education"
+               make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" 
"${PN}-48x48" "Science;Education"
                doicon -s 48 gui/icons/${PN}-48x48.png
        fi