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

(Portage version: 2.1.2-r9)

11 files changed, 199 insertions, 106 deletions

diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog
index f9b71fa28b05..a6e028159361 100644
--- a/dev-python/numeric/ChangeLog
+++ b/dev-python/numeric/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-python/numeric
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.28 2007/02/07 17:21:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.29 2007/02/23 23:43:05 bicatali Exp $
+
+*numeric-24.2-r4 (23 Feb 2007)
+*numeric-24.2-r3 (23 Feb 2007)
+
+  23 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  files/numeric-24.2-arrayobject.patch, files/numeric-24.2-lapack.patch,
+  +files/numeric-24.2-python25.patch, +files/numeric-24.2-test.patch,
+  metadata.xml, -numeric-24.2-r1.ebuild, -numeric-24.2-r2.ebuild,
+  +numeric-24.2-r3.ebuild, +numeric-24.2-r4.ebuild:
+  Added sci herd in metadata.xml, removed buggy 
+  numeric-24.2-r{1,2}.ebuild, better cblas/lapack treatments, more patches.
+  Use numeric-24.2-r4 with lapack support for arches supporting it.
 
 *numeric-24.2-r2 (07 Feb 2007)
 
diff --git a/dev-python/numeric/files/digest-numeric-24.2-r1 b/dev-python/numeric/files/digest-numeric-24.2-r3
index b891af10ea95..44098727615d 100644
--- a/dev-python/numeric/files/digest-numeric-24.2-r1
+++ b/dev-python/numeric/files/digest-numeric-24.2-r3
@@ -1,3 +1,6 @@
 MD5 2ae672656e06716a149acb048cca3093 Numeric-24.2.tar.gz 743800
 RMD160 c9502db28663558c535e236392c9beddec9743bb Numeric-24.2.tar.gz 743800
 SHA256 5f72e729eb6ff57442f2a38bfc9931738b59e5077928e2e70d22b4610ff15258 Numeric-24.2.tar.gz 743800
+MD5 258b3758645568724ab1a3ead67db78a numpy.pdf 1234555
+RMD160 7a4f20c6f239989871594850f379cc2588ed34af numpy.pdf 1234555
+SHA256 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f numpy.pdf 1234555
diff --git a/dev-python/numeric/files/digest-numeric-24.2-r2 b/dev-python/numeric/files/digest-numeric-24.2-r4
index b891af10ea95..44098727615d 100644
--- a/dev-python/numeric/files/digest-numeric-24.2-r2
+++ b/dev-python/numeric/files/digest-numeric-24.2-r4
@@ -1,3 +1,6 @@
 MD5 2ae672656e06716a149acb048cca3093 Numeric-24.2.tar.gz 743800
 RMD160 c9502db28663558c535e236392c9beddec9743bb Numeric-24.2.tar.gz 743800
 SHA256 5f72e729eb6ff57442f2a38bfc9931738b59e5077928e2e70d22b4610ff15258 Numeric-24.2.tar.gz 743800
+MD5 258b3758645568724ab1a3ead67db78a numpy.pdf 1234555
+RMD160 7a4f20c6f239989871594850f379cc2588ed34af numpy.pdf 1234555
+SHA256 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f numpy.pdf 1234555
diff --git a/dev-python/numeric/files/numeric-24.2-arrayobject.patch b/dev-python/numeric/files/numeric-24.2-arrayobject.patch
index a67d5b4f501e..b17fc7a8a7a2 100644
--- a/dev-python/numeric/files/numeric-24.2-arrayobject.patch
+++ b/dev-python/numeric/files/numeric-24.2-arrayobject.patch
@@ -1,5 +1,5 @@
 --- Numeric-24.2/Src/arrayobject.c	2005-11-11 07:30:18.000000000 +0000
-+++ Numeric-24.2.new/Src/arrayobject.c	2006-06-06 19:13:58.000000000 +0100
++++ Numeric-24.2.new/Src/arrayobject.c	2007-02-08 12:12:01.000000000 +0000
 @@ -1866,7 +1866,7 @@
      for (i=0; i<sz; i++) {
  	v=array_item((PyArrayObject *)self, i);
@@ -9,3 +9,12 @@
  	    Py_DECREF(v);
  	}
      }
