dev-ros/ament_lint_auto: use python_has_version inside python_check_deps

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
This commit is contained in:
Arthur Zamarin
2022-10-04 22:32:27 +03:00
parent d7b1498a18
commit 308c74e211
3 changed files with 11 additions and 14 deletions

View File

@@ -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}]"
}

View File

@@ -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}]"
}

View File

@@ -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}]"
}