cleaned patches, replaced numarray-1.5.2 with -r1 and better lapack treatment

Package-Manager: portage-2.1.2-r9

diff --git a/dev-python/numarray/ChangeLog b/dev-python/numarray/ChangeLog
index 97320d5c4aa3929a12a1b901bb2b34dab372e3fe..95b4e8dda561c3e02f3afde092aaf45512749b13 100644 (file)
--- a/dev-python/numarray/ChangeLog
+++ b/dev-python/numarray/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/numarray
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/ChangeLog,v 1.20 2007/02/07 20:55:38 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/ChangeLog,v 1.21 2007/02/23 23:26:18 bicatali Exp $
+
+*numarray-1.5.2-r1 (23 Feb 2007)
+
+  23 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/numarray-1.5.2-html.patch, files/numarray-1.5.2-includes.patch,
+  -files/numarray-1.5.2-numinclude.patch,
+  -files/numarray-1.5.2-lapack.patch,
+  +files/numarray-1.5.2-refcount.patch, metadata.xml,
+  -numarray-1.5.2.ebuild, +numarray-1.5.2-r1.ebuild:
+  better treatment of cblas/lapack, added some patches, a src_test and 
+  much cleaning.
 
   07 Feb 2007; Marien Zwart <marienz@gentoo.org> numarray-1.5.2.ebuild:
   Fix syntax error in SRC_URI. Closes bug #165789, thanks to Darren Dale for

diff --git a/dev-python/numarray/Manifest b/dev-python/numarray/Manifest
index 5e1ea23742b32726254cc832218b5835795c49a3..f56e9521f7b8440aae736de231d97b9201029a2a 100644 (file)
--- a/dev-python/numarray/Manifest
+++ b/dev-python/numarray/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX numarray-1.5.2-html.patch 538 RMD160 09c2a5fe50ae6ce66dc640854e04e18f71b41f4d SHA1 e97325fef9316d0aa80a75164b4876f30c91fff4 SHA256 8261742a79d730a526632d11c48f574c6c84bdedeadd2a120289ba64a4828b66
-MD5 e0eb3c6ef22919b83a3e4e802de5f9d0 files/numarray-1.5.2-html.patch 538
-RMD160 09c2a5fe50ae6ce66dc640854e04e18f71b41f4d files/numarray-1.5.2-html.patch 538
-SHA256 8261742a79d730a526632d11c48f574c6c84bdedeadd2a120289ba64a4828b66 files/numarray-1.5.2-html.patch 538
-AUX numarray-1.5.2-includes.patch 1995 RMD160 b89304f335e7bff4a56eec8e8c5c1001843472bf SHA1 81e1abdd77235273558e74f2d7e323842f4c5529 SHA256 4ff1347c11a52d38a4def9787299fcad66db94ada5a9986b0221175f0c9e4864
-MD5 288812bfe69f9655decb8e39fe4aed44 files/numarray-1.5.2-includes.patch 1995
-RMD160 b89304f335e7bff4a56eec8e8c5c1001843472bf files/numarray-1.5.2-includes.patch 1995
-SHA256 4ff1347c11a52d38a4def9787299fcad66db94ada5a9986b0221175f0c9e4864 files/numarray-1.5.2-includes.patch 1995
-AUX numarray-1.5.2-numinclude.patch 404 RMD160 3759c9d5ac115cdb6f2084b56a08f879c7d27462 SHA1 f06609b62a9dc4dad6b1821f9d3fb6f7ff6adf36 SHA256 603356a9e1ab6772baf72dc089f519a8d7fb37bed1993687e6be6fc3040dfb68
-MD5 75fcd18347f72d9276dd1d7626c64cf1 files/numarray-1.5.2-numinclude.patch 404
-RMD160 3759c9d5ac115cdb6f2084b56a08f879c7d27462 files/numarray-1.5.2-numinclude.patch 404
-SHA256 603356a9e1ab6772baf72dc089f519a8d7fb37bed1993687e6be6fc3040dfb68 files/numarray-1.5.2-numinclude.patch 404
+AUX numarray-1.5.2-includes.patch 1763 RMD160 24bb7992e8e898b00ab90b7e82120eb7c7b2ba4c SHA1 f822dc2c202c36b2dcfbdbe83408b165b1aa9c13 SHA256 02016cf4b2038aff9cd8a6bc388da7dd2e461ef28b869c47f642a8a31033c6d5
+MD5 98e007f8a6b5d0805b02bd2de59b7749 files/numarray-1.5.2-includes.patch 1763
+RMD160 24bb7992e8e898b00ab90b7e82120eb7c7b2ba4c files/numarray-1.5.2-includes.patch 1763
+SHA256 02016cf4b2038aff9cd8a6bc388da7dd2e461ef28b869c47f642a8a31033c6d5 files/numarray-1.5.2-includes.patch 1763
+AUX numarray-1.5.2-refcount.patch 289 RMD160 b8a0f68560881aa08fd0e93bc9086b1b0b97acad SHA1 e3ee147d59ea164db7912ad8e6a3f76409ca6031 SHA256 775d401415a8509e00d064b4323986aa1083aa4331094e94027799f8c1f2768f
+MD5 9c5dfe77fd316676d570647bba4c36a6 files/numarray-1.5.2-refcount.patch 289
+RMD160 b8a0f68560881aa08fd0e93bc9086b1b0b97acad files/numarray-1.5.2-refcount.patch 289
+SHA256 775d401415a8509e00d064b4323986aa1083aa4331094e94027799f8c1f2768f files/numarray-1.5.2-refcount.patch 289
 DIST numarray-1.3.1.tar.gz 1193560 RMD160 3e84041e2faaee9b31f0668cd604928d2713bba7 SHA1 34c14ab3abd0fb3c19f8c5a8883275db60114e51 SHA256 f5483a25194a769f2e1ec1576e0ff1a05d39e49830b5e26e7d6f5092ec36ae4c
 DIST numarray-1.4.1.tar.gz 1186165 RMD160 f87cec4af34f53fc01842456bf432d80b7935f27 SHA1 b8b1d7d8a87c1dd9cc7caa9bd69f8068925c5824 SHA256 c080d8487d8fcfcb6017784153f850382dc4739e2b7d98d686fa8eefbb705777
 DIST numarray-1.5.0.tar.gz 1192005 RMD160 ddb7236ecccb35b0efa8dccb5b8203f1166959d3 SHA1 1bd6357207470bccb32dc485d62bba655e07ff89 SHA256 061a71f5324cf0808f611eb77455c273d1b9595ca6337d8ba7f201c2f1a8b12c
