commit:     fe9dc70beb2e205fb3edc95a23612b2cb21bb6a8
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 04:15:55 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 04:15:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=fe9dc70b

R-packages.eclass: use default S.

 files/eclass/R-packages.eclass | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass
index 8544e70..7d2afc6 100644
--- a/files/eclass/R-packages.eclass
+++ b/files/eclass/R-packages.eclass
@@ -13,26 +13,23 @@ IUSE="byte-compile"
 DEPEND="dev-lang/R"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 R-packages_src_unpack() {
        unpack ${A}
        mv ${PN//_/.} ${P}
 }
 
 R-packages_src_prepare() {
-       cd ${P}
        epatch_user
 }
 
 R-packages_src_compile() {
        MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } 
FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" \
-               R CMD INSTALL ${S}/${P} -l . $(use byte-compile && echo 
"--byte-compile")
+               R CMD INSTALL . -l "${WORKDIR}" $(use byte-compile && echo 
"--byte-compile")
 }
 
 R-packages_src_install() {
        insinto /usr/$(get_libdir)/R/site-library
-       doins -r ${PN//_/.}
+       doins -r "${WORKDIR}"/${PN//_/.}y
 }
 
 R-packages_pkg_postinst() {

Reply via email to