From 54a0d665365030d765830fe9a41b9f183652a30b Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 13 Dec 2019 12:45:42 +0100 Subject: [PATCH] dev-ros/console_bridge_vendor: simplify to use python-any-r1 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Alexis Ballier --- .../console_bridge_vendor-1.2.0.ebuild | 15 +++------------ .../console_bridge_vendor-9999.ebuild | 15 +++------------ 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild index e36d23f50a78..9d08355634bd 100644 --- a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.ebuild +++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.0.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 if [ "${PV#9999}" != "${PV}" ] ; then inherit git-r3 @@ -31,16 +31,7 @@ DEPEND=" >=dev-libs/console_bridge-0.4.1 " RDEPEND="${DEPEND}" -BDEPEND="ros-meta/ament_cmake[${PYTHON_USEDEP}] +BDEPEND=" + $(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]') ${PYTHON_DEPS} " -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/console_bridge_vendor/console_bridge_vendor-9999.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild index e36d23f50a78..9d08355634bd 100644 --- a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild +++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-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 if [ "${PV#9999}" != "${PV}" ] ; then inherit git-r3 @@ -31,16 +31,7 @@ DEPEND=" >=dev-libs/console_bridge-0.4.1 " RDEPEND="${DEPEND}" -BDEPEND="ros-meta/ament_cmake[${PYTHON_USEDEP}] +BDEPEND=" + $(python_gen_any_dep 'ros-meta/ament_cmake[${PYTHON_USEDEP}]') ${PYTHON_DEPS} " -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 -} -- 2.26.2