added numeric-24.2-r{3,4} replacement of numeric-24.2-r{1,2} with many patches

Package-Manager: portage-2.1.2-r9

diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog
index f9b71fa28b0538b12ef78d37f9e04184694918b3..a6e0281593617318fae1af2d6cdbd9b0e5441676 100644 (file)
--- a/dev-python/numeric/ChangeLog
+++ b/dev-python/numeric/ChangeLog
@@ -1,6 +1,18 @@
 # 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.28 2007/02/07 17:21:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.29 2007/02/23 23:43:05 bicatali Exp $
+
+*numeric-24.2-r4 (23 Feb 2007)
+*numeric-24.2-r3 (23 Feb 2007)
+
+  23 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  files/numeric-24.2-arrayobject.patch, files/numeric-24.2-lapack.patch,
+  +files/numeric-24.2-python25.patch, +files/numeric-24.2-test.patch,
+  metadata.xml, -numeric-24.2-r1.ebuild, -numeric-24.2-r2.ebuild,
+  +numeric-24.2-r3.ebuild, +numeric-24.2-r4.ebuild:
+  Added sci herd in metadata.xml, removed buggy 
+  numeric-24.2-r{1,2}.ebuild, better cblas/lapack treatments, more patches.
+  Use numeric-24.2-r4 with lapack support for arches supporting it.
 
 *numeric-24.2-r2 (07 Feb 2007)
 

diff --git a/dev-python/numeric/Manifest b/dev-python/numeric/Manifest
index b3c442c9c91f56787bfb20832c2ba6191d1d510c..ca133a42b2687cafb70b4242c386c8e4161375ae 100644 (file)
--- a/dev-python/numeric/Manifest
+++ b/dev-python/numeric/Manifest
@@ -5,18 +5,26 @@ AUX numeric-23.7.patch 2311 RMD160 bab250c3106bda159fc73f85f35e82f6ab2b93fa SHA1
 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 389 RMD160 04c59d5bb1dfab822ac24298632e3a6d87c99f6f SHA1 07195f7560c8f662016cd946c58630b817f60cb5 SHA256 1f475cb518649871306fe85b22bad7ad34144933c12d5e435c58897d61bac847
-MD5 40944b7b93d0a05737a0c40fc2dd6437 files/numeric-24.2-arrayobject.patch 389
-RMD160 04c59d5bb1dfab822ac24298632e3a6d87c99f6f files/numeric-24.2-arrayobject.patch 389
-SHA256 1f475cb518649871306fe85b22bad7ad34144933c12d5e435c58897d61bac847 files/numeric-24.2-arrayobject.patch 389
+AUX numeric-24.2-arrayobject.patch 610 RMD160 fa5781e9cb319e300574806a4dd233190134d503 SHA1 927a8e5d814088863e2a0abf52d8f78a1a08871b SHA256 21882b663253b7f497e73489af4fee7d8e42428e275214eff798d90278dab738
+MD5 796989001bd05eef01191bb89e13bdd7 files/numeric-24.2-arrayobject.patch 610
+RMD160 fa5781e9cb319e300574806a4dd233190134d503 files/numeric-24.2-arrayobject.patch 610
+SHA256 21882b663253b7f497e73489af4fee7d8e42428e275214eff798d90278dab738 files/numeric-24.2-arrayobject.patch 610
 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
 SHA256 8038f5e8ceaa3c853d32711ee9945903c56d550f316f5778e93e234db6897cab files/numeric-24.2-eigen.patch 292
