From e504013dc705a9ab392b14b65716f9b02833ad3c Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Mon, 28 Nov 2016 15:30:30 +0100
Subject: 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 ++++++++++++++++++
 dev-ros/rospack/rospack-2.3.1-r1.ebuild | 30 ++++++++++++++++++++++++++++++
 dev-ros/rospack/rospack-2.3.1.ebuild    | 29 -----------------------------
 dev-ros/rospack/rospack-9999.ebuild     |  3 ++-
 4 files changed, 50 insertions(+), 30 deletions(-)
 create mode 100644 dev-ros/rospack/files/gentoo.patch
 create mode 100644 dev-ros/rospack/rospack-2.3.1-r1.ebuild
 delete mode 100644 dev-ros/rospack/rospack-2.3.1.ebuild

(limited to 'dev-ros')

diff --git a/dev-ros/rospack/files/gentoo.patch b/dev-ros/rospack/files/gentoo.patch
new file mode 100644
index 000000000000..7090d7b02dd7
--- /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-r1.ebuild b/dev-ros/rospack/rospack-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..61b544e45a92
--- /dev/null
+++ b/dev-ros/rospack/rospack-2.3.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/rospack"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+# Do it that way to avoid ros-catkin pulling in python-r1
+PYTHON_COMPAT=( python{2_7,3_4} )
+inherit python-single-r1
+
+DESCRIPTION="Retrieves information about ROS packages available on the filesystem"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+PATCHES=( "${FILESDIR}/gentoo.patch" )
+
+RDEPEND="dev-libs/boost:=
+	dev-libs/tinyxml
+	"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	test? (
+		dev-cpp/gtest
+		dev-python/nose
+	)"
diff --git a/dev-ros/rospack/rospack-2.3.1.ebuild b/dev-ros/rospack/rospack-2.3.1.ebuild
deleted file mode 100644
index 60535c584ae8..000000000000
--- a/dev-ros/rospack/rospack-2.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/rospack"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-# Do it that way to avoid ros-catkin pulling in python-r1
-PYTHON_COMPAT=( python{2_7,3_4} )
-inherit python-single-r1
-
-DESCRIPTION="Retrieves information about ROS packages available on the filesystem"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/tinyxml
-	"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? (
-		dev-cpp/gtest
-		dev-python/nose
-	)"
diff --git a/dev-ros/rospack/rospack-9999.ebuild b/dev-ros/rospack/rospack-9999.ebuild
index 4d7f1ab66b65..61b544e45a92 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
-- 
cgit v1.2.3-65-gdbad