From 04db859ba4e4f6202a5a5326edc9b59d42894574 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Fri, 18 Sep 2020 18:55:02 +0200
Subject: dev-python/catkin_pkg: improve catkin prefix patch not to require
 cmake

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---
 dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild | 56 +++++++++++++++++++++++
 dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild    | 56 -----------------------
 dev-python/catkin_pkg/files/catkin_prefix2.patch  | 11 +++--
 3 files changed, 62 insertions(+), 61 deletions(-)
 create mode 100644 dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild
 delete mode 100644 dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild

(limited to 'dev-python/catkin_pkg')

diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild
new file mode 100644
index 000000000000..53b5bb90f674
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} 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=""
+	KEYWORDS=""
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${RDEPEND}
+	!<dev-util/catkin-0.7.14"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix2.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop4.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild
deleted file mode 100644
index 53b5bb90f674..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.22.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} 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=""
-	KEYWORDS=""
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
-PATCHES=(
-	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop4.patch"
-)
-
-python_test() {
-	nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/files/catkin_prefix2.patch b/dev-python/catkin_pkg/files/catkin_prefix2.patch
index 761894e83b1c..064ad1ca65f2 100644
--- a/dev-python/catkin_pkg/files/catkin_prefix2.patch
+++ b/dev-python/catkin_pkg/files/catkin_prefix2.patch
@@ -2,10 +2,10 @@ Allow CATKIN_PREFIX_PATH to work as CMAKE_PREFIX_PATH:
 When building with SYSROOT!=/, CMAKE_PREFIX_PATH is the same as with SYSROOT=/
 but we need to find packages in SYSROOT.
 
-Index: catkin_pkg-0.4.6/src/catkin_pkg/workspaces.py
+Index: catkin_pkg-0.4.22/src/catkin_pkg/workspaces.py
 ===================================================================
---- catkin_pkg-0.4.6.orig/src/catkin_pkg/workspaces.py
-+++ catkin_pkg-0.4.6/src/catkin_pkg/workspaces.py
+--- catkin_pkg-0.4.22.orig/src/catkin_pkg/workspaces.py
++++ catkin_pkg-0.4.22/src/catkin_pkg/workspaces.py
 @@ -41,16 +41,17 @@ CATKIN_WORKSPACE_MARKER_FILE = '.catkin_
  
  def get_spaces(paths=None):
@@ -20,10 +20,11 @@ Index: catkin_pkg-0.4.6/src/catkin_pkg/workspaces.py
      if paths is None:
 -        if 'CMAKE_PREFIX_PATH' not in os.environ:
 -            raise RuntimeError('Neither the environment variable CMAKE_PREFIX_PATH is set nor was a list of paths passed.')
+-        paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ['CMAKE_PREFIX_PATH'] else []
 +        if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ:
 +            raise RuntimeError('None of the environment variables CMAKE_PREFIX_PATH or CATKIN_PREFIX_PATH are set nor was a list of paths passed.')
-         paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ['CMAKE_PREFIX_PATH'] else []
-+        paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if os.environ['CATKIN_PREFIX_PATH'] else []
++        paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ.get('CMAKE_PREFIX_PATH') else []
++        paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if os.environ.get('CATKIN_PREFIX_PATH') else []
  
      spaces = []
      for path in paths:
-- 
cgit v1.2.3-65-gdbad