@@ -35,18 +31,18 @@ EBUILD numarray-1.5.1.ebuild 740 RMD160 8be3e134127a45fe5571ee0908cc1d6bade49abc
 MD5 dd91203b6006c2f73c3dd3213ec54cf7 numarray-1.5.1.ebuild 740
 RMD160 8be3e134127a45fe5571ee0908cc1d6bade49abc numarray-1.5.1.ebuild 740
 SHA256 adb574deeb3da29cbab3ae2bbddb2004062247ec7bc2d705f5a2bcd6b4192428 numarray-1.5.1.ebuild 740
-EBUILD numarray-1.5.2.ebuild 1673 RMD160 68a9bdefdc5b5e527291d69bd2b671acfc227337 SHA1 4d29687ccff53e3c290b00ba854e3f180bcf82ed SHA256 f68c6381f5b01c65541ccb296998fdc7c38a796e4c599328e208ea0cde3181e9
-MD5 5c1130a1727058b8b788df4894afe811 numarray-1.5.2.ebuild 1673
-RMD160 68a9bdefdc5b5e527291d69bd2b671acfc227337 numarray-1.5.2.ebuild 1673
-SHA256 f68c6381f5b01c65541ccb296998fdc7c38a796e4c599328e208ea0cde3181e9 numarray-1.5.2.ebuild 1673
-MISC ChangeLog 2851 RMD160 ba0ea8ad6ee3c73004d4e1cafe7e94b7fc190943 SHA1 2fc1091fffbc01c5e651a45980e18eab4043e1d9 SHA256 050c7d240c9c6559a326fd4669864e85a83d420816e36291005c52665ec0dd26
-MD5 177a3fef431fdd304890de5c92471105 ChangeLog 2851
-RMD160 ba0ea8ad6ee3c73004d4e1cafe7e94b7fc190943 ChangeLog 2851
-SHA256 050c7d240c9c6559a326fd4669864e85a83d420816e36291005c52665ec0dd26 ChangeLog 2851
-MISC metadata.xml 923 RMD160 cdf7e5a16211111d2c317056d5d41ddc1b6a30e1 SHA1 8b392f68114b8524269f2508d74b7d65eac6dbb3 SHA256 36b17aa66e3e4356e4d44cd7f5d5a4a5ff5f8813c6ccef3eb118905bb6e8c7c2
-MD5 1ffa32cfa3e5c763b32594feb8047497 metadata.xml 923
-RMD160 cdf7e5a16211111d2c317056d5d41ddc1b6a30e1 metadata.xml 923
-SHA256 36b17aa66e3e4356e4d44cd7f5d5a4a5ff5f8813c6ccef3eb118905bb6e8c7c2 metadata.xml 923
+EBUILD numarray-1.5.2-r1.ebuild 3070 RMD160 52e0eff082f469f1630c6e481b3607784f014c90 SHA1 14fc868394136b5e4414dc66b9fcba4acbb34516 SHA256 dc9b805d7bea0c8c81aaa0199bf303449bd8bcfb3ac9304d88ee3a5a4b7c8008
+MD5 83bf0596964d511311f8003e7052e701 numarray-1.5.2-r1.ebuild 3070
+RMD160 52e0eff082f469f1630c6e481b3607784f014c90 numarray-1.5.2-r1.ebuild 3070
+SHA256 dc9b805d7bea0c8c81aaa0199bf303449bd8bcfb3ac9304d88ee3a5a4b7c8008 numarray-1.5.2-r1.ebuild 3070
+MISC ChangeLog 3291 RMD160 b4b8cbd21c11abfa21277472acd1a9b700582d28 SHA1 200e972faedd9f036c37cb30fcde14671a997d1d SHA256 dd86e0e1e25c46bae4bdf76a05044b047cb3ccd8652982109fe206a1a9d72926
+MD5 cc214ac7e0ccd49d4e1a996d0c7e2986 ChangeLog 3291
+RMD160 b4b8cbd21c11abfa21277472acd1a9b700582d28 ChangeLog 3291
+SHA256 dd86e0e1e25c46bae4bdf76a05044b047cb3ccd8652982109fe206a1a9d72926 ChangeLog 3291
+MISC metadata.xml 950 RMD160 678f238a25e95981f6668360be4f564a84eafba8 SHA1 5b2721eab57bd7bb4946400354edd4d162930fc3 SHA256 1e4851dd9530a0ee08781b710b138653904b195fdb4d2e62152ad4f2534acaf8
+MD5 a97691f0d19210f3741485b1ca4dcf37 metadata.xml 950
+RMD160 678f238a25e95981f6668360be4f564a84eafba8 metadata.xml 950
+SHA256 1e4851dd9530a0ee08781b710b138653904b195fdb4d2e62152ad4f2534acaf8 metadata.xml 950
 MD5 4b720d40a42fb05f3331167673f5117c files/digest-numarray-1.3.1 247
 RMD160 d88ebb753f2487ab95c324784eed08f44eecb3bb files/digest-numarray-1.3.1 247
 SHA256 b2e635637ffa282c7b47a42401530a469e121caa560de8a62caeed92a4993e42 files/digest-numarray-1.3.1 247
