From b64a3da7ffebfd74e24d560bd14f4bf8a59f6192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 14 Nov 2022 05:34:45 +0100
Subject: [PATCH] dev-python/catkin_pkg: Remove old
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-python/catkin_pkg/Manifest                |  1 -
 .../catkin_pkg/catkin_pkg-0.4.24.ebuild       | 46 -------------------
 .../catkin_pkg/files/infinite_loop4.patch     | 27 -----------
 .../files/summary_single_line.patch           | 19 --------
 4 files changed, 93 deletions(-)
 delete mode 100644 dev-python/catkin_pkg/catkin_pkg-0.4.24.ebuild
 delete mode 100644 dev-python/catkin_pkg/files/infinite_loop4.patch
 delete mode 100644 dev-python/catkin_pkg/files/summary_single_line.patch

diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index ad5ec33456df4..08e672a1d4483 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,2 +1 @@
-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
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.24.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.24.ebuild
deleted file mode 100644
index bc0e7090297d1..0000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.24.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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_loop4.patch"
-	"${FILESDIR}/summary_single_line.patch"
-)
-
-distutils_enable_tests nose
diff --git a/dev-python/catkin_pkg/files/infinite_loop4.patch b/dev-python/catkin_pkg/files/infinite_loop4.patch
deleted file mode 100644
index affb67bb83671..0000000000000
--- a/dev-python/catkin_pkg/files/infinite_loop4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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.4.20/src/catkin_pkg/packages.py
-===================================================================
---- catkin_pkg-0.4.20.orig/src/catkin_pkg/packages.py
-+++ catkin_pkg-0.4.20/src/catkin_pkg/packages.py
-@@ -57,7 +57,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) & {'AMENT_IGNORE', 'CATKIN_IGNORE', 'COLCON_IGNORE'} or \
-             os.path.realpath(dirpath) in real_exclude_paths or \
-                 (exclude_subspaces and '.catkin' in filenames):
-@@ -68,7 +70,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
- 
- 
diff --git a/dev-python/catkin_pkg/files/summary_single_line.patch b/dev-python/catkin_pkg/files/summary_single_line.patch
deleted file mode 100644
index d24c284da9ea4..0000000000000
--- a/dev-python/catkin_pkg/files/summary_single_line.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-setuptools will disallow newlines in descriptions, so do not generate them
-see e.g. https://bugs.gentoo.org/765868
-
-Index: catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
-===================================================================
---- catkin_pkg-0.4.23.orig/src/catkin_pkg/python_setup.py
-+++ catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
-@@ -99,9 +99,9 @@ def generate_distutils_setup(package_xml
-         data['url'] = package.urls[0].url
- 
-     if len(package.description) <= 200:
--        data['description'] = package.description
-+        data['description'] = package.description.replace('\n', ' ')
-     else:
--        data['description'] = package.description[:197] + '...'
-+        data['description'] = package.description[:197].replace('\n', ' ') + '...'
-         data['long_description'] = package.description
- 
-     data['license'] = ', '.join(package.licenses)