gentoo resync : 25.08.2020

5 files changed, 46 insertions, 69 deletions

diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
deleted file mode 100644
index e667ea9cf59e..000000000000
--- a/dev-util/catkin/files/catkin_prefix_path_util_py.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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:
-Index: catkin-0.7.1/python/catkin/builder.py
-===================================================================
---- catkin-0.7.1.orig/python/catkin/builder.py
-+++ catkin-0.7.1/python/catkin/builder.py
-@@ -1026,6 +1026,7 @@ def build_workspace_isolated(
-                     '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)),
-                     'PYTHON_EXECUTABLE': sys.executable,
-                     'PYTHON_INSTALL_DIR': get_python_install_dir(),
-                 }
-Index: catkin-0.7.1/test/unit_tests/test_setup_util.py
-===================================================================
---- catkin-0.7.1.orig/test/unit_tests/test_setup_util.py
-+++ catkin-0.7.1/test/unit_tests/test_setup_util.py
-@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
-                           'PYTHON_EXECUTABLE': sys.executable,
-                           'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
-                           'CMAKE_PREFIX_PATH_AS_IS': '',
-+                          'CATKIN_PREFIX_PATH':'',
-                       })
- with tempfile.NamedTemporaryFile('w+') as setup_util_file:
-     setup_util_file.write(data)
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 ae468b21c01c..6ad761f8421a 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(),
                  }
diff --git a/dev-util/catkin/files/distutils.patch b/dev-util/catkin/files/distutils.patch
deleted file mode 100644
index 292551181b6d..000000000000
--- a/dev-util/catkin/files/distutils.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Allow to install scripts in PYTHON_SCRIPTDIR.
-Needed for Gentoo multi-python support.
-
-Index: catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
-===================================================================
---- catkin-0.6.11.orig/cmake/templates/python_distutils_install.sh.in
-+++ catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
-@@ -25,4 +25,4 @@ cd "@INSTALL_CMD_WORKING_DIRECTORY@"
-     build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
-     install \
-     $DESTDIR_ARG \
--    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@"
-+    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
diff --git a/dev-util/catkin/files/gtest.patch b/dev-util/catkin/files/gtest.patch
new file mode 100644
index 000000000000..106b7e2886e8
--- /dev/null
+++ b/dev-util/catkin/files/gtest.patch
@@ -0,0 +1,45 @@
+From d9302318dece61acd0caa27d56f3817838f8f333 Mon Sep 17 00:00:00 2001
+From: seanyen <seanyen@microsoft.com>
+Date: Thu, 6 Aug 2020 18:59:07 -0700
+Subject: [PATCH] Adding the new GTest search logic for Vcpkg.
+
+---
+ cmake/test/gtest.cmake | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+Index: catkin-0.8.8/cmake/test/gtest.cmake
+===================================================================
+--- catkin-0.8.8.orig/cmake/test/gtest.cmake
++++ catkin-0.8.8/cmake/test/gtest.cmake
+@@ -337,6 +337,31 @@ if(TARGET gtest AND TARGET gtest_main AN
+     set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
+   endif()
+ else()
++  # attempt to find the modern GTest config.
++  find_package(GTest 1.8.1 QUIET CONFIG)
++  if(GTest_FOUND AND TARGET GTest::gtest AND TARGET GTest::gtest_main)
++    set(GTEST_FOUND TRUE)
++    add_library(gtest ALIAS GTest::gtest)
++    add_library(gtest_main ALIAS GTest::gtest_main)
++    set(GTEST_INCLUDE_DIRS)
++    set(GTEST_LIBRARY_DIRS)
++    set(GTEST_LIBRARIES gtest)
++    set(GTEST_MAIN_LIBRARIES gtest_main)
++    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
++  endif()
++  if(GTest_FOUND AND TARGET GTest::gmock AND TARGET GTest::gmock_main)
++    set(GMOCK_FOUND TRUE)
++    add_library(gmock ALIAS GTest::gmock)
++    add_library(gmock_main ALIAS GTest::gmock_main)
++    set(GMOCK_INCLUDE_DIRS)
++    set(GMOCK_LIBRARY_DIRS)
++    set(GMOCK_LIBRARIES gmock)
++    set(GMOCK_MAIN_LIBRARIES gmock_main)
++    set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
++  endif()
++endif()
++
++if(NOT GTEST_FOUND)
+   find_package(GTest QUIET)
+ endif()
+ if(NOT GMOCK_FOUND OR NOT GTEST_FOUND)
diff --git a/dev-util/catkin/files/sitedir.patch b/dev-util/catkin/files/sitedir.patch
deleted file mode 100644
index 61fcad29d04a..000000000000
--- a/dev-util/catkin/files/sitedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Pass --install-lib to setup.py install.
-pypy installs in /usr/site-packages otherwise...
-
-Index: catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
-===================================================================
---- catkin-0.7.6.orig/cmake/templates/python_distutils_install.sh.in
-+++ catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
-@@ -30,4 +30,6 @@ echo_and_run /usr/bin/env \
-     build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
-     install \
-     $DESTDIR_ARG \
--    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
-+    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" \
-+    --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" \
-+    --install-lib="@CMAKE_INSTALL_PREFIX@/@PYTHON_INSTALL_DIR@"