@@ -59,13 +55,13 @@ SHA256 266f17ffb1b10af3a309f6ed4df014500533d33ea41848186aaaf9c772b8db04 files/di
 MD5 2959c508b89458218474ed7bd5109b2e files/digest-numarray-1.5.1 247
 RMD160 3d8a53e09e5a8d2f17047533d83883d0693f69da files/digest-numarray-1.5.1 247
 SHA256 6e1fe18b9b0d4130d9bcae570114c298324519ee06a5eccd64d2a7acd3c1dbc2 files/digest-numarray-1.5.1 247
-MD5 8156150213bcbcb20722f62a1981476e files/digest-numarray-1.5.2 500
-RMD160 08839452392d78160290d8ce7baffbd114f7d18e files/digest-numarray-1.5.2 500
-SHA256 4527949b921e98437b3d48fec263d3180b6a2ff67b4f9da18082310d07a3a312 files/digest-numarray-1.5.2 500
+MD5 8156150213bcbcb20722f62a1981476e files/digest-numarray-1.5.2-r1 500
+RMD160 08839452392d78160290d8ce7baffbd114f7d18e files/digest-numarray-1.5.2-r1 500
+SHA256 4527949b921e98437b3d48fec263d3180b6a2ff67b4f9da18082310d07a3a312 files/digest-numarray-1.5.2-r1 500
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFyjzsUElL7eJpfEQRArDVAJ9r321e+ICA12mjxCgyzmIKAOnpNQCgusoJ
-8yFlDRQnUTQIeGEK7qGZKPE=
-=G77L
+iD8DBQFF33hSWc/Ciu+QQGkRAuE2AJ4/33wkxN4qKRKtq9cUDiWdfoqBuACbBs8j
+fCEoWGHpcvCO7gMil9AWGYE=
+=nqNZ
 -----END PGP SIGNATURE-----

