[gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_lint_auto/

[Arthur Zamarin]

commit:     308c74e211ddb2be797c5cc8c33fd7c19af3616e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 19:32:27 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 19:32:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308c74e2

dev-ros/ament_lint_auto: use python_has_version inside python_check_deps

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 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 7c0ae86f0a35..f4bba4298b4b 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 16d03e212bf3..f4bba4298b4b 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 7c0ae86f0a35..f4bba4298b4b 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}]"
 }