diff options
| author |   Arthur Zamarin <arthurzam@gentoo.org> | 2022-10-04 09:29:36 +0300 |
|---|---|---|
| committer | Arthur Zamarin <arthurzam@gentoo.org> | 2022-10-04 09:29:36 +0300 |
| commit | c6540d1a92552ffc234b3af8dc770c79211f6125 (patch) | |
| tree | bab52ae16e2bc14f28ea64bdcafed01f3da1731d /dev-ros | |
| parent | dev-ros/ament_cmake_export_definitions: use python_has_version inside python_... (diff) | |
| download | gentoo-c6540d1a92552ffc234b3af8dc770c79211f6125.tar.gz gentoo-c6540d1a92552ffc234b3af8dc770c79211f6125.tar.bz2 gentoo-c6540d1a92552ffc234b3af8dc770c79211f6125.zip | |
dev-ros/ament_cmake_export_dependencies: use python_has_version inside python_check_deps
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'dev-ros')
3 files changed, 19 insertions, 22 deletions
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild index d9868e9db6f6..e0d2318a70a0 100644 --- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.1.4.ebuild +++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-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_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild index c116d2160e29..87ab8cbd0b33 100644 --- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.ebuild +++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.3.0-r1.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 @@ -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}]" } diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild index c116d2160e29..87ab8cbd0b33 100644 --- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild +++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.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 @@ -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}]" } |