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

[Alexis Ballier]

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