Fix installation when client or server use flag is disabled, bug 521488 by Steven Lai. Remove old.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

13 files changed, 49 insertions, 456 deletions

diff --git a/dev-python/ws4py/ChangeLog b/dev-python/ws4py/ChangeLog
index f59d72b1a810..eb051c921378 100644
--- a/dev-python/ws4py/ChangeLog
+++ b/dev-python/ws4py/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/ws4py
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ChangeLog,v 1.13 2014/05/24 04:26:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ChangeLog,v 1.14 2014/10/18 16:20:51 floppym Exp $
+
+  18 Oct 2014; Mike Gilbert <floppym@gentoo.org> -ws4py-0.2.1-r1.ebuild,
+  -ws4py-0.2.1-r2.ebuild, -ws4py-0.2.1.ebuild, -ws4py-0.2.2.ebuild,
+  -ws4py-0.2.3.ebuild, -ws4py-0.2.4-r1.ebuild, -ws4py-0.2.4.ebuild,
+  -ws4py-0.3.2.ebuild, -ws4py-0.3.3.ebuild, ws4py-0.3.4.ebuild,
+  ws4py-9999.ebuild:
+  Fix installation when client or server use flag is disabled, bug 521488 by
+  Steven Lai. Remove old.
 
 *ws4py-0.3.4 (24 May 2014)
 
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 032db2bf82f2..e908c89b269d 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -3,30 +3,15 @@ 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
-DIST ws4py-0.3.2.tar.gz 58961 SHA256 76b13b6e3a36519dc46f3e156da21dc68fb02d08dd17d85d44dfcb532e3a45df SHA512 2363ecd416755ed4e0a199e351ccb9739450741d234a6e5a9505cde1be2d233658a2e24f80897eb3eece6f57b7e7b358ed9a0d634b39b2c745c6a686179b2554 WHIRLPOOL 90ac9d9b416f4f23d2611aff50008fa0231d1d9c29d8f30b9caf47c27b75eb7711268ac4b58e220bf25cd242a6f3d0c80fd72a17434890f6db78a7d54213ffbe
-DIST ws4py-0.3.3.tar.gz 65132 SHA256 5dbea58201f3f9dabb3897778dce46ed58a215db6cc6d5d5c52f77734e79ae1e SHA512 2cc3cb68e9a3598ece024ef8998f04007b53908e4c98446170b91c54a56b736f395f36a976c6c69e8d0d56d87142f436f15ecbe1e3ad986369ef3f50eedf4f3b WHIRLPOOL 621a34ee27e0b79a78aedbb5f9b0c7ca4ff9a4ffc2b1229cb047e375d8c38870ea21aea0f3b936a52de57bd9d639ac1b7fc6f98960181b05e7e860ed335adf26
 DIST ws4py-0.3.4.tar.gz 65467 SHA256 5aedb5663ee1e5fb4334615cc6582f4f2e97cf967d8dc4c6c3627515d16afa90 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f WHIRLPOOL 77f6c56ab1c2bbcd628f0d1773c1c9659ddc68d976ca8af55804d04e16ec6e9e06e87f5a6a3167670d8c0898dde657f3b3b1fdc4d4a94029f74d71ca2ee50e1b
