commit: c81fbcf11def82fd9e7699311786d0652fb19810
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 12:39:10 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 13:53:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81fbcf1
dev-ros/ament_cmake_target_dependencies: use python-any-r1
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
.../ament_cmake_target_dependencies-0.8.1.ebuild | 27 ++++++++--------------
.../ament_cmake_target_dependencies-9999.ebuild | 27 ++++++++--------------
2 files changed, 20 insertions(+), 34 deletions(-)
diff --git
a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild
b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild
index 85658b767df..c48f31a5cc7 100644
---
a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild
+++
b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python{3_6,3_7} )
-inherit cmake-utils python-r1
+inherit cmake-utils python-any-r1
ROS_PN="ament_cmake"
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -30,21 +30,14 @@ else
fi
IUSE=""
-DEPEND="
- dev-ros/ament_cmake_core[${PYTHON_USEDEP}]
- dev-ros/ament_cmake_include_directories[${PYTHON_USEDEP}]
- dev-ros/ament_cmake_libraries[${PYTHON_USEDEP}]
+RDEPEND="
+ dev-ros/ament_cmake_core
+ dev-ros/ament_cmake_include_directories
+ dev-ros/ament_cmake_libraries
+"
+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}
"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
- # This is a build tool that does not install python-related files
- # ... but we need to propagate the deps and use python3 to build it.
- local pyimpl="${PYTHON_COMPAT[0]}"
- python_export "${pyimpl}" EPYTHON PYTHON
- python_wrapper_setup
- cmake-utils_src_configure
-}
diff --git
a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
index 85658b767df..c48f31a5cc7 100644
---
a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
+++
b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python{3_6,3_7} )
-inherit cmake-utils python-r1
+inherit cmake-utils python-any-r1
ROS_PN="ament_cmake"
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -30,21 +30,14 @@ else
fi
IUSE=""
-DEPEND="
- dev-ros/ament_cmake_core[${PYTHON_USEDEP}]
- dev-ros/ament_cmake_include_directories[${PYTHON_USEDEP}]
- dev-ros/ament_cmake_libraries[${PYTHON_USEDEP}]
+RDEPEND="
+ dev-ros/ament_cmake_core
+ dev-ros/ament_cmake_include_directories
+ dev-ros/ament_cmake_libraries
+"
+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}
"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
- # This is a build tool that does not install python-related files
- # ... but we need to propagate the deps and use python3 to build it.
- local pyimpl="${PYTHON_COMPAT[0]}"
- python_export "${pyimpl}" EPYTHON PYTHON
- python_wrapper_setup
- cmake-utils_src_configure
-}
