From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1354489-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 202F0158086
for <garchives@archives.gentoo.org>; Sun, 2 Jan 2022 07:05:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 382DE2C4007;
Sun, 2 Jan 2022 07:05:37 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B8D842C4005
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Jan 2022 07:05:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BAAA8342B11
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Jan 2022 07:05:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C205278
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Jan 2022 07:05:28 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1641106977.ea8f17e7ca45c0eb1225cf2e2ded0207e9db4514.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-geosciences/grass/grass-9999.ebuild
X-VCS-Directories: sci-geosciences/grass/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: ea8f17e7ca45c0eb1225cf2e2ded0207e9db4514
X-VCS-Branch: master
Date: Sun, 2 Jan 2022 07:05:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 17317bc3-1f04-4119-af2b-cbdf298c9efe
X-Archives-Hash: 544197642b8e4a9e92a70e142f1e4368
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