diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2010-03-18 16:16:21 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2010-03-18 16:16:21 +0000 |
| commit | aea90a58da3f74aed12993b55f767b66c87a1b0a (patch) | |
| tree | a6e29b7be5b69eef62cf698ccd3237247c44bbb5 /dev-lang | |
| parent | Hotfix from upstream (diff) | |
| download | gentoo-2-aea90a58da3f74aed12993b55f767b66c87a1b0a.tar.gz gentoo-2-aea90a58da3f74aed12993b55f767b66c87a1b0a.tar.bz2 gentoo-2-aea90a58da3f74aed12993b55f767b66c87a1b0a.zip | |
Restricting test when minimal flag is on (upstream recommendation), some ebuild cleaning
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/R/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/R/R-2.10.1.ebuild | 25 |
2 files changed, 18 insertions, 15 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index dbe467431bbd..f0642c294b0b 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/R -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.167 2009/12/26 17:32:26 pva Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.168 2010/03/18 16:16:21 bicatali Exp $ + + 18 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> R-2.10.1.ebuild: + Restricting test when minimal flag is on (upstream recommendation), some + ebuild cleaning 26 Dec 2009; Peter Volkov <pva@gentoo.org> R-2.7.2.ebuild, R-2.8.1.ebuild, R-2.9.2.ebuild, R-2.10.0.ebuild, R-2.10.1.ebuild: diff --git a/dev-lang/R/R-2.10.1.ebuild b/dev-lang/R/R-2.10.1.ebuild index 72d1007da835..bd59c8597d20 100644 --- a/dev-lang/R/R-2.10.1.ebuild +++ b/dev-lang/R/R-2.10.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.1.ebuild,v 1.2 2009/12/26 17:32:26 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.1.ebuild,v 1.3 2010/03/18 16:16:21 bicatali Exp $ EAPI=2 inherit eutils flag-o-matic bash-completion versionator @@ -42,10 +42,14 @@ RDEPEND="${CDEPEND} app-arch/zip java? ( >=virtual/jre-1.5 )" -R_HOME=/usr/$(get_libdir)/${PN} +RESTRICT="minimal? ( test )" + +R_DIR=/usr/$(get_libdir)/${PN} pkg_setup() { filter-ldflags -Wl,-Bdirect -Bdirect + # avoid using existing R installation + unset R_HOME } src_prepare() { @@ -58,7 +62,7 @@ src_prepare() { # fix Rscript sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_HOME}\"':" \ + -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ src/unix/Makefile.in || die "sed unix Makefile failed" # fix HTML links to manual (bug #273957) @@ -72,7 +76,8 @@ src_prepare() { export R_BROWSER="$(type -p xdg-open)" export R_PDFVIEWER="$(type -p xdg-open)" fi - use perl && export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" + use perl && \ + export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" } src_configure() { @@ -112,12 +117,6 @@ src_compile(){ fi } -src_test() { - # we need to unset R_HOME otherwise some of the diff based - # tests fail due to warnings in the output - R_HOME="" emake -j1 check || die "Some of the tests failed" -} - src_install() { emake DESTDIR="${D}" install || die "emake install failed" @@ -141,8 +140,8 @@ src_install() { # env file cat > 99R <<-EOF - LDPATH=${R_HOME}/lib - R_HOME=${R_HOME} + LDPATH=${R_DIR}/lib + R_HOME=${R_DIR} EOF doenvd 99R || die "doenvd failed" dobashcompletion "${WORKDIR}"/R.bash_completion |