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

2023-07-31 Thread Benda XU 
commit: 68c6ef694ea96dc15228ff2ab9bc215dd2dd8ae7
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Aug  1 04:16:03 2023 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Aug  1 04:16:03 2023 +
URL:https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=68c6ef69

files/eclass/R-packages.eclass: drop eutils.

Signed-off-by: Benda Xu  gentoo.org>

 files/eclass/R-packages.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass
index 2d52145..f3864ff 100644
--- a/files/eclass/R-packages.eclass
+++ b/files/eclass/R-packages.eclass
@@ -1,8 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
-
 EXPORT_FUNCTIONS src_unpack src_configure src_compile src_install pkg_postinst
 
 SLOT="0"

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

2020-11-24 Thread Benda XU 
commit: b9c5f4dc2cc46038fa369859445667cef22ba930
Author: Benda Xu  gentoo  org>
AuthorDate: Tue Nov 24 10:28:37 2020 +
Commit: Benda XU  gentoo  org>
CommitDate: Tue Nov 24 10:28:37 2020 +
URL:https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=b9c5f4dc

files/eclass/R-packages.eclass: set src_configure as no-op.

In sci-CRAN/nloptr src_configure triggers installation as well, which
is not desired.

Signed-off-by: Benda Xu  gentoo.org>

 files/eclass/R-packages.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass
index 0315e0b..2d52145 100644
--- a/files/eclass/R-packages.eclass
+++ b/files/eclass/R-packages.eclass
@@ -3,7 +3,7 @@
 
 inherit eutils
 
-EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst
+EXPORT_FUNCTIONS src_unpack src_configure src_compile src_install pkg_postinst
 
 SLOT="0"
 IUSE="byte-compile"
@@ -19,6 +19,8 @@ R-packages_src_unpack() {
fi
 }
 
+R-packages_src_configure() { :; }
+
 R-packages_src_compile() {
MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } 
FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" \
R CMD INSTALL . -l "${WORKDIR}" $(use byte-compile && echo 
"--byte-compile")

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

2018-08-11 Thread Benda XU 
commit: 03d386f84d59f23650915365e04e30c215c1f07c
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Aug 11 08:59:03 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Aug 11 08:59:03 2018 +
URL:https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=03d386f8

R-package.eclass: do not expose src_prepare.

 files/eclass/R-packages.eclass | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass
index 8ac9321..0b1dac3 100644
--- a/files/eclass/R-packages.eclass
+++ b/files/eclass/R-packages.eclass
@@ -3,7 +3,7 @@
 
 inherit eutils
 
-EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -19,16 +19,6 @@ R-packages_src_unpack() {
fi
 }
 
-if has "${EAPI:-0}" 0 1 2 3 4 5; then
-   R-packages_src_prepare() {
-   epatch_user
-   }
-else
-   R-packages_src_prepare() {
-   default
-   }
-fi
-
 R-packages_src_compile() {
MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } 
FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" \
R CMD INSTALL . -l "${WORKDIR}" $(use byte-compile && echo 
"--byte-compile")

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

2018-07-12 Thread Benda XU 
commit: 8008c9551b15daaed1682513cdd5d9fd00bfe3ff
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Jul 12 07:04:14 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Jul 12 07:04:14 2018 +
URL:https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=8008c955

R-packages.eclass: EAPI bump to 6.

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

diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass
index 5c3b66c..8ac9321 100644
--- a/files/eclass/R-packages.eclass
+++ b/files/eclass/R-packages.eclass
@@ -1,6 +1,5 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 inherit eutils
 
@@ -20,9 +19,15 @@ R-packages_src_unpack() {
fi
 }
 
-R-packages_src_prepare() {
-   epatch_user
-}
+if has "${EAPI:-0}" 0 1 2 3 4 5; then
+   R-packages_src_prepare() {
+   epatch_user
+   }
+else
+   R-packages_src_prepare() {
+   default
+   }
+fi
 
 R-packages_src_compile() {
MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } 
FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" \

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

2018-05-28 Thread Benda XU 
commit: 9cbd621514659738f3a8943e4bde3d90c8febfc3
Author: Benda Xu  gentoo  org>
AuthorDate: Mon May 28 08:07:40 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Mon May 28 08:07:40 2018 +
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() {

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

2016-07-06 Thread Benda XU 
commit: fe9dc70beb2e205fb3edc95a23612b2cb21bb6a8
Author: Benda Xu  gentoo  org>
AuthorDate: Thu Jul  7 04:15:55 2016 +
Commit: Benda XU  gentoo  org>
CommitDate: Thu Jul  7 04:15:55 2016 +
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() {