-AUX numeric-24.2-lapack.patch 1145 RMD160 e152b034a1e7045b6e75e7bef9238dbc4fe443be SHA1 b7f5ac135f068122bb078e967e2f045cd64386a8 SHA256 f059eb3c91851e02ace0269606027237e59ec54f0cd38f1d656360e3fbc15c6b
-MD5 ec13158428efee29f2f0eddd799e556f files/numeric-24.2-lapack.patch 1145
-RMD160 e152b034a1e7045b6e75e7bef9238dbc4fe443be files/numeric-24.2-lapack.patch 1145
-SHA256 f059eb3c91851e02ace0269606027237e59ec54f0cd38f1d656360e3fbc15c6b files/numeric-24.2-lapack.patch 1145
+AUX numeric-24.2-lapack.patch 905 RMD160 8067c71400af3e76d9e1b63e6a542fa36f77486a SHA1 6d9e5547800ffe648750e8c7aeba9b71757a2508 SHA256 a2653e0990e91a45a97968d3bbcc12b8dad8bf2233ca8336736e12bf62ab763a
+MD5 8877aafb72a294ff37410653c9e9a238 files/numeric-24.2-lapack.patch 905
+RMD160 8067c71400af3e76d9e1b63e6a542fa36f77486a files/numeric-24.2-lapack.patch 905
+SHA256 a2653e0990e91a45a97968d3bbcc12b8dad8bf2233ca8336736e12bf62ab763a files/numeric-24.2-lapack.patch 905
+AUX numeric-24.2-python25.patch 270 RMD160 db415e2392c75e2512bf2d1cbf2e48a803f4bf58 SHA1 19c5d87fb92e75f6ed8a4ad099dffb050721c522 SHA256 026cdfc2765791cebc69aaeb0f1eb9d8f9cae7925831684959b60673f54ec8f0
+MD5 61be7f76ced6e5ae8400b3fe87f2383f files/numeric-24.2-python25.patch 270
+RMD160 db415e2392c75e2512bf2d1cbf2e48a803f4bf58 files/numeric-24.2-python25.patch 270
+SHA256 026cdfc2765791cebc69aaeb0f1eb9d8f9cae7925831684959b60673f54ec8f0 files/numeric-24.2-python25.patch 270
+AUX numeric-24.2-test.patch 569 RMD160 e76ae89e8925a0f9d0b7cd7f2d8c43e09e45ecf6 SHA1 076fdc231ba64662ddb1d61ed79920d70430c7fe SHA256 807f8963adadef5fac8cb7820c16748e6cfcb112046b0e16bfa249d5ec330520
+MD5 585d0c2aa134a19827ee65b015329a4f files/numeric-24.2-test.patch 569
+RMD160 e76ae89e8925a0f9d0b7cd7f2d8c43e09e45ecf6 files/numeric-24.2-test.patch 569
+SHA256 807f8963adadef5fac8cb7820c16748e6cfcb112046b0e16bfa249d5ec330520 files/numeric-24.2-test.patch 569
 AUX numeric-24.2-umath.patch 357 RMD160 33c55cd84cd3a1e2acb32b9420e5c2fab3f6486b SHA1 e62bef8fb392eedc9b27364fdd2c6ad1d3800175 SHA256 00f41e3fb05b9e26daf200a0bc1397d36055590b1ccb416c33ac76464d08a36c
 MD5 ff094342d7c47777acfdf87db45b9596 files/numeric-24.2-umath.patch 357
 RMD160 33c55cd84cd3a1e2acb32b9420e5c2fab3f6486b files/numeric-24.2-umath.patch 357
@@ -24,6 +32,7 @@ SHA256 00f41e3fb05b9e26daf200a0bc1397d36055590b1ccb416c33ac76464d08a36c files/nu
 DIST Numeric-23.7.tar.gz 725824 RMD160 1ff89d0e809c97b5cc06184676503bfee12c2fcd SHA1 3fe90c14692c9fe9da0d4202df4036e8ecfdd365 SHA256 33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c
 DIST Numeric-23.8.tar.gz 725817 RMD160 c97297adaa8652dfc8e661fc9b28fac2b227c002 SHA1 e86aa5956fb0c3a9b1325bf437f8df9e03339390 SHA256 16d88e7dcf5a6967cd2782edff2e355a6abebd7881fcf99fe79eef7fd9e163ae
 DIST Numeric-24.2.tar.gz 743800 RMD160 c9502db28663558c535e236392c9beddec9743bb SHA1 72869ef80c12630a9a125ba10c96093b6ae16aff SHA256 5f72e729eb6ff57442f2a38bfc9931738b59e5077928e2e70d22b4610ff15258
+DIST numpy.pdf 1234555 RMD160 7a4f20c6f239989871594850f379cc2588ed34af SHA1 0a5ddb28ecea2fdc48e026366f100d952743dffb SHA256 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f
 EBUILD numeric-23.7.ebuild 892 RMD160 00f76cdd7bd7a8dc787628ab22af29cca71a59ab SHA1 7d6de52e9ef87635958af76801c3bfdef0dca07b SHA256 d0cb72a02074d4ff8e3ba43baa0d13e992a73e8c94267b1164f8e9a571f32529
 MD5 1e017049397e903f58823a94b33152b1 numeric-23.7.ebuild 892
 RMD160 00f76cdd7bd7a8dc787628ab22af29cca71a59ab numeric-23.7.ebuild 892
