numeric: fix for 2.5

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@723 32389bae-6d03-0410-99cf-db05cde120eb

5 files changed, 32 insertions, 55 deletions

diff --git a/dev-python/numeric/Manifest b/dev-python/numeric/Manifest
index a7d883c81..9c39f61a9 100644
--- a/dev-python/numeric/Manifest
+++ b/dev-python/numeric/Manifest
@@ -2,10 +2,6 @@ AUX numeric-24.2-arrayobject.patch 630 RMD160 00add561a044df4840bed49df706708bb3
 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-arrayobject.patch.old 610 RMD160 fa5781e9cb319e300574806a4dd233190134d503 SHA1 927a8e5d814088863e2a0abf52d8f78a1a08871b SHA256 21882b663253b7f497e73489af4fee7d8e42428e275214eff798d90278dab738
-MD5 796989001bd05eef01191bb89e13bdd7 files/numeric-24.2-arrayobject.patch.old 610
-RMD160 fa5781e9cb319e300574806a4dd233190134d503 files/numeric-24.2-arrayobject.patch.old 610
-SHA256 21882b663253b7f497e73489af4fee7d8e42428e275214eff798d90278dab738 files/numeric-24.2-arrayobject.patch.old 610
 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
@@ -18,14 +14,10 @@ AUX numeric-24.2-lapack.patch 905 RMD160 8067c71400af3e76d9e1b63e6a542fa36f77486
 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 7032 RMD160 b99755e919c92d36d6a1b358df58d6c6d112c4f3 SHA1 426752f4abaef0271a4320cd070c2b1c7f8fe256 SHA256 c80e2abb1e243cde24027a0c18de66135d97bbee9fdabf3a2ca371b03d38731a
-MD5 6b2b34c5150604373243e5fa6899dc69 files/numeric-24.2-python25.patch 7032
-RMD160 b99755e919c92d36d6a1b358df58d6c6d112c4f3 files/numeric-24.2-python25.patch 7032
-SHA256 c80e2abb1e243cde24027a0c18de66135d97bbee9fdabf3a2ca371b03d38731a files/numeric-24.2-python25.patch 7032
-AUX numeric-24.2-python25.patch.old 270 RMD160 db415e2392c75e2512bf2d1cbf2e48a803f4bf58 SHA1 19c5d87fb92e75f6ed8a4ad099dffb050721c522 SHA256 026cdfc2765791cebc69aaeb0f1eb9d8f9cae7925831684959b60673f54ec8f0
-MD5 61be7f76ced6e5ae8400b3fe87f2383f files/numeric-24.2-python25.patch.old 270
-RMD160 db415e2392c75e2512bf2d1cbf2e48a803f4bf58 files/numeric-24.2-python25.patch.old 270
-SHA256 026cdfc2765791cebc69aaeb0f1eb9d8f9cae7925831684959b60673f54ec8f0 files/numeric-24.2-python25.patch.old 270
+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
@@ -40,10 +32,10 @@ EBUILD numeric-24.2-r5.ebuild 1626 RMD160 1ca211c04b3d42bb2459e23015600ca7afdc2b
 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 2937 RMD160 ef096e14a90cfe9a92deec6fb2b223dff0937068 SHA1 59c611bbdc8ccdca09ffa9150737c70d4779941d SHA256 46d2b879e317f67d882f98e160cc29357720d04e965e90ecc95db293d73b3223
-MD5 1397ad6571e3640ab3ab3f85db75c436 numeric-24.2-r6.ebuild 2937
-RMD160 ef096e14a90cfe9a92deec6fb2b223dff0937068 numeric-24.2-r6.ebuild 2937
-SHA256 46d2b879e317f67d882f98e160cc29357720d04e965e90ecc95db293d73b3223 numeric-24.2-r6.ebuild 2937
+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
diff --git a/dev-python/numeric/files/numeric-24.2-arrayobject.patch.old b/dev-python/numeric/files/numeric-24.2-arrayobject.patch.old
deleted file mode 100644
index b17fc7a8a..000000000
--- a/dev-python/numeric/files/numeric-24.2-arrayobject.patch.old
+++ /dev/null
@@ -1,20 +0,0 @@
---- Numeric-24.2/Src/arrayobject.c	2005-11-11 07:30:18.000000000 +0000
-+++ 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);
- 	PyList_SetItem(lp, i, PyArray_ToList(v));
--	if (((PyArrayObject *)self)->nd>1){
-+	if (((PyArrayObject *)self)->nd>0){
- 	    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-python25.patch b/dev-python/numeric/files/numeric-24.2-python25.patch
index eae8aabbd..05962f1a0 100644
--- a/dev-python/numeric/files/numeric-24.2-python25.patch
+++ b/dev-python/numeric/files/numeric-24.2-python25.patch
@@ -196,3 +196,24 @@ diff -Nur Numeric-24.2/Src/ufuncobject.c Numeric-24.2.new/Src/ufuncobject.c
  
      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-python25.patch.old b/dev-python/numeric/files/numeric-24.2-python25.patch.old
deleted file mode 100644
index 8f29e60fe..000000000
--- a/dev-python/numeric/files/numeric-24.2-python25.patch.old
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/numeric-24.2-r6.ebuild b/dev-python/numeric/numeric-24.2-r6.ebuild
index 5b1339163..acc3da6a6 100644
--- a/dev-python/numeric/numeric-24.2-r6.ebuild
+++ b/dev-python/numeric/numeric-24.2-r6.ebuild
@@ -13,8 +13,8 @@ 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)
+# 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 )"
@@ -30,7 +30,7 @@ S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	if use lapack; then
-		FORTRAN="gfortran g77"
+		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
@@ -78,11 +78,6 @@ src_unpack() {
 	fi
 }
 
-#src_compile() {
-#	use lapack && unset LDFLAGS
-#	distutils_src_compile
-#}
-
 src_test() {
 	cd build/lib*
 	PYTHONPATH=. "${python}" "${S}"/Test/test.py \
@@ -91,7 +86,6 @@ src_test() {
 
 src_install() {
 	distutils_src_install
-	distutils_python_version
 
 	# install various README from packages
 	newdoc Packages/MA/README README.MA