Further refine client/server install and gevent requirement.

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

5 files changed, 94 insertions, 27 deletions

diff --git a/dev-python/ws4py/ChangeLog b/dev-python/ws4py/ChangeLog
index 8bfd1af6a69e..5d1588b6c7d6 100644
--- a/dev-python/ws4py/ChangeLog
+++ b/dev-python/ws4py/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/ws4py
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ChangeLog,v 1.2 2012/04/20 19:37:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ChangeLog,v 1.3 2012/04/24 02:31:04 vapier Exp $
+
+*ws4py-0.2.1-r2 (24 Apr 2012)
+
+  24 Apr 2012; Mike Frysinger <vapier@gentoo.org> +ws4py-0.2.1-r2.ebuild,
+  metadata.xml, ws4py-9999.ebuild:
+  Further refine client/server install and gevent requirement.
 
 *ws4py-0.2.1-r1 (20 Apr 2012)
 
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index ba86cbbf4209..650e04db9dc0 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -4,24 +4,25 @@ Hash: SHA1
 AUX ws4py-0.2.1-process-data.patch 761 RMD160 6897d09fb6dab348522254c64afb29a337cae8eb SHA1 c5d6ceb578c4908c8e10016438cebdd73213f6fa SHA256 29528dd1d55a2c26d28e50ea39bb4a03f6cf33c6da810ac60669c37bedb9706a
 DIST ws4py-0.2.1-src.tar.gz 1858090 RMD160 994cd2b0cb73cd3f04efdfcbd25df01ad380f131 SHA1 5967f99fac74bf890e1ecca996ba839c57c99673 SHA256 8f902a5be5bed493392ccbabd71406c113c89f973a0d635d7ed35a4d8ec932c5
 EBUILD ws4py-0.2.1-r1.ebuild 1165 RMD160 6251a0a618d2f9f71340ae983f51ed702c487c66 SHA1 95fe7df656626acfcbb86b31ec6dfc9d6cfdc51e SHA256 e8f2f5e312608cdcd150da934551dcb54e66e15f11ad86da9f0ce36193e9922a
+EBUILD ws4py-0.2.1-r2.ebuild 1360 RMD160 6b7ca2aa0797019f9370cf2515670051c60b70f8 SHA1 f19de590096dc16ef5b9efcdc03763773463d2b2 SHA256 582845665851b27693c511e5614a3597dd56dbb24b628ea4ca5ed7e0508fd200
 EBUILD ws4py-0.2.1.ebuild 1067 RMD160 21e2d2bbcaab1f01e21558c9f015f8b20726571e SHA1 c60e46355713132d027167c840d34f4479c6625c SHA256 b728d3869d2ba804d92359ebd7b7e0e7b618f56c2478bc6e08d420d3617be49f
