gentoo resync : 25.08.2020

4 files changed, 56 insertions, 42 deletions

diff --git a/dev-ros/laser_geometry/Manifest b/dev-ros/laser_geometry/Manifest
index 97717f991e41..f660a8b02d97 100644
--- a/dev-ros/laser_geometry/Manifest
+++ b/dev-ros/laser_geometry/Manifest
@@ -1,4 +1,4 @@
-DIST laser_geometry-1.6.4.tar.gz 16251 BLAKE2B ca19bde86a1669d6981651d81ff4c62ad0467e262065113612ee4dd30a05c40ddbddfb84800ea3411697e21a61d84daf7a2cd97c712833b44d7fe8183286c24b SHA512 5c490a30696c0b0a30b826a605b5f09849a971792d60b273491e1deb66b399dfb4c9a37c114c38294799064b2f4532bb6b0119664cd064a4ce9045f18ebd2736
-EBUILD laser_geometry-1.6.4.ebuild 735 BLAKE2B 0f25948dc9e8bad2cea0161794a9c46c14b3d5cad24d90756e9695e10edcc8ea2eec7f6c2c75cf722e4c3a4c114d84e0bb8e7d11993778871c107853a8ec2182 SHA512 1e57c2d28abee27463292c2ba4d61e49798eb061d7a1966d1a12a54319c07912de68cbac934d1abcab858785ca374355910a24e9ed8b20f53c4a5c694babf7bf
-EBUILD laser_geometry-9999.ebuild 735 BLAKE2B 0f25948dc9e8bad2cea0161794a9c46c14b3d5cad24d90756e9695e10edcc8ea2eec7f6c2c75cf722e4c3a4c114d84e0bb8e7d11993778871c107853a8ec2182 SHA512 1e57c2d28abee27463292c2ba4d61e49798eb061d7a1966d1a12a54319c07912de68cbac934d1abcab858785ca374355910a24e9ed8b20f53c4a5c694babf7bf
+DIST laser_geometry-1.6.5.tar.gz 17057 BLAKE2B 3894410f84d2aa76e57e894b6b601acf7d06d5603fbf8ccaaec8db28d9744b2435809ed1eb566b5e7e085be5c300b2cef3e718c1d551bd18e73e5310da232c4c SHA512 324391386d29a1599965e66b95cd48f5b1134df3d7a8589f528e3f476b897530f823bc32c02d4e02d89ce20aa0df76c0238b7522d9f7752f296662623de66041
+EBUILD laser_geometry-1.6.5.ebuild 914 BLAKE2B 5a2e5482882ed2f9f1fe5957e2c4fb2aefc0dc991342a154a85130a5d1dd6e3d2156eef1e5ab2ebbf57b15d55a4e247cf558290101a69a6980fd0bc2ebcff540 SHA512 054b59d0692774508359c3b34f26ca11521242f3b30200f196073901d4bdd9d2680a0f16b4fe5cf39263e38c8166f58b86bc7a4866fb514bac6545358e95476e
+EBUILD laser_geometry-9999.ebuild 914 BLAKE2B 5a2e5482882ed2f9f1fe5957e2c4fb2aefc0dc991342a154a85130a5d1dd6e3d2156eef1e5ab2ebbf57b15d55a4e247cf558290101a69a6980fd0bc2ebcff540 SHA512 054b59d0692774508359c3b34f26ca11521242f3b30200f196073901d4bdd9d2680a0f16b4fe5cf39263e38c8166f58b86bc7a4866fb514bac6545358e95476e
 MISC metadata.xml 343 BLAKE2B a797ebc84630a2db52e772c1d06a4df97d824941660a1e3a1709ba0498c20bbd300e794ee550e47727bb6bfb1d836b08ec63729be7ae439696bfd1035e5ae707 SHA512 7d4f2ddb636794d8d0b493ea1ef5a06b2cfac3bb5fb18f6daf174f16d719d9ceea5eca29762596dca085c94d3e1ab7a49047a8410933505521f0dbceb8c50b9f
diff --git a/dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild b/dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild
deleted file mode 100644
index 4fdcc7652d02..000000000000
--- a/dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_geometry"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Class for converting from a 2D laser scan into a point cloud"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
-	dev-ros/tf
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
-	dev-cpp/eigen:3
-	dev-ros/angles
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild b/dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild
new file mode 100644
index 000000000000..29bb835d8b1a
--- /dev/null
+++ b/dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild
@@ -0,0 +1,36 @@
+# 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-perception/laser_geometry"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Class for converting from a 2D laser scan into a point cloud"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/tf2[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=[threads]
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
+BDEPEND="
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/laser_geometry/laser_geometry-9999.ebuild b/dev-ros/laser_geometry/laser_geometry-9999.ebuild
index 4fdcc7652d02..29bb835d8b1a 100644
--- a/dev-ros/laser_geometry/laser_geometry-9999.ebuild
+++ b/dev-ros/laser_geometry/laser_geometry-9999.ebuild
@@ -1,10 +1,9 @@
-# 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
 ROS_REPO_URI="https://github.com/ros-perception/laser_geometry"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -14,16 +13,24 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	dev-ros/angles
 	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-libs/boost:=[threads]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/tf
-	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/boost:=[threads]
 	dev-cpp/eigen:3
-	dev-ros/angles
 "
 DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
+BDEPEND="
 	dev-ros/cmake_modules
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+"