Apply patch to fix exception syntax and unrestrict python 3.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

3 files changed, 46 insertions, 3 deletions

diff --git a/dev-python/pyzmq/ChangeLog b/dev-python/pyzmq/ChangeLog
index 6340f1a7d18e..bc3213bbde35 100644
--- a/dev-python/pyzmq/ChangeLog
+++ b/dev-python/pyzmq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyzmq
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.23 2012/08/29 17:00:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/ChangeLog,v 1.24 2012/08/29 17:11:31 floppym Exp $
+
+  29 Aug 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/pyzmq-2.2.0.1-python3.patch, pyzmq-2.2.0.1.ebuild:
+  Apply patch to fix exception syntax and unrestrict python 3.
 
   29 Aug 2012; Mike Gilbert <floppym@gentoo.org> pyzmq-2.2.0.1.ebuild,
   pyzmq-2.2.0.ebuild:
diff --git a/dev-python/pyzmq/files/pyzmq-2.2.0.1-python3.patch b/dev-python/pyzmq/files/pyzmq-2.2.0.1-python3.patch
new file mode 100644
index 000000000000..d6b1299add7a
--- /dev/null
+++ b/dev-python/pyzmq/files/pyzmq-2.2.0.1-python3.patch
@@ -0,0 +1,34 @@
+From 51f2470bce6c9e6067606aec2d9a018555582b30 Mon Sep 17 00:00:00 2001
+From: MinRK <benjaminrk@gmail.com>
+Date: Mon, 20 Aug 2012 22:44:27 -0700
+Subject: [PATCH] fix exception syntax in gevent.core
+
+---
+ zmq/green/core.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/zmq/green/core.py b/zmq/green/core.py
+index d4e5f73..9e5acdf 100644
+--- a/zmq/green/core.py
++++ b/zmq/green/core.py
+@@ -114,7 +114,7 @@ def _wait_write(self):
+         try:
+             timeout.start()
+             self.__writable.get(block=True)
+-        except gevent.Timeout, t:
++        except gevent.Timeout as t:
+             if t is not timeout:
+                 raise
+             toc = time.time()
+@@ -138,7 +138,7 @@ def _wait_read(self):
+         try:
+             timeout.start()
+             self.__readable.get(block=True)
+-        except gevent.Timeout, t:
++        except gevent.Timeout as t:
+             if t is not timeout:
+                 raise
+             toc = time.time()
+-- 
+1.7.10
+
diff --git a/dev-python/pyzmq/pyzmq-2.2.0.1.ebuild b/dev-python/pyzmq/pyzmq-2.2.0.1.ebuild
index deea6a28e00a..8fc1aa8e06f4 100644
--- a/dev-python/pyzmq/pyzmq-2.2.0.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-2.2.0.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.2.0.1.ebuild,v 1.3 2012/08/29 17:00:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.2.0.1.ebuild,v 1.4 2012/08/29 17:11:31 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython 2.7-pypy-*"
 DISTUTILS_SRC_TEST="nosetests"
 PYTHON_TESTS_RESTRICTED_ABIS="3*"
 
@@ -28,6 +28,11 @@ DEPEND="${RDEPEND}
 DOCS="README.rst"
 PYTHON_MODNAME="zmq"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.2.0.1-python3.patch"
+	distutils_src_prepare
+}
+
 src_test() {
 	testing() {
 		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" nosetests -sv $(ls -d build-${PYTHON_ABI}/lib.*)