Added doc flag, bug #293525, thanks Denilson

(Portage version: 2.2_rc50/cvs/Linux x86_64)

10 files changed, 35 insertions, 1219 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index c615d984e654..0a4ae3823700 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.43 2009/09/04 21:31:22 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.44 2009/11/20 21:00:08 bicatali Exp $
+
+  20 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -scipy-0.6.0-r6.ebuild, -files/scipy-0.6.0-cdf.patch,
+  -files/scipy-0.6.0-fftw-fix.patch, -files/scipy-0.6.0-implicit.patch,
+  -files/scipy-0.6.0-ndimage.patch,
+  -files/scipy-0.6.0-python-2.6-c_abs.patch,
+  -files/scipy-0.6.0-randomkit.patch, -scipy-0.7.0.ebuild,
+  scipy-0.7.1.ebuild:
+  Added doc flag, bug #293525, thanks Denilson
 
   04 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   scipy-0.7.1.ebuild:
diff --git a/sci-libs/scipy/files/scipy-0.6.0-cdf.patch b/sci-libs/scipy/files/scipy-0.6.0-cdf.patch
deleted file mode 100644
index c9bb2dbbb5c7..000000000000
--- a/sci-libs/scipy/files/scipy-0.6.0-cdf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scipy/special/setup.py.orig	2007-09-11 18:11:04.457232054 +0100
-+++ scipy/special/setup.py	2007-09-11 18:09:23.103456231 +0100
-@@ -20,9 +20,9 @@
-     # Fortran libraries
-     config.add_library('mach',sources=[join('mach','*.f')],
-                        config_fc={'noopt':(__file__,1)})
--    config.add_library('toms',sources=[join('amos','*.f')])
--    config.add_library('amos',sources=[join('toms','*.f')])
--    config.add_library('cdf',sources=[join('cdflib','*.f')])
-+    config.add_library('toms',sources=[join('toms','*.f')])
-+    config.add_library('amos',sources=[join('amos','*.f')])
-+    config.add_library('cdflib',sources=[join('cdflib','*.f')])
-     config.add_library('specfun',sources=[join('specfun','*.f')])
- 
-     # Extension _cephes
-@@ -30,7 +30,7 @@
-                'toms_wrappers.c','cdf_wrappers.c','ufunc_extras.c']
-     config.add_extension('_cephes', sources=sources,
-                          libraries=['amos','toms','c_misc','cephes','mach',
--                                    'cdf', 'specfun'],
-+                                    'cdflib', 'specfun'],
-                          define_macros = define_macros
-                          )
-     # Extension specfun
diff --git a/sci-libs/scipy/files/scipy-0.6.0-fftw-fix.patch b/sci-libs/scipy/files/scipy-0.6.0-fftw-fix.patch
deleted file mode 100644
index 8db84dd8dcdd..000000000000
--- a/sci-libs/scipy/files/scipy-0.6.0-fftw-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur scipy-0.6.0/scipy/fftpack/src/zfftnd_fftw.c scipy-0.6.0-new/scipy/fftpack/src/zfftnd_fftw.c
---- scipy-0.6.0/scipy/fftpack/src/zfftnd_fftw.c	2007-09-22 03:56:38.000000000 -0400
-+++ scipy-0.6.0-new/scipy/fftpack/src/zfftnd_fftw.c	2007-10-05 09:20:19.000000000 -0400
-@@ -25,7 +25,7 @@
- 	  free(caches_zfftnd_fftw[id].dims);, 10)
- 
- 
--extern void zfftnd_mkl(complex_double * inout, int rank,
-+extern void zfftnd_fftw(complex_double * inout, int rank,
- 		       int *dims, int direction, int howmany,
- 		       int normalize)
- {
diff --git a/sci-libs/scipy/files/scipy-0.6.0-implicit.patch b/sci-libs/scipy/files/scipy-0.6.0-implicit.patch
deleted file mode 100644
index 8c1181342505..000000000000
--- a/sci-libs/scipy/files/scipy-0.6.0-implicit.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- scipy/linsolve/SuperLU/SRC/dcomplex.c	2007-09-22 03:55:18.000000000 -0400
-+++ scipy/linsolve/SuperLU/SRC/dcomplex.c	2008-07-03 08:04:15.000000000 -0400
-@@ -11,6 +11,7 @@
-  */
- #include <math.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include "dcomplex.h"
- 
- 
---- scipy/linsolve/SuperLU/SRC/scomplex.c	2007-09-22 03:55:18.000000000 -0400
-+++ scipy/linsolve/SuperLU/SRC/scomplex.c	2008-07-03 08:04:34.000000000 -0400
-@@ -11,6 +11,7 @@
-  */
- #include <math.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include "scomplex.h"
- 
- 
---- scipy/linsolve/SuperLU/SRC/xerbla.c	2007-09-22 03:55:18.000000000 -0400
-+++ scipy/linsolve/SuperLU/SRC/xerbla.c	2008-07-03 08:05:27.000000000 -0400
-@@ -1,3 +1,5 @@
-+#include <stdio.h>
-+
- /* Subroutine */ int xerbla_(char *srname, int *info)
- {
- /*  -- LAPACK auxiliary routine (version 2.0) --   
diff --git a/sci-libs/scipy/files/scipy-0.6.0-ndimage.patch b/sci-libs/scipy/files/scipy-0.6.0-ndimage.patch
deleted file mode 100644
index c5ee5b0fa442..000000000000
--- a/sci-libs/scipy/files/scipy-0.6.0-ndimage.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- scipy/ndimage/src/nd_image.h.orig	2008-01-21 01:20:06.010806667 +0000
-+++ scipy/ndimage/src/nd_image.h	2008-01-21 01:21:52.565386609 +0000
-@@ -273,12 +273,6 @@
-                                        NA_ByteOrder(), 1, 1);
- }
- 
--#define  NA_OutputArray (*(PyArrayObject* (*) (PyObject*,NumarrayType,int) ) (void *) NA_OutputArray)
--#define  NA_IoArray (*(PyArrayObject* (*) (PyObject*,NumarrayType,int) ) (void *) NA_IoArray)
--#define  NA_NewArray (*(PyArrayObject* (*) (void* buffer, NumarrayType, int, ...) ) (void *) NA_NewArray )
--#define  NA_elements (*(unsigned long (*) (PyArrayObject*) ) (void *) NA_elements)
--#define  NA_InputArray (*(PyArrayObject* (*) (PyObject*,NumarrayType,int) ) (void *) NA_InputArray)
--
- #endif /* ND_IMPORT_ARRAY */
- 
- #endif /* ND_IMAGE_H */
diff --git a/sci-libs/scipy/files/scipy-0.6.0-python-2.6-c_abs.patch b/sci-libs/scipy/files/scipy-0.6.0-python-2.6-c_abs.patch
deleted file mode 100644
index 569c108a5128..000000000000
--- a/sci-libs/scipy/files/scipy-0.6.0-python-2.6-c_abs.patch
+++ /dev/null
@@ -1,309 +0,0 @@
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cgsequ.c scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cgsequ.c
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cgsequ.c	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cgsequ.c	2008-11-11 17:32:10.000000000 +0100
-@@ -118,7 +118,7 @@
-     for (j = 0; j < A->ncol; ++j)
- 	for (i = Astore->colptr[j]; i < Astore->colptr[j+1]; ++i) {
- 	    irow = Astore->rowind[i];
--	    r[irow] = SUPERLU_MAX( r[irow], c_abs1(&Aval[i]) );
-+	    r[irow] = SUPERLU_MAX( r[irow], slu_c_abs1(&Aval[i]) );
- 	}
- 
-     /* Find the maximum and minimum scale factors. */
-@@ -153,7 +153,7 @@
-     for (j = 0; j < A->ncol; ++j)
- 	for (i = Astore->colptr[j]; i < Astore->colptr[j+1]; ++i) {
- 	    irow = Astore->rowind[i];
--	    c[j] = SUPERLU_MAX( c[j], c_abs1(&Aval[i]) * r[irow] );
-+	    c[j] = SUPERLU_MAX( c[j], slu_c_abs1(&Aval[i]) * r[irow] );
- 	}
- 
-     /* Find the maximum and minimum scale factors. */
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cgsrfs.c scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cgsrfs.c
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cgsrfs.c	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cgsrfs.c	2008-11-11 17:32:10.000000000 +0100
-@@ -276,21 +276,21 @@
- 	       than SAFE2, then SAFE1 is added to the i-th component of the   
- 	       numerator and denominator before dividing. */
- 
--	    for (i = 0; i < A->nrow; ++i) rwork[i] = c_abs1( &Bptr[i] );
-+	    for (i = 0; i < A->nrow; ++i) rwork[i] = slu_c_abs1( &Bptr[i] );
- 	    
- 	    /* Compute abs(op(A))*abs(X) + abs(B). */
- 	    if (notran) {
- 		for (k = 0; k < A->ncol; ++k) {
--		    xk = c_abs1( &Xptr[k] );
-+		    xk = slu_c_abs1( &Xptr[k] );
- 		    for (i = Astore->colptr[k]; i < Astore->colptr[k+1]; ++i)
--			rwork[Astore->rowind[i]] += c_abs1(&Aval[i]) * xk;
-+			rwork[Astore->rowind[i]] += slu_c_abs1(&Aval[i]) * xk;
- 		}
- 	    } else {
- 		for (k = 0; k < A->ncol; ++k) {
- 		    s = 0.;
- 		    for (i = Astore->colptr[k]; i < Astore->colptr[k+1]; ++i) {
- 			irow = Astore->rowind[i];
--			s += c_abs1(&Aval[i]) * c_abs1(&Xptr[irow]);
-+			s += slu_c_abs1(&Aval[i]) * slu_c_abs1(&Xptr[irow]);
- 		    }
- 		    rwork[k] += s;
- 		}
-@@ -298,9 +298,9 @@
- 	    s = 0.;
- 	    for (i = 0; i < A->nrow; ++i) {
- 		if (rwork[i] > safe2)
--		    s = SUPERLU_MAX( s, c_abs1(&work[i]) / rwork[i] );
-+		    s = SUPERLU_MAX( s, slu_c_abs1(&work[i]) / rwork[i] );
- 		else
--		    s = SUPERLU_MAX( s, (c_abs1(&work[i]) + safe1) / 
-+		    s = SUPERLU_MAX( s, (slu_c_abs1(&work[i]) + safe1) / 
- 				(rwork[i] + safe1) );
- 	    }
- 	    berr[j] = s;
-@@ -351,22 +351,22 @@
-              inv(op(A)) * diag(W),   
-           where W = abs(R) + NZ*EPS*( abs(op(A))*abs(X)+abs(B) ))) */
- 	
--	for (i = 0; i < A->nrow; ++i) rwork[i] = c_abs1( &Bptr[i] );
-+	for (i = 0; i < A->nrow; ++i) rwork[i] = slu_c_abs1( &Bptr[i] );
- 	
- 	/* Compute abs(op(A))*abs(X) + abs(B). */
- 	if ( notran ) {
- 	    for (k = 0; k < A->ncol; ++k) {
--		xk = c_abs1( &Xptr[k] );
-+		xk = slu_c_abs1( &Xptr[k] );
- 		for (i = Astore->colptr[k]; i < Astore->colptr[k+1]; ++i)
--		    rwork[Astore->rowind[i]] += c_abs1(&Aval[i]) * xk;
-+		    rwork[Astore->rowind[i]] += slu_c_abs1(&Aval[i]) * xk;
- 	    }
- 	} else {
- 	    for (k = 0; k < A->ncol; ++k) {
- 		s = 0.;
- 		for (i = Astore->colptr[k]; i < Astore->colptr[k+1]; ++i) {
- 		    irow = Astore->rowind[i];
--		    xk = c_abs1( &Xptr[irow] );
--		    s += c_abs1(&Aval[i]) * xk;
-+		    xk = slu_c_abs1( &Xptr[irow] );
-+		    s += slu_c_abs1(&Aval[i]) * xk;
- 		}
- 		rwork[k] += s;
- 	    }
-@@ -374,9 +374,9 @@
- 	
- 	for (i = 0; i < A->nrow; ++i)
- 	    if (rwork[i] > safe2)
--		rwork[i] = c_abs(&work[i]) + (iwork[i]+1)*eps*rwork[i];
-+		rwork[i] = slu_c_abs(&work[i]) + (iwork[i]+1)*eps*rwork[i];
- 	    else
--		rwork[i] = c_abs(&work[i])+(iwork[i]+1)*eps*rwork[i]+safe1;
-+		rwork[i] = slu_c_abs(&work[i])+(iwork[i]+1)*eps*rwork[i]+safe1;
- 	kase = 0;
- 
- 	do {
-@@ -424,13 +424,13 @@
- 	lstres = 0.;
-  	if ( notran && colequ ) {
- 	    for (i = 0; i < A->nrow; ++i)
--	    	lstres = SUPERLU_MAX( lstres, C[i] * c_abs1( &Xptr[i]) );
-+	    	lstres = SUPERLU_MAX( lstres, C[i] * slu_c_abs1( &Xptr[i]) );
-   	} else if ( !notran && rowequ ) {
- 	    for (i = 0; i < A->nrow; ++i)
--	    	lstres = SUPERLU_MAX( lstres, R[i] * c_abs1( &Xptr[i]) );
-+	    	lstres = SUPERLU_MAX( lstres, R[i] * slu_c_abs1( &Xptr[i]) );
- 	} else {
- 	    for (i = 0; i < A->nrow; ++i)
--	    	lstres = SUPERLU_MAX( lstres, c_abs1( &Xptr[i]) );
-+	    	lstres = SUPERLU_MAX( lstres, slu_c_abs1( &Xptr[i]) );
- 	}
- 	if ( lstres != 0. )
- 	    ferr[j] /= lstres;
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/clacon.c scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/clacon.c
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/clacon.c	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/clacon.c	2008-11-11 17:32:10.000000000 +0100
-@@ -106,14 +106,14 @@
-   L20:
-     if (*n == 1) {
- 	v[0] = x[0];
--	*est = c_abs(&v[0]);
-+	*est = slu_c_abs(&v[0]);
- 	/*        ... QUIT */
- 	goto L150;
-     }
-     *est = scsum1_(n, x, &c__1);
- 
-     for (i = 0; i < *n; ++i) {
--	d__1 = c_abs(&x[i]);
-+	d__1 = slu_c_abs(&x[i]);
- 	if (d__1 > safmin) {
- 	    d__1 = 1 / d__1;
- 	    x[i].r *= d__1;
-@@ -158,7 +158,7 @@
-     if (*est <= estold) goto L120;
- 
-     for (i = 0; i < *n; ++i) {
--	d__1 = c_abs(&x[i]);
-+	d__1 = slu_c_abs(&x[i]);
- 	if (d__1 > safmin) {
- 	    d__1 = 1 / d__1;
- 	    x[i].r *= d__1;
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/clangs.c scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/clangs.c
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/clangs.c	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/clangs.c	2008-11-11 17:32:10.000000000 +0100
-@@ -72,7 +72,7 @@
- 	value = 0.;
- 	for (j = 0; j < A->ncol; ++j)
- 	    for (i = Astore->colptr[j]; i < Astore->colptr[j+1]; i++)
--		value = SUPERLU_MAX( value, c_abs( &Aval[i]) );
-+		value = SUPERLU_MAX( value, slu_c_abs( &Aval[i]) );
- 	
-     } else if (lsame_(norm, "O") || *(unsigned char *)norm == '1') {
- 	/* Find norm1(A). */
-@@ -80,7 +80,7 @@
- 	for (j = 0; j < A->ncol; ++j) {
- 	    sum = 0.;
- 	    for (i = Astore->colptr[j]; i < Astore->colptr[j+1]; i++) 
--		sum += c_abs( &Aval[i] );
-+		sum += slu_c_abs( &Aval[i] );
- 	    value = SUPERLU_MAX(value,sum);
- 	}
- 	
-@@ -92,7 +92,7 @@
- 	for (j = 0; j < A->ncol; ++j)
- 	    for (i = Astore->colptr[j]; i < Astore->colptr[j+1]; i++) {
- 		irow = Astore->rowind[i];
--		rwork[irow] += c_abs( &Aval[i] );
-+		rwork[irow] += slu_c_abs( &Aval[i] );
- 	    }
- 	value = 0.;
- 	for (i = 0; i < A->nrow; ++i)
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cpivotgrowth.c scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cpivotgrowth.c
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cpivotgrowth.c	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cpivotgrowth.c	2008-11-11 17:32:10.000000000 +0100
-@@ -83,15 +83,15 @@
- 	    maxaj = 0.;
-             oldcol = inv_perm_c[j];
- 	    for (i = Astore->colptr[oldcol]; i < Astore->colptr[oldcol+1]; ++i)
--		maxaj = SUPERLU_MAX( maxaj, c_abs1( &Aval[i]) );
-+		maxaj = SUPERLU_MAX( maxaj, slu_c_abs1( &Aval[i]) );
- 	
- 	    maxuj = 0.;
- 	    for (i = Ustore->colptr[j]; i < Ustore->colptr[j+1]; i++)
--		maxuj = SUPERLU_MAX( maxuj, c_abs1( &Uval[i]) );
-+		maxuj = SUPERLU_MAX( maxuj, slu_c_abs1( &Uval[i]) );
- 	    
- 	    /* Supernode */
- 	    for (i = 0; i < nz_in_U; ++i)
--		maxuj = SUPERLU_MAX( maxuj, c_abs1( &luval[i]) );
-+		maxuj = SUPERLU_MAX( maxuj, slu_c_abs1( &luval[i]) );
- 
- 	    ++nz_in_U;
- 	    luval += nsupr;
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cpivotL.c scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cpivotL.c
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cpivotL.c	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cpivotL.c	2008-11-11 17:32:10.000000000 +0100
-@@ -106,7 +106,7 @@
-     diag = EMPTY;
-     old_pivptr = nsupc;
-     for (isub = nsupc; isub < nsupr; ++isub) {
--        rtemp = c_abs1 (&lu_col_ptr[isub]);
-+        rtemp = slu_c_abs1 (&lu_col_ptr[isub]);
- 	if ( rtemp > pivmax ) {
- 	    pivmax = rtemp;
- 	    pivptr = isub;
-@@ -127,7 +127,7 @@
-     
-     /* Choose appropriate pivotal element by our policy. */
-     if ( *usepr ) {
--        rtemp = c_abs1 (&lu_col_ptr[old_pivptr]);
-+        rtemp = slu_c_abs1 (&lu_col_ptr[old_pivptr]);
- 	if ( rtemp != 0.0 && rtemp >= thresh )
- 	    pivptr = old_pivptr;
- 	else
-@@ -136,7 +136,7 @@
-     if ( *usepr == 0 ) {
- 	/* Use diagonal pivot? */
- 	if ( diag >= 0 ) { /* diagonal exists */
--            rtemp = c_abs1 (&lu_col_ptr[diag]);
-+            rtemp = slu_c_abs1 (&lu_col_ptr[diag]);
- 	    if ( rtemp != 0.0 && rtemp >= thresh ) pivptr = diag;
-         }
- 	*pivrow = lsub_ptr[pivptr];
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cutil.c scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cutil.c
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/cutil.c	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/cutil.c	2008-11-11 17:32:10.000000000 +0100
-@@ -414,8 +414,8 @@
-       err = xnorm = 0.0;
-       for (i = 0; i < X->nrow; i++) {
-         c_sub(&temp, &soln_work[i], &xtrue[i]);
--	err = SUPERLU_MAX(err, c_abs(&temp));
--	xnorm = SUPERLU_MAX(xnorm, c_abs(&soln_work[i]));
-+	err = SUPERLU_MAX(err, slu_c_abs(&temp));
-+	xnorm = SUPERLU_MAX(xnorm, slu_c_abs(&soln_work[i]));
-       }
-       err = err / xnorm;
-       printf("||X - Xtrue||/||X|| = %e\n", err);
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/scomplex.c scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/scomplex.c
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/scomplex.c	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/scomplex.c	2008-11-11 17:32:10.000000000 +0100
-@@ -45,7 +45,7 @@
- 
- 
- /* Returns sqrt(z.r^2 + z.i^2) */
--double c_abs(complex *z)
-+double slu_c_abs(complex *z)
- {
-     float temp;
-     float real = z->r;
-@@ -68,7 +68,7 @@
- 
- /* Approximates the abs */
- /* Returns abs(z.r) + abs(z.i) */
--double c_abs1(complex *z)
-+double slu_c_abs1(complex *z)
- {
-     float real = z->r;
-     float imag = z->i;
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/scomplex.h scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/scomplex.h
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/scomplex.h	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/scomplex.h	2008-11-11 17:32:10.000000000 +0100
-@@ -57,8 +57,8 @@
- 
- /* Prototypes for functions in scomplex.c */
- void c_div(complex *, complex *, complex *);
--double c_abs(complex *);     /* exact */
--double c_abs1(complex *);    /* approximate */
-+double slu_c_abs(complex *);     /* exact */
-+double slu_c_abs1(complex *);    /* approximate */
- void c_exp(complex *, complex *);
- void r_cnjg(complex *, complex *);
- double r_imag(complex *);
-diff -ur scipy-0.6.0/scipy/linsolve/SuperLU/SRC/scsum1.c scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/scsum1.c
---- scipy-0.6.0/scipy/linsolve/SuperLU/SRC/scsum1.c	2007-09-22 09:55:18.000000000 +0200
-+++ scipy-svn/scipy/sparse/linalg/dsolve/SuperLU/SRC/scsum1.c	2008-11-11 17:32:10.000000000 +0100
-@@ -42,7 +42,7 @@
-     int i__1, i__2;
-     float ret_val;
-     /* Builtin functions */
--    double c_abs(complex *);
-+    double slu_c_abs(complex *);
-     /* Local variables */
-     static int i, nincx;
-     static float stemp;
-@@ -69,7 +69,7 @@
- 
- /*        NEXT LINE MODIFIED. */
- 
--	stemp += c_abs(&CX(i));
-+	stemp += slu_c_abs(&CX(i));
- /* L10: */
-     }
-     ret_val = stemp;
-@@ -83,7 +83,7 @@
- 
- /*        NEXT LINE MODIFIED. */
- 
--	stemp += c_abs(&CX(i));
-+	stemp += slu_c_abs(&CX(i));
- /* L30: */
-     }
-     ret_val = stemp;
diff --git a/sci-libs/scipy/files/scipy-0.6.0-randomkit.patch b/sci-libs/scipy/files/scipy-0.6.0-randomkit.patch
deleted file mode 100644
index f760d4c33048..000000000000
--- a/sci-libs/scipy/files/scipy-0.6.0-randomkit.patch
+++ /dev/null
@@ -1,552 +0,0 @@
---- scipy/sandbox/montecarlo/src/randomkit.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ scipy/sandbox/montecarlo/src/randomkit.c	2007-06-06 17:15:22.505066000 +0100
-@@ -0,0 +1,357 @@
-+/* Random kit 1.3 */
-+
-+/*
-+ * Copyright (c) 2003-2005, Jean-Sebastien Roy (js@jeannot.org)
-+ *
-+ * The rk_random and rk_seed functions algorithms and the original design of 
-+ * the Mersenne Twister RNG:
-+ *
-+ *   Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-+ *   All rights reserved.
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ * 
-+ *   1. Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   2. Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   3. The names of its contributors may not be used to endorse or promote
-+ *   products derived from this software without specific prior written
-+ *   permission.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ *   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ *   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ *   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ *   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ * 
-+ * Original algorithm for the implementation of rk_interval function from
-+ * Richard J. Wagner's implementation of the Mersenne Twister RNG, optimised by
-+ * Magnus Jonsson.
-+ *
-+ * Constants used in the rk_double implementation by Isaku Wada.
-+ * 
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ * 
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ * 
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/* static char const rcsid[] =
-+  "@(#) $Jeannot: randomkit.c,v 1.28 2005/07/21 22:14:09 js Exp $"; */
-+
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <time.h>
-+#include <limits.h>
-+#include <math.h>
-+
-+#ifdef _WIN32
-+/* Windows */
-+#include <sys/timeb.h>
-+#ifndef RK_NO_WINCRYPT
-+/* Windows crypto */
-+#ifndef _WIN32_WINNT
-+#define _WIN32_WINNT 0x0400
-+#endif
-+#include <windows.h>
-+#include <wincrypt.h>
-+#endif
-+#else
-+/* Unix */
-+#include <sys/time.h>
-+#include <unistd.h>
-+#endif
-+
-+#include "randomkit.h"
-+
-+#ifndef RK_DEV_URANDOM
-+#define RK_DEV_URANDOM "/dev/urandom"
-+#endif
-+
-+#ifndef RK_DEV_RANDOM
-+#define RK_DEV_RANDOM "/dev/random"
-+#endif
-+
-+char *rk_strerror[RK_ERR_MAX] =
-+{
-+	"no error",
-+	"random device unvavailable"
-+};
-+
-+/* static functions */
-+static unsigned long rk_hash(unsigned long key);
-+
-+void rk_seed(unsigned long seed, rk_state *state)
-+{
-+	int pos;
-+	seed &= 0xffffffffUL;
-+
-+	/* Knuth's PRNG as used in the Mersenne Twister reference implementation */
-+	for (pos=0; pos<RK_STATE_LEN; pos++)
-+	{
-+		state->key[pos] = seed;
-+		seed = (1812433253UL * (seed ^ (seed >> 30)) + pos + 1) & 0xffffffffUL;
-+	}
-+
-+	state->pos = RK_STATE_LEN;
-+	state->has_gauss = 0;
-+        state->has_binomial = 0;
-+}
-+
-+/* Thomas Wang 32 bits integer hash function */
-+unsigned long rk_hash(unsigned long key)
-+{
-+  key += ~(key << 15);
-+  key ^=  (key >> 10);
-+  key +=  (key << 3);
-+  key ^=  (key >> 6);
-+  key += ~(key << 11);
-+  key ^=  (key >> 16);
-+  return key;
-+}
-+
-+rk_error rk_randomseed(rk_state *state)
-+{
-+#ifndef _WIN32
-+	struct timeval tv;
-+#else
-+	struct _timeb	tv;
-+#endif
-+        int i;
-+
-+	if(rk_devfill(state->key, sizeof(state->key), 0) == RK_NOERR)
-+	{
-+		state->key[0] |= 0x80000000UL; /* ensures non-zero key */
-+		state->pos = RK_STATE_LEN;
-+		state->has_gauss = 0;
-+                state->has_binomial = 0;
-+
-+                for (i=0; i<624; i++)
-+                {
-+                    state->key[i] &= 0xffffffffUL;
-+                }
-+
-+		return RK_NOERR;
-+	}
-+
-+#ifndef _WIN32
-+	gettimeofday(&tv, NULL);
-+	rk_seed(rk_hash(getpid()) ^ rk_hash(tv.tv_sec) ^ rk_hash(tv.tv_usec)
-+		^ rk_hash(clock()), state);
-+#else
-+	_ftime(&tv);
-+	rk_seed(rk_hash(tv.time) ^ rk_hash(tv.millitm) ^ rk_hash(clock()), state);
-+#endif
-+
-+	return RK_ENODEV;
-+}
-+
-+/* Magic Mersenne Twister constants */
-+#define N 624
-+#define M 397
-+#define MATRIX_A 0x9908b0dfUL
-+#define UPPER_MASK 0x80000000UL
-+#define LOWER_MASK 0x7fffffffUL
-+
-+/* Slightly optimised reference implementation of the Mersenne Twister */
-+unsigned long rk_random(rk_state *state)
-+{
-+  unsigned long y;
-+
-+  if (state->pos == RK_STATE_LEN)
-+	{
-+    int i;
-+
-+    for (i=0;i<N-M;i++)
-+		{
-+      y = (state->key[i] & UPPER_MASK) | (state->key[i+1] & LOWER_MASK);
-+      state->key[i] = state->key[i+M] ^ (y>>1) ^ (-(y & 1) & MATRIX_A);
-+    }
-+    for (;i<N-1;i++)
-+		{
-+      y = (state->key[i] & UPPER_MASK) | (state->key[i+1] & LOWER_MASK);
-+      state->key[i] = state->key[i+(M-N)] ^ (y>>1) ^ (-(y & 1) & MATRIX_A);
-+    }
-+    y = (state->key[N-1] & UPPER_MASK) | (state->key[0] & LOWER_MASK);
-+    state->key[N-1] = state->key[M-1] ^ (y>>1) ^ (-(y & 1) & MATRIX_A);
-+
-+    state->pos = 0;
-+  }
-+  
-+  y = state->key[state->pos++];
-+
-+  /* Tempering */
-+  y ^= (y >> 11);
-+  y ^= (y << 7) & 0x9d2c5680UL;
-+  y ^= (y << 15) & 0xefc60000UL;
-+  y ^= (y >> 18);
-+
-+  return y;
-+}
-+
-+long rk_long(rk_state *state)
-+{
-+	return rk_ulong(state) >> 1;
-+}
-+
-+unsigned long rk_ulong(rk_state *state)
-+{
-+#if ULONG_MAX <= 0xffffffffUL
-+	return rk_random(state);
-+#else
-+	return (rk_random(state) << 32) | (rk_random(state));
-+#endif
-+}
-+
-+unsigned long rk_interval(unsigned long max, rk_state *state)
-+{
-+	unsigned long mask = max, value;
-+
-+	if (max == 0) return 0;
-+
-+	/* Smallest bit mask >= max */
-+	mask |= mask >> 1;
-+	mask |= mask >> 2;
-+	mask |= mask >> 4;
-+	mask |= mask >> 8;
-+	mask |= mask >> 16;
-+#if ULONG_MAX > 0xffffffffUL
-+	mask |= mask >> 32;
-+#endif
-+
-+	/* Search a random value in [0..mask] <= max */
-+	while ((value = (rk_ulong(state) & mask)) > max);
-+
-+	return value;
-+}
-+
-+double rk_double(rk_state *state)
-+{
-+	/* shifts : 67108864 = 0x4000000, 9007199254740992 = 0x20000000000000 */
-+	long a = rk_random(state) >> 5, b = rk_random(state) >> 6;
-+	return (a * 67108864.0 + b) / 9007199254740992.0;
-+}
-+
-+void rk_fill(void *buffer, size_t size, rk_state *state)
-+{
-+	unsigned long r;
-+	unsigned char *buf = buffer;
-+	
-+	for (; size >= 4; size -= 4)
-+	{
-+		r = rk_random(state);
-+		*(buf++) = r & 0xFF;
-+		*(buf++) = (r >> 8) & 0xFF;
-+		*(buf++) = (r >> 16) & 0xFF;
-+		*(buf++) = (r >> 24) & 0xFF;
-+	}
-+	
-+	if (!size) return;
-+
-+	r = rk_random(state);
-+
-+	for (; size; r >>= 8, size --)
-+		*(buf++) = (unsigned char)(r & 0xFF);
-+}
-+
-+rk_error rk_devfill(void *buffer, size_t size, int strong)
-+{
-+#ifndef _WIN32
-+	FILE *rfile;
-+	int done;
-+
-+	if (strong)
-+		rfile = fopen(RK_DEV_RANDOM, "rb");
-+	else
-+		rfile = fopen(RK_DEV_URANDOM, "rb");
-+	if (rfile == NULL)
-+		return RK_ENODEV;
-+	done = fread(buffer, size, 1, rfile);
-+	fclose(rfile);
-+	if (done)
-+		return RK_NOERR;
-+#else
-+
-+#ifndef RK_NO_WINCRYPT
-+	HCRYPTPROV hCryptProv;
-+	BOOL done;
-+
-+	if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL,
-+		CRYPT_VERIFYCONTEXT) || !hCryptProv)
-+		return RK_ENODEV;
-+	done = CryptGenRandom(hCryptProv, size, (unsigned char *)buffer);
-+	CryptReleaseContext(hCryptProv, 0);
-+	if (done)
-+		return RK_NOERR;
-+#endif
-+
-+#endif
-+
-+	return RK_ENODEV;
-+}
-+
-+rk_error rk_altfill(void *buffer, size_t size, int strong, rk_state *state)
-+{
-+	rk_error err;
-+
-+	err = rk_devfill(buffer, size, strong);
-+	if (err)
-+		rk_fill(buffer, size, state);
-+
-+	return err;
-+}
-+
-+double rk_gauss(rk_state *state)
-+{
-+	if (state->has_gauss)
-+	{
-+		state->has_gauss = 0;
-+		return state->gauss;
-+	}
-+	else
-+	{
-+		double f, x1, x2, r2;
-+		do
-+		{
-+			x1 = 2.0*rk_double(state) - 1.0;
-+			x2 = 2.0*rk_double(state) - 1.0;
-+			r2 = x1*x1 + x2*x2;
-+		}
-+		while (r2 >= 1.0 || r2 == 0.0);
-+		
-+		f = sqrt(-2.0*log(r2)/r2); /* Box-Muller transform */
-+		state->has_gauss = 1;
-+		state->gauss = f*x1; /* Keep for next call */
-+		return f*x2;
-+	}
-+}
-+
-+
---- scipy/sandbox/montecarlo/src/randomkit.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ scipy/sandbox/montecarlo/src/randomkit.h	2007-06-06 17:15:22.505066000 +0100
-@@ -0,0 +1,189 @@
-+/* Random kit 1.3 */
-+
-+/*
-+ * Copyright (c) 2003-2005, Jean-Sebastien Roy (js@jeannot.org)
-+ * 
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, sublicense, and/or sell copies of the Software, and to
-+ * permit persons to whom the Software is furnished to do so, subject to
-+ * the following conditions:
-+ * 
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ * 
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/* @(#) $Jeannot: randomkit.h,v 1.24 2005/07/21 22:14:09 js Exp $ */
-+
-+/*
-+ * Typical use:
-+ *
-+ * {
-+ * 	rk_state state;
-+ * 	unsigned long seed = 1, random_value;
-+ * 	
-+ * 	rk_seed(seed, &state); // Initialize the RNG
-+ * 	...
-+ * 	random_value = rk_random(&state); // Generate random values in [0..RK_MAX]
-+ * }
-+ * 
-+ * Instead of rk_seed, you can use rk_randomseed which will get a random seed
-+ * from /dev/urandom (or the clock, if /dev/urandom is unavailable):
-+ *
-+ * {
-+ * 	rk_state state;
-+ * 	unsigned long random_value;
-+ * 	
-+ * 	rk_randomseed(&state); // Initialize the RNG with a random seed
-+ * 	...
-+ * 	random_value = rk_random(&state); // Generate random values in [0..RK_MAX]
-+ * }
-+ */
-+ 
-+/*
-+ * Useful macro:
-+ * 	RK_DEV_RANDOM: the device used for random seeding.
-+ *                 defaults to "/dev/urandom"
-+ */
-+
-+#include <stddef.h>
-+
-+#ifndef _RANDOMKIT_
-+#define _RANDOMKIT_
-+
-+#define	RK_STATE_LEN 624
-+
-+typedef struct rk_state_
-+{
-+	unsigned long key[RK_STATE_LEN];
-+	int pos;
-+	int has_gauss; /* !=0: gauss contains a gaussian deviate */
-+	double gauss;
-+
-+    /* The rk_state structure has been extended to store the following
-+     * information for the binomial generator. If the input values of n or p
-+     * are different than nsave and psave, then the other parameters will be
-+     * recomputed. RTK 2005-09-02 */
-+
-+    int has_binomial; /* !=0: following parameters initialized for 
-+                              binomial */
-+    double psave;
-+    long nsave;
-+    double r;
-+    double q;
-+    double fm;
-+    long m;
-+    double p1;
-+    double xm;
-+    double xl;
-+    double xr;
-+    double c;
-+    double laml;
-+    double lamr;
-+    double p2;
-+    double p3;
-+    double p4;
-+
-+}
-+rk_state;
-+
-+typedef enum {
-+	RK_NOERR = 0, /* no error */
-+	RK_ENODEV = 1, /* no RK_DEV_RANDOM device */
-+	RK_ERR_MAX = 2
-+} rk_error;
-+
-+/* error strings */
-+extern char *rk_strerror[RK_ERR_MAX];
-+
-+/* Maximum generated random value */
-+#define RK_MAX 0xFFFFFFFFUL
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Initialize the RNG state using the given seed.
-+ */
-+extern void rk_seed(unsigned long seed, rk_state *state);
-+
-+/*
-+ * Initialize the RNG state using a random seed.
-+ * Uses /dev/random or, when unavailable, the clock (see randomkit.c).
-+ * Returns RK_NOERR when no errors occurs.
-+ * Returns RK_ENODEV when the use of RK_DEV_RANDOM failed (for example because
-+ * there is no such device). In this case, the RNG was initialized using the
-+ * clock.
-+ */
-+extern rk_error rk_randomseed(rk_state *state);
-+
-+/*
-+ * Returns a random unsigned long between 0 and RK_MAX inclusive
-+ */
-+extern unsigned long rk_random(rk_state *state);
-+
-+/*
-+ * Returns a random long between 0 and LONG_MAX inclusive
-+ */
-+extern long rk_long(rk_state *state);
-+
-+/*
-+ * Returns a random unsigned long between 0 and ULONG_MAX inclusive
-+ */
-+extern unsigned long rk_ulong(rk_state *state);
-+
-+/*
-+ * Returns a random unsigned long between 0 and max inclusive.
-+ */
-+extern unsigned long rk_interval(unsigned long max, rk_state *state);
-+
-+/*
-+ * Returns a random double between 0.0 and 1.0, 1.0 excluded.
-+ */
-+extern double rk_double(rk_state *state);
-+
-+/*
-+ * fill the buffer with size random bytes
-+ */
-+extern void rk_fill(void *buffer, size_t size, rk_state *state);
-+
-+/*
-+ * fill the buffer with randombytes from the random device
-+ * Returns RK_ENODEV if the device is unavailable, or RK_NOERR if it is
-+ * On Unix, if strong is defined, RK_DEV_RANDOM is used. If not, RK_DEV_URANDOM
-+ * is used instead. This parameter has no effect on Windows.
-+ * Warning: on most unixes RK_DEV_RANDOM will wait for enough entropy to answer
-+ * which can take a very long time on quiet systems.
-+ */
-+extern rk_error rk_devfill(void *buffer, size_t size, int strong);
-+
-+/*
-+ * fill the buffer using rk_devfill if the random device is available and using
-+ * rk_fill if is is not
-+ * parameters have the same meaning as rk_fill and rk_devfill
-+ * Returns RK_ENODEV if the device is unavailable, or RK_NOERR if it is
-+ */
-+extern rk_error rk_altfill(void *buffer, size_t size, int strong,
-+	rk_state *state);
-+
-+/*
-+ * return a random gaussian deviate with variance unity and zero mean.
-+ */
-+extern double rk_gauss(rk_state *state);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _RANDOMKIT_ */ 
diff --git a/sci-libs/scipy/scipy-0.6.0-r6.ebuild b/sci-libs/scipy/scipy-0.6.0-r6.ebuild
deleted file mode 100644
index a347efe7a8e0..000000000000
--- a/sci-libs/scipy/scipy-0.6.0-r6.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.6.0-r6.ebuild,v 1.2 2009/02/20 10:29:30 bicatali Exp $
-
-EAPI=2
-NEED_PYTHON=2.3
-inherit eutils distutils fortran flag-o-matic
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/"
-LICENSE="BSD"
-
-SLOT="0"
-
-IUSE="fftw umfpack sandbox"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-CDEPEND="dev-python/numpy
-	virtual/cblas
-	virtual/lapack
-	fftw? ( sci-libs/fftw:2.1 )
-	umfpack? ( sci-libs/umfpack )
-	sandbox? ( >=sci-libs/netcdf-3.6 x11-libs/libX11 )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	umfpack? ( || ( >=dev-lang/swig-1.3.38 <=dev-lang/swig-1.3.36[python] ) )"
-
-RDEPEND="${CDEPEND}
-	dev-python/imaging"
-
-# test still buggy on lapack with 2 failures on check_syevr
-# (lapack float). check every version bump.
-#RESTRICT="test"
-
-DOCS="THANKS.txt DEVELOPERS.txt LATEST.txt TOCHANGE.txt FORMAT_GUIDELINES.txt"
-
-scipy_fortran_setup() {
-	append-ldflags -shared
-	FORTRAN="gfortran g77 ifc"
-	fortran_pkg_setup
-	local fc=
-	case ${FORTRANC} in
-		gfortran) fc=gnu95 ;;
-		g77) fc=gnu ;;
-		ifc|ifort)
-			if use ia64; then
-				fc=intele
-			elif use amd64; then
-				fc=intelem
-			else
-				fc=intel
-			fi
-			;;
-		*)	eerror "Unknown fortran compiler: ${FORTRANC}"
-			die "scipy_fortran_setup failed" ;;
-	esac
-	export SCIPY_FCONFIG="config_fc --fcompiler=${fc} --noopt --noarch"
-}
-
-pkg_setup() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use fftw && unset FFTW
-	use umfpack && unset UMFPACK
-	use sandbox && elog "Warning: using sandbox modules at your own risk!"
-	scipy_fortran_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-implicit.patch
-	epatch "${FILESDIR}"/${P}-randomkit.patch
-	epatch "${FILESDIR}"/${P}-cdf.patch
-	epatch "${FILESDIR}"/${P}-fftw-fix.patch
-	epatch "${FILESDIR}"/${P}-ndimage.patch
-	epatch "${FILESDIR}"/${P}-python-2.6-c_abs.patch
-	epatch "${FILESDIR}"/${P}-stsci.patch
-	cat > site.cfg <<-EOF
-		[DEFAULT]
-		library_dirs = /usr/$(get_libdir)
-		include_dirs = /usr/include
-		[atlas]
-		include_dirs = $(pkg-config --cflags-only-I \
-			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas blas lapack| sed -e \
-			's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
-		atlas_libs = $(pkg-config --libs-only-l \
-			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		lapack_libs = $(pkg-config --libs-only-l \
-			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		[blas_opt]
-		include_dirs = $(pkg-config --cflags-only-I \
-			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):/usr/$(get_libdir)
-		libraries = $(pkg-config --libs-only-l \
-			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		[lapack_opt]
-		library_dirs = $(pkg-config --libs-only-L \
-			lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):/usr/$(get_libdir)
-		libraries = $(pkg-config --libs-only-l \
-			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-	EOF
-	if use sandbox; then
-		cd scipy/sandbox
-		ls -1 */__init__.py \
-			| sed -e 's:/__init__.py::' \
-			| grep -v exmplpackage \
-			> enabled_packages.txt \
-			|| die "sandbox listing failed"
-	fi
-}
-
-src_compile() {
-	# when fortran flags are set, pic is removed.
-	[[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
-	distutils_src_compile ${SCIPY_FCONFIG}
-}
-
-src_test() {
-	"${python}" setup.py install \
-		--home="${S}"/test \
-		--no-compile \
-		${SCIPY_FCONFIG} || die "install test failed"
-	pushd "${S}"/test/lib*/python
-	PYTHONPATH=. "${python}" -c \
-		"import scipy as s;import sys;sys.exit(s.test(10,3))" \
-		 2>&1 | tee test.log
-	grep -q OK test.log || die "test failed"
-	popd
-	rm -rf test
-}
-
-src_install() {
-	distutils_src_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer if you don't like the default one. Ex:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.7.0.ebuild b/sci-libs/scipy/scipy-0.7.0.ebuild
deleted file mode 100644
index f72a762010b5..000000000000
--- a/sci-libs/scipy/scipy-0.7.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.0.ebuild,v 1.2 2009/02/20 10:29:30 bicatali Exp $
-
-EAPI=2
-NEED_PYTHON=2.4
-
-inherit eutils distutils fortran flag-o-matic
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/"
-LICENSE="BSD"
-
-SLOT="0"
-
-IUSE="test umfpack"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-CDEPEND=">=dev-python/numpy-1.2
-	virtual/cblas
-	virtual/lapack
-	umfpack? ( sci-libs/umfpack )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	test? ( dev-python/nose )
-	umfpack? ( || ( >=dev-lang/swig-1.3.38 <=dev-lang/swig-1.3.36[python] ) )"
-
-RDEPEND="${CDEPEND}
-	dev-python/imaging"
-
-DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
-
-scipy_fortran_setup() {
-	append-ldflags -shared
-	FORTRAN="gfortran g77 ifc"
-	fortran_pkg_setup
-	local fc=
-	case ${FORTRANC} in
-		gfortran) fc=gnu95 ;;
-		g77) fc=gnu ;;
-		ifc|ifort)
-			if use ia64; then
-				fc=intele
-			elif use amd64; then
-				fc=intelem
-			else
-				fc=intel
-			fi
-			;;
-		*)	eerror "Unknown fortran compiler: ${FORTRANC}"
-			die "scipy_fortran_setup failed" ;;
-	esac
-	export SCIPY_FCONFIG="config_fc --fcompiler=${fc} --noopt --noarch"
-}
-
-pkg_setup() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use umfpack && unset UMFPACK
-	scipy_fortran_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.0_beta1-implicit.patch
-	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
-	cat > site.cfg <<-EOF
-		[DEFAULT]
-		library_dirs = /usr/$(get_libdir)
-		include_dirs = /usr/include
-		[atlas]
-		include_dirs = $(pkg-config --cflags-only-I \
-			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas blas lapack| sed -e \
-			's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
-		atlas_libs = $(pkg-config --libs-only-l \
-			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		lapack_libs = $(pkg-config --libs-only-l \
-			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		[blas_opt]
-		include_dirs = $(pkg-config --cflags-only-I \
-			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
-			cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):/usr/$(get_libdir)
-		libraries = $(pkg-config --libs-only-l \
-			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		[lapack_opt]
-		library_dirs = $(pkg-config --libs-only-L \
-			lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
-			-e 's/ //g'):/usr/$(get_libdir)
-		libraries = $(pkg-config --libs-only-l \
-			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-	EOF
-}
-
-src_compile() {
-	# when fortran flags are set, pic is removed.
-	[[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
-	distutils_src_compile ${SCIPY_FCONFIG}
-}
-
-src_test() {
-	"${python}" setup.py install \
-		--home="${S}"/test \
-		--no-compile \
-		${SCIPY_FCONFIG} || die "install test failed"
-	pushd "${S}"/test/lib*/python
-	PYTHONPATH=. "${python}" -c "import scipy; scipy.test('full')" 2>&1 | tee test.log
-	grep -q ^ERROR test.log && die "test failed"
-	popd
-	rm -rf test
-}
-
-src_install() {
-	distutils_src_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer if you don't like the default one. Ex:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.7.1.ebuild b/sci-libs/scipy/scipy-0.7.1.ebuild
index 5b9bd85ae771..f7a0327551f8 100644
--- a/sci-libs/scipy/scipy-0.7.1.ebuild
+++ b/sci-libs/scipy/scipy-0.7.1.ebuild
@@ -1,20 +1,27 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.3 2009/09/04 21:31:22 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.4 2009/11/20 21:00:08 bicatali Exp $
 
 EAPI="2"
 NEED_PYTHON="2.4"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit eutils distutils flag-o-matic toolchain-funcs
+inherit eutils distutils flag-o-matic toolchain-funcs versionator
 
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SP="${PN}-$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${SP}.x/${PN}-html.zip -> ${SP}-html.zip
+		http://docs.scipy.org/doc/${SP}.x/${PN}-ref.pdf -> ${SP}-ref.pdf
+	)"
 DESCRIPTION="Scientific algorithms library for Python"
 HOMEPAGE="http://www.scipy.org/"
+
 LICENSE="BSD"
 
 SLOT="0"
-IUSE="umfpack"
+IUSE="doc umfpack"
 #IUSE="test umfpack"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
@@ -25,7 +32,8 @@ CDEPEND=">=dev-python/numpy-1.2
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
-	umfpack? ( dev-lang/swig )"
+	umfpack? ( dev-lang/swig )
+	doc? ( app-arch/unzip )"
 #	test? ( dev-python/nose )
 
 RDEPEND="${CDEPEND}
@@ -49,6 +57,13 @@ pkg_setup() {
 	export SCIPY_FCONFIG="config_fc --noopt --noarch"
 }
 
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${SP}-html.zip -d html || die
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7.0_beta1-implicit.patch
 	epatch "${FILESDIR}"/${PN}-0.6.0-stsci.patch
@@ -103,6 +118,11 @@ src_test() {
 
 src_install() {
 	distutils_src_install ${SCIPY_FCONFIG}
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${WORKDIR}"/html || die
+		doins  "${DISTDIR}"/${SP}*pdf || die
+	fi
 }
 
 pkg_postinst() {