| 1 |
commit: e504013dc705a9ab392b14b65716f9b02833ad3c |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 28 14:30:30 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 28 15:04:28 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e504013d |
| 7 |
|
| 8 |
dev-ros/rospack: add custom patch to return proper package paths with our package.xml moved to ros_packages. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
dev-ros/rospack/files/gentoo.patch | 18 ++++++++++++++++++ |
| 13 |
.../{rospack-2.3.1.ebuild => rospack-2.3.1-r1.ebuild} | 1 + |
| 14 |
dev-ros/rospack/rospack-9999.ebuild | 3 ++- |
| 15 |
3 files changed, 21 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-ros/rospack/files/gentoo.patch b/dev-ros/rospack/files/gentoo.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..7090d7b |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ros/rospack/files/gentoo.patch |
| 22 |
@@ -0,0 +1,18 @@ |
| 23 |
+Index: rospack-2.3.1/src/rospack.cpp |
| 24 |
+=================================================================== |
| 25 |
+--- rospack-2.3.1.orig/src/rospack.cpp |
| 26 |
++++ rospack-2.3.1/src/rospack.cpp |
| 27 |
+@@ -191,6 +191,13 @@ class Stackage |
| 28 |
+ break; |
| 29 |
+ } |
| 30 |
+ } |
| 31 |
++ |
| 32 |
++ // On Gentoo we move package.xml to /usr/share/ros_packages/... but need to keep standard stuff in /usr/share, so correct this here. |
| 33 |
++ try { |
| 34 |
++ fs::path p = fs::canonical("../../" + name_, path_); |
| 35 |
++ path_ = p.string(); |
| 36 |
++ } |
| 37 |
++ catch(fs::filesystem_error& e) {}; |
| 38 |
+ } |
| 39 |
+ |
| 40 |
+ bool isStack() const |
| 41 |
|
| 42 |
diff --git a/dev-ros/rospack/rospack-2.3.1.ebuild b/dev-ros/rospack/rospack-2.3.1-r1.ebuild |
| 43 |
similarity index 93% |
| 44 |
rename from dev-ros/rospack/rospack-2.3.1.ebuild |
| 45 |
rename to dev-ros/rospack/rospack-2.3.1-r1.ebuild |
| 46 |
index 60535c5..61b544e 100644 |
| 47 |
--- a/dev-ros/rospack/rospack-2.3.1.ebuild |
| 48 |
+++ b/dev-ros/rospack/rospack-2.3.1-r1.ebuild |
| 49 |
@@ -17,6 +17,7 @@ DESCRIPTION="Retrieves information about ROS packages available on the filesyste |
| 50 |
LICENSE="BSD" |
| 51 |
SLOT="0" |
| 52 |
IUSE="" |
| 53 |
+PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 54 |
|
| 55 |
RDEPEND="dev-libs/boost:= |
| 56 |
dev-libs/tinyxml |
| 57 |
|
| 58 |
diff --git a/dev-ros/rospack/rospack-9999.ebuild b/dev-ros/rospack/rospack-9999.ebuild |
| 59 |
index 4d7f1ab..61b544e 100644 |
| 60 |
--- a/dev-ros/rospack/rospack-9999.ebuild |
| 61 |
+++ b/dev-ros/rospack/rospack-9999.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2014 Gentoo Foundation |
| 64 |
+# Copyright 1999-2016 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
# $Id$ |
| 67 |
|
| 68 |
@@ -17,6 +17,7 @@ DESCRIPTION="Retrieves information about ROS packages available on the filesyste |
| 69 |
LICENSE="BSD" |
| 70 |
SLOT="0" |
| 71 |
IUSE="" |
| 72 |
+PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 73 |
|
| 74 |
RDEPEND="dev-libs/boost:= |
| 75 |
dev-libs/tinyxml |
Archives