gentoo resync : 25.08.2020

6 files changed, 23 insertions, 207 deletions

diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index b344d8045857..c1c9a86bc5c3 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,8 +1,4 @@
-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
-DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
-EBUILD rostopic-1.14.3-r1.ebuild 614 BLAKE2B 53a0cbbe88bf306c7c348c50a16d61c612002c33174c9c1f84fb1d8b066d9bff950a7813d22c8b4cf5261d4dbedce2e60aec443798fccf9755173c9a61b1acc7 SHA512 7367cd95c60c2c8a6c0a97a0c4b31bf1acc357e0036f7a63cb714d8dd6e15140fd89a7ad777cb7aa2e5c93ab03854b2eabd4ff4ecae16708dc0db182f034e1d6
-EBUILD rostopic-1.15.4.ebuild 553 BLAKE2B 0b9508bdf9327727eba2d3e44eb3b14d06d610d915f2199c524cb1e7b40497e0844ce8bfad318bb9052f46c19662dd8db8d67739450a49ce3b5ffac5bb6e4208 SHA512 793194ac2652d09b512cd95cbc2a4531418b11f1d9b119b8bf164af27b90db18938b8cc64a41944afe39fc115baf85c2fb161e60e458605498d0c23ca15c62b3
-EBUILD rostopic-9999.ebuild 553 BLAKE2B 0b9508bdf9327727eba2d3e44eb3b14d06d610d915f2199c524cb1e7b40497e0844ce8bfad318bb9052f46c19662dd8db8d67739450a49ce3b5ffac5bb6e4208 SHA512 793194ac2652d09b512cd95cbc2a4531418b11f1d9b119b8bf164af27b90db18938b8cc64a41944afe39fc115baf85c2fb161e60e458605498d0c23ca15c62b3
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD rostopic-1.15.8.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
+EBUILD rostopic-9999.ebuild 661 BLAKE2B d33853c2b2aefa1b73d391d516146c63842c01332ebd99feea7faea2bc842cde957ddb7cab481dfdda934e04a53d567bdb97a3886b76525ddddeb06409ca1551 SHA512 8812788df4dbd5f760cf65238d0482022bab1f2ee421e9614000e843019a5ba7b56f11f0c2f00891c19f203569d840680f8b00079b4b15ea56ef31f2e6f1f7af
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostopic/files/py3.patch b/dev-ros/rostopic/files/py3.patch
deleted file mode 100644
index 51f5da5aa778..000000000000
--- a/dev-ros/rostopic/files/py3.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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
deleted file mode 100644
index e96337b50546..000000000000
--- a/dev-ros/rostopic/files/yaml.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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.15.4.ebuild b/dev-ros/rostopic/rostopic-1.15.4.ebuild
deleted file mode 100644
index 647d292a6d3f..000000000000
--- a/dev-ros/rostopic/rostopic-1.15.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 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=( python2_7 )
-
-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.3-r1.ebuild b/dev-ros/rostopic/rostopic-1.15.8.ebuild
index 1f86a766a1ff..c436e4f953a2 100644
--- a/dev-ros/rostopic/rostopic-1.14.3-r1.ebuild
+++ b/dev-ros/rostopic/rostopic-1.15.8.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,13 +15,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)
 "
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rostopic/rostopic-9999.ebuild b/dev-ros/rostopic/rostopic-9999.ebuild
index 647d292a6d3f..c436e4f953a2 100644
--- a/dev-ros/rostopic/rostopic-9999.ebuild
+++ b/dev-ros/rostopic/rostopic-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,12 +15,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}