0.2.3.ebuild; corrections re gevent now present in portage, adjusted PYTHON_DEPEND to encompass py3 and pypy, set cherrypy to minimal version in DEPEND, discarded sed stmnt added cherrypy_test.patch to src_prepare acquired upstream, fixes issue 72, fixes Bug #450638 by Ago, version bump 0.2.4 with all these features

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 99 insertions, 18 deletions

diff --git a/dev-python/ws4py/ChangeLog b/dev-python/ws4py/ChangeLog
index e2685fd50a0a..496a6c65183c 100644
--- a/dev-python/ws4py/ChangeLog
+++ b/dev-python/ws4py/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/ws4py
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ChangeLog,v 1.7 2013/01/06 19:56:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ChangeLog,v 1.8 2013/01/11 15:50:38 idella4 Exp $
+
+*ws4py-0.2.4 (11 Jan 2013)
+
+  11 Jan 2013; Ian Delaney <idella4@gentoo.org>
+  +files/ws4py-0.2-cherrypy_test.patch, +ws4py-0.2.4.ebuild, ws4py-0.2.3.ebuild:
+  0.2.3.ebuild; corrections re gevent now present in portage, adjusted
+  PYTHON_DEPEND to encompass py3 and pypy, set cherrypy to minimal version in
+  DEPEND, discarded sed stmnt added cherrypy_test.patch to src_prepare acquired
+  upstream, fixes issue 72, fixes Bug #450638 by Ago, version bump 0.2.4 with
+  all these features
 
   06 Jan 2013; Michał Górny <mgorny@gentoo.org> ws4py-0.2.3.ebuild:
   Use virtual/python-unittest2.
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 1933e37f523c..74105c97123a 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ws4py-0.2-cherrypy_test.patch 1091 SHA256 659736ebbfa86a9e6f332ef9530872935239b4333c262ca9c563d7269acc768c SHA512 7e334e87dced85cdf21d304bf259c8fce98e7f62d83c09f51335e97a1e0a7a47efcc9bc99a0a43c2bad06316b66a37b321335e357db330d46e7bf3394af65553 WHIRLPOOL 86c0475490a45ba0e5e3a536bb725d049bd709e585c713cf6be9198566f35dafb51853b99e34070d369aab965c88636f80b4f441abd6d813b7b667a2b9459cdc
 AUX ws4py-0.2.1-process-data.patch 761 SHA256 29528dd1d55a2c26d28e50ea39bb4a03f6cf33c6da810ac60669c37bedb9706a SHA512 dbcb6bf8d324986fb7ec7a1aa55654968894587f6128d3862074ff80b5dba659badd6e1ad0f8ea3013422a0c3b863e3469d2c72b82cdd02c0caa3c8a6961561e WHIRLPOOL 6c728f812d3f87706078830ebf1229899677006e674d52225267da3e94a824e27e59eb9ef51f21e4df9d47c05fefc600cebb4ee79bd11f687091ee058b3dff97
 DIST ws4py-0.2.1.tar.gz 1858090 SHA256 8f902a5be5bed493392ccbabd71406c113c89f973a0d635d7ed35a4d8ec932c5 SHA512 212ba49d81a2b22894bd03346d4b71cf2486c6317ecaf2d4a7cc962c1f3be9550e61dfe74030cf22f4cb396fb74a43dbc73c69e6f915d6ff1a87e7b05ace1c4f WHIRLPOOL b4b886f752c476fe9a2838380adf15b4822d194d615ae83a42937d5231858a35e014657daa5d9cbe974b083ad1c8f2a9806fa182e476911cce033a4882e324cc
 DIST ws4py-0.2.2.tar.gz 1859370 SHA256 591014a09e4cd492c85ef5c46ce88586e29f9db941cea7f262634d07d58c6040 SHA512 886a9f013b0ef99c0e31df30bcc587601bdb727a6911d60a1362c7172efe6fd18e8d44989237eaa3e61fcd56672bbe9dc67950148c22c3f013f6801d8d111511 WHIRLPOOL c953dd3f4a5b6b5683cfe8401342537e275bb2af32b46241dc42e3a119bcbb608238374051c679313cf61e81f1cd8aa38b54f2284dcc253107f49a156688a566
 DIST ws4py-0.2.3.tar.gz 1858465 SHA256 4a56ab45af5df80ea243faa6970b4f7d5e9eff10d9ea732941e4f5a1dafed9b7 SHA512 f5b7cb2fdc17978fbd60e865736a22e4a4989b7094acd3931011b4cf4e44294d3aeb4d0f1f312a6934d34b2abde970b2ef1e039b2526d9592573e0000ca281bb WHIRLPOOL cf4324109dc878d1f0d592f51dcf287ff036116792b16250b80427ef8d3f5b66eca565eaadb2a39c473421bbc5fae14860142174e92fcc76cce2bebf9cb40cc6
