Added patch for python-3, thanks Johan Bergström, bug #393679

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 81 insertions, 8 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 4eab1ae3ed94..f33dbf8952bb 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.154 2011/10/27 17:21:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.155 2011/12/17 05:36:54 bicatali Exp $
+
+  17 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> numpy-1.6.1-r1.ebuild,
+  +files/numpy-1.6.1-import_umath.patch:
+  Added patch for python-3, thanks Johan Bergström, bug #393679
 
   27 Oct 2011; Justin Lecher <jlec@gentoo.org> numpy-1.6.1-r1.ebuild,
   files/numpy-1.6.1-atlas.patch:
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 7a981f7d6ba1..14802bebafb2 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
 AUX numpy-1.3.0-fenv-freebsd.patch 1177 RMD160 78a84e18836472bd9c657771c43a44e417ec3e19 SHA1 4dba898255df4784eac9e52633307991c12029de SHA256 2fa3ed9fdeb9dc529d51da4ba8a3a7ea4cc4bb9998fffa66426b1606f2c637b5
 AUX numpy-1.4.0-interix.patch 478 RMD160 9a0290253238e09b824069d0026a5d2f00c90a8f SHA1 261e45c3feb068f033eed9b6468f5115ea418ca5 SHA256 4d6adcc1c66aa1399871c37f57e94ae7138c157ee5575945e83224a36c98c142
 AUX numpy-1.5.1-python-3.2.patch 971 RMD160 7e6ba80d2932279a45340a1d74f89051bbef1f0d SHA1 56fd29f930febd7b4339a821d268470fe41b67a1 SHA256 8add395a3f0a7e381fb96691024d7e2e1e062e2f3a1be8ffccbaf0cc060b4735
 AUX numpy-1.6.1-atlas.patch 829 RMD160 111f0357500b823376b8e3a065b6dee6f3a95cd2 SHA1 784688b48308fc5ea87d9ba454fbfe51ef5ea81d SHA256 5faada467f38931eb128144bdef72d19b227eb3583bcdc95b973bc2267e3705d
+AUX numpy-1.6.1-import_umath.patch 2240 RMD160 58b128f87ce70dd8d7aa032dc230b566718b1497 SHA1 4b08118efa8a0c0c0d70220451dc8ceb087a770a SHA256 8c28b1b599934f366a5fd7cbc2f0926845d419caa2de6d63bcb0cbcae2768e9e
 DIST numpy-1.5-html.zip 8545276 RMD160 41636f21c2c82ed1d9f15fe595c9d9303f62a2ee SHA1 c4fb912eec5850e5cf20afd47920a0019bfa5535 SHA256 2b71258bc71b623f682eaa791b81e0f81dce43b69546a1bcd3b1a9de830ce057
 DIST numpy-1.5-ref.pdf 7112007 RMD160 35901204b7e4c0ffc08ebb43a8a4dfa5b5a79bf1 SHA1 5e496e87a4f9873759397cb1cf546f6af0533598 SHA256 9ec75950b46e9d086cfb170f6978ba2b146ed7b1dc103af51e3c81ed5b8b5406
 DIST numpy-1.5-user.pdf 562092 RMD160 20d475d9c5a4abbad0ec5f969fdf9a5eef79c4b3 SHA1 6fafde625a81dd4be22a158cd73c010cb219e855 SHA256 afe77bacce8839460330e0c1c8a01508a03dd4a3010c2b8739ab61956d47f69d
@@ -17,14 +18,14 @@ DIST numpy-1.6.0.tar.gz 2633698 RMD160 29bee854e1436e0baad46150606d7a0d2d80ac61
 DIST numpy-1.6.1.tar.gz 2637779 RMD160 e4619fd5860c85a9c00bce0d0cb8dd9bb07a56f5 SHA1 3f73ff9231a1c15e28e6e259ef5cc35a72b34059 SHA256 788b1bc712ee566d4b4d62ef99736c5830fa264cbc56f8651ded1e795c755cdd
 EBUILD numpy-1.5.1.ebuild 5107 RMD160 b86e103a1f358cc172d24655a4836e19efaea7c2 SHA1 20d1865d2edd1b78dc44de8801d167c4ec140eab SHA256 7559513f731ed9ac96ae60de0e35df84ed8ba3f5f6045cabe18efd6250a709a8
 EBUILD numpy-1.6.0.ebuild 4801 RMD160 590604f459ed3f1e4a810e3cb7440401d49c0dac SHA1 846f45b4d4c3492ef50486224af58b1540dbb963 SHA256 fcd824bd3d81b721175c0037922f4752287914b618f01d0c9d6669c5ba5e4c3b
-EBUILD numpy-1.6.1-r1.ebuild 4147 RMD160 5067bcd49109a9773d570a79776fae4187fcc845 SHA1 dbfc69a25b4851b35e9bfc2ccdba2e35a303a2a0 SHA256 e3b22414d75f2108aeac18df255ccb7c189faf3868bb9d9a10eb75ca93924b26
+EBUILD numpy-1.6.1-r1.ebuild 4197 RMD160 2342289f020d52fdc969e07b19618ba860eae003 SHA1 43506fb8e59d52d7920e593c8e3dddf061ac1aeb SHA256 48ae536c2f76b52cbf85092ac9519422cc88fd0227225b6bdb8aa5663958516a
 EBUILD numpy-1.6.1.ebuild 4820 RMD160 474904fd117469e8255c3fe708759215ec60ecee SHA1 51649d2c39b688b5a7cee71444b48ef7eed31e2b SHA256 3fc958720f24a600c6e58f1567a2936592e0a8139b033b4705b4fea0c85eb449
