gentoo resync : 25.08.2020

5 files changed, 51 insertions, 68 deletions

diff --git a/dev-ros/tf_conversions/Manifest b/dev-ros/tf_conversions/Manifest
index 0b1d079c7b70..dbe1228bd967 100644
--- a/dev-ros/tf_conversions/Manifest
+++ b/dev-ros/tf_conversions/Manifest
@@ -1,6 +1,4 @@
-DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
-DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
-EBUILD tf_conversions-1.11.9-r1.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
-EBUILD tf_conversions-1.12.0.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
-EBUILD tf_conversions-9999.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
+DIST geometry-1.13.2.tar.gz 188225 BLAKE2B b08e78b298c94c38baa5d25a878be703d7d3a310277b66690b9fe4da1d0cd3f9083cf3bf6dc1d59149599b6fb0ec10feaf668206da245ed7e0cb9cf1878b620c SHA512 504de0e7ebf1dd73e918ab4fa39967cc9e39a53d487072430106b391d669ddfc7e530b66b38f4f73d1787e4a73acdad8e707c6757afe2e235157d4aa19f28af2
+EBUILD tf_conversions-1.13.2-r1.ebuild 920 BLAKE2B ff0f5bdf1a3956cbf688eb611f853952efd7ebaf5fefc40a845ebfc9f91f8c319f283120b64d280109631f478d8d36cf7252a3cc89c388b8823973d6ff6eabb3 SHA512 a76ecc61f4ad91392bc745cda8abbb6cc5ca6c802a968af3ff900006602eb4c11ea02bef0d5a371ee58e5d2e348927faa655c748441fd8eeeb2e2cd2dadcf0c3
+EBUILD tf_conversions-9999.ebuild 920 BLAKE2B ff0f5bdf1a3956cbf688eb611f853952efd7ebaf5fefc40a845ebfc9f91f8c319f283120b64d280109631f478d8d36cf7252a3cc89c388b8823973d6ff6eabb3 SHA512 a76ecc61f4ad91392bc745cda8abbb6cc5ca6c802a968af3ff900006602eb4c11ea02bef0d5a371ee58e5d2e348927faa655c748441fd8eeeb2e2cd2dadcf0c3
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf_conversions/tf_conversions-1.11.9-r1.ebuild b/dev-ros/tf_conversions/tf_conversions-1.11.9-r1.ebuild
deleted file mode 100644
index 9e9aa0f339c9..000000000000
--- a/dev-ros/tf_conversions/tf_conversions-1.11.9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/kdl_conversions
-	dev-ros/tf[${PYTHON_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-cpp/eigen:3
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild b/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
deleted file mode 100644
index 9e9aa0f339c9..000000000000
--- a/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/kdl_conversions
-	dev-ros/tf[${PYTHON_USEDEP}]
-	sci-libs/orocos_kdl:=
-	dev-cpp/eigen:3
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf_conversions/tf_conversions-1.13.2-r1.ebuild b/dev-ros/tf_conversions/tf_conversions-1.13.2-r1.ebuild
new file mode 100644
index 000000000000..c717bec23799
--- /dev/null
+++ b/dev-ros/tf_conversions/tf_conversions-1.13.2-r1.ebuild
@@ -0,0 +1,33 @@
+# 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="Functions to convert common tf datatypes into those used by other libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/kdl_conversions
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+	sci-libs/orocos_kdl:=
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-cpp/gtest
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/tf_conversions/tf_conversions-9999.ebuild b/dev-ros/tf_conversions/tf_conversions-9999.ebuild
index 9e9aa0f339c9..c717bec23799 100644
--- a/dev-ros/tf_conversions/tf_conversions-9999.ebuild
+++ b/dev-ros/tf_conversions/tf_conversions-9999.ebuild
@@ -1,27 +1,33 @@
-# Copyright 1999-2018 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="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
+DESCRIPTION="Functions to convert common tf datatypes into those used by other libraries"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/kdl_conversions
-	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
 	sci-libs/orocos_kdl:=
-	dev-cpp/eigen:3
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-cpp/gtest
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"