+DIST ws4py-0.2.4.tar.gz 45057 SHA256 fa9f1e0ef56f1a864ac4fa0abb7ea1e426f7655fbbc93c754e19e8d976a5c23d SHA512 1e3522d63f0d8e5487b41e429d22e40c12522ee441377e1885685013f1506874e1feb280446374cd1654bbffffdcda737c3de0065bdf62d5b1cc07a837916a85 WHIRLPOOL bca0b08aaa706449b6115606a37785acb5fdbaca5ccf43d77c56be51caf4056a5672944e9f5aaa7b219218b96c0802da40cf347a39a259bd68469cf9e383f9a4
 EBUILD ws4py-0.2.1-r1.ebuild 1161 SHA256 adad924a2dcba25a711795f63ef53bde3a5defee2160852ba8ee326bebb98b89 SHA512 0f0887a15bea0212d57d03922b9daac033c5d30cc0090f92d69d823a23128eae7e0e262e93fd9e8ecaccab7afbc944aabb3b8717e3002337018b6ae9add32a7d WHIRLPOOL 06414e2eb71fe75ca293119cd71c31fd523cfd4d5f4b3a84d9e5c61845159fdfd9b0be2c1b570139952d3cf10a812228c2be2077ab4b9507fea9ef9214a99329
 EBUILD ws4py-0.2.1-r2.ebuild 1356 SHA256 98d489b70e7ec894026003dfec5e0c1b23938514cc0f4ba70173ff71adf92d1e SHA512 a3fa2528426df38f74785018683e8735bb14d5a10e11e7866df8c127fd63a935961f1efc9b9a8a361b426d512e97113949bc2efe61a3763f6b2ec100a617465c WHIRLPOOL bb8d970dd6613b5c930d513c4ce513aed1d0eea4b2e9b0c9b7984bbc27773bdb04600249f734486f59320ad042e0ac27c36b1d2a94b61ff8225296f4bf4a72dc
 EBUILD ws4py-0.2.1.ebuild 1063 SHA256 86bf96d161b1a1b9123ed6707a519b654f082ef7d7b0150bc3d8d8ca2921588b SHA512 b71d98c2c3ae02426d5717348179a117380c1f164ac446982547d1eb363d555e111e8221e02df93df47269d73e781db568641c9f5b32e755482676daf5c92c64 WHIRLPOOL d2b0125fb93b749e76143847fda7b02a6c4725d4be080f68d6fdaa767a79954e72f2124b13db4ea8bb8ffc5ea89e9873d67535b9b8d45a254e005ea0b40e4c02
 EBUILD ws4py-0.2.2.ebuild 1369 SHA256 6e137f61dce1b845af8045230f3e4a25e5285b9af07a5fd88722b4e95cb5d2f9 SHA512 283986c651fd079851f446b0775bd159dd79015085a103ace285fae082cbdbdfde55daccaac3aa888305e5d21fd0be37331ae87c265d5aeaccf12117f232af28 WHIRLPOOL 335a9e6928434aa938db03c1dd1f1fb9cdec31b9c38c81586df08cf741df2876c88c7a1e6c800ed3cf04604408fcb9cbdbab073c7e11939616dfa16cb848fa95
