diff options
| author |   Denis Dupeyron <calchan@gentoo.org> | 2016-09-12 13:37:22 -0600 |
|---|---|---|
| committer | Denis Dupeyron <calchan@gentoo.org> | 2016-09-12 13:37:22 -0600 |
| commit | 49f4aa6a4b60cfd02acd8ac85aa239a38434d560 (patch) | |
| tree | fe24cec65327d3f7c6b0929fd5061d40d9f10905 /dev-lang | |
| parent | dev-db/mysql: Version bump for 5.6.33 (diff) | |
| download | gentoo-49f4aa6a4b60cfd02acd8ac85aa239a38434d560.tar.gz gentoo-49f4aa6a4b60cfd02acd8ac85aa239a38434d560.tar.bz2 gentoo-49f4aa6a4b60cfd02acd8ac85aa239a38434d560.zip | |
dev-lang/R: 593420
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/R/R-3.3.1.ebuild | 8 |
1 files 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 c7a578ac3863..ceeeaf9f4639 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} |