[gentoo-commits] proj/R_overlay:master commit in: files/eclass/

[Benda XU]

commit:     9cbd621514659738f3a8943e4bde3d90c8febfc3
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 08:07:40 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon May 28 08:07:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=9cbd6215

Only move source directory when needed.

  This supports packages from outside CRAN.

  Fix typo in the last commit.

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

diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass
index 7d2afc6..5c3b66c 100644
--- a/files/eclass/R-packages.eclass
+++ b/files/eclass/R-packages.eclass
@@ -15,7 +15,9 @@ RDEPEND="${DEPEND}"
 
 R-packages_src_unpack() {
        unpack ${A}
-       mv ${PN//_/.} ${P}
+       if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then
+               mv ${PN//_/.} ${P}
+       fi
 }
 
 R-packages_src_prepare() {
@@ -29,7 +31,7 @@ R-packages_src_compile() {
 
 R-packages_src_install() {
        insinto /usr/$(get_libdir)/R/site-library
-       doins -r "${WORKDIR}"/${PN//_/.}y
+       doins -r "${WORKDIR}"/${PN//_/.}
 }
 
 R-packages_pkg_postinst() {