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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69FD9158096 for ; Tue, 4 Oct 2022 19:27:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CD81E0931; Tue, 4 Oct 2022 19:27:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7FAC6E0931 for ; Tue, 4 Oct 2022 19:27:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A54E9340E81 for ; Tue, 4 Oct 2022 19:27:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D93E6606 for ; Tue, 4 Oct 2022 19:27:52 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1664911664.224e909e6f087e8a1e8caadbd7aa9674a8328d16.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_include_directories/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild X-VCS-Directories: dev-ros/ament_cmake_include_directories/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 224e909e6f087e8a1e8caadbd7aa9674a8328d16 X-VCS-Branch: master Date: Tue, 4 Oct 2022 19:27:52 +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: 2fcadaba-9ce7-4572-897b-0d67551ad269 X-Archives-Hash: 32e0b299bc2774e8947f8d2f569e6054 commit: 224e909e6f087e8a1e8caadbd7aa9674a8328d16 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Oct 4 19:22:32 2022 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Tue Oct 4 19:27:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224e909e dev-ros/ament_cmake_include_directories: use python_has_version inside python_check_deps Signed-off-by: Arthur Zamarin gentoo.org> .../ament_cmake_include_directories-1.1.4.ebuild | 15 +++++++-------- .../ament_cmake_include_directories-1.3.0.ebuild | 13 ++++++------- .../ament_cmake_include_directories-9999.ebuild | 15 +++++++-------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild index 5a4b76c2c1ab..f6499feed3e5 100644 --- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild +++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,6 @@ ROS_PN="ament_cmake" if [ "${PV#9999}" != "${PV}" ] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/ament/ament_cmake" - SRC_URI="" S=${WORKDIR}/${P}/${PN} else SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" @@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then else KEYWORDS="~amd64" fi -IUSE="" 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} +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/ament_package[${PYTHON_USEDEP}] + dev-python/catkin_pkg[${PYTHON_USEDEP}]') " python_check_deps() { - has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \ - has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" + python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \ + "dev-python/catkin_pkg[${PYTHON_USEDEP}]" } diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild index 4f7e319646d6..f6499feed3e5 100644 --- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild +++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.3.0.ebuild @@ -11,7 +11,6 @@ ROS_PN="ament_cmake" if [ "${PV#9999}" != "${PV}" ] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/ament/ament_cmake" - SRC_URI="" S=${WORKDIR}/${P}/${PN} else SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" @@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then else KEYWORDS="~amd64" fi -IUSE="" 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} +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/ament_package[${PYTHON_USEDEP}] + dev-python/catkin_pkg[${PYTHON_USEDEP}]') " python_check_deps() { - has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \ - has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" + python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \ + "dev-python/catkin_pkg[${PYTHON_USEDEP}]" } diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild index 5a4b76c2c1ab..f6499feed3e5 100644 --- a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild +++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,6 @@ ROS_PN="ament_cmake" if [ "${PV#9999}" != "${PV}" ] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/ament/ament_cmake" - SRC_URI="" S=${WORKDIR}/${P}/${PN} else SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" @@ -28,19 +27,19 @@ if [ "${PV#9999}" != "${PV}" ] ; then else KEYWORDS="~amd64" fi -IUSE="" 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} +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/ament_package[${PYTHON_USEDEP}] + dev-python/catkin_pkg[${PYTHON_USEDEP}]') " python_check_deps() { - has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \ - has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" + python_has_version "dev-python/ament_package[${PYTHON_USEDEP}]" \ + "dev-python/catkin_pkg[${PYTHON_USEDEP}]" }