gentoo resync : 15.12.2019

13 files changed, 125 insertions, 282 deletions

diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 4c7fdda4e82a..279a76bddead 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,20 +1,7 @@
-DIST ros_comm-1.12.7.tar.gz 974568 BLAKE2B 8c3ece3a200de84fc9557468de87dddad145f3412655fe082a4efa3a0701c98646d098c72f3da0cf5cbbd901c52e70d0dc19c19485f11f564eeb2c089615a949 SHA512 7cfc5bf231e8e388102f192d46bd902a2b92d4620938379b362efd250c48f317f5ba6e0aee7398c841392f56c2b79f933ad5ec60eb69492add90fa2ca86a3a8f
-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 empty.patch 389 BLAKE2B 7ff08d2bd3cc7c14a4e93cc2ff4a89029f8e922f545c707d14b604a207170a1bbe8f0321c64882d6cc0f614670a8fe6f173e787c7b672a60afb1f8a3a289fe11 SHA512 c6ae83e53ec66fe390647e04c0ddf4ab8a7fcd20dfc6ab4c26012011f8033d3f5120f05eb7f6a71da361592058bcea521ca7839f3158c2fb63b68961c01ef9e6
+AUX py3.patch 2361 BLAKE2B 778987cf4fa20faf2bc883f6715f6c05a0631037bcab799e73e842c18ca1aa2cdbe1ac483d1e160a41eb24c6cac17ae9aff7c14ab86813d348281191948445b2 SHA512 f4f53a5caed1a11c1d0619d2f9a883fc30c35f4f431461074a4e1c79b478be41de7702299fa10ab0c187662aaa1531f184a3748a6944c9eb44130899b0222d6c
+AUX yaml.patch 2233 BLAKE2B 174e7417282c07960ddb76381f79d4cae9ccfd3c9c99add5f0e5dfa610b84fb437b8d6410937bfe048640e082fba23c0544df1dbfd5422b74d9500b5f21468e2 SHA512 ef38c5408dc694bef305746f31b6e0a2b5711968dd5f54a290d5d7eec4c09631fd5773a22443d7c02bc0ef5e275986c7b3755d9acbfa971085e2b67e37f53103
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD test_rosmaster-1.12.7.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.0.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.1.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.2.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.4.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.5.ebuild 698 BLAKE2B 9bf8a34f75e53aa7950cbe40889aebf3b85c897e1e11c3eaec0ecfe55cbe13e19ec2ed58d80972a52bfd5024e9987cbbc46ad69fc11ffb11b9b881a8975fbf86 SHA512 67c40515bf7f0f7b1081740fd995448679790de1de8a954d821c272751bff8f6c6ce0a0af7ee673541a36143581b0832c5fe8c6f5088aa27b9a41c2bed3f0f6e
-EBUILD test_rosmaster-1.13.6.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
-EBUILD test_rosmaster-1.14.2.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
-EBUILD test_rosmaster-1.14.3.ebuild 698 BLAKE2B 58ce81be4098e9839761dd1979ce2f5c44f0fc6d7bced98d12ecb6cacaee7d36d7a507ff32e3e4aabdc35ac822eeec17d9b24f694f834b3856ca4e3405f37826 SHA512 f8169b68855c6dcdef425686423d9d4d78bc354cd4f85fbcfebf2e3394c16095c74f0ef21a06f56d45a649adf8f451f7b18e2fcaf37210f94db7750948af47d0
+EBUILD test_rosmaster-1.14.3-r2.ebuild 782 BLAKE2B 55c8a2d6a8323107a49e6877989a037a57e9e7807816fdef4d57c0a458909df2fee6d689d27d5fe8ed8142bd4fe4b3732f4019ecc90dfc24950d175d12733649 SHA512 6c280c81ac9c8fe6d362fc34ad9c119adef908be96dbffa0f8fe272f7b344b1aef573a698238b1f3cae01390d98830ed54d44ac1768b8c12f6ce2b213dc2a402
 EBUILD test_rosmaster-9999.ebuild 698 BLAKE2B d5b4d4a9029b5fb5d967a146d22f056f48bab5c55d71db031322feadd8dbd11cccd46dfb8bba77bf70328e24b329e3bdb7df824c9706f30c5dd7e40f1d5c9eb0 SHA512 99dc926c24a752cedb957d9322d1f9a76ca3eb1855ef485ba81fe12fcca2641ecebc960279dbc04739a14cdb77e807cc012233419d6d7c7466b4778c2f5d9498
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosmaster/files/empty.patch b/dev-ros/test_rosmaster/files/empty.patch
new file mode 100644
index 000000000000..8ec371c917c0
--- /dev/null
+++ b/dev-ros/test_rosmaster/files/empty.patch
@@ -0,0 +1,12 @@
+Index: test_rosmaster/CMakeLists.txt
+===================================================================
+--- test_rosmaster.orig/CMakeLists.txt
++++ test_rosmaster/CMakeLists.txt
+@@ -10,6 +10,7 @@ if(CATKIN_ENABLE_TESTING)
+     String.msg
+     Arrays.msg
+     CompositeA.msg CompositeB.msg Composite.msg
++    Empty.msg
+     Embed.msg Floats.msg Simple.msg
+     RosmsgA.msg
+     RosmsgB.msg
diff --git a/dev-ros/test_rosmaster/files/py3.patch b/dev-ros/test_rosmaster/files/py3.patch
new file mode 100644
index 000000000000..579d24f9f0b5
--- /dev/null
+++ b/dev-ros/test_rosmaster/files/py3.patch
@@ -0,0 +1,54 @@
+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/test/test_rosmaster/test/nodes/testAllCommonFlows b/test/test_rosmaster/test/nodes/testAllCommonFlows
+index 4d3e053f8..a22ffb8d8 100755
+--- a/test/test_rosmaster/test/nodes/testAllCommonFlows
++++ b/test/test_rosmaster/test/nodes/testAllCommonFlows
+@@ -12,7 +12,7 @@ import sys, os
+ BOOTSTRAP_VERSION = "0.1"
+ 
+ # Read in ROS_ROOT
+-if not os.environ.has_key('ROS_ROOT'):
++if 'ROS_ROOT' not in os.environ:
+   print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the 
+ location of your ROS install.\n"""
+   sys.exit(-1)
+diff --git a/test/test_rosmaster/test/nodes/testMaster b/test/test_rosmaster/test/nodes/testMaster
+index f3ec36be4..4dca1cb4a 100755
+--- a/test/test_rosmaster/test/nodes/testMaster
++++ b/test/test_rosmaster/test/nodes/testMaster
+@@ -12,7 +12,7 @@ import sys, os
+ BOOTSTRAP_VERSION = "0.1"
+ 
+ # Read in ROS_ROOT
+-if not os.environ.has_key('ROS_ROOT'):
++if 'ROS_ROOT' not in os.environ:
+   print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the 
+ location of your ROS install.\n"""
+   sys.exit(-1)
+diff --git a/test/test_rosmaster/test/nodes/testSlave b/test/test_rosmaster/test/nodes/testSlave
+index cf70af08b..f8ea7cb47 100755
+--- a/test/test_rosmaster/test/nodes/testSlave
++++ b/test/test_rosmaster/test/nodes/testSlave
+@@ -12,7 +12,7 @@ import sys, os
+ BOOTSTRAP_VERSION = "0.1"
+ 
+ # Read in ROS_ROOT
+-if not os.environ.has_key('ROS_ROOT'):
++if 'ROS_ROOT' not in os.environ:
+   print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the 
+ location of your ROS install.\n"""
+   sys.exit(-1)
diff --git a/dev-ros/test_rosmaster/files/yaml.patch b/dev-ros/test_rosmaster/files/yaml.patch
new file mode 100644
index 000000000000..2eb9c086b7e4
--- /dev/null
+++ b/dev-ros/test_rosmaster/files/yaml.patch
@@ -0,0 +1,53 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py             |  2 +-
+ .../test/test_roslib_message.py               |  2 +-
+ .../client_verification/test_slave_api.py     |  2 +-
+ test/test_rosparam/test/check_rosparam.py     |  8 ++---
+ .../check_rosparam_command_line_online.py     |  2 +-
+ .../check_rosservice_command_line_online.py   |  4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py                |  2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
+ tools/roslaunch/src/roslaunch/loader.py       |  4 +--
+ .../test/unit/test_roslaunch_dump_params.py   |  4 +--
+ tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
+ tools/rosservice/src/rosservice/__init__.py   |  4 +--
+ tools/rostopic/src/rostopic/__init__.py       |  6 ++--
+ tools/topic_tools/scripts/relay_field         |  2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/test/test_rosmaster/test/client_verification/test_slave_api.py b/test/test_rosmaster/test/client_verification/test_slave_api.py
+index 63d919c72..8614c045d 100755
+--- a/test/test_rosmaster/test/client_verification/test_slave_api.py
++++ b/test/test_rosmaster/test/client_verification/test_slave_api.py
+@@ -106,7 +106,7 @@ def __init__(self, *args, **kwds):
+     def load_profile(self, filename):
+         import yaml
+         with open(filename) as f:
+-            d = yaml.load(f)
++            d = yaml.safe_load(f)
+         self.required_pubs = d.get('pubs', {})
+         self.required_subs = d.get('subs', {})
+         
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.0.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.0.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.1.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.1.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.2.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.4.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.4.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.5.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.5.ebuild
deleted file mode 100644
index 69bbd047e7b9..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild
deleted file mode 100644
index f9547e8381b1..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.13.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.2.ebuild
deleted file mode 100644
index f9547e8381b1..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.14.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.12.7.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
index 69bbd047e7b9..d09c050ee2a7 100644
--- a/dev-ros/test_rosmaster/test_rosmaster-1.12.7.ebuild
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,6 +23,7 @@ RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
 DEPEND="${RDEPEND}
 	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
 "
+PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/empty.patch" "${FILESDIR}/py3.patch" )
 
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
 
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild
deleted file mode 100644
index f9547e8381b1..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.14.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosmaster"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
-"
-
-mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
-
-src_install() {
-	ros-catkin_src_install
-	dodir /usr/share/${PN}
-	cp -a test "${ED}//usr/share/${PN}/" || die
-}