Version bump. Added fix for glibc-2.14 (bug #373051). Fixed missing libs during linking libRmath (bug #359249). More EAPI4 simplifications.

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

3 files changed, 191 insertions, 5 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 9bd4e00ab4c9..14425816b058 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.185 2011/06/23 13:03:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.186 2011/07/20 19:56:35 bicatali Exp $
+
+*R-2.13.1 (20 Jul 2011)
+
+  20 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> +R-2.13.1.ebuild:
+  Version bump. Added fix for glibc-2.14 (bug #373051). Fixed missing libs
+  during linking libRmath (bug #359249). More EAPI4 simplifications.
 
 *R-2.13.0 (23 Jun 2011)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index f59129fb80c8..9d129ef0f909 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -7,17 +7,19 @@ DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SH
 DIST R-2.12.1.tar.gz 20806432 RMD160 a083689dc6785cd8072461f30ce4a7969fc7ec91 SHA1 41f443cd646f7773bd824c41ea53cac3102b428d SHA256 74475d73f145d25c1e121dac9e4f18eaa077510b9e58d514cc6ae523382dee3f
 DIST R-2.12.2.tar.gz 21120720 RMD160 0f835e1f3433f2e2916b784089843a7fe8f47f23 SHA1 dbdc46edbab2dbbdc115b7247f80da5fee3dd912 SHA256 869ac219844671e4139aa4ddf5a272c27e26b1250bc427af3877fb237a5a9dbb
 DIST R-2.13.0.tar.gz 21832899 RMD160 5fc0bbdbdc0f6520e0da68ef7a17a4f3780bf9cb SHA1 878510e8a5fa1ccd1e0c4af5866f5416f3c27469 SHA256 559213ff05a205b9d2ad7ac7abebf477fb87c1bb3f0b03febbff5aa6bd8ab811
+DIST R-2.13.1.tar.gz 22063747 RMD160 3d83b907f6c81980a7e65bdf942936d6ce02a850 SHA1 8b9d48c7a654186064f369652ea34a085eff239b SHA256 ded5f39bc5130ff58a53d361435e0fee818ebec6c2aacc976ab625a3adf9bc51
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.10.1.ebuild 4132 RMD160 7cba401673eb7da1ce2a127da7d732a66199a2f7 SHA1 1452fdf5623ba48aab7d1806da3d91bf81fe1ab3 SHA256 7e52359c86bf6534232f9d387f914de54e1708875e1c56028ddb498290b3c835
 EBUILD R-2.12.1.ebuild 4406 RMD160 589188ea6e9355e8aede1a0ed432686b7a5270dc SHA1 9e2f668a98eb414966db6a8f134baf3c1573c8b1 SHA256 1dc731612dde5a4f16583c09ca10f0d90d29dafc4b8038c6ed4a7d54585e6528
 EBUILD R-2.12.2.ebuild 4604 RMD160 49836bd3a04547ecdf7d5f764deeae045f1d30f5 SHA1 4fffde5a6610df42e3f46fb61fb36fced6ee007c SHA256 7d06a2eb55f2e733794f78f747547531728541ab7efaab16c23ac9bc319c48ec
 EBUILD R-2.13.0.ebuild 4614 RMD160 fe7c37984a5320117d481150f21f494a5a4167f2 SHA1 6652c2866031c44568e49fca54f3009fb877e4ab SHA256 e692e2f37a86298ba0460930508173db9ddecaded8ce389e7f738405a17f061e
-MISC ChangeLog 26782 RMD160 cd0632e1e724e3873528ce1ff337961cda63ec17 SHA1 6b380e58bdd8161a1de60b9accfb48cc736b2a45 SHA256 0dbeb009c6cd08a34ad5f4841677e8b97114f36c81285e609f720baa3bd36fe0
+EBUILD R-2.13.1.ebuild 5022 RMD160 62af9dedcf16fbfa8412e750187f1ea0d1d1528f SHA1 f1d5abd607a945e9f7710d75991f55f44d3a7f6a SHA256 b0a07a4948744863991ef44d4657031358b89517e9a582f9af38ebd200c568b9
+MISC ChangeLog 27029 RMD160 d87730be49dff243698791d4dd5cd4d7d82c31f4 SHA1 e755292fc03cbc1f1727172e57edb2f019f7c153 SHA256 7e4d0a0c2d19199afe490aee914b0593067bef8aedb4a749199eacf0d9b18fb6
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4DObQACgkQgAnW8HDreRYtsgCdGPoRbx8Ki4M8GZcv67uy2J7K
-Tz8AnjU2NODYoXfs06rnsptzGu3VwQyr
-=cd1h
+iEYEARECAAYFAk4nM0sACgkQ1ycZbhPLE2BPogCbBVxtK+x/hV26IiQHr3Qh3zRm
+SiEAnj4J7eleYw0stkSVnsDMiLvxyUoE
+=QO+h
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.13.1.ebuild b/dev-lang/R/R-2.13.1.ebuild
new file mode 100644
index 000000000000..1e2e71ebecd4
--- /dev/null
+++ b/dev-lang/R/R-2.13.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.13.1.ebuild,v 1.1 2011/07/20 19:56:35 bicatali Exp $
+
+EAPI=4
+
+inherit bash-completion 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="cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X"
+
+# common depends
+CDEPEND="app-arch/bzip2
+	app-text/ghostscript-gpl
+	dev-libs/libpcre
+	|| ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 )
+	virtual/blas
+	cairo? ( x11-libs/cairo[X]
+		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
+	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
+		   app-text/ptex ) )"
+
+RDEPEND="${CDEPEND}
+	app-arch/unzip
+	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() {
+	# fix ocasional failure with parallel install (bug #322965)
+	# upstream in R-2.13?
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
+	epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch
+	# respect ldflags on rscript
+	# upstream does not want it, no reasons given
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
+	epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch
+
+	# glibc 2.14 removed rpc
+	if has_version '>=net-libs/libtirpc-0.2.2-r1'; then
+		append-cppflags $($(tc-getPKG_CONFIG) libtirpc --cflags)
+		export LIBS+=" $($(tc-getPKG_CONFIG) libtirpc --libs)"
+		# patching configure.ac would cause way too much work
+		# ugly hack on configure and let upstream do the job
+		sed -i -e "s/'' nsl;/'' tirpc;/" configure || die
+	fi
+
+	# 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/Rd.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-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 openmp) \
+		$(use_enable nls) \
+		$(use_enable profile R-profiling) \
+		$(use_enable profile memory-profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs R-static-lib) \
+		$(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(){
+	export VARTEXFONTS="${T}/fonts"
+	emake
+	RMATH_V=0.0.0
+	emake -C src/nmath/standalone \
+		libRmath_la_LDFLAGS="-Wl,-soname,libRmath.so.${RMATH_V}" \
+		libRmath_la_LIBADD="\$(LIBM)" \
+		shared $(use static-libs && echo static)
+	use doc && emake info pdf
+}
+
+src_install() {
+	default
+	if use doc; then
+		emake DESTDIR="${D}" install-info install-pdf
+		dosym ../manual /usr/share/doc/${PF}/html/manual
+	fi
+
+	# standalone math lib install (-j1 basically harmless)
+	emake \
+		-C src/nmath/standalone \
+		DESTDIR="${D}" install
+
+	local mv=$(get_major_version ${RMATH_V})
+	mv  "${ED}"/usr/$(get_libdir)/libRmath.so \
+		"${ED}"/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
+	dobashcompletion "${WORKDIR}"/R.bash_completion
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}