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

Package-Manager: portage-2.1.3.7

5 files changed, 32 insertions, 48 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/Manifest b/dev-python/numeric/Manifest
index 1a8300360c35..fe1e8a857e93 100644
--- a/dev-python/numeric/Manifest
+++ b/dev-python/numeric/Manifest
@@ -1,18 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX numeric-23.7.patch 2311 RMD160 bab250c3106bda159fc73f85f35e82f6ab2b93fa SHA1 ad733a495b3115ecd24ca4d8f8458923d0a308d5 SHA256 eafed2342ecd71ae00c8f1e780e4fcf3fc561e33c5499a6112edefe5de4af9b4
 MD5 b962c2f9fe39159f4c6025bb24cdf701 files/numeric-23.7.patch 2311
 RMD160 bab250c3106bda159fc73f85f35e82f6ab2b93fa files/numeric-23.7.patch 2311
 SHA256 eafed2342ecd71ae00c8f1e780e4fcf3fc561e33c5499a6112edefe5de4af9b4 files/numeric-23.7.patch 2311
-AUX numeric-24.2-arrayobject.patch 656 RMD160 d41b0f1507b42ae93f392efc5d00bed5dd30a782 SHA1 42aa3391a2e4fd415a1e024ca2feb339b5bc8e6f SHA256 7c41402e572f5ff90a47d49228d079632ffe8601cc0873f35a11c1e74ad08c38
-MD5 2f77b09328808bc546bf9c41ca3526de files/numeric-24.2-arrayobject.patch 656
-RMD160 d41b0f1507b42ae93f392efc5d00bed5dd30a782 files/numeric-24.2-arrayobject.patch 656
-SHA256 7c41402e572f5ff90a47d49228d079632ffe8601cc0873f35a11c1e74ad08c38 files/numeric-24.2-arrayobject.patch 656
-AUX numeric-24.2-dotblas.patch 4326 RMD160 ada3edfd14a7eb60880fb7a59d78f95b2bd54c9e SHA1 09acc8290ebcbbfe6c3d27c36fbd96277afaa08e SHA256 10acf2959d2498966b31080634fadb7cd342df3dc3a706ed46528d8404b2096d
-MD5 7fc233e75d21419ae4b7527d538f7757 files/numeric-24.2-dotblas.patch 4326
-RMD160 ada3edfd14a7eb60880fb7a59d78f95b2bd54c9e files/numeric-24.2-dotblas.patch 4326
-SHA256 10acf2959d2498966b31080634fadb7cd342df3dc3a706ed46528d8404b2096d files/numeric-24.2-dotblas.patch 4326
+AUX numeric-24.2-arrayobject.patch 462 RMD160 79d9b18576fb7465d462e9bba7d1be6d4d6ef95a SHA1 b5f40d0252b94dc6451e1708691135c2717f455d SHA256 eadeed68c87f829188ef5a95abf0bca61024497b8783b62aca749afd68f55386
+MD5 c04b7ede7d971eea68d42f4337cab632 files/numeric-24.2-arrayobject.patch 462
+RMD160 79d9b18576fb7465d462e9bba7d1be6d4d6ef95a files/numeric-24.2-arrayobject.patch 462
+SHA256 eadeed68c87f829188ef5a95abf0bca61024497b8783b62aca749afd68f55386 files/numeric-24.2-arrayobject.patch 462
+AUX numeric-24.2-dotblas.patch 3940 RMD160 305b26c9892391e9fe7aa8195aa615e64016598e SHA1 98689c97f4c9e2bcae5549687d42d4a924b4acde SHA256 21729353e06f94a33dffc6154fb17f55b0d784bad499eb4aab7d826b649e9043
+MD5 6bb95d429c0517af8d80b081cc9951d2 files/numeric-24.2-dotblas.patch 3940
+RMD160 305b26c9892391e9fe7aa8195aa615e64016598e files/numeric-24.2-dotblas.patch 3940
+SHA256 21729353e06f94a33dffc6154fb17f55b0d784bad499eb4aab7d826b649e9043 files/numeric-24.2-dotblas.patch 3940
 AUX numeric-24.2-eigen.patch 292 RMD160 7502282632c01c2012b27ac191c2036abb43b59f SHA1 48eba53c874a212964fd5fcd87cd8285dc8ba792 SHA256 8038f5e8ceaa3c853d32711ee9945903c56d550f316f5778e93e234db6897cab
 MD5 4b0a676b71ebbe6df65f0ebffd72d019 files/numeric-24.2-eigen.patch 292
 RMD160 7502282632c01c2012b27ac191c2036abb43b59f files/numeric-24.2-eigen.patch 292
@@ -49,18 +46,18 @@ EBUILD numeric-24.2-r5.ebuild 1554 RMD160 f2d9fa8a4680ac21a2062afead64a686f83605
 MD5 a416ee0d041cbee92dc7bfa622ee05f3 numeric-24.2-r5.ebuild 1554
 RMD160 f2d9fa8a4680ac21a2062afead64a686f8360537 numeric-24.2-r5.ebuild 1554
 SHA256 e991aa6e001ef9de14319c6c87f1a206309d8fbb28df6790b55d6bf22c5f313d numeric-24.2-r5.ebuild 1554
