| 1 |
commit: 598819d1a34cb5d100405d7168413fd0ede90ae9 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 6 15:12:46 2022 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 15:14:04 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598819d1 |
| 7 |
|
| 8 |
dev-python/catkin_pkg: bump to 0.5.2 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-python/catkin_pkg/Manifest | 1 + |
| 14 |
...kin_pkg-9999.ebuild => catkin_pkg-0.5.2.ebuild} | 5 ++-- |
| 15 |
dev-python/catkin_pkg/catkin_pkg-9999.ebuild | 5 ++-- |
| 16 |
dev-python/catkin_pkg/files/infinite_loop5.patch | 27 ++++++++++++++++++++++ |
| 17 |
4 files changed, 32 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest |
| 20 |
index c7f66fef7438..ad5ec33456df 100644 |
| 21 |
--- a/dev-python/catkin_pkg/Manifest |
| 22 |
+++ b/dev-python/catkin_pkg/Manifest |
| 23 |
@@ -1 +1,2 @@ |
| 24 |
DIST catkin_pkg-0.4.24-gh.tar.gz 65113 BLAKE2B 554848e5e34a663b29246ec1109f228361cbb010d76d54e0b27107189382843e90babf24f8660dce4063324f78dff87286e31f5f1bb7db10aaa86e056c23de2d SHA512 7c746917876d5a9d8be6f187fc3d75e322ab158ff9fd1b9c661e0802504b188c59d47ad42320613e3aff26b83a6f239bb3dec5d0ab16dadd2ff1e26f73288e61 |
| 25 |
+DIST catkin_pkg-0.5.2-gh.tar.gz 67596 BLAKE2B aec34c6f54926dee02034d542741affe9cb662b06b354062088bec1fec25381f036d59af5fa52153ba1ce1c91fdf8bb9d1484475df8a63268ca474a7acd5f285 SHA512 40e7e3839017ad430ee36dccf87a90727e5efd92e6c605cdba3e9f8850b71a6a80da79bd8760d94e356dadebdd842c8a3f8b530782fb75503d3e620add79be4a |
| 26 |
|
| 27 |
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild |
| 28 |
similarity index 89% |
| 29 |
copy from dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 30 |
copy to dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild |
| 31 |
index 79e5eb6b91bf..ae7ac37cda94 100644 |
| 32 |
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 33 |
+++ b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild |
| 34 |
@@ -1,4 +1,4 @@ |
| 35 |
-# Copyright 1999-2021 Gentoo Authors |
| 36 |
+# Copyright 1999-2022 Gentoo Authors |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
EAPI=7 |
| 40 |
@@ -39,8 +39,7 @@ BDEPEND=" |
| 41 |
PATCHES=( |
| 42 |
"${FILESDIR}/catkin_prefix2.patch" |
| 43 |
"${FILESDIR}/ros_packages.patch" |
| 44 |
- "${FILESDIR}/infinite_loop4.patch" |
| 45 |
- "${FILESDIR}/summary_single_line.patch" |
| 46 |
+ "${FILESDIR}/infinite_loop5.patch" |
| 47 |
) |
| 48 |
|
| 49 |
distutils_enable_tests nose |
| 50 |
|
| 51 |
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 52 |
index 79e5eb6b91bf..ae7ac37cda94 100644 |
| 53 |
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 54 |
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild |
| 55 |
@@ -1,4 +1,4 @@ |
| 56 |
-# Copyright 1999-2021 Gentoo Authors |
| 57 |
+# Copyright 1999-2022 Gentoo Authors |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
|
| 60 |
EAPI=7 |
| 61 |
@@ -39,8 +39,7 @@ BDEPEND=" |
| 62 |
PATCHES=( |
| 63 |
"${FILESDIR}/catkin_prefix2.patch" |
| 64 |
"${FILESDIR}/ros_packages.patch" |
| 65 |
- "${FILESDIR}/infinite_loop4.patch" |
| 66 |
- "${FILESDIR}/summary_single_line.patch" |
| 67 |
+ "${FILESDIR}/infinite_loop5.patch" |
| 68 |
) |
| 69 |
|
| 70 |
distutils_enable_tests nose |
| 71 |
|
| 72 |
diff --git a/dev-python/catkin_pkg/files/infinite_loop5.patch b/dev-python/catkin_pkg/files/infinite_loop5.patch |
| 73 |
new file mode 100644 |
| 74 |
index 000000000000..7f88da41a27d |
| 75 |
--- /dev/null |
| 76 |
+++ b/dev-python/catkin_pkg/files/infinite_loop5.patch |
| 77 |
@@ -0,0 +1,27 @@ |
| 78 |
+https://bugs.gentoo.org/show_bug.cgi?id=612860 |
| 79 |
+By Tim Rakowski |
| 80 |
+We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node |
| 81 |
+ |
| 82 |
+Index: catkin_pkg-0.5.2/src/catkin_pkg/packages.py |
| 83 |
+=================================================================== |
| 84 |
+--- catkin_pkg-0.5.2.orig/src/catkin_pkg/packages.py |
| 85 |
++++ catkin_pkg-0.5.2/src/catkin_pkg/packages.py |
| 86 |
+@@ -61,7 +61,9 @@ def find_package_paths(basepath, exclude |
| 87 |
+ """ |
| 88 |
+ paths = [] |
| 89 |
+ real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else [] |
| 90 |
++ visited = set() |
| 91 |
+ for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True): |
| 92 |
++ visited.add(dirpath) |
| 93 |
+ if set(dirnames + filenames) & ignore_markers or \ |
| 94 |
+ os.path.realpath(dirpath) in real_exclude_paths or \ |
| 95 |
+ (exclude_subspaces and '.catkin' in filenames): |
| 96 |
+@@ -72,7 +74,7 @@ def find_package_paths(basepath, exclude |
| 97 |
+ del dirnames[:] |
| 98 |
+ continue |
| 99 |
+ # filter out hidden directories in-place |
| 100 |
+- dirnames[:] = [d for d in dirnames if not d.startswith('.')] |
| 101 |
++ dirnames[:] = [d for d in dirnames if not d.startswith('.') and not os.path.realpath(os.path.join(dirpath, d)) in visited] |
| 102 |
+ return paths |
| 103 |
+ |
| 104 |
+ |
Archives