New version (fixes bug #158346).

Package-Manager: portage-2.1.2_rc3-r4

5 files changed, 160 insertions, 5 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 41bf5b963ce5..06bd7f2cfd0b 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.80 2006/10/24 03:24:26 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.81 2006/12/19 04:17:40 markusle Exp $
+
+*R-2.4.1 (19 Dec 2006)
+
+  19 Dec 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/R-2.4.1-as-needed-gentoo.patch, +R-2.4.1.ebuild:
+  New version (fixes bug #158346).
 
   24 Oct 2006; Markus Dittrich <markusle@gentoo.org>
   +files/R-2.4.0-as-needed-gentoo.patch, R-2.4.0.ebuild:
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 3bda59aaf396..4aa10518ca18 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -6,6 +6,10 @@ AUX R-2.4.0-as-needed-gentoo.patch 619 RMD160 54d7a7805e323507f5548c4adcd74cfaea
 MD5 32a45e62cfb5d208ce35a4150e2bc6b6 files/R-2.4.0-as-needed-gentoo.patch 619
 RMD160 54d7a7805e323507f5548c4adcd74cfaeaf9d7a5 files/R-2.4.0-as-needed-gentoo.patch 619
 SHA256 2e60e38fc66bb1d002fd0cff217ac1b2bbbb1562d5a7db4e5f3af3fcf197cc34 files/R-2.4.0-as-needed-gentoo.patch 619
+AUX R-2.4.1-as-needed-gentoo.patch 619 RMD160 ffbece3caf684816bfcd45bf104e925f67b5184a SHA1 f7ed6e0f0276dd8366232eda5b6f66e48f900587 SHA256 0dfb291fcb718c1f21f725538b570113b9b3f3941e3bcdcc53cb2782fd35f395
+MD5 d4fc2298a31764f54146ba7a2e518e03 files/R-2.4.1-as-needed-gentoo.patch 619
+RMD160 ffbece3caf684816bfcd45bf104e925f67b5184a files/R-2.4.1-as-needed-gentoo.patch 619
+SHA256 0dfb291fcb718c1f21f725538b570113b9b3f3941e3bcdcc53cb2782fd35f395 files/R-2.4.1-as-needed-gentoo.patch 619
 AUX R-logo.png 4867 RMD160 f33e75036a19b78b5bc96124484a750881a9e703 SHA1 6454501d5082e0d6c05f5eaa30922c60ee619d07 SHA256 c022525d4d9303423a2b8b392c21dfe0f9f77f1d5a9b0c135aafb1a832a8595a
 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867
 RMD160 f33e75036a19b78b5bc96124484a750881a9e703 files/R-logo.png 4867
@@ -20,6 +24,7 @@ DIST R-2.2.1.tar.gz 13665367 RMD160 b63b6c5ef1db27a879783460b0ecb6de0d4bba18 SHA
 DIST R-2.3.0.tar.gz 14251956 RMD160 87422ce47ae36e33d4ace3a7f0b68c46c2d9128d SHA1 62e9a90e87c1403a59e846e292e94196f9a893d2 SHA256 ed19c04691028bf095056f9bde2957cb8beb95bdccda8c562046a7bb85e40a03
 DIST R-2.3.1.tar.gz 14285120 RMD160 061a77f25d3b1144aecdce479aa707e7bea21a82 SHA1 62cf87f4a273f17d5a55a5ffaf0bfcdfdae3c03d SHA256 1952bcf0d169cfe98aef33015a988f85eda72bf0223cd5833669e197fea2e427
 DIST R-2.4.0.tar.gz 14597440 RMD160 d4cc3257ab5fc6cfefd79877c64c0dff60ababb7 SHA1 b0433978dff831ae2f44b6336bfad44cbe14d4a9 SHA256 0a0263acf42230c291ca5cf371541077aae3a1f8a586e1bf336bdb6af76946e2
+DIST R-2.4.1.tar.gz 14570344 RMD160 2a03cc81b870d594a695e9eb1e77720379c60194 SHA1 5ab0a29a29c35dc2cb06c875539e62b57503c762 SHA256 4ff92cfd29064db59978ef11c95dd88a4040ed4984fdce29fcb5d5783fe9028b
 EBUILD R-2.1.1.ebuild 2840 RMD160 9cfc14992892e119581bc393aca63b4ad0ff035f SHA1 1441de2759adc96c38698fc8afe96b47e1da7069 SHA256 32091ae0e6e8cbba46373a166d3b6b1bec02861c514bd1cbb1955794eae66b24
 MD5 e31d4aac16729ca4d9ac3bd04bd95971 R-2.1.1.ebuild 2840
 RMD160 9cfc14992892e119581bc393aca63b4ad0ff035f R-2.1.1.ebuild 2840
@@ -44,14 +49,22 @@ EBUILD R-2.4.0.ebuild 3423 RMD160 b0e2d589c510ffd5e5b8a16e3e60dc4b2be40ba8 SHA1
 MD5 b041e3faa8a2eddce9de803a5b98dfb3 R-2.4.0.ebuild 3423
 RMD160 b0e2d589c510ffd5e5b8a16e3e60dc4b2be40ba8 R-2.4.0.ebuild 3423
 SHA256 ceeb716a013fd9960583f4df99fd249bdfb9b2db714727ea84d82fdd8a5ad09d R-2.4.0.ebuild 3423
-MISC ChangeLog 12305 RMD160 e334d56ecf592fb780b88d57625f4aea1a09ffb0 SHA1 3a39edc6be0b715a196aad67b5c4c390f7b9d61a SHA256 f7f8f4bd48740e347acccd049758cacb0a56f57b677162be438ab292a642b267
-MD5 91a757872be786c0ba96d48795d4509e ChangeLog 12305
-RMD160 e334d56ecf592fb780b88d57625f4aea1a09ffb0 ChangeLog 12305
-SHA256 f7f8f4bd48740e347acccd049758cacb0a56f57b677162be438ab292a642b267 ChangeLog 12305
+EBUILD R-2.4.1.ebuild 3358 RMD160 9663a207960cddd4f2874f17d1bcb39e87d08b2c SHA1 01f4854f77d62acdde8fa6c491362207750aedbb SHA256 c9383cada85829e1bc6d677c77fefa19c6326f04136089dadc42a1cc1f3e2842
+MD5 7f3e26f3b5a218f2487e2f5f67d97bab R-2.4.1.ebuild 3358
+RMD160 9663a207960cddd4f2874f17d1bcb39e87d08b2c R-2.4.1.ebuild 3358
+SHA256 c9383cada85829e1bc6d677c77fefa19c6326f04136089dadc42a1cc1f3e2842 R-2.4.1.ebuild 3358
+MISC ChangeLog 12476 RMD160 993547a0ace4746fe155f3ba2366e3027a730f7c SHA1 95c866deb958462cc60bb8b540867d09332a3ecd SHA256 4670b65dd807f447b138ef0aab51c0f2800caad254ff1dc3788a771eb1e0d80d
+MD5 3d5a241f4ad77b1dc75e8c1980f087d2 ChangeLog 12476
+RMD160 993547a0ace4746fe155f3ba2366e3027a730f7c ChangeLog 12476
+SHA256 4670b65dd807f447b138ef0aab51c0f2800caad254ff1dc3788a771eb1e0d80d ChangeLog 12476
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
+MISC tmpQVwYnC.repoman.msg 64 RMD160 26f1098fd60d1167f935d81d4869905b2e4807f3 SHA1 89e5aef02a3b84a96557ec73373112852df44d26 SHA256 8a6a91b9b031da7877bacfc9900b4753baac2ce009bb16b063c8682302006f95
+MD5 3834d94005ace028b3221d3dad81c172 tmpQVwYnC.repoman.msg 64
+RMD160 26f1098fd60d1167f935d81d4869905b2e4807f3 tmpQVwYnC.repoman.msg 64
+SHA256 8a6a91b9b031da7877bacfc9900b4753baac2ce009bb16b063c8682302006f95 tmpQVwYnC.repoman.msg 64
 MD5 1be6338417fd08a609cb02164398a26b files/digest-R-2.1.1 61
 RMD160 2dbcb35bceb8e64ce48a8887766bee1fadb37256 files/digest-R-2.1.1 61
 SHA256 7c36db19b0c7bc7248bfccd63f2b6ea155ed76ed522dc909e0b1a6ae3a1ff610 files/digest-R-2.1.1 61
@@ -70,3 +83,6 @@ SHA256 c468475abaadf2f54b1d164b237cb27c7e28aa62ffea7f7637c5cb6cebad0b20 files/di
 MD5 5dddf0db40407a83fead9496f45a49d1 files/digest-R-2.4.0 229
 RMD160 e4a82d5426ea596069f00b4a6990e65edbdb1c1f files/digest-R-2.4.0 229
 SHA256 df1891933f91c515c48181b1c49e0816c65f2051ebe0b7c9d3bf95cd4da97cc3 files/digest-R-2.4.0 229
+MD5 2fbf21a251d9868a4dbcb3a17d7c6178 files/digest-R-2.4.1 229
+RMD160 cec6faf41cd8cb3d57a8408e71d95a26403c19e9 files/digest-R-2.4.1 229
+SHA256 9e65e0cee9f8ff3946f8e51c30aacacd0783bffdb0efc99d46c63c493520c543 files/digest-R-2.4.1 229
diff --git a/dev-lang/R/R-2.4.1.ebuild b/dev-lang/R/R-2.4.1.ebuild
new file mode 100644
index 000000000000..7bf7a260cd28
--- /dev/null
+++ b/dev-lang/R/R-2.4.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.4.1.ebuild,v 1.1 2006/12/19 04:17:40 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"
+
+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 )
+	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 -i -e "s:-fpic:-fPIC:g" ${S}/configure
+	epatch "${FILESDIR}"/${P}-as-needed-gentoo.patch
+}
+
+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"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		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/R-2.4.1-as-needed-gentoo.patch b/dev-lang/R/files/R-2.4.1-as-needed-gentoo.patch
new file mode 100644
index 000000000000..bfb539624817
--- /dev/null
+++ b/dev-lang/R/files/R-2.4.1-as-needed-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Naur R-2.4.1/src/modules/lapack/Makefile.in R-2.4.1-new/src/modules/lapack/Makefile.in
+--- R-2.4.1/src/modules/lapack/Makefile.in	2006-09-04 10:41:35.000000000 -0400
++++ R-2.4.1-new/src/modules/lapack/Makefile.in	2006-12-18 21:14:05.000000000 -0500
+@@ -78,7 +78,7 @@
+ ## Include BLAS here, as with (static) ATLAS that pulls all the
+ ## BLAS routines into one place.
+ $(Rlapack_la): $(LIBOBJECTS)
+-	$(DYLIB_LINK) -o $@ $(LIBOBJECTS) @BLAS_LIBS@ $(Rlapack_la_LIBADD)
++	$(DYLIB_LINK) -o $@ $(LIBOBJECTS) @BLAS_LIBS@ $(Rlapack_la_LIBADD) $(FLIBS)
+ 
+ Rlapack_install: $(Rlapack_la) 
+ 	@$(MKINSTALLDIRS) $(Rexeclibdir)
diff --git a/dev-lang/R/files/digest-R-2.4.1 b/dev-lang/R/files/digest-R-2.4.1
new file mode 100644
index 000000000000..538afe17a2c9
--- /dev/null
+++ b/dev-lang/R/files/digest-R-2.4.1
@@ -0,0 +1,3 @@
+MD5 92b33fd2c3e770d595c1a472889230d5 R-2.4.1.tar.gz 14570344
+RMD160 2a03cc81b870d594a695e9eb1e77720379c60194 R-2.4.1.tar.gz 14570344
+SHA256 4ff92cfd29064db59978ef11c95dd88a4040ed4984fdce29fcb5d5783fe9028b R-2.4.1.tar.gz 14570344