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.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 3F10215801B for ; Sun, 16 Jul 2023 13:26:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32C23E08A2; Sun, 16 Jul 2023 13:26:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 157EFE08A2 for ; Sun, 16 Jul 2023 13:26:26 +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 135AF335DB5 for ; Sun, 16 Jul 2023 13:26:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A944A36 for ; Sun, 16 Jul 2023 13:26:23 +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: <1689513808.06dc20558d6372d03ac0925c3fa508bcaa2e41cc.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-8.3.0.ebuild 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: 06dc20558d6372d03ac0925c3fa508bcaa2e41cc X-VCS-Branch: master Date: Sun, 16 Jul 2023 13:26:23 +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: 648f36de-2fc8-4259-bd18-3e27b0f606d5 X-Archives-Hash: 2ae174cd47ba92790b4b04b79876ea5c commit: 06dc20558d6372d03ac0925c3fa508bcaa2e41cc Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sun Jul 16 12:43:10 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 16 13:23:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06dc2055 sci-geosciences/grass: remove sed no-ops Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> sci-geosciences/grass/grass-8.3.0.ebuild | 23 ----------------------- sci-geosciences/grass/grass-9999.ebuild | 23 ----------------------- 2 files changed, 46 deletions(-) diff --git a/sci-geosciences/grass/grass-8.3.0.ebuild b/sci-geosciences/grass/grass-8.3.0.ebuild index 212d805be495..e80a47292e49 100644 --- a/sci-geosciences/grass/grass-8.3.0.ebuild +++ b/sci-geosciences/grass/grass-8.3.0.ebuild @@ -240,34 +240,11 @@ src_install() { dodir /usr/include/ dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass - # fix paths in addons makefile includes - local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/ - for f in "${scriptMakeDir}"/*; do - file="${f##*/}" - echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - done - - # 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/grass || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ - "${ED}"${gisbase}/etc/fontcap || die - # set proper python interpreter sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ -i "${ED}"/usr/bin/grass || die - # set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file - sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \ - -i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die - if use X; then local GUI="--gui" make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education" diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index 4a055a1fe3ea..337cf8efb27d 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -235,34 +235,11 @@ src_install() { dodir /usr/include/ dosym ../$(get_libdir)/${MY_PM}/include/grass /usr/include/grass - # fix paths in addons makefile includes - local scriptMakeDir="${ED}"/usr/$(get_libdir)/${MY_PM}/include/Make/ - for f in "${scriptMakeDir}"/*; do - file="${f##*/}" - echo sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die - done - - # 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/grass || die - - # get proper fonts path for fontcap - sed -i \ - -e "s|${ED}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ - "${ED}"${gisbase}/etc/fontcap || die - # set proper python interpreter sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\ os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \ -i "${ED}"/usr/bin/grass || die - # set proper GISDBASE directory path in the demolocation .grassrc${GVERSION//.} file - sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \ - -i "${ED}"${gisbase}/demolocation/.grassrc${GVERSION//.} || die - if use X; then local GUI="--gui" make_desktop_entry "/usr/bin/grass ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"