Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/R_overlay:master commit in: files/eclass/
Date: Thu, 07 Jul 2016 04:19:44
Message-Id: 1467864955.fe9dc70beb2e205fb3edc95a23612b2cb21bb6a8.heroxbd@gentoo
1 commit: fe9dc70beb2e205fb3edc95a23612b2cb21bb6a8
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 7 04:15:55 2016 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 7 04:15:55 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=fe9dc70b
7
8 R-packages.eclass: use default S.
9
10 files/eclass/R-packages.eclass | 7 ++-----
11 1 file changed, 2 insertions(+), 5 deletions(-)
12
13 diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass
14 index 8544e70..7d2afc6 100644
15 --- a/files/eclass/R-packages.eclass
16 +++ b/files/eclass/R-packages.eclass
17 @@ -13,26 +13,23 @@ IUSE="byte-compile"
18 DEPEND="dev-lang/R"
19 RDEPEND="${DEPEND}"
20
21 -S="${WORKDIR}"
22 -
23 R-packages_src_unpack() {
24 unpack ${A}
25 mv ${PN//_/.} ${P}
26 }
27
28 R-packages_src_prepare() {
29 - cd ${P}
30 epatch_user
31 }
32
33 R-packages_src_compile() {
34 MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" \
35 - R CMD INSTALL ${S}/${P} -l . $(use byte-compile && echo "--byte-compile")
36 + R CMD INSTALL . -l "${WORKDIR}" $(use byte-compile && echo "--byte-compile")
37 }
38
39 R-packages_src_install() {
40 insinto /usr/$(get_libdir)/R/site-library
41 - doins -r ${PN//_/.}
42 + doins -r "${WORKDIR}"/${PN//_/.}y
43 }
44
45 R-packages_pkg_postinst() {