From 7872cf79972af0c079ceea92447ecd88f5fb5365 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Fri, 30 Oct 2015 12:07:03 +0100
Subject: dev-ros/rosbridge_server: Unbundle
 dev-python/backports-ssl-match-hostname. Bug #564340.

Package-Manager: portage-2.2.23
---
 dev-ros/rosbridge_server/files/backports-ssl.patch | 13 +++++++++++
 .../rosbridge_server-0.7.13-r1.ebuild              | 26 ++++++++++++++++++++++
 .../rosbridge_server-0.7.13.ebuild                 | 24 --------------------
 .../rosbridge_server/rosbridge_server-9999.ebuild  |  2 ++
 4 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 dev-ros/rosbridge_server/files/backports-ssl.patch
 create mode 100644 dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
 delete mode 100644 dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild

(limited to 'dev-ros/rosbridge_server')

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 000000000000..b8fc226bde0c
--- /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-r1.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
new file mode 100644
index 000000000000..cc30070be372
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
@@ -0,0 +1,26 @@
+# 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.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
deleted file mode 100644
index 997490d73c41..000000000000
--- a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
+++ /dev/null
@@ -1,24 +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}]
-	"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
index 997490d73c41..cc30070be372 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" )
-- 
cgit v1.2.3-18-g5258