[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/

[Alexis Ballier]

commit:     0f076db9febbc02a17a61dac7ece0c7c16493746
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 09:54:45 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 09:58:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f076db9

dev-util/catkin: Honour CATKIN_PREFIX_PATH in toplevel.cmake too. Bug #566094.

Package-Manager: portage-2.2.25
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-util/catkin/files/catkin_prefix_path.patch | 39 ++++++++++++++++++++------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/dev-util/catkin/files/catkin_prefix_path.patch b/dev-util/catkin/files/catkin_prefix_path.patch
index 94e23ee..5c03a45 100644
--- a/dev-util/catkin/files/catkin_prefix_path.patch
+++ b/dev-util/catkin/files/catkin_prefix_path.patch
@@ -7,10 +7,10 @@ ROS packages are properly configured without needed to source a shellrc file in
 every shell session. This can't be done with CMAKE_PREFIX_PATH which is way too
 generic.
 
-Index: catkin-0.6.9/cmake/all.cmake
+Index: catkin-0.6.16/cmake/all.cmake
 ===================================================================
---- catkin-0.6.9.orig/cmake/all.cmake
-+++ catkin-0.6.9/cmake/all.cmake
+--- catkin-0.6.16.orig/cmake/all.cmake
++++ catkin-0.6.16/cmake/all.cmake
 @@ -52,7 +52,11 @@ set(CMAKE_PREFIX_PATH_AS_IS ${CMAKE_PREF
  
  # list of unique catkin workspaces based on CMAKE_PREFIX_PATH
@@ -24,10 +24,10 @@ Index: catkin-0.6.9/cmake/all.cmake
    if(EXISTS "${path}/.catkin")
      list(FIND CATKIN_WORKSPACES ${path} _index)
      if(_index EQUAL -1)
-Index: catkin-0.6.11/python/catkin/workspace.py
+Index: catkin-0.6.16/python/catkin/workspace.py
 ===================================================================
---- catkin-0.6.11.orig/python/catkin/workspace.py
-+++ catkin-0.6.11/python/catkin/workspace.py
+--- catkin-0.6.16.orig/python/catkin/workspace.py
++++ catkin-0.6.16/python/catkin/workspace.py
 @@ -44,7 +44,7 @@ def get_workspaces():
      """
      # get all cmake prefix paths
@@ -37,10 +37,10 @@ Index: catkin-0.6.11/python/catkin/workspace.py
      # remove non-workspace paths
      workspaces = [path for path in paths if os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))]
      return workspaces
-Index: catkin-0.6.9/cmake/catkinConfig.cmake.in
+Index: catkin-0.6.16/cmake/catkinConfig.cmake.in
 ===================================================================
---- catkin-0.6.9.orig/cmake/catkinConfig.cmake.in
-+++ catkin-0.6.9/cmake/catkinConfig.cmake.in
+--- catkin-0.6.16.orig/cmake/catkinConfig.cmake.in
++++ catkin-0.6.16/cmake/catkinConfig.cmake.in
 @@ -64,6 +64,11 @@ if(catkin_FIND_COMPONENTS)
  
        # get search paths from CMAKE_PREFIX_PATH (which includes devel space)
@@ -53,3 +53,24 @@ Index: catkin-0.6.9/cmake/catkinConfig.cmake.in
        foreach(path ${CMAKE_PREFIX_PATH})
          if(IS_DIRECTORY ${path}/share/${component}/cmake)
            list(APPEND paths ${path}/share/${component}/cmake)
+Index: catkin-0.6.16/cmake/toplevel.cmake
+===================================================================
+--- catkin-0.6.16.orig/cmake/toplevel.cmake
++++ catkin-0.6.16/cmake/toplevel.cmake
+@@ -35,10 +35,15 @@ else()
+       string(REPLACE ":" ";" CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+     endif()
+   endif()
++  if(NOT DEFINED CATKIN_PREFIX_PATH)
++    if(NOT "$ENV{CATKIN_PREFIX_PATH}" STREQUAL "")
++      string(REPLACE ":" ";" CATKIN_PREFIX_PATH $ENV{CATKIN_PREFIX_PATH})
++    endif()
++  endif()
+ 
+   # list of catkin workspaces
+   set(catkin_search_path "")
+-  foreach(path ${CMAKE_PREFIX_PATH})
++  foreach(path ${CMAKE_PREFIX_PATH} ${CATKIN_PREFIX_PATH})
+     if(EXISTS "${path}/.catkin")
+       list(FIND catkin_search_path ${path} _index)
+       if(_index EQUAL -1)

[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/

[Alexis Ballier]

commit:     00242c045f5742c0abdfa6fc75aabf9c51a32580
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 13:56:38 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 15:04:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00242c04

dev-util/catkin: add some comments in the etc patch

Package-Manager: portage-2.3.2

 dev-util/catkin/files/etc.patch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-util/catkin/files/etc.patch b/dev-util/catkin/files/etc.patch
index 205aca9..d95391f 100644
--- a/dev-util/catkin/files/etc.patch
+++ b/dev-util/catkin/files/etc.patch
@@ -1,3 +1,6 @@
+So that files like python_logging.conf ends up in $EPREFIX/etc.
+https://bugs.gentoo.org/show_bug.cgi?id=598537
+
 Index: catkin-0.7.4/cmake/all.cmake
 ===================================================================
 --- catkin-0.7.4.orig/cmake/all.cmake

[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/

[Alexis Ballier]

commit:     7ac50d6aefdbce6975819fed24ba04f2f174a3f2
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 14:57:15 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 15:02:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac50d6a

dev-util/catkin: fix patch for when env is unset

Closes: https://bugs.gentoo.org/629596
Closes: https://bugs.gentoo.org/677628
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
index ae468b21c01..6ad761f8421 100644
--- a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
@@ -22,7 +22,7 @@ Index: catkin-0.7.17/python/catkin/builder.py
                      'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
                      'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
                      'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
-+                    'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
++                    'CATKIN_PREFIX_PATH': ';'.join(os.environ.get('CATKIN_PREFIX_PATH','').split(os.pathsep)),
                      'PYTHON_EXECUTABLE': sys.executable,
                      'PYTHON_INSTALL_DIR': get_python_install_dir(),
                  }