floppym 14/10/18 16:20:51
Modified: ws4py-0.3.4.ebuild ws4py-9999.ebuild ChangeLog
Removed: ws4py-0.3.2.ebuild ws4py-0.2.4.ebuild
ws4py-0.2.2.ebuild ws4py-0.2.1-r2.ebuild
ws4py-0.2.3.ebuild ws4py-0.3.3.ebuild
ws4py-0.2.4-r1.ebuild ws4py-0.2.1.ebuild
ws4py-0.2.1-r1.ebuild
Log:
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)
Revision Changes Path
1.2 dev-python/ws4py/ws4py-0.3.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ws4py/ws4py-0.3.4.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ws4py/ws4py-0.3.4.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ws4py/ws4py-0.3.4.ebuild?r1=1.1&r2=1.2
Index: ws4py-0.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.3.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ws4py-0.3.4.ebuild 24 May 2014 04:26:19 -0000 1.1
+++ ws4py-0.3.4.ebuild 18 Oct 2014 16:20:51 -0000 1.2
@@ -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 @@
# 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}" -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
}
1.5 dev-python/ws4py/ws4py-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ws4py/ws4py-9999.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ws4py/ws4py-9999.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ws4py/ws4py-9999.ebuild?r1=1.4&r2=1.5
Index: ws4py-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ws4py-9999.ebuild 17 Jul 2012 02:11:37 -0000 1.4
+++ ws4py-9999.ebuild 18 Oct 2014 16:20:51 -0000 1.5
@@ -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 @@
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
}
1.14 dev-python/ws4py/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ws4py/ChangeLog?rev=1.14&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ws4py/ChangeLog?rev=1.14&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/ws4py/ChangeLog?r1=1.13&r2=1.14
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/ws4py/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog 24 May 2014 04:26:19 -0000 1.13
+++ ChangeLog 18 Oct 2014 16:20:51 -0000 1.14
@@ -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 <[email protected]> -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)
