From: David Seifert <soap@gentoo.org>
Date: Sat, 8 Feb 2020 16:21:22 +0000 (+0100)
Subject: dev-lang/R: [QA] Fix UnnecessarySlashStrip
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=aba5c51f6c144c813e66a875fc361d3a4acd69cb;p=gentoo.git

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 df86d7063895..35f7ce8af6b0 100644
--- 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 df86d7063895..35f7ce8af6b0 100644
--- 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 b428a1112711..f3312585e0cc 100644
--- 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}