diff --git a/dev-python/numarray/files/digest-numarray-1.5.2 b/dev-python/numarray/files/digest-numarray-1.5.2-r1
similarity index 100%
rename from dev-python/numarray/files/digest-numarray-1.5.2
rename to dev-python/numarray/files/digest-numarray-1.5.2-r1

diff --git a/dev-python/numarray/files/numarray-1.5.2-html.patch b/dev-python/numarray/files/numarray-1.5.2-html.patch
deleted file mode 100644 (file)
index b2e4896..0000000
--- a/dev-python/numarray/files/numarray-1.5.2-html.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- numarray-1.5.2/Doc/manual/Makefile 2005-04-28 16:58:23.000000000 +0100
-+++ numarray-1.5.2.new/Doc/manual/Makefile     2006-08-30 19:54:21.000000000 +0100
-@@ -52,7 +52,7 @@
- 
- dvi:          numarray.dvi
- 
--html:         numarray
-+html:         numarray.html
- 
- pdf:          numarray.pdf
- 
-@@ -71,7 +71,7 @@
-               echo "You need to create a link to mkhowto,"
-               echo "see the README for details."
- 
--numarray:     Makefile mkhowto $(SOURCES)
-+numarray.html:        Makefile mkhowto $(SOURCES)
-               $(MKHOWTO) --html $(OPTIONS) numarray.tex
- 
- numarray.dvi: Makefile mkhowto $(SOURCES)

diff --git a/dev-python/numarray/files/numarray-1.5.2-includes.patch b/dev-python/numarray/files/numarray-1.5.2-includes.patch
index 43536999bf3dea43fb6f378e00fc58a0a1049c5c..b425ef8b7e34c31bf061e93bb12b98c381d37b78 100644 (file)
--- a/dev-python/numarray/files/numarray-1.5.2-includes.patch
+++ b/dev-python/numarray/files/numarray-1.5.2-includes.patch
@@ -1,6 +1,6 @@
-diff -Nur numarray-1.5.2/Include/numarray/arraybase.h numarray-1.5.2.new/Include/numarray/arraybase.h
---- numarray-1.5.2/Include/numarray/arraybase.h        2006-01-23 11:45:03.000000000 +0000
-+++ numarray-1.5.2.new/Include/numarray/arraybase.h    2006-08-30 19:54:21.000000000 +0100
+diff -Nur Include.orig/numarray/arraybase.h Include/numarray/arraybase.h
+--- Include.orig/numarray/arraybase.h  2007-02-08 16:08:06.000000000 +0000
++++ Include/numarray/arraybase.h       2007-02-08 16:07:30.000000000 +0000
 @@ -1,6 +1,8 @@
  #if !defined(_arraybase_h)
  #define _arraybase_h 1
@@ -19,9 +19,9 @@ diff -Nur numarray-1.5.2/Include/numarray/arraybase.h numarray-1.5.2.new/Include
  #define REFCOUNT(obj) (((PyObject *)(obj))->ob_refcnt)
  #define MAX_ELSIZE 16
  
-diff -Nur numarray-1.5.2/Include/numarray/cfunc.h numarray-1.5.2.new/Include/numarray/cfunc.h
---- numarray-1.5.2/Include/numarray/cfunc.h    2005-10-27 22:06:35.000000000 +0100
-+++ numarray-1.5.2.new/Include/numarray/cfunc.h        2006-08-30 19:54:21.000000000 +0100
+diff -Nur Include.orig/numarray/cfunc.h Include/numarray/cfunc.h
+--- Include.orig/numarray/cfunc.h      2007-02-08 16:08:06.000000000 +0000
++++ Include/numarray/cfunc.h   2007-02-08 16:07:30.000000000 +0000
 @@ -1,6 +1,8 @@
  #if !defined(__cfunc__)
  #define __cfunc__ 1
@@ -31,9 +31,9 @@ diff -Nur numarray-1.5.2/Include/numarray/cfunc.h numarray-1.5.2.new/Include/num
  typedef PyObject *(*CFUNCasPyValue)(void *);
  typedef int (*UFUNC)(long, long, long, void **, long*);
  /* typedef void (*CFUNC_2ARG)(long, void *, void *); */
