[gentoo-commits] repo/gentoo:master commit in: dev-ros/rosbridge_server/files/, dev-ros/rosbridge_server/

[Alexis Ballier]

commit:     7872cf79972af0c079ceea92447ecd88f5fb5365
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 11:07:03 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 11:07:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7872cf79

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 +++++++++++++
 ...rver-0.7.13.ebuild => rosbridge_server-0.7.13-r1.ebuild} |  2 ++
 dev-ros/rosbridge_server/rosbridge_server-9999.ebuild       |  2 ++
 3 files changed, 17 insertions(+)

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 0000000..b8fc226
--- /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
similarity index 85%
rename from dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
rename to dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
index 997490d..cc30070 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 997490d..cc30070 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" )