-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 1325 SHA256 5c774cd4111789acdef0b9e529ac00fc5d91416d95d65990a9fcb788bee1df60 SHA512 134ca77b8cb6e6e85627271a6629b4a6f2d42986fe6719aec5f0ea6f2528e1f2fa517e00c16e6a7f075dca6ad603e4d6aa1713c125685223d8824636c5cd90e0 WHIRLPOOL de2ec79e55058c51c1b93caba7d51dc6a6e53c3b9ef3f37a09c3cefa4b116107fa0dcd9f69e30b304a9296a255971d426e9e8d4457f7636362c78d57145540f5
-EBUILD ws4py-0.2.4-r1.ebuild 1332 SHA256 88894cf3d47f42be79d47a7cd075f20b537aa376370932294ff0108de8b07775 SHA512 a34d05fd60a74088bd8c784b139c98dca6c31886fd52fe7616da8f284bd4726270927d2516810b51802db40022ad93e9dc59b4544e83e2f69f7fb36eeb828281 WHIRLPOOL 14ea536d8ef5cafa7881a2006f29a7e0226e47841d78d6b6f70b636beda1a9e228519cb93a5c5d2fccdfea9fb9d305b4031948fc0a61d2a701a3cc1d901e7e62
-EBUILD ws4py-0.2.4.ebuild 1357 SHA256 39630dcbdf06436c71104365bd19f58afe58adf5d0fad254545d4c7daefa6ba5 SHA512 095e2eb0d3af4a3d4902a9b8857bcbf654e04993c4e5176c25c2f381fe2b58dc25d9cf0f0c6e3f8ef0e24b00a29c7e20cf26205a9f0e36457533b24cc3a4b3e6 WHIRLPOOL 22edb956f7561cdf75f193570d9e822c7aa23ce1a6c5eaf5b1338be600d5109b31b572b84e1a6135d04bb48f7daffcb923a1109e29cac03f76a5d05326c8ed6d
-EBUILD ws4py-0.3.2.ebuild 1273 SHA256 3ce7d4bff541279d499b0a1b0fadf2e5448921d03005320c08edd07d4ecbc604 SHA512 28ee07d5c286b57329dff183a9dbfc9af6062bc9a8ccb0009b080e6a03b80e228c83ae58d23cbceac0614109f638c012d84e691914416ae0a4e750ff1a7725e5 WHIRLPOOL 3cf1050eb823319852a7e6b3f9519914f7e451bfe2a7633f42899886f55c83b6368861c2d32e6f59d2d4521045af055045396d476d1e0b03427dfce8dbc9c9d1
-EBUILD ws4py-0.3.3.ebuild 1273 SHA256 78951b47506b5b1f50ad55adddac866607e69195b9512fb281369c2a6a43fa66 SHA512 2f080fa4d92931c55feb3ec39e4d849f33110da43472dcad8e2b57d0df3929e4ba874816cb1050b7f6b30e51268c45c13c4afa90f4cc5ede723952b268ee21a6 WHIRLPOOL efa6f61ae0214bada5df73e72819462f01230bf7481e93e1df14cc8a8deb83090279802dd61b111590f53b8ea94e444b58c16cb0027d20d6c9754f6c62d96932
-EBUILD ws4py-0.3.4.ebuild 1831 SHA256 a54b681eaf21fd4e548dde034437bc87e29d41fad260ec6e80a424afb542a49a SHA512 1f2a83a1f32a24884990913a9870642bf77650422de31627f53487fcf04b1088bdd84edff4c5c231e23bc7ca19d299ae2645b3a8202f6a105eaa58dc098ba575 WHIRLPOOL e1e0a1ad7504c00024912146bb47a5614038a0e75ceb79ad06a63cb1de13362ebf8f98dfb9d6bb980f91c0d93d4f860b4d4f6a4f91ddb9b00632c26b09c92384
-EBUILD ws4py-9999.ebuild 1368 SHA256 121072e69164d9b7e4cb39395641922d836e0fff628a8408e7bbab70d093a7fb SHA512 d5327bf4e3e7a23b7b785cc644c51cba06768159079f7301cf9c08143943e75b881d4685483807e37f871566a4e60945e8d2a981efc9728e78eb95b0c9918485 WHIRLPOOL 26a5a4faeabc39fb3f4553f3cf2e122ddd84414f845973b0f6514bfcd3e0bf0d07b6e96348961bcc0b4130dcf8ed780bffb7446a6a5daf8403c603159d8a6989
-MISC ChangeLog 2664 SHA256 a9cd0ea5e30cd2cc42707fdf75fe51b5c399d6a81c67366f936eab1abbdb6085 SHA512 a1972d69dee8885bac8f062996739343b6bc9fee1732c88df4c37702f972861574f03175891f59c7ad794679a72f485386330843404f462029295bdfd7c113d7 WHIRLPOOL 4b651bb2c105eb0c6278057fef83a288d9144efb32f82e8c2a360c32528197234b10271ed5b3822c6417d4e467cb29f37c00cdfbb01bae0ca3aa92f0396b293f
+EBUILD ws4py-0.3.4.ebuild 1856 SHA256 9c3c3ba00b3687ee5c384b665541987123c5ab8df4fe5153bdefd6a6ae481a08 SHA512 df657831fec5674037402cd2c621fb3c42f374b0c52c7359e3e4f2ef81cd45859cf9aa69a2348e1f7f7e25ef816a9dcc3de79238db3d778321b285946ff7b641 WHIRLPOOL 179675bfce123369bfedc76a1931a30578e4606f9cb50ca2a049bd8c9a58e278d5e3aa238f3a3f99d2b5db95150df368ba801d67e03ba25a731b7e766e13caa7
+EBUILD ws4py-9999.ebuild 1855 SHA256 4afefc19fa0dc34ae860aab0f15e0343862ac1cf7a32511364c63dd3ac0c5ba4 SHA512 08059e534795eb69612daf75758c7e8289184c11be7c07f4aa9c9a1b42d7e48f1a4af70595970f28cf1f3b536c99da14a993b54c897d669f4394af2c7311008e WHIRLPOOL 95fe9a4417004674bea89e54ae8de19456134612161b80629b9d4e1646a2e7e4b93e3d4f36590500f4f841ac2b5dccf90c2523fcfda6b735b4b72793f81f0a20
+MISC ChangeLog 3062 SHA256 5a5ae52e015fc22797614a23ba620dc94767d86def46b92d7ddffc9ec23a5fed SHA512 d85ad1f40d7fd403299f8762f04951b6202bda994ae0036dc29b52f0bec60dac6f92eecdcc3ea5c56e851965031eb4a558c1b04f57d32157afe0a40dd8e37b7b WHIRLPOOL 60d590fe4ae9ae2eeb440f5465cde061f418a2dad2d1d314c31b9c65feda96e793b6f671d095fdf3450400d97f237188f0474705307b86229941b676327c0201
 MISC metadata.xml 394 SHA256 da0ee1261f3a6ec3319e152c257b42ade798e5ed1b47a10444c99919600ddac0 SHA512 d167099bc3f3de3c68ae77aff63f44c3b332dd385ef5cb19c7ab84a2389f2ca916e92ab39d63f8139d36f7b5fa65c0f666c8f5cb02e7abae18af6babbea18fb4 WHIRLPOOL 3d883142b291ede838bd9d2e20db089b8e4e2e2d1e4db9f3f1931b50164f58f788bf79131d5b8969fdadc4d2050f5a5b8b7c09d65b5f7fdb70b33dd69a077fd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOAHZwACgkQso7CE7gHKw3+dwCg4oKeikVzfVY466Xy3AAJIAx0
