Bump

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

3 files changed, 45 insertions, 45 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 00203cfb74dd..8aa67d56221b 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.150 2009/04/18 15:05:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.151 2009/04/21 16:06:37 bicatali Exp $
+
+*R-2.9.0 (21 Apr 2009)
+
+  21 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> -R-2.7.1.ebuild,
+  +R-2.9.0.ebuild:
+  Bump
 
   18 Apr 2009; Markus Meier <maekke@gentoo.org> R-2.8.1:
   amd64/x86 stable, bug #265338
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 9dd5bd8a3150..7491ff5e5c51 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -3,19 +3,19 @@ Hash: SHA1
 
 AUX R-2.7.1-test-fix.patch 4049 RMD160 ea331226db3feda862009724a74cb98b08a6be91 SHA1 0b386fb4f173770820903ac4dd72a7f3d54556b5 SHA256 a641846b359f54fc254293f1ec74c0505297c5b1c7227de6c2bcba267592fa91
 AUX R-javareconf.patch 1242 RMD160 667445da01c51438deef5d876929985858507d30 SHA1 0af91b826b969afb54462569cc210b8d16b0d482 SHA256 1667dc70b39197e1b77fbaab74a5fce078067f43da248d650a84d4cf494b15bd
-DIST R-2.7.1.tar.gz 16413667 RMD160 ac98e39d46ebc7581dd53da7f69a1e7abad269a4 SHA1 cdf5f6f85463c7be007306add2f4ca7cf7babfb7 SHA256 f0449d23257f98d71ed7749a2ed30f69023a05259f392e4c5fd8fac9db485de7
 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.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
-EBUILD R-2.7.1.ebuild 4190 RMD160 5b0637b88a216923a39de5637e46513dee258905 SHA1 47b0db9e8eb3f9cde8db89a7b478dd9e106a65f2 SHA256 3f229509c86efa3a511d7af812f4104dbba7ed727e38e72adbfe584cd273b79f
 EBUILD R-2.7.2.ebuild 4118 RMD160 e4014f756bbcf1b5941909adfa759b9c44ac876b SHA1 d4b8eeca7a559ba23f8de905cdc877f964fbe2c6 SHA256 5f1d6885395fae92acf9b06ebe282fe7485642f49339a8f2a0d204b883411162
 EBUILD R-2.8.1.ebuild 4048 RMD160 68d46743b9ed0b4a59c700c662e4e51b18e967fb SHA1 50e0b6bf8f49cf71414c073299b0cba323af8861 SHA256 c67daec9bc8233077842a0a931eb45d960c0151d47bb3b308663ea07d13699cc
-MISC ChangeLog 22111 RMD160 744ac26966d11b369c09d360186bb703a1c7a958 SHA1 7b008db5ea1897bc1188f68a0aceeba28dc5c6bf SHA256 aca8f85975abad285be61e2d3da7b56b392e6e45eb3c1c562053c7a5dc47e717
+EBUILD R-2.9.0.ebuild 4012 RMD160 4c22604b7a13176f542a782a2fedb15771bc7b91 SHA1 27dc88c48a28a56b8e91a712fb11b414adb6daa9 SHA256 6f9b0166fc87ab6febb3b95718865023e29d9240a3a9411f85c995ffaa8c5dcf
+MISC ChangeLog 22236 RMD160 159df309c6eaf66b8079673fd65f07716e71051a SHA1 3566c0c38925d77e2849bc5204c685fdbf511887 SHA256 b1f6bf018a788a707bdcdaaf069c535bd0e223c993166c51d8a69fe1a65a344a
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknp7EQACgkQkKaRLQcq0GJzJACgmHIcyU+nN9rKRLs+32vgXfFy
-PhgAn21BBfRv0u09yHAhX8VyhsPhHEBH
-=GO06
+iEYEARECAAYFAknt7xoACgkQ1ycZbhPLE2CLFgCfegm7+5ZcucWngPZYy10VM0aZ
+ptsAoIKmupogUVTdbXsc8Z1n9HmFJ1Zb
+=GOgD
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.7.1.ebuild b/dev-lang/R/R-2.9.0.ebuild
index 81e3898aab13..a251300ea25a 100644
--- a/dev-lang/R/R-2.7.1.ebuild
+++ b/dev-lang/R/R-2.9.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.7.1.ebuild,v 1.11 2008/10/27 10:32:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.9.0.ebuild,v 1.1 2009/04/21 16:06:37 bicatali Exp $
 
-inherit fortran flag-o-matic bash-completion
+EAPI=2
+inherit eutils fortran flag-o-matic bash-completion versionator
 
 DESCRIPTION="Language and environment for statistical computing and graphics"
 HOMEPAGE="http://www.r-project.org/"
@@ -11,17 +12,18 @@ SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="doc java jpeg lapack minimal nls png readline tk X cairo"
+IUSE="doc java jpeg lapack minimal nls png readline threads tk X cairo"
 
 # common depends
 CDEPEND="dev-lang/perl
-	>=dev-libs/libpcre-7.3
+	dev-libs/libpcre
 	app-arch/bzip2
 	virtual/blas
 	virtual/ghostscript
-	cairo? ( x11-libs/cairo x11-libs/pango )
+	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 )
@@ -49,32 +51,11 @@ pkg_setup() {
 	export FFLAGS="${FFLAGS:--O2}"
 	[[ ${FORTRANC} = gfortran || ${FORTRANC} = if* ]] && \
 		export FCFLAGS="${FCFLAGS:-${FFLAGS}}"
-
-	# make sure cairo and pango are both compiled with "X"
-	# use flag (see bug #231970)
-	if use cairo; then
-		if ( ! built_with_use x11-libs/cairo X ); then
-			eerror "x11-libs/cairo needs to be built with USE=\"X\""
-			die "Please rebuild x11-libs/cairo with USE=\"X\""
-		fi
-
-		if ( ! built_with_use x11-libs/pango X ); then
-			eerror "x11-libs/pango needs to be built with USE=\"X\""
-			die "Please rebuild x11-libs/pango with USE=\"X\""
-		fi
-	fi
-
 	filter-ldflags -Wl,-Bdirect -Bdirect
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-javareconf.patch
-	epatch "${FILESDIR}"/${P}-test-fix.patch
-}
+src_prepare() {
 
-src_compile() {
 	# fix packages.html for doc (bug #205103)
 	# check in later versions if fixed
 	sed -i \
@@ -94,8 +75,11 @@ src_compile() {
 		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 \
@@ -107,6 +91,7 @@ src_compile() {
 		--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) \
@@ -114,37 +99,46 @@ src_compile() {
 		$(use_with png libpng) \
 		$(use_with readline) \
 		$(use_with cairo) \
-		$(use_with X x) \
-		|| die "econf failed"
+		$(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
-
-	emake -j1 -C src/nmath/standalone || die "emake math library failed"
 }
 
 src_test() {
 	# we need to unset R_HOME otherwise some of the diff based
 	# tests fail due to warnings in the output
-	R_HOME="" make check || die "Some of the tests failed"
+	R_HOME="" emake -j1 check || die "Some of the tests failed"
 }
 
 src_install() {
-	# -j1 because creates various dirs sequentially (hit should be small)
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	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
 
-	emake -j1 \
+	emake \
 		-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