From 06dc20558d6372d03ac0925c3fa508bcaa2e41cc Mon Sep 17 00:00:00 2001 From: Mario Haustein Date: Sun, 16 Jul 2023 14:43:10 +0200 Subject: sci-geosciences/grass: remove sed no-ops Signed-off-by: Mario Haustein Signed-off-by: Sam James --- sci-geosciences/grass/grass-8.3.0.ebuild | 23 ----------------------- sci-geosciences/grass/grass-9999.ebuild | 23 ----------------------- 2 files changed, 46 deletions(-) (limited to 'sci-geosciences') 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" -- cgit v1.2.3-65-gdbad