diff options
Diffstat (limited to 'dev-python/numarray')
| -rw-r--r-- | dev-python/numarray/Manifest | 27 | ||||
| -rw-r--r-- | dev-python/numarray/files/digest-numarray-1.5.1-r2 | 1 | ||||
| -rw-r--r-- | dev-python/numarray/files/digest-numarray-1.5.2 | 6 | ||||
| -rw-r--r-- | dev-python/numarray/files/numarray-1.5.1-include.patch | 68 | ||||
| -rw-r--r-- | dev-python/numarray/files/numarray-1.5.2-html.patch | 20 | ||||
| -rw-r--r-- | dev-python/numarray/files/numarray-1.5.2-includes.patch | 56 | ||||
| -rw-r--r-- | dev-python/numarray/files/numarray-1.5.2-numinclude.patch | 11 | ||||
| -rw-r--r-- | dev-python/numarray/numarray-1.5.2.ebuild (renamed from dev-python/numarray/numarray-1.5.1-r2.ebuild) | 38 |
8 files changed, 136 insertions, 91 deletions
diff --git a/dev-python/numarray/Manifest b/dev-python/numarray/Manifest index 691ffa717..4fa99f635 100644 --- a/dev-python/numarray/Manifest +++ b/dev-python/numarray/Manifest @@ -1,4 +1,25 @@ +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 +DIST numarray-1.5.2.tar.gz 1196014 RMD160 51cc7681958cada32c515872e8def6fc0ff296ca SHA1 17f6c4bb5f0d97e93923b8ca4f55fccc1ee985e9 SHA256 6f6dc1a348c2fa32b2179717f3b3af4ddf60e9a3417739d325f344eb8f243174 +DIST numarray-1.5.html.tar.gz 203409 RMD160 361850242a04efea59befe7e05dd9cb6fa1cb457 SHA1 dd88e63e19d51dcc4ff092dff47048bf37bf674c SHA256 55d6322e83d78d6f0961ae563bf81602214fb44d47929a212f0342fb579346a6 +EBUILD numarray-1.5.2.ebuild 1637 RMD160 a200b194c5fcde278cce7d57843cd9eefce76421 SHA1 5c733b7620191d87b710d70be48c14fa97d78774 SHA256 8d7277bd0deb304593d6a66ce466a1eded910e41a3ebedefbb7516f5a9f94c3f +MD5 ba156495f2cce698de09edea2ea7f101 numarray-1.5.2.ebuild 1637 +RMD160 a200b194c5fcde278cce7d57843cd9eefce76421 numarray-1.5.2.ebuild 1637 +SHA256 8d7277bd0deb304593d6a66ce466a1eded910e41a3ebedefbb7516f5a9f94c3f numarray-1.5.2.ebuild 1637 +MISC ChangeLog 2650 RMD160 118421f10adb3609abd448e29eac2ef0142e8e2d SHA1 6751b8ac70bde841f6f442506700fb3f565d189d SHA256 1612313308c3e235f384cba69f9b5cd6419a1c5ce57bc58fffeac8fac470cef2 MD5 3e0700df75a48ebda06597d7613108cd ChangeLog 2650 -MD5 3b253945667c1a85499157ac13dd220c files/digest-numarray-1.5.1-r2 67 -MD5 37520cfe4faa14a59f09635d2328cbeb files/numarray-1.5.1-include.patch 2479 -MD5 da04b59a3fc0c3af5aafae8fab07b318 numarray-1.5.1-r2.ebuild 1616 +RMD160 118421f10adb3609abd448e29eac2ef0142e8e2d ChangeLog 2650 +SHA256 1612313308c3e235f384cba69f9b5cd6419a1c5ce57bc58fffeac8fac470cef2 ChangeLog 2650 +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 diff --git a/dev-python/numarray/files/digest-numarray-1.5.1-r2 b/dev-python/numarray/files/digest-numarray-1.5.1-r2 deleted file mode 100644 index 7b08102ba..000000000 --- a/dev-python/numarray/files/digest-numarray-1.5.1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 e6c282b950f4383f294134424ae58f3b numarray-1.5.1.tar.gz 1196883 diff --git a/dev-python/numarray/files/digest-numarray-1.5.2 b/dev-python/numarray/files/digest-numarray-1.5.2 new file mode 100644 index 000000000..882e2bded --- /dev/null +++ b/dev-python/numarray/files/digest-numarray-1.5.2 @@ -0,0 +1,6 @@ +MD5 d2ecfc60fe4869c328b872540d04e0f7 numarray-1.5.2.tar.gz 1196014 +RMD160 51cc7681958cada32c515872e8def6fc0ff296ca numarray-1.5.2.tar.gz 1196014 +SHA256 6f6dc1a348c2fa32b2179717f3b3af4ddf60e9a3417739d325f344eb8f243174 numarray-1.5.2.tar.gz 1196014 +MD5 c7b23442b8ead6aa7521f27049c41deb numarray-1.5.html.tar.gz 203409 +RMD160 361850242a04efea59befe7e05dd9cb6fa1cb457 numarray-1.5.html.tar.gz 203409 +SHA256 55d6322e83d78d6f0961ae563bf81602214fb44d47929a212f0342fb579346a6 numarray-1.5.html.tar.gz 203409 diff --git a/dev-python/numarray/files/numarray-1.5.1-include.patch b/dev-python/numarray/files/numarray-1.5.1-include.patch deleted file mode 100644 index dcac4544c..000000000 --- a/dev-python/numarray/files/numarray-1.5.1-include.patch +++ /dev/null @@ -1,68 +0,0 @@ -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/files/numarray-1.5.2-html.patch b/dev-python/numarray/files/numarray-1.5.2-html.patch new file mode 100644 index 000000000..b2e4896d7 --- /dev/null +++ b/dev-python/numarray/files/numarray-1.5.2-html.patch @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000..43536999b --- /dev/null +++ b/dev-python/numarray/files/numarray-1.5.2-includes.patch @@ -0,0 +1,56 @@ +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 +@@ -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.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 +@@ -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.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 +@@ -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.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 +@@ -1,5 +1,7 @@ + #if defined(MEASURE_TIMING) + ++#include <Python.h> ++ + /* ----------------------------------------------------------------------- */ + + typedef struct diff --git a/dev-python/numarray/files/numarray-1.5.2-numinclude.patch b/dev-python/numarray/files/numarray-1.5.2-numinclude.patch new file mode 100644 index 000000000..3da32fc56 --- /dev/null +++ b/dev-python/numarray/files/numarray-1.5.2-numinclude.patch @@ -0,0 +1,11 @@ +--- 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/numarray-1.5.1-r2.ebuild b/dev-python/numarray/numarray-1.5.2.ebuild index 542bdaea9..32bb63732 100644 --- a/dev-python/numarray/numarray-1.5.1-r2.ebuild +++ b/dev-python/numarray/numarray-1.5.2.ebuild @@ -5,14 +5,11 @@ 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 +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? ( sci-libs/blas-atlas ) - lapack? ( virtual/lapack )" + lapack? ( sci-libs/blas-atlas virtual/lapack )" IUSE="doc lapack" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -22,7 +19,17 @@ FORTRAN="gfortran g77" src_unpack() { unpack ${A} - epatch "${FILESDIR}"/${P}-include.patch + use doc && mv ${PN}-1.5 html + # various patches inspired from Debian packaging. + # 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 local myblas="/usr/$(get_libdir)/blas/atlas" @@ -35,27 +42,20 @@ src_unpack() { -e 's:f77blas:blas:g' \ cfg_packages.py # fix gfortran for > gcc-4 - if [[ ${FORTRANC} == gfortran ]]; then + if [[ ${FORTRANC} == gfortran ]]; then sed -i \ -e "s:g2c:gfortran:g" \ cfg_packages.py + fi 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 + doins -r Examples + dohtml ${WORKDIR}/html fi } |