Fixed bugs in patches and disabled linking against libg2c for atlas as well (fixes bug #191022).

(Portage version: 2.1.3.7)

4 files changed, 16 insertions, 22 deletions

diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog
index 812d371a159e..48d9c7f9ece6 100644
--- a/dev-python/numeric/ChangeLog
+++ b/dev-python/numeric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numeric
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.32 2007/09/01 22:24:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.33 2007/09/02 03:20:38 markusle Exp $
+
+  02 Sep 2007; Markus Dittrich <markusle@gentoo.org>
+  files/numeric-24.2-arrayobject.patch, files/numeric-24.2-dotblas.patch,
+  numeric-24.2-r6.ebuild:
+  Fixed bugs in patches and disabled linking against libg2c for 
+  atlas as well (fixes bug #191022).
 
 *numeric-24.2-r5 (01 Sep 2007)
 
diff --git a/dev-python/numeric/files/numeric-24.2-arrayobject.patch b/dev-python/numeric/files/numeric-24.2-arrayobject.patch
index bc78b0aa59dd..ef549b0a531c 100644
--- a/dev-python/numeric/files/numeric-24.2-arrayobject.patch
+++ b/dev-python/numeric/files/numeric-24.2-arrayobject.patch
@@ -1,14 +1,6 @@
---- Numeric-24.2.orig/Src/arrayobject.c	2005-11-11 07:30:18.000000000 +0000
-+++ Numeric-24.2/Src/arrayobject.c	2006-03-10 04:55:59.000000000 +0000
-@@ -12,7 +12,7 @@
-   performance for heterogeneity.
- */
- 
--/* $Id: numeric-24.2-arrayobject.patch,v 1.3 2007/09/01 22:24:30 bicatali Exp $ */
-+/* $Id: numeric-24.2-arrayobject.patch,v 1.3 2007/09/01 22:24:30 bicatali Exp $ */
- 
- #include "Python.h"
- #include <stddef.h>
+diff -Naur Numeric-24.2/Src/arrayobject.c Numeric-24.2-new/Src/arrayobject.c
+--- Numeric-24.2/Src/arrayobject.c	2005-11-11 02:30:18.000000000 -0500
++++ Numeric-24.2-new/Src/arrayobject.c	2007-09-01 22:52:50.000000000 -0400
 @@ -1866,9 +1866,7 @@
      for (i=0; i<sz; i++) {
  	v=array_item((PyArrayObject *)self, i);
diff --git a/dev-python/numeric/files/numeric-24.2-dotblas.patch b/dev-python/numeric/files/numeric-24.2-dotblas.patch
index d7f707163f34..78edb53b4c97 100644
--- a/dev-python/numeric/files/numeric-24.2-dotblas.patch
+++ b/dev-python/numeric/files/numeric-24.2-dotblas.patch
@@ -96,12 +96,3 @@
      }
    }
    else {
-@@ -703,7 +705,7 @@
-     /* Add some symbolic constants to the module */
-     d = PyModule_GetDict(m);
- 
--    s = PyString_FromString("$Id: numeric-24.2-dotblas.patch,v 1.1 2007/09/01 22:24:30 bicatali Exp $");
-+    s = PyString_FromString("$Id: numeric-24.2-dotblas.patch,v 1.1 2007/09/01 22:24:30 bicatali Exp $");
-     PyDict_SetItemString(d, "__version__", s);
-     Py_DECREF(s);
- 
diff --git a/dev-python/numeric/numeric-24.2-r6.ebuild b/dev-python/numeric/numeric-24.2-r6.ebuild
index ff39bf97f7a1..215d4b2057ff 100644
--- a/dev-python/numeric/numeric-24.2-r6.ebuild
+++ b/dev-python/numeric/numeric-24.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild,v 1.1 2007/09/01 22:24:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild,v 1.2 2007/09/02 03:20:38 markusle Exp $
 
 NEED_PYTHON=2.3
 
@@ -75,6 +75,11 @@ src_unpack() {
 				-e "s:include/atlas:include/cblas:g" \
 				"${S}"/customize.py \
 				|| die "sed for lapack failed"
+		elif [[ "${mycblas}" == atlas ]]; then
+			sed -i \
+				-e "s:g2c:${flib}:g" \
+				"${S}"/customize.py \
+				|| die "sed for lapack failed"
 		fi
 	fi
 }