-MISC ChangeLog 21888 RMD160 72cde1cd35106b9b6c2bdabb8a55c605f825fc29 SHA1 d92c86708286cd8caf28f06c3d6ebd750fd828c7 SHA256 9468a5feb20c7c43fa499dde3270852e17421279de52bf4e7a1885c3e5fd2d90
+MISC ChangeLog 22077 RMD160 e486589f5dc38f1bc74115601a9f1bdc37c3b402 SHA1 60762971b96a215e739095b1c958d854358bf76a SHA256 9b38a0a7fff9a526f933c0f1070544fb5154615332274c5bb49c0c2b88a6dcc7
 MISC metadata.xml 615 RMD160 2f09f0eca557ef9bdc4c672c8d2172b66e25ad69 SHA1 189dc5a2f5d3cb26680e81987501a4266c4972d1 SHA256 f50bbda17ece7ce10e62c739225822877af67a95b3fb9b6a861ee31db489cab3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6pkwYACgkQgAnW8HDreRbyXQCfXZa+3ICXbbw5mTXxMvMlYrzp
-0xkAoJLxkL0G08od4WwbTUfCh9wFGfbf
-=4SU1
+iEYEARECAAYFAk7sKoQACgkQ1ycZbhPLE2BS9ACfREwJpe0a5eo7Rf8Ip4ccXOSd
+6I4An1diK60ZzIO7MuWs42vixR/I55Y9
+=Qj95
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/files/numpy-1.6.1-import_umath.patch b/dev-python/numpy/files/numpy-1.6.1-import_umath.patch
new file mode 100644
index 000000000000..aedaa2024206
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.6.1-import_umath.patch
@@ -0,0 +1,67 @@
+http://projects.scipy.org/numpy/ticket/1919
+https://github.com/numpy/numpy/commit/4dac50bf1faf2c8189c277ec8f11ead506c243b1
+https://github.com/numpy/numpy/commit/418f070fc67d1ea2b6eae3259e9dcf7a980bbaaf
+
+--- numpy/core/code_generators/generate_ufunc_api.py
++++ numpy/core/code_generators/generate_ufunc_api.py
+@@ -75,14 +75,53 @@
+   return 0;
+ }
+ 
+-#define import_umath() { UFUNC_NOFPE if (_import_umath() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.umath failed to import"); return; }}
+-
+-#define import_umath1(ret) { UFUNC_NOFPE if (_import_umath() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.umath failed to import"); return ret; }}
+-
+-#define import_umath2(msg, ret) { UFUNC_NOFPE if (_import_umath() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, msg); return ret; }}
+-
+-#define import_ufunc() { UFUNC_NOFPE if (_import_umath() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.umath failed to import"); }}
++#if PY_VERSION_HEX >= 0x03000000
++#define NUMPY_IMPORT_UMATH_RETVAL NULL
++#else
++#define NUMPY_IMPORT_UMATH_RETVAL
++#endif
+ 
++#define import_umath() \
++    do {\
++        UFUNC_NOFPE\
++        if (_import_umath() < 0) {\
++            PyErr_Print();\
++            PyErr_SetString(PyExc_ImportError,\
++                    "numpy.core.umath failed to import");\
++            return NUMPY_IMPORT_UMATH_RETVAL;\
++        }\
++    } while(0)
++
++#define import_umath1(ret) \
++    do {\
++        UFUNC_NOFPE\
++        if (_import_umath() < 0) {\
++            PyErr_Print();\
++            PyErr_SetString(PyExc_ImportError,\
++                    "numpy.core.umath failed to import");\
++            return ret;\
++        }\
++    } while(0)
++
++#define import_umath2(ret, msg) \
++    do {\
++        UFUNC_NOFPE\
++        if (_import_umath() < 0) {\
++            PyErr_Print();\
++            PyErr_SetString(PyExc_ImportError, msg);\
++            return ret;\
++        }\
++    } while(0)
++
++#define import_ufunc() \
++    do {\
++        UFUNC_NOFPE\
++        if (_import_umath() < 0) {\
++            PyErr_Print();\
++            PyErr_SetString(PyExc_ImportError,\
++                    "numpy.core.umath failed to import");\
++        }\
++    } while(0)
+ 
+ #endif
+ """
diff --git a/dev-python/numpy/numpy-1.6.1-r1.ebuild b/dev-python/numpy/numpy-1.6.1-r1.ebuild
index 3c9703402a83..64aca6b47ce3 100644
--- a/dev-python/numpy/numpy-1.6.1-r1.ebuild
+++ b/dev-python/numpy/numpy-1.6.1-r1.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.6.1-r1.ebuild,v 1.2 2011/10/27 17:21:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.1-r1.ebuild,v 1.3 2011/12/17 05:36:54 bicatali Exp $
 
 EAPI=3
 
@@ -72,6 +72,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-atlas.patch
+	epatch "${FILESDIR}"/${P}-import_umath.patch
 
 	if use lapack; then
 		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"