summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-01-12 19:07:36 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-01-12 19:07:36 +0000
commitb2e2a4e3ed60452d202d5c91922c7de2e3a8ce7e (patch)
tree570efa27cec96b1060b1276cc8aa6e23101f665a /dev-python/numpy
parentBump to 0.10.31. Minor fixes in this release. (diff)
downloadhistorical-b2e2a4e3ed60452d202d5c91922c7de2e3a8ce7e.tar.gz
historical-b2e2a4e3ed60452d202d5c91922c7de2e3a8ce7e.tar.bz2
historical-b2e2a4e3ed60452d202d5c91922c7de2e3a8ce7e.zip
Add incomplete fix for compatibility with Python 3.2 (bug #351057).
Package-Manager: portage-2.2.0_alpha14_p4/cvs/Linux x86_64
Diffstat (limited to 'dev-python/numpy')
-rw-r--r--dev-python/numpy/ChangeLog6
-rw-r--r--dev-python/numpy/files/numpy-1.5.1-python-3.2.patch31
-rw-r--r--dev-python/numpy/numpy-1.5.1.ebuild9
3 files changed, 41 insertions, 5 deletions
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 1ea13e5e7c1f..a1bc438f5655 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.126 2011/01/12 17:35:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.127 2011/01/12 19:07:35 arfrever Exp $
+
+ 12 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ numpy-1.5.1.ebuild, +files/numpy-1.5.1-python-3.2.patch:
+ Add incomplete fix for compatibility with Python 3.2 (bug #351057).
12 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
numpy-1.5.1.ebuild:
diff --git a/dev-python/numpy/files/numpy-1.5.1-python-3.2.patch b/dev-python/numpy/files/numpy-1.5.1-python-3.2.patch
new file mode 100644
index 000000000000..44e05c5d50ab
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.5.1-python-3.2.patch
@@ -0,0 +1,31 @@
+https://github.com/numpy/numpy/commit/f1f52d6c962bf0ada57d8332b3fbd863bb1ca6cd
+
+--- numpy/ctypeslib.py
++++ numpy/ctypeslib.py
+@@ -93,7 +93,6 @@
+ "with ctypes < 1.0.1")
+
+ ext = os.path.splitext(libname)[1]
+-
+ if not ext:
+ # Try to load library with platform-specific name, otherwise
+ # default to libname.[so|pyd]. Sometimes, these files are built
+@@ -112,14 +111,15 @@
+ else:
+ libdir = loader_path
+
++ # Need to save exception when using Python 3k, see PEP 3110.
++ exc = None
+ for ln in libname_ext:
+ try:
+ libpath = os.path.join(libdir, ln)
+ return ctypes.cdll[libpath]
+ except OSError, e:
+- pass
+-
+- raise e
++ exc = e
++ raise exc
+
+ ctypes_load_library = deprecate(load_library, 'ctypes_load_library',
+ 'load_library')
diff --git a/dev-python/numpy/numpy-1.5.1.ebuild b/dev-python/numpy/numpy-1.5.1.ebuild
index ef48383facad..6c6bac560d0e 100644
--- a/dev-python/numpy/numpy-1.5.1.ebuild
+++ b/dev-python/numpy/numpy-1.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.5 2011/01/12 17:55:03 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.1.ebuild,v 1.6 2011/01/12 19:07:35 arfrever Exp $
EAPI="3"
PYTHON_DEPEND="*"
@@ -67,8 +67,10 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
- epatch "${FILESDIR}"/${PN}-1.3.0-fenv-freebsd.patch # bug 279487
+ epatch "${FILESDIR}/${PN}-1.1.0-f2py.patch"
+ epatch "${FILESDIR}/${PN}-1.3.0-fenv-freebsd.patch" # Bug #279487
+ epatch "${FILESDIR}/${PN}-1.4.0-interix.patch"
+ epatch "${FILESDIR}/${P}-python-3.2.patch"
# Gentoo patch for ATLAS library names
sed -i \
@@ -109,7 +111,6 @@ src_prepare() {
else
export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
fi
- epatch "${FILESDIR}"/${PN}-1.4.0-interix.patch
# Disable tests failing on ppc/ppc64.
# http://projects.scipy.org/numpy/ticket/1664