-EBUILD ws4py-0.2.3.ebuild 1506 SHA256 bc1569c27f1fabdea4ccede7c6af0ffd2672b9cfbcd388d3d8c5799faf03477d SHA512 36079f47daa9e441ca9d094eb2a896a50ecbbb8ca5e1af0ff3886dc35be2994452635c05d92d51bff7829f98a0ae556b296a1ce054f375a4d81689e14e4248d2 WHIRLPOOL ecb1d6fa78c92fec7c2e7167dc3fd9d8624cacc06beb71f276e03f5bb3f3d64a351ce9d1d0978ceea66b78a5c33c3600fdcd38f0956bd48f6f09e67514e18d5d
+EBUILD ws4py-0.2.3.ebuild 1330 SHA256 8a7f6e47f6e6044447de1546a208fa982e3c4c1e6e0f3f6bd23d10732ca5d799 SHA512 95e4fee40c54b188e6e3b163f63671934ed4cf65046fe2261dff6fa28f6f37726ed834dee36593376aaf04f8587a0ed347dce70345bccaea6eee7a0c8afb52b4 WHIRLPOOL c41558de786e62bbec462f2eb57154f81d4496fc82d60c02f17316ec41ee8b24d0aa933974b0262d898b226d1a6ddd7427732041a436a7900dab017a58ec6f0c
+EBUILD ws4py-0.2.4.ebuild 1362 SHA256 0b203ba695bd13175bf195900320735128609f40d517f12de56b4270a017e0b5 SHA512 0b5b4e7c43829d5ecab8b5e636d1f96d724ea7140890836bcb728d0af0d98d40bc932e7b37bf5398f60d11ccb6b3b4ac70989b7c5b89825774e2d2213ad8fa1f WHIRLPOOL 1ff22911d326fe03c73958212b57d864e9ba670c4ca2bb82f0ec70233ff1b9aa0335e54b93957998ceb8b6aee362dedee7d74fa98fe4a7e4eac2db864961b9e2
 EBUILD ws4py-9999.ebuild 1368 SHA256 121072e69164d9b7e4cb39395641922d836e0fff628a8408e7bbab70d093a7fb SHA512 d5327bf4e3e7a23b7b785cc644c51cba06768159079f7301cf9c08143943e75b881d4685483807e37f871566a4e60945e8d2a981efc9728e78eb95b0c9918485 WHIRLPOOL 26a5a4faeabc39fb3f4553f3cf2e122ddd84414f845973b0f6514bfcd3e0bf0d07b6e96348961bcc0b4130dcf8ed780bffb7446a6a5daf8403c603159d8a6989
-MISC ChangeLog 1413 SHA256 2388c7eb1aa42085d76cec4abaef683361437cc1bcdb67b6757428532a60860a SHA512 6e9cee808a85ff89618c57d22fbc7d60af6a2333d24847b60f45277d859874d401b7956af463c7d52e3e546e28cce0ff69cfc0c06c15d3fc2519383cfc0d8ed4 WHIRLPOOL d1bec60571383812f796fffb3bea3057891670190722b13e80cb3268e91b648f2e9da877f247578ecb5564ea72948c988ceddb798c5fae067ff9fdf5d677db54
+MISC ChangeLog 1900 SHA256 482ac377294a350916f591c9f88f3956eaaa5f2904eeb22c267d8a4af1193e5f SHA512 7de78e02d05b396b6f43402c8a29c2ef1c05451509bc352287c819ce6cf8d40c28d32c9c2a91d3fcf48c70c8b66a0f75fa81f4d3de23e9d9bdbf2a111781df1e WHIRLPOOL 981093e40614a81d4a7ba01eb6432fb9e52165ea403ea4fb7d2ad9d24b07b32877828266e479a4ace27033c3a758b3b7c5784715f0f2c04ae300c22060b2740b
 MISC metadata.xml 394 SHA256 da0ee1261f3a6ec3319e152c257b42ade798e5ed1b47a10444c99919600ddac0 SHA512 d167099bc3f3de3c68ae77aff63f44c3b332dd385ef5cb19c7ab84a2389f2ca916e92ab39d63f8139d36f7b5fa65c0f666c8f5cb02e7abae18af6babbea18fb4 WHIRLPOOL 3d883142b291ede838bd9d2e20db089b8e4e2e2d1e4db9f3f1931b50164f58f788bf79131d5b8969fdadc4d2050f5a5b8b7c09d65b5f7fdb70b33dd69a077fd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDp1vEACgkQfXuS5UK5QB2yGAP/VSvCN+W2Q7sOjU/slBKiMrav