-EBUILD ws4py-9999.ebuild 1066 RMD160 360a640717da7a1b7343cbf6f831d5d55bc87c1c SHA1 4c981079efea511e360626da42712dd25fad2429 SHA256 8fd99e2dfcda4836bdf97516eb5578061f1df94b0defb1cc910f84f152f3c318
-MISC ChangeLog 606 RMD160 600b409c1a5e7181bea1183297b7aeddc8b5d369 SHA1 59776b5c6a41f13a65ca8d41b7fdc062355dd18c SHA256 5c7797512c4e45b6c73ec4dae5ce9c610a85861fd9c3d442bb3b8cc3b7bce2b0
-MISC metadata.xml 279 RMD160 4849fb2bff5533d654332c33b485c621bec9ece4 SHA1 5bd671a36ff05a7a918e6a32995a12f280a16e11 SHA256 9d45a0168715338fa5a6e4e23a6f0032b0f2ce9e35bf8fd183453fd8cd18988b
+EBUILD ws4py-9999.ebuild 1356 RMD160 19eba1b22719d451290a4a20f63142c9404c9f5c SHA1 46c63602e9d780f37181ea9d800d09d633a09ac2 SHA256 351f6f5d9880089a7ef63bdeb9d1c221a755753dc3442e9f2c5ebd1a8e469877
+MISC ChangeLog 810 RMD160 3253f9b9427ecfdef010be7015074d063fd2ae47 SHA1 5d15510e0fadf5271a57e2028e12f1a0225748cf SHA256 c007f6c06db9cce853eab5df63dbab4e474cf2c4bdb2c3d21876d8956b00ced6
+MISC metadata.xml 394 RMD160 55c65f458cdf586fc1261091a60a591460f7004f SHA1 6e1daf3a8e95a93c8d48244828ed6b2286ec6a7a SHA256 da0ee1261f3a6ec3319e152c257b42ade798e5ed1b47a10444c99919600ddac0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPkbsmAAoJELEHsLL7fEFWIQIP/28/qIPyY5Mk0wwOZyyThQtU
-I3VmHQ9tHMXO4rHuCFupC8qDOXGr3KTAViuAOT0ufirK5PrPPgeoU+C3vmLjjHq8
-5igOvPnOSzqwBelIx3muMQLON7nq3ccrmAjbcb6xcHULhSqXlyTfh8J373Ij6UXZ
-HSgWK9mn4mXPVSbRjpWVD69PLT89BLlvgGI1bEKAreSf0zNKGSPcVzMSD6AS7gZW
-a7IEGDJILXeD73jWBT3LNkKiH2bI8Ht29TO7w1kdKLlF1ZwqSVvRYj5XZYx4dSdF
-8kd4wBA7kLU9rTwJT0Od0PTyaPENywhtBjVV+H4fxjIGOcLumKItnHhFbZefZ2eU
-HgqrTTVISamWHsHwcGKizBlPJfRugpMfUm9AmvfCmKx9OmLWa+OcxklC9jWFAvQW
-uPiHhT8EcXN2pxe8123aWRdXcx7NeCVbezvHQ2wDdyAJ/VzNdZ41e/PryT4vNfZ5
-/BNmZxYa3IJEQmH783yJGKFXMuRY9WcB3HmGRH50PJXkHcYPItR/0zzVK57v1ptv
-VnMRyYzIBiiUYdpw6T6JJB1geIrrOxmPFMVfgTsNq9HP14BFwXLdUY2eCMbetKzY
-g7fy7SXpnLzhBjgh2REo3LEucxxOG+c6Q/eClOxBIH6+uKZ82GZc1bQxXhGZNXPe
-9+45mw38ujCIWN+OgVvK
-=vmrj
+iQIcBAEBAgAGBQJPlhDHAAoJELEHsLL7fEFWzkIP/Arfubyxf2K2DXycMp33Ias3
+Nm9DPCNuscURORiebuqFOqr4OgY6t7NOfvcxNkNvMCVqZ8buIkuld5dn0/QeK1DR
+CHtFc0xSxdUPqFU7tdWMDslbkXS3sMQzLK3VRRXOki9YucB0uZ0zpZQK0q9TjXX+
+NanWJ9m1HRKDyvym39bgAiw0Hpwnii1IktrppZHI0UoRDphMcRUmeDQyZSoi02ir
+0fRVMy124g5gYvBw1g1KgFN4sI1yAhu9AFpLiQdoQloLNJEYXeOeHfWyoJaERXAp
+VM9sT9eoPc+BIJVUznSRWPKNuxVV86KP+9fITh99CdeWAawNgxG3PCb+XqS8UQT+
+8hVf21gTiZZwWuS7mgI7Kq+mnsawVJFgumk4zcTrPrKCSCgZRYvm6F57GFCHrpN3
+rB5221eIJ+5kfaA5nBkyO/hC27enqUuXdeCBd7mEXUj4jsX/ungChUvdyPziAURY
+sjZRghzBovPgo7Mzx3ijAYiW39UI6hsDqq5mKnxVYm5Bk1RGWUNZ9Tqa+Wgk9wxo
+nej4o3z/BZbGrod/JqfyTroXMKJC8RwB0GskQxp+pGYxLZMkyWmKJr9nc4urC0i6
++ZtLzJao30Z2p95I/gJAZVTwlEzvT+vN1+iJzLPqPf0M6yKQkGObUrIlVSv6TVaq
+tjxHBYG47CNG7zwosyHu
+=QYcI
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
index 80f2c021cdaf..13bc2c4ff5bb 100644
--- a/dev-python/ws4py/metadata.xml
+++ b/dev-python/ws4py/metadata.xml
@@ -6,4 +6,8 @@
  <email>vapier@gentoo.org</email>
  <description>make whatever changes you want</description>
 </maintainer>
+<use>
+ <flag name='client'>Install client modules</flag>
+ <flag name='server'>Install server modules</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-python/ws4py/ws4py-0.2.1-r2.ebuild b/dev-python/ws4py/ws4py-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..673f27752192
--- /dev/null
+++ b/dev-python/ws4py/ws4py-0.2.1-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.1-r2.ebuild,v 1.1 2012/04/24 02:31:04 vapier 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"
+
+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}-src.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 +threads"
+
+RDEPEND="client? ( dev-lang/python[threads?] )"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-process-data.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-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 10b73c7a38f7..349af5e0e9b9 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -1,11 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-9999.ebuild,v 1.1 2012/04/17 23:09:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-9999.ebuild,v 1.2 2012/04/24 02:31:04 vapier 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"
 
-inherit distutils
+inherit distutils eutils
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/Lawouach/WebSocket-for-Python.git"
 	inherit git-2
@@ -20,17 +27,20 @@ HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
-#IUSE="client server"
+IUSE="+client +server +threads"
 
-# The gevent package isn't in the tree yet.
-#RDEPEND="client? ( >=dev-python/gevent-0.13.6 )
-#	server? ( >=dev-python/gevent-0.13.6 )"
+RDEPEND="client? ( dev-lang/python[threads?] )"
 DEPEND=""
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-process-data.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
-	rm -rf "${ED}$(python_get_sitedir)"/ws4py/{client,server}
+	# 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
 }