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 E2673138335 for ; Fri, 13 Dec 2019 13:58:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC61FE08FA; Fri, 13 Dec 2019 13:58:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7DD61E08FA for ; Fri, 13 Dec 2019 13:58:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5651534D969 for ; Fri, 13 Dec 2019 13:58:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE9C6901 for ; Fri, 13 Dec 2019 13:58:05 +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: <1576245199.c81fbcf11def82fd9e7699311786d0652fb19810.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_target_dependencies/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-0.8.1.ebuild dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-9999.ebuild X-VCS-Directories: dev-ros/ament_cmake_target_dependencies/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: c81fbcf11def82fd9e7699311786d0652fb19810 X-VCS-Branch: master Date: Fri, 13 Dec 2019 13:58:05 +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: 42234573-9ff3-46a7-8b2a-d4bb58c4ca4f X-Archives-Hash: b9e850033aba4e82534ba6aa3a98e374 commit: c81fbcf11def82fd9e7699311786d0652fb19810 Author: Alexis Ballier gentoo org> AuthorDate: Fri Dec 13 12:39:10 2019 +0000 Commit: Alexis Ballier gentoo 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 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 -}