Version bump.

Package-Manager: portage-2.1.11.2/cvs/Linux x86_64

3 files changed, 182 insertions, 2 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index a4cea293aa67..f3b7368581e2 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.203 2012/06/22 15:50:57 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.204 2012/06/29 00:30:17 calchan Exp $
+
+*R-2.15.1 (29 Jun 2012)
+
+  29 Jun 2012; Denis Dupeyron <calchan@gentoo.org> +R-2.15.1.ebuild:
+  Version bump.
 
   22 Jun 2012; Denis Dupeyron <calchan@gentoo.org> R-2.15.0.ebuild:
   Removed debugging code which stayed behind by mistake. Many thanks to Gabriel
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 97d5709e4ea0..583828915528 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -11,11 +11,13 @@ DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SH
 DIST R-2.14.1.tar.gz 23697861 RMD160 9dcd1d135701e3c682585346e7c48ac2c62012fd SHA1 5803a213480a749e36bccc155aecb13070ade096 SHA256 d8a18914005975f40ed8fb37e3532422f769fb454651a9ed75f73c2bee9c0c4c
 DIST R-2.14.2.tar.gz 23893986 RMD160 6055dd28a99baa7b23c55f74dc1479e93a0dee58 SHA1 523dca7694e4d0c8701fcc783ea3767e46fe7a62 SHA256 ccd8b43a746dc7105a1c77423ea1bb72dc333b41d9e9801a96d6f71c2266736e
 DIST R-2.15.0.tar.gz 24195517 RMD160 eef2b98441469b21aff9b013986c89c3c57908b0 SHA1 a633f87fdbd22e8c371971c535ca815e63c297f6 SHA256 6f26304773e92d8b61f150e1ccd21c153a32b89e8032b1ece45e5f4c34d9e397
+DIST R-2.15.1.tar.gz 24592493 RMD160 84a010906424f3e84b84a71236424a8f2bf1df08 SHA1 f0e6912be6dfc0d1fdc4be66048304d8befe8424 SHA256 96e4baea9dc7653b9160d7f2e1d321d0f252fee37ceb4273d4c94f0d4d815485
 DIST R-20120306.bash_completion.bz2 4325 RMD160 2cc48e78a067f4cd4e92dec5119d11a93f691baf SHA1 6a0022d62b86986471ee114f4d7fcd159d16952f SHA256 63003bcad2c35edc5e3329b72f85aaa0b8843b9ec424dc015b50212976372c3f
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.10.1.ebuild 4525 RMD160 fb0226c2a3521698f71e460832552e0b6f58ad98 SHA1 490b0bc3731330e389cbe8bdcb54b894bd830b9c SHA256 9d02913f707accb1a91a07704b118cdd6376af0ed1f661d8038af7eab6cdae4a
 EBUILD R-2.14.1.ebuild 4334 RMD160 b85c8c99869c40b793b9b82352cb9cf16047366b SHA1 65b9e8c63ebbfd2d1302a397d2e7b7049fdbc436 SHA256 4caa551320de5ea8b8e0acf252eb54cb502862dcc993dab5e2d63899e11461f8
 EBUILD R-2.14.2.ebuild 4421 RMD160 1902a7206c803fb3e09e3b6417e0fd865a1f6784 SHA1 1cb666269bd92e0f4acd79cb93b5556512c50675 SHA256 235ba61fc1f0e6c4062d971381426538119d476ac016a093f0b4e176028e7175
 EBUILD R-2.15.0.ebuild 5238 RMD160 1ff0663ccffb7b347d062c5a47d8831764365111 SHA1 9c769f33074d23f17d21d66cc2a419f8bfeceb38 SHA256 ea06d93051b406a18cacad1ffb075c9506f1413edb6375293b33b6ccb2ed59ea
-MISC ChangeLog 30662 RMD160 905ed5adaab168f955dd513d39fab285bf1edf31 SHA1 18a8dfeb07a9f60f46870a52aa69817d0258e8f1 SHA256 2cb68c9bcaa74bee958a86bda6f5831d84dafba90c4e8c975e162d46f34d154d
+EBUILD R-2.15.1.ebuild 4915 RMD160 f32c14bb16898535dcadfafc427e64c33533afa1 SHA1 ef4520eb00b13338d1ee6169cc556d33e81dd370 SHA256 36e64b264ba7406373e7c9ec993d5ca5bdfeede95c0b17199633b10aa5736639
+MISC ChangeLog 30773 RMD160 ba0b18043565f04ff5457c624903f6ae1d3918ec SHA1 cc0c4651fdb528b6da2fb2a2ad0925d57fe212bd SHA256 a41765b5a10abaaa370c6add59c7f565b4d858d484a9674caa9d73b45f55df4e
 MISC metadata.xml 1124 RMD160 b1816af77325d46cb8670e0d23ea8b367b0b67f2 SHA1 631740a32ccdd45b3991d855b9cc44cd5e570507 SHA256 8f06d05ef29fdd4960269413a7e3e6ed5cfbdf32fa7cac5ed4c2750d58a4785b
