Apply patch to fix exception syntax and unrestrict python 3.

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

4 files changed, 52 insertions, 8 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/Manifest b/dev-python/pyzmq/Manifest
index 2eefa5cf82ea..9deac67d8986 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pyzmq-2.2.0.1-python3.patch 1005 SHA256 b7bcad01d0d810da01e777a37e3d3965e69bbad0b39421cba84ef5aa8052f79c SHA512 90971232bfd18893edeb1ef0ba5af9ef9ac819e42d0b9be168a8530870f1d468ea96beba6875f15bd17f6ab78b9a6dc2bc16f82bd8d914061b99289edf013871 WHIRLPOOL 6e280656d3728c7af74f809c5ee6c4a361b57c98a23385ce87655dbca119a87c8af0c1f1417fece9c8f7e1fe5d89c9ba1ca136baa5e0afb530ae9c474ddb8972
 DIST pyzmq-2.1.10.tar.gz 613843 SHA256 cbcb8c7bf514297aec6e4622381e9feacb4fc552f610d89a9856c47e246f3932 SHA512 de4516174c48162e1132bc387714853c6be9ab178e15f0df6d481f4ee1f42d0329f26098e0e84df61ff598f86bfc0e2602bb5e231a8b5a614fa089310ebe65f7 WHIRLPOOL b35129f60b86a732cc1518380edd2ed3a746428af062973914457b8c5234d7a5175b41ca9374fe4715eafb2cca6ae3a757c22d2630d9e03616511a1f6bdb4796
 DIST pyzmq-2.1.11.tar.gz 611281 SHA256 91c21b762ace0ee0dba21d4544b6d521b2ec60015a37a558aa1d747b274f06e2 SHA512 d761b492352841cdc125d9f0c99ee6d6c435812472ea234728b7f0fb4ad1048e1eec9b399df2081fbc926566f333f7780fedd0ce23255a6633fe5c60ed15a6af WHIRLPOOL b3af3633a4d0675ed7abe0cb21948534c30d3d43eb2c17181805adf9f8d34c7eaac7c15756b08f38abb0d9dabfc9cd99ecb3f4037ee02add75a7691b51fbff46
 DIST pyzmq-2.1.7.tar.gz 550434 SHA256 bcecc9e6d19e99757528f0957ab0fbb1ac5d9343820ad3386dcb3ca798cbf317 SHA512 fe54d4c95612fefc78ff8d4ff425c3c3f0a0d03bb1ae7d94d19af8a3259c01e016f0e69c206eda2f76e03e5a1479350b6361798ad3c84114981902776b8584e5 WHIRLPOOL 527a1bf4215c3cd573a1f05048720dcbd987009d5898e0bd1ce04f88714e05b13ce4ec93773b93ca044d8074a0feb569161a0da097616b769d7c89e937467fb2
@@ -11,14 +12,14 @@ EBUILD pyzmq-2.1.10.ebuild 1063 SHA256 d475dd79483420cbb0c797fb3ad6e63992cfed34c
 EBUILD pyzmq-2.1.11.ebuild 1065 SHA256 89109851e241f0ac0523145411af2a33c85a8b8170994978be788cc80360f9a4 SHA512 50244ff16fe5a7b145b983951db738b1897f6c74df6fac016013592bf6f1ef251fce5ef206bcd9643456e649664d98f9b2561936fadd28acd163d37c5ad18ecc WHIRLPOOL f97aa2df8c5543da9f7ca28f07ea2acfc390d36efc24f6bb4a911813e8ad6fc1d7e50552e5cc7a0b863aacf6368e47df76920b8bffbf52a5bf4604567e350cfe
 EBUILD pyzmq-2.1.7.ebuild 1060 SHA256 dc48440be9dfc1caab713d13d8757d7ecbb910aa08e606c161fda8366fc31f46 SHA512 660c468c586a38e1c2183bca7c1ebf808b0e64b53ce060547ae00af87e77914daa63f23b7df6bb01bc59e651c456066859a96c0a0d0385c276922427f97d8288 WHIRLPOOL b2ef3c641b49ad00e7b4552de06958f9361e396ace060ee49f38fb0ece81616805c8d6c4f5453d322569d5154c5ecae6fdddf30215136fb0aa1a31220b619492
 EBUILD pyzmq-2.1.9.ebuild 1064 SHA256 664e758de2aa3598308cf555b80d3912068f22b94be05eee884e74adfb98ca86 SHA512 ef6ebed1c83ff13c0772f788c7eaaad7d6eb19693a792df053c2c460594de86105036b8c87c0cc7946fc2700a06c691f8891c25eb555f99f864a60a66ea8924d WHIRLPOOL 045ebdeb31c908bc7ff9be9d20b7d5ccb53f296e72a6e4c04bf6703da66bd1c24dac54f7292ddf1a923335aa1ce9aa082d322a020255b0f5dfaa42018b15b9dd