-EBUILD numeric-24.2-r6.ebuild 2940 RMD160 020ca29cfa9833a5616856e23a76c8c1ca1925c4 SHA1 dca50a2e4d7913207987dc0d5cd20d6c61c6c2c3 SHA256 3e897c13871fd722319abfabf51e786e1236e4eebcbce3c13f407a4dd3ae7827
-MD5 8e44a8783915ab773a05ac05eb9d355d numeric-24.2-r6.ebuild 2940
-RMD160 020ca29cfa9833a5616856e23a76c8c1ca1925c4 numeric-24.2-r6.ebuild 2940
-SHA256 3e897c13871fd722319abfabf51e786e1236e4eebcbce3c13f407a4dd3ae7827 numeric-24.2-r6.ebuild 2940
+EBUILD numeric-24.2-r6.ebuild 3081 RMD160 514510ce467bb4f17361cf596109004b70b8c8d9 SHA1 a79a25aea94379047f0a8e2a85f389664355ac91 SHA256 6c9a84c84d63a5ee030a8e9b22d555887e75b35c080da6d6f3e2a2fee56aa3ad
+MD5 e1b789f8ff1760db7a29cc227f156225 numeric-24.2-r6.ebuild 3081
+RMD160 514510ce467bb4f17361cf596109004b70b8c8d9 numeric-24.2-r6.ebuild 3081
+SHA256 6c9a84c84d63a5ee030a8e9b22d555887e75b35c080da6d6f3e2a2fee56aa3ad numeric-24.2-r6.ebuild 3081
 EBUILD numeric-24.2.ebuild 848 RMD160 a60967fc80d1900e57d198356494b2db25a413ae SHA1 f28d3654a80bc3c437a21d581f7ea7ec142cbcfd SHA256 93e209fb19b862bc914fc9b04e45bcfd0ca40c4aed2e34d41b82d15e85ba770e
 MD5 be3fad4c9fdf2ed413ea4fcfb24caa43 numeric-24.2.ebuild 848
 RMD160 a60967fc80d1900e57d198356494b2db25a413ae numeric-24.2.ebuild 848
 SHA256 93e209fb19b862bc914fc9b04e45bcfd0ca40c4aed2e34d41b82d15e85ba770e numeric-24.2.ebuild 848
-MISC ChangeLog 6206 RMD160 9b0f97482d3e64ac1831f891bd1f0ed9803cfdbe SHA1 fd4f005246335183ec5b879be90c7b933778ccb6 SHA256 ab66f22c575eb747722fbc3878008447276f79b60accc7a5f7d20a22625085fe
-MD5 12da0b845795bbfa9ddcf1d3ab1ec22d ChangeLog 6206
-RMD160 9b0f97482d3e64ac1831f891bd1f0ed9803cfdbe ChangeLog 6206
-SHA256 ab66f22c575eb747722fbc3878008447276f79b60accc7a5f7d20a22625085fe ChangeLog 6206
+MISC ChangeLog 6462 RMD160 9432415af3f56329fe8fb17d96fbb5cda00b4ce5 SHA1 4a26ec7843a6a8626469952f28641f6308eccbc3 SHA256 995d7b137d2840a969fb87365445a5e8714d31cfe90eb3da9a2ca6a020b42133
+MD5 07e5d843af9d15cfa24864ca5909ee76 ChangeLog 6462
+RMD160 9432415af3f56329fe8fb17d96fbb5cda00b4ce5 ChangeLog 6462
+SHA256 995d7b137d2840a969fb87365445a5e8714d31cfe90eb3da9a2ca6a020b42133 ChangeLog 6462
 MISC metadata.xml 541 RMD160 72132dabcdb4bf092f51e9fe632c4fa3e75bf83c SHA1 e1f11e89405fa3bf2da1b1dcee2a86f8ad7f1d43 SHA256 e2629c5f0ce5f03b5666f9169b04cc699eac40e11179c4c45aa93f32f6c9dbb7
 MD5 188a2dc88446ced4e627340d892803bc metadata.xml 541
 RMD160 72132dabcdb4bf092f51e9fe632c4fa3e75bf83c metadata.xml 541
@@ -80,10 +77,3 @@ SHA256 9b7f723450199e5eb5d4816af0d7504bee35ae64f9219f5b939a0cbf07470cff files/di
 MD5 5b52da6bca1f3b07ef1a321554066b0a files/digest-numeric-24.2-r6 449
 RMD160 41afdea026a2ba6459df18713c94ceb6466ddd21 files/digest-numeric-24.2-r6 449
 SHA256 9b7f723450199e5eb5d4816af0d7504bee35ae64f9219f5b939a0cbf07470cff files/digest-numeric-24.2-r6 449
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFG2eal1ycZbhPLE2ARAt9YAJ9JavrHnUG23PAEEAh1fPJiPI0wMgCcDRC6
-0fJBZkK6CDD4XdO/66uCMm0=
-=WAd3
------END PGP SIGNATURE-----
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
 }