-aTfWbib7/jKJ1CCkgcdAwLOFtboyCkINFJwuj0sgTwEs7xDffhJLkDuLGOdIdrvK
-QcnlkeTKvg+Gt5iTZSMxqFyyNqdR8jNF+n46eYnuXUaiVnIIdNDcCdFkAPIxpOME
-wkYzP8SBuk6Cok+fSKQ=
-=UFxJ
+iEYEAREIAAYFAlDwNN0ACgkQso7CE7gHKw3DFwCeJ8RiZ3+kjN2xjDv/3IPPGPPh
+EBkAoOCAszfmOGpnJP5UwXgx0sA8QcOS
+=0sh6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ws4py/files/ws4py-0.2-cherrypy_test.patch b/dev-python/ws4py/files/ws4py-0.2-cherrypy_test.patch
new file mode 100644
index 000000000000..e1d55afa0a6b
--- /dev/null
+++ b/dev-python/ws4py/files/ws4py-0.2-cherrypy_test.patch
@@ -0,0 +1,24 @@
+db23aff2ea commit 4ec8638c268ecdb710d97176a55cc5b818aa1a18
+https://github.com/Lawouach/WebSocket-for-Python/issues/72
+diff -ur ws4py-0.2.4.orig/test/test_cherrypy.py ws4py-0.2.4/test/test_cherrypy.py
+--- test/test_cherrypy.py	2012-12-14 03:35:48.000000000 +0800
++++ test/test_cherrypy.py	2013-01-11 16:56:37.555534011 +0800
+@@ -4,6 +4,7 @@
+ import cherrypy
+ from ws4py.server.cherrypyserver import WebSocketPlugin, WebSocketTool
+ from ws4py.websocket import EchoWebSocket
++from ws4py.compat import py3k
+ 
+ class FakeSocket(object):
+     def settimeout(self, timeout):
+@@ -65,7 +66,10 @@
+         h = EchoWebSocket(s, [], [])
+         cherrypy.engine.publish('handle-websocket', h, ('127.0.0.1', 0))
+         self.assertEquals(len(cherrypy.engine.websocket.pool), 1)
+-        k = cherrypy.engine.websocket.pool.keys()[0]
++        if py3k:
++            k = list(cherrypy.engine.websocket.pool.keys())[0]
++        else:
++            k = cherrypy.engine.websocket.pool.keys()[0]
+         self.assertTrue(k is h)
+         self.assertEquals(cherrypy.engine.websocket.pool[k][1], ('127.0.0.1', 0))
diff --git a/dev-python/ws4py/ws4py-0.2.3.ebuild b/dev-python/ws4py/ws4py-0.2.3.ebuild
index 1e2ec445429f..0f54416ea568 100644
--- a/dev-python/ws4py/ws4py-0.2.3.ebuild
+++ b/dev-python/ws4py/ws4py-0.2.3.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.3.ebuild,v 1.2 2013/01/06 19:56:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.3.ebuild,v 1.3 2013/01/11 15:50:38 idella4 Exp $
 
-# The gevent package isn't in the tree yet, so we delete
-# those implementations.
-#
 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
 # Same for www-servers/tornado and USE=client ...
 
 EAPI="4"
-PYTHON_DEPEND="2:2.6"
-DISTUTILS_SRC_TEST="setup.py"
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="py.test"
 
 inherit distutils eutils
 if [[ ${PV} == "9999" ]] ; then
@@ -34,18 +32,17 @@ RDEPEND="client? ( dev-lang/python[threads?] )"
 DEPEND="test? (
 		${RDEPEND}
 		virtual/python-unittest2
-		dev-python/cherrypy
+		>=dev-python/cherrypy-3.2.0
 		dev-python/gevent
 	)"
 
 src_prepare() {
-	sed -i -e 's/tests_require=['unittest2', 'gevent', 'cherrypy'],//' setup.py || die "Fail"
+	epatch "${FILESDIR}"/${PN}-0.2-cherrypy_test.patch
+	distutils_src_prepare
 }
 
 src_install() {
 	distutils_src_install
-	# We don't have a gevent pkg in the tree, so punt.
-	rm -rf "${ED}$(python_get_sitedir)"/ws4py/*/gevent*.py
 	use client || rm -rf "${ED}$(python_get_sitedir)"/ws4py/client
 	use server || rm -rf "${ED}$(python_get_sitedir)"/ws4py/server
 }
diff --git a/dev-python/ws4py/ws4py-0.2.4.ebuild b/dev-python/ws4py/ws4py-0.2.4.ebuild
new file mode 100644
index 000000000000..7beb721e1a87
--- /dev/null
+++ b/dev-python/ws4py/ws4py-0.2.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.4.ebuild,v 1.1 2013/01/11 15:50:38 idella4 Exp $
+
+# We could depend on dev-python/cherrypy when USE=server, but
+# that is an optional component ...
+# Same for www-servers/tornado and USE=client ...
+
+EAPI="4"
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+DISTUTILS_SRC_TEST="py.test"
+
+inherit distutils eutils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Lawouach/WebSocket-for-Python.git"
+	inherit git-2
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="WebSocket support for Python"
+HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+client +server test +threads"
+
+RDEPEND="client? ( dev-lang/python[threads?] )"
+DEPEND="test? (
+		${RDEPEND}
+		virtual/python-unittest2
+		>=dev-python/cherrypy-3.2.0
+		dev-python/gevent
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2-cherrypy_test.patch
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+	use client || rm -rf "${ED}$(python_get_sitedir)"/ws4py/client
+	use server || rm -rf "${ED}$(python_get_sitedir)"/ws4py/server
+}