gentoo resync : 15.12.2019

11 files changed, 164 insertions, 204 deletions

diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index 8da9eebafc5f..1bdfc8437e09 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,18 +1,6 @@
-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 py3.patch 4958 BLAKE2B c441bee4b3ae1095b32aecb9618120d41d2cda53062ba4ce7c85f539840be27ed035a4f3da87f643217a650c1766b6b9c94f48d44116a753ddc6ab44a5a0fd43 SHA512 b576a41c69680df1a388b30b3588ef0a94609b6338820a08deaa2ed3f29b05816bbb68db256cb843ae394f12723674a485e1b933caa2a19729a3c610de5c8345
+AUX yaml.patch 2816 BLAKE2B ecd4c4047f009dcc9c2417efa8a2233220dc002ede217beee75f88af111b1bab26423aba8796027f60e73887c0926e5099fa9db114b8a7f5144e25a5acf04789 SHA512 f3d197fec12c9df46eb488398c3149c36f0b7581a2a2c7ae7052bc0c37ed27302405b1aba81a140463ffe52fd8a9f65789371bbb697e0d09867b0ca02ce35340
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rostopic-1.13.0.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.1.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.2.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.4.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.5.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.13.6.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.14.2.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
-EBUILD rostopic-1.14.3.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
+EBUILD rostopic-1.14.3-r1.ebuild 620 BLAKE2B ec9207dee43c1fe77fedcb6571e8ebd264cf425e25b0dcb3140f52fc479a962fd5604075b793bfb7e5ea89a069cedb7434a67ffcd46945bb55f76d383c8761d9 SHA512 eab5569f7be770b6f1908d2eb7ac649fe2ebb82edba1c5b2aea154f96f3aec3520a5292edd64db6c8e915e53891a4543c18b8e1b7128389c7be6cdb7d09428f3
 EBUILD rostopic-9999.ebuild 559 BLAKE2B f4b697a8796d810e9eb598b4c601e2e5a0bbc622907d2557e2e349b906ffddf575ff72b76de53c64052e3e29889ce050a493548f3e29e02ff0d06a7a74b9d3bd SHA512 6ae4e9e2688ec2910693b6ac6fc6bc9d09fd6a5026418dfc16f21d0b4bdf9ba517465a9c100abae80ddca98456c573358d1759a207ef783c6442f3a47aefebbf
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostopic/files/py3.patch b/dev-ros/rostopic/files/py3.patch
new file mode 100644
index 000000000000..51f5da5aa778
--- /dev/null
+++ b/dev-ros/rostopic/files/py3.patch
@@ -0,0 +1,89 @@
+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/rostopic/test/test_rostopic_command_line_offline.py b/tools/rostopic/test/test_rostopic_command_line_offline.py
+index 5dab1ad16..37a81faaa 100644
+--- a/tools/rostopic/test/test_rostopic_command_line_offline.py
++++ b/tools/rostopic/test/test_rostopic_command_line_offline.py
+@@ -48,9 +48,9 @@ def test_cmd_help(self):
+         cmd = 'rostopic'
+ 
+         sub = ['bw', 'echo', 'hz', 'delay', 'info', 'list', 'pub', 'type','find']
+-        output = Popen([cmd], stdout=PIPE).communicate()[0]
++        output = Popen([cmd], stdout=PIPE).communicate()[0].decode()
+         self.assert_('Commands' in output)
+-        output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0]
++        output = Popen([cmd, '-h'], stdout=PIPE).communicate()[0].decode()
+         self.assert_('Commands' in output)
+         # make sure all the commands are in the usage
+         for c in sub:
+@@ -59,16 +59,16 @@ def test_cmd_help(self):
+ 
+         for c in sub:
+             output = Popen([cmd, c, '-h'], stdout=PIPE, stderr=PIPE).communicate()
+-            self.assert_("usage:" in output[0].lower(), output)
++            self.assert_("usage:" in output[0].decode().lower(), output)
+             # make sure usage refers to the command
+-            self.assert_("%s %s"%(cmd, c) in output[0], output)
++            self.assert_("%s %s"%(cmd, c) in output[0].decode(), output)
+             
+         # test no args on commands that require args
+         for c in ['bw', 'echo', 'hz', 'delay', 'info', 'pub', 'type', 'find']:
+             output = Popen([cmd, c], stdout=PIPE, stderr=PIPE).communicate()
+-            self.assert_("usage:" in output[0].lower() or "usage:" in output[1].lower(), output)
++            self.assert_("usage:" in output[0].decode().lower() or "usage:" in output[1].decode().lower(), output)
+             # make sure usage refers to the command
+-            self.assert_("%s %s"%(cmd, c) in output[1], output)
++            self.assert_("%s %s"%(cmd, c) in output[1].decode(), output)
+             
+     def test_offline(self):
+         cmd = 'rostopic'
+@@ -80,19 +80,19 @@ def test_offline(self):
+ 
+         msg = "ERROR: Unable to communicate with master!\n"
+ 
+-        output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate()
+-        self.assert_(output[1].endswith(msg))
+-        output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate()
+-        self.assert_(output[1].endswith(msg))
+-        output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate()
+-        self.assert_(output[1].endswith(msg))
+-        output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate()
+-        self.assert_(output[1].endswith(msg))
+-        output = Popen([cmd, 'list'], **kwds).communicate()
+-        self.assert_(output[1].endswith(msg))
+-        output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate()
+-        self.assert_(output[1].endswith(msg))
+-        output = Popen([cmd, 'type', 'chatter'], **kwds).communicate()
+-        self.assert_(output[1].endswith(msg))
+-        output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate()
+-        self.assert_(output[1].endswith(msg))
++        output = Popen([cmd, 'bw', 'chatter'], **kwds).communicate()[1].decode()
++        self.assert_(output.endswith(msg))
++        output = Popen([cmd, 'echo', 'chatter'], **kwds).communicate()[1].decode()
++        self.assert_(output.endswith(msg))
++        output = Popen([cmd, 'hz', 'chatter'], **kwds).communicate()[1].decode()
++        self.assert_(output.endswith(msg))
++        output = Popen([cmd, 'delay', 'chatter'], **kwds).communicate()[1].decode()
++        self.assert_(output.endswith(msg))
++        output = Popen([cmd, 'list'], **kwds).communicate()[1].decode()
++        self.assert_(output.endswith(msg))
++        output = Popen([cmd, 'pub', 'chatter', 'std_msgs/String', 'hello'], **kwds).communicate()[1].decode()
++        self.assert_(output.endswith(msg))
++        output = Popen([cmd, 'type', 'chatter'], **kwds).communicate()[1].decode()
++        self.assert_(output.endswith(msg))
++        output = Popen([cmd, 'type', 'std_msgs/String'], **kwds).communicate()[1].decode()
++        self.assert_(output.endswith(msg))
diff --git a/dev-ros/rostopic/files/yaml.patch b/dev-ros/rostopic/files/yaml.patch
new file mode 100644
index 000000000000..e96337b50546
--- /dev/null
+++ b/dev-ros/rostopic/files/yaml.patch
@@ -0,0 +1,71 @@
+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/tools/rostopic/src/rostopic/__init__.py b/tools/rostopic/src/rostopic/__init__.py
+index ad244b0f0..41138562e 100644
+--- a/tools/rostopic/src/rostopic/__init__.py
++++ b/tools/rostopic/src/rostopic/__init__.py
+@@ -1779,7 +1779,7 @@ def _rostopic_cmd_pub(argv):
+     try:
+         pub_args = []
+         for arg in args[2:]:
+-            pub_args.append(yaml.load(arg))
++            pub_args.append(yaml.safe_load(arg))
+     except Exception as e:
+         parser.error("Argument error: "+str(e))
+ 
+@@ -1822,7 +1822,7 @@ def bagy_iter():
+         try:
+             with open(filename, 'r') as f:
+                 # load all documents
+-                data = yaml.load_all(f)
++                data = yaml.safe_load_all(f)
+                 for d in data:
+                     yield [d]
+         except yaml.YAMLError as e:
+@@ -2014,7 +2014,7 @@ def stdin_yaml_arg():
+ 
+             if arg.strip() == '---': # End of document
+                 try:
+-                    loaded = yaml.load(buff.rstrip())
++                    loaded = yaml.safe_load(buff.rstrip())
+                 except Exception as e:
+                     sys.stderr.write("Invalid YAML: %s\n"%str(e))
+                 if loaded is not None:
diff --git a/dev-ros/rostopic/rostopic-1.13.1.ebuild b/dev-ros/rostopic/rostopic-1.13.1.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.1.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.2.ebuild b/dev-ros/rostopic/rostopic-1.13.2.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.2.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.4.ebuild b/dev-ros/rostopic/rostopic-1.13.4.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.4.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.5.ebuild b/dev-ros/rostopic/rostopic-1.13.5.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.5.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.6.ebuild b/dev-ros/rostopic/rostopic-1.13.6.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.13.6.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rostopic/rostopic-1.14.2.ebuild b/dev-ros/rostopic/rostopic-1.14.2.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.14.2.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/rostopic/rostopic-1.13.0.ebuild b/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild
index bc869fd3fbe8..db7295a22db1 100644
--- a/dev-ros/rostopic/rostopic-1.13.0.ebuild
+++ b/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild
@@ -25,3 +25,4 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
+PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" )
diff --git a/dev-ros/rostopic/rostopic-1.14.3.ebuild b/dev-ros/rostopic/rostopic-1.14.3.ebuild
deleted file mode 100644
index bc869fd3fbe8..000000000000
--- a/dev-ros/rostopic/rostopic-1.14.3.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit ros-catkin
-
-DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"