gentoo resync : 09.07.2022

4 files changed, 78 insertions, 4 deletions

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 11a2abcaaa92..56e462826781 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,8 +1,11 @@
 AUX catkin_prefix2.patch 1741 BLAKE2B 31884cff0d6150e458fd76fadff86e16f0d76d73c2422c2a5c02ae45a8494de939e141a1eca5caf0e3de37b12e1456ff7a83eb2fc550f2b5f5b25a204db6d51c SHA512 e6a04b6d53676acb3f9f20ce76040a4b2ed9da72bd32fd7d27419d0602ce9c05826128af055f1f498e1e3299525e665a4af1987ba9eec6889f6d7ed493dd813b
 AUX infinite_loop4.patch 1327 BLAKE2B 609c67413dcd65db3961d0c96066d6921cc909ca1aab4c253c83045ae6792dc5420c516c53f354d64aa45389f99c50e7ba34db6ccc7d00845444e409804f3dfa SHA512 7ef9d36aaa9fe88fc8f3ce60c233e4ad92facd04dfe9bfbfd496d96659f2e977702e6cb0ce5ec1654cfc8773b91b5e5ee83ac6634599c30b015c1c40c6564e9e
+AUX infinite_loop5.patch 1288 BLAKE2B b86fe26ba58cea472f9f1cf1e896b6f9f91522739214ab165979627061b37882f55985c324c1a260bdd3cb0502f94f7230869c89fe9f0a12b10a079e273debe5 SHA512 d66a9f347111189acdb8dd599812495c3f65539b980547c8b5f09844d5b6b9a0cd1b64c4b1637e70326ef2ca6e98fdb95c6c0b58b387baf568f8970f32435bb0
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
 AUX summary_single_line.patch 886 BLAKE2B 0fb24b9297a5a65e891204cb02c1bc4d7d9ad3739fea95b27e4069a2007248c9cb481c226d0da08f9a3906bbb8e1591ddce3f3ef29a4db0428eee0a8c74dd8f6 SHA512 78f3e5180778dbfbe7f945f7dc33dab284267985564dab974c33d4998d2ff44f2a17c52b83925b8f9ced38c5c4731a1028ac28989ffe617d49f5954857d3c1e1
 DIST catkin_pkg-0.4.24-gh.tar.gz 65113 BLAKE2B 554848e5e34a663b29246ec1109f228361cbb010d76d54e0b27107189382843e90babf24f8660dce4063324f78dff87286e31f5f1bb7db10aaa86e056c23de2d SHA512 7c746917876d5a9d8be6f187fc3d75e322ab158ff9fd1b9c661e0802504b188c59d47ad42320613e3aff26b83a6f239bb3dec5d0ab16dadd2ff1e26f73288e61
+DIST catkin_pkg-0.5.2-gh.tar.gz 67596 BLAKE2B aec34c6f54926dee02034d542741affe9cb662b06b354062088bec1fec25381f036d59af5fa52153ba1ce1c91fdf8bb9d1484475df8a63268ca474a7acd5f285 SHA512 40e7e3839017ad430ee36dccf87a90727e5efd92e6c605cdba3e9f8850b71a6a80da79bd8760d94e356dadebdd842c8a3f8b530782fb75503d3e620add79be4a
 EBUILD catkin_pkg-0.4.24.ebuild 1079 BLAKE2B 38802970213b064e81ea3a7ad31f1e43de705c96e84ebcd712dc7bb7f081e7cdd7caf479f28a19d637769731236a5d98038dfd4edbe59798aa274f1848fb8985 SHA512 47c1892e595b29f36a3abe6d251b5e3fb92cef573e7aef207ec3550f90159819d4e8070f5ec262fcabac5fcc4f8481e5d4e89c8fb6a1800fbe796b5e36c6f28a
