Merge from Prefix

(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)

4 files changed, 210 insertions, 3 deletions

diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog
index 3d2d0bf1e0e9..0925211f51c5 100644
--- a/dev-python/numeric/ChangeLog
+++ b/dev-python/numeric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numeric
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.47 2009/09/06 22:40:48 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.48 2009/10/10 18:12:50 grobian Exp $
+
+  10 Oct 2009; Fabian Groffen <grobian@gentoo.org> numeric-24.2-r6.ebuild,
+  +files/numeric-24.2-interix3.patch, +files/numeric-24.2.ranf.c.patch:
+  Merge from Prefix
 
   06 Sep 2009; Christian Ruppert <idl0r@gentoo.org> numeric-23.7.ebuild,
   -files/numeric-24.2-lapack.patch:
diff --git a/dev-python/numeric/files/numeric-24.2-interix3.patch b/dev-python/numeric/files/numeric-24.2-interix3.patch
new file mode 100644
index 000000000000..8a2c4f6cc0cf
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2-interix3.patch
@@ -0,0 +1,185 @@
+diff -ru Numeric-24.2.orig/Src/f2c_lite.c Numeric-24.2/Src/f2c_lite.c
+--- Numeric-24.2.orig/Src/f2c_lite.c	2008-04-02 10:39:04 +0200
++++ Numeric-24.2/Src/f2c_lite.c	2008-04-02 10:42:58 +0200
+@@ -333,10 +333,10 @@
+ 
+ #ifdef KR_headers
+ double f__cabs();
+-double z_abs(z) doublecomplex *z;
++double my_z_abs(z) doublecomplex *z;
+ #else
+ double f__cabs(double, double);
+-double z_abs(doublecomplex *z)
++double my_z_abs(doublecomplex *z)
+ #endif
+ {
+ return( f__cabs( z->r, z->i ) );
+diff -ru Numeric-24.2.orig/Src/zlapack_lite.c Numeric-24.2/Src/zlapack_lite.c
+--- Numeric-24.2.orig/Src/zlapack_lite.c	2008-04-02 10:39:04 +0200
++++ Numeric-24.2/Src/zlapack_lite.c	2008-04-02 10:42:58 +0200
+@@ -352,7 +352,7 @@
+     doublereal d__1, d__2;
+ 
+     /* Builtin functions */
+-    double d_imag(doublecomplex *), z_abs(doublecomplex *);
++    double d_imag(doublecomplex *), my_z_abs(doublecomplex *);
+ 
+     /* Local variables */
+     static doublereal c__, f, g;
+@@ -639,10 +639,10 @@
+ 	    ;
+ 	}
+ 	ica = izamax_(&l, &a[i__ * a_dim1 + 1], &c__1);
+-	ca = z_abs(&a[ica + i__ * a_dim1]);
++	ca = my_z_abs(&a[ica + i__ * a_dim1]);
+ 	i__2 = *n - k + 1;
+ 	ira = izamax_(&i__2, &a[i__ + k * a_dim1], lda);
+-	ra = z_abs(&a[i__ + (ira + k - 1) * a_dim1]);
++	ra = my_z_abs(&a[i__ + (ira + k - 1) * a_dim1]);
+ 
+ /*        Guard against zero C or R due to underflow. */
+ 
+@@ -10721,7 +10721,7 @@
+     double d_imag(doublecomplex *);
+     void z_sqrt(doublecomplex *, doublecomplex *), d_cnjg(doublecomplex *,
+ 	    doublecomplex *);
+-    double z_abs(doublecomplex *);
++    double my_z_abs(doublecomplex *);
+ 
+     /* Local variables */
+     static integer i__, j, k, l, m;
+@@ -11188,7 +11188,7 @@
+ 
+ 		z__1.r = 1. - t1.r, z__1.i = 0. - t1.i;
+ 		temp.r = z__1.r, temp.i = z__1.i;
+-		d__1 = z_abs(&temp);
++		d__1 = my_z_abs(&temp);
+ 		z__1.r = temp.r / d__1, z__1.i = temp.i / d__1;
+ 		temp.r = z__1.r, temp.i = z__1.i;
+ 		i__3 = m + 1 + m * h_dim1;
+@@ -11233,7 +11233,7 @@
+ 	i__2 = i__ + (i__ - 1) * h_dim1;
+ 	temp.r = h__[i__2].r, temp.i = h__[i__2].i;
+ 	if (d_imag(&temp) != 0.) {
+-	    rtemp = z_abs(&temp);
++	    rtemp = my_z_abs(&temp);
+ 	    i__2 = i__ + (i__ - 1) * h_dim1;
+ 	    h__[i__2].r = rtemp, h__[i__2].i = 0.;
+ 	    z__1.r = temp.r / rtemp, z__1.i = temp.i / rtemp;
+@@ -13512,7 +13512,7 @@
+     doublereal ret_val, d__1, d__2;
+ 
+     /* Builtin functions */
+-    double z_abs(doublecomplex *), sqrt(doublereal);
++    double my_z_abs(doublecomplex *), sqrt(doublereal);
+ 
+     /* Local variables */
+     static integer i__, j;
+@@ -13603,7 +13603,7 @@
+ 	    i__2 = *m;
+ 	    for (i__ = 1; i__ <= i__2; ++i__) {
+ /* Computing MAX */
+-		d__1 = value, d__2 = z_abs(&a[i__ + j * a_dim1]);
++		d__1 = value, d__2 = my_z_abs(&a[i__ + j * a_dim1]);
+ 		value = max(d__1,d__2);
+ /* L10: */
+ 	    }
+@@ -13620,7 +13620,7 @@
+ 	    sum = 0.;
+ 	    i__2 = *m;
+ 	    for (i__ = 1; i__ <= i__2; ++i__) {
+-		sum += z_abs(&a[i__ + j * a_dim1]);
++		sum += my_z_abs(&a[i__ + j * a_dim1]);
+ /* L30: */
+ 	    }
+ 	    value = max(value,sum);
+@@ -13639,7 +13639,7 @@
+ 	for (j = 1; j <= i__1; ++j) {
+ 	    i__2 = *m;
+ 	    for (i__ = 1; i__ <= i__2; ++i__) {
+-		work[i__] += z_abs(&a[i__ + j * a_dim1]);
++		work[i__] += my_z_abs(&a[i__ + j * a_dim1]);
+ /* L60: */
+ 	    }
+ /* L70: */
+@@ -13681,7 +13681,7 @@
+     doublereal ret_val, d__1, d__2, d__3;
+ 
+     /* Builtin functions */
+-    double z_abs(doublecomplex *), sqrt(doublereal);
++    double my_z_abs(doublecomplex *), sqrt(doublereal);
+ 
+     /* Local variables */
+     static integer i__, j;
+@@ -13782,7 +13782,7 @@
+ 		i__2 = j - 1;
+ 		for (i__ = 1; i__ <= i__2; ++i__) {
+ /* Computing MAX */
+-		    d__1 = value, d__2 = z_abs(&a[i__ + j * a_dim1]);
++		    d__1 = value, d__2 = my_z_abs(&a[i__ + j * a_dim1]);
+ 		    value = max(d__1,d__2);
+ /* L10: */
+ 		}
+@@ -13802,7 +13802,7 @@
+ 		i__2 = *n;
+ 		for (i__ = j + 1; i__ <= i__2; ++i__) {
+ /* Computing MAX */
+-		    d__1 = value, d__2 = z_abs(&a[i__ + j * a_dim1]);
++		    d__1 = value, d__2 = my_z_abs(&a[i__ + j * a_dim1]);
+ 		    value = max(d__1,d__2);
+ /* L30: */
+ 		}
+@@ -13820,7 +13820,7 @@
+ 		sum = 0.;
+ 		i__2 = j - 1;
+ 		for (i__ = 1; i__ <= i__2; ++i__) {
+-		    absa = z_abs(&a[i__ + j * a_dim1]);
++		    absa = my_z_abs(&a[i__ + j * a_dim1]);
+ 		    sum += absa;
+ 		    work[i__] += absa;
+ /* L50: */
+@@ -13848,7 +13848,7 @@
+ 		sum = work[j] + (d__1 = a[i__2].r, abs(d__1));
+ 		i__2 = *n;
+ 		for (i__ = j + 1; i__ <= i__2; ++i__) {
+-		    absa = z_abs(&a[i__ + j * a_dim1]);
++		    absa = my_z_abs(&a[i__ + j * a_dim1]);
+ 		    sum += absa;
+ 		    work[i__] += absa;
+ /* L90: */
+@@ -13916,7 +13916,7 @@
+     doublereal ret_val, d__1, d__2;
+ 
+     /* Builtin functions */
+-    double z_abs(doublecomplex *), sqrt(doublereal);
++    double my_z_abs(doublecomplex *), sqrt(doublereal);
+ 
+     /* Local variables */
+     static integer i__, j;
+@@ -14006,7 +14006,7 @@
+ 	    i__2 = min(i__3,i__4);
+ 	    for (i__ = 1; i__ <= i__2; ++i__) {
+ /* Computing MAX */
+-		d__1 = value, d__2 = z_abs(&a[i__ + j * a_dim1]);
++		d__1 = value, d__2 = my_z_abs(&a[i__ + j * a_dim1]);
+ 		value = max(d__1,d__2);
+ /* L10: */
+ 	    }
+@@ -14025,7 +14025,7 @@
+ 	    i__3 = *n, i__4 = j + 1;
+ 	    i__2 = min(i__3,i__4);
+ 	    for (i__ = 1; i__ <= i__2; ++i__) {
+-		sum += z_abs(&a[i__ + j * a_dim1]);
++		sum += my_z_abs(&a[i__ + j * a_dim1]);
+ /* L30: */
+ 	    }
+ 	    value = max(value,sum);
+@@ -14046,7 +14046,7 @@
+ 	    i__3 = *n, i__4 = j + 1;
+ 	    i__2 = min(i__3,i__4);
+ 	    for (i__ = 1; i__ <= i__2; ++i__) {
+-		work[i__] += z_abs(&a[i__ + j * a_dim1]);
++		work[i__] += my_z_abs(&a[i__ + j * a_dim1]);
+ /* L60: */
+ 	    }
+ /* L70: */
diff --git a/dev-python/numeric/files/numeric-24.2.ranf.c.patch b/dev-python/numeric/files/numeric-24.2.ranf.c.patch
new file mode 100644
index 000000000000..fb3ab1711b9b
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2.ranf.c.patch
@@ -0,0 +1,14 @@
+* remove redundant declaration, which causes conflicts
+
+--- Numeric-24.2/Packages/RNG/Src/ranf.c
++++ Numeric-24.2/Packages/RNG/Src/ranf.c
+@@ -149,9 +149,6 @@
+ #else
+ 	struct timeval tv;
+ 	struct timezone tz;
+-#if !defined(__sgi)
+-	int gettimeofday(struct timeval *, struct timezone *);
+-#endif
+ 
+ 	(void)gettimeofday(&tv,&tz);
+ 	s48[0] = (u32)tv.tv_sec;
diff --git a/dev-python/numeric/numeric-24.2-r6.ebuild b/dev-python/numeric/numeric-24.2-r6.ebuild
index 381474b8f3a4..fe454089148d 100644
--- a/dev-python/numeric/numeric-24.2-r6.ebuild
+++ b/dev-python/numeric/numeric-24.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild,v 1.14 2009/04/13 11:38:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild,v 1.15 2009/10/10 18:12:50 grobian Exp $
 
 NEED_PYTHON=2.3
 
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 S="${WORKDIR}/${MY_P}"
@@ -49,6 +49,10 @@ src_unpack() {
 	[[ "${PYVER}" == 2.5 ]] && epatch "${FILESDIR}"/${P}-python25.patch
 	# fix for dotblas from uncommited cvs
 	epatch "${FILESDIR}"/${P}-dotblas.patch
+	# fix gettimeofday issue on NetBSD
+	epatch "${FILESDIR}"/${PN}-24.2.ranf.c.patch
+	# rename z_abs on interix3, since there is a name colission with the system math.h
+	epatch "${FILESDIR}"/${P}-interix3.patch
 
 	# adapt lapack/cblas support
 	if use lapack; then