Version bump.

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

3 files changed, 209 insertions, 13 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 438706b3ce40..64ec3c2578aa 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.206 2012/10/07 13:35:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.207 2012/10/26 21:44:05 calchan Exp $
+
+*R-2.15.2 (26 Oct 2012)
+
+  26 Oct 2012; Denis Dupeyron <calchan@gentoo.org> +R-2.15.2.ebuild:
+  Version bump.
 
   07 Oct 2012; Justin Lecher <jlec@gentoo.org> R-2.10.1.ebuild,
   R-2.14.2.ebuild, R-2.15.0.ebuild, R-2.15.1.ebuild, metadata.xml:
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index e5a198abe950..bb441b0ba1cd 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX R-2.11.1-parallel.patch 633 SHA256 4ad6f007ffb390584de0c8a5935e98f98106f32394aac45c30c3fdfe77c00c70 SHA512 788eca6236dccaf3fd6a13387c167bf3b11625b32c5b658fb19b17521d8e2747170cfaa54eaca3a4703a89e1f9453399e013792f7f92e7e9d0adeafeefb7e6da WHIRLPOOL a8ebf8ea01406fe576d2f95d57efc1f3c42d9ba61f75bd1034f485c85e68576cdd1c46c5d0e3139b5de8da312c20e89c78d97395082b4ff821fde4248a1b2b58
 AUX R-2.12.1-ldflags.patch 639 SHA256 dee11fd510d31add8166230a7af61b7e700f2f4f122cbe0a07310d0017874933 SHA512 49b73cff79c1521e214f036390f32eed8c7d4afd39082eabb7e6c59e5d7136f399ff7227117e418d4445647d25259dce8eb208a1ebe5990bf4ad87cefa250338 WHIRLPOOL 98ec264ac6d68e64dcbce32f4688aa458ba6d300202b6f31cd7580de68c693f0fb6aecba40cd0f6736a0ef9ff346d04cd96af06716a25c4a84a72551085837ed
 AUX R-2.13.1-zlib_header_fix.patch 464 SHA256 161f0fff63db5cb2cb4894321759997e75463d784d5a7ba5105f74fe2ed73c40 SHA512 7d573f33f16a9cfe080976e32fae1cb0af50e02bef026814aa5d30ce5a37d79f0ddeb69cee817602de40968fc3d5aee2ee4681b15d4011afc61ad69a01705f17 WHIRLPOOL 30d34d6e3c3a39f395409f238f6469b0c096db5039df377c8668678aaf4968f704205202f5c4f63cf8c5e3607b15df83172af09178df7707e12e746151bf02aa
@@ -15,6 +12,7 @@ DIST R-2.14.1.tar.gz 23697861 SHA256 d8a18914005975f40ed8fb37e3532422f769fb45465
 DIST R-2.14.2.tar.gz 23893986 SHA256 ccd8b43a746dc7105a1c77423ea1bb72dc333b41d9e9801a96d6f71c2266736e SHA512 366765f92d790c276ba9e3d2b29df7f1c518597bc31581a9d04a22aced6799a45a9b5162034d284333e0d7e4a24c8ee4a7447f7065b0c1c47169dbc065465df7 WHIRLPOOL 045ab86944227519c76fb2f99e2580b137addbde7cbafdb1374ece3b33567d3ec41a632f3d4f4299c7068ed8abddf780e70b5e9edceecffd90e2577d103a8765
 DIST R-2.15.0.tar.gz 24195517 SHA256 6f26304773e92d8b61f150e1ccd21c153a32b89e8032b1ece45e5f4c34d9e397 SHA512 50be07c69a5c2ab967009254ec30973eb31584ddd3ca0cade76a83c3feaf22fb29759d8e705930ef8a3e4ec4cd502f6c08d7a701c6f840f6031b124cc0e4f1b6 WHIRLPOOL 775ff40b1418b869d4ccf507e761f4a328fa9481036d93fac52e7e5aacf11279868c0ab22550954e3a1d3348a8a54a60a81e0f7730e001a323b4177bec6ac3aa
 DIST R-2.15.1.tar.gz 24592493 SHA256 96e4baea9dc7653b9160d7f2e1d321d0f252fee37ceb4273d4c94f0d4d815485 SHA512 22e15e5535c15ece208a21692d397cd993a1cf1b226d75d87c83557cc2a75e2f38a5a4743b20d92d44bee3629e98a1e5dfafac00ea2bffa77f984426cd2d70ca WHIRLPOOL 7bb9092fa7578790d8acb600de4a2f13f4bc6969aa82594a827e2d74df56b733babf85a0789fd0550e2583fb6a7a6eec80e7c77a2bc3e64cc7c77beb9210b521
