[gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_python/

["Alexis Ballier" <aballier@gentoo.org>]

commit:     f54abd7d1b2f5e879ffe81ef05802f686a3e4a1d
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 12:41:32 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 13:53:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54abd7d

dev-ros/ament_cmake_python: 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_python-0.8.1-r1.ebuild             | 23 ++++++++--------------
 .../ament_cmake_python-9999.ebuild                 | 23 ++++++++--------------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild
index 43d5e233045..fba573262bf 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-0.8.1-r1.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,20 +30,13 @@ else
 fi
 IUSE=""
 
-DEPEND="
-	dev-ros/ament_cmake_core[${PYTHON_USEDEP}]
+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}
 "
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=( "${FILESDIR}/destdir.patch" )
-
-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_python/ament_cmake_python-9999.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
index 43d5e233045..fba573262bf 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-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,20 +30,13 @@ else
 fi
 IUSE=""
 
-DEPEND="
-	dev-ros/ament_cmake_core[${PYTHON_USEDEP}]
+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}
 "
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=( "${FILESDIR}/destdir.patch" )
-
-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
-}