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

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

12 files changed, 42 insertions, 434 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/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
 }