Version bump.

Package-Manager: portage-2.1.3_rc5

4 files changed, 144 insertions, 5 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 7f82de89bb88..16f5859bb989 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.86 2007/05/11 13:31:28 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.87 2007/06/30 17:14:25 markusle Exp $
+
+*R-2.5.1 (30 Jun 2007)
+
+  30 Jun 2007; Markus Dittrich <markusle@gentoo.org> +R-2.5.1.ebuild:
+  Version bump.
 
   11 May 2007; Markus Dittrich <markusle@gentoo.org> R-2.5.0.ebuild:
   Added gd useflag to allow users to install the GDD module (this
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 9b057fea5640..1fd3a344acaa 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -21,6 +21,7 @@ SHA256 ebddf927cf47cf584592c67f7b0a6cccc593c92ad07ec9d4d1d7b67da1ca7ec0 files/R.
 DIST R-2.2.1.tar.gz 13665367 RMD160 b63b6c5ef1db27a879783460b0ecb6de0d4bba18 SHA1 537e0b89b8de55c1156474c76c19c1fcc210f756 SHA256 db442c769e5e8ecbdb33c771e41bdac4330b565652c5ca730f26f975df30c624
 DIST R-2.4.1.tar.gz 14570344 RMD160 2a03cc81b870d594a695e9eb1e77720379c60194 SHA1 5ab0a29a29c35dc2cb06c875539e62b57503c762 SHA256 4ff92cfd29064db59978ef11c95dd88a4040ed4984fdce29fcb5d5783fe9028b
 DIST R-2.5.0.tar.gz 15117375 RMD160 ae14775281b53a2ffc582977eec4c36c6bdc504f SHA1 a75bbb598d7f957aec3c4be79f182a906fb14541 SHA256 52504c7700f8f880891b34622f73a41dde66e0752a8552d2b8df5c85756a8eef
+DIST R-2.5.1.tar.gz 15224643 RMD160 0f5ed986c783c0d9baa2310b08278db1b8720f88 SHA1 cc3f566e8bd1e2944fbbf40f7a9f01c28afeffe1 SHA256 8d915327b37f38e742c247bbe6a653417eabf3dadc5880f3a81507924a1df682
 EBUILD R-2.2.1.ebuild 3192 RMD160 3f16b9c059b7a6feae33a2d04622062342451f6a SHA1 77dd1efd735b5954f761cbf1f8bad01bb0cb14a1 SHA256 9aedebf110dc41c28b662e42b3d92a1a6ee315a4fbe5e823a55ecc0d06c6d830
 MD5 d796569818d34c6d48a815a45f6cbe99 R-2.2.1.ebuild 3192
 RMD160 3f16b9c059b7a6feae33a2d04622062342451f6a R-2.2.1.ebuild 3192
@@ -33,10 +34,14 @@ EBUILD R-2.5.0.ebuild 3508 RMD160 4e22cb16cfe48b8e06df03faf12b6eb1de6ce709 SHA1
 MD5 0b63c25b8d4ca2e007cfc3342c5b50d0 R-2.5.0.ebuild 3508
 RMD160 4e22cb16cfe48b8e06df03faf12b6eb1de6ce709 R-2.5.0.ebuild 3508
 SHA256 afec69cefba3d92489d0e177b82cd263597c09ed802c35ac6faa4b2bcc9a5b3a R-2.5.0.ebuild 3508
-MISC ChangeLog 13450 RMD160 7fc2ff2e9f971cf02f9cc74d8a8201b86608b8e3 SHA1 d862ea468bc347906e3754dc06719fe8f27c2192 SHA256 a7409666bd45569ffc1999a29b1ad87797b8740819e107e90c14522519c6c2d9
-MD5 c9fb9952779c8c868667d737e97103a0 ChangeLog 13450
-RMD160 7fc2ff2e9f971cf02f9cc74d8a8201b86608b8e3 ChangeLog 13450
-SHA256 a7409666bd45569ffc1999a29b1ad87797b8740819e107e90c14522519c6c2d9 ChangeLog 13450
+EBUILD R-2.5.1.ebuild 3508 RMD160 556b69b37e8d15ca274e6e6564a39d61a525fe43 SHA1 73c643641481e52403754ad8a44754baced5947c SHA256 01a456749950b8d9190bc03ec357d137d22908a91ddd039884bb55029ac52843
+MD5 9a8aa507ff58dca34f4b6008deb9b6de R-2.5.1.ebuild 3508
+RMD160 556b69b37e8d15ca274e6e6564a39d61a525fe43 R-2.5.1.ebuild 3508
+SHA256 01a456749950b8d9190bc03ec357d137d22908a91ddd039884bb55029ac52843 R-2.5.1.ebuild 3508
+MISC ChangeLog 13561 RMD160 55072e4a28426841afb26ddcab8ebf7674751cec SHA1 de27cdfa6d56322694e089090b4d5835157c0a45 SHA256 a9af84d7321e31d0ced33a1b4aa626e78e0baffd9441f3aefc69ac07dfbb2f40
+MD5 5667bbdbdc514f6c515d93d38f875091 ChangeLog 13561
+RMD160 55072e4a28426841afb26ddcab8ebf7674751cec ChangeLog 13561
+SHA256 a9af84d7321e31d0ced33a1b4aa626e78e0baffd9441f3aefc69ac07dfbb2f40 ChangeLog 13561
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -50,3 +55,6 @@ SHA256 9e65e0cee9f8ff3946f8e51c30aacacd0783bffdb0efc99d46c63c493520c543 files/di
 MD5 24318b465d01a70e960c1724ec2c3ef7 files/digest-R-2.5.0 229
 RMD160 8f12aee4221a9244f201b30b51f2ccf42ee009d2 files/digest-R-2.5.0 229
 SHA256 7f2bea9875f750ae98c1551484704ab88395098d177580cb385da7dfd5910d31 files/digest-R-2.5.0 229
+MD5 fa9ab3bdf3f18ddf3923e0381d622c4d files/digest-R-2.5.1 229
+RMD160 d409e0a808b739c96304f8bf47853cbcb34b0a0c files/digest-R-2.5.1 229
+SHA256 0b6a08e4211f60d1e321ab5a77c54f79fe80e74f0a2f1e17b5e7490d97ef8086 files/digest-R-2.5.1 229
diff --git a/dev-lang/R/R-2.5.1.ebuild b/dev-lang/R/R-2.5.1.ebuild
new file mode 100644
index 000000000000..8a4a32b7b6bb
--- /dev/null
+++ b/dev-lang/R/R-2.5.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.5.1.ebuild,v 1.1 2007/06/30 17:14:25 markusle Exp $
+
+inherit fortran toolchain-funcs flag-o-matic
+
+DESCRIPTION="R is GNU S - A 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"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="blas jpeg nls png readline tk X lapack gd"
+
+RDEPEND=">=dev-lang/perl-5.6.1-r3
+	readline? ( >=sys-libs/readline-4.1-r3 )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	gd? ( >=media-libs/gd-2 )
+	tk? ( dev-lang/tk
+		dev-lang/tcl )
+	X? ( || ( ( x11-libs/libX11 )
+		virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xproto
+		x11-libs/libXt
+		x11-libs/libX11 )
+		virtual/x11 ) )"
+
+pkg_setup() {
+	# Test for a 64 bit architecture - f2c won't work on 64 bit archs with R.
+	# Thanks to vapier for providing the test.
+	cd "${T}"
+	echo 'int main(){}' > test.c
+	$(tc-getCC) -c test.c -o test.o
+	if file test.o | grep -qs 64-bit ; then
+		einfo "64 bit architecture detected, using g77 or gfortran."
+		FORTRAN="gfortran g77 ifc"
+	else
+		FORTRAN="gfortran g77 f2c"
+	fi
+	rm -f test.{c,o}
+	fortran_pkg_setup
+
+	filter-ldflags -Wl,-Bdirect -Bdirect
+
+	# this is needed to properly compile additional R packages
+	# (see bug #152379)
+	append-flags -std=gnu99
+}
+
+src_unpack() {
+	unpack ${A}
+	sed -e "s:\$(rhome):/usr/$(get_libdir)/R:g" \
+		-i "${S}"/src/unix/Makefile.in ||
+		die "Failed to fix Rscript makefile"
+}
+
+
+src_compile() {
+	local myconf="--enable-R-profiling --enable-R-shlib --enable-linux-lfs"
+
+	if use tk; then
+		#configure needs to find the files tclConfig.sh and tkConfig.sh
+		myconf="${myconf} --with-tcltk --with-tcl-config=/usr/lib/tclConfig.sh
+			--with-tk-config=/usr/lib/tkConfig.sh"
+	else
+		myconf="${myconf} --without-tcltk"
+	fi
+
+	econf \
+		$(use_enable nls) \
+		$(use_with blas) \
+		$(use_with lapack) \
+		$(use_with jpeg jpeglib) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with X x) \
+		${myconf} || die "econf failed"
+	# R-2.5.0 started to have issues with parallel make
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		libdir=${D}/usr/$(get_libdir) \
+		rhome=${D}/usr/$(get_libdir)/R \
+		install || die "Installation Failed"
+
+	# fix the R wrapper script to have the correct R_HOME_DIR
+	# sed regexp borrowed from included debian rules
+	sed \
+		-e "/^R_HOME_DIR=.*/s::R_HOME_DIR=/usr/$(get_libdir)/R:" \
+		-i ${D}/usr/$(get_libdir)/R/bin/R \
+		|| die "sed failed."
+
+	# The same kinds of seds are needed for these variables too, see bug 115140
+	sed \
+		-e "/^R_SHARE_DIR=.*/s::R_SHARE_DIR=/usr/$(get_libdir)/R/share:" \
+		-e "/^R_INCLUDE_DIR=.*/s::R_INCLUDE_DIR=/usr/$(get_libdir)/R/include:" \
+		-e "/^R_DOC_DIR=.*/s::R_DOC_DIR=/usr/$(get_libdir)/R/doc:" \
+		-i ${D}/usr/$(get_libdir)/R/bin/R \
+		|| die "sed failed."
+
+	# R installs two identical wrappers under /usr/bin and /usr/lib/R/bin/
+	# the 2nd one is corrected by above sed, the first is replaced by a symlink
+	cd ${D}/usr/bin/
+	rm R
+	dosym ../$(get_libdir)/R/bin/R /usr/bin/R
+	dodir /etc/env.d
+	echo -n \
+		"LDPATH=\"/usr/$(get_libdir)/R/lib\"" \
+		> ${D}/etc/env.d/99R
+	cd ${S}
+
+	dodoc ChangeLog *NEWS README VERSION
+}
diff --git a/dev-lang/R/files/digest-R-2.5.1 b/dev-lang/R/files/digest-R-2.5.1
new file mode 100644
index 000000000000..5adf0a12d786
--- /dev/null
+++ b/dev-lang/R/files/digest-R-2.5.1
@@ -0,0 +1,3 @@
+MD5 162f6d5a1bd7c60fd652145e050f3f3c R-2.5.1.tar.gz 15224643
+RMD160 0f5ed986c783c0d9baa2310b08278db1b8720f88 R-2.5.1.tar.gz 15224643
+SHA256 8d915327b37f38e742c247bbe6a653417eabf3dadc5880f3a81507924a1df682 R-2.5.1.tar.gz 15224643