diff options
| author |   Denis Dupeyron <calchan@gentoo.org> | 2013-02-13 19:16:31 +0000 |
|---|---|---|
| committer | Denis Dupeyron <calchan@gentoo.org> | 2013-02-13 19:16:31 +0000 |
| commit | 632ae6f881cb0f561f3859e5fc17b404b57d26d8 (patch) | |
| tree | 43712962c6e68dbfe933e91fc82fccbc9890ebec /dev-lang/R | |
| parent | Remove old (diff) | |
| download | gentoo-2-632ae6f881cb0f561f3859e5fc17b404b57d26d8.tar.gz gentoo-2-632ae6f881cb0f561f3859e5fc17b404b57d26d8.tar.bz2 gentoo-2-632ae6f881cb0f561f3859e5fc17b404b57d26d8.zip | |
Fix R_HOME warning when R is started up.
(Portage version: 2.1.11.50/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-lang/R')
| -rw-r--r-- | dev-lang/R/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/R/R-2.15.2-r2.ebuild (renamed from dev-lang/R/R-2.15.2-r1.ebuild) | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index a5ef542fabc5..11dc022f8de3 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/R # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.209 2013/01/29 18:27:44 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.210 2013/02/13 19:16:31 calchan Exp $ + +*R-2.15.2-r2 (13 Feb 2013) + + 13 Feb 2013; Denis Dupeyron <calchan@gentoo.org> -R-2.15.2-r1.ebuild, + +R-2.15.2-r2.ebuild: + Fix R_HOME warning when R is started up. 29 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> R-2.15.2-r1.ebuild: Fixed bash completion spaces (bug #417951, thanks Marco Poletti) and parallel diff --git a/dev-lang/R/R-2.15.2-r1.ebuild b/dev-lang/R/R-2.15.2-r2.ebuild index b00aac77f557..43c7260e4f11 100644 --- a/dev-lang/R/R-2.15.2-r1.ebuild +++ b/dev-lang/R/R-2.15.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.2-r1.ebuild,v 1.2 2013/01/29 18:27:44 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.2-r2.ebuild,v 1.1 2013/02/13 19:16:31 calchan Exp $ EAPI=5 @@ -48,7 +48,7 @@ RDEPEND="${CDEPEND} RESTRICT="minimal? ( test )" -R_DIR="${EROOT}/usr/$(get_libdir)/${PN}" +R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" pkg_setup() { if use openmp; then @@ -122,10 +122,10 @@ src_prepare() { configure.ac || die # sort of "undo" 2.14.1-rmath-shared.patch sed -i \ - -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \ + -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ src/nmath/standalone/Makefile.in || die else - append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib" + append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" fi fi AT_M4DIR=m4 eaclocal |