diff options
Diffstat (limited to 'dev-ros')
-rw-r--r-- | dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild | 12 | ||||
-rw-r--r-- | dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild index 1feb04c069f8..932f46d31bde 100644 --- a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-1.3.0.ebuild +++ b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-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" @@ -38,15 +37,16 @@ DEPEND="${RDEPEND} dev-ros/ament_cmake_gtest )" # 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}]') " RESTRICT="test" # fixme 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}]" } src_configure() { diff --git a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild index 1feb04c069f8..932f46d31bde 100644 --- a/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-9999.ebuild +++ b/dev-ros/ament_cmake_gen_version_h/ament_cmake_gen_version_h-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" @@ -38,15 +37,16 @@ DEPEND="${RDEPEND} dev-ros/ament_cmake_gtest )" # 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}]') " RESTRICT="test" # fixme 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}]" } src_configure() { |