summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-10-30 12:07:03 +0100
committerAlexis Ballier <aballier@gentoo.org>2015-10-30 12:07:03 +0100
commit7872cf79972af0c079ceea92447ecd88f5fb5365 (patch)
treea357867782be2b0df38077bfaa34e0c6cf85b326 /dev-ros/rosbridge_server
parentdev-ml/ocurl: Bump to 0.7.6. (diff)
downloadgentoo-7872cf79972af0c079ceea92447ecd88f5fb5365.tar.gz
gentoo-7872cf79972af0c079ceea92447ecd88f5fb5365.tar.bz2
gentoo-7872cf79972af0c079ceea92447ecd88f5fb5365.zip
dev-ros/rosbridge_server: Unbundle dev-python/backports-ssl-match-hostname. Bug #564340.
Package-Manager: portage-2.2.23
Diffstat (limited to 'dev-ros/rosbridge_server')
-rw-r--r--dev-ros/rosbridge_server/files/backports-ssl.patch13
-rw-r--r--dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild (renamed from dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild)2
-rw-r--r--dev-ros/rosbridge_server/rosbridge_server-9999.ebuild2
3 files changed, 17 insertions, 0 deletions
diff --git a/dev-ros/rosbridge_server/files/backports-ssl.patch b/dev-ros/rosbridge_server/files/backports-ssl.patch
new file mode 100644
index 00000000000..b8fc226bde0
--- /dev/null
+++ b/dev-ros/rosbridge_server/files/backports-ssl.patch
@@ -0,0 +1,13 @@
+Index: rosbridge_server/setup.py
+===================================================================
+--- rosbridge_server.orig/setup.py
++++ rosbridge_server/setup.py
+@@ -11,8 +11,6 @@ from catkin_pkg.python_setup import gene
+ d = generate_distutils_setup(
+ packages=[
+ 'rosbridge_server',
+- 'backports',
+- 'backports.ssl_match_hostname',
+ 'tornado',
+ 'tornado.platform'
+ ],
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
index 997490d73c4..cc30070be37 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
@@ -20,5 +20,7 @@ RDEPEND="
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-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
index 997490d73c4..cc30070be37 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -20,5 +20,7 @@ RDEPEND="
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" )