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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 183 insertions, 9 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/Manifest b/dev-lang/R/Manifest
index 362b1411f9e8..f760b28484fe 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA1
 
 AUX R-2.7.1-test-fix.patch 4049 RMD160 ea331226db3feda862009724a74cb98b08a6be91 SHA1 0b386fb4f173770820903ac4dd72a7f3d54556b5 SHA256 a641846b359f54fc254293f1ec74c0505297c5b1c7227de6c2bcba267592fa91
+AUX R-2.9.0-without-x.patch 398 RMD160 6b4afb6104ebb7af04eafed4eaee7b33857b751d SHA1 acd4dd9a690b310be523bb48ba18d009366ea1a4 SHA256 8922b64fb8d96df30942fa9f58ed44d1be97bb3542bbb3f7a0a32483a3f6b886
 AUX R-javareconf.patch 1242 RMD160 667445da01c51438deef5d876929985858507d30 SHA1 0af91b826b969afb54462569cc210b8d16b0d482 SHA256 1667dc70b39197e1b77fbaab74a5fce078067f43da248d650a84d4cf494b15bd
 DIST R-2.7.2.tar.gz 16466658 RMD160 948e379f07cbfeda13c46947791f755e1faabbf7 SHA1 0de9f00ae58e67840fc2daab8973d37d97d78535 SHA256 7184c1f85fafce518e6dbccb5a64ba47a62d8694c7019da0e1c1e83ff98c3ff4
 DIST R-2.8.1.tar.gz 16585380 RMD160 1d12f8833a7b368d3cc06488172394ce4cb165ff SHA1 71e577dc061ff8720ce399471a75dea5b8fb1dab SHA256 ab488af73ce7a4f2057afcf0e725be96c9ae37f8721143004397b91928ecfa60
 DIST R-2.9.0.tar.gz 18423754 RMD160 90c9b42d7e8f3c78fa3442690dedb23c10d9a294 SHA1 97c610b31113db27999cf615d4182d68c8602a4f SHA256 f2de4b710feabf0395ee3503befc69332b78ed6b159e959e93bc086a1a8ad818
+DIST R-2.9.1.tar.gz 18620921 RMD160 cdce66673d301555c3a4c128283b456b85d9dcaa SHA1 59bcc4e775db5c681aefbfafe9fc357bc99e1fad SHA256 ef981c88b1632bef3359bc3755eed7f7eb38b2fca37e0443e64eb95162d3985a
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.7.2.ebuild 4095 RMD160 a3d0682264de76235fc075cc831dc94ea8bb6e35 SHA1 f57dbf820ce4fd90df764e53bd794424a34f8990 SHA256 7e3527174e4ebd6d76dce92a1402ab5010b1a8201f08520e198c7fc246caf330
 EBUILD R-2.8.1.ebuild 4025 RMD160 c7dcca9bef2ca9bb058100d993990172a4027acc SHA1 752ef4f4e16ed3632f82666ba29289d7d6c265c7 SHA256 0f6d7cd1edc38b314cf4db9f0efb10409fe710360c5c7203075c2752882aacc9
-EBUILD R-2.9.0.ebuild 3987 RMD160 2eed65c96d10d86f6ae561573e82ab27d5dbba0b SHA1 eef2056b44bdf7213f9bb07a4957861f9539d0f1 SHA256 83d00dd752ac0d47e99b01258166e888acbf5a005140b6a7888941ec7d2d6c21
-MISC ChangeLog 22476 RMD160 4419c3a8330b357a64f742285409f6c258b2135a SHA1 868a5b995fc52c526bc1a5e09426f57ef27508eb SHA256 5798f12fc1e42a0e0fae7a5f03fe79bbc076666ed67f8221f011b634607399fe
+EBUILD R-2.9.0.ebuild 4157 RMD160 51f0d7e43d39275ee684701352913005de5e142f SHA1 82772538ac5342c43a9465767620be4df04f977c SHA256 9f06728f16aa72f9d6c41340f40ee756deda4b7e1687b4b80cb11b53c6ece83e
+EBUILD R-2.9.1.ebuild 3866 RMD160 d434eabf71ae5058ca6bd94486c97883f0e7e4cc SHA1 74e44f17b69b1f53dd08a7ad5e78709a3c3b74d3 SHA256 e70d05e253024f63e9609f00bb873c924dc2157132c47d030b49bf3c36e49018
+MISC ChangeLog 22699 RMD160 472234263783a2cb5cecc4297c29b83287229a2a SHA1 94adb8377970a02a9e448f5548ddeacb0aa81b4f SHA256 da023c5e99fcdf92624c67ca844b4952eeb51a2daf6e92fb547c9651c5005df3
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkog7v8ACgkQOeoy/oIi7uyLbQCgzE3A8XzcIXS0v8SQB82yXcza
-sA8AoKHE9q7pQTppyG8VcdyXStQ8i/Pk
-=19+1
+iEYEARECAAYFAkpTpngACgkQ1ycZbhPLE2CL+wCeO8wV2M8vlPklyh1YzP4HdnM7
+8NUAoJliAwGP0JHfx7nD4PLRSIiy4HEj
+=TB5G
 -----END PGP SIGNATURE-----
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
+