summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2021-01-05 20:19:59 +0100
committerAlexis Ballier <aballier@gentoo.org>2021-01-05 21:02:51 +0100
commit454cf0f1f0199d794f18a104bd9850cc450b84ac (patch)
tree0dc656c4112e395cde7b55d8c197f5e6627a57fe /dev-util/catkin
parentdev-ros/rviz: bump to 1.14.4 (diff)
downloadgentoo-454cf0f1f0199d794f18a104bd9850cc450b84ac.tar.gz
gentoo-454cf0f1f0199d794f18a104bd9850cc450b84ac.tar.bz2
gentoo-454cf0f1f0199d794f18a104bd9850cc450b84ac.zip
dev-util/catkin: bump to 0.8.9
Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-util/catkin')
-rw-r--r--dev-util/catkin/Manifest2
-rw-r--r--dev-util/catkin/catkin-0.8.9.ebuild (renamed from dev-util/catkin/catkin-0.8.8-r1.ebuild)2
-rw-r--r--dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch26
3 files changed, 15 insertions, 15 deletions
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index daf0db1703c4..cd13737b5834 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1 +1 @@
-DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979
+DIST catkin-0.8.9.tar.gz 217743 BLAKE2B e59df77a7df04492942917377f4f3dd9e302e20fd901bbc8878d1f51879a481e15b01482db4f1d3b8d1eee360779bedb5d999663fe58f10d33c5e4f1964a3be7 SHA512 a34784d349935f5917e7d4600c5ad3e728a86d8ed235fb3be86b4dec212693a1e4209901929d284e50c112f31ada62a04a9caf9845ee06c6db2e98e79602ecd9
diff --git a/dev-util/catkin/catkin-0.8.8-r1.ebuild b/dev-util/catkin/catkin-0.8.9.ebuild
index 4907543b6705..457484d36e64 100644
--- a/dev-util/catkin/catkin-0.8.8-r1.ebuild
+++ b/dev-util/catkin/catkin-0.8.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
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 6ad761f8421a..52f183cc8551 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
@@ -1,24 +1,24 @@
Author: Eric Timmons
https://bugs.gentoo.org/show_bug.cgi?id=586104
-Index: catkin-0.7.17/cmake/templates/_setup_util.py.in
+Index: catkin-0.8.9/cmake/templates/_setup_util.py.in
===================================================================
---- catkin-0.7.17.orig/cmake/templates/_setup_util.py.in
-+++ catkin-0.7.17/cmake/templates/_setup_util.py.in
-@@ -264,7 +264,7 @@ if __name__ == '__main__':
+--- catkin-0.8.9.orig/cmake/templates/_setup_util.py.in
++++ catkin-0.8.9/cmake/templates/_setup_util.py.in
+@@ -268,7 +268,7 @@ if __name__ == '__main__':
if not args.local:
# 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(';')
+- CMAKE_PREFIX_PATH = r'@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
++ CMAKE_PREFIX_PATH = r'@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
else:
# don't consider any other prefix path than this one
CMAKE_PREFIX_PATH = []
-Index: catkin-0.7.17/python/catkin/builder.py
+Index: catkin-0.8.9/python/catkin/builder.py
===================================================================
---- catkin-0.7.17.orig/python/catkin/builder.py
-+++ catkin-0.7.17/python/catkin/builder.py
-@@ -1143,6 +1143,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh"
+--- catkin-0.8.9.orig/python/catkin/builder.py
++++ catkin-0.8.9/python/catkin/builder.py
+@@ -1164,6 +1164,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh"
'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)),
@@ -26,10 +26,10 @@ Index: catkin-0.7.17/python/catkin/builder.py
'PYTHON_EXECUTABLE': sys.executable,
'PYTHON_INSTALL_DIR': get_python_install_dir(),
}
-Index: catkin-0.7.17/test/unit_tests/test_setup_util.py
+Index: catkin-0.8.9/test/unit_tests/test_setup_util.py
===================================================================
---- catkin-0.7.17.orig/test/unit_tests/test_setup_util.py
-+++ catkin-0.7.17/test/unit_tests/test_setup_util.py
+--- catkin-0.8.9.orig/test/unit_tests/test_setup_util.py
++++ catkin-0.8.9/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',