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

["Alexis Ballier" <aballier@gentoo.org>]

commit:     c10a60e2e37797bb070ddfd54f1e8802f9d2fa32
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 16:04:09 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri May 24 16:23:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10a60e2

dev-util/catkin: bump to 0.7.17

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-util/catkin/Manifest                           |  1 +
 .../{catkin-9999.ebuild => catkin-0.7.17.ebuild}   |  2 +-
 dev-util/catkin/catkin-9999.ebuild                 |  2 +-
 .../files/catkin_prefix_path_util_py_v2.patch      | 40 ++++++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index b4107c5a90c..078333b1a2e 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1 +1,2 @@
 DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
+DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45

diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild
similarity index 98%
copy from dev-util/catkin/catkin-9999.ebuild
copy to dev-util/catkin/catkin-0.7.17.ebuild
index cef4fa0eb0e..84cbac41ee4 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-0.7.17.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
 	"${FILESDIR}/distutils.patch"
 	"${FILESDIR}/catkin_prefix_path.patch"
 	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
 	"${FILESDIR}/package_xml.patch"
 	"${FILESDIR}/etc.patch"
 	"${FILESDIR}/sitedir.patch"

diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index cef4fa0eb0e..84cbac41ee4 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
 	"${FILESDIR}/distutils.patch"
 	"${FILESDIR}/catkin_prefix_path.patch"
 	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
 	"${FILESDIR}/package_xml.patch"
 	"${FILESDIR}/etc.patch"
 	"${FILESDIR}/sitedir.patch"

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
new file mode 100644
index 00000000000..ae468b21c01
--- /dev/null
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
@@ -0,0 +1,40 @@
+Author:  Eric Timmons 
+https://bugs.gentoo.org/show_bug.cgi?id=586104
+
+Index: catkin-0.7.17/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__':
+ 
+         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(';')
+         else:
+             # don't consider any other prefix path than this one
+             CMAKE_PREFIX_PATH = []
+Index: catkin-0.7.17/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_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.17/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
+@@ -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)