Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyzmq/files/, dev-python/pyzmq/
Date: Tue, 28 Jun 2016 22:20:19
Message-Id: 1467152407.e105a00cab63d93cb86e59a6b2663e283a732fe2.floppym@gentoo
1 commit: e105a00cab63d93cb86e59a6b2663e283a732fe2
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 28 22:19:46 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 28 22:20:07 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e105a00c
7
8 dev-python/pyzmq: fix build with cython-0.24
9
10 Bug: https://bugs.gentoo.org/583192
11
12 Package-Manager: portage-portage_p2.3.0
13
14 dev-python/pyzmq/files/pyzmq-cython-0.24.patch | 33 ++++++++++++++++++++++++++
15 dev-python/pyzmq/pyzmq-15.2.0.ebuild | 2 ++
16 2 files changed, 35 insertions(+)
17
18 diff --git a/dev-python/pyzmq/files/pyzmq-cython-0.24.patch b/dev-python/pyzmq/files/pyzmq-cython-0.24.patch
19 new file mode 100644
20 index 0000000..55be83e
21 --- /dev/null
22 +++ b/dev-python/pyzmq/files/pyzmq-cython-0.24.patch
23 @@ -0,0 +1,33 @@
24 +From 659f9211aad1565543e26ef6877456d017c9d5bb Mon Sep 17 00:00:00 2001
25 +From: Min RK <benjaminrk@×××××.com>
26 +Date: Tue, 8 Mar 2016 09:17:05 +0100
27 +Subject: [PATCH] remove unused, deprecated `_handle`
28 +
29 +Cython 0.24 may not support property assignment
30 +---
31 + zmq/backend/cython/context.pyx | 8 ++------
32 + 1 file changed, 2 insertions(+), 6 deletions(-)
33 +
34 +diff --git a/zmq/backend/cython/context.pyx b/zmq/backend/cython/context.pyx
35 +index 2cb7409..3595c10 100644
36 +--- a/zmq/backend/cython/context.pyx
37 ++++ b/zmq/backend/cython/context.pyx
38 +@@ -108,16 +108,12 @@ cdef class Context:
39 + if self._n_sockets:
40 + # move last handle to closed socket's index
41 + self._sockets[idx] = self._sockets[self._n_sockets]
42 +-
43 +-
44 ++
45 + @property
46 + def underlying(self):
47 + """The address of the underlying libzmq context"""
48 + return <size_t> self.handle
49 +-
50 +- # backward-compat, though nobody is using it
51 +- _handle = underlying
52 +-
53 ++
54 + cdef inline int _term(self):
55 + cdef int rc=0
56 + if self.handle != NULL and not self.closed and getpid() == self._pid:
57
58 diff --git a/dev-python/pyzmq/pyzmq-15.2.0.ebuild b/dev-python/pyzmq/pyzmq-15.2.0.ebuild
59 index 2ed5a56..022dfdf 100644
60 --- a/dev-python/pyzmq/pyzmq-15.2.0.ebuild
61 +++ b/dev-python/pyzmq/pyzmq-15.2.0.ebuild
62 @@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
63 dev-python/numpydoc[${PYTHON_USEDEP}]
64 )"
65
66 +PATCHES=( "${FILESDIR}/pyzmq-cython-0.24.patch" )
67 +
68 python_prepare_all() {
69 # Prevent un-needed download during build
70 sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die