diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
index 8fd9b0edd57b1..8697fbb574233 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-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_cpplint/ament_cmake_cpplint-0.12.1.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
index 7052cdbb4a60a..8697fbb574233 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-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_cpplint/ament_cmake_cpplint-9999.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
index 8fd9b0edd57b1..8697fbb574233 100644
--- a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-9999.ebuild
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-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() {