From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B5696138334 for ; Fri, 13 Dec 2019 13:58:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C578E0916; Fri, 13 Dec 2019 13:58:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DA028E0917 for ; Fri, 13 Dec 2019 13:58:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4342834D986 for ; Fri, 13 Dec 2019 13:58:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91C1D968 for ; Fri, 13 Dec 2019 13:58:06 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1576245200.73563114f9951ac6bd9fe7fcaa375b221882202d.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_export_dependencies/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild X-VCS-Directories: dev-ros/ament_cmake_export_dependencies/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 73563114f9951ac6bd9fe7fcaa375b221882202d X-VCS-Branch: master Date: Fri, 13 Dec 2019 13:58:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 513bf245-e0dc-481c-8d92-7b25074f1ae9 X-Archives-Hash: 67c1b8e903198d95bf349c86640d37b0 commit: 73563114f9951ac6bd9fe7fcaa375b221882202d Author: Alexis Ballier gentoo org> AuthorDate: Fri Dec 13 13:36:53 2019 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Fri Dec 13 13:53:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73563114 dev-ros/ament_cmake_export_dependencies: use python-any-r1 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Alexis Ballier gentoo.org> .../ament_cmake_export_dependencies-0.8.1.ebuild | 25 ++++++++-------------- .../ament_cmake_export_dependencies-9999.ebuild | 25 ++++++++-------------- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild index cfd9dde3b96..a8243ae6598 100644 --- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild +++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_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,20 +30,13 @@ else fi IUSE="" -DEPEND=" - dev-ros/ament_cmake_core[${PYTHON_USEDEP}] - dev-ros/ament_cmake_libraries[${PYTHON_USEDEP}] +RDEPEND=" + dev-ros/ament_cmake_core + 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_export_dependencies/ament_cmake_export_dependencies-9999.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild index cfd9dde3b96..a8243ae6598 100644 --- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild +++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_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,20 +30,13 @@ else fi IUSE="" -DEPEND=" - dev-ros/ament_cmake_core[${PYTHON_USEDEP}] - dev-ros/ament_cmake_libraries[${PYTHON_USEDEP}] +RDEPEND=" + dev-ros/ament_cmake_core + 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 -}