[gentoo-commits] repo/gentoo:master commit in: dev-lang/R/

[Denis Dupeyron]

commit:     49f4aa6a4b60cfd02acd8ac85aa239a38434d560
Author:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 19:37:22 2016 +0000
Commit:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 19:37:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f4aa6a

dev-lang/R: 593420

 dev-lang/R/R-3.3.1.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-lang/R/R-3.3.1.ebuild b/dev-lang/R/R-3.3.1.ebuild
index c7a578a..ceeeaf9 100644
--- a/dev-lang/R/R-3.3.1.ebuild
+++ b/dev-lang/R/R-3.3.1.ebuild
@@ -50,8 +50,6 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="minimal? ( test )"
 
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
 pkg_setup() {
        if use openmp; then
                if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
@@ -83,7 +81,7 @@ src_prepare() {
 
        # fix Rscript path when installed (gentoo bug #221061)
        sed -i \
-               -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
+               -e 
"s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" 
\
                src/unix/Makefile.in || die "sed unix Makefile failed"
 
        # fix HTML links to manual (gentoo bug #273957)
@@ -173,8 +171,8 @@ src_install() {
        fi
 
        cat > 99R <<-EOF
-               LDPATH=${R_DIR}/lib
-               R_HOME=${R_DIR}
+               LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
+               R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
        EOF
        doenvd 99R
        newbashcomp "${WORKDIR}"/${BCP} ${PN}