From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0127E158013 for ; Fri, 24 Sep 2021 23:36:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CEBCE0974; Fri, 24 Sep 2021 23:36:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0FAAE0967 for ; Fri, 24 Sep 2021 23:36:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78FEB342B1C for ; Fri, 24 Sep 2021 23:36:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13223102 for ; Fri, 24 Sep 2021 23:36:54 +0000 (UTC) From: "Sam James" 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" Message-ID: <1632526475.e8cef9238270fcd394e032616ab9b9c3e420cdfc.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: e8cef9238270fcd394e032616ab9b9c3e420cdfc X-VCS-Branch: master Date: Fri, 24 Sep 2021 23:36:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a5758d24-34f8-4db6-9923-95aa333409b3 X-Archives-Hash: c0008f888cf835fcafd8eb77646483ea commit: e8cef9238270fcd394e032616ab9b9c3e420cdfc Author: Tomas Zigo slovanet sk> AuthorDate: Sun Sep 19 15:17:35 2021 +0000 Commit: Sam James gentoo 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 slovanet.sk> Signed-off-by: Sam James 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"