(#121855) Allow compilation with gcc-4. Also at least partially fix compilation with non-gcc compilers (e.g. ifc).

Package-Manager: portage-2.1_pre6-r3

4 files changed, 47 insertions, 9 deletions

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index 9b442f9ae4d1..c307df091008 100644
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/blas-atlas
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.19 2006/02/24 04:07:14 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.20 2006/03/21 19:29:10 spyderous Exp $
+
+  21 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/3.7.11-allow-any-gcc-version.patch, blas-atlas-3.7.11.ebuild:
+  (#121855) Allow compilation with gcc-4. Also at least partially fix
+  compilation with non-gcc compilers (e.g. ifc).
 
   24 Feb 2006; Markus Dittrich <markusle@gentoo.org>
   blas-atlas-3.6.0-r1.ebuild:
diff --git a/sci-libs/blas-atlas/Manifest b/sci-libs/blas-atlas/Manifest
index c34b7518d447..6f736ec82b66 100644
--- a/sci-libs/blas-atlas/Manifest
+++ b/sci-libs/blas-atlas/Manifest
@@ -1,6 +1,6 @@
-MD5 f8d0f6f44a1a185ba6e8e54384b58a25 ChangeLog 5882
-RMD160 9c63dc803918bc0ebaa0f205094e2151fc76333e ChangeLog 5882
-SHA256 3ec9957751d98d3a54c0749b9c510a00c1ef6598ecdef4fdb0b111c13c91581c ChangeLog 5882
+MD5 3d90bbef7ce8d5559e3da0240c3d2437 ChangeLog 6129
+RMD160 ddb26a786259d5f138423a33547cf414aeb339fa ChangeLog 6129
+SHA256 625b7f063a1d0d93f3b26ac30886e4e54117f2ec6d49251553cbd71a2050232e ChangeLog 6129
 MD5 4855d1544dae8c52e911d3019e27f78f blas-atlas-3.6.0-r1.ebuild 4266
 RMD160 a973136c1ef644ca491b4b3f334f6b4b8afb0ab6 blas-atlas-3.6.0-r1.ebuild 4266
 SHA256 8766e28e9809f37b6c1ee793196c121fd37b77081ffd70c00412da5393a60e27 blas-atlas-3.6.0-r1.ebuild 4266
@@ -10,9 +10,12 @@ SHA256 ed0985eecc2c6c84a6b13be0c7c129c1f2efb046e8d3a961716282992cf9f17b blas-atl
 MD5 7c557aafda64ad6b2849bbb76a819ee1 blas-atlas-3.7.10.ebuild 4166
 RMD160 6fc9a32014e32bc465050722237b94b10fa51f09 blas-atlas-3.7.10.ebuild 4166
 SHA256 3212603bb6d0fed40a5c6bbd8097592c1ac43dfea3190ce10b0ecf6b611c7ed0 blas-atlas-3.7.10.ebuild 4166
-MD5 6643e8ab68488a8939a964436edd9f15 blas-atlas-3.7.11.ebuild 4336
-RMD160 6c436f4d4ceb64ae84b7dfb343a8e79cd253fcd8 blas-atlas-3.7.11.ebuild 4336
-SHA256 10dd01f895ccc4d794ca467e3219bbc915552c2891ad810edf1ad78658163e9d blas-atlas-3.7.11.ebuild 4336
+MD5 331cf3d5db82efb7bdb39e100206aac7 blas-atlas-3.7.11.ebuild 4751
+RMD160 ba488d11fa806e178886d6eacc53ebc89c919353 blas-atlas-3.7.11.ebuild 4751
+SHA256 fe3b91cab0463679d6e1e2c28ef3e29ee2a9d0b45a8fb88ddde9eccd72639506 blas-atlas-3.7.11.ebuild 4751
+MD5 f96a214eb98219c3702fa278f0fe8ec1 files/3.7.11-allow-any-gcc-version.patch 554
+RMD160 7ae243d7fad6e2ce37cf02c41751dcc57cd9d8d6 files/3.7.11-allow-any-gcc-version.patch 554
+SHA256 2e43cbe7c4ec50c7f5a499c0cc9bde04260e673fecd7b3c0db1102bf0ed855ae files/3.7.11-allow-any-gcc-version.patch 554
 MD5 73bb69e091e5629e3d47ec813d560223 files/c-ATLAS 497
 RMD160 1bca887c53b7132f434a8e6e023721a7a7d6e567 files/c-ATLAS 497
 SHA256 4d135a53bf4bce2a373f2154286876bbba5a78ccab48834e3db3a83714f224c8 files/c-ATLAS 497
diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild
index b8cb5c783388..0d201f1418a8 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild,v 1.4 2006/02/02 16:23:03 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild,v 1.5 2006/03/21 19:29:10 spyderous Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -24,19 +24,34 @@ PROVIDE="virtual/blas"
 
 S="${WORKDIR}/ATLAS"
 RPATH="${DESTTREE}/$(get_libdir)/blas"
-FORTRAN="g77"
+FORTRAN="g77 gfortran"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
 	epatch "${FILESDIR}"/unbuffered.patch
+	epatch "${FILESDIR}"/${PV}-allow-any-gcc-version.patch
 	epatch "${DISTDIR}"/atlas3.6.0-shared-libs.1.patch.bz2
 	sed -i \
 		-e "s:ASM:ASM VOLATILE:" \
 		include/contrib/camm_dpa.h \
 		|| die "sed failed to fix clobbering"
 
+	sed -i \
+		-e "s:\(\t./xconfig\):\1 -m $(tc-getCC) -c $(tc-getCC) -f ${FORTRANC}:g" \
+		${S}/Makefile \
+		|| die "Failed to fix compilers"
+
+	if [[ $(gcc-major-version) -ge 4 ]]; then
+		einfo "Updating Makefiles for gcc-4"
+		sed -i \
+			-e "s:g2c:gfortran:g" \
+			${S}/Make.top \
+			${S}/makes/Make.lib \
+			|| die "Failed to update for gcc-4"
+	fi
+
 	cp "${FILESDIR}"/war "${S}"
 	chmod a+x "${S}"/war
 }
diff --git a/sci-libs/blas-atlas/files/3.7.11-allow-any-gcc-version.patch b/sci-libs/blas-atlas/files/3.7.11-allow-any-gcc-version.patch
new file mode 100644
index 000000000000..6dfd33ab74af
--- /dev/null
+++ b/sci-libs/blas-atlas/files/3.7.11-allow-any-gcc-version.patch
@@ -0,0 +1,15 @@
+diff -urN ATLAS.orig/config.c ATLAS/config.c
+--- ATLAS.orig/config.c	2006-01-16 19:08:16.000000000 -0800
++++ ATLAS/config.c	2006-01-16 19:27:22.000000000 -0800
+@@ -712,11 +712,6 @@
+                gcc, major, minor, patch);
+    if (major == -1)
+       iret = 0;
+-   else if ( MachIsX86(mach) ) /* don't use gcc 2.96 - 3.0 */
+-   {
+-      if ((major == 2 && minor < 96) || (major == 3 && minor > 1))
+-         iret = 1;
+-   }
+    else if (mach == IA64Itan || mach == IA64Itan2 || MachIsUS(mach) ||
+             mach == Dec21164 || mach == Dec21264)
+    {