summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Zamarin <arthurzam@gentoo.org>2022-10-04 22:13:52 +0300
committerArthur Zamarin <arthurzam@gentoo.org>2022-10-04 22:27:43 +0300
commitfddcb8f5d8f6c639a48072c6dc60759736d39a30 (patch)
tree8fa25a8fd610cc0494d5dff6afba64aca34802b8 /dev-ros
parentdev-ros/ament_cmake_export_link_flags: use python_has_version inside python_c... (diff)
downloadgentoo-fddcb8f5d8f6c639a48072c6dc60759736d39a30.tar.gz
gentoo-fddcb8f5d8f6c639a48072c6dc60759736d39a30.tar.bz2
gentoo-fddcb8f5d8f6c639a48072c6dc60759736d39a30.zip
dev-ros/ament_cmake_export_targets: use python_has_version inside python_check_deps
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'dev-ros')
-rw-r--r--dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild15
-rw-r--r--dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild13
-rw-r--r--dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild15
3 files changed, 20 insertions, 23 deletions
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
index efc907fe2f8b..54c4f083a05b 100644
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.1.4.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
@@ -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
@@ -36,12 +34,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}]"
}
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild
index a509591e9cdc..54c4f083a05b 100644
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.3.0.ebuild
@@ -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
@@ -36,12 +34,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}]"
}
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild
index efc907fe2f8b..54c4f083a05b 100644
--- a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-9999.ebuild
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-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
@@ -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
@@ -36,12 +34,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}]"
}