dev-ros/rviz: add qt5 useflag and bump to 1.11.13

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

3 files changed, 91 insertions, 5 deletions

diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 87d1cc3d0b77..4b1e0b56c45f 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1 +1,2 @@
 DIST rviz-1.11.10.tar.gz 4526836 SHA256 0b1f91042d9e4c90c7c40602a2f479632f432c7ce40801e5508a0077281eadbe SHA512 552a7482f90ce70933bbf93aa7dc29e6ef1685998b508dfd60af2c8e60f43d88ae6c1b5a8585494248d79c5ac7c1c1ade784acd1260ef3aea62ee61050fecafe WHIRLPOOL 47dbd86a3f07e6a78808e5abd0f7a5a17c75839e025479f036def64be042b266adb758426f02bde2c0c0c3fd9a764150a742ad0ed42cc90cddcf6bfc0f2b5a0e
+DIST rviz-1.11.13.tar.gz 4532451 SHA256 97189c47427f1d0d7d3599777544bd001da27694f7225d7fe3c3eab1c064b9b4 SHA512 652355cfe062d22858925329081458b61a95d2f2d8ecf10f746b238e124553706dd2fa507c8191450d0f9a3907ebcfd2b1440212b918b7da69bd9f3b16d5a5a2 WHIRLPOOL 9dc30f05150304a9306b9bb41ca06ccc27271f8b4e9537128ec3a0d5ab9205598f423f234ebbf7619dd323f53ca81f0150a814bb47d280e7818159d4dbbcae2d
diff --git a/dev-ros/rviz/rviz-1.11.13.ebuild b/dev-ros/rviz/rviz-1.11.13.ebuild
new file mode 100644
index 000000000000..61c0440f524e
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.11.13.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="qt5"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/assimp
+	dev-games/ogre
+	virtual/opengl
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+	)
+	!qt5? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		dev-qt/qtcore:4
+		dev-qt/qtsvg:4
+	)
+	dev-cpp/eigen:3
+	dev-cpp/yaml-cpp
+
+	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[${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/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=$(usex qt5 ON OFF)" )
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 43b31fc3a7fd..61c0440f524e 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -13,17 +13,24 @@ inherit ros-catkin
 DESCRIPTION="3D visualization tool for ROS"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="qt5"
 
 RDEPEND="
 	dev-libs/boost:=[threads]
 	media-libs/assimp
 	dev-games/ogre
 	virtual/opengl
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtcore:4
-	dev-qt/qtsvg:4
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+	)
+	!qt5? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		dev-qt/qtcore:4
+		dev-qt/qtsvg:4
+	)
 	dev-cpp/eigen:3
 	dev-cpp/yaml-cpp
 
@@ -59,3 +66,8 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_USEDEP}]
 		dev-cpp/gtest
 	)"
+
+src_configure() {
+	local mycatkincmakeargs=( "-DUseQt5=$(usex qt5 ON OFF)" )
+	ros-catkin_src_configure
+}