numarray-1.5.1-r2: fixed for gcc-4.1, lapack and headers

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

5 files changed, 140 insertions, 1 deletions

diff --git a/dev-python/numarray/ChangeLog b/dev-python/numarray/ChangeLog
index 79ccae616..c96e90d98 100644
--- a/dev-python/numarray/ChangeLog
+++ b/dev-python/numarray/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*numarray-1.5.1-r2 (24 May 2006)
+
+  24 May 2006; Sebastien Fabbro <seb@ist.utl.pt> +numarray-1.5.1-r2.ebuild,
+  +files/numarray-1.5.1-include.patch. Fixed gcc-4.1 problems, fixed headers
+  problems (from Debian patch)
+
 *numarray-1.5.1-r1 (04 Mar 2006)
 
   04 Mar 2006; Sebastien Fabbro <seb@ist.utl.pt> +numarray-1.5.1-r1.ebuild:
diff --git a/dev-python/numarray/Manifest b/dev-python/numarray/Manifest
index 28f88721e..6ada167ba 100644
--- a/dev-python/numarray/Manifest
+++ b/dev-python/numarray/Manifest
@@ -1,3 +1,6 @@
-MD5 a5f065f4ab47e9e322aa860a0bcaeef2 ChangeLog 2431
+MD5 3e0700df75a48ebda06597d7613108cd ChangeLog 2650
 MD5 3b253945667c1a85499157ac13dd220c files/digest-numarray-1.5.1-r1 67
+MD5 3b253945667c1a85499157ac13dd220c files/digest-numarray-1.5.1-r2 67
+MD5 37520cfe4faa14a59f09635d2328cbeb files/numarray-1.5.1-include.patch 2479
 MD5 c0d179b38525d0edd04153b5f207d79d numarray-1.5.1-r1.ebuild 1104
