| 1 |
commit: 9cbd621514659738f3a8943e4bde3d90c8febfc3 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 08:07:40 2018 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 28 08:07:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=9cbd6215 |
| 7 |
|
| 8 |
Only move source directory when needed. |
| 9 |
|
| 10 |
This supports packages from outside CRAN. |
| 11 |
|
| 12 |
Fix typo in the last commit. |
| 13 |
|
| 14 |
files/eclass/R-packages.eclass | 6 ++++-- |
| 15 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass |
| 18 |
index 7d2afc6..5c3b66c 100644 |
| 19 |
--- a/files/eclass/R-packages.eclass |
| 20 |
+++ b/files/eclass/R-packages.eclass |
| 21 |
@@ -15,7 +15,9 @@ RDEPEND="${DEPEND}" |
| 22 |
|
| 23 |
R-packages_src_unpack() { |
| 24 |
unpack ${A} |
| 25 |
- mv ${PN//_/.} ${P} |
| 26 |
+ if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then |
| 27 |
+ mv ${PN//_/.} ${P} |
| 28 |
+ fi |
| 29 |
} |
| 30 |
|
| 31 |
R-packages_src_prepare() { |
| 32 |
@@ -29,7 +31,7 @@ R-packages_src_compile() { |
| 33 |
|
| 34 |
R-packages_src_install() { |
| 35 |
insinto /usr/$(get_libdir)/R/site-library |
| 36 |
- doins -r "${WORKDIR}"/${PN//_/.}y |
| 37 |
+ doins -r "${WORKDIR}"/${PN//_/.} |
| 38 |
} |
| 39 |
|
| 40 |
R-packages_pkg_postinst() { |
Archives