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 BF17F1395E3 for ; Mon, 28 Nov 2016 15:11:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56D2CE0B26; Mon, 28 Nov 2016 15:11:35 +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 2BEADE0B26 for ; Mon, 28 Nov 2016 15:11:35 +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 235B13414AD for ; Mon, 28 Nov 2016 15:11:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 928BD24A4 for ; Mon, 28 Nov 2016 15:11:31 +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: <1480345468.e504013dc705a9ab392b14b65716f9b02833ad3c.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rospack/, dev-ros/rospack/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/rospack/files/gentoo.patch dev-ros/rospack/rospack-2.3.1-r1.ebuild dev-ros/rospack/rospack-2.3.1.ebuild dev-ros/rospack/rospack-9999.ebuild X-VCS-Directories: dev-ros/rospack/files/ dev-ros/rospack/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: e504013dc705a9ab392b14b65716f9b02833ad3c X-VCS-Branch: master Date: Mon, 28 Nov 2016 15:11:31 +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: 460c18c8-60c8-4e24-adaa-025fe1619f28 X-Archives-Hash: e4b92d2a3b71c298aff295c007ea73ca commit: e504013dc705a9ab392b14b65716f9b02833ad3c Author: Alexis Ballier gentoo org> AuthorDate: Mon Nov 28 14:30:30 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Mon Nov 28 15:04:28 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e504013d dev-ros/rospack: add custom patch to return proper package paths with our package.xml moved to ros_packages. Package-Manager: portage-2.3.2 dev-ros/rospack/files/gentoo.patch | 18 ++++++++++++++++++ .../{rospack-2.3.1.ebuild => rospack-2.3.1-r1.ebuild} | 1 + dev-ros/rospack/rospack-9999.ebuild | 3 ++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dev-ros/rospack/files/gentoo.patch b/dev-ros/rospack/files/gentoo.patch new file mode 100644 index 00000000..7090d7b --- /dev/null +++ b/dev-ros/rospack/files/gentoo.patch @@ -0,0 +1,18 @@ +Index: rospack-2.3.1/src/rospack.cpp +=================================================================== +--- rospack-2.3.1.orig/src/rospack.cpp ++++ rospack-2.3.1/src/rospack.cpp +@@ -191,6 +191,13 @@ class Stackage + break; + } + } ++ ++ // On Gentoo we move package.xml to /usr/share/ros_packages/... but need to keep standard stuff in /usr/share, so correct this here. ++ try { ++ fs::path p = fs::canonical("../../" + name_, path_); ++ path_ = p.string(); ++ } ++ catch(fs::filesystem_error& e) {}; + } + + bool isStack() const diff --git a/dev-ros/rospack/rospack-2.3.1.ebuild b/dev-ros/rospack/rospack-2.3.1-r1.ebuild similarity index 93% rename from dev-ros/rospack/rospack-2.3.1.ebuild rename to dev-ros/rospack/rospack-2.3.1-r1.ebuild index 60535c5..61b544e 100644 --- a/dev-ros/rospack/rospack-2.3.1.ebuild +++ b/dev-ros/rospack/rospack-2.3.1-r1.ebuild @@ -17,6 +17,7 @@ DESCRIPTION="Retrieves information about ROS packages available on the filesyste LICENSE="BSD" SLOT="0" IUSE="" +PATCHES=( "${FILESDIR}/gentoo.patch" ) RDEPEND="dev-libs/boost:= dev-libs/tinyxml diff --git a/dev-ros/rospack/rospack-9999.ebuild b/dev-ros/rospack/rospack-9999.ebuild index 4d7f1ab..61b544e 100644 --- a/dev-ros/rospack/rospack-9999.ebuild +++ b/dev-ros/rospack/rospack-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,6 +17,7 @@ DESCRIPTION="Retrieves information about ROS packages available on the filesyste LICENSE="BSD" SLOT="0" IUSE="" +PATCHES=( "${FILESDIR}/gentoo.patch" ) RDEPEND="dev-libs/boost:= dev-libs/tinyxml