gentoo resync : 25.08.2020

5 files changed, 18 insertions, 104 deletions

diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 857fbbf35b91..9541d91f7bcc 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,7 +1,4 @@
-AUX yaml.patch 2150 BLAKE2B 5620056ff8c1da96f7f5e42bf4fccff73763211051d7c39c35c3dd6181aba3059dcbe9e32b5b6edb6ba4f074601dee7937e6093c321e3b236a7de2bcd7f9252d SHA512 4b9b884c1b29987bff911a945daec6841fb19b5fa34d0b6ffd81c3c338412c3faf5787240c39e7ff5a952841131aeb3f2994161eddc5c3a9b4173c099660e9bd
-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 topic_tools-1.14.3-r1.ebuild 729 BLAKE2B ccc071e3a6170f559e3e9dce6886621f4c7c1c72b11ce1f66e83cd04092cd6cc999e7e0526baf9c8a6336c976f27ebcf213d01186aae486cfcdb80a4eeef58dd SHA512 5181892055fbb64cba30d9467d30639c3f23435b805be1c9ea32fd8f19aeafa0a3b152a0106398e69b45134f5f317a3ca2b96f1e2e04e164bee52fa2dc619a40
-EBUILD topic_tools-1.15.4.ebuild 692 BLAKE2B 18d9cb31888309b6e5cbec2c1c30567f0d68bb763081c2a51ae1a3839f768d49e8f7b4de73553d4263ebf44ce4dad81044fc7cc0298f3e18b93eef151037df26 SHA512 3a2c93aa9a49182054372a4115d3cb8f5cfa8b8aed0fb0509b76260492afa218e0c4867d365f04c76a0f1133947f43d7ea75c590c038245d6a6ecd41a29af4fb
-EBUILD topic_tools-9999.ebuild 695 BLAKE2B 63c6c776011923217856c1392fb0d292d0bb44bebd000c7fa6530371a237aefda1a18c07bd78d9352d0f4dc7608a1c9dd335710cc6860485678dd2da4fa621df SHA512 918f548657eeab6f571e371dde921b0cdc374890b3f4a80b9eb51ece52e3404ce750a9447d1139e15a60409054f8f3e6d829f75ad538e6c80ffa8617eaca646a
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD topic_tools-1.15.8.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
+EBUILD topic_tools-9999.ebuild 832 BLAKE2B e025e1142b4a923027c5d15452c5ce6e310df1f805bdbb14e03f71b5beabd909bc8609f0eea161614e697b6c42ffe101b97f2f6556bc81c1bc05770dbd50d3c7 SHA512 c03f68fce690a2d76b547786532e1bba9a5db6480c780f9a0c4eabd5b607c681e7bb45f86014c61e6ded236cd3a53cb459e06b91da1b0a10bdb55c4ca5b60d8e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/files/yaml.patch b/dev-ros/topic_tools/files/yaml.patch
deleted file mode 100644
index e783e321b7fb..000000000000
--- a/dev-ros/topic_tools/files/yaml.patch
+++ /dev/null
@@ -1,53 +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/topic_tools/scripts/relay_field b/tools/topic_tools/scripts/relay_field
-index 6630b685d..cc73ac443 100755
---- a/tools/topic_tools/scripts/relay_field
-+++ b/tools/topic_tools/scripts/relay_field
-@@ -98,7 +98,7 @@ class RelayField(object):
-         if self.input_fn is not None:
-             m = self.input_fn(m)
- 
--        msg_generation = yaml.load(self.expression)
-+        msg_generation = yaml.safe_load(self.expression)
-         pub_args = _eval_in_dict_impl(msg_generation, None, {'m': m})
- 
-         now = rospy.get_rostime()
diff --git a/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild b/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild
deleted file mode 100644
index ecddea9d6441..000000000000
--- a/dev-ros/topic_tools/topic_tools-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,34 +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"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/rostime
-	dev-ros/xmlrpcpp
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/topic_tools/topic_tools-1.15.4.ebuild b/dev-ros/topic_tools/topic_tools-1.15.8.ebuild
index 49f8f6d9bbb1..8c28b2e72861 100644
--- a/dev-ros/topic_tools/topic_tools-1.15.4.ebuild
+++ b/dev-ros/topic_tools/topic_tools-1.15.8.ebuild
@@ -1,13 +1,12 @@
 # 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"
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
@@ -23,11 +22,14 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rostime
 	dev-ros/xmlrpcpp
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
diff --git a/dev-ros/topic_tools/topic_tools-9999.ebuild b/dev-ros/topic_tools/topic_tools-9999.ebuild
index a14a336c7fdc..8c28b2e72861 100644
--- a/dev-ros/topic_tools/topic_tools-9999.ebuild
+++ b/dev-ros/topic_tools/topic_tools-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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"
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
@@ -23,11 +22,14 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rostime
 	dev-ros/xmlrpcpp
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rosbash[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"