commit:     1aeb5312d8ec30411838b96a5caeffe3f07f5a71
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 19:29:36 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 19:29:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aeb5312

dev-ros/ament_cmake_uncrustify: use python_has_version inside python_check_deps

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

 .../ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild   | 8 ++++----
 .../ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild   | 6 +++---
 dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild 
b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
index 826f45045e89..ca275536e31d 100644
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-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
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-       { use !test || has_version -b 
"dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-               has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-               has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+       { use !test || python_has_version 
"dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+               python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+                       "dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {

diff --git 
a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild 
b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild
index c2d582d94104..ca275536e31d 100644
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.12.1.ebuild
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-       { use !test || has_version -b 
"dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-               has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-               has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+       { use !test || python_has_version 
"dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+               python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+                       "dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {

diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild 
b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
index 826f45045e89..ca275536e31d 100644
--- a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-9999.ebuild
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-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
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-       { use !test || has_version -b 
"dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
-               has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-               has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+       { use !test || python_has_version 
"dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+               python_has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+                       "dev-python/ament_package[${PYTHON_USEDEP}]"
 }
 
 src_configure() {

Reply via email to