public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/roslaunch/
Date: Wed, 13 May 2020 14:07:24 +0000 (UTC)	[thread overview]
Message-ID: <1589378833.4430b9943cd5d88a9e7efb25dd97594eba2297a6.aballier@gentoo> (raw)

commit:     4430b9943cd5d88a9e7efb25dd97594eba2297a6
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 11:45:14 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed May 13 14:07:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4430b994

dev-ros/roslaunch: remove patch merged upstream

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/roslaunch/roslaunch-1.15.4.ebuild | 2 +-
 dev-ros/roslaunch/roslaunch-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
index 7263b4b9124..4538fcdb1d6 100644
--- a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
+++ b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-ros/test_rosmaster
 	)"
-PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" )
+PATCHES=( "${FILESDIR}/timeout.patch" )
 
 src_test() {
 	rosdep update

diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index 7263b4b9124..4538fcdb1d6 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-ros/test_rosmaster
 	)"
-PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" )
+PATCHES=( "${FILESDIR}/timeout.patch" )
 
 src_test() {
 	rosdep update


             reply	other threads:[~2020-05-13 14:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-13 14:07 Alexis Ballier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-03-08 16:16 [gentoo-commits] repo/gentoo:master commit in: dev-ros/roslaunch/ Alexis Ballier
2021-12-15 10:19 Alexis Ballier
2021-07-20 21:11 Conrad Kostecki
2021-07-20 21:11 Conrad Kostecki
2020-08-04 16:00 Alexis Ballier
2020-07-31 13:20 Alexis Ballier
2019-12-11 16:12 Alexis Ballier
2018-07-03 11:22 Alexis Ballier
2018-02-09 11:39 Alexis Ballier
2017-11-15  6:58 Alexis Ballier
2017-08-17 11:46 Alexis Ballier
2017-06-15  9:37 Alexis Ballier
2017-02-27 17:10 Alexis Ballier
2017-02-25  9:55 Alexis Ballier
2017-02-09 17:46 Alexis Ballier
2017-02-09 17:46 Alexis Ballier
2016-11-01 12:53 Alexis Ballier
2016-06-06 11:14 Alexis Ballier
2016-04-21  9:07 Alexis Ballier
2016-03-19 13:56 Alexis Ballier
2015-11-19  9:58 Alexis Ballier
2015-11-14 11:34 Alexis Ballier
2015-10-15 11:26 Alexis Ballier
2015-09-22 14:36 Alexis Ballier

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=1589378833.4430b9943cd5d88a9e7efb25dd97594eba2297a6.aballier@gentoo \
    --to=aballier@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