Bump and fixed bug #268362 (thanks Andrew Savchenko) and bug #269511

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 174 insertions, 3 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 42e39aa69d4d..fb7ecb369ff5 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,12 @@
 # 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.153 2009/05/30 08:30:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.154 2009/07/07 19:47:58 bicatali Exp $
+
+*R-2.9.1 (07 Jul 2009)
+
+  07 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> R-2.9.0.ebuild,
+  +files/R-2.9.0-without-x.patch, +R-2.9.1.ebuild:
+  Bump and fixed bug #268362 (thanks Andrew Savchenko) and bug #269511
 
   30 May 2009; Ulrich Mueller <ulm@gentoo.org> R-2.7.2.ebuild,
   R-2.8.1.ebuild, R-2.9.0.ebuild:
diff --git a/dev-lang/R/R-2.9.0.ebuild b/dev-lang/R/R-2.9.0.ebuild
index db3fc52d23c6..d21ccd67828b 100644
--- a/dev-lang/R/R-2.9.0.ebuild
+++ b/dev-lang/R/R-2.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.9.0.ebuild,v 1.2 2009/05/30 08:30:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.9.0.ebuild,v 1.3 2009/07/07 19:47:58 bicatali Exp $
 
 EAPI=2
 inherit eutils fortran flag-o-matic bash-completion versionator
@@ -55,6 +55,9 @@ pkg_setup() {
 
 src_prepare() {
 
+	# fix empty loop for option -without-x (bug #268362)
+	epatch "${FILESDIR}"/${PN}-2.9.0-without-x.patch
+
 	# fix packages.html for doc (bug #205103)
 	# check in later versions if fixed
 	sed -i \
@@ -127,7 +130,8 @@ src_install() {
 			install-info install-pdf || die "emake install docs failed"
 	fi
 
-	emake \
+	# standalone math lib install (-j1 basically harmless)
+	emake -j1 \
 		-C src/nmath/standalone \
 		DESTDIR="${D}" install \
 		|| die "emake install math library failed"
diff --git a/dev-lang/R/R-2.9.1.ebuild b/dev-lang/R/R-2.9.1.ebuild
new file mode 100644
index 000000000000..9197d31aefef
--- /dev/null
+++ b/dev-lang/R/R-2.9.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.9.1.ebuild,v 1.1 2009/07/07 19:47:58 bicatali Exp $
+
+EAPI=2
+inherit eutils flag-o-matic bash-completion versionator
+
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="http://www.r-project.org/"
+SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz
+	bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="doc java jpeg lapack minimal nls png readline threads tk X cairo"
+
+# common depends
+CDEPEND="dev-lang/perl
+	dev-libs/libpcre
+	app-arch/bzip2
+	virtual/blas
+	virtual/ghostscript
+	cairo? ( x11-libs/cairo[X]
+		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
+	readline? ( sys-libs/readline )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	lapack? ( virtual/lapack )
+	tk? ( dev-lang/tk )
+	X? ( x11-libs/libXmu x11-misc/xdg-utils )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	doc? ( virtual/latex-base
+	  || ( dev-texlive/texlive-fontsrecommended
+		   app-text/ptex ) )"
+
+RDEPEND="${CDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	java? ( >=virtual/jre-1.5 )"
+
+R_HOME=/usr/$(get_libdir)/${PN}
+
+pkg_setup() {
+	filter-ldflags -Wl,-Bdirect -Bdirect
+}
+
+src_prepare() {
+	# fix packages.html for doc (bug #205103)
+	# check in later versions if fixed
+	sed -i \
+		-e "s:../../library:../../../../$(get_libdir)/R/library:g" \
+		src/library/tools/R/packageshtml.R \
+		|| die "sed failed"
+
+	# fix Rscript
+	sed -i \
+		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_HOME}\"':" \
+		src/unix/Makefile.in || die "sed unix Makefile failed"
+
+	use lapack && \
+		export LAPACK_LIBS="$(pkg-config --libs lapack)"
+
+	if use X; then
+		export R_BROWSER="$(type -p xdg-open)"
+		export R_PDFVIEWER="$(type -p xdg-open)"
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--enable-R-profiling \
+		--enable-memory-profiling \
+		--enable-R-shlib \
+		--enable-linux-lfs \
+		--with-system-zlib \
+		--with-system-bzlib \
+		--with-system-pcre \
+		--with-blas="$(pkg-config --libs blas)" \
+		--docdir=/usr/share/doc/${PF} \
+		rdocdir=/usr/share/doc/${PF} \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_with lapack) \
+		$(use_with tk tcltk) \
+		$(use_with jpeg jpeglib) \
+		$(use_with !minimal recommended-packages) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with cairo) \
+		$(use_with X x)
+}
+
+src_compile(){
+	emake || die "emake failed"
+	RMATH_V=0.0.0
+	emake -j1 -C src/nmath/standalone \
+		libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.${RMATH_V} \
+		|| die "emake math library failed"
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts"
+		emake info pdf || die "emake docs failed"
+	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"
+
+	if use doc; then
+		emake DESTDIR="${D}" \
+			install-info install-pdf || die "emake install docs failed"
+	fi
+
+	# standalone math lib install (-j1 basically harmless)
+	emake -j1 \
+		-C src/nmath/standalone \
+		DESTDIR="${D}" install \
+		|| die "emake install math library failed"
+
+	local mv=$(get_major_version ${RMATH_V})
+	mv  "${D}"/usr/$(get_libdir)/libRmath.so \
+		"${D}"/usr/$(get_libdir)/libRmath.so.${RMATH_V}
+	dosym libRmath.so.${RMATH_V} /usr/$(get_libdir)/libRmath.so.${mv}
+	dosym libRmath.so.${mv} /usr/$(get_libdir)/libRmath.so
+
+	# env file
+	cat > 99R <<-EOF
+		LDPATH=${R_HOME}/lib
+		R_HOME=${R_HOME}
+	EOF
+	doenvd 99R || die "doenvd failed"
+	dobashcompletion "${WORKDIR}"/R.bash_completion
+}
+
+pkg_config() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}
diff --git a/dev-lang/R/files/R-2.9.0-without-x.patch b/dev-lang/R/files/R-2.9.0-without-x.patch
new file mode 100644
index 000000000000..1d92ad0b7c31
--- /dev/null
+++ b/dev-lang/R/files/R-2.9.0-without-x.patch
@@ -0,0 +1,11 @@
+--- R-2.9.0/src/modules/Makefile.in.orig	2009-03-20 02:05:31.000000000 +0300
++++ R-2.9.0/src/modules/Makefile.in	2009-05-03 00:25:38.000000000 +0400
+@@ -24,7 +24,7 @@
+ 	@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ 
+ R: Makefile make.internet make.lapack make.vfonts
+-	@for d in "$(R_MODULES)"; do \
++	@for d in $(R_MODULES); do \
+ 	  (cd $${d} && $(MAKE) $@) || exit 1; \
+ 	done
+