gentoo resync : 25.08.2020

5 files changed, 20 insertions, 78 deletions

diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index f2523aa6960e..2bb2fc72179f 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,7 +1,6 @@
-AUX yaml.patch 2320 BLAKE2B 2b59ccbd08c333df5b6ec603136ac94202da82eec17f13b4b84c1df66636d2fadf22eaacb5d24e7d00543358eb1f539ffa7c09498ed0afeda5ae5e382b17660f SHA512 de3f2c418f5d84f99af771634cca03e5982ca0a828f404fdfe62de2e8fac9cf4dcaf681e1892f37908568fd5b70f527c0f4f860e201ba330dda65b1e7098de30
-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 rospy-1.14.3-r1.ebuild 757 BLAKE2B e6a4dddf0d7316388b6c5de241c94be85680c212508f0301b13d140e51c007ace25e94f429d7c037e836f6da98986386b1b945c663ba18cda1cb4bd9e1bccea6 SHA512 00efa18957a3fb4f556c41a998e060888e1d5cb299e3a197c6a2a669c4996892e18ab9c92a4b93623d0b30ab8525108c1b8855b56bc797bba5e00f5f45d2e1a3
-EBUILD rospy-1.15.4.ebuild 720 BLAKE2B 718df093cd4d0c42aff4a245a6cc6f070aba7100e45f978fd3257b711b81e857547ee05665c48f7c9f36a813c6eb12fa26d594a9776ed3ddbdd7cfc7bfd3b342 SHA512 83e83ccd7a5a61df417dbc81f0a8691fc5265f76cb301329cad5d4fd35bc428cf7500479934081d69fed3e285ff28945c5f69943c2e7585e0d3ec343d58b9a42
-EBUILD rospy-9999.ebuild 720 BLAKE2B 718df093cd4d0c42aff4a245a6cc6f070aba7100e45f978fd3257b711b81e857547ee05665c48f7c9f36a813c6eb12fa26d594a9776ed3ddbdd7cfc7bfd3b342 SHA512 83e83ccd7a5a61df417dbc81f0a8691fc5265f76cb301329cad5d4fd35bc428cf7500479934081d69fed3e285ff28945c5f69943c2e7585e0d3ec343d58b9a42
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD rospy-1.15.7.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
+EBUILD rospy-1.15.8.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
+EBUILD rospy-9999.ebuild 727 BLAKE2B 896a986416606452c618e6a5b22900895844158a39f12de9adea1360895efadaf436dbf932373d82dfdf84da62c38b6a0fb53453b7dd47810f49cf1768cac0d5 SHA512 fd0517eebfcf2c58d894ad66e7a99371a942d955f7bf0b8db8e8fc81ce9a2be7abff9e82f66f843739358c8f431d74fa73e9185dcfd037cfc9c55a9804d9eb21
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rospy/files/yaml.patch b/dev-ros/rospy/files/yaml.patch
deleted file mode 100644
index e9e9aa8202a9..000000000000
--- a/dev-ros/rospy/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/clients/rospy/src/rospy/client.py b/clients/rospy/src/rospy/client.py
-index d543c53ac..c72d6d6f0 100644
---- a/clients/rospy/src/rospy/client.py
-+++ b/clients/rospy/src/rospy/client.py
-@@ -101,7 +101,7 @@ def load_command_line_node_params(argv):
-                 src, dst = [x.strip() for x in arg.split(rosgraph.names.REMAP)]
-                 if src and dst:
-                     if len(src) > 1 and src[0] == '_' and src[1] != '_':
--                        mappings[src[1:]] = yaml.load(dst)
-+                        mappings[src[1:]] = yaml.safe_load(dst)
-         return mappings
-     except Exception as e:
-         raise rospy.exceptions.ROSInitException("invalid command-line parameters: %s"%(str(e)))
diff --git a/dev-ros/rospy/rospy-1.15.4.ebuild b/dev-ros/rospy/rospy-1.15.7.ebuild
index ed13430b1e69..c15250f755ce 100644
--- a/dev-ros/rospy/rospy-1.15.4.ebuild
+++ b/dev-ros/rospy/rospy-1.15.7.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"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=clients/${PN}
 
 inherit ros-catkin
@@ -17,10 +16,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roscpp[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/rospy-1.14.3-r1.ebuild b/dev-ros/rospy/rospy-1.15.8.ebuild
index 72153d4c7f54..c15250f755ce 100644
--- a/dev-ros/rospy/rospy-1.14.3-r1.ebuild
+++ b/dev-ros/rospy/rospy-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"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=clients/${PN}
 
 inherit ros-catkin
@@ -17,14 +16,13 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roscpp[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/yaml.patch" )
 
 src_install() {
 	ros-catkin_src_install
diff --git a/dev-ros/rospy/rospy-9999.ebuild b/dev-ros/rospy/rospy-9999.ebuild
index ed13430b1e69..c15250f755ce 100644
--- a/dev-ros/rospy/rospy-9999.ebuild
+++ b/dev-ros/rospy/rospy-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"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=clients/${PN}
 
 inherit ros-catkin
@@ -17,10 +16,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roscpp[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roscpp[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"