Version bump. Switched to EAPI3.

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

3 files changed, 176 insertions, 6 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 3d665ed8f520..e58742ed3ae2 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,11 @@
 # 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.182 2011/01/04 20:51:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.183 2011/03/01 21:31:45 bicatali Exp $
+
+*R-2.12.2 (01 Mar 2011)
+
+  01 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> +R-2.12.2.ebuild:
+  Version bump. Switched to EAPI3.
 
   04 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> R-2.12.1.ebuild:
   Profiling is now turn on with a use flag
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 37c82e8be015..7f646d4f4d0b 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -5,15 +5,17 @@ AUX R-2.11.1-parallel.patch 488 RMD160 d693776b4650bc151f977f7c75234e582ad379c1
 AUX R-2.12.1-ldflags.patch 526 RMD160 d54e94d5c1d621821d5b0ff5d8ea789a153259eb SHA1 5cfbec92afaa164aa28fc28def531b26b2e8e428 SHA256 1af5dcdba86a915b7f6dc67d81afb71959adeca1a305890c3b7e0666b7537546
 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d
 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.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.10.1.ebuild 4081 RMD160 26cb35991a195a796e04843c1e3661c832b67242 SHA1 04e91251e2de6d7f4a2017366b8054c8f72628a8 SHA256 74e52a2124448a71a9a26a497605f83056406ea02cbf005212109e67a85a4a73
 EBUILD R-2.12.1.ebuild 4353 RMD160 3ad5b99ef4819fa0f59fe5c4944106d545296813 SHA1 ac40759641b57c8f49ffc7a3d1469331e9cfe9db SHA256 9648b5ff68008fcc6e04bb74bf724ec004d40a83405c3758b1da17416e91b729
-MISC ChangeLog 26350 RMD160 8bdee2c1cf07536e2607916c99e6e062f98e71df SHA1 22043ad0a0b3b223a4303ecb40467e6deb71025f SHA256 5b1f8cbcc5a6f332f7d486c5a15d910765c5019d5bf31fee9622047926dea55d
+EBUILD R-2.12.2.ebuild 4551 RMD160 ff221820e9e2f3ddf065fb35642fca80c89cb83e SHA1 c738971cbdb7fad511b86982b82734bb586d9bf7 SHA256 e738bce24c66781fa9f6ecec0b1f44eb281b2ad2e8c30737377cb70fe5b41e7d
+MISC ChangeLog 26484 RMD160 cd3b9c77944e2f2b63086f47cf3db1c7bd0919ec SHA1 359710807ba57813a89dce4159840891cf3f52ef SHA256 83824ad6e4fdff21b015992446233952d43fa726cf679deca5744b764694924e
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0jiEYACgkQ1ycZbhPLE2AkcwCgiGzcYb6l2nkKbhZUdGstzqOq
-nUIAmwRPr1tOGvb21HQ1wHRcmCCA7fAf
-=6rh0
+iEYEARECAAYFAk1tZcoACgkQ1ycZbhPLE2BLYwCgoRb5J7u8h11TEyomr6Jc10CW
+3+AAniovyyPA99WbEBbVMvXzzjYCYrwa
+=FTBK
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.12.2.ebuild b/dev-lang/R/R-2.12.2.ebuild
new file mode 100644
index 000000000000..d27e48f752fc
--- /dev/null
+++ b/dev-lang/R/R-2.12.2.ebuild
@@ -0,0 +1,163 @@
+# 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.12.2.ebuild,v 1.1 2011/03/01 21:31:45 bicatali Exp $
+
+EAPI=3
+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 profile readline static-libs 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? ( 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/zip
+	java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="minimal? ( test )"
+
+R_DIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
+
+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-12.3?
+	# 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
+
+	# 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-shlib \
+		--with-system-zlib \
+		--with-system-bzlib \
+		--with-system-pcre \
+		--with-blas="$(pkg-config --libs blas)" \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		rdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(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 || 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
+		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  "${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 || 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
+}