1 |
commit: 4430b9943cd5d88a9e7efb25dd97594eba2297a6 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 13 11:45:14 2020 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 13 14:07:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4430b994 |
7 |
|
8 |
dev-ros/roslaunch: remove patch merged upstream |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
12 |
|
13 |
dev-ros/roslaunch/roslaunch-1.15.4.ebuild | 2 +- |
14 |
dev-ros/roslaunch/roslaunch-9999.ebuild | 2 +- |
15 |
2 files changed, 2 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild |
18 |
index 7263b4b9124..4538fcdb1d6 100644 |
19 |
--- a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild |
20 |
+++ b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild |
21 |
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND} |
22 |
dev-python/nose[${PYTHON_USEDEP}] |
23 |
dev-ros/test_rosmaster |
24 |
)" |
25 |
-PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" ) |
26 |
+PATCHES=( "${FILESDIR}/timeout.patch" ) |
27 |
|
28 |
src_test() { |
29 |
rosdep update |
30 |
|
31 |
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild |
32 |
index 7263b4b9124..4538fcdb1d6 100644 |
33 |
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild |
34 |
+++ b/dev-ros/roslaunch/roslaunch-9999.ebuild |
35 |
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND} |
36 |
dev-python/nose[${PYTHON_USEDEP}] |
37 |
dev-ros/test_rosmaster |
38 |
)" |
39 |
-PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" ) |
40 |
+PATCHES=( "${FILESDIR}/timeout.patch" ) |
41 |
|
42 |
src_test() { |
43 |
rosdep update |