From: Alexis Ballier <aballier@gentoo.org>
Date: Wed, 13 May 2020 11:45:14 +0000 (+0200)
Subject: dev-ros/roslaunch: remove patch merged upstream
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4430b9943cd5d88a9e7efb25dd97594eba2297a6;p=gentoo.git

dev-ros/roslaunch: remove patch merged upstream

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

diff --git a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
index 7263b4b91248..4538fcdb1d63 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 7263b4b91248..4538fcdb1d63 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