1 |
commit: ea8f17e7ca45c0eb1225cf2e2ded0207e9db4514 |
2 |
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> |
3 |
AuthorDate: Thu Dec 30 20:30:49 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 2 07:02:57 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8f17e7 |
7 |
|
8 |
sci-geosciences/grass: rename binary |
9 |
|
10 |
Upstream decided to drop the version number from the binary. |
11 |
|
12 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
13 |
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de> |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
sci-geosciences/grass/grass-9999.ebuild | 8 +++----- |
17 |
1 file changed, 3 insertions(+), 5 deletions(-) |
18 |
|
19 |
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild |
20 |
index f2d4abfd423d..4e0eaf89a49f 100644 |
21 |
--- a/sci-geosciences/grass/grass-9999.ebuild |
22 |
+++ b/sci-geosciences/grass/grass-9999.ebuild |
23 |
@@ -218,13 +218,11 @@ src_install() { |
24 |
sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die |
25 |
done |
26 |
|
27 |
- mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM} || die |
28 |
- |
29 |
# get proper folder for grass path in script |
30 |
local gisbase=/usr/$(get_libdir)/${MY_PM} |
31 |
sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\ |
32 |
GISBASE = os.path.normpath(\"${gisbase}\"):" \ |
33 |
- -i "${ED}"/usr/bin/${MY_PM} || die |
34 |
+ -i "${ED}"/usr/bin/grass || die |
35 |
|
36 |
# get proper fonts path for fontcap |
37 |
sed -i \ |
38 |
@@ -234,7 +232,7 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \ |
39 |
# set proper python interpreter |
40 |
sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ |
41 |
os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ |
42 |
- -i "${ED}"/usr/bin/${MY_PM} || die |
43 |
+ -i "${ED}"/usr/bin/grass || die |
44 |
|
45 |
# set proper GISDBASE directory path in the demolocation .grassrc80 file |
46 |
sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \ |
47 |
@@ -243,7 +241,7 @@ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ |
48 |
if use X; then |
49 |
local GUI="-gui" |
50 |
[[ ${WX_BUILD} == yes ]] && GUI="-wxpython" |
51 |
- make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" |
52 |
+ make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" |
53 |
doicon -s 48 gui/icons/${PN}-48x48.png |
54 |
fi |