diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
index 7657d4a383e24..bf7643e226054 100644
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.11.2.ebuild
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
index 7657d4a383e24..bf7643e226054 100644
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.12.1.ebuild
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
 }
 
 src_configure() {
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
index 7657d4a383e24..bf7643e226054 100644
--- a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-9999.ebuild
@@ -45,9 +45,9 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
-		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \
+		"dev-python/catkin_pkg[${PYTHON_USEDEP}]" \
+		"dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
 }
 
 src_configure() {