Version bump.

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

3 files changed, 168 insertions, 2 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 0db08c2f0f33..5880ac638609 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.196 2012/03/05 17:23:05 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.197 2012/03/30 23:12:08 calchan Exp $
+
+*R-2.15.0 (30 Mar 2012)
+
+  30 Mar 2012; Denis Dupeyron <calchan@gentoo.org> +R-2.15.0.ebuild:
+  Version bump.
 
 *R-2.14.2 (05 Mar 2012)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index f4de257a98dc..261f50e61cd8 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -10,9 +10,11 @@ AUX R-2.14.2-prune-package-update.patch 1173 RMD160 1d735be7298eab1f0ff019019e94
 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d
 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.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.10.1.ebuild 4514 RMD160 7f170bfc025de21298d01f6b44ac3714605146fd SHA1 2a4d80e1e2ab22e2b3bfa2e910770185b81ee584 SHA256 86e6ab59bf58155d0dc313ecc3a07281b471074b3a178058c96fa8e4e3e3dea8
 EBUILD R-2.14.1.ebuild 4327 RMD160 ff7b567055bdb11dc8ba276f50a0486cebda9910 SHA1 f23735533c94b4435c5f3dfebe2b729ab5a72be9 SHA256 015dca3585c42f807f0907c7f6e1809123d79055c13cd4d3e83e5d02c17bb8ba
 EBUILD R-2.14.2.ebuild 4413 RMD160 fc99894f788fb824bd36e2650e29359a2f67acf4 SHA1 3637ba3e35918917192b2c6534d3c60b83be7d01 SHA256 a30c20572426d6df161ebfe2ad47ee53298dfed6bf4d9a5cd0ea434cf7f33932
-MISC ChangeLog 29721 RMD160 cf81928965b09a0e1f9142105312151404a165aa SHA1 fb71fc7fea8015dcf494a278d909ef7c9753c12b SHA256 220f1d1eb828447d1fedd3cadc33a320495870c75dedff84c918b07babb82c7b
+EBUILD R-2.15.0.ebuild 4413 RMD160 b12ab96f17d2c3a6766861c1f27094292efe2a22 SHA1 8d49f7ddb77faff0eec171559c4f4dd21d2f89bd SHA256 4ad782e52ae03ccf3daa0bc162beda4935acc294ec5434bf455db33e52cbcb59
+MISC ChangeLog 29832 RMD160 d81f29afd46ca0c0853381c4f481269ed0af4e14 SHA1 73b87d5a0ac4737ad5400ce24917a25c36b48abb SHA256 634ce863749880bcde7e8e8d3b245054e875c6213f6e077423f5e01ebe2901cf
 MISC metadata.xml 1124 RMD160 b1816af77325d46cb8670e0d23ea8b367b0b67f2 SHA1 631740a32ccdd45b3991d855b9cc44cd5e570507 SHA256 8f06d05ef29fdd4960269413a7e3e6ed5cfbdf32fa7cac5ed4c2750d58a4785b
diff --git a/dev-lang/R/R-2.15.0.ebuild b/dev-lang/R/R-2.15.0.ebuild
new file mode 100644
index 000000000000..bbf7de0ea772
--- /dev/null
+++ b/dev-lang/R/R-2.15.0.ebuild
@@ -0,0 +1,159 @@
+# 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.0.ebuild,v 1.1 2012/03/30 23:12:08 calchan Exp $
+
+EAPI=4
+
+inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 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 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}
+	dev-util/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
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
+		"${FILESDIR}"/${PN}-2.12.1-ldflags.patch \
+		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
+		"${FILESDIR}"/${PN}-2.14.1-tiff.patch \
+		"${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch \
+		"${FILESDIR}"/${PN}-2.14.1-warnings-buffer-overflow.patch \
+		"${FILESDIR}"/${PN}-2.14.2-library-writability.patch \
+		"${FILESDIR}"/${PN}-2.14.2-prune-package-update.patch
+
+	# fix packages.html for doc (bug #205103)
+	sed -i \
+		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+		src/library/tools/R/Rd.R || die
+
+	# fix Rscript path when installed (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 (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 && dobashcomp "${WORKDIR}"/R.bash_completion
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}