gentoo resync : 30.12.2017

5 files changed, 6 insertions, 139 deletions

diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 88bfd9139001..8385b156aa08 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,8 +1,4 @@
-DIST rviz-1.12.11.tar.gz 4550851 BLAKE2B f87106335aa4d0e78b47eab032d7f5e6cbd40c878d394e0ce8f12fc79dba5260277be22624c92a8adc2b2342c4f4f5550ba967b796a60766b8c808660d22fd59 SHA512 0eb5c35b658a56b6f17c741ec8b704aa9651c45a01707aff00dca51b3eebd15827c4fbef60cb2f75028c920a9d6ed4779eb6a9645a9a43a12f5e568a43300793
-DIST rviz-1.12.13.tar.gz 5086771 BLAKE2B e19fd4c5e9001fbb425baf6b650adb45037c9662ed8602c2d4a95be4f62cf02c023c480ca83b2b9ab3b84ff9b65f208c0515b174d32963a322085ebb44af5649 SHA512 f9f76308f2c7f973e95a6b410850f55489ed65027004fe080e8f39be79d4cc142657825ae93b0f06ef299ae75fb42a018add6afa8e7f132f89418b21eadd1980
 DIST rviz-1.12.14.tar.gz 5087682 BLAKE2B 0ff42da139419b819e224459826d0bcc49bb70c9ca1c878487abee188321030f1c5535ff3ce7a1462b6946f2a9eac1cc1022f31289c5d138b0a64cef213228bc SHA512 748e3daf3fef53086f9056532e1fc9d3ca5a9130656b880487b50a557115e603ad843dd7f363241eb0b4d300f9fbe601fbd645f1e629ac2760a8a54666028e68
-EBUILD rviz-1.12.11.ebuild 1623 BLAKE2B 713cb2be64247f15654ef4cb62b599715dafb680533c913f34bf3beff161759f3de0d98bae5d7373d93f328662a47f8c886b192f18a9a0e518cf54ace4bff014 SHA512 fed122023589a879c9902d9704a7fd88583177e8e130fa1234e71327a32ae1d3f371f770a829728e28839eb37b5361bbaba71a1ba1218117726cc3b9a5cce1e0
-EBUILD rviz-1.12.13.ebuild 1643 BLAKE2B 5db07dd4eff1a3d3700a35571e1b45ce86793c1daca610721776ec0f41cfe5d8d3a0af01c11cc8d86d61ae02c3530d2d65274d109eb9c31c9477beb58f746e6b SHA512 fd51cb5e46cd822b9dc5d2612aca11c766b317617493bf5bdbc52dd45be249a1d160c64bbaec39c3f49f568bf431fbc1e84903e0100723e26c1e07b9ef0e43f9
-EBUILD rviz-1.12.14.ebuild 1643 BLAKE2B 5db07dd4eff1a3d3700a35571e1b45ce86793c1daca610721776ec0f41cfe5d8d3a0af01c11cc8d86d61ae02c3530d2d65274d109eb9c31c9477beb58f746e6b SHA512 fd51cb5e46cd822b9dc5d2612aca11c766b317617493bf5bdbc52dd45be249a1d160c64bbaec39c3f49f568bf431fbc1e84903e0100723e26c1e07b9ef0e43f9
-EBUILD rviz-9999.ebuild 1643 BLAKE2B 5db07dd4eff1a3d3700a35571e1b45ce86793c1daca610721776ec0f41cfe5d8d3a0af01c11cc8d86d61ae02c3530d2d65274d109eb9c31c9477beb58f746e6b SHA512 fd51cb5e46cd822b9dc5d2612aca11c766b317617493bf5bdbc52dd45be249a1d160c64bbaec39c3f49f568bf431fbc1e84903e0100723e26c1e07b9ef0e43f9
+EBUILD rviz-1.12.14-r1.ebuild 1692 BLAKE2B a31df46f2a1005c6abd422f46bf5c86ecf0010e11df7d5a4fbf7c977791715fd75e7e84f5aa0afcc35583c55de69ef904c0d008fa54ab462a03be75b395d391c SHA512 32cf80f7a5905012493bbdfce94783ac1b527be8d9bbe87ac446a55b8e81e4a78d05292e9fe34c52625144988cbf5b704802bed4f5ea315ea072a46d7522612e
+EBUILD rviz-9999.ebuild 1692 BLAKE2B a31df46f2a1005c6abd422f46bf5c86ecf0010e11df7d5a4fbf7c977791715fd75e7e84f5aa0afcc35583c55de69ef904c0d008fa54ab462a03be75b395d391c SHA512 32cf80f7a5905012493bbdfce94783ac1b527be8d9bbe87ac446a55b8e81e4a78d05292e9fe34c52625144988cbf5b704802bed4f5ea315ea072a46d7522612e
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.12.11.ebuild b/dev-ros/rviz/rviz-1.12.11.ebuild
deleted file mode 100644
index 9ada9a6fdae4..000000000000
--- a/dev-ros/rviz/rviz-1.12.11.ebuild
+++ /dev/null
@@ -1,66 +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-visualization/rviz"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/assimp
-	dev-games/ogre
-	virtual/opengl
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp
-	dev-libs/urdfdom:=
-
-	dev-ros/angles
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rviz/rviz-1.12.13.ebuild b/dev-ros/rviz/rviz-1.12.14-r1.ebuild
index b2eef9fdeb69..ef99e3dce197 100644
--- a/dev-ros/rviz/rviz-1.12.13.ebuild
+++ b/dev-ros/rviz/rviz-1.12.14-r1.ebuild
@@ -34,10 +34,12 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/message_filters
 	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
 	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
 	dev-ros/resource_retriever
 	dev-ros/rosbag[${PYTHON_USEDEP}]
 	dev-ros/rosconsole
+	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
diff --git a/dev-ros/rviz/rviz-1.12.14.ebuild b/dev-ros/rviz/rviz-1.12.14.ebuild
deleted file mode 100644
index b2eef9fdeb69..000000000000
--- a/dev-ros/rviz/rviz-1.12.14.ebuild
+++ /dev/null
@@ -1,67 +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-visualization/rviz"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/assimp
-	dev-games/ogre
-	virtual/opengl
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp
-	dev-libs/urdfdom:=
-	dev-libs/tinyxml:=
-
-	dev-ros/angles
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index b2eef9fdeb69..ef99e3dce197 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -34,10 +34,12 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/message_filters
 	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
 	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
 	dev-ros/resource_retriever
 	dev-ros/rosbag[${PYTHON_USEDEP}]
 	dev-ros/rosconsole
+	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]