Upgraded the ws4py Portage package

Upgraded dev-python/ws4py to version 0.2.1-r2 on amd64, arm, x86

BUG=None
TEST=Built Chrome factory UI

Change-Id: I98509cbc1643413f4bb8c3096ad512c7e86beeeb
Reviewed-on: https://gerrit.chromium.org/gerrit/20928
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Jon Salz <jsalz@chromium.org>
Commit-Ready: Jon Salz <jsalz@chromium.org>
This commit is contained in:
Jon Salz 2012-04-24 20:32:38 +08:00 committed by Gerrit
parent b9a5f7e437
commit dc01d01073
5 changed files with 86 additions and 48 deletions

View File

@ -0,0 +1,27 @@
From 38cf669e27fab9de187eb11dabd7d85d73d5f470 Mon Sep 17 00:00:00 2001
From: Jon Salz <jsalz@chromium.org>
Date: Fri, 20 Apr 2012 02:22:46 +0800
Subject: [PATCH] Process remaining bytes in the body, if any.
https://github.com/Lawouach/WebSocket-for-Python/issues/46
---
ws4py/client/__init__.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ws4py/client/__init__.py b/ws4py/client/__init__.py
index aa4c8f2..29b1357 100644
--- a/ws4py/client/__init__.py
+++ b/ws4py/client/__init__.py
@@ -71,6 +71,9 @@ class WebSocketBaseClient(WebSocket):
self.handshake_ok()
+ if body != '':
+ self.process(body)
+
@property
def handshake_headers(self):
parts = urlsplit(self.url)
--
1.7.3.4

View File

@ -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
}

View File

@ -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.1 2012/04/17 23:09:11 vapier 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}-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=""
#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}
}

View File

@ -1,12 +0,0 @@
DEFINED_PHASES=compile install postinst postrm prepare setup unpack
DEPEND=>=app-admin/eselect-python-20091230 =dev-lang/python-2*
DESCRIPTION=WebSocket support for Python
EAPI=4
HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
KEYWORDS=amd64 arm x86
LICENSE=BSD
RDEPEND=>=app-admin/eselect-python-20091230 =dev-lang/python-2*
SLOT=0
SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/tarball/v0.2.1 -> ws4py-0.2.1-src.tar.gz
_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 vcs-snapshot da01f8084931ab770fd9ddf7e537a262
_md5_=91b0ec59e300530c701a6c5cce6fa3f0

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile install postinst postrm prepare setup unpack
DEPEND=>=app-admin/eselect-python-20091230 =dev-lang/python-2*
DESCRIPTION=WebSocket support for Python
EAPI=4
HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
IUSE=+client +server +threads
KEYWORDS=amd64 arm x86
LICENSE=BSD
RDEPEND=client? ( dev-lang/python[threads?] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
SLOT=0
SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/tarball/v0.2.1 -> ws4py-0.2.1-src.tar.gz
_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 vcs-snapshot da01f8084931ab770fd9ddf7e537a262
_md5_=f5cd112e967e1e92e092b890af082207