mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
dev-ros/ament_cmake_lint_cmake: use python_has_version inside python_check_deps
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
This commit is contained in:
@@ -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}]"
|
||||
}
|
||||
|
||||
@@ -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}]"
|
||||
}
|
||||
|
||||
@@ -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}]"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user