+DIST R-2.15.2.tar.gz 24338934 SHA256 292837ae259b7668509b8a5d4ec8be0aa50c327cfe7a534bac419b4ca766d66d SHA512 86b07630cf9b69e9889a753297fd672a8fe89000c8b084908d6f1c90118cdb8b478681db37deefd5a5ddb3128169f60671201550bcd34689658b1f189398adac WHIRLPOOL 88fe31ce28115b0ca6961ad372c054618b199836131ca067f06139a0f6e4f23ff849f52d8653828e4245156d5377f4fbd08b866de44ea33b18b39c5694d08694
 DIST R-20120306.bash_completion.bz2 4325 SHA256 63003bcad2c35edc5e3329b72f85aaa0b8843b9ec424dc015b50212976372c3f SHA512 1bf874c58efb648aa96ac22b7c6c66444cb8f72b33cefa9eb28461043659476548873ec6dbd5a15bf893d6f87a7a7d18e4deb045759a1e74774d03cbb8f1f082 WHIRLPOOL 231742e9a886174b3f6bd62102d5b7cea1b050e786420f4e0cd4d9cec31ccb93fcc5a3115364776fbd00020d4e26398400e80cec126a41c5bd70677fd675c966
 DIST R.bash_completion.bz2 4019 SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 SHA512 b11efb99a5dae1f434d2f8c70154a09dd3826126a034a102f905144650c3d77851ddeb206c247dd9365baca13cf95897708a62bd6f8bddc079e3b679a8470fe2 WHIRLPOOL eb8fb8bff43873b75b61bf92af817be7d2bc4eddb2bf51c13e51dc1bdcc0cb5b0bd3623cf73fe20867c8b734732c6c89523916bc8ed4fba2931e55c5a0f837b8
 EBUILD R-2.10.1.ebuild 4505 SHA256 260a2a335dd5bd19e84b6a9d898a6b5062db8922797cf142e666a9c5d16eaa0c SHA512 98c3312e1d22857c3edb48a96e221cdfe23d24eac3a7303462a5c6c193e5adfa1b58076b8bece363853c546355c7b5be417701bbe5778fac6df0bde9e665eb0f WHIRLPOOL c90295b9be219fe6753bc855c32a97297f1a4a02ca3e12fc8f7259a54c80be2c32b1372d52212316ee60bbd424f43ad6f98b286164dd7a096a10a944e41342a6
@@ -22,13 +20,6 @@ EBUILD R-2.14.1.ebuild 4334 SHA256 4caa551320de5ea8b8e0acf252eb54cb502862dcc993d
 EBUILD R-2.14.2.ebuild 4401 SHA256 72f77e19c48afb86e686c4dd8a44a8dff1b29c37d83a59d8b7678b2ffe81ff42 SHA512 d5517692f2f3427b9d2341f9550771ca419b9b4055691ed759e01a188ee324a77f07e160f373727a822030e06f8269a0617c0ee3b6d08cc0fd1c3e53f0dca87d WHIRLPOOL 3ead56e44342d0d1275cd0188948f2645f11e975394298e096ac2dd5f4be87a9152f12a807889b9d13ce02242aa1c157240a986026f33a6b593a8630f7a11267
 EBUILD R-2.15.0.ebuild 5218 SHA256 922f4b89be9f49c46fbff64f4af026b8c862bbb3421c84bf87f3051522533a41 SHA512 c4fb77e788be0b9d8d258c0d3c9ca1f17ae54049390564270f8f422c81a18c1a88712f5302c98d0bd1ab5a9177c4b9d08eb3a853630c57dad35b141bfb181b5e WHIRLPOOL 02c991e3a2372a32a47c302ba86a17cc579b4d46080c75ff6e7bc8eeeb0b23ce07b54f42455a4c98fbfcf973de4f36c41e2e6a38a9e82a5dd87840ebb3a73d07
 EBUILD R-2.15.1.ebuild 6151 SHA256 5cd42d166f1f525ca1a1b3c289206da38c2b4921d7a24cc918c276efe8dc573c SHA512 56c840fdc836dc33e255ff73f8e70b865d054f65e1858db1908ee5b812268703c8a83c8cb36f295d673007e96df02ca435cb1ad9ac81eb6aabd5497d43aae80f WHIRLPOOL 511116d219bfdf43b30d61c2a4467d1037736b8c676cdf0e44eec7bed966ee70d705b23cc9f701f1074562873b4b48768d33b4bde28387232dbd5e75a984ef7a
