gentoo resync : 25.08.2020

6 files changed, 71 insertions, 83 deletions

diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
index b7c6a63fa00b..a8f202cc07b4 100644
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@@ -1,5 +1,5 @@
-AUX boost.patch 974 BLAKE2B 77e8a170d7d6dcec9e41e32443abf512d735c0cbb82bc160883e14dad45136818fbe47e34813bf7abe328fca4549c92b5c1041c83a33a5ea63145abb1e8f9431 SHA512 272b7ea812a7a65d415fb8dc845f23cb969391a10e5035b759e48f1fe31466248ffece658f2323a3e3e0ce6b7bfef6ae6e4d0014e8a8a926755e98a9c96783fc
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD tf-1.12.0.ebuild 1041 BLAKE2B bafd8e43f109f7127ce19e48a0d31e44ab91b8027ef02c0c7b86ba0159671ffca727c701e38844e6694c2313de3bd5655a9c94fe9780260507c8c1e35a3643b2 SHA512 8ec179d1f944810777444059a15c395be28c2329c7600d8696f3c99ca56e1d1edf09de48010cab9c05265c346e3dd6afeb95a2f188e6fe1954fee0de3dfa3275
-EBUILD tf-9999.ebuild 1006 BLAKE2B 67006c1c0fc77a0449be9d829464d1efad49aa0e503d96df900e3c288350dd1d140fd2b22bdd76eaa6e3973ef83642251c2ef3218f02492e6d637e903992983e SHA512 980971c39495ef9679810efa1cce7ac029ea92b2fe09031a8dd52d346c37770caf5717641d548b200b42dbce2b4c21dd64d3363794e3fd904c441753fcbd65ac
+AUX yaml.patch 559 BLAKE2B 228004c7cc268ebe011dfc8f83aeec9a32e98566c970b7e94b8fcd19879ad1974038fdee9b850ca7bebc770e96cf8b81a92ae9583188191de86e7d5a4100b835 SHA512 67f8aeee746fc3137310fc5eb127d8dc12be2c33b38b2237b6889f7837d2637125394ebe5d22c6dfee28787fecf0cf48be3168c09a50c435dde7040eed39dfc3
+DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
+EBUILD tf-1.13.2-r1.ebuild 1113 BLAKE2B f03f680d5d9be8be0b24ea486140860d0d5912a1fc81cf79fabb51ede3250ab115e22e38fd4b1f5cbad1b25642926b0bc7926750d4340cf587c0d531684ec9fd SHA512 ee8eb935a5e933686f6bba5ba9004790c7933eb2941159bc1659632ac264ba925fe1bbfb60c370a01b5df92a83ddd82be07fa6da9a3f35ebe98e1a22509acf32
+EBUILD tf-9999.ebuild 1113 BLAKE2B f03f680d5d9be8be0b24ea486140860d0d5912a1fc81cf79fabb51ede3250ab115e22e38fd4b1f5cbad1b25642926b0bc7926750d4340cf587c0d531684ec9fd SHA512 ee8eb935a5e933686f6bba5ba9004790c7933eb2941159bc1659632ac264ba925fe1bbfb60c370a01b5df92a83ddd82be07fa6da9a3f35ebe98e1a22509acf32
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf/files/boost.patch b/dev-ros/tf/files/boost.patch
deleted file mode 100644
index dd926cf05848..000000000000
--- a/dev-ros/tf/files/boost.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2eed72cb7b63fc4ee98af695c625d9a741a09897 Mon Sep 17 00:00:00 2001
-From: Maarten de Vries <maarten@de-vri.es>
-Date: Thu, 17 Jan 2019 21:40:28 +0100
-Subject: [PATCH] Remove `signals` from find_package(Boost COMPONENTS ...)
-
-tf is using signals2, which is not the same library as signals.
-Additionally, signals2 has always been header only, and header only
-libraries must not be listed in find_package.
-
-Boost 1.69 removed the old signals library entirely, so the otherwise
-useless `COMPONENTS signals` actually breaks the build.
----
- tf/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
-index 04dcb4e8..b469f658 100644
---- a/tf/CMakeLists.txt
-+++ b/tf/CMakeLists.txt
-@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS
-     std_msgs
-     tf2_ros
- )
--find_package(Boost REQUIRED COMPONENTS thread signals system)
-+find_package(Boost REQUIRED COMPONENTS thread system)
- 
- catkin_python_setup()
- 
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.12.0.ebuild b/dev-ros/tf/tf-1.12.0.ebuild
deleted file mode 100644
index 201cf57ee6b6..000000000000
--- a/dev-ros/tf/tf-1.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Maintains the relationship between coordinate frames in a tree structure buffered in 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_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-PATCHES=( "${FILESDIR}/boost.patch" )
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-9999.ebuild b/dev-ros/tf/tf-9999.ebuild
index 8268c23d3c0d..360303d8a915 100644
--- a/dev-ros/tf/tf-9999.ebuild
+++ b/dev-ros/tf/tf-9999.ebuild
@@ -1,16 +1,15 @@
-# 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
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/geometry"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Maintains the relationship between coordinate frames in a tree structure buffered in time"
+DESCRIPTION="Maintains the relationship between frames in a tree structure over time"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -23,16 +22,19 @@ RDEPEND="
 	dev-ros/rostime
 	dev-ros/roscpp
 	dev-ros/tf2_ros
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	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_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 	)"
+PATCHES=( "${FILESDIR}/yaml.patch" )