diff --git a/dev-lang/R/R-2.15.1.ebuild b/dev-lang/R/R-2.15.1.ebuild
new file mode 100644
index 000000000000..4a352f3bb263
--- /dev/null
+++ b/dev-lang/R/R-2.15.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.1.ebuild,v 1.1 2012/06/29 00:30:17 calchan Exp $
+
+EAPI=4
+
+inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
+
+BCP=${PN}-20120306.bash_completion
+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? ( http://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png profile readline static-libs tiff tk X"
+REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
+
+CDEPEND="app-arch/bzip2
+	app-text/ghostscript-gpl
+	dev-libs/libpcre
+	virtual/blas
+	virtual/fortran
+	cairo? ( x11-libs/cairo[X] x11-libs/pango )
+	icu? ( dev-libs/icu )
+	jpeg? ( virtual/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}
+	virtual/pkgconfig
+	doc? (
+			virtual/latex-base
+			dev-texlive/texlive-fontsrecommended
+		 )"
+
+RDEPEND="${CDEPEND}
+	( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
+	app-arch/xz-utils
+	java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="minimal? ( test )"
+
+R_DIR="${EPREFIX}/usr/$(get_libdir)/${PN}"
+
+pkg_setup() {
+	if use openmp; then
+		FORTRAN_NEED_OPENMP=1
+		tc-has-openmp || die "Please enable openmp support in your compiler"
+	fi
+	fortran-2_pkg_setup
+	filter-ldflags -Wl,-Bdirect -Bdirect
+	# avoid using existing R installation
+	unset R_HOME
+	# Temporary fix for bug #419761
+	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
+		append-flags -fno-ipa-cp-clone
+	fi
+}
+
+src_prepare() {
+	# gentoo bug #322965 (not applied upstream)
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
+	epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch
+
+	# respect ldflags (not applied upstream)
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
+	epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch
+
+	# gentoo bug #383431
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951
+	epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch
+
+	# tiff automagic
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14952
+	epatch "${FILESDIR}"/${PN}-2.14.1-tiff.patch
+
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
+	epatch "${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch
+
+	# fix packages.html for doc (gentoo bug #205103)
+	sed -i \
+		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+		src/library/tools/R/Rd.R || die
+
+	# fix Rscript path when installed (gentoo bug #221061)
+	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 (gentoo bug #273957)
+	sed -i \
+		-e 's:\.\./manual/:manual/:g' \
+		$(grep -Flr ../manual/ doc) || die "sed for HTML links 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}"
+	AT_M4DIR=m4 eaclocal
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--enable-byte-compiled-packages \
+		--enable-R-shlib \
+		--with-system-zlib \
+		--with-system-bzlib \
+		--with-system-pcre \
+		--with-system-xz \
+		--with-blas="$(pkg-config --libs blas)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable profile R-profiling) \
+		$(use_enable profile memory-profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs R-static-lib) \
+		$(use_with cairo) \
+		$(use_with icu ICU) \
+		$(use_with jpeg jpeglib) \
+		$(use_with lapack) \
+		$(use_with !minimal recommended-packages) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with tiff libtiff) \
+		$(use_with tk tcltk) \
+		$(use_with X x)
+}
+
+src_compile(){
+	export VARTEXFONTS="${T}/fonts"
+	emake
+	emake -C src/nmath/standalone shared $(use static-libs && echo static)
+	use doc && emake info pdf
+}
+
+src_install() {
+	default
+	emake -C src/nmath/standalone DESTDIR="${D}" install
+
+	if use doc; then
+		emake DESTDIR="${D}" install-info install-pdf
+		dosym ../manual /usr/share/doc/${PF}/html/manual
+	fi
+
+	cat > 99R <<-EOF
+		LDPATH=${R_DIR}/lib
+		R_HOME=${R_DIR}
+	EOF
+	doenvd 99R
+	use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}