-MISC ChangeLog 31107 SHA256 ac2ee745247cc52532cc7f9fff7183d563c51f5f5ac63adfb6c91127d61bcea0 SHA512 d3c9eb3eb309ee30174d8d16a977e5737aa4a6db69c3aca820b761355b20d2dad1eb70b9d546b952ed0beee2829f92c75233dff98fa56ea0e80f28f88bcc824d WHIRLPOOL e2dba31d0b751c24a076fdbed06d1c4b66c87165760fd28ed71c2985ca1003a38d87278b96539f6277dbf3e8ad646d664e1034e6fc27c7d24531ed37df7cba4d
+EBUILD R-2.15.2.ebuild 6044 SHA256 39c7c327f19e8747d1a4c1f54375c707d1d22ce900bfa86c8562c2591f621c6e SHA512 e01cd46d763bb494e40f3426b638e0e5e16e6c1fc8f7f57661938152f52ba63cef80bce0392efa1afb929459d050daf7afd95bd1a80cdee39b19e77bcb35c4f4 WHIRLPOOL de0986d9620b88ccc08fbd144accba3e8e7f3f1084236144b9e02513fae53ebdf95ad26d701f6a08a590a61ca334f5f6b392224295867e9f9824b1f37c4edbbe
+MISC ChangeLog 31221 SHA256 aad08e6bd4c903dddc2e97c93129b85f592ce5264432babdf842fe51596a6fb1 SHA512 71d36c5bf01418046f69eada87f62bf3f8889d260f56fc222fa3a969607bc9794b9b4770034b0c824049b1efa1e51cf66deb213d065232c443837def3cd5939c WHIRLPOOL c6969ae13ad5a97591405cfb329a8d67658c2027163e1815b8b79f0d3a196e0de9cf712090fea63aebc850fe366ddea4865a988e4a427784c1f0877cf59f273a
 MISC metadata.xml 1128 SHA256 2d7e3ff1039fd54c49878cda840c5bf9e9e920acbe40b23842205eb952438f30 SHA512 5be608da862dad635021511537d92f1fc30553cf6de847dee82e756254273dd18f74d3237a58327ba12f5709542fc6472b099c8536f0e78836aeb00a93292fb9 WHIRLPOOL 624711ad18e98f4ba99213c31a2da979eeb27fd1c81ac27e0dc0b62f2add78ea55c20d32caec0652f412ecfe213bd06822fa0e87d4dae0aa9c052f774010d4a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
-
-iEYEAREIAAYFAlBxhRoACgkQgAnW8HDreRaZyQCdHagbaoPkV4UPZmaLCiYem/Hj
-mRYAoKFB1FuNWwlbEz/TMzcM+by/2pp/
-=lmNT
------END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.15.2.ebuild b/dev-lang/R/R-2.15.2.ebuild
new file mode 100644
index 000000000000..fd85fc5f9fa6
--- /dev/null
+++ b/dev-lang/R/R-2.15.2.ebuild
@@ -0,0 +1,200 @@
+# 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.2.ebuild,v 1.1 2012/10/26 21:44:05 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 ~amd64-linux ~x86-fbsd ~x86-linux ~x64-macos"
+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
+
+	# 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}"
+
+	# don't search /usr/local
+	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+	# Fix for Darwin (OS X)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+			-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+			-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+			-e "/SHLIB_EXT/s/\.so/.dylib/" \
+			-i configure.ac || die
+
+		# sort of "undo" 2.14.1-rmath-shared.patch
+		sed "s:-Wl,-soname=libRmath.so:-install_name ${EPREFIX}/usr/$(get_libdir)/libRmath.dylib:" \
+			-i src/nmath/standalone/Makefile.in || die
+	fi
+
+	AT_M4DIR=m4 eaclocal
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		--enable-byte-compiled-packages \
+		--enable-R-shlib \
+		--disable-R-framework \
+		--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}
+	# The buildsystem has a different understanding of install_names than what
+	# we require.  Since it builds modules like shared objects (wrong), many
+	# objects (all modules) get an incorrect install_name.  Fixing the build
+	# system here is not really trivial.
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local mod
+		pushd "${ED}"/usr/lib/R > /dev/null
+		for mod in $(find . -name "*.dylib") ; do
+			mod=${mod#./}
+			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
+				"${mod}"
+		done
+		popd > /dev/null
+	fi
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}