From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53E39139695 for ; Tue, 28 Feb 2017 11:27:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FDBD21C18A; Tue, 28 Feb 2017 11:27:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7916421C18A for ; Tue, 28 Feb 2017 11:27:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10ED734166C for ; Tue, 28 Feb 2017 11:27:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51C1C5787 for ; Tue, 28 Feb 2017 11:27:02 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1488281211.e83a9211a4011102af0257b50b0fea3b18a41ba0.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rqt_gui/, dev-ros/rqt_gui/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/rqt_gui/files/gentoo.patch dev-ros/rqt_gui/rqt_gui-0.3.2-r1.ebuild dev-ros/rqt_gui/rqt_gui-9999.ebuild X-VCS-Directories: dev-ros/rqt_gui/files/ dev-ros/rqt_gui/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: e83a9211a4011102af0257b50b0fea3b18a41ba0 X-VCS-Branch: master Date: Tue, 28 Feb 2017 11:27:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b97d4242-efe8-42f3-a557-1ccc42ae4f25 X-Archives-Hash: 40a9ae5db2200dcc4b1f66a6c57fdc23 commit: e83a9211a4011102af0257b50b0fea3b18a41ba0 Author: Alexis Ballier gentoo org> AuthorDate: Tue Feb 28 11:20:09 2017 +0000 Commit: Alexis Ballier gentoo 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" )