Fix #120775

(Portage version: 2.1)

5 files changed, 34 insertions, 3 deletions

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index 77b97f438619..f65a5bdc3019 100644
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,15 @@
 # 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.23 2006/05/23 20:13:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.24 2006/06/17 00:34:47 lu_zero Exp $
+
+  17 Jun 2006; Luca Barbato <lu_zero@gentoo.org>
+  +files/3.6.0-ppc-configure.patch, +files/3.7.11-ppc-configure.patch,
+  blas-atlas-3.6.0-r1.ebuild, blas-atlas-3.7.11.ebuild:
+  Fix #120775 for 3.6.0-r1
+
+  16 Jun 2006; Luca Barbato <lu_zero@gentoo.org>
+  +files/3.7.11-ppc-configure.patch, blas-atlas-3.7.11.ebuild:
+  Fix #120775 for 3.7.11
 
   23 May 2006; Markus Rothe <corsair@gentoo.org> blas-atlas-3.6.0-r1.ebuild:
   Stable on ppc64
diff --git a/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild
index 958d26363720..09312f1962c6 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.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.6.0-r1.ebuild,v 1.10 2006/05/23 20:13:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild,v 1.11 2006/06/17 00:34:47 lu_zero Exp $
 
 inherit eutils toolchain-funcs
 
@@ -44,6 +44,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/unbuffered.patch
 	epatch ${DISTDIR}/atlas3.6.0-shared-libs.1.patch.bz2
+	epatch ${FILESDIR}/${PV}-ppc-configure.patch
 	sed -i -e "s:ASM:ASM VOLATILE:" include/contrib/camm_dpa.h || die "sed failed to fix clobbering"
 	cp ${FILESDIR}/war ${S}
 	chmod a+x ${S}/war
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 19c08779d27f..abd1e073bed6 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.6 2006/04/01 19:59:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild,v 1.7 2006/06/17 00:34:47 lu_zero Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -33,6 +33,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/unbuffered.patch
 	epatch "${FILESDIR}"/${PV}-allow-any-gcc-version.patch
 	epatch "${DISTDIR}"/atlas3.6.0-shared-libs.1.patch.bz2
+	epatch "${FILESDIR}"/${PV}-ppc-configure.patch
 	sed -i \
 		-e "s:ASM:ASM VOLATILE:" \
 		include/contrib/camm_dpa.h \
diff --git a/sci-libs/blas-atlas/files/3.6.0-ppc-configure.patch b/sci-libs/blas-atlas/files/3.6.0-ppc-configure.patch
new file mode 100644
index 000000000000..c499cd0aaebd
--- /dev/null
+++ b/sci-libs/blas-atlas/files/3.6.0-ppc-configure.patch
@@ -0,0 +1,10 @@
+--- ATLAS/config.c.old	2006-06-17 01:57:32.000000000 +0200
++++ ATLAS/config.c	2006-06-17 01:55:45.000000000 +0200
+@@ -2877,6 +2877,7 @@
+             else if (strstr(ln2, "7400")) mach = PPCG4;
+             else if (strstr(ln2, "7410")) mach = PPCG4;
+             else if (strstr(ln2, "7455")) mach = PPCG4;
++            else if (strstr(ln2, "altivec")) mach = PPCG4;
+          }
+          break;
+       case LASPARC:  /* don't know here anymore */
diff --git a/sci-libs/blas-atlas/files/3.7.11-ppc-configure.patch b/sci-libs/blas-atlas/files/3.7.11-ppc-configure.patch
new file mode 100644
index 000000000000..6ab7d2ace503
--- /dev/null
+++ b/sci-libs/blas-atlas/files/3.7.11-ppc-configure.patch
@@ -0,0 +1,10 @@
+--- /var/tmp/portage/blas-atlas-3.7.11/work/ATLAS/config.c.orig	2006-06-13 18:26:29.000000000 +0200
++++ /var/tmp/portage/blas-atlas-3.7.11/work/ATLAS/config.c	2006-06-13 20:23:47.000000000 +0200
+@@ -3088,6 +3088,7 @@
+             else if (strstr(ln2, "7410")) mach = PPCG4;
+             else if (strstr(ln2, "7455")) mach = PPCG4;
+             else if (strstr(ln2, "PPC970FX")) mach = PPCG5;
++            else if (strstr(ln2, "altivec") && !Use64Bits) mach = PPCG4;
+          }
+          break;
+       case LASPARC:  /* don't know here anymore */