@@ -32,26 +41,26 @@ EBUILD numeric-23.8.ebuild 866 RMD160 2e135c4fc62dcd8c7962a75ccc61c840c8438b39 S
 MD5 c641bcf12a746279a3247e8a1840e65a numeric-23.8.ebuild 866
 RMD160 2e135c4fc62dcd8c7962a75ccc61c840c8438b39 numeric-23.8.ebuild 866
 SHA256 27c3dc03b21c2ffc151f119968f89161558169926aa54be03124248644ebd56c numeric-23.8.ebuild 866
-EBUILD numeric-24.2-r1.ebuild 1285 RMD160 cca33cb77a18b5e447a951f74580684ed4fb43f6 SHA1 906268f917c34d988e7a0c9dd7a66e5a95f1de70 SHA256 e554510aa5ce5591884229d70bc391d83aa964359d7138349a93ebd3f880bd25
-MD5 20864c217512cbeb2a397cab658f01e0 numeric-24.2-r1.ebuild 1285
-RMD160 cca33cb77a18b5e447a951f74580684ed4fb43f6 numeric-24.2-r1.ebuild 1285
-SHA256 e554510aa5ce5591884229d70bc391d83aa964359d7138349a93ebd3f880bd25 numeric-24.2-r1.ebuild 1285
-EBUILD numeric-24.2-r2.ebuild 1805 RMD160 3d0da4827be2119cc6b5f27e4466549693d02589 SHA1 f910c49b2bac9977c37e0c02802f1ada87ceaa3a SHA256 6a278e4225f2947c8323994d79e2c681869d74b5924b065c40454e126e7b4f64
-MD5 cc291190ce5b76c4ffc667ad062ffa17 numeric-24.2-r2.ebuild 1805
-RMD160 3d0da4827be2119cc6b5f27e4466549693d02589 numeric-24.2-r2.ebuild 1805
-SHA256 6a278e4225f2947c8323994d79e2c681869d74b5924b065c40454e126e7b4f64 numeric-24.2-r2.ebuild 1805
+EBUILD numeric-24.2-r3.ebuild 1498 RMD160 518532d6d21ac00e61a502b0d410f4157dacf18b SHA1 db7d3df624cfad5aead0672a546bfb979ee57921 SHA256 4f2094b72d2d1eb766712600695952dac0a9a1cb37b09300d99e01a363bf76b6
+MD5 69887ebcb20ed8271b93252c9ff24ddb numeric-24.2-r3.ebuild 1498
+RMD160 518532d6d21ac00e61a502b0d410f4157dacf18b numeric-24.2-r3.ebuild 1498
+SHA256 4f2094b72d2d1eb766712600695952dac0a9a1cb37b09300d99e01a363bf76b6 numeric-24.2-r3.ebuild 1498
+EBUILD numeric-24.2-r4.ebuild 2777 RMD160 75da50ed43ae5259128051e13523b77b4c54ce31 SHA1 bc3c610a2728c9252f15a179a3752e4ba44283cc SHA256 84764587cfa9821554646b19c53fb973e845b3d09852e90e523ab36005fbc7fd
+MD5 af3083fe8f47067729368c2c3d16a7e4 numeric-24.2-r4.ebuild 2777
+RMD160 75da50ed43ae5259128051e13523b77b4c54ce31 numeric-24.2-r4.ebuild 2777
+SHA256 84764587cfa9821554646b19c53fb973e845b3d09852e90e523ab36005fbc7fd numeric-24.2-r4.ebuild 2777
 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 4887 RMD160 b159219faf6f9b2fedf2c3b5fc1eb774eb56ca89 SHA1 9dd86cdf4a7c1259e6ef5099f78b09a8855aa26b SHA256 6db2f65df788f68d51beee01a35544f23ef7b68592be6cca5eb0ad69a24af259