-EBUILD catkin_pkg-9999.ebuild 1079 BLAKE2B ab79ad486f2af818391a4399cb36499cd6e2d12d66ad2ca56d67f70f3cf5037058f4ecfd48f2090f3a3d3787c617feafab8dbdfc90623b3dce32d33d7af6d097 SHA512 be3fef6a69c97d8894c3db7e21af4fb7ba4934b73f32183d164a9ffeb63ff1e70b574d179df7b01dde86af7c9087f0d451695fbd129414952cccf8e1ff255270
+EBUILD catkin_pkg-0.5.2.ebuild 1038 BLAKE2B 805e37397eb5c84622a5625477e3e1fc58e8f46ae47af39fa5ca071a173c67a3dc85349d4ab402d4480ceaa6b81e4bdc75243b13d64ea773f88f987731aeb6ed SHA512 e365ae94e1d18eabf0dd26f1100771f5495f00a726e298ef52ab6120b182795ac7312694bd3f5463d5e1306a4ea7431ffdde96cf8d94e3f8293e4190e37ce5d1
+EBUILD catkin_pkg-9999.ebuild 1038 BLAKE2B 805e37397eb5c84622a5625477e3e1fc58e8f46ae47af39fa5ca071a173c67a3dc85349d4ab402d4480ceaa6b81e4bdc75243b13d64ea773f88f987731aeb6ed SHA512 e365ae94e1d18eabf0dd26f1100771f5495f00a726e298ef52ab6120b182795ac7312694bd3f5463d5e1306a4ea7431ffdde96cf8d94e3f8293e4190e37ce5d1
 MISC metadata.xml 392 BLAKE2B 120b8d0580c146c876c314b063eabb0992d6b4b70d597c57f2eaa29a4efdcab87d09348ce24d6298ac1d348ffeda508b82d3c74f8aa59723801f015f86c45f29 SHA512 9192fe46fb2a105f269cee2d7074d3b3c28ffec5fe43b1d3dc622840c37fe242423dc854c4bc7791ed86b255ce94f4ced318d4c245790848358bba17d9042b99
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild
new file mode 100644
index 000000000000..ae7ac37cda94
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="https://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	!<dev-util/catkin-0.7.14"
+BDEPEND="
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/catkin_prefix2.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop5.patch"
+)
+
+distutils_enable_tests nose
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 79e5eb6b91bf..ae7ac37cda94 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,8 +39,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
 	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop4.patch"
-	"${FILESDIR}/summary_single_line.patch"
+	"${FILESDIR}/infinite_loop5.patch"
 )
 
 distutils_enable_tests nose
diff --git a/dev-python/catkin_pkg/files/infinite_loop5.patch b/dev-python/catkin_pkg/files/infinite_loop5.patch
new file mode 100644
index 000000000000..7f88da41a27d
--- /dev/null
+++ b/dev-python/catkin_pkg/files/infinite_loop5.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=612860
+By Tim Rakowski
+We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node
+
+Index: catkin_pkg-0.5.2/src/catkin_pkg/packages.py
+===================================================================
+--- catkin_pkg-0.5.2.orig/src/catkin_pkg/packages.py
++++ catkin_pkg-0.5.2/src/catkin_pkg/packages.py
+@@ -61,7 +61,9 @@ def find_package_paths(basepath, exclude
+     """
+     paths = []
+     real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else []
++    visited = set()
+     for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True):
++        visited.add(dirpath)
+         if set(dirnames + filenames) & ignore_markers or \
+             os.path.realpath(dirpath) in real_exclude_paths or \
+                 (exclude_subspaces and '.catkin' in filenames):
+@@ -72,7 +74,7 @@ def find_package_paths(basepath, exclude
+             del dirnames[:]
+             continue
+         # filter out hidden directories in-place
+-        dirnames[:] = [d for d in dirnames if not d.startswith('.')]
++        dirnames[:] = [d for d in dirnames if not d.startswith('.') and not os.path.realpath(os.path.join(dirpath, d)) in visited]
+     return paths
+ 
+