diff options
| author |   Arthur Zamarin <arthurzam@gentoo.org> | 2022-10-04 22:23:04 +0300 |
|---|---|---|
| committer | Arthur Zamarin <arthurzam@gentoo.org> | 2022-10-04 22:27:44 +0300 |
| commit | 58a1aea6dcde729a3d89397e883e7c215e3b99a8 (patch) | |
| tree | 79da089c9270b35d1cef7413007ba8a721768b9e /dev-ros | |
| parent | dev-ros/ament_cmake_include_directories: use python_has_version inside python... (diff) | |
| download | gentoo-58a1aea6dcde729a3d89397e883e7c215e3b99a8.tar.gz gentoo-58a1aea6dcde729a3d89397e883e7c215e3b99a8.tar.bz2 gentoo-58a1aea6dcde729a3d89397e883e7c215e3b99a8.zip | |
dev-ros/ament_cmake_libraries: use python_has_version inside python_check_deps
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'dev-ros')
3 files changed, 20 insertions, 23 deletions
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild index d307d099dbb9..b163f6ef19db 100644 --- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.1.4.ebuild +++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-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,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then else KEYWORDS="~amd64" fi -IUSE="" RDEPEND=" dev-ros/ament_cmake_core " 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_libraries/ament_cmake_libraries-1.3.0.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.3.0.ebuild index 70e39d4a9658..b163f6ef19db 100644 --- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.3.0.ebuild +++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-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,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then else KEYWORDS="~amd64" fi -IUSE="" RDEPEND=" dev-ros/ament_cmake_core " 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_libraries/ament_cmake_libraries-9999.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild index d307d099dbb9..b163f6ef19db 100644 --- a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-9999.ebuild +++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-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,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then else KEYWORDS="~amd64" fi -IUSE="" RDEPEND=" dev-ros/ament_cmake_core " 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}]" } |