From f69842be50589f050caaaed2cc145be489592d5a Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Mon, 2 Nov 2015 00:10:25 +0100 Subject: dev-ros/rosbridge_server: Unbundle tornado. Bug #564644. Package-Manager: portage-2.2.23 --- dev-ros/rosbridge_server/files/tornado.patch | 91 ++++++++++++++++++++++ .../rosbridge_server-0.7.13-r1.ebuild | 26 ------- .../rosbridge_server-0.7.13-r2.ebuild | 30 +++++++ .../rosbridge_server/rosbridge_server-9999.ebuild | 6 +- 4 files changed, 126 insertions(+), 27 deletions(-) create mode 100644 dev-ros/rosbridge_server/files/tornado.patch delete mode 100644 dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild create mode 100644 dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild diff --git a/dev-ros/rosbridge_server/files/tornado.patch b/dev-ros/rosbridge_server/files/tornado.patch new file mode 100644 index 00000000000..ae239138523 --- /dev/null +++ b/dev-ros/rosbridge_server/files/tornado.patch @@ -0,0 +1,91 @@ +Index: rosbridge_server/setup.py +=================================================================== +--- rosbridge_server.orig/setup.py ++++ rosbridge_server/setup.py +@@ -10,85 +10,9 @@ from catkin_pkg.python_setup import gene + + d = generate_distutils_setup( + packages=[ +- 'rosbridge_server', +- 'tornado', +- 'tornado.platform' ++ 'rosbridge_server' + ], + package_dir={'': 'src'} + ) + +-# The following code is copied from +-# https://github.com/mongodb/mongo-python-driver/blob/master/setup.py +-# to support installing without the extension on platforms where +-# no compiler is available. +-from distutils.command.build_ext import build_ext +- +-class custom_build_ext(build_ext): +- """Allow C extension building to fail. +- +- The C extension speeds up websocket masking, but is not essential. +- """ +- +- warning_message = """ +-******************************************************************** +-WARNING: %s could not +-be compiled. No C extensions are essential for Tornado to run, +-although they do result in significant speed improvements for +-websockets. +-%s +- +-Here are some hints for popular operating systems: +- +-If you are seeing this message on Linux you probably need to +-install GCC and/or the Python development package for your +-version of Python. +- +-Debian and Ubuntu users should issue the following command: +- +- $ sudo apt-get install build-essential python-dev +- +-RedHat, CentOS, and Fedora users should issue the following command: +- +- $ sudo yum install gcc python-devel +-******************************************************************** +-""" +- +- def run(self): +- try: +- build_ext.run(self) +- except Exception: +- e = sys.exc_info()[1] +- sys.stdout.write('%s\n' % str(e)) +- warnings.warn(self.warning_message % ("Extension modules", +- "There was an issue with " +- "your platform configuration" +- " - see above.")) +- +- def build_extension(self, ext): +- name = ext.name +- try: +- build_ext.build_extension(self, ext) +- except Exception: +- e = sys.exc_info()[1] +- sys.stdout.write('%s\n' % str(e)) +- warnings.warn(self.warning_message % ("The %s extension " +- "module" % (name,), +- "The output above " +- "this warning shows how " +- "the compilation " +- "failed.")) +- +-if (platform.python_implementation() == 'CPython' and +- os.environ.get('TORNADO_EXTENSION') != '0'): +- # This extension builds and works on pypy as well, although pypy's jit +- # produces equivalent performance. +- d['ext_modules'] = [ +- Extension('tornado.speedups', sources=['src/tornado/speedups.c']), +- ] +- +- if os.environ.get('TORNADO_EXTENSION') != '1': +- # Unless the user has specified that the extension is mandatory, +- # fall back to the pure-python implementation on any build failure. +- d['cmdclass'] = {'build_ext': custom_build_ext} +- + setup(**d) diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild deleted file mode 100644 index cc30070be37..00000000000 --- a/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite" -KEYWORDS="~amd64" -PYTHON_COMPAT=( python2_7 ) -ROS_SUBDIR=${PN} - -inherit ros-catkin - -DESCRIPTION="A WebSocket interface to rosbridge" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/rosauth[${PYTHON_USEDEP}] - dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/backports-ssl.patch" ) diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild new file mode 100644 index 00000000000..de815261bc7 --- /dev/null +++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite" +KEYWORDS="~amd64" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="A WebSocket interface to rosbridge" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] + dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/rosauth[${PYTHON_USEDEP}] + dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}] + www-servers/tornado[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/backports-ssl.patch" + "${FILESDIR}/tornado.patch" +) diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild index cc30070be37..de815261bc7 100644 --- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild +++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild @@ -21,6 +21,10 @@ RDEPEND=" dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] dev-ros/rosauth[${PYTHON_USEDEP}] dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}] + www-servers/tornado[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/backports-ssl.patch" ) +PATCHES=( + "${FILESDIR}/backports-ssl.patch" + "${FILESDIR}/tornado.patch" +) -- cgit v1.2.1