+MD5 2fc20693917253db6902e502f5e96c14 numarray-1.5.1-r2.ebuild 1630
diff --git a/dev-python/numarray/files/digest-numarray-1.5.1-r2 b/dev-python/numarray/files/digest-numarray-1.5.1-r2
new file mode 100644
index 000000000..7b08102ba
--- /dev/null
+++ b/dev-python/numarray/files/digest-numarray-1.5.1-r2
@@ -0,0 +1 @@
+MD5 e6c282b950f4383f294134424ae58f3b numarray-1.5.1.tar.gz 1196883
diff --git a/dev-python/numarray/files/numarray-1.5.1-include.patch b/dev-python/numarray/files/numarray-1.5.1-include.patch
new file mode 100644
index 000000000..dcac4544c
--- /dev/null
+++ b/dev-python/numarray/files/numarray-1.5.1-include.patch
@@ -0,0 +1,68 @@
+diff -Nur numarray-1.5.1/Include/numarray/arraybase.h numarray-1.5.1.new/Include/numarray/arraybase.h
+--- numarray-1.5.1/Include/numarray/arraybase.h	2006-01-30 18:51:21.000000000 +0000
++++ numarray-1.5.1.new/Include/numarray/arraybase.h	2006-05-24 19:23:57.000000000 +0100
+@@ -1,6 +1,8 @@
+ #if !defined(_arraybase_h)
+ #define _arraybase_h 1
+ 
++#include <Python.h>
++
+ #if defined(SIZEOF_VOID_P)
+ #if SIZEOF_VOID_P == 8
+ #define LP64 1
+@@ -17,6 +19,8 @@
+ #define HAS_UINT64 1
+ #endif
+ 
++#include "numconfig.h"
++
+ #define REFCOUNT(obj) (((PyObject *)(obj))->ob_refcnt)
+ #define MAX_ELSIZE 16
+ 
+diff -Nur numarray-1.5.1/Include/numarray/cfunc.h numarray-1.5.1.new/Include/numarray/cfunc.h
+--- numarray-1.5.1/Include/numarray/cfunc.h	2005-10-27 22:06:35.000000000 +0100
++++ numarray-1.5.1.new/Include/numarray/cfunc.h	2006-05-24 19:24:21.000000000 +0100
+@@ -1,6 +1,8 @@
+ #if !defined(__cfunc__)
+ #define __cfunc__ 1
+ 
++#include <Python.h>
++
+ typedef PyObject *(*CFUNCasPyValue)(void *);
+ typedef int (*UFUNC)(long, long, long, void **, long*);
+ /* typedef void (*CFUNC_2ARG)(long, void *, void *); */
+diff -Nur numarray-1.5.1/Include/numarray/nummacro.h numarray-1.5.1.new/Include/numarray/nummacro.h
+--- numarray-1.5.1/Include/numarray/nummacro.h	2005-11-28 01:07:02.000000000 +0000
++++ numarray-1.5.1.new/Include/numarray/nummacro.h	2006-05-24 19:25:10.000000000 +0100
+@@ -1,6 +1,8 @@
+ #if !defined(_ndarraymacro)
+ #define _ndarraymacro
+ 
++#include <Python.h>
++
+ /* The structs defined here are private implementation details of numarray
+ which are subject to change w/o notice.
+ */
+diff -Nur numarray-1.5.1/Include/numarray/tc.h numarray-1.5.1.new/Include/numarray/tc.h
+--- numarray-1.5.1/Include/numarray/tc.h	2003-05-09 18:11:56.000000000 +0100
++++ numarray-1.5.1.new/Include/numarray/tc.h	2006-05-24 19:25:32.000000000 +0100
+@@ -1,5 +1,7 @@
+ #if defined(MEASURE_TIMING)
+ 
++#include <Python.h>
++
+ /* ----------------------------------------------------------------------- */
+ 
+ typedef struct 
+diff -Nur numarray-1.5.1/Lib/numinclude.py numarray-1.5.1.new/Lib/numinclude.py
+--- numarray-1.5.1/Lib/numinclude.py	2006-02-07 20:13:29.000000000 +0000
++++ numarray-1.5.1.new/Lib/numinclude.py	2006-05-24 19:27:06.000000000 +0100
+@@ -4,7 +4,7 @@
+ import _ndarray
+ import os
+ 
+-include_dir = '/home/jmiller/work/debug/include/python2.4/numarray'
++include_dir = '/usr/include/python2.4/numarray'
+ version     = '1.5.1'
+ hasUInt64   = _ndarray.hasUInt64()
+ LP64        = _ndarray.lp64()
diff --git a/dev-python/numarray/numarray-1.5.1-r2.ebuild b/dev-python/numarray/numarray-1.5.1-r2.ebuild
new file mode 100644
index 000000000..06ca4901d
--- /dev/null
+++ b/dev-python/numarray/numarray-1.5.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit distutils fortran
+
+DESCRIPTION="Large array processing extension module for Python"
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/numarray
+	doc? http://www.stsci.edu/resources/software_hardware/numarray/manualPDF"
+
+# force blas-atlas because we don't have a virtual/cblas
+DEPEND=">=dev-lang/python-2.3
+	lapack? ( sci-libs/blas-atlas )
+	lapack? ( virtual/lapack )"
+IUSE="doc lapack"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+
+FORTRAN="gfortran g77"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-include.patch
+	cd ${S}
+	if use lapack; then
+		local myblas="/usr/$(get_libdir)/blas/atlas"
+		[ -d "/usr/$(get_libdir)/blas/threaded-atlas" ] && \
+			myblas=${myblas/threaded-/}
+		# fix default location and lib names
+		sed -i \
+			-e 's:/usr/local/lib/atlas:${myblas}:g' \
+			-e 's:/usr/local/include/atlas:/usr/include/atlas:g' \
+			-e 's:f77blas:blas:g' \
+			cfg_packages.py
+		# fix gfortran for > gcc-4
+        if  [[ ${FORTRANC} == gfortran ]]; then
+			sed -i \
+				-e "s:g2c:gfortran:g" \
+				cfg_packages.py
+        fi
+	fi
+}
+
+src_compile() {
+	# for some reason needs to define USE_LAPACK here to make it work
+	use lapack && export USE_LAPACK=1
+	distutils_src_compile
+}
+
+src_install() {
+	distutils_src_install
+	get_all_version_components
+	dodoc Doc/*.txt LICENSE.txt Doc/release_notes/ANNOUNCE-${PV:0:3}
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		newins "${DISTDIR}/manualPDF" users_guide.pdf
+		doins -r Examples
+	fi
+}