diff options
author | bicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb> | 2007-09-01 22:29:07 +0000 |
---|---|---|
committer | bicatali <bicatali@32389bae-6d03-0410-99cf-db05cde120eb> | 2007-09-01 22:29:07 +0000 |
commit | 62f5eb0ce999e1e901d5a1d8c5f53d5a65b33baf (patch) | |
tree | e7529a9977389980e64b18768711b8dd58a9eeb2 | |
parent | numeric: fix for 2.5 (diff) | |
download | sci-62f5eb0ce999e1e901d5a1d8c5f53d5a65b33baf.tar.gz sci-62f5eb0ce999e1e901d5a1d8c5f53d5a65b33baf.tar.bz2 sci-62f5eb0ce999e1e901d5a1d8c5f53d5a65b33baf.zip |
delete numeric, now in main tree
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@724 32389bae-6d03-0410-99cf-db05cde120eb
-rw-r--r-- | dev-python/numeric/ChangeLog | 7 | ||||
-rw-r--r-- | dev-python/numeric/Manifest | 52 | ||||
-rw-r--r-- | dev-python/numeric/files/digest-numeric-24.2-r5 | 6 | ||||
-rw-r--r-- | dev-python/numeric/files/digest-numeric-24.2-r6 | 6 | ||||
-rw-r--r-- | dev-python/numeric/files/numeric-24.2-arrayobject.patch | 22 | ||||
-rw-r--r-- | dev-python/numeric/files/numeric-24.2-dotblas.patch | 107 | ||||
-rw-r--r-- | dev-python/numeric/files/numeric-24.2-eigen.patch | 11 | ||||
-rw-r--r-- | dev-python/numeric/files/numeric-24.2-lapack.patch | 29 | ||||
-rw-r--r-- | dev-python/numeric/files/numeric-24.2-python25.patch | 219 | ||||
-rw-r--r-- | dev-python/numeric/files/numeric-24.2-test.patch | 12 | ||||
-rw-r--r-- | dev-python/numeric/files/numeric-24.2-umath.patch | 14 | ||||
-rw-r--r-- | dev-python/numeric/metadata.xml | 13 | ||||
-rw-r--r-- | dev-python/numeric/numeric-24.2-r5.ebuild | 63 | ||||
-rw-r--r-- | dev-python/numeric/numeric-24.2-r6.ebuild | 107 |
14 files changed, 0 insertions, 668 deletions
diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog deleted file mode 100644 index bb02a9278..000000000 --- a/dev-python/numeric/ChangeLog +++ /dev/null @@ -1,7 +0,0 @@ -# ChangeLog for dev-python/numeric -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 25 May 2007; Sébastien Fabbro <bicatali@gentoo.org> ChangeLog: - various new patches to work with python 2.5 - diff --git a/dev-python/numeric/Manifest b/dev-python/numeric/Manifest deleted file mode 100644 index 9c39f61a9..000000000 --- a/dev-python/numeric/Manifest +++ /dev/null @@ -1,52 +0,0 @@ -AUX numeric-24.2-arrayobject.patch 630 RMD160 00add561a044df4840bed49df706708bb3c85178 SHA1 8da1e215a7760abc1f3b3df9b6b1a544dc69f59b SHA256 9652cffec96baa342bc4e53a75d95b7038263d8e76e8dec9085b782fdaa9079f -MD5 37857689a145ddca1cf10418eba0aa70 files/numeric-24.2-arrayobject.patch 630 -RMD160 00add561a044df4840bed49df706708bb3c85178 files/numeric-24.2-arrayobject.patch 630 -SHA256 9652cffec96baa342bc4e53a75d95b7038263d8e76e8dec9085b782fdaa9079f files/numeric-24.2-arrayobject.patch 630 -AUX numeric-24.2-dotblas.patch 4295 RMD160 eda25e00227050fdd0f5f62258b5342b6a54ac4d SHA1 d47f6e589023de98a2036b9c5d33fdc0e5af9a03 SHA256 cb5a1a22da63af53af3ace3998b75af73013a16ce6938a941f68eba154dbd421 -MD5 1f5e3db3e934216652663cf170cc37e3 files/numeric-24.2-dotblas.patch 4295 -RMD160 eda25e00227050fdd0f5f62258b5342b6a54ac4d files/numeric-24.2-dotblas.patch 4295 -SHA256 cb5a1a22da63af53af3ace3998b75af73013a16ce6938a941f68eba154dbd421 files/numeric-24.2-dotblas.patch 4295 -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 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 7670 RMD160 ee21e4e91f7d56e05729f6f402509ea6209e2e0c SHA1 faaf15d6ab86719ec09ff58a8a8fe89eeb1a04df SHA256 b47d001aad57dec7bb0914307bbd7262692809fb2e48e1830fa5ae62e49e9e89 -MD5 8f9a248a8309259d22ca6cd8f99ecad4 files/numeric-24.2-python25.patch 7670 -RMD160 ee21e4e91f7d56e05729f6f402509ea6209e2e0c files/numeric-24.2-python25.patch 7670 -SHA256 b47d001aad57dec7bb0914307bbd7262692809fb2e48e1830fa5ae62e49e9e89 files/numeric-24.2-python25.patch 7670 -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 -SHA256 00f41e3fb05b9e26daf200a0bc1397d36055590b1ccb416c33ac76464d08a36c files/numeric-24.2-umath.patch 357 -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-24.2-r5.ebuild 1626 RMD160 1ca211c04b3d42bb2459e23015600ca7afdc2ba2 SHA1 7fca4ab5b1a4cbf6495ca74dbe4c0016e6e4e5a8 SHA256 5cad91e8d30e0e05ae9a8a666ce8b717000a711329b75b06738fe8cac76cfe1a -MD5 6a088ebf5140a93d6332160e0cb43b15 numeric-24.2-r5.ebuild 1626 -RMD160 1ca211c04b3d42bb2459e23015600ca7afdc2ba2 numeric-24.2-r5.ebuild 1626 -SHA256 5cad91e8d30e0e05ae9a8a666ce8b717000a711329b75b06738fe8cac76cfe1a numeric-24.2-r5.ebuild 1626 -EBUILD numeric-24.2-r6.ebuild 2846 RMD160 a76a7ad253062ab5bade4074a89239e0fad215b8 SHA1 c6fe47ab11d5c2bf66773d5aa8b50a124531b232 SHA256 3fe53daaff15af0612d058890ca624c6655974ae90d30272dc0da7a0fbb45d6c -MD5 01c461fcc065a12d0db64d94bfb6d2fb numeric-24.2-r6.ebuild 2846 -RMD160 a76a7ad253062ab5bade4074a89239e0fad215b8 numeric-24.2-r6.ebuild 2846 -SHA256 3fe53daaff15af0612d058890ca624c6655974ae90d30272dc0da7a0fbb45d6c numeric-24.2-r6.ebuild 2846 -MISC ChangeLog 232 RMD160 25330c5511731dbc2a03dac84f985f1510c03c10 SHA1 673e3dd51ef208c12fe24f045d6cab98aa36a428 SHA256 dcf84de802bc08a83b1385e69e4586752fb295698ae3a5716636d99490f38fcf -MD5 0afc6a689a62c1ab8fb7eb3fee4c5f82 ChangeLog 232 -RMD160 25330c5511731dbc2a03dac84f985f1510c03c10 ChangeLog 232 -SHA256 dcf84de802bc08a83b1385e69e4586752fb295698ae3a5716636d99490f38fcf ChangeLog 232 -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 5b52da6bca1f3b07ef1a321554066b0a files/digest-numeric-24.2-r5 449 -RMD160 41afdea026a2ba6459df18713c94ceb6466ddd21 files/digest-numeric-24.2-r5 449 -SHA256 9b7f723450199e5eb5d4816af0d7504bee35ae64f9219f5b939a0cbf07470cff files/digest-numeric-24.2-r5 449 -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 diff --git a/dev-python/numeric/files/digest-numeric-24.2-r5 b/dev-python/numeric/files/digest-numeric-24.2-r5 deleted file mode 100644 index 440987276..000000000 --- a/dev-python/numeric/files/digest-numeric-24.2-r5 +++ /dev/null @@ -1,6 +0,0 @@ -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-r6 b/dev-python/numeric/files/digest-numeric-24.2-r6 deleted file mode 100644 index 440987276..000000000 --- a/dev-python/numeric/files/digest-numeric-24.2-r6 +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index a761f8233..000000000 --- a/dev-python/numeric/files/numeric-24.2-arrayobject.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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: arrayobject.c,v 1.107 2005/11/09 19:43:39 teoliphant Exp $ */ -+/* $Id: arrayobject.c,v 1.108 2006/03/10 04:55:59 teoliphant Exp $ */ - - #include "Python.h" - #include <stddef.h> -@@ -1866,9 +1866,7 @@ - for (i=0; i<sz; i++) { - v=array_item((PyArrayObject *)self, i); - PyList_SetItem(lp, i, PyArray_ToList(v)); -- if (((PyArrayObject *)self)->nd>1){ -- Py_DECREF(v); -- } -+ Py_DECREF(v); - } - - return lp; diff --git a/dev-python/numeric/files/numeric-24.2-dotblas.patch b/dev-python/numeric/files/numeric-24.2-dotblas.patch deleted file mode 100644 index 70dcd927c..000000000 --- a/dev-python/numeric/files/numeric-24.2-dotblas.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- Numeric-24.2/Packages/dotblas/dotblas/_dotblas.c.orig 2005-04-07 06:15:47.000000000 +0100 -+++ Numeric-24.2/Packages/dotblas/dotblas/_dotblas.c 2007-05-25 17:39:30.382025500 +0100 -@@ -52,7 +52,7 @@ - static PyObject *dotblas_matrixproduct(PyObject *dummy, PyObject *args) { - PyObject *op1, *op2; - PyArrayObject *ap1, *ap2, *ret; -- int i, j, l, lda, ldb, matchDim = -1, otherDim = -1; -+ int i, j, l, lda, ldb, ldc, matchDim = -1, otherDim = -1; - int typenum; - int dimensions[MAX_DIMS], nd; - static const float oneF[2] = {1.0, 0.0}; -@@ -248,33 +248,34 @@ - /* Matrix matrix multiplication -- Level 3 BLAS */ - lda = (ap1->dimensions[1] > 1 ? ap1->dimensions[1] : 1); - ldb = (ap2->dimensions[1] > 1 ? ap2->dimensions[1] : 1); -+ ldc = (ret->dimensions[1] > 1 ? ret->dimensions[1] : 1); - if (typenum == PyArray_DOUBLE) { - cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, - ap1->dimensions[0], ap2->dimensions[1], ap2->dimensions[0], - 1.0, (double *)ap1->data, lda, - (double *)ap2->data, ldb, -- 0.0, (double *)ret->data, ldb); -+ 0.0, (double *)ret->data, ldc); - } - else if (typenum == PyArray_FLOAT) { - cblas_sgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, - ap1->dimensions[0], ap2->dimensions[1], ap2->dimensions[0], - 1.0, (float *)ap1->data, lda, - (float *)ap2->data, ldb, -- 0.0, (float *)ret->data, ldb); -+ 0.0, (float *)ret->data, ldc); - } - else if (typenum == PyArray_CDOUBLE) { - cblas_zgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, - ap1->dimensions[0], ap2->dimensions[1], ap2->dimensions[0], - oneD, (double *)ap1->data, lda, - (double *)ap2->data, ldb, -- zeroD, (double *)ret->data, ldb); -+ zeroD, (double *)ret->data, ldc); - } - else if (typenum == PyArray_CFLOAT) { - cblas_cgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, - ap1->dimensions[0], ap2->dimensions[1], ap2->dimensions[0], - oneF, (float *)ap1->data, lda, - (float *)ap2->data, ldb, -- zeroF, (float *)ret->data, ldb); -+ zeroF, (float *)ret->data, ldc); - } - } - else { -@@ -334,7 +335,7 @@ - static PyObject *dotblas_innerproduct(PyObject *dummy, PyObject *args) { - PyObject *op1, *op2; - PyArrayObject *ap1, *ap2, *ret; -- int i, j, l, lda, ldb; -+ int i, j, l, lda, ldb, ldc; - int typenum; - int dimensions[MAX_DIMS], nd; - static const float oneF[2] = {1.0, 0.0}; -@@ -525,33 +526,34 @@ - /* Matrix matrix multiplication -- Level 3 BLAS */ - lda = (ap1->dimensions[1] > 1 ? ap1->dimensions[1] : 1); - ldb = (ap2->dimensions[1] > 1 ? ap2->dimensions[1] : 1); -+ ldc = (ret->dimensions[1] > 1 ? ret->dimensions[1] : 1); - if (typenum == PyArray_DOUBLE) { - cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasTrans, - ap1->dimensions[0], ap2->dimensions[0], ap1->dimensions[1], - 1.0, (double *)ap1->data, lda, - (double *)ap2->data, ldb, -- 0.0, (double *)ret->data, ldb); -+ 0.0, (double *)ret->data, ldc); - } - else if (typenum == PyArray_FLOAT) { - cblas_sgemm(CblasRowMajor, CblasNoTrans, CblasTrans, - ap1->dimensions[0], ap2->dimensions[0], ap1->dimensions[1], - 1.0, (float *)ap1->data, lda, - (float *)ap2->data, ldb, -- 0.0, (float *)ret->data, ldb); -+ 0.0, (float *)ret->data, ldc); - } - else if (typenum == PyArray_CDOUBLE) { - cblas_zgemm(CblasRowMajor, CblasNoTrans, CblasTrans, - ap1->dimensions[0], ap2->dimensions[0], ap1->dimensions[1], - oneD, (double *)ap1->data, lda, - (double *)ap2->data, ldb, -- zeroD, (double *)ret->data, ldb); -+ zeroD, (double *)ret->data, ldc); - } - else if (typenum == PyArray_CFLOAT) { - cblas_cgemm(CblasRowMajor, CblasNoTrans, CblasTrans, - ap1->dimensions[0], ap2->dimensions[0], ap1->dimensions[1], - oneF, (float *)ap1->data, lda, - (float *)ap2->data, ldb, -- zeroF, (float *)ret->data, ldb); -+ zeroF, (float *)ret->data, ldc); - } - } - else { -@@ -703,7 +705,7 @@ - /* Add some symbolic constants to the module */ - d = PyModule_GetDict(m); - -- s = PyString_FromString("$Id: _dotblas.c,v 1.3 2005/04/06 22:40:23 dmcooke Exp $"); -+ s = PyString_FromString("$Id: _dotblas.c,v 1.4 2005/11/29 18:54:12 teoliphant Exp $"); - PyDict_SetItemString(d, "__version__", s); - Py_DECREF(s); - diff --git a/dev-python/numeric/files/numeric-24.2-eigen.patch b/dev-python/numeric/files/numeric-24.2-eigen.patch deleted file mode 100644 index 331d0f11a..000000000 --- a/dev-python/numeric/files/numeric-24.2-eigen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Numeric-24.2/Src/dlamch.c.fix-dlamc3 2006-10-29 22:30:52.000000000 -0500 -+++ Numeric-24.2/Src/dlamch.c 2006-10-29 22:31:00.000000000 -0500 -@@ -672,7 +672,7 @@ - */ - /* >>Start of File<< - System generated locals */ -- doublereal ret_val; -+ volatile doublereal ret_val; - - - diff --git a/dev-python/numeric/files/numeric-24.2-lapack.patch b/dev-python/numeric/files/numeric-24.2-lapack.patch deleted file mode 100644 index 926deb6d9..000000000 --- a/dev-python/numeric/files/numeric-24.2-lapack.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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. - --use_system_lapack = 0 -+use_system_lapack = 1 - lapack_library_dirs = [] --lapack_libraries = [] -+lapack_libraries = ['lapack'] - lapack_extra_link_args = [] - - # Example: using ATLAS -@@ -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 --use_dotblas = 0 --dotblas_include_dirs = [] -+use_dotblas = 1 -+dotblas_include_dirs = ['/usr/include/atlas'] - dotblas_cblas_header = '<cblas.h>' - dotblas_library_dirs = lapack_library_dirs --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 deleted file mode 100644 index 05962f1a0..000000000 --- a/dev-python/numeric/files/numeric-24.2-python25.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -Nur Numeric-24.2/Src/arrayobject.c Numeric-24.2.new/Src/arrayobject.c ---- Numeric-24.2/Src/arrayobject.c 2007-05-25 18:34:55.000000000 +0100 -+++ Numeric-24.2.new/Src/arrayobject.c 2007-05-25 18:34:04.000000000 +0100 -@@ -12,7 +12,7 @@ - performance for heterogeneity. - */ - --/* $Id: arrayobject.c,v 1.108 2006/03/10 04:55:59 teoliphant Exp $ */ -+/* $Id: arrayobject.c,v 1.107 2005/11/09 19:43:39 teoliphant Exp $ */ - - #include "Python.h" - #include <stddef.h> -@@ -491,7 +491,8 @@ - - static PyObject * PyArray_Resize(PyArrayObject *self, PyObject *shape) { - size_t oldsize, newsize; -- int new_nd, k, sd, n, elsize; -+ int sd, n, elsize; -+ Py_ssize_t new_nd, k; - int refcnt; - int new_dimensions[MAX_DIMS]; - int new_strides[MAX_DIMS]; -@@ -776,7 +777,7 @@ - - if ((item = index2ptr(self, i)) == NULL) return -1; - -- if(self->descr->type_num != PyArray_OBJECT && PyString_Check(v) && PyObject_Length(v) == 1) { -+ if(self->descr->type_num != PyArray_OBJECT && PyString_Check(v) && PyObject_Length(v) == (Py_ssize_t)1) { - char *s; - if ((s=PyString_AsString(v)) == NULL) return -1; - if(self->descr->type == 'c') { -@@ -823,7 +824,7 @@ - - /* This is basically PySlice_GetIndicesEx, but with our coercion - * of indices to integers (plus, that function is new in Python 2.3) */ --static int -+static Py_ssize_t - slice_GetIndices(PySliceObject *r, int length, - int *start, int *stop, int *step, - int *slicelength) -@@ -925,8 +926,8 @@ - - static int parse_index(PyArrayObject *self, PyObject *op, - int *dimensions, int *strides, int *offset_ptr) { -- int i, j, n; -- int nd_old, nd_new, start, offset, n_add, n_pseudo; -+ Py_ssize_t i, n, j, n_add, n_pseudo; -+ int nd_old, nd_new, start, offset; - int step_size, n_steps; - PyObject *op1=NULL; - int is_slice; -@@ -1098,7 +1099,7 @@ - } - - static PyMappingMethods array_as_mapping = { -- (inquiry)array_length, /*mp_length*/ -+ (lenfunc)array_length, /*mp_length*/ - (binaryfunc)array_subscript_nice, /*mp_subscript*/ - (objobjargproc)array_ass_sub, /*mp_ass_subscript*/ - }; -@@ -1183,10 +1184,10 @@ - } - - static PyBufferProcs array_as_buffer = { -- (getreadbufferproc)array_getreadbuf, /*bf_getreadbuffer*/ -- (getwritebufferproc)array_getwritebuf, /*bf_getwritebuffer*/ -- (getsegcountproc)array_getsegcount, /*bf_getsegcount*/ -- (getcharbufferproc)array_getcharbuf, /*bf_getcharbuffer*/ -+ (readbufferproc)array_getreadbuf, /*bf_getreadbuffer*/ -+ (writebufferproc)array_getwritebuf, /*bf_getwritebuffer*/ -+ (segcountproc)array_getsegcount, /*bf_getsegcount*/ -+ (charbufferproc)array_getcharbuf, /*bf_getcharbuffer*/ - }; - /* End methods added by Scott N. Gunyan for buffer extension */ - -@@ -1595,7 +1596,7 @@ - (unaryfunc)array_negative, - (unaryfunc)PyArray_Copy, /*nb_pos*/ - (unaryfunc)array_absolute, /*(unaryfunc)array_abs,*/ -- (inquiry)array_nonzero, /*nb_nonzero*/ -+ (lenfunc)array_nonzero, /*nb_nonzero*/ - (unaryfunc)array_invert, /*nb_invert*/ - (binaryfunc)array_left_shift, /*nb_lshift*/ - (binaryfunc)array_right_shift, /*nb_rshift*/ -@@ -1634,13 +1635,13 @@ - }; - - static PySequenceMethods array_as_sequence = { -- (inquiry)array_length, /*sq_length*/ -+ (lenfunc)array_length, /*sq_length*/ - (binaryfunc)NULL, /*nb_add, concat is numeric add*/ -- (intargfunc)NULL, /*nb_multiply, repeat is numeric multiply*/ -- (intargfunc)array_item_nice, /*sq_item*/ -- (intintargfunc)array_slice, /*sq_slice*/ -- (intobjargproc)array_ass_item, /*sq_ass_item*/ -- (intintobjargproc)array_ass_slice, /*sq_ass_slice*/ -+ (ssizeargfunc)NULL, /*nb_multiply, repeat is numeric multiply*/ -+ (ssizeargfunc)array_item_nice, /*sq_item*/ -+ (ssizessizeargfunc)array_slice, /*sq_slice*/ -+ (ssizeobjargproc)array_ass_item, /*sq_ass_item*/ -+ (ssizessizeobjargproc)array_ass_slice, /*sq_ass_slice*/ - }; - - /* -------------------------------------------------------------- */ -@@ -2426,7 +2427,7 @@ - - #if PY_VERSION_HEX >= 0x02010000 - (traverseproc)0L, -- (inquiry)0L, -+ (lenfunc)0L, - (richcmpfunc)array_richcompare, /*tp_richcompfunc*/ - offsetof(PyArrayObject, weakreflist), /*tp_weaklistoffset */ - #endif -@@ -2463,7 +2464,8 @@ - - static int discover_dimensions(PyObject *s, int nd, int *d, int check_it) { - PyObject *e; -- int r, n, i, n_lower; -+ int r, n_lower; -+ Py_ssize_t i, n; - - n=PyObject_Length(s); - *d = n; -@@ -2501,7 +2503,7 @@ - static int - array_objecttype(PyObject *op, int minimum_type, int savespaceflag, int max) - { -- int l; -+ Py_ssize_t l; - PyObject *ip; - int result; - PyArray_Descr* descr; -@@ -2593,7 +2595,9 @@ - - static int Assign_Array(PyArrayObject *self, PyObject *v) { - PyObject *e; -- int l, r; -+ int r; -+ Py_ssize_t l; -+ - - if (!PySequence_Check(v)) { - PyErr_SetString(PyExc_ValueError,"assignment from non-sequence"); -diff -Nur Numeric-24.2/Src/multiarraymodule.c Numeric-24.2.new/Src/multiarraymodule.c ---- Numeric-24.2/Src/multiarraymodule.c 2005-08-16 06:20:25.000000000 +0100 -+++ Numeric-24.2.new/Src/multiarraymodule.c 2007-05-25 18:28:35.000000000 +0100 -@@ -36,7 +36,8 @@ - extern PyObject *PyArray_Concatenate(PyObject *op) { - PyArrayObject *ret, **mps; - PyObject *otmp; -- int i, n, type_num, tmp, nd=0, new_dim; -+ int type_num, tmp, nd=0, new_dim; -+ Py_ssize_t i, n; - char *data; - - n = PySequence_Length(op); -@@ -284,7 +285,8 @@ - - - extern PyObject *PyArray_Choose(PyObject *ip, PyObject *op) { -- int i, n, *sizes, m, offset, elsize, type_num; -+ int *sizes, elsize, type_num; -+ Py_ssize_t i, n, m, offset; - char *ret_data; - PyArrayObject **mps, *ap, *ret; - PyObject *otmp; -@@ -1139,7 +1141,8 @@ - static char *kwlist[] = {"shape", "typecode", "savespace", NULL}; - PyObject *op; - PyArray_Descr *descr; -- int i, nd, n, dims[MAX_DIMS]; -+ int dims[MAX_DIMS]; -+ Py_ssize_t i, nd, n; - int sd; - char *data; - -@@ -1217,7 +1220,8 @@ - PyArrayObject *ret; - char type_char='l'; - char *type = &type_char, *dptr; -- int i, nd, n, dimensions[MAX_DIMS]; -+ int dimensions[MAX_DIMS]; -+ Py_ssize_t i, nd, n; - int savespace=0; - static char all_zero[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; - static char *kwlist[] = {"shape", "typecode", "savespace", NULL}; -diff -Nur Numeric-24.2/Src/ufuncobject.c Numeric-24.2.new/Src/ufuncobject.c ---- Numeric-24.2/Src/ufuncobject.c 2005-08-16 06:20:25.000000000 +0100 -+++ Numeric-24.2.new/Src/ufuncobject.c 2007-05-25 18:28:35.000000000 +0100 -@@ -272,7 +272,7 @@ - - int setup_matrices(PyUFuncObject *self, PyObject *args, PyUFuncGenericFunction *function, void **data, - PyArrayObject **mps, char *arg_types) { -- int nargs, i; -+ Py_ssize_t nargs, i; - - nargs = PyTuple_Size(args); - if ((nargs != self->nin) && (nargs != self->nin+self->nout)) { - -From: Daniel Drake <d.drake@mmm.com> - -Fix list slicing on python 2.5 - -Numeric.arange(0,10) was working fine but Numeric.arange(0,10)[:] was -returning nonsense. Using the correct data type fixes the problem. - -Index: Numeric-24.2/Src/arrayobject.c -=================================================================== ---- Numeric-24.2.orig/Src/arrayobject.c -+++ Numeric-24.2/Src/arrayobject.c -@@ -708,7 +708,7 @@ extern PyObject *PyArray_Return(PyArrayO - } - - static PyObject * --array_slice(PyArrayObject *self, int ilow, int ihigh) -+array_slice(PyArrayObject *self, Py_ssize_t ilow, Py_ssize_t ihigh) - { - PyArrayObject *r; - int l; diff --git a/dev-python/numeric/files/numeric-24.2-test.patch b/dev-python/numeric/files/numeric-24.2-test.patch deleted file mode 100644 index 837f7c645..000000000 --- a/dev-python/numeric/files/numeric-24.2-test.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/files/numeric-24.2-umath.patch b/dev-python/numeric/files/numeric-24.2-umath.patch deleted file mode 100644 index eb3d8b010..000000000 --- a/dev-python/numeric/files/numeric-24.2-umath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Numeric-24.2.orig/Src/umathmodule.c 2005-04-20 19:48:47.000000000 +0100 -+++ Numeric-24.2/Src/umathmodule.c 2006-10-10 16:16:40.000000000 +0100 -@@ -1,9 +1,9 @@ -- -+#include <math.h> - #include "Python.h" - #include "Numeric/arrayobject.h" - #include "Numeric/ufuncobject.h" - #include "abstract.h" --#include <math.h> -+ - - #ifndef CHAR_BIT - #define CHAR_BIT 8 diff --git a/dev-python/numeric/metadata.xml b/dev-python/numeric/metadata.xml deleted file mode 100644 index 4d6bae10a..000000000 --- a/dev-python/numeric/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?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 -processing. These objects facilitates processing for manny numerical -applications such as universal functions on arrays, FFTs and linear -algebra. This package is being superseeded by numpy, and now inactive, -but still used in various applications. -</longdescription> -</pkgmetadata> diff --git a/dev-python/numeric/numeric-24.2-r5.ebuild b/dev-python/numeric/numeric-24.2-r5.ebuild deleted file mode 100644 index 0218b2550..000000000 --- a/dev-python/numeric/numeric-24.2-r5.ebuild +++ /dev/null @@ -1,63 +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-r3.ebuild,v 1.1 2007/02/23 23:43:05 bicatali Exp $ - -NEED_PYTHON=2.3 - -inherit distutils eutils - -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 )" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -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 only for python-2.5 - python_version - [[ "${PYVER}" == 2.5 ]] && epatch "${FILESDIR}"/${P}-python25.patch - # fix for dotblas from uncommited cvs - epatch "${FILESDIR}"/${P}-dotblas.patch -} - -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 - - # 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-r6.ebuild b/dev-python/numeric/numeric-24.2-r6.ebuild deleted file mode 100644 index acc3da6a6..000000000 --- a/dev-python/numeric/numeric-24.2-r6.ebuild +++ /dev/null @@ -1,107 +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-r4.ebuild,v 1.3 2007/05/25 11:08:56 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 needs cblas (virtual/cblas work in progress) -# and lapack. needs fortran to get the proper fortran to C library. -RDEPEND="lapack? ( || ( >=sci-libs/blas-atlas-3.7.11-r1 - >=sci-libs/cblas-reference-20030223-r3 ) - 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 ifc" - 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 only for python-2.5 - python_version - [[ "${PYVER}" == 2.5 ]] && epatch "${FILESDIR}"/${P}-python25.patch - # fix for dotblas from uncommited cvs - epatch "${FILESDIR}"/${P}-dotblas.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" \ - customize.py - fi -} - -src_test() { - cd build/lib* - PYTHONPATH=. "${python}" "${S}"/Test/test.py \ - || die "test failed" -} - -src_install() { - distutils_src_install - - # 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 -} |