commit: 5855c2107f1eb92b0ea9e6ceada4efeb51ffd98f
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 14:36:19 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 15:26:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5855c210
dev-ros/rosbash: fix patch
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/rosbash/files/catkin_prefix.patch | 13 +++++++++++++
dev-ros/rosbash/rosbash-1.14.7.ebuild | 2 +-
dev-ros/rosbash/rosbash-9999.ebuild | 4 ++--
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/dev-ros/rosbash/files/catkin_prefix.patch
b/dev-ros/rosbash/files/catkin_prefix.patch
new file mode 100644
index 00000000000..89877b005f9
--- /dev/null
+++ b/dev-ros/rosbash/files/catkin_prefix.patch
@@ -0,0 +1,13 @@
+Index: rosbash/scripts/rosrun
+===================================================================
+--- rosbash.orig/scripts/rosrun
++++ rosbash/scripts/rosrun
+@@ -47,7 +47,7 @@ case $2 in
+ ;;
+ esac
+
+-if [[ -n $CMAKE_PREFIX_PATH ]]; then
++if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then
+ _rosrun_IFS="$IFS"
+ IFS=$'\n'
+ catkin_package_libexec_dirs=($(catkin_find --without-underlays --libexec
--share "$1" 2> /dev/null))
diff --git a/dev-ros/rosbash/rosbash-1.14.7.ebuild
b/dev-ros/rosbash/rosbash-1.14.7.ebuild
index 1b7d1d2120d..3a58dab5f49 100644
--- a/dev-ros/rosbash/rosbash-1.14.7.ebuild
+++ b/dev-ros/rosbash/rosbash-1.14.7.ebuild
@@ -16,4 +16,4 @@ IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosbash/rosbash-9999.ebuild
b/dev-ros/rosbash/rosbash-9999.ebuild
index f77828f9bf9..3a58dab5f49 100644
--- a/dev-ros/rosbash/rosbash-9999.ebuild
+++ b/dev-ros/rosbash/rosbash-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,4 +16,4 @@ IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
