gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-ros/ament_cmake_target_dependencies: use python_has_version inside python_check_deps

Browse Source 
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
This commit is contained in:
Arthur Zamarin
2022-10-04 22:23:42 +03:00
parent 92d4c5e46d
commit fe4dfeeb19
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.1.4.ebuild
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
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
if [ "${PV#9999}" != "${PV}" ] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ament/ament_cmake"
SRC_URI=""
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
else
KEYWORDS="~amd64"
fi
IUSE=""
RDEPEND="
dev-ros/ament_cmake_core
@@ -37,12 +35,13 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
# Deps here are transitive from ament_cmake_core to have matching python support
BDEPEND="
$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
${PYTHON_DEPS}
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep '
dev-python/ament_package[${PYTHON_USEDEP}]
dev-python/catkin_pkg[${PYTHON_USEDEP}]')
"
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}]"
}

13
dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.3.0.ebuild
View File

@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
if [ "${PV#9999}" != "${PV}" ] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ament/ament_cmake"
SRC_URI=""
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
else
KEYWORDS="~amd64"
fi
IUSE=""
RDEPEND="
dev-ros/ament_cmake_core
@@ -37,12 +35,13 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
# Deps here are transitive from ament_cmake_core to have matching python support
BDEPEND="
$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
${PYTHON_DEPS}
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep '
dev-python/ament_package[${PYTHON_USEDEP}]
dev-python/catkin_pkg[${PYTHON_USEDEP}]')
"
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}]"
}

15
dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
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
@@ -11,7 +11,6 @@ ROS_PN="ament_cmake"
if [ "${PV#9999}" != "${PV}" ] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ament/ament_cmake"
SRC_URI=""
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
@@ -28,7 +27,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
else
KEYWORDS="~amd64"
fi
IUSE=""
RDEPEND="
dev-ros/ament_cmake_core
@@ -37,12 +35,13 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
# Deps here are transitive from ament_cmake_core to have matching python support
BDEPEND="
$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
${PYTHON_DEPS}
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep '
dev-python/ament_package[${PYTHON_USEDEP}]
dev-python/catkin_pkg[${PYTHON_USEDEP}]')
"
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}]"
}