-diff -Nur numarray-1.5.2/Include/numarray/nummacro.h numarray-1.5.2.new/Include/numarray/nummacro.h
---- numarray-1.5.2/Include/numarray/nummacro.h 2005-11-28 01:07:02.000000000 +0000
-+++ numarray-1.5.2.new/Include/numarray/nummacro.h     2006-08-30 19:54:21.000000000 +0100
+diff -Nur Include.orig/numarray/nummacro.h Include/numarray/nummacro.h
+--- Include.orig/numarray/nummacro.h   2007-02-08 16:08:06.000000000 +0000
++++ Include/numarray/nummacro.h        2007-02-08 16:07:30.000000000 +0000
 @@ -1,6 +1,8 @@
  #if !defined(_ndarraymacro)
  #define _ndarraymacro
@@ -43,9 +43,9 @@ diff -Nur numarray-1.5.2/Include/numarray/nummacro.h numarray-1.5.2.new/Include/
  /* The structs defined here are private implementation details of numarray
  which are subject to change w/o notice.
  */
-diff -Nur numarray-1.5.2/Include/numarray/tc.h numarray-1.5.2.new/Include/numarray/tc.h
---- numarray-1.5.2/Include/numarray/tc.h       2003-05-09 18:11:56.000000000 +0100
-+++ numarray-1.5.2.new/Include/numarray/tc.h   2006-08-30 19:54:21.000000000 +0100
+diff -Nur Include.orig/numarray/tc.h Include/numarray/tc.h
+--- Include.orig/numarray/tc.h 2007-02-08 16:08:06.000000000 +0000
++++ Include/numarray/tc.h      2007-02-08 16:07:30.000000000 +0000
 @@ -1,5 +1,7 @@
  #if defined(MEASURE_TIMING)
  

diff --git a/dev-python/numarray/files/numarray-1.5.2-numinclude.patch b/dev-python/numarray/files/numarray-1.5.2-numinclude.patch
deleted file mode 100644 (file)
index 3da32fc..0000000
--- a/dev-python/numarray/files/numarray-1.5.2-numinclude.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- numarray-1.5.2/Lib/numinclude.py   2006-08-24 19:40:48.000000000 +0100
-+++ numarray-1.5.2.new/Lib/numinclude.py       2006-08-30 19:54:21.000000000 +0100
-@@ -4,7 +4,7 @@
- import _ndarray
- import os
- 
--include_dir = '/home/jmiller/work/debug/include/python2.5/numarray'
-+include_dir = '/usr/include/python2.4/numarray'
- version     = '1.5.2'
- hasUInt64   = _ndarray.hasUInt64()
- LP64        = _ndarray.lp64()

