diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
commit | 71deace00d1a2b091313fe137ab7092418c6f87c (patch) | |
tree | 9f1f0dee23e13658e52f49437befe78427148c51 /dev-lang/R/R-3.6.2.ebuild | |
parent | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff) |
gentoo resync : 10.02.2020
Diffstat (limited to 'dev-lang/R/R-3.6.2.ebuild')
-rw-r--r-- | dev-lang/R/R-3.6.2.ebuild | 10 |
1 files changed, 5 insertions, 5 deletions
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} |