Version bump

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

3 files changed, 168 insertions, 5 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 021e140bc39e..e46c095e6b6a 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,11 @@
 # 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.156 2009/08/07 17:18:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.157 2009/09/08 19:04:33 bicatali Exp $
+
+*R-2.9.2 (08 Sep 2009)
+
+  08 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> +R-2.9.2.ebuild:
+  Version bump
 
   07 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> R-2.7.2.ebuild,
   R-2.8.1.ebuild, -R-2.9.0.ebuild, -files/R-2.9.0-without-x.patch,
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 6a07f5f229dd..7b38536a5b47 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -6,16 +6,18 @@ AUX R-javareconf.patch 1242 RMD160 667445da01c51438deef5d876929985858507d30 SHA1
 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.1.tar.gz 18620921 RMD160 cdce66673d301555c3a4c128283b456b85d9dcaa SHA1 59bcc4e775db5c681aefbfafe9fc357bc99e1fad SHA256 ef981c88b1632bef3359bc3755eed7f7eb38b2fca37e0443e64eb95162d3985a
+DIST R-2.9.2.tar.gz 18591679 RMD160 71313889c2886b285dcf588d60089a5ce7260648 SHA1 3934743b67a57691db724606c575e38a35ecb590 SHA256 2b2bfa9edab38d2c0c9a6262767336f2f19780cb30483aedcb7c69524ec1dbb8
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.7.2.ebuild 4161 RMD160 da607b0384b0e21a94f6aa70cd82d1958d7bd521 SHA1 dea7d9b9bf835ba32c983187f4666b1839867be5 SHA256 6c7b080500c7a6eebc121428fa0b77c811d2b74deb7de50813398f0cadeca721
 EBUILD R-2.8.1.ebuild 4091 RMD160 a08f808836139f5a4a8dfdadd3c097370fdb59d1 SHA1 2129de504986407e167e721a3492d3e916e33c40 SHA256 a4591dd44623cc94725c7a6eec3d38e505d1eb8f3478fefdc7698bd83df2b3fa
 EBUILD R-2.9.1.ebuild 4154 RMD160 e9f8d43330e405b5245cd68d4cd6a1e7bb196215 SHA1 d3b5634fca66ebe9ffd45868f9b091cf799bc7f9 SHA256 4e16cc754911cff3c61df9d7e0e40d0fd82b3db0b494cdb6b92fb40a061efd4e
-MISC ChangeLog 23080 RMD160 0636753fc6334a5267f57db98a6ebdc5fe52ba8e SHA1 efcde4c880e8a7a9edfcce10175e5860f32f1295 SHA256 a08b2cdf310f07fca411edad875a86e12ecb06bd333d39e05b046afc92500dc9
+EBUILD R-2.9.2.ebuild 4154 RMD160 023293c94ee1ba048055e37ceb4be7fa9523b517 SHA1 9be8dfbf9eeff3a7c8bc059a688115c1fb2c4d31 SHA256 36bbc98902a7d4ffe230f415d11e45c00992e8574737db4197bb37fdd53cf160
+MISC ChangeLog 23192 RMD160 686b544401b1ceaf28e667b655839005a2644297 SHA1 492b7d549724b9be48b8478451734940054d2771 SHA256 619f125c3256e6cb3818e5fee71c19ed0b2a61b70de02915eb901f2b0bba444f
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkp8YgYACgkQ1ycZbhPLE2AHoQCfWg6jZohLlSJa5ZVHE/0kiwPx
-zBkAoJGKf0PoM2csvXx2oXrNqVr6D8ct
-=GHtx
+iEYEARECAAYFAkqmqswACgkQ1ycZbhPLE2AUFQCfcK4e5Kn3OMLIwy+XvLKkt1l7
+jZ8AoKQujgdBHZP3nZYa23WwTigLBx/h
+=H/X6
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.9.2.ebuild b/dev-lang/R/R-2.9.2.ebuild
new file mode 100644
index 000000000000..9250b838219b
--- /dev/null
+++ b/dev-lang/R/R-2.9.2.ebuild
@@ -0,0 +1,156 @@
+# 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.2.ebuild,v 1.1 2009/09/08 19:04:33 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"
+
+	# fix HTML links to manual (bug #273957)
+	sed -i -e 's:\.\./manual/:manual/:g' $(grep -Flr ../manual/ doc) \
+		|| die "sed for HTML links to manual 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
+	export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+}
+
+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"
+		dosym /usr/share/doc/${PF}/manual /usr/share/doc/${PF}/html/manual
+	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
+}