From cf64eac86ab41ef2523defcacd4207c0fccb94e9 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Wed, 29 Jul 2020 14:52:35 +0200
Subject: dev-ros/tf: stop using yaml.load

Fixes tests

Closes: https://bugs.gentoo.org/623656
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---
 dev-ros/tf/files/yaml.patch    | 13 +++++++++++++
 dev-ros/tf/tf-1.13.2-r1.ebuild | 40 ++++++++++++++++++++++++++++++++++++++++
 dev-ros/tf/tf-1.13.2.ebuild    | 39 ---------------------------------------
 dev-ros/tf/tf-9999.ebuild      |  1 +
 4 files changed, 54 insertions(+), 39 deletions(-)
 create mode 100644 dev-ros/tf/files/yaml.patch
 create mode 100644 dev-ros/tf/tf-1.13.2-r1.ebuild
 delete mode 100644 dev-ros/tf/tf-1.13.2.ebuild

diff --git a/dev-ros/tf/files/yaml.patch b/dev-ros/tf/files/yaml.patch
new file mode 100644
index 000000000000..344ef80417ae
--- /dev/null
+++ b/dev-ros/tf/files/yaml.patch
@@ -0,0 +1,13 @@
+Index: tf/src/tf/listener.py
+===================================================================
+--- tf.orig/src/tf/listener.py
++++ tf/src/tf/listener.py
+@@ -94,7 +94,7 @@ class Transformer(object):
+ 
+     def getFrameStrings(self):
+         """ Not a recommended API, only here for backwards compatibility """
+-        data = yaml.load(self._buffer.all_frames_as_yaml()) or {}
++        data = yaml.safe_load(self._buffer.all_frames_as_yaml()) or {}
+         return [p for p, _ in data.items()]
+ 
+     def getLatestCommonTime(self, source_frame, dest_frame):
diff --git a/dev-ros/tf/tf-1.13.2-r1.ebuild b/dev-ros/tf/tf-1.13.2-r1.ebuild
new file mode 100644
index 000000000000..360303d8a915
--- /dev/null
+++ b/dev-ros/tf/tf-1.13.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/angles
+	dev-ros/message_filters
+	dev-ros/rosconsole
+	dev-ros/rostime
+	dev-ros/roscpp
+	dev-ros/tf2_ros
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/tf/tf-1.13.2.ebuild b/dev-ros/tf/tf-1.13.2.ebuild
deleted file mode 100644
index 6f018ff01c10..000000000000
--- a/dev-ros/tf/tf-1.13.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/angles
-	dev-ros/message_filters
-	dev-ros/rosconsole
-	dev-ros/rostime
-	dev-ros/roscpp
-	dev-ros/tf2_ros
-	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
-	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	test? (
-		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-		dev-cpp/gtest
-		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
-	)"
diff --git a/dev-ros/tf/tf-9999.ebuild b/dev-ros/tf/tf-9999.ebuild
index 6f018ff01c10..360303d8a915 100644
--- a/dev-ros/tf/tf-9999.ebuild
+++ b/dev-ros/tf/tf-9999.ebuild
@@ -37,3 +37,4 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
+PATCHES=( "${FILESDIR}/yaml.patch" )
-- 
cgit v1.2.3-65-gdbad