+@@ -2877,7 +2877,7 @@
+     PyArrayObject *ret=NULL;
+     PyArray_Descr *descr;
+     char *data;
+-    int buffer_len;
++    ssize_t buffer_len;
+     int res, i, n;
+     int dims[MAX_DIMS], strides[MAX_DIMS];
+     int swap;
diff --git a/dev-python/numeric/files/numeric-24.2-lapack.patch b/dev-python/numeric/files/numeric-24.2-lapack.patch
index bb77b77c8a77..926deb6d9a3a 100644
--- a/dev-python/numeric/files/numeric-24.2-lapack.patch
+++ b/dev-python/numeric/files/numeric-24.2-lapack.patch
@@ -1,5 +1,5 @@
---- Numeric-24.2.orig/customize.py	2005-11-13 02:40:14.000000000 +0000
-+++ Numeric-24.2/customize.py	2006-10-10 17:58:33.000000000 +0100
+--- customize.py.orig	2007-02-13 22:56:17.000000000 +0000
++++ customize.py	2007-02-13 22:59:20.000000000 +0000
 @@ -13,9 +13,9 @@
  # will be used, except on Mac OS X, where the vecLib framework will be used
  # if found.
@@ -8,11 +8,11 @@
 +use_system_lapack = 1
  lapack_library_dirs = []
 -lapack_libraries = []
-+lapack_libraries = ['lapack', 'cblas', 'blas', 'atlas', 'g2c']
++lapack_libraries = ['lapack']
  lapack_extra_link_args = []
  
  # Example: using ATLAS
-@@ -35,8 +35,8 @@
+@@ -35,11 +35,11 @@
  
  # Set use_dotblas to 1 to use BLAS for the matrix multiplication routines.
  # Put the directory that 'cblas.h' is in into dotblas_include_dirs
@@ -22,13 +22,8 @@
 +dotblas_include_dirs = ['/usr/include/atlas']
  dotblas_cblas_header = '<cblas.h>'
  dotblas_library_dirs = lapack_library_dirs
- dotblas_libraries = lapack_libraries
-@@ -45,7 +45,7 @@
- # Example: using ATLAS
- if 0:
-     use_dotblas = 1
--    dotblas_include_dirs = ['/usr/include/atlas']
-+    dotblas_include_dirs = ['/usr/include/atlas','/usr/include/cblas']
-     dotblas_library_dirs = lapack_library_dirs
-     dotblas_libraries = ['cblas', 'atlas', 'g2c']
+-dotblas_libraries = lapack_libraries
++dotblas_libraries = ['cblas', 'blas', 'atlas', 'g2c']
+ dotblas_extra_link_args = []
  
+ # Example: using ATLAS
diff --git a/dev-python/numeric/files/numeric-24.2-python25.patch b/dev-python/numeric/files/numeric-24.2-python25.patch
new file mode 100644
index 000000000000..8f29e60fe709
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2-python25.patch
@@ -0,0 +1,10 @@
+--- Numeric-24.2/Packages/RNG/Src/RNGmodule.c	2005-04-22 11:54:38.000000000 +0100
++++ Numeric-24.2.new/Packages/RNG/Src/RNGmodule.c	2007-02-13 20:06:07.000000000 +0000
+@@ -93,6 +93,7 @@
+ {
+ 	Py_XDECREF(self->parameters);
+ 	PyMem_DEL(self);
++	PyObject_FREE(self);
+ }
+ 
+ 
diff --git a/dev-python/numeric/files/numeric-24.2-test.patch b/dev-python/numeric/files/numeric-24.2-test.patch
new file mode 100644
index 000000000000..837f7c645bd1
--- /dev/null
+++ b/dev-python/numeric/files/numeric-24.2-test.patch
@@ -0,0 +1,12 @@
+--- Numeric-24.2/Test/test.py	2005-08-16 06:20:25.000000000 +0100
++++ Numeric-24.2.new/Test/test.py	2007-02-13 20:10:41.000000000 +0000
+@@ -581,7 +581,8 @@
+         assert_eq(Numeric.diagonal(b), [1,6,3,8])
+         assert_eq(Numeric.diagonal(b, -1), [5,2,7])
+         c = Numeric.array([b,b])
+-        assert_eq(Numeric.diagonal(c,1), [[2,7,4], [2,7,4]])
++        # default axes for "diagonal" are now 0 and 1. 
++        assert_eq(Numeric.diagonal(c,1,-2,-1), [[2,7,4], [2,7,4]])
+         
+ class UniversalFunctionsTestCase (unittest.TestCase):
+     def setUp (self):
diff --git a/dev-python/numeric/metadata.xml b/dev-python/numeric/metadata.xml
index bfa28bb2c37c..4d6bae10a496 100644
--- a/dev-python/numeric/metadata.xml
+++ b/dev-python/numeric/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>sci</herd>
 <herd>python</herd>
 <longdescription lang="en">
 The Numeric Extensions to Python (NumPy) adds multi-dimensional array