-MD5 bbb19a91ffaee442f29363d10f6ad22c ChangeLog 4887
-RMD160 b159219faf6f9b2fedf2c3b5fc1eb774eb56ca89 ChangeLog 4887
-SHA256 6db2f65df788f68d51beee01a35544f23ef7b68592be6cca5eb0ad69a24af259 ChangeLog 4887
-MISC metadata.xml 524 RMD160 196b661a6d6b3dfb8b4c41a4bf114b0b7dcc99c5 SHA1 6b6b2097e61f55bf5f83aa826053b6923368fc86 SHA256 66a1c707d248e0c7bb2bf22af2ab9910cf256a468bb58e71961c7786d6c6fae1
-MD5 23a6e92b4a0d6a7e34ed10882f87383c metadata.xml 524
-RMD160 196b661a6d6b3dfb8b4c41a4bf114b0b7dcc99c5 metadata.xml 524
-SHA256 66a1c707d248e0c7bb2bf22af2ab9910cf256a468bb58e71961c7786d6c6fae1 metadata.xml 524
+MISC ChangeLog 5460 RMD160 f80451bc09612821e501b5037810a1e9d90067cc SHA1 a73deb0d91c9f836f14a4c992d09ab136b8c658c SHA256 38b48c3a696eeb6bb31f22c70e70b4bc127fc1e19de5ee092163ec582626a427
+MD5 5a201a90e726145f4867d27afe6011ce ChangeLog 5460
+RMD160 f80451bc09612821e501b5037810a1e9d90067cc ChangeLog 5460
+SHA256 38b48c3a696eeb6bb31f22c70e70b4bc127fc1e19de5ee092163ec582626a427 ChangeLog 5460
+MISC metadata.xml 541 RMD160 72132dabcdb4bf092f51e9fe632c4fa3e75bf83c SHA1 e1f11e89405fa3bf2da1b1dcee2a86f8ad7f1d43 SHA256 e2629c5f0ce5f03b5666f9169b04cc699eac40e11179c4c45aa93f32f6c9dbb7
+MD5 188a2dc88446ced4e627340d892803bc metadata.xml 541
+RMD160 72132dabcdb4bf092f51e9fe632c4fa3e75bf83c metadata.xml 541
+SHA256 e2629c5f0ce5f03b5666f9169b04cc699eac40e11179c4c45aa93f32f6c9dbb7 metadata.xml 541
 MD5 ad35d120972f70efdf47d1d25aff45d0 files/digest-numeric-23.7 238
 RMD160 f0611578b9d8714ff1684cdd06a89d8e679fd2ca files/digest-numeric-23.7 238
 SHA256 716c8bdf5baf3d199351596b5e9ffce5b90b723460ec9773d783782a2cfc7a65 files/digest-numeric-23.7 238
@@ -61,16 +70,16 @@ SHA256 aaee47a9b2b160539310d1b7215f1ff93a48fa3ad9576be20d56bd241ba39ac6 files/di
 MD5 ecd78d1bb4d2b61725a79deb65e5bb75 files/digest-numeric-24.2 238
 RMD160 fc57f969862ead472f970e34a365c6aff70c906e files/digest-numeric-24.2 238
 SHA256 d672c5f7d95f34bcc793b9091ebe6ebb22ed591f953e172ffc338679e5fa4a00 files/digest-numeric-24.2 238
-MD5 ecd78d1bb4d2b61725a79deb65e5bb75 files/digest-numeric-24.2-r1 238
-RMD160 fc57f969862ead472f970e34a365c6aff70c906e files/digest-numeric-24.2-r1 238
-SHA256 d672c5f7d95f34bcc793b9091ebe6ebb22ed591f953e172ffc338679e5fa4a00 files/digest-numeric-24.2-r1 238
-MD5 ecd78d1bb4d2b61725a79deb65e5bb75 files/digest-numeric-24.2-r2 238
-RMD160 fc57f969862ead472f970e34a365c6aff70c906e files/digest-numeric-24.2-r2 238
-SHA256 d672c5f7d95f34bcc793b9091ebe6ebb22ed591f953e172ffc338679e5fa4a00 files/digest-numeric-24.2-r2 238
+MD5 5b52da6bca1f3b07ef1a321554066b0a files/digest-numeric-24.2-r3 449
+RMD160 41afdea026a2ba6459df18713c94ceb6466ddd21 files/digest-numeric-24.2-r3 449
+SHA256 9b7f723450199e5eb5d4816af0d7504bee35ae64f9219f5b939a0cbf07470cff files/digest-numeric-24.2-r3 449
+MD5 5b52da6bca1f3b07ef1a321554066b0a files/digest-numeric-24.2-r4 449
+RMD160 41afdea026a2ba6459df18713c94ceb6466ddd21 files/digest-numeric-24.2-r4 449
+SHA256 9b7f723450199e5eb5d4816af0d7504bee35ae64f9219f5b939a0cbf07470cff files/digest-numeric-24.2-r4 449
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFygqQWc/Ciu+QQGkRAkbjAJ4tE5wcL/HJPGjXCNjHwKYsiTsjIwCfRNFi
-5IlnXpEH4Sh4f1ebMfsTbGQ=
-=1IDJ
+iD8DBQFF33wSWc/Ciu+QQGkRAoFCAJ9d/UhFb7GWxmcmxuKL1E2Wsr71ZgCeKPoe
+Fuxz8AOyzoigm7Qmq7C30PQ=
+=pYyl
 -----END PGP SIGNATURE-----