-EBUILD pyzmq-2.2.0.1.ebuild 1188 SHA256 740e5b13bd811150c2f5fa74f45f80a8dddf3977da1160bbcf66a4115c7a0680 SHA512 dcc80714dbd84fde5ce007262d369f0c75425395439b4d72b0cf3784b90f6652fab95fd627c08d52a687d769f92db6dccf740d4ca8f0ec88068a8a5c6ca0e0c7 WHIRLPOOL 39e938fe8207707e40841011f1700eca387daeefdc4b52a0edb5683d8d8e9d0e2d73f7822dee49b3a7d40a6d6cefe7bcea73016ecda53865adc5969592c192be
+EBUILD pyzmq-2.2.0.1.ebuild 1276 SHA256 c9d1ea20cff48294fedc14d15b55064318f290673dcca2eecb0ea412cd8ac0e3 SHA512 d401115a41fb48780f4147edea704f57b9bbd9321338f18ca0a4e203b529e9954db1e45b52b4c4e68f30b84ef5f0a10fc293faef3215fd61342641168a0ba59d WHIRLPOOL 87614e864505771c4326fd1921a650605aac6c6cf0838617fc4ecf38321687f2fac2d4a0323d30b5889e7094bafe13b93c0cb689bd2d7ed8cc08cc5aa3f532c0
 EBUILD pyzmq-2.2.0.ebuild 1162 SHA256 cefa254edfd9ee2e51c6aadd4aabef41c565c36c219c677919ca28e9d54dc799 SHA512 1486537fbedffde073b8af6f35c145e7b5a9c30afc39cbe55a478a54ecd3599f69adf461ad31e5df83594a42285b31fc0e4c31f970bb8acf6c4d5cf907ca81af WHIRLPOOL 3619417ba401acbf885cc1fa7885e9289480158d3c7a544bad2c262e0cd79a4e74523831557b04ad98c1e241cb8ba9423845daa9cef01d91e44df6cffa85bc28
-MISC ChangeLog 3308 SHA256 f942a7a55f9edfe95b3118f219f57cae8faa6adff5f6148ec0a9eeefe4da75f9 SHA512 5807d61853f2efe49d65f27118bee416732fe3ad53e1f614ca56f45910b42381ff74b56e8fc1f236193444f46b3f648323a67fc7b1a7b2bb05c98917199b88e4 WHIRLPOOL 648fabceff595a3c6c5de50bd964e79b7051f24dea7480e00daf46f0d6430ee6d432271575667c8b8091fc9854c4bdf00a2b5a49cb1075156cbd59732d2b020b
+MISC ChangeLog 3481 SHA256 685ed421c8f6367dccf598528fcb02029a1b802ba39a7b6b9de3c038421ef64f SHA512 a9805372d9ce467af06eed9487afc3936c92e448f61289d7c346444f0c5504eb07d11f9a8fb986753212b842babe3d08b767e8a938e138ab4fc14e9974f55146 WHIRLPOOL f0d8f69788a7dba5ee859316287663b4bce72d396961fb094500f868cfe5f656f95f9d4c38559ae4a90124da3dd332d9cb3d434af98a94120177f7395e26768c
 MISC metadata.xml 320 SHA256 ccdb8718bba3e85456193834da51782cf53697aff1257a42d4ce09ea74174599 SHA512 3b58a0ece5cd5350fb3f3212516a2474ea92801eb9896d87e532d7f17d5b7db93372c9dc8d21f3f8724c6337c7df498ec9a51aa4dddf29a11bdc65c288d0f693 WHIRLPOOL ced69e21115acd4f1e0e593a59fd7944329445c6104afab8a8c32278f0e7955a7bd3b3b6f1c110c695726108c897e91cd7162058607d2227196158c4203265b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlA+Sr8ACgkQC77qH+pIQ6QyYQD9HPQB7KlbrKMxl2zwo8sZX7J8
-to/eQgXNV+LOmbGlgZ4BAJlaLZlt0w9GgPY9dvIUY70ZfkRqG3LQXnYUdpXXftZN
-=eyrI
+iF4EAREIAAYFAlA+TUkACgkQC77qH+pIQ6QC8gEAjWZFEUpZepLB2rsRIWXm4f8I
+0GgP2FOmjRupFZ2fL78A/0W6DCTOpZjWkRSOxnJG6KT4N2lDW04L8G5mvkSfwAJK
+=9KTI
 -----END PGP SIGNATURE-----
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.*)