gentoo resync : 25.08.2020

5 files changed, 62 insertions, 66 deletions

diff --git a/dev-ros/tf2_sensor_msgs/Manifest b/dev-ros/tf2_sensor_msgs/Manifest
index 86918131241e..3f24f4e11b19 100644
--- a/dev-ros/tf2_sensor_msgs/Manifest
+++ b/dev-ros/tf2_sensor_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST geometry2-0.6.3.tar.gz 167590 BLAKE2B 96ef84a40a8d75bbd3303774163b41d29086085cc175010731584ebfb71da87fa5264caf24c8b5b6b4450b9befc2625c6b118b8a60d032c78ce315554af74370 SHA512 f46ae3c9240073252d910e1e4b1f412ed4f534b2b3166852330ae82f1d37dde16527e12ef8a4140b41587ec664f83d8c2271376b606c55c51cee681c4d10b75b
-DIST geometry2-0.6.5.tar.gz 169353 BLAKE2B b1e710440eb9bbc1c6e2eb8af19c2d253ee891c0477583ef2572c24b917293b2ed9c205f001b28a114ae221e176d8a51e1df987b16e29e8bbba4ac396d5bf160 SHA512 b7cb6891a4f425d4c9ee0c65285bbb516e2c5fdf652fa6209df2bbd2172d95d2300250ba96dac221a553e00a0d3527ccf8b2fa7e487ad5bb6f47f3e08f74c81b
-EBUILD tf2_sensor_msgs-0.6.3.ebuild 669 BLAKE2B dcbbfed6d01622cb9180e5710c873c91b3c89f98b687ef997d6bde5b7a674d5ff28167690e058fb811f4c14abe98f0dae052e333bef7ad512f26da08b060f518 SHA512 5fd908cf73de8cac73082449f277cc8855eef78b3592ffd4f3ac103f2f441a71d4e625239781de015e7318ae44d9b47c4a72d28e2e70e21f18cec3ec17a31382
-EBUILD tf2_sensor_msgs-0.6.5.ebuild 666 BLAKE2B 8342c5fe47e91e18e7c69f7355db1292dcb479562eb02652a65a2a43cdc6eb01cc9cacfea7a74e983c9332ac0c4fe83467722e470579e2c45893951bfb28f9e0 SHA512 b4d0df4072c72bb654bd661aca9d9854e4921ac17eb6c18cba3e52b91597ea94c58e53cad6d7251b4d3924f9958cd82ea850cbc1228363873dd396244fc0ba47
-EBUILD tf2_sensor_msgs-9999.ebuild 669 BLAKE2B 421e0a9477b65e934283192c07b6e8f61fffceb9b563c6fb3da5b4206c1f9c5fbe3d48c277acf604166d014d212b1f3e04c721c692a2723d2112438c1278f325 SHA512 457c001966d6e995f0773f3c6faa15dce13f82f60de4adb4814c1cd624fb60e76cb0cd2c8fbde72dca2ae26fe6250c7c913cd9c26fd2c724df09589929de1db1
+DIST geometry2-0.7.2.tar.gz 174319 BLAKE2B 0f319055cf0a4c8a425c31abc981ee1aee3c77b9dae8e0ddae6a0c4bdf09c31373b8005cb05177374ae5a2139c0f49a4cfdd5b966f8e991827ca2c6e471dcdd2 SHA512 8c2ad4e67d4d7509c3d9a7ef781d454eeb570fbc29d201ece7d2613258b7bed2ba00398655901e2b5856b59acad94422dbb6ae1f0bd545b3a41353204c31d00b
+EBUILD tf2_sensor_msgs-0.7.2.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
+EBUILD tf2_sensor_msgs-9999.ebuild 950 BLAKE2B 8b3b0b8e5d2881e6be69be4f591ebf8ad8ed8650a0b7a42d2602cf585afa0ef55d155a32dbe6576385cf7a641123aa9acf96827c036996f1ebd6c772bf9bed32 SHA512 0954452ac651c00dcf005aecce75c6e839735cf3dcc48df90f8c4d152000841596bbc5749e8c7198665c0c9f13c6a7af9bc1814a8ffd7dd1e1c8842a492434af
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.3.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.3.ebuild
deleted file mode 100644
index b4c841429ce6..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.3.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/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.5.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.5.ebuild
deleted file mode 100644
index 48bdaf11cbeb..000000000000
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/geometry2"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild
new file mode 100644
index 000000000000..b6d6fb7ff23f
--- /dev/null
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.7.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+		dev-cpp/gtest
+	)
+	dev-ros/cmake_modules
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
index 9d28f70aecb0..b6d6fb7ff23f 100644
--- a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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/geometry2"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,12 +14,25 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/tf2
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	dev-ros/cmake_modules"
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+		dev-cpp/gtest
+	)
+	dev-ros/cmake_modules
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-cpp/eigen:3
+"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}