gentoo resync : 15.12.2019

12 files changed, 157 insertions, 169 deletions

diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 081dd6791258..bf115ceb0ee3 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,18 +1,7 @@
-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-2.patch 2357 BLAKE2B a3af95fdd93c1e5540626a529696583c366623a34a056122efde2eccf19219c70528cfcf227ffe96c2e5c90c5d26da5127f5ae3fdbd47a0da045dea4e9b34f08 SHA512 3437178097e04ac0b169a0612579a839f1d1d391859df9e215a3a016b301d1a22cd37a1c25684d55e7af0958a46af0e6d8ed759798a350dd7839a1b2b5bc7783
+AUX py3.patch 1616 BLAKE2B 56b70362a387ca67c97041456f185f4fb10959d32c7a54d825c8ee2a2dc71cc6bef3f2b9883083596f28bd26442d1b6d9bf92e563a5d3a8872a608a676949aa4 SHA512 e12466e7f86252516a7a094fdb6b0bbfeef784cae3a6638683b84aa5ee94c6848ecb1a22121719339f65fecdaa0d25a26c27d986c771ad2a82dc42975dad6118
+AUX yaml.patch 2245 BLAKE2B 2048938c0532efee2bca2cd7bdc5f544670245cd3b647613e8ec1a80588fad33287931ead00fc63c27e03e825bfb5c2b8db5bae75446184f85fc0c09abb26f3d SHA512 6346eb9231152dd91627b67f99f1268fc158136092d62e86fa01c7adb831a31e36844c12dbb3c52f190fbd6b4dbd77b026fe5190496d88ba4326abf55f7339ac
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosgraph-1.13.0.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.1.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.2.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.4.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.5.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.13.6.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.14.2.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
-EBUILD rosgraph-1.14.3.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
+EBUILD rosgraph-1.14.3-r1.ebuild 645 BLAKE2B df21262505f554db873790a9f38076e4dd438b1d4178ae2b236f478a6f833448870823fe064d4581536db742add495e89c9dc3b04844d9d2dcc8e6b920ddc14b SHA512 bb235fb4a947eb396cd6987bbadab7201d919b5ea092fcf26fe99c8a15809de967060726c8c9e94f00caecd63a6256648c30f55b619e7a55c76615ebeb4c6b1a
 EBUILD rosgraph-9999.ebuild 558 BLAKE2B a313d530533a4d318885cc9d60501402ac9b0921dfcf95932abef31859840fe36f675f32aaacf2c3dc1b2274c28eb793c978dd173abddad4f83fff295c75a232 SHA512 b5c635bfc9fadd098e08424fbfce28227b9805c05e8c054dc68a1c5e38e231b608e121aa131beefd647e2d1f215d95c062d6355bc978688e2eefde21bd22cb19
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosgraph/files/py3-2.patch b/dev-ros/rosgraph/files/py3-2.patch
new file mode 100644
index 000000000000..b83b349576bd
--- /dev/null
+++ b/dev-ros/rosgraph/files/py3-2.patch
@@ -0,0 +1,52 @@
+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/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
+index bbf1d9f49..51c39becd 100644
+--- a/tools/rosgraph/src/rosgraph/roslogging.py
++++ b/tools/rosgraph/src/rosgraph/roslogging.py
+@@ -49,7 +49,7 @@
+ class LoggingException(Exception): pass
+ 
+ class RospyLogger(logging.getLoggerClass()):
+-    def findCaller(self, dummy=False): # Dummy second arg to match Python3 function declaration
++    def findCaller(self, stack_info=False):
+         """
+         Find the stack frame of the caller so that we can note the source
+         file name, line number, and function name with class name if possible.
+diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
+index 4ac4f8291..1c3cb5df5 100644
+--- a/tools/rosgraph/test/test_roslogging_user_logger.py
++++ b/tools/rosgraph/test/test_roslogging_user_logger.py
+@@ -51,12 +51,16 @@
+ 
+ # set user defined custom logger
+ class UserCustomLogger(logging.Logger):
+-    def findCaller(self):
++    def findCaller(self, stack_info=False):
+         """Returns static caller.
+ 
+         This method is being overwritten in rosgraph.roslogging.
+         """
+-        return '<filename>', '<lineno>', '<func_name>'
++        if sys.version_info > (3, 2):
++            # Dummy last argument to match Python3 return type
++            return '<filename>', '<lineno>', '<func_name>', None
++        else:
++            return '<filename>', '<lineno>', '<func_name>'
+ 
+     def _log(self, level, msg, args, exc_info=None, extra=None):
+         """Write log with ROS_IP.
diff --git a/dev-ros/rosgraph/files/py3.patch b/dev-ros/rosgraph/files/py3.patch
new file mode 100644
index 000000000000..45798c1d618e
--- /dev/null
+++ b/dev-ros/rosgraph/files/py3.patch
@@ -0,0 +1,47 @@
+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/rosgraph/test/test_roslogging.py b/tools/rosgraph/test/test_roslogging.py
+index f9e618f87..ca38c80e8 100644
+--- a/tools/rosgraph/test/test_roslogging.py
++++ b/tools/rosgraph/test/test_roslogging.py
+@@ -32,7 +32,10 @@
+ 
+ import logging
+ import os
+-from StringIO import StringIO
++try:
++    from cStringIO import StringIO
++except ImportError:
++    from io import StringIO
+ import sys
+ 
+ import re
+diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
+index 62051638a..4ac4f8291 100644
+--- a/tools/rosgraph/test/test_roslogging_user_logger.py
++++ b/tools/rosgraph/test/test_roslogging_user_logger.py
+@@ -38,7 +38,10 @@
+ 
+ import logging
+ import os
+-from StringIO import StringIO
++try:
++    from cStringIO import StringIO
++except ImportError:
++    from io import StringIO
+ import sys
+ 
+ from nose.tools import assert_regexp_matches
diff --git a/dev-ros/rosgraph/files/yaml.patch b/dev-ros/rosgraph/files/yaml.patch
new file mode 100644
index 000000000000..32ea589c8e49
--- /dev/null
+++ b/dev-ros/rosgraph/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/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
+index ffe975dab..bbf1d9f49 100644
+--- a/tools/rosgraph/src/rosgraph/roslogging.py
++++ b/tools/rosgraph/src/rosgraph/roslogging.py
+@@ -178,7 +178,7 @@ def configure_logging(logname, level=logging.INFO, filename=None, env=None):
+     os.environ['ROS_LOG_FILENAME'] = log_filename
+     if config_file.endswith(('.yaml', '.yml')):
+         with open(config_file) as f:
+-            dict_conf = yaml.load(f)
++            dict_conf = yaml.safe_load(f)
+         dict_conf.setdefault('version', 1)
+         logging.config.dictConfig(dict_conf)
+     else:
diff --git a/dev-ros/rosgraph/rosgraph-1.13.1.ebuild b/dev-ros/rosgraph/rosgraph-1.13.1.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.1.ebuild
+++ /dev/null
@@ -1,22 +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"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.2.ebuild b/dev-ros/rosgraph/rosgraph-1.13.2.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.2.ebuild
+++ /dev/null
@@ -1,22 +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"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.4.ebuild b/dev-ros/rosgraph/rosgraph-1.13.4.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.4.ebuild
+++ /dev/null
@@ -1,22 +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"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.5.ebuild b/dev-ros/rosgraph/rosgraph-1.13.5.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.5.ebuild
+++ /dev/null
@@ -1,22 +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"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.6.ebuild b/dev-ros/rosgraph/rosgraph-1.13.6.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.13.6.ebuild
+++ /dev/null
@@ -1,22 +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"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.14.2.ebuild b/dev-ros/rosgraph/rosgraph-1.14.2.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.14.2.ebuild
+++ /dev/null
@@ -1,22 +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"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosgraph/rosgraph-1.13.0.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild
index 4922358a7091..4a463741c8fc 100644
--- a/dev-ros/rosgraph/rosgraph-1.13.0.ebuild
+++ b/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild
@@ -20,3 +20,4 @@ RDEPEND="
 	dev-python/rospkg[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
diff --git a/dev-ros/rosgraph/rosgraph-1.14.3.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3.ebuild
deleted file mode 100644
index 4922358a7091..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.14.3.ebuild
+++ /dev/null
@@ -1,22 +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"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Prints information about the ROS Computation Graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"