From 7872cf79972af0c079ceea92447ecd88f5fb5365 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 30 Oct 2015 12:07:03 +0100 Subject: [PATCH] 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 +++++++++++++ ....13.ebuild => rosbridge_server-0.7.13-r1.ebuild} | 2 ++ .../rosbridge_server/rosbridge_server-9999.ebuild | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 dev-ros/rosbridge_server/files/backports-ssl.patch rename dev-ros/rosbridge_server/{rosbridge_server-0.7.13.ebuild => rosbridge_server-0.7.13-r1.ebuild} (85%) 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.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 997490d73c41..cc30070be372 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 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" ) -- 2.26.2