Version bump

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

3 files changed, 165 insertions, 5 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index d19d8be1bdba..67c9d4fe68f4 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.176 2010/05/25 16:24:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.177 2010/06/01 18:55:08 bicatali Exp $
+
+*R-2.11.1 (01 Jun 2010)
+
+  01 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> +R-2.11.1.ebuild:
+  Version bump
 
   25 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
   -files/R-2.7.1-test-fix.patch, -R-2.9.2.ebuild, -files/R-javareconf.patch:
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 61083a9bc05b..42bcb1ac1edd 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -3,15 +3,17 @@ Hash: SHA1
 
 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d
 DIST R-2.11.0.tar.gz 19779908 RMD160 358d5ba19bd534e9f5be56f517bd217c235599dc SHA1 86af359879afaf18bf0cd9ca36f2957d7b146ba3 SHA256 9b2a1769cdf21ad00500cbc0a1f7e09c872681d2ca0ea592e7692f15ff980a43
+DIST R-2.11.1.tar.gz 19729300 RMD160 a5223a3f784ad0f808d893d82a4e0a130c9a9b3a SHA1 0b36780627f3cc5cea3f41e0b717ed7ee92ba086 SHA256 48c1b96426f5b588763652b0b633cadccf410bae34300c22fd40524662bc23bb
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.10.1.ebuild 4078 RMD160 135e9344cf5de1ca710f216822075ffc35dc3b0e SHA1 e58976ba3ffb4473f120d293c036e97114e02908 SHA256 2296760ff1357e60475cff72c7715e92fcfc50ec2c3271b9d5a9b094123b2e6e
 EBUILD R-2.11.0.ebuild 4040 RMD160 e07c5cf6ebe8efb12d172feae7898948c2a54929 SHA1 20b8739961d325080fdeb70b406f131261bceb4f SHA256 1dea2cbd708ca4c53d231462df79691ae9ec5bb28027530b07816ca9e17578d7
-MISC ChangeLog 25464 RMD160 2b0912473140198892b4aea4651ab519406ae0f9 SHA1 bb6f2fa4e4b6c6f5dd97606ae8826025d7242a28 SHA256 5ed9d9242682de36a1c943b9beecc50e0ecac56a155a0461d5c1d903721aca88
+EBUILD R-2.11.1.ebuild 4040 RMD160 5b71abde6752e62a015a58e9593e5dfc5c6fe0f1 SHA1 b570eb780437bc062a13dbcfb05af3a8301e3585 SHA256 a3620c213093e54b02e8ae58b96fbf26a17cdf96ebffce50b425c16762e6dc2b
+MISC ChangeLog 25578 RMD160 e3fcec7be42455301f774c817d183da5e0bb982b SHA1 d21953686edb148f73685e75b927138183e018da SHA256 1b36c0432803d3df6f95986bf52c545fbc13cc69612c7eb3e358d57184670bcd
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv8Ar0ACgkQ1ycZbhPLE2AI/gCeKSeWZ9YUeLKwMtnTQyLu5YCt
-8z8AnRoswWFzYT2OCiWrONRF9Kr8krMg
-=v8r4
+iEYEARECAAYFAkwFYD0ACgkQ1ycZbhPLE2Da0wCeJCuDZBVNxeec80G7i/dZZK+O
+wtAAn1apZV3SKQ9g8UgRXb8S7GA02TfO
+=qO1B
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.11.1.ebuild b/dev-lang/R/R-2.11.1.ebuild
new file mode 100644
index 000000000000..73e8fd4e4428
--- /dev/null
+++ b/dev-lang/R/R-2.11.1.ebuild
@@ -0,0 +1,153 @@
+# 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.11.1.ebuild,v 1.1 2010/06/01 18:55:08 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 perl png readline threads tk X cairo"
+
+# common depends
+CDEPEND="dev-libs/libpcre
+	app-arch/bzip2
+	virtual/blas
+	app-text/ghostscript-gpl
+	cairo? ( x11-libs/cairo[X]
+		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
+	jpeg? ( media-libs/jpeg )
+	lapack? ( virtual/lapack )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	readline? ( sys-libs/readline )
+	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 )"
+
+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() {
+	# 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_DIR}\"':" \
+		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
+	use perl && \
+		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+}
+
+src_configure() {
+	econf \
+		--enable-R-profiling \
+		--enable-memory-profiling \
+		--enable-R-shlib \
+		--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 -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_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 \
+		-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_DIR}/lib
+		R_HOME=${R_DIR}
+	EOF
+	doenvd 99R || die "doenvd failed"
+	dobashcompletion "${WORKDIR}"/R.bash_completion
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}