diff --git a/dev-python/numeric/files/digest-numeric-24.2-r1 b/dev-python/numeric/files/digest-numeric-24.2-r3
similarity index 53%
rename from dev-python/numeric/files/digest-numeric-24.2-r1
rename to dev-python/numeric/files/digest-numeric-24.2-r3
index b891af10ea95cc015e51161a4cb4f5b70b034954..44098727615d45d3246d4b5ca81e4d04065dccf5 100644 (file)
--- a/dev-python/numeric/files/digest-numeric-24.2-r1
+++ b/dev-python/numeric/files/digest-numeric-24.2-r3
@@ -1,3 +1,6 @@
 MD5 2ae672656e06716a149acb048cca3093 Numeric-24.2.tar.gz 743800
 RMD160 c9502db28663558c535e236392c9beddec9743bb Numeric-24.2.tar.gz 743800
 SHA256 5f72e729eb6ff57442f2a38bfc9931738b59e5077928e2e70d22b4610ff15258 Numeric-24.2.tar.gz 743800
+MD5 258b3758645568724ab1a3ead67db78a numpy.pdf 1234555
+RMD160 7a4f20c6f239989871594850f379cc2588ed34af numpy.pdf 1234555
+SHA256 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f numpy.pdf 1234555

diff --git a/dev-python/numeric/files/digest-numeric-24.2-r2 b/dev-python/numeric/files/digest-numeric-24.2-r4
similarity index 53%
rename from dev-python/numeric/files/digest-numeric-24.2-r2
rename to dev-python/numeric/files/digest-numeric-24.2-r4
index b891af10ea95cc015e51161a4cb4f5b70b034954..44098727615d45d3246d4b5ca81e4d04065dccf5 100644 (file)
--- a/dev-python/numeric/files/digest-numeric-24.2-r2
+++ b/dev-python/numeric/files/digest-numeric-24.2-r4
@@ -1,3 +1,6 @@
 MD5 2ae672656e06716a149acb048cca3093 Numeric-24.2.tar.gz 743800
 RMD160 c9502db28663558c535e236392c9beddec9743bb Numeric-24.2.tar.gz 743800
 SHA256 5f72e729eb6ff57442f2a38bfc9931738b59e5077928e2e70d22b4610ff15258 Numeric-24.2.tar.gz 743800
+MD5 258b3758645568724ab1a3ead67db78a numpy.pdf 1234555
+RMD160 7a4f20c6f239989871594850f379cc2588ed34af numpy.pdf 1234555
+SHA256 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f numpy.pdf 1234555

diff --git a/dev-python/numeric/files/numeric-24.2-arrayobject.patch b/dev-python/numeric/files/numeric-24.2-arrayobject.patch
index a67d5b4f501e0606d7dfe231b23a9bf608ba4971..b17fc7a8a7a270305a1af035cb8f2a42a44369d0 100644 (file)
--- a/dev-python/numeric/files/numeric-24.2-arrayobject.patch
+++ b/dev-python/numeric/files/numeric-24.2-arrayobject.patch
@@ -1,5 +1,5 @@
 --- Numeric-24.2/Src/arrayobject.c     2005-11-11 07:30:18.000000000 +0000
-+++ Numeric-24.2.new/Src/arrayobject.c 2006-06-06 19:13:58.000000000 +0100
++++ Numeric-24.2.new/Src/arrayobject.c 2007-02-08 12:12:01.000000000 +0000
 @@ -1866,7 +1866,7 @@
      for (i=0; i<sz; i++) {
        v=array_item((PyArrayObject *)self, i);
@@ -9,3 +9,12 @@
            Py_DECREF(v);
        }
      }
+@@ -2877,7 +2877,7 @@
+     PyArrayObject *ret=NULL;
+     PyArray_Descr *descr;
+     char *data;
+-    int buffer_len;
++    ssize_t buffer_len;
+     int res, i, n;
+     int dims[MAX_DIMS], strides[MAX_DIMS];
+     int swap;

