Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rosbridge_server/files/, dev-ros/rosbridge_server/
Date: Fri, 30 Oct 2015 11:07:35
Message-Id: 1446203223.7872cf79972af0c079ceea92447ecd88f5fb5365.aballier@gentoo
1 commit: 7872cf79972af0c079ceea92447ecd88f5fb5365
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 30 11:07:03 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 30 11:07:03 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7872cf79
7
8 dev-ros/rosbridge_server: Unbundle dev-python/backports-ssl-match-hostname. Bug #564340.
9
10 Package-Manager: portage-2.2.23
11
12 dev-ros/rosbridge_server/files/backports-ssl.patch | 13 +++++++++++++
13 ...rver-0.7.13.ebuild => rosbridge_server-0.7.13-r1.ebuild} | 2 ++
14 dev-ros/rosbridge_server/rosbridge_server-9999.ebuild | 2 ++
15 3 files changed, 17 insertions(+)
16
17 diff --git a/dev-ros/rosbridge_server/files/backports-ssl.patch b/dev-ros/rosbridge_server/files/backports-ssl.patch
18 new file mode 100644
19 index 0000000..b8fc226
20 --- /dev/null
21 +++ b/dev-ros/rosbridge_server/files/backports-ssl.patch
22 @@ -0,0 +1,13 @@
23 +Index: rosbridge_server/setup.py
24 +===================================================================
25 +--- rosbridge_server.orig/setup.py
26 ++++ rosbridge_server/setup.py
27 +@@ -11,8 +11,6 @@ from catkin_pkg.python_setup import gene
28 + d = generate_distutils_setup(
29 + packages=[
30 + 'rosbridge_server',
31 +- 'backports',
32 +- 'backports.ssl_match_hostname',
33 + 'tornado',
34 + 'tornado.platform'
35 + ],
36
37 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
38 similarity index 85%
39 rename from dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
40 rename to dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
41 index 997490d..cc30070 100644
42 --- a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
43 +++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
44 @@ -20,5 +20,7 @@ RDEPEND="
45 dev-ros/rospy[${PYTHON_USEDEP}]
46 dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
47 dev-ros/rosauth[${PYTHON_USEDEP}]
48 + dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
49 "
50 DEPEND="${RDEPEND}"
51 +PATCHES=( "${FILESDIR}/backports-ssl.patch" )
52
53 diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
54 index 997490d..cc30070 100644
55 --- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
56 +++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
57 @@ -20,5 +20,7 @@ RDEPEND="
58 dev-ros/rospy[${PYTHON_USEDEP}]
59 dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
60 dev-ros/rosauth[${PYTHON_USEDEP}]
61 + dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
62 "
63 DEPEND="${RDEPEND}"
64 +PATCHES=( "${FILESDIR}/backports-ssl.patch" )