gentoo resync : 25.08.2020

6 files changed, 14 insertions, 118 deletions

diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index a2105d3d7329..aad597d3d0d1 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,8 +1,6 @@
-AUX yaml.patch 895 BLAKE2B 983493cadf83e5eee7646769ddc8560bbcff3756ebdb77f4365e0a3e10d97b104c4a6ec3ceb0d7e3504502c250cc21ee07b3f5582e3521a5eafe7f5925c622a1 SHA512 92a6ba5660b2cc0a490477d4e4fd39ebbd95912804d5c32c76eec5dc4fc5a67e043dc9cce2ee13d44c623b7a7b710d045fabd68ff3968d2e5ea555d97eb219f2
-AUX yaml2.patch 3279 BLAKE2B 8ca2d9dcd99eeefe7ca2c5039a894bfcda02586995a2982c8f6ea6ac61c19c16325e53bd0733b1c3272160f3dd572ed8aa5c754ad7d182adfc8e85f7b39e0c99 SHA512 23856b931f203fc3c0adfddbcc3c94ea1b827eb2a1f8550d130ac25abdb09a2167da5f4ae9aaf9d869326a80f1964e0f5a00e68895133fb101e4accdf6f5a4c4
-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 rosparam-1.14.3-r1.ebuild 562 BLAKE2B 77a1ff5ef7d1035009421bd5582e5bea52ea11e5fdbb45349ef37a4c46449aac66333e16b89158e367ee2e379cd94c3a8dd11f23339a498c2d10ec8cd3b6cebf SHA512 d3056a70cbf9903d22f9d5d76b243d6f98aa50563a9be7248972dbd1cbca4570e922a304af8555be8c47254732f2a2aa7973c5fffa27b5a5a4118fddb721325a
-EBUILD rosparam-1.15.4.ebuild 499 BLAKE2B 44b8e57ab8d44f3f014c3a04520698fd27495d948c7423720a9d3b4f92f227bc782319d90f20a87b3389381127f6f405630c6138e62e5c0e8745ce3e9072ebaf SHA512 902d85db77f75bc112fb01ff608994c4c98fbd6b862a0f195a88956a0319752cacbf0ec314a41af8f2f5e9ec9b2da842a674154db60012c624d8dc91b3428546
-EBUILD rosparam-9999.ebuild 499 BLAKE2B 44b8e57ab8d44f3f014c3a04520698fd27495d948c7423720a9d3b4f92f227bc782319d90f20a87b3389381127f6f405630c6138e62e5c0e8745ce3e9072ebaf SHA512 902d85db77f75bc112fb01ff608994c4c98fbd6b862a0f195a88956a0319752cacbf0ec314a41af8f2f5e9ec9b2da842a674154db60012c624d8dc91b3428546
+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 rosparam-1.15.7.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
+EBUILD rosparam-1.15.8.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
+EBUILD rosparam-9999.ebuild 492 BLAKE2B acccae97699f0557ba8467d767f476a6ad54bfb5770437f1bab2a302aed2c30b3ec974c428c9077a34c5a997f6843fb9a7151651b74ff9fcc4acf4de1a5b03f1 SHA512 8856c8d723b12d48b6edc4bd4ecc69c9b3f277b38e949e843672a52766ede0c4e6a57c8fdec23cde3f9afa769caffe29acf7a2526496bbd37aabf8794cb3e75e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosparam/files/yaml.patch b/dev-ros/rosparam/files/yaml.patch
deleted file mode 100644
index a4ed42758f13..000000000000
--- a/dev-ros/rosparam/files/yaml.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 481ad19689561052afde658ab0c54c91b0e5e04a Mon Sep 17 00:00:00 2001
-From: Maxime St-Pierre <me@maximest-pierre.me>
-Date: Sun, 10 Nov 2019 06:27:40 -0500
-Subject: [PATCH] Fix #1833 change unsafe yaml.load to yaml.safe_load
-
----
- tools/rosparam/src/rosparam/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
-index 3279ab97d..fd8b0569f 100644
---- a/tools/rosparam/src/rosparam/__init__.py
-+++ b/tools/rosparam/src/rosparam/__init__.py
-@@ -368,7 +368,7 @@ def set_param(param, value, verbose=False):
-     :param param: parameter name, ``str``
-     :param value: yaml-encoded value, ``str``
-     """
--    set_param_raw(param, yaml.load(value), verbose=verbose)
-+    set_param_raw(param, yaml.safe_load(value), verbose=verbose)
- 
- def upload_params(ns, values, verbose=False):
-     """
diff --git a/dev-ros/rosparam/files/yaml2.patch b/dev-ros/rosparam/files/yaml2.patch
deleted file mode 100644
index 1e36844ee38c..000000000000
--- a/dev-ros/rosparam/files/yaml2.patch
+++ /dev/null
@@ -1,76 +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/rosparam/src/rosparam/__init__.py b/tools/rosparam/src/rosparam/__init__.py
-index 41b806711..3279ab97d 100644
---- a/tools/rosparam/src/rosparam/__init__.py
-+++ b/tools/rosparam/src/rosparam/__init__.py
-@@ -99,6 +99,7 @@ def construct_yaml_binary(loader, node):
- # register the (de)serializers with pyyaml
- yaml.add_representer(Binary,represent_xml_binary)
- yaml.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
-+yaml.SafeLoader.add_constructor(u'tag:yaml.org,2002:binary', construct_yaml_binary)
- 
- def construct_angle_radians(loader, node):
-     """
-@@ -185,7 +186,7 @@ def load_str(str, filename, default_namespace=None, verbose=False):
-     """
-     paramlist = []
-     default_namespace = default_namespace or get_ros_namespace()
--    for doc in yaml.load_all(str):
-+    for doc in yaml.safe_load_all(str):
-         if NS in doc:
-             ns = ns_join(default_namespace, doc.get(NS, None))
-             if verbose:
-@@ -633,10 +634,14 @@ def yamlmain(argv=None):
- 
- yaml.add_constructor(u'!radians', construct_angle_radians)
- yaml.add_constructor(u'!degrees', construct_angle_degrees)
-+yaml.SafeLoader.add_constructor(u'!radians', construct_angle_radians)
-+yaml.SafeLoader.add_constructor(u'!degrees', construct_angle_degrees)
- 
- # allow both !degrees 180, !radians 2*pi
- pattern = re.compile(r'^deg\([^\)]*\)$')
- yaml.add_implicit_resolver(u'!degrees', pattern, first="deg(")
-+yaml.SafeLoader.add_implicit_resolver(u'!degrees', pattern, first="deg(")
- pattern = re.compile(r'^rad\([^\)]*\)$')
- yaml.add_implicit_resolver(u'!radians', pattern, first="rad(")
-+yaml.SafeLoader.add_implicit_resolver(u'!radians', pattern, first="rad(")
- 
diff --git a/dev-ros/rosparam/rosparam-1.15.4.ebuild b/dev-ros/rosparam/rosparam-1.15.7.ebuild
index 07a0e27680c2..0e2d39275623 100644
--- a/dev-ros/rosparam/rosparam-1.15.4.ebuild
+++ b/dev-ros/rosparam/rosparam-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"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild b/dev-ros/rosparam/rosparam-1.15.8.ebuild
index f0fe1a56c7cf..0e2d39275623 100644
--- a/dev-ros/rosparam/rosparam-1.14.3-r1.ebuild
+++ b/dev-ros/rosparam/rosparam-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=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
@@ -16,8 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/yaml2.patch" )
diff --git a/dev-ros/rosparam/rosparam-9999.ebuild b/dev-ros/rosparam/rosparam-9999.ebuild
index 07a0e27680c2..0e2d39275623 100644
--- a/dev-ros/rosparam/rosparam-9999.ebuild
+++ b/dev-ros/rosparam/rosparam-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=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyyaml[\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}"