diff --git a/dev-python/numeric/files/numeric-24.2-lapack.patch b/dev-python/numeric/files/numeric-24.2-lapack.patch
index bb77b77c8a772d934d89a060f55f023e2d4c9367..926deb6d9a3af8f79189c97fd91b0f2b0a01a854 100644 (file)
--- a/dev-python/numeric/files/numeric-24.2-lapack.patch
+++ b/dev-python/numeric/files/numeric-24.2-lapack.patch
@@ -1,5 +1,5 @@
---- Numeric-24.2.orig/customize.py     2005-11-13 02:40:14.000000000 +0000
-+++ Numeric-24.2/customize.py  2006-10-10 17:58:33.000000000 +0100
+--- customize.py.orig  2007-02-13 22:56:17.000000000 +0000
++++ customize.py       2007-02-13 22:59:20.000000000 +0000
 @@ -13,9 +13,9 @@
  # will be used, except on Mac OS X, where the vecLib framework will be used
  # if found.
@@ -8,11 +8,11 @@
 +use_system_lapack = 1
  lapack_library_dirs = []
 -lapack_libraries = []
-+lapack_libraries = ['lapack', 'cblas', 'blas', 'atlas', 'g2c']
++lapack_libraries = ['lapack']
  lapack_extra_link_args = []
  
  # Example: using ATLAS
-@@ -35,8 +35,8 @@
+@@ -35,11 +35,11 @@
  
  # Set use_dotblas to 1 to use BLAS for the matrix multiplication routines.
  # Put the directory that 'cblas.h' is in into dotblas_include_dirs
@@ -22,13 +22,8 @@
 +dotblas_include_dirs = ['/usr/include/atlas']
  dotblas_cblas_header = '<cblas.h>'
  dotblas_library_dirs = lapack_library_dirs
- dotblas_libraries = lapack_libraries
-@@ -45,7 +45,7 @@
- # Example: using ATLAS
- if 0:
-     use_dotblas = 1
--    dotblas_include_dirs = ['/usr/include/atlas']
-+    dotblas_include_dirs = ['/usr/include/atlas','/usr/include/cblas']
-     dotblas_library_dirs = lapack_library_dirs
-     dotblas_libraries = ['cblas', 'atlas', 'g2c']
+-dotblas_libraries = lapack_libraries
++dotblas_libraries = ['cblas', 'blas', 'atlas', 'g2c']
+ dotblas_extra_link_args = []
  
+ # Example: using ATLAS

diff --git a/dev-python/numeric/files/numeric-24.2-python25.patch b/dev-python/numeric/files/numeric-24.2-python25.patch
new file mode 100644 (file)
index 0000000..8f29e60
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2-python25.patch
@@ -0,0 +1,10 @@
+--- Numeric-24.2/Packages/RNG/Src/RNGmodule.c  2005-04-22 11:54:38.000000000 +0100
++++ Numeric-24.2.new/Packages/RNG/Src/RNGmodule.c      2007-02-13 20:06:07.000000000 +0000
+@@ -93,6 +93,7 @@
+ {
+       Py_XDECREF(self->parameters);
+       PyMem_DEL(self);
++      PyObject_FREE(self);
+ }
+ 
+ 

diff --git a/dev-python/numeric/files/numeric-24.2-test.patch b/dev-python/numeric/files/numeric-24.2-test.patch
new file mode 100644 (file)
index 0000000..837f7c6
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2-test.patch
@@ -0,0 +1,12 @@
+--- Numeric-24.2/Test/test.py  2005-08-16 06:20:25.000000000 +0100
++++ Numeric-24.2.new/Test/test.py      2007-02-13 20:10:41.000000000 +0000
+@@ -581,7 +581,8 @@
+         assert_eq(Numeric.diagonal(b), [1,6,3,8])
+         assert_eq(Numeric.diagonal(b, -1), [5,2,7])
+         c = Numeric.array([b,b])
+-        assert_eq(Numeric.diagonal(c,1), [[2,7,4], [2,7,4]])
++        # default axes for "diagonal" are now 0 and 1. 
++        assert_eq(Numeric.diagonal(c,1,-2,-1), [[2,7,4], [2,7,4]])
+         
+ class UniversalFunctionsTestCase (unittest.TestCase):
+     def setUp (self):

diff --git a/dev-python/numeric/metadata.xml b/dev-python/numeric/metadata.xml
index bfa28bb2c37c40b4f9efe9da069252e463a5712b..4d6bae10a4964b9f881debb5fb9b6009cd978047 100644 (file)
--- a/dev-python/numeric/metadata.xml
+++ b/dev-python/numeric/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>sci</herd>
 <herd>python</herd>
 <longdescription lang="en">
 The Numeric Extensions to Python (NumPy) adds multi-dimensional array

