dev-lang/R: [QA] Fix UnnecessarySlashStrip

Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/dev-lang/R/R-3.5.3.ebuild b/dev-lang/R/R-3.5.3.ebuild
index df86d70638952f7054d5ab8d01eef906fdfa2bd3..35f7ce8af6b077820e50b4b835c1080178794fa8 100644 (file)
--- a/dev-lang/R/R-3.5.3.ebuild
+++ b/dev-lang/R/R-3.5.3.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
                -i src/library/tools/R/Rd.R || die
 
        # fix Rscript path when installed (gentoo bug #221061)
-       sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+       sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
                -i src/unix/Makefile.in || die "sed unix Makefile failed"
 
        # fix HTML links to manual (gentoo bug #273957)
@@ -116,10 +116,10 @@ src_prepare() {
                                -e "/SHLIB_EXT/s/\.so/.dylib/" \
                                -i configure.ac || die
                        # sort of "undo" 2.14.1-rmath-shared.patch
-                       sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+                       sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
                                -i src/nmath/standalone/Makefile.in || die
                else
-                       append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+                       append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
                fi
        fi
        AT_M4DIR=m4
@@ -175,8 +175,8 @@ src_install() {
        fi
 
        cat > 99R <<-EOF
-               LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
-               R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+               LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+               R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
        EOF
        doenvd 99R
        newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}

diff --git a/dev-lang/R/R-3.6.0.ebuild b/dev-lang/R/R-3.6.0.ebuild
index df86d70638952f7054d5ab8d01eef906fdfa2bd3..35f7ce8af6b077820e50b4b835c1080178794fa8 100644 (file)
--- a/dev-lang/R/R-3.6.0.ebuild
+++ b/dev-lang/R/R-3.6.0.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
                -i src/library/tools/R/Rd.R || die
 
        # fix Rscript path when installed (gentoo bug #221061)
-       sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+       sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
                -i src/unix/Makefile.in || die "sed unix Makefile failed"
 
        # fix HTML links to manual (gentoo bug #273957)
@@ -116,10 +116,10 @@ src_prepare() {
                                -e "/SHLIB_EXT/s/\.so/.dylib/" \
                                -i configure.ac || die
                        # sort of "undo" 2.14.1-rmath-shared.patch
-                       sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+                       sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
                                -i src/nmath/standalone/Makefile.in || die
                else
-                       append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+                       append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
                fi
        fi
        AT_M4DIR=m4
@@ -175,8 +175,8 @@ src_install() {
        fi
 
        cat > 99R <<-EOF
-               LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
-               R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+               LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+               R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
        EOF
        doenvd 99R
        newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}

diff --git a/dev-lang/R/R-3.6.2.ebuild b/dev-lang/R/R-3.6.2.ebuild
index b428a1112711255b5b99e5e89b34a54299cd1550..f3312585e0ccf949676f95cac053a8ef26bedc0e 100644 (file)
--- a/dev-lang/R/R-3.6.2.ebuild
+++ b/dev-lang/R/R-3.6.2.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
                -i src/library/tools/R/Rd.R || die
 
        # fix Rscript path when installed (gentoo bug #221061)
-       sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+       sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
                -i src/unix/Makefile.in || die "sed unix Makefile failed"
 
        # fix HTML links to manual (gentoo bug #273957)
@@ -118,10 +118,10 @@ src_prepare() {
                                -e "/SHLIB_EXT/s/\.so/.dylib/" \
                                -i configure.ac || die
                        # sort of "undo" 2.14.1-rmath-shared.patch
-                       sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+                       sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
                                -i src/nmath/standalone/Makefile.in || die
                else
-                       append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+                       append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
                fi
        fi
        AT_M4DIR=m4
@@ -177,8 +177,8 @@ src_install() {
        fi
 
        cat > 99R <<-EOF
-               LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
-               R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+               LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+               R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
        EOF
        doenvd 99R
        newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}