From 0c70d98d56658a90e76f57009fa0f9a95edce027 Mon Sep 17 00:00:00 2001
From: Arthur Zamarin <arthurzam@gentoo.org>
Date: Tue, 4 Oct 2022 09:33:58 +0300
Subject: dev-ros/ament_cmake_export_libraries: use python_has_version inside
 python_check_deps

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---
 .../ament_cmake_export_libraries-1.1.4.ebuild             | 15 +++++++--------
 .../ament_cmake_export_libraries-1.3.0.ebuild             | 13 ++++++-------
 .../ament_cmake_export_libraries-9999.ebuild              | 15 +++++++--------
 3 files changed, 20 insertions(+), 23 deletions(-)

(limited to 'dev-ros')

diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
index 027da570e32d..b517a6e02372 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
index c22c1ee30534..b517a6e02372 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.3.0.ebuild
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
index 027da570e32d..b517a6e02372 100644
--- a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
-	SRC_URI=""
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	KEYWORDS="~amd64"
 fi
-IUSE=""
 
 RDEPEND="
 	dev-ros/ament_cmake_core
 "
 DEPEND="${RDEPEND}"
 # Deps here are transitive from ament_cmake_core to have matching python support
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
-	${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]')
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]"
 }
-- 
cgit v1.2.3-65-gdbad