diff --git a/dev-python/numeric/numeric-24.2-r2.ebuild b/dev-python/numeric/numeric-24.2-r2.ebuild
deleted file mode 100644 (file)
index 1083a25..0000000
--- a/dev-python/numeric/numeric-24.2-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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-r2.ebuild,v 1.1 2007/02/07 17:21:10 bicatali Exp $
-
-inherit distutils eutils fortran
-
-MY_P=Numeric-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Numerical multidimensional array language facility for Python."
-HOMEPAGE="http://numeric.scipy.org/"
-SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="lapack"
-DEPEND=">=dev-lang/python-2.3
-       lapack? ( virtual/cblas virtual/lapack )"
-
-pkg_setup() {
-       if use lapack; then
-               FORTRAN="gfortran g77"
-               fortran_pkg_setup
-       fi
-}
-
-src_unpack() {
-       if use lapack; then
-               fortran_src_unpack
-       else
-               unpack ${A}
-       fi
-       # fix list problem
-       epatch "${FILESDIR}"/${P}-arrayobject.patch
-       # fix skips of acosh, asinh
-       epatch "${FILESDIR}"/${P}-umath.patch
-       # fix eigenvalue hang
-       epatch "${FILESDIR}"/${P}-eigen.patch
-       # adapt lapack support
-       if use lapack; then
-               epatch "${FILESDIR}"/${P}-lapack.patch
-               if  [[ ${FORTRANC} == gfortran ]]; then
-                       sed -i -e 's:g2c:gfortran:g' ${S}/customize.py
-               fi
-       fi
-}
-
-src_install() {
-       distutils_src_install
-       distutils_python_version
-
-       # Numerical Tutorial is nice for testing and learning
-       insinto /usr/$(get_libdir)/python${PYVER}/site-packages/NumTut
-       doins Demo/NumTut/*
-
-       # install various doc from packages
-       docinto FFT
-       dodoc Packages/FFT/MANIFEST
-       docinto MA
-       dodoc Packages/MA/{MANIFEST,README}
-       docinto RNG
-       dodoc Packages/RNG/{MANIFEST,README}
-       docinto lapack_lite
-       dodoc Misc/lapack_lite/README
-       if use lapack; then
-               docinto dotblas
-               dodoc Packages/dotblas/{README,profileDot}.txt
-               insinto /usr/share/doc/${PF}/dotblas
-               doins Packages/dotblas/profileDot.py
-       fi
-}

diff --git a/dev-python/numeric/numeric-24.2-r1.ebuild b/dev-python/numeric/numeric-24.2-r3.ebuild
similarity index 51%
rename from dev-python/numeric/numeric-24.2-r1.ebuild
rename to dev-python/numeric/numeric-24.2-r3.ebuild
index 79aff0bd53fa7ed2f6dbce17b0e15e758444db79..f81371bfadefa67e1090a63f26200498a9a8b9d9 100644 (file)
--- a/dev-python/numeric/numeric-24.2-r1.ebuild
+++ b/dev-python/numeric/numeric-24.2-r3.ebuild
@@ -1,49 +1,60 @@
 # 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-r1.ebuild,v 1.1 2007/02/07 17:14:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r3.ebuild,v 1.1 2007/02/23 23:43:05 bicatali Exp $
+
+NEED_PYTHON=2.3
 
 inherit distutils eutils
 
 MY_P=Numeric-${PV}
-S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Numerical multidimensional array language facility for Python."
 HOMEPAGE="http://numeric.scipy.org/"
-SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz
+       doc? ( http://numpy.scipy.org/numpy.pdf )"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3"
+IUSE="doc"
 
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
        unpack ${A}
+
+       use doc && cp "${DISTDIR}"/numpy.pdf ${S}/
+
        # fix list problem
        epatch "${FILESDIR}"/${P}-arrayobject.patch
        # fix skips of acosh, asinh
        epatch "${FILESDIR}"/${P}-umath.patch
        # fix eigenvalue hang
        epatch "${FILESDIR}"/${P}-eigen.patch
+       # fix a bug in the test
+       epatch "${FILESDIR}"/${P}-test.patch
+       # fix for python-2.5
+       epatch "${FILESDIR}"/${P}-python25.patch
+}
+
+src_test() {
+       cd build/lib*
+       PYTHONPATH=. "${python}" "${S}"/Test/test.py \
+               || die "test failed"
 }
 
 src_install() {
        distutils_src_install
        distutils_python_version
 
-       # Numerical Tutorial is nice for testing and learning
-       insinto /usr/$(get_libdir)/python${PYVER}/site-packages/NumTut
-       doins Demo/NumTut/*
-
-       # install various doc from packages
-       docinto FFT
-       dodoc Packages/FFT/MANIFEST
-       docinto MA
-       dodoc Packages/MA/{MANIFEST,README}
-       docinto RNG
-       dodoc Packages/RNG/{MANIFEST,README}
-       docinto lapack_lite
-       dodoc Misc/lapack_lite/README
+       # install various README from packages
+       newdoc Packages/MA/README README.MA
+       newdoc Packages/RNG/README README.RNG
+
+       # install tutorial and docs
+       if use doc; then
+               insinto /usr/share/doc/${PF}
+               doins -r Test Demo/NumTut || die
+               newins "${S}"/numpy.pdf numeric.pdf || die
+       fi
 }

diff --git a/dev-python/numeric/numeric-24.2-r4.ebuild b/dev-python/numeric/numeric-24.2-r4.ebuild
new file mode 100644 (file)
index 0000000..d31200c
--- /dev/null
+++ b/dev-python/numeric/numeric-24.2-r4.ebuild
@@ -0,0 +1,109 @@
+# 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-r4.ebuild,v 1.1 2007/02/23 23:43:05 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils eutils fortran
+
+MY_P=Numeric-${PV}
+
+DESCRIPTION="Numerical multidimensional array language facility for Python."
+HOMEPAGE="http://numeric.scipy.org/"
+SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz
+       doc? ( http://numpy.scipy.org/numpy.pdf )"
+
+# numeric does not work yet with other cblas implementations
+# than cblas-reference or blas-atlas (work in progress)
+RDEPEND="lapack? ( || ( sci-libs/blas-atlas sci-libs/cblas-reference )
+                                  virtual/lapack )"
+DEPEND="${RDEPEND}
+       lapack? ( app-admin/eselect-cblas )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc lapack"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       if use lapack; then
+               FORTRAN="gfortran g77"
+               fortran_pkg_setup
+               for d in $(eselect cblas show); do mycblas=${d}; done
+               if [[ -z "${mycblas/reference/}" ]] && [[ -z "${mycblas/atlas/}" ]]; then
+                       ewarn "You need to set cblas to atlas or reference. Do:"
+                       ewarn "   eselect cblas set <impl>"
+                       ewarn "where <impl> is atlas, threaded-atlas or reference"
+                       die "setup failed"
+               fi
+       fi
+}
+
+src_unpack() {
+       if use lapack; then
+               fortran_src_unpack
+       else
+               unpack ${A}
+       fi
+       use doc && cp "${DISTDIR}"/numpy.pdf ${S}/
+
+       # fix list problem
+       epatch "${FILESDIR}"/${P}-arrayobject.patch
+       # fix skips of acosh, asinh
+       epatch "${FILESDIR}"/${P}-umath.patch
+       # fix eigenvalue hang
+       epatch "${FILESDIR}"/${P}-eigen.patch
+       # fix a bug in the test
+       epatch "${FILESDIR}"/${P}-test.patch
+       # fix for python-2.5
+       epatch "${FILESDIR}"/${P}-python25.patch
+
+       # adapt lapack support
+       if use lapack; then
+               epatch "${FILESDIR}"/${P}-lapack.patch
+               if  [[ "${FORTRANC}" == gfortran ]]; then
+                       sed -i -e 's:g2c:gfortran:g' customize.py
+               fi
+               [[ "${mycblas}" == reference ]] && \
+                       sed -i \
+                       -e "s:'atlas',::g" \
+                       -e "s:include/atlas:include/cblas:g" \
+                       cusomize.py
+       fi
+}
+
+#src_compile() {
+#      use lapack && unset LDFLAGS
+#      distutils_src_compile
+#}
+
+src_test() {
+       cd build/lib*
+       PYTHONPATH=. "${python}" "${S}"/Test/test.py \
+               || die "test failed"
+}
+
+src_install() {
+       distutils_src_install
+       distutils_python_version
+
+       # install various README from packages
+       newdoc Packages/MA/README README.MA
+       newdoc Packages/RNG/README README.RNG
+
+       if use lapack; then
+               docinto dotblas
+               dodoc Packages/dotblas/{README,profileDot}.txt
+               insinto /usr/share/doc/${PF}/dotblas
+               doins Packages/dotblas/profileDot.py
+       fi
+
+       # install tutorial and docs
+       if use doc; then
+               insinto /usr/share/doc/${PF}
+               doins -r Test Demo/NumTut || die
+               newins "${S}"/numpy.pdf numeric.pdf || die
+       fi
+}