From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-901105-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8393C138330
for <garchives@archives.gentoo.org>; Mon, 12 Sep 2016 19:38:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6CE3DE0850;
Mon, 12 Sep 2016 19:38:16 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4FBABE0850
for <gentoo-commits@lists.gentoo.org>; Mon, 12 Sep 2016 19:38:16 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A2FCD340A5C
for <gentoo-commits@lists.gentoo.org>; Mon, 12 Sep 2016 19:38:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AB4A32471
for <gentoo-commits@lists.gentoo.org>; Mon, 12 Sep 2016 19:38:11 +0000 (UTC)
From: "Denis Dupeyron" <calchan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Denis Dupeyron" <calchan@gentoo.org>
Message-ID: <1473709042.49f4aa6a4b60cfd02acd8ac85aa239a38434d560.calchan@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/R/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/R/R-3.3.1.ebuild
X-VCS-Directories: dev-lang/R/
X-VCS-Committer: calchan
X-VCS-Committer-Name: Denis Dupeyron
X-VCS-Revision: 49f4aa6a4b60cfd02acd8ac85aa239a38434d560
X-VCS-Branch: master
Date: Mon, 12 Sep 2016 19:38:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2b089c2e-48ca-414c-b254-3a91c1b9c1de
X-Archives-Hash: 1ecfd8a7ceba133f347ab07a9e1ae812
commit: 49f4aa6a4b60cfd02acd8ac85aa239a38434d560
Author: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 19:37:22 2016 +0000
Commit: Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 19:37:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f4aa6a
dev-lang/R: 593420
dev-lang/R/R-3.3.1.ebuild | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dev-lang/R/R-3.3.1.ebuild b/dev-lang/R/R-3.3.1.ebuild
index c7a578a..ceeeaf9 100644
--- a/dev-lang/R/R-3.3.1.ebuild
+++ b/dev-lang/R/R-3.3.1.ebuild
@@ -50,8 +50,6 @@ RDEPEND="${CDEPEND}
RESTRICT="minimal? ( test )"
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
pkg_setup() {
if use openmp; then
if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
@@ -83,7 +81,7 @@ src_prepare() {
# fix Rscript path when installed (gentoo bug #221061)
sed -i \
- -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
+ -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
src/unix/Makefile.in || die "sed unix Makefile failed"
# fix HTML links to manual (gentoo bug #273957)
@@ -173,8 +171,8 @@ src_install() {
fi
cat > 99R <<-EOF
- LDPATH=${R_DIR}/lib
- R_HOME=${R_DIR}
+ LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
+ R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
EOF
doenvd 99R
newbashcomp "${WORKDIR}"/${BCP} ${PN}