From 308c74e211ddb2be797c5cc8c33fd7c19af3616e Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Tue, 4 Oct 2022 22:32:27 +0300 Subject: [PATCH] dev-ros/ament_lint_auto: use python_has_version inside python_check_deps Signed-off-by: Arthur Zamarin --- dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild | 9 ++++----- dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild | 7 +++---- dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild | 9 ++++----- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild index 7c0ae86f0a352..f4bba4298b4b9 100644 --- a/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.ebuild +++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.11.2.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 @@ -30,14 +30,13 @@ RDEPEND=" " DEPEND="${RDEPEND}" # Deps here are transitive from ament_cmake_core to have matching python support -BDEPEND=" +BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep ' dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} " 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_lint_auto/ament_lint_auto-0.12.1.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild index 16d03e212bf37..f4bba4298b4b9 100644 --- a/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild +++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.12.1.ebuild @@ -30,14 +30,13 @@ RDEPEND=" " DEPEND="${RDEPEND}" # Deps here are transitive from ament_cmake_core to have matching python support -BDEPEND=" +BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep ' dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} " 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_lint_auto/ament_lint_auto-9999.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild index 7c0ae86f0a352..f4bba4298b4b9 100644 --- a/dev-ros/ament_lint_auto/ament_lint_auto-9999.ebuild +++ b/dev-ros/ament_lint_auto/ament_lint_auto-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 @@ -30,14 +30,13 @@ RDEPEND=" " DEPEND="${RDEPEND}" # Deps here are transitive from ament_cmake_core to have matching python support -BDEPEND=" +BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep ' dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]') - ${PYTHON_DEPS} " 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}]" }