gentoo resync : 30.12.2017

5 files changed, 5 insertions, 83 deletions

diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
index 1d10f10d1cfe..12fb8bee8f97 100644
--- a/dev-ros/navfn/Manifest
+++ b/dev-ros/navfn/Manifest
@@ -1,9 +1,5 @@
 AUX pgm_h_location.patch 900 BLAKE2B 2816bc6803bce70d14f5fcf10161316961ffd265d94a36e90f7d98bd381a4966bd924e352cda2f859e07ea25547e62e0d6381afa1fa3b488364634b20730830c SHA512 4c3286e18d922d292858e8fc574cc440c344ae182133539efca93cb25e16dc78149efe521499024751a46f2b4d1b63516276f1e0510028114357520d4a560d81
-DIST navigation-1.14.0.tar.gz 340196 BLAKE2B 9338af98d1eb88e6bd79aa4f4c186ac6dc1c52b0f024286264f62e487f8e2236cff81397ccb8b828e4e000c0d05bc93963c979975089220b49cf980f465b643d SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a
-DIST navigation-1.14.2.tar.gz 345166 BLAKE2B 4c54f975088e3f99102f7bb1ef500909b16218e48db97a875f8b980dfe1bfd51d51eccab308ba7a3d5bee444de7d9e9fdf7d6477583739740ad13e7f0c35d1ea SHA512 6477104a330a20722fde1634a0d51b1706c9705b4b9415aa9703c99a61d2ce3de97caba24a6b667897e842490c15a6bf2cdbb2f51341febf29d0475b4c0f384b
 DIST navigation-1.15.1.tar.gz 346480 BLAKE2B 29f9a0b6f2c62bd21a7cb87a64b490c845bb7db4af338fd094744abb22402df7eedc8c164b64f93f2d67dabaff99ca3b946b45e93173bed74834d9e3668726ad SHA512 25c5093bf7acca9d15d46bb2d0ae7e4ce0fa45f18b32d1626668dcbd33732317e8535b978e7225d86391472c517f05acb7736f31a7c511c8736ab8a22c7af4b0
-EBUILD navfn-1.14.0-r1.ebuild 886 BLAKE2B 81f518cb49795c9597144580ea0e4ac2014057c598e8f450239be9a1e9fd6f3d12039e10801b2dfa82c840759aca36f940001b6df79721d770ef20c1784fe05b SHA512 1cef5fdbb3d2bafd9949950e879196ef7def286f7c78b0bf7bfbee0b9815fffc5f4cf9f2c616f80fc4062ab30905995db4082c85a5a12b511e66e1eb741fcc20
-EBUILD navfn-1.14.2.ebuild 886 BLAKE2B 1689679793959c2d0c7680a5472e8b871e90a600967fe0f30ceeac32303871b77371c9aa7e71c05ce124ea649502baae36c0a938ad7af7ff9f4d526d8de2bc35 SHA512 56d921e932d646fb447c5ef6902f71081a5fdb1a6deb6592ad7b51eb817bffdff7bc4a45dd0bf051f5b56040ed1bc3aa0d1e8356b87562fb4b87f649be4b80c1
-EBUILD navfn-1.15.1.ebuild 886 BLAKE2B 1689679793959c2d0c7680a5472e8b871e90a600967fe0f30ceeac32303871b77371c9aa7e71c05ce124ea649502baae36c0a938ad7af7ff9f4d526d8de2bc35 SHA512 56d921e932d646fb447c5ef6902f71081a5fdb1a6deb6592ad7b51eb817bffdff7bc4a45dd0bf051f5b56040ed1bc3aa0d1e8356b87562fb4b87f649be4b80c1
-EBUILD navfn-9999.ebuild 886 BLAKE2B 81f518cb49795c9597144580ea0e4ac2014057c598e8f450239be9a1e9fd6f3d12039e10801b2dfa82c840759aca36f940001b6df79721d770ef20c1784fe05b SHA512 1cef5fdbb3d2bafd9949950e879196ef7def286f7c78b0bf7bfbee0b9815fffc5f4cf9f2c616f80fc4062ab30905995db4082c85a5a12b511e66e1eb741fcc20
+EBUILD navfn-1.15.1-r1.ebuild 913 BLAKE2B 9d84a8b7bc87825f8593a325f2d39ae0146edd6d299d0b4f5151e3f7f4486d837fb4c577162efa08a92e43fd6d0041b87ec403fe00b309554d97d74eee7a72c4 SHA512 f6cfd0c8a4abf07ee4440fa5bb399d6ac6295427356f2dace3728b87c01e0e359917900218b3723ee60fad37672e41b328a9c5109cff4b640a58b16b27108f54
+EBUILD navfn-9999.ebuild 913 BLAKE2B 9d84a8b7bc87825f8593a325f2d39ae0146edd6d299d0b4f5151e3f7f4486d837fb4c577162efa08a92e43fd6d0041b87ec403fe00b309554d97d74eee7a72c4 SHA512 f6cfd0c8a4abf07ee4440fa5bb399d6ac6295427356f2dace3728b87c01e0e359917900218b3723ee60fad37672e41b328a9c5109cff4b640a58b16b27108f54
 MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/navfn/navfn-1.14.0-r1.ebuild b/dev-ros/navfn/navfn-1.14.0-r1.ebuild
deleted file mode 100644
index d3e9e756c94a..000000000000
--- a/dev-ros/navfn/navfn-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/nav_core
-	dev-ros/pcl_conversions
-	dev-ros/pcl_ros
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/visualization_msgs
-	dev-cpp/eigen:3
-	sci-libs/pcl
-	x11-libs/fltk
-	media-libs/netpbm
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/navfn/navfn-1.14.2.ebuild b/dev-ros/navfn/navfn-1.15.1-r1.ebuild
index 26ee875ac6dc..66cdbd1cb7d1 100644
--- a/dev-ros/navfn/navfn-1.14.2.ebuild
+++ b/dev-ros/navfn/navfn-1.15.1-r1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
 	x11-libs/fltk
 	media-libs/netpbm
 	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )
diff --git a/dev-ros/navfn/navfn-1.15.1.ebuild b/dev-ros/navfn/navfn-1.15.1.ebuild
deleted file mode 100644
index 26ee875ac6dc..000000000000
--- a/dev-ros/navfn/navfn-1.15.1.ebuild
+++ /dev/null
@@ -1,38 +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"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/nav_core
-	dev-ros/pcl_conversions
-	dev-ros/pcl_ros
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/visualization_msgs
-	dev-cpp/eigen:3
-	sci-libs/pcl
-	x11-libs/fltk
-	media-libs/netpbm
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/navfn/navfn-9999.ebuild b/dev-ros/navfn/navfn-9999.ebuild
index d3e9e756c94a..66cdbd1cb7d1 100644
--- a/dev-ros/navfn/navfn-9999.ebuild
+++ b/dev-ros/navfn/navfn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,6 +30,7 @@ RDEPEND="
 	x11-libs/fltk
 	media-libs/netpbm
 	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )