gentoo resync : 15.12.2019

15 files changed, 129 insertions, 463 deletions

diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index 8768199645d2..402cba89147f 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -1,25 +1,14 @@
 AUX 40roslaunch 41 BLAKE2B a07c8484065add0cec5d9cf2e586a7a1fff3b7df575a904f224eeb20fbf88c707212458e53f45799822703fad633efd944f8c0cab35fb1e22c701d40c17d8efa SHA512 1b32e0967267e2d6f40583f3463e989f52ff2aeb243fd3b96647e946c95bab553a0b969407579ea3b700234fd554ff23a4208562ffb741c0a5a47a42da28525a
+AUX py3-2.patch 1430 BLAKE2B bbb55f75603556a96e4a573039c20aa41caea7c3758a2a994e80d8dd4175c97467c740cc1319d61812301fe74956a63e5385eb2220573e36a6f557e9ba1b97ed SHA512 57c8853bf8130c2c5050d1191e197f37e38937ad524e01de551d0f1d018b507af3bb6de463381f743740ca8c52cdd1ed2ed85a9fa6830960a3c3b6661686c3ad
+AUX py3.patch 1989 BLAKE2B 635135fc80d5f28c7953fd28105793b74ef51384bdc269a3b45c85e5519a700014ff02a2eedc38aa8dc5642ca269421d5521197957f5ccbae8fe42d88bde18a1 SHA512 5ebf4e0bf6d5f814dd9ee4fee868127dd7fb13b78f488bed7875d1a0102ba7ff63b848d843d9a94eeee13aa79694b0f6d8a2a2bbc74294861a27dc3b8255248a
 AUX roscore.confd 9 BLAKE2B 89bba6f2d5d004cd5d0e3bb931d039e54e5389f21538c4210924c2e52d9287b2191e1ae5f94641658fb95fef10bf55e261e2d20e702974cc823988609e27781a SHA512 91af98d3c1f567572e0d995b68f268cefe8abaff46b58499fdd11845809947e858c8d133c6b4428115f0a62db6eb847495bf462619a7fa7c233bf3a97dc9f0bc
-AUX roscore.initd 536 BLAKE2B a171ba37652582bace25eba0b027751fc325e6d3c7dfca520603e422206544c78cb5300f47346bd0f8de25e36f78c0eb3f19e1c2427a3568f5a2711e253eae3d SHA512 b46522a0da35f9ad5c009bbb8cedc17b79986ee833042cc3991a1b4f61f89f7065c8c49a48ac5544c06b5c7dbdbcfac197df99b8811d4a9d4a36b0003806572b
+AUX roscore.initd 533 BLAKE2B 2ff10e03a6b75128fd72a98022a040b93c32ddba6782912133e4164e50427a37f77c5911cd1a50082ba33f90cc7cc6983d2d4eff4ca1ef86c07d3e2ebabfbce6 SHA512 8a43dd2ec83c24db1c00f4e849fa3e6193d348c6c3e4cae0317717d1d08cd1da6cbc37dbfdd338b9d2d77d2bf852d93736214c7d3c31e6dba3b46627e3d0b410
 AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af930e3e01a32dc3228dfc60aeb4c1d6efe05f8245a948edd2314dcb550f9e80d1acd36461c347ce38 SHA512 fff18b8f4ffdf3f3e6cdc3b33cdb386dabaab769f3bac995cb3c29243c8380b13898cd5892026e9dee459f88f4f05886c052696b2f081fbbb393ade148fda0f6
 AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
-AUX roslaunch.initd 918 BLAKE2B 5f87cd89c7083a111e956c1156b51f2a151169e63c221159f3abc127ee95c65b7a22b40c061fcec31dc1527a6f65e71b1133f4f2287983a321b6cc2176708291 SHA512 af14f8f53ce2aba8f430dd244e577832543a632508eb388717671e26b38b139da6312800ce3b71a799dd7ffb5c6f2f8323be3c51c478444aaaa25568c9bcfa52
+AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
 AUX timeout.patch 623 BLAKE2B 0889396c4a38d3f62fd928dcd2f8d982a7fb070da0912d16f68ff61bf15c0d10f7b4f8dc70f8df9d946608c6755dbcfeb770d9cbc6e5acc9dfd0e3d509177258 SHA512 56ded8178faab6d74245479afe013fbffc984037263cae502ec411ce5e681efa6a8d11fc3b2083673df3e69a011db0c2e0992c5900fa5409338f7be84b0ea843
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
+AUX yaml.patch 1951 BLAKE2B cb6a66bb788221cd666d199d28a9844e10e61955e254bbd73e93e4595a1b6f3f9bbd292bf2781c46b5f3a0e4d052b79691a896a4fb922ab7db10918d61c86519 SHA512 964212c13d5cdef7fa0b19a947d1740b0782eac35e62e9bac41bc5e4fa33ebb3e15ca7ba6007ec97df2903237c250cdbc87d438804bdf5648ecec55f24ccd21d
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD roslaunch-1.13.0.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.1.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.2.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.4.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.5.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.13.6.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.14.2.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-1.14.3.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
-EBUILD roslaunch-9999.ebuild 1432 BLAKE2B 96c1aad5e033df82bf5f63bf2213deb9b9a4308e6bc1872f0630e5b3f4083f517966f2eeb64dc909795c9756a747627d498242a90f9b226f0d787b86cb4a7641 SHA512 50a3c318010ea41d72d27c29b5a593c0f0b547038ead9242f8cb8c37c33ad088f2d37a76c28654ebe585a22d80a761d1bcd7a1a2d1e8413dd1880117c456a38e
+EBUILD roslaunch-1.14.3-r2.ebuild 1507 BLAKE2B 46796b9ca0bdc3c989382224c9480579490859ab09c21101584aace824f2caca1e4a9ebaabe2913f8b2f923b38389c67701a1ff635154a846c85a735b6ac2669 SHA512 aacb052b1e3b3558c6615784d12590eca8e197c480a91d3bbd166c38ac867048898eac973e39fb934712a5fa9ef431ecd609fecc8c479724fc138619c66b818c
+EBUILD roslaunch-9999.ebuild 1457 BLAKE2B 173d7bb2d90bcc0f51bc44ae991e44e621f408e68e8922993bffe02d1c836bd39564d74db62d7eec11c4642fdf41173a426fb12f4d3b5389b7bce87f71de54d5 SHA512 2b0ea20c87e6b58840565267d709010f392defc113ec1220e325cc036fbdc0abdc411359b434a4ebdf5232d609b89ca7e753324aa7a63e1ecbcafd6d95053170
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/files/py3-2.patch b/dev-ros/roslaunch/files/py3-2.patch
new file mode 100644
index 000000000000..d3ae600e4d7e
--- /dev/null
+++ b/dev-ros/roslaunch/files/py3-2.patch
@@ -0,0 +1,29 @@
+From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 16:06:51 -0700
+Subject: [PATCH] more Python 3 compatibility (#1783)
+
+---
+ test/test_rospy/test/unit/test_genmsg_py.py   |  6 +--
+ tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
+ .../test/test_roslogging_user_logger.py       |  8 +++-
+ tools/roslaunch/test/unit/test_xmlloader.py   |  2 +-
+ tools/rosmsg/src/rosmsg/__init__.py           |  2 +-
+ tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
+ .../test/test_rosmsgproto_command_line.py     | 20 ++++----
+ .../test_rostopic_command_line_offline.py     | 44 +++++++++---------
+ 8 files changed, 67 insertions(+), 63 deletions(-)
+
+diff --git a/tools/roslaunch/test/unit/test_xmlloader.py b/tools/roslaunch/test/unit/test_xmlloader.py
+index ac30189d0..f582ec230 100644
+--- a/tools/roslaunch/test/unit/test_xmlloader.py
++++ b/tools/roslaunch/test/unit/test_xmlloader.py
+@@ -218,7 +218,7 @@ def test_params(self):
+         p = [p for p in mock.params if p.key == '/configfile'][0]
+         self.assertEquals(contents, p.value, 1)
+         p = [p for p in mock.params if p.key == '/binaryfile'][0]
+-        self.assertEquals(Binary(contents), p.value, 1)
++        self.assertEquals(Binary(contents.encode()), p.value, 1)
+ 
+         f = open(os.path.join(get_example_path(), 'example.launch'))
+         try:
diff --git a/dev-ros/roslaunch/files/py3.patch b/dev-ros/roslaunch/files/py3.patch
new file mode 100644
index 000000000000..8fa2c6e2fab2
--- /dev/null
+++ b/dev-ros/roslaunch/files/py3.patch
@@ -0,0 +1,45 @@
+From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
+Date: Tue, 6 Aug 2019 12:50:24 -0700
+Subject: [PATCH] more Python 3 compatibility (#1782)
+
+---
+ test/test_rosmaster/test/nodes/testAllCommonFlows  | 2 +-
+ test/test_rosmaster/test/nodes/testMaster          | 2 +-
+ test/test_rosmaster/test/nodes/testSlave           | 2 +-
+ test/test_rospy/test/unit/test_genmsg_py.py        | 8 +++++++-
+ tools/rosgraph/test/test_roslogging.py             | 5 ++++-
+ tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
+ tools/roslaunch/src/roslaunch/depends.py           | 8 ++++----
+ 7 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/tools/roslaunch/src/roslaunch/depends.py b/tools/roslaunch/src/roslaunch/depends.py
+index a3fbf7a41..91ae26998 100644
+--- a/tools/roslaunch/src/roslaunch/depends.py
++++ b/tools/roslaunch/src/roslaunch/depends.py
+@@ -86,21 +86,21 @@ def __str__(self):
+ 
+ def _get_arg_value(tag, context):
+     name = tag.attributes['name'].value
+-    if tag.attributes.has_key('value'):
++    if 'value' in tag.attributes.keys():
+         return resolve_args(tag.attributes['value'].value, context)
+     elif name in context['arg']:
+         return context['arg'][name]
+-    elif tag.attributes.has_key('default'):
++    elif 'default' in tag.attributes.keys():
+         return resolve_args(tag.attributes['default'].value, context)
+     else:
+         raise RoslaunchDepsException("No value for arg [%s]"%(name))
+ 
+ def _check_ifunless(tag, context):
+-    if tag.attributes.has_key('if'):
++    if 'if' in tag.attributes.keys():
+         val = resolve_args(tag.attributes['if'].value, context)
+         if not convert_value(val, 'bool'):
+             return False
+-    elif tag.attributes.has_key('unless'):
++    elif 'unless' in tag.attributes.keys():
+         val = resolve_args(tag.attributes['unless'].value, context)
+         if convert_value(val, 'bool'):
+             return False
diff --git a/dev-ros/roslaunch/files/roscore.initd b/dev-ros/roslaunch/files/roscore.initd
index 3df4be4006b9..d05c3fe98a76 100755..100644
--- a/dev-ros/roslaunch/files/roscore.initd
+++ b/dev-ros/roslaunch/files/roscore.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/dev-ros/roslaunch/files/roslaunch.initd b/dev-ros/roslaunch/files/roslaunch.initd
index af38d2abbe68..fa0c0ace1c55 100755..100644
--- a/dev-ros/roslaunch/files/roslaunch.initd
+++ b/dev-ros/roslaunch/files/roslaunch.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/dev-ros/roslaunch/files/yaml.patch b/dev-ros/roslaunch/files/yaml.patch
new file mode 100644
index 000000000000..135e9927c408
--- /dev/null
+++ b/dev-ros/roslaunch/files/yaml.patch
@@ -0,0 +1,44 @@
+Index: roslaunch/src/roslaunch/loader.py
+===================================================================
+--- roslaunch.orig/src/roslaunch/loader.py
++++ roslaunch/src/roslaunch/loader.py
+@@ -98,7 +98,7 @@ def convert_value(value, type_):
+         raise ValueError("%s is not a '%s' type"%(value, type_))
+     elif type_ == 'yaml':
+         try:
+-            return yaml.load(value)
++            return yaml.safe_load(value)
+         except yaml.parser.ParserError as e:
+             raise ValueError(e)
+     else:
+@@ -409,7 +409,7 @@ class Loader(object):
+             if rosparam is None:
+                 import rosparam
+             try:
+-                data = yaml.load(text)
++                data = yaml.safe_load(text)
+                 # #3162: if there is no YAML, load() will return an
+                 # empty string.  We want an empty dictionary instead
+                 # for our representation of empty.
+Index: roslaunch/test/unit/test_roslaunch_dump_params.py
+===================================================================
+--- roslaunch.orig/test/unit/test_roslaunch_dump_params.py
++++ roslaunch/test/unit/test_roslaunch_dump_params.py
+@@ -53,7 +53,7 @@ class TestDumpParams(unittest.TestCase):
+         o, e = p.communicate()
+         self.assert_(p.returncode == 0, "Return code nonzero for param dump! Code: %d" % (p.returncode))
+ 
+-        self.assertEquals({'/noop': 'noop'}, yaml.load(o))
++        self.assertEquals({'/noop': 'noop'}, yaml.safe_load(o))
+ 
+         p = Popen([cmd, '--dump-params', 'roslaunch', 'test-dump-rosparam.launch'], stdout = PIPE)
+         o, e = p.communicate()
+@@ -95,7 +95,7 @@ class TestDumpParams(unittest.TestCase):
+             '/noparam1': 'value1',
+             '/noparam2': 'value2',
+             }
+-        output_val = yaml.load(o)
++        output_val = yaml.safe_load(o)
+         if not val == output_val:
+             for k, v in val.items():
+                 if k not in output_val:
diff --git a/dev-ros/roslaunch/roslaunch-1.13.1.ebuild b/dev-ros/roslaunch/roslaunch-1.13.1.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.2.ebuild b/dev-ros/roslaunch/roslaunch-1.13.2.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.4.ebuild b/dev-ros/roslaunch/roslaunch-1.13.4.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.5.ebuild b/dev-ros/roslaunch/roslaunch-1.13.5.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.6.ebuild b/dev-ros/roslaunch/roslaunch-1.13.6.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.13.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.14.2.ebuild b/dev-ros/roslaunch/roslaunch-1.14.2.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.14.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-1.13.0.ebuild b/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild
index be129d151484..6f8d65622b86 100644
--- a/dev-ros/roslaunch/roslaunch-1.13.0.ebuild
+++ b/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-ros/test_rosmaster
 	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
+PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
 
 src_test() {
 	rosdep update
diff --git a/dev-ros/roslaunch/roslaunch-1.14.3.ebuild b/dev-ros/roslaunch/roslaunch-1.14.3.ebuild
deleted file mode 100644
index be129d151484..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.14.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin user
-
-DESCRIPTION="Tool for easily launching multiple ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosclean[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosparam[${PYTHON_USEDEP}]
-	dev-ros/rosmaster[${PYTHON_USEDEP}]
-	dev-ros/rosout
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/test_rosmaster
-	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
-
-src_test() {
-	rosdep update
-	ros-catkin_src_test
-}
-
-src_install() {
-	ros-catkin_src_install
-
-	dodir /etc/ros
-	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
-
-	newinitd "${FILESDIR}/roscore.initd" roscore
-	newconfd "${FILESDIR}/roscore.confd" roscore
-
-	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
-	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
-
-	doenvd "${FILESDIR}/40roslaunch"
-
-	# Needed by test_roslaunch
-	insinto /usr/share/${PN}
-	doins test/xml/noop.launch
-}
-
-pkg_preinst() {
-	enewgroup ros
-	enewuser ros -1 -1 /home/ros ros
-}
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index be129d151484..cc74b7791b52 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" )
+PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" )
 
 src_test() {
 	rosdep update