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

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

[Alexis Ballier]

commit:     e83a9211a4011102af0257b50b0fea3b18a41ba0
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 11:20:09 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83a9211

dev-ros/rqt_gui: Strip ros_packages/ from plugin.xml search path

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ros/rqt_gui/files/gentoo.patch                        | 15 +++++++++++++++
 .../{rqt_gui-9999.ebuild => rqt_gui-0.3.2-r1.ebuild}      |  1 +
 dev-ros/rqt_gui/rqt_gui-9999.ebuild                       |  1 +
 3 files changed, 17 insertions(+)

diff --git a/dev-ros/rqt_gui/files/gentoo.patch b/dev-ros/rqt_gui/files/gentoo.patch
new file mode 100644
index 0000000000..abdc30a8cc
--- /dev/null
+++ b/dev-ros/rqt_gui/files/gentoo.patch
@@ -0,0 +1,15 @@
+Index: rqt_gui/src/rqt_gui/ros_plugin_provider.py
+===================================================================
+--- rqt_gui.orig/src/rqt_gui/ros_plugin_provider.py
++++ rqt_gui/src/rqt_gui/ros_plugin_provider.py
+@@ -109,6 +109,10 @@ class RosPluginProvider(PluginProvider):
+     def _parse_plugin_xml(self, package_name, plugin_xml):
+         plugin_descriptors = []
+ 
++        # Gentoo: strip ros_packages to get the real path.
++        if not os.path.isfile(plugin_xml):
++            plugin_xml = plugin_xml.replace('ros_packages/', '')
++
+         if not os.path.isfile(plugin_xml):
+             qCritical('RosPluginProvider._parse_plugin_xml() plugin file "%s" in package "%s" not found' % (plugin_xml, package_name))
+             return plugin_descriptors

diff --git a/dev-ros/rqt_gui/rqt_gui-9999.ebuild b/dev-ros/rqt_gui/rqt_gui-0.3.2-r1.ebuild
similarity index 92%
copy from dev-ros/rqt_gui/rqt_gui-9999.ebuild
copy to dev-ros/rqt_gui/rqt_gui-0.3.2-r1.ebuild
index 8d01cc5e18..1ba3c35e10 100644
--- a/dev-ros/rqt_gui/rqt_gui-9999.ebuild
+++ b/dev-ros/rqt_gui/rqt_gui-0.3.2-r1.ebuild
@@ -18,3 +18,4 @@ IUSE=""
 
 RDEPEND=">=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gentoo.patch" )

diff --git a/dev-ros/rqt_gui/rqt_gui-9999.ebuild b/dev-ros/rqt_gui/rqt_gui-9999.ebuild
index 8d01cc5e18..1ba3c35e10 100644
--- a/dev-ros/rqt_gui/rqt_gui-9999.ebuild
+++ b/dev-ros/rqt_gui/rqt_gui-9999.ebuild
@@ -18,3 +18,4 @@ IUSE=""
 
 RDEPEND=">=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gentoo.patch" )