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

[Arthur Zamarin]

commit:     f9fa4a434b20bb7d91b58e9612c21391b6bafd8d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 16:42:03 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 16:42:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9fa4a43

dev-ros/ament_cmake_lint_cmake: use python_has_version inside python_check_deps

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

 .../ament_cmake_lint_cmake-0.11.2.ebuild                      | 11 +++++------
 .../ament_cmake_lint_cmake-0.12.1.ebuild                      |  9 ++++-----
 .../ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild | 11 +++++------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git 
a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild 
b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
index 57023a6b7a97..aa9896eac402 100644
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-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
@@ -28,18 +28,17 @@ RDEPEND="
        dev-ros/ament_lint_cmake
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
        $(python_gen_any_dep '
                dev-python/ament_package[${PYTHON_USEDEP}]
                dev-python/catkin_pkg[${PYTHON_USEDEP}]
                dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
        dev-ros/ament_cmake_test
        dev-ros/ament_cmake_core
-       ${PYTHON_DEPS}
 "
 
 python_check_deps() {
-       has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-               has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-               has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
+       python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+               "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+               "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
 }

diff --git 
a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.12.1.ebuild 
b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.12.1.ebuild
index 8f2ff312efbc..aa9896eac402 100644
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.12.1.ebuild
@@ -28,18 +28,17 @@ RDEPEND="
        dev-ros/ament_lint_cmake
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
        $(python_gen_any_dep '
                dev-python/ament_package[${PYTHON_USEDEP}]
                dev-python/catkin_pkg[${PYTHON_USEDEP}]
                dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
        dev-ros/ament_cmake_test
        dev-ros/ament_cmake_core
-       ${PYTHON_DEPS}
 "
 
 python_check_deps() {
-       has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-               has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-               has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
+       python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+               "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+               "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
 }

diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild 
b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
index 57023a6b7a97..aa9896eac402 100644
--- a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-9999.ebuild
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-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
@@ -28,18 +28,17 @@ RDEPEND="
        dev-ros/ament_lint_cmake
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
+BDEPEND="${PYTHON_DEPS}
        $(python_gen_any_dep '
                dev-python/ament_package[${PYTHON_USEDEP}]
                dev-python/catkin_pkg[${PYTHON_USEDEP}]
                dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
        dev-ros/ament_cmake_test
        dev-ros/ament_cmake_core
-       ${PYTHON_DEPS}
 "
 
 python_check_deps() {
-       has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-               has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-               has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
+       python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+               "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+               "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
 }