diff --git a/dev-python/numarray/files/numarray-1.5.2-refcount.patch b/dev-python/numarray/files/numarray-1.5.2-refcount.patch
new file mode 100644 (file)
index 0000000..d80f90f
--- /dev/null
+++ b/dev-python/numarray/files/numarray-1.5.2-refcount.patch
@@ -0,0 +1,10 @@
+--- Src/libnumarray.ch 2006-08-24 19:38:15.000000000 +0100
++++ Src/libnumarray.ch.new     2007-02-08 16:10:49.000000000 +0000
+@@ -877,6 +877,7 @@
+               if (!buf) return NULL;
+       } else {
+               buf = Py_None;
++              Py_INCREF(buf);
+       }
+       
+       a = NA_NewAllFromBuffer( nd, dimensions, descr->type_num, buf, 

diff --git a/dev-python/numarray/metadata.xml b/dev-python/numarray/metadata.xml
index 255a5187017be37edcefed9ce3b5e61da46168f4..b4eae99877663cacc1d9369038ef32852dc84e07 100644 (file)
--- a/dev-python/numarray/metadata.xml
+++ b/dev-python/numarray/metadata.xml
@@ -1,8 +1,9 @@
 <?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>
+<longdescription lang="en">
 Numarray is an array processing package designed to efficiently
 manipulate large multi-dimensional arrays.  Numarray is modelled after
 Numeric and features c-code generated from python template scripts,

diff --git a/dev-python/numarray/numarray-1.5.2-r1.ebuild b/dev-python/numarray/numarray-1.5.2-r1.ebuild
new file mode 100644 (file)
index 0000000..2e935ca
--- /dev/null
+++ b/dev-python/numarray/numarray-1.5.2-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/numarray-1.5.2-r1.ebuild,v 1.1 2007/02/23 23:26:18 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils fortran
+
+DOC_PV=1.5
+DESCRIPTION="Large array processing extension module for Python"
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
+       doc? ( mirror://sourceforge/numpy/${PN}-${DOC_PV}.html.tar.gz )"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/numarray"
+
+# numarray does not work yet with other cblas implementations
+# than cblas-reference or blas-atlas
+RDEPEND="lapack? ( || ( >=sci-libs/blas-atlas-3.7.11-r1
+                                  >=sci-libs/cblas-reference-20030223-r3 )
+                                  virtual/lapack )"
+DEPEND="${RDEPEND}
+       lapack? ( app-admin/eselect-cblas )"
+
+IUSE="doc lapack"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+
+DOCS="LICENSE.txt Doc/*.txt Doc/release_notes/ANNOUNCE-${PV:0:3}"
+
+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
+
+       cd "${S}"
+       # include Python.h from header files using the PyObject_HEAD macro.
+       epatch "${FILESDIR}"/${P}-includes.patch
+
+       # fix refcount problem from a debian bug
+       epatch "${FILESDIR}"/${P}-refcount.patch
+
+       # fix hard-coded path in numinclude
+       sed -i \
+               -e "s:/home/jmiller/work/debug/include/python2.5:/usr/include/python${PYVER}:" \
+               Lib/numinclude.py || die "sed failed"
+
+       # configure cfg_packages.py for lapack
+       if use lapack; then
+               sed -i \
+                       -e '/^if USE_LAPACK:/iUSE_LAPACK=True' \
+                       -e 's:/usr/local/include/atlas:/usr/include/atlas:g' \
+                       -e "s:/usr/local/lib/atlas:/usr/$(get_libdir):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
+               [[ "${mycblas}" == reference ]] && \
+                       sed -i \
+                       -e "s:'atlas',::g" \
+                       -e "s:include/atlas:include/cblas:g" \
+                       cfg_packages.py
+       fi
+       ${python} setup.py config --gencode || die "API code generation failed"
+}
+
+src_test() {
+       # test with lapack buggy
+       if use lapack; then
+               einfo "no automatic testing with external lapack"
+               return
+       fi
+       ebegin "Testing numarray functions"
+       cd build/lib*
+       cp "${S}"/Lib/testdata.fits numarray
+       PYTHONPATH=. "${python}" -c \
+               "from numarray.testall import test;import sys;sys.exit(test())" \
+               > test.log
+       grep -q -i failed test.log  && die "failed tests in ${PWD}/test.log"
+       eend $?
+       rm -f numarray/testdata.fits test*.*
+}
+
+
+src_install() {
+       distutils_src_install
+       if use doc; then
+               insinto /usr/share/doc/${PF}
+               doins -r Examples
+               dohtml ${WORKDIR}/${PN}-${DOC_PV}/* || die "dohtml failed"
+       fi
+}

diff --git a/dev-python/numarray/numarray-1.5.2.ebuild b/dev-python/numarray/numarray-1.5.2.ebuild
deleted file mode 100644 (file)
index dadbebb..0000000
--- a/dev-python/numarray/numarray-1.5.2.ebuild
+++ /dev/null
@@ -1,67 +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/numarray/numarray-1.5.2.ebuild,v 1.2 2007/02/07 20:55:38 marienz Exp $
-
-inherit distutils fortran
-
-DESCRIPTION="Large array processing extension module for Python"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
-       doc? ( mirror://sourceforge/numpy/${PN}-1.5.html.tar.gz )"
-HOMEPAGE="http://www.stsci.edu/resources/software_hardware/numarray"
-DEPEND=">=dev-lang/python-2.3
-       lapack? ( virtual/lapack )"
-IUSE="doc lapack"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-
-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
-
-       use doc && mv ${PN}-1.5 html
-       # include Python.h from header files using the PyObject_HEAD macro.
-       epatch "${FILESDIR}"/${P}-includes.patch
-
-       # fix Makefile for html docs
-       epatch "${FILESDIR}"/${P}-html.patch
-
-       # fix hard-coded path in numinclude
-       epatch "${FILESDIR}"/${P}-numinclude.patch
-
-       cd "${S}"
-       if use lapack; then
-               sed -i \
-                       -e '/^if USE_LAPACK:/iUSE_LAPACK=True' \
-                       -e "s:/usr/local/lib/atlas:/usr/$(get_libdir):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_install() {
-       distutils_src_install
-       dodoc Doc/*.txt LICENSE.txt Doc/release_notes/ANNOUNCE-${PV:0:3}
-       if use doc; then
-               insinto /usr/share/doc/${PF}
-               doins -r Examples
-               dohtml ${WORKDIR}/html
-       fi
-}