gentoo resync : 15.12.2019

10 files changed, 79 insertions, 198 deletions

diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index 6e8c9d663cf3..c160f3ae5207 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,18 +1,5 @@
-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 yaml.patch 3286 BLAKE2B ff83da906b271b957a63e89b26b7ab8b30abf8464635ac773a23d86a82d304ad09fcb9f78eba4f599655231ba59bb509fa89f146529f927742480eb4b777ca37 SHA512 85c1674cc7de77b08e8f632df97e772a325b5595086153690a289f8c2f33e9392ade4a17ab198969baf21f17f2e0414df4aefc2eb758866fa0da2ffe069f5ed0
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD test_rosparam-1.13.0.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.1.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.2.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.4.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.5.ebuild 503 BLAKE2B a18419f3e90f5af5413901969cefd6c1b53907748dc5da1156ec36de248c638b7e2ba3b8dd71ef8c46289d119dbb3bee7617acc0025cd0f9e8b84d1f6eba99d6 SHA512 c7858182460cfc4a85c2603f1e95252a63040349ac31c021307c42a951d1f3ab4b59d5c24f1fea1d0c10598060a253ac9423dd4100e1f85cbbb5211605b8b81d
-EBUILD test_rosparam-1.13.6.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
-EBUILD test_rosparam-1.14.2.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
-EBUILD test_rosparam-1.14.3.ebuild 503 BLAKE2B d782d1f52885c86ac50106fb19b07f9a2517a29dfa321f82e15b9ef0d0517586ce1fa0b7248aaadfa0d7e56d6c4a31ca852ad7c637e7bc2586b1f3537c879adf SHA512 b42629a3510b66d53f9e326d95aef7eb8545aecfd3e4277fb8e082982d9568334d082bb38a5e6901e2d68e9fb45b7b8a58a89df438ff345611113c316ee9c0ae
+EBUILD test_rosparam-1.14.3.ebuild 537 BLAKE2B ee1b480b906b2606b85c128dfe22e364187bb6866606623bb524e82d2be666bb59d5da501493dfe7fd0933a1c2037cc406802bd9fd2d020b2edce336b5a0dcb4 SHA512 7f6700c3584b8500757db238544252360b1426b7a1b863b15f33fde7a50f87e52f3915181df6db8ea80d7e8a353b1003bc0ca29c0689bfdf83ee2460349eb85e
 EBUILD test_rosparam-9999.ebuild 503 BLAKE2B e065bfcfa421c3de64ad8840a544eb4f427c3b2753b38b64960b51e4a9f432d7d3a6e8f2f4ef5303e47c0005e533deea5f34cd63369febb1f05ea3ac0bfb460f SHA512 a36d13dae004b782d566d5c7edf5ebe551c6e6a4d5213904824b1ccacfb61b24c437d01765fe96d584ffcc497fee7a3a630c3bbd45d0849fd0b460289ba8a654
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosparam/files/yaml.patch b/dev-ros/test_rosparam/files/yaml.patch
new file mode 100644
index 000000000000..48f2c1d5bb19
--- /dev/null
+++ b/dev-ros/test_rosparam/files/yaml.patch
@@ -0,0 +1,75 @@
+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/test/test_rosparam/test/check_rosparam.py b/test/test_rosparam/test/check_rosparam.py
+index 52ed976b5..fe8c03fb4 100755
+--- a/test/test_rosparam/test/check_rosparam.py
++++ b/test/test_rosparam/test/check_rosparam.py
+@@ -227,7 +227,7 @@ def test_rosparam_get(self):
+         with fakestdout() as b:
+             rosparam.yamlmain([cmd, 'get', "g1"])
+             import yaml
+-            d = yaml.load(b.getvalue())
++            d = yaml.safe_load(b.getvalue())
+             self.assertEquals(d['float'], 10.0)
+             self.assertEquals(d['int'], 10.0)
+             self.assertEquals(d['string'], "g1-foo-value")
+@@ -346,18 +346,18 @@ def test_rosparam_dump(self):
+         import yaml
+         with open(f_out) as b:
+             with open(f) as b2:
+-                self.assertEquals(yaml.load(b.read()), yaml.load(b2.read()))
++                self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read()))
+ 
+         rosparam.yamlmain([cmd, 'dump', '-v', f_out, 'rosparam_dump'])                
+         with open(f_out) as b:
+             with open(f) as b2:
+-                self.assertEquals(yaml.load(b.read()), yaml.load(b2.read()))
++                self.assertEquals(yaml.safe_load(b.read()), yaml.safe_load(b2.read()))
+ 
+         # yaml file and std_out should be the same
+         with fakestdout() as b:
+             rosparam.yamlmain([cmd, 'dump'])
+             with open(f) as b2:
+-                self.assertEquals(yaml.load(b.getvalue())['rosparam_dump'], yaml.load(b2.read()))
++                self.assertEquals(yaml.safe_load(b.getvalue())['rosparam_dump'], yaml.safe_load(b2.read()))
+ 
+     def test_fullusage(self):
+         import rosparam
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.0.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.0.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.1.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.1.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.2.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.2.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.4.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.4.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.5.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.5.ebuild
deleted file mode 100644
index 5e1ce7075a30..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild b/dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild
deleted file mode 100644
index 1c24d77d5702..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.13.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.14.2.ebuild b/dev-ros/test_rosparam/test_rosparam-1.14.2.ebuild
deleted file mode 100644
index 1c24d77d5702..000000000000
--- a/dev-ros/test_rosparam/test_rosparam-1.14.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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=test/${PN}
-CATKIN_HAS_MESSAGES=yes
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for rosparam"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-ros/rosparam[${PYTHON_USEDEP}]
-	)"
diff --git a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild b/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
index 1c24d77d5702..9deec865fa13 100644
--- a/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
+++ b/dev-ros/test_rosparam/test_rosparam-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,3 +24,4 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-ros/rosparam[${PYTHON_USEDEP}]
 	)"
+PATCHES=( "${FILESDIR}/yaml.patch" )