diff --git a/dev-python/numeric/numeric-24.2-r2.ebuild b/dev-python/numeric/numeric-24.2-r2.ebuild
deleted file mode 100644
index 1083a25a5985..000000000000
--- a/dev-python/numeric/numeric-24.2-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r2.ebuild,v 1.1 2007/02/07 17:21:10 bicatali Exp $
-
-inherit distutils eutils fortran
-
-MY_P=Numeric-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Numerical multidimensional array language facility for Python."
-HOMEPAGE="http://numeric.scipy.org/"
-SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="lapack"
-DEPEND=">=dev-lang/python-2.3
-	lapack? ( virtual/cblas virtual/lapack )"
-
-pkg_setup() {
-	if use lapack; then
-		FORTRAN="gfortran g77"
-		fortran_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if use lapack; then
-		fortran_src_unpack
-	else
-		unpack ${A}
-	fi
-	# fix list problem
-	epatch "${FILESDIR}"/${P}-arrayobject.patch
-	# fix skips of acosh, asinh
-	epatch "${FILESDIR}"/${P}-umath.patch
-	# fix eigenvalue hang
-	epatch "${FILESDIR}"/${P}-eigen.patch
-	# adapt lapack support
-	if use lapack; then
-		epatch "${FILESDIR}"/${P}-lapack.patch
-		if  [[ ${FORTRANC} == gfortran ]]; then
-			sed -i -e 's:g2c:gfortran:g' ${S}/customize.py
-		fi
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	distutils_python_version
-
-	# Numerical Tutorial is nice for testing and learning
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages/NumTut
-	doins Demo/NumTut/*
-
-	# install various doc from packages
-	docinto FFT
-	dodoc Packages/FFT/MANIFEST
-	docinto MA
-	dodoc Packages/MA/{MANIFEST,README}
-	docinto RNG
-	dodoc Packages/RNG/{MANIFEST,README}
-	docinto lapack_lite
-	dodoc Misc/lapack_lite/README
-	if use lapack; then
-		docinto dotblas
-		dodoc Packages/dotblas/{README,profileDot}.txt
-		insinto /usr/share/doc/${PF}/dotblas
-		doins Packages/dotblas/profileDot.py
-	fi
-}
diff --git a/dev-python/numeric/numeric-24.2-r1.ebuild b/dev-python/numeric/numeric-24.2-r3.ebuild
index 79aff0bd53fa..f81371bfadef 100644
--- a/dev-python/numeric/numeric-24.2-r1.ebuild
+++ b/dev-python/numeric/numeric-24.2-r3.ebuild
@@ -1,49 +1,60 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r1.ebuild,v 1.1 2007/02/07 17:14:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r3.ebuild,v 1.1 2007/02/23 23:43:05 bicatali Exp $
+
+NEED_PYTHON=2.3
 
 inherit distutils eutils
 
 MY_P=Numeric-${PV}
-S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Numerical multidimensional array language facility for Python."
 HOMEPAGE="http://numeric.scipy.org/"
-SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz
+	doc? ( http://numpy.scipy.org/numpy.pdf )"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.3"
+IUSE="doc"
 
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
+
+	use doc && cp "${DISTDIR}"/numpy.pdf ${S}/
+
 	# fix list problem
 	epatch "${FILESDIR}"/${P}-arrayobject.patch
 	# fix skips of acosh, asinh
 	epatch "${FILESDIR}"/${P}-umath.patch
 	# fix eigenvalue hang
 	epatch "${FILESDIR}"/${P}-eigen.patch
+	# fix a bug in the test
+	epatch "${FILESDIR}"/${P}-test.patch
+	# fix for python-2.5
+	epatch "${FILESDIR}"/${P}-python25.patch
+}
+
+src_test() {
+	cd build/lib*
+	PYTHONPATH=. "${python}" "${S}"/Test/test.py \
+		|| die "test failed"
 }
 
 src_install() {
 	distutils_src_install
 	distutils_python_version
 
-	# Numerical Tutorial is nice for testing and learning
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages/NumTut
-	doins Demo/NumTut/*
-
-	# install various doc from packages
-	docinto FFT
-	dodoc Packages/FFT/MANIFEST
-	docinto MA
-	dodoc Packages/MA/{MANIFEST,README}
-	docinto RNG
-	dodoc Packages/RNG/{MANIFEST,README}
-	docinto lapack_lite
-	dodoc Misc/lapack_lite/README
+	# install various README from packages
+	newdoc Packages/MA/README README.MA
+	newdoc Packages/RNG/README README.RNG
+
+	# install tutorial and docs
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r Test Demo/NumTut || die
+		newins "${S}"/numpy.pdf numeric.pdf || die
+	fi
 }
diff --git a/dev-python/numeric/numeric-24.2-r4.ebuild b/dev-python/numeric/numeric-24.2-r4.ebuild
new file mode 100644
index 000000000000..d31200ce43c0
--- /dev/null
+++ b/dev-python/numeric/numeric-24.2-r4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r4.ebuild,v 1.1 2007/02/23 23:43:05 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils eutils fortran
+
+MY_P=Numeric-${PV}
+
+DESCRIPTION="Numerical multidimensional array language facility for Python."
+HOMEPAGE="http://numeric.scipy.org/"
+SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz
+	doc? ( http://numpy.scipy.org/numpy.pdf )"
+
+# numeric does not work yet with other cblas implementations
+# than cblas-reference or blas-atlas (work in progress)
+RDEPEND="lapack? ( || ( sci-libs/blas-atlas sci-libs/cblas-reference )
+			  	   virtual/lapack )"
+DEPEND="${RDEPEND}
+	lapack? ( app-admin/eselect-cblas )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc lapack"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use lapack; then
+		FORTRAN="gfortran g77"
+		fortran_pkg_setup
+		for d in $(eselect cblas show); do mycblas=${d}; done
+		if [[ -z "${mycblas/reference/}" ]] && [[ -z "${mycblas/atlas/}" ]]; then
+			ewarn "You need to set cblas to atlas or reference. Do:"
+			ewarn "   eselect cblas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+}
+
+src_unpack() {
+	if use lapack; then
+		fortran_src_unpack
+	else
+		unpack ${A}
+	fi
+	use doc && cp "${DISTDIR}"/numpy.pdf ${S}/
+
+	# fix list problem
+	epatch "${FILESDIR}"/${P}-arrayobject.patch
+	# fix skips of acosh, asinh
+	epatch "${FILESDIR}"/${P}-umath.patch
+	# fix eigenvalue hang
+	epatch "${FILESDIR}"/${P}-eigen.patch
+	# fix a bug in the test
+	epatch "${FILESDIR}"/${P}-test.patch
+	# fix for python-2.5
+	epatch "${FILESDIR}"/${P}-python25.patch
+
+	# adapt lapack support
+	if use lapack; then
+		epatch "${FILESDIR}"/${P}-lapack.patch
+		if  [[ "${FORTRANC}" == gfortran ]]; then
+			sed -i -e 's:g2c:gfortran:g' customize.py
+		fi
+		[[ "${mycblas}" == reference ]] && \
+			sed -i \
+			-e "s:'atlas',::g" \
+			-e "s:include/atlas:include/cblas:g" \
+			cusomize.py
+	fi
+}
+
+#src_compile() {
+#	use lapack && unset LDFLAGS
+#	distutils_src_compile
+#}
+
+src_test() {
+	cd build/lib*
+	PYTHONPATH=. "${python}" "${S}"/Test/test.py \
+		|| die "test failed"
+}
+
+src_install() {
+	distutils_src_install
+	distutils_python_version
+
+	# install various README from packages
+	newdoc Packages/MA/README README.MA
+	newdoc Packages/RNG/README README.RNG
+
+	if use lapack; then
+		docinto dotblas
+		dodoc Packages/dotblas/{README,profileDot}.txt
+		insinto /usr/share/doc/${PF}/dotblas
+		doins Packages/dotblas/profileDot.py
+	fi
+
+	# install tutorial and docs
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r Test Demo/NumTut || die
+		newins "${S}"/numpy.pdf numeric.pdf || die
+	fi
+}