-E/0AoJZGf7rJ2gS67aLuOCIUH2UIzSJC
-=iGhL
+iF4EAREIAAYFAlRCk2QACgkQC77qH+pIQ6R6FwD7BAgnet2who5R2+J7PjScLIEF
+V0oPsb9+siYst2zsIoQA/RX+yQ7ht/uPvP/s8yi599vOfqWqj79jmEm6oljOw/KX
+=pQ5d
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ws4py/ws4py-0.2.1-r1.ebuild b/dev-python/ws4py/ws4py-0.2.1-r1.ebuild
deleted file mode 100644
index 1fe1cd361229..000000000000
--- a/dev-python/ws4py/ws4py-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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-r1.ebuild,v 1.2 2012/06/11 14:13:15 mgorny Exp $
-
-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}.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=""
-#IUSE="client server"
-
-# The gevent package isn't in the tree yet.
-#RDEPEND="client? ( >=dev-python/gevent-0.13.6 )
-#	server? ( >=dev-python/gevent-0.13.6 )"
-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}
-}
diff --git a/dev-python/ws4py/ws4py-0.2.1-r2.ebuild b/dev-python/ws4py/ws4py-0.2.1-r2.ebuild
deleted file mode 100644
index b52ca3d38af2..000000000000
--- a/dev-python/ws4py/ws4py-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.2 2012/06/11 14:13:15 mgorny 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}.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-0.2.1.ebuild b/dev-python/ws4py/ws4py-0.2.1.ebuild
deleted file mode 100644
index 98b022bd4a76..000000000000
--- a/dev-python/ws4py/ws4py-0.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.ebuild,v 1.2 2012/06/11 14:13:15 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit distutils
-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=""
-#IUSE="client server"
-
-# The gevent package isn't in the tree yet.
-#RDEPEND="client? ( >=dev-python/gevent-0.13.6 )
-#	server? ( >=dev-python/gevent-0.13.6 )"
-DEPEND=""
-
-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}
-}
diff --git a/dev-python/ws4py/ws4py-0.2.2.ebuild b/dev-python/ws4py/ws4py-0.2.2.ebuild
deleted file mode 100644
index 44f3d6d1c98b..000000000000
--- a/dev-python/ws4py/ws4py-0.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.2.ebuild,v 1.1 2012/07/17 02:11:37 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:2.6"
-DISTUTILS_SRC_TEST="setup.py"
-
-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}
-		dev-python/cherrypy
-		dev-python/gevent
-	)"
-
-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.3.ebuild b/dev-python/ws4py/ws4py-0.2.3.ebuild
deleted file mode 100644
index 475ea0fefb9d..000000000000
--- a/dev-python/ws4py/ws4py-0.2.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.4 2013/07/19 07:56:00 mgorny 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"
-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}
-		dev-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
-}
diff --git a/dev-python/ws4py/ws4py-0.2.4-r1.ebuild b/dev-python/ws4py/ws4py-0.2.4-r1.ebuild
deleted file mode 100644
index abe253709015..000000000000
--- a/dev-python/ws4py/ws4py-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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-r1.ebuild,v 1.2 2013/07/19 07:56:00 mgorny 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="5"
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="threads?"
-
-inherit distutils-r1
-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=""
-DEPEND="test? (
-		${RDEPEND}
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		>=dev-python/cherrypy-3.2.0[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2-cherrypy_test.patch )
-
-python_test() {
-	esetup.py test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	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
deleted file mode 100644
index b2a4b7b254ac..000000000000
--- a/dev-python/ws4py/ws4py-0.2.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.2 2013/07/19 07:56:00 mgorny 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}
-		dev-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
-}
diff --git a/dev-python/ws4py/ws4py-0.3.2.ebuild b/dev-python/ws4py/ws4py-0.3.2.ebuild
deleted file mode 100644
index 386bce4195ee..000000000000
--- a/dev-python/ws4py/ws4py-0.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.3.2.ebuild,v 1.1 2014/02/24 05:58:37 patrick 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="5"
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="threads?"
-
-inherit distutils-r1
-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=""
-DEPEND="test? (
-		${RDEPEND}
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		>=dev-python/cherrypy-3.2.0[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	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.3.3.ebuild b/dev-python/ws4py/ws4py-0.3.3.ebuild
deleted file mode 100644
index 7b3f40cabab7..000000000000
--- a/dev-python/ws4py/ws4py-0.3.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.3.3.ebuild,v 1.1 2014/05/03 08:12:25 patrick 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="5"
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="threads?"
-
-inherit distutils-r1
-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=""
-DEPEND="test? (
-		${RDEPEND}
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		>=dev-python/cherrypy-3.2.0[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	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.3.4.ebuild b/dev-python/ws4py/ws4py-0.3.4.ebuild
index 95103d69cb7f..bdc9d9e25d29 100644
--- a/dev-python/ws4py/ws4py-0.3.4.ebuild
+++ b/dev-python/ws4py/ws4py-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.3.4.ebuild,v 1.1 2014/05/24 04:26:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.3.4.ebuild,v 1.2 2014/10/18 16:20:51 floppym Exp $
 
 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
@@ -30,7 +30,7 @@ IUSE="+client +server test +threads"
 # doc build requires sphinxcontrib ext packages absent from portage
 
 RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-		dev-python/gevent[$(python_gen_usedep python2_7)]
+		$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
 		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
 		server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
@@ -45,8 +45,8 @@ python_test() {
 	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
 }
 
-src_install() {
-	distutils-r1_src_install
-	use client || rm -rf "${ED}$(python_get_sitedir)"/ws4py/client
-	use server || rm -rf "${ED}$(python_get_sitedir)"/ws4py/server
+python_install() {
+	distutils-r1_python_install
+	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
+	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
 }
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 3645fc6837d0..e4a9d18afb38 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.4 2012/07/17 02:11:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-9999.ebuild,v 1.5 2014/10/18 16:20:51 floppym 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 ...
+# Same for www-servers/tornado and USE=client ... so why not???
+# pypy is viable but better with a cutdown set of deps
 
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-DISTUTILS_SRC_TEST="setup.py"
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads?"
 
-inherit distutils eutils
+inherit distutils-r1
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/Lawouach/WebSocket-for-Python.git"
 	inherit git-2
@@ -23,24 +21,32 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-DESCRIPTION="WebSocket support for Python"
+DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
 HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
 
 LICENSE="BSD"
 SLOT="0"
 IUSE="+client +server test +threads"
+# doc build requires sphinxcontrib ext packages absent from portage
 
-RDEPEND="client? ( dev-lang/python[threads?] )"
+RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+		server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
 DEPEND="test? (
-		${RDEPEND}
-		dev-python/cherrypy
-		dev-python/gevent
+		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 	)"
 
-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
+python_test() {
+	# testsuite displays an issue with mock under py3 but is non fatal
+	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
+	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
 }