gentoo resync : 04.08.2018

4 files changed, 32 insertions, 65 deletions

diff --git a/dev-ros/base_local_planner/Manifest b/dev-ros/base_local_planner/Manifest
index 84296934cf83..b13d31a00513 100644
--- a/dev-ros/base_local_planner/Manifest
+++ b/dev-ros/base_local_planner/Manifest
@@ -1,6 +1,4 @@
-DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-DIST navigation-1.15.2.tar.gz 348985 BLAKE2B 866779425828b1e4c3a044654ae41f33643646ca70cf6841f23bce265add2c420bf0934a41a6b29fa65fc421228a31dc15e9fb0f6cc4295ce12adbbb627b43d4 SHA512 582422756b31b4d83e929e3c723e7205e772b9775fcf618c9bd5d3c54af1f20e9bc8a0143626750c0c3cffeb0cbea8f8706b7e66f62dc037cfe12b05f23ee142
-EBUILD base_local_planner-1.15.1-r1.ebuild 825 BLAKE2B ff31bd17f30f5765222382e4ea78249ab240047035f6b4e3e0052bdb4ff367d9241325b09e520adad1e1477a375c300a4a0e7053e0a6806c3e77038def46be9c SHA512 bf994cf2b4d063044fa89d54d59e247e42b53294ae9a201efe25dcb66dfda799173ae6b31a2894aafec2e4f7791ba7bc8e03c7fda32791b34e3bea48fe1c3878
-EBUILD base_local_planner-1.15.2.ebuild 825 BLAKE2B 9e57b6d8f514fb91f4b3c27f0d0ce91df5cd30464c3b4d4fc899399251fef895cc9c02a88b3d9c48d2b00e61f65043462514cebec2ea0efd266b2b6f8219995f SHA512 dbb12ee0a08642ea6a209f7259292de6934e9ae96ca6babf7ff09d4d2f566baa4bf1f8060575e9b7c01e791e1a2828c2ad20e25c38654ed471c2d7444f2f0480
-EBUILD base_local_planner-9999.ebuild 825 BLAKE2B ff31bd17f30f5765222382e4ea78249ab240047035f6b4e3e0052bdb4ff367d9241325b09e520adad1e1477a375c300a4a0e7053e0a6806c3e77038def46be9c SHA512 bf994cf2b4d063044fa89d54d59e247e42b53294ae9a201efe25dcb66dfda799173ae6b31a2894aafec2e4f7791ba7bc8e03c7fda32791b34e3bea48fe1c3878
+DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
+EBUILD base_local_planner-1.16.1.ebuild 1088 BLAKE2B 07d1c699b36f6288a8c464d22428b45032b14e0139a3615f6b0ce2b0d772a33fc9894271c754f4c06a9f917e11b0b078a057f32c02e8e7d9872fdbfebc7ee65b SHA512 7c0a4f6750e3be9f4a480791a44d19fddc588061fb6f8dbeb0641b7b64e7a3f3204b0a21446a568f81391fd266004ec0aed55ac9e655252be87af0e4d20619b5
+EBUILD base_local_planner-9999.ebuild 1088 BLAKE2B 07d1c699b36f6288a8c464d22428b45032b14e0139a3615f6b0ce2b0d772a33fc9894271c754f4c06a9f917e11b0b078a057f32c02e8e7d9872fdbfebc7ee65b SHA512 7c0a4f6750e3be9f4a480791a44d19fddc588061fb6f8dbeb0641b7b64e7a3f3204b0a21446a568f81391fd266004ec0aed55ac9e655252be87af0e4d20619b5
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/base_local_planner/base_local_planner-1.15.1-r1.ebuild b/dev-ros/base_local_planner/base_local_planner-1.15.1-r1.ebuild
deleted file mode 100644
index b65fa9b3d54e..000000000000
--- a/dev-ros/base_local_planner/base_local_planner-1.15.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pcl_conversions
-	dev-ros/rostest
-	dev-ros/costmap_2d
-	dev-ros/pluginlib
-	dev-ros/angles
-	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	sci-libs/pcl
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-cpp/gtest )
-"
diff --git a/dev-ros/base_local_planner/base_local_planner-1.15.2.ebuild b/dev-ros/base_local_planner/base_local_planner-1.16.1.ebuild
index a093f607b110..459e749a5fbb 100644
--- a/dev-ros/base_local_planner/base_local_planner-1.15.2.ebuild
+++ b/dev-ros/base_local_planner/base_local_planner-1.16.1.ebuild
@@ -17,21 +17,24 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
+	dev-ros/angles
+	>=dev-ros/costmap_2d-1.16
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pcl_conversions
-	dev-ros/rostest
-	dev-ros/costmap_2d
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/nav_core-1.16
 	dev-ros/pluginlib
-	dev-ros/angles
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/voxel_grid
 	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	sci-libs/pcl
-	dev-libs/console_bridge:=
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
-	test? ( dev-cpp/gtest )
+	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
 "
diff --git a/dev-ros/base_local_planner/base_local_planner-9999.ebuild b/dev-ros/base_local_planner/base_local_planner-9999.ebuild
index b65fa9b3d54e..459e749a5fbb 100644
--- a/dev-ros/base_local_planner/base_local_planner-9999.ebuild
+++ b/dev-ros/base_local_planner/base_local_planner-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,21 +17,24 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
+	dev-ros/angles
+	>=dev-ros/costmap_2d-1.16
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/pcl_conversions
-	dev-ros/rostest
-	dev-ros/costmap_2d
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/nav_core-1.16
 	dev-ros/pluginlib
-	dev-ros/angles
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/voxel_grid
 	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	sci-libs/pcl
-	dev-libs/console_bridge:=
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
-	test? ( dev-cpp/gtest )
+	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
 "