Updated 64 bit detection code.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 20 insertions, 27 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 12a87d3d8635..0e302ec15a57 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/R
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.44 2005/05/10 13:35:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.45 2005/05/24 21:50:06 cryos Exp $
+
+  24 May 2005; Marcus D. Hanwell <cryos@gentoo.org> R-2.0.1.ebuild:
+  Updated 64 bit detection code.
 
   10 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> R-2.0.1.ebuild:
   Stable on sparc
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index b28eebdc7326..e440e855294b 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 245acb0d62d61acfc362474785078a6b ChangeLog 7268
 MD5 ad67b46cbe76484c3613ba1fa7ea25f7 R-1.9.0-r1.ebuild 4041
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 e9c7048c23a390cf8160b15dea9cc1e6 R-2.0.1.ebuild 3571
 MD5 ba11424ce6f3493c306ef4a9fe4c2db6 R-2.1.0-r1.ebuild 2518
+MD5 c2cec6772c2ed2663713fdc63c5d5096 R-2.0.1.ebuild 3608
+MD5 29f3d1a0b7288a534aeca185be4f5539 ChangeLog 7367
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 35b08f0bf56b91051f76faa75d70eb9f files/digest-R-2.1.0-r1 61
 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867
-MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425
 MD5 c85aa52863a8206a8f7a5f74e1439225 files/digest-R-1.9.0-r1 57
+MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425
 MD5 eec0037e7f2073028a10b5028ee8b0bc files/digest-R-2.0.1 61
-MD5 35b08f0bf56b91051f76faa75d70eb9f files/digest-R-2.1.0-r1 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCgLieKRy60XGEcJIRAgpvAJ4kam5ieoTa03HOTzjqLhbP3Ad6vQCdFCUB
-tA9ojZ5UBOtPEcVGzJr9kG4=
-=VY1q
------END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.0.1.ebuild b/dev-lang/R/R-2.0.1.ebuild
index 70a001b86b3e..15a7fcb5f83d 100644
--- a/dev-lang/R/R-2.0.1.ebuild
+++ b/dev-lang/R/R-2.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.0.1.ebuild,v 1.3 2005/05/10 13:35:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.0.1.ebuild,v 1.4 2005/05/24 21:50:06 cryos Exp $
 
-inherit 64-bit fortran
+inherit fortran toolchain-funcs
 
 IUSE="blas X tcltk gnome zlib bzlib pcre"
 DESCRIPTION="R is GNU S - A language and environment for statistical computing and graphics."
@@ -33,17 +33,17 @@ DEPEND="virtual/libc
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="x86 sparc ~ppc ppc64 amd64"
-64-bit || FORTRAN="g77" # No f2c on 64-bit archs anymore.
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#sed -e 's/^#define NeedFunctionPrototypes 0/#define NeedFunctionPrototypes 1/' \
-	#-i src/modules/X11/dataentry.c || die "sed failed"
-}
 
 src_compile() {
-	#addwrite "/var/cache/fonts"
+	# Test for a 64 bit architecture - f2c won't work on 64 bit archs with R.
+	# Thanks to vapier for providing the test.
+	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."
+		FORTRAN="g77"
+	fi
+
 	local myconf="--enable-static --enable-R-profiling --enable-R-shlib --with-readline"
 
 	use zlib || myconf="${myconf} --with-zlib"		#default disabled