dev-util/catkin: Add CATKIN_PREFIX_PATH support to _setup_util.py.in.

Patch by Eric Timmons. Bug #586104.

Package-Manager: portage-2.3.1

diff --git a/dev-util/catkin/catkin-0.7.1.ebuild b/dev-util/catkin/catkin-0.7.1-r1.ebuild
similarity index 96%
rename from dev-util/catkin/catkin-0.7.1.ebuild
rename to dev-util/catkin/catkin-0.7.1-r1.ebuild
index ddfc8ba1e712dea095887941a03239a75f6f1e26..cf494b1753eec173b24c3686e0c6481dc45fc804 100644 (file)
--- a/dev-util/catkin/catkin-0.7.1.ebuild
+++ b/dev-util/catkin/catkin-0.7.1-r1.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$
 
@@ -40,6 +40,7 @@ PATCHES=(
        "${FILESDIR}/distutils.patch"
        "${FILESDIR}/catkin_prefix_path.patch"
        "${FILESDIR}/gnuinstalldirs.patch"
+       "${FILESDIR}/catkin_prefix_path_util_py.patch"
 )
 
 src_prepare() {

diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index ddfc8ba1e712dea095887941a03239a75f6f1e26..cf494b1753eec173b24c3686e0c6481dc45fc804 100644 (file)
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-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$
 
@@ -40,6 +40,7 @@ PATCHES=(
        "${FILESDIR}/distutils.patch"
        "${FILESDIR}/catkin_prefix_path.patch"
        "${FILESDIR}/gnuinstalldirs.patch"
+       "${FILESDIR}/catkin_prefix_path_util_py.patch"
 )
 
 src_prepare() {

diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
new file mode 100644 (file)
index 0000000..d978176
--- /dev/null
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
@@ -0,0 +1,16 @@
+Author:  Eric Timmons 
+https://bugs.gentoo.org/show_bug.cgi?id=586104
+
+Index: catkin-0.6.16/cmake/templates/_setup_util.py.in
+===================================================================
+--- catkin-0.6.16.orig/cmake/templates/_setup_util.py.in
++++ catkin-0.6.16/cmake/templates/_setup_util.py.in
+@@ -262,7 +262,7 @@
+             sys.exit(1)
+ 
+         # environment at generation time
+-        CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
++        CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
+         # prepend current workspace if not already part of CPP
+         base_path = os.path.dirname(__file__)
+         if base_path not in CMAKE_PREFIX_PATH: