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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Arthur Zamarin" <arthurzam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_python/
Date: Tue,  4 Oct 2022 19:27:53 +0000 (UTC)	[thread overview]
Message-ID: <1664911665.92d4c5e46d7fe8e6fe48afe2b8fd03b887f4626d.arthurzam@gentoo> (raw)

commit:     92d4c5e46d7fe8e6fe48afe2b8fd03b887f4626d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 19:23:34 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 19:27:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d4c5e4

dev-ros/ament_cmake_python: use python_has_version inside python_check_deps

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../ament_cmake_python/ament_cmake_python-1.1.4.ebuild    | 15 +++++++--------
 .../ament_cmake_python/ament_cmake_python-1.3.0.ebuild    | 13 ++++++-------
 dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild | 13 ++++++-------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
index d6ff5f678382..9e97d1bcb641 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.1.4.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-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,20 +27,20 @@ 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}]')
 "
 PATCHES=( "${FILESDIR}/destdir.patch" )
 
 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_python/ament_cmake_python-1.3.0.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.3.0.ebuild
index d4b1a4488aca..efe87c1c7938 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-1.3.0.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-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,20 +27,20 @@ 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}]')
 "
 PATCHES=( "${FILESDIR}/destdir2.patch" )
 
 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_python/ament_cmake_python-9999.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
index d4b1a4488aca..efe87c1c7938 100644
--- a/dev-ros/ament_cmake_python/ament_cmake_python-9999.ebuild
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-9999.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,20 +27,20 @@ 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}]')
 "
 PATCHES=( "${FILESDIR}/destdir2.patch" )
 
 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}]"
 }

next             reply	other threads:[~2022-10-04 19:27 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-04 19:27 Arthur Zamarin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-03-15 17:05 [gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_python/ Alexis Ballier
2022-03-15 16:22 Alexis Ballier
2021-05-19 10:54 Alexis Ballier
2021-04-06  9:30 Alexis Ballier
2021-01-26 16:36 Alexis Ballier
2021-01-20 20:35 Alexis Ballier
2020-09-30 11:09 Alexis Ballier
2020-07-29 18:06 Alexis Ballier
2019-12-13 13:58 Alexis Ballier
2019-12-12 15:44 Alexis Ballier
2019-12-12 10:42 Alexis Ballier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:d6ff5f67838 dfblob:9e97d1bcb64 dfblob:d4b1a4488ac
dfblob:efe87c1c793 dfblob:d4b1a4488ac dfblob:efe87c1c793 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_python/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1664911665.92d4c5e46d7fe8e6fe48afe2b8fd03b887f4626d.arthurzam@gentoo \
    --to=arthurzam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox