gentoo resync : 15.12.2019

3 files changed, 81 insertions, 3 deletions

diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 218fd42bf8ca..3fd4c21d3d5d 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,6 +1,8 @@
 DIST rviz-1.13.1.tar.gz 5094089 BLAKE2B 7f4c106bf51b2465177107f5eb19602323045423b3ee5149f70b177170af9eea1cea0d4069f859c3c9bf3a2bdbe7feb91b802c758a66f6b990bd890b124d2a52 SHA512 cace4d41341647a8e4d5ab3be64ca71a4b41134a15a4df8556f35824c550c5fb7024f7338d0ffac1ea9c7f574c10757b773a8df37625d6e616eafdcd7f0aab09
 DIST rviz-1.13.3.tar.gz 5085813 BLAKE2B da1f12c1ab9e7306bcd5762311948f0e4af355c80b1f0ffac521c64e62250c11c48f52659c187137c27209616a7564086bc84a3cc81f88ded2c6d3c65847774b SHA512 90d319342e16735629a3aa8229b0f8b55b6b8f863fba719aeed0a6b06cee5fd269dc852b4bfa861422b44840d57e8030c98da09b046a378a36fdac58f5782f96
+DIST rviz-1.13.6.tar.gz 5096543 BLAKE2B f51750803ca2e133dd225de5b28bf3730b89fd6df9650b662fdbf9ab28551eaadbbd8bab50fd17e8a980702fc9d162ea41b1a3319c14309fdcb15714b8103e3c SHA512 d9f462cf25cc1386a6bfad4dee27e6963ba15e3714f7556df6f79db7eeaa1b43f60461630e6e8d354fd0c56755b7a2b8b38d98fcee4343dd30559a771b0cd157
 EBUILD rviz-1.13.1-r1.ebuild 1681 BLAKE2B ce51638542b6abbebb13d647552646d5e8cd797845a386a347733acc02ab585d451e0fcfff19a7d798e99f79e37238751167d2331b83bc89ec03e76e56ca9a39 SHA512 19569262319e122cc37f572429315302b31da5b5f7de520cd9b60c8841fbdc617aaae0ff25d1e0b6dd9b007e0d49e735cd5ddded586efb4750d6a87c3e211f34
 EBUILD rviz-1.13.3.ebuild 1678 BLAKE2B 0fa86998b709d83a21be63fdde597107e54be94487d98a6b58be8768be50fa17804c4ee2a3d44e0b8a546d0e7519da9951138e6dee7ff1ee2ab7bf012d917563 SHA512 e9bcd8aa8a72010f34b439b273fd367a53af0c743b7e80f817be2bbbff551310411793badc7b194ca18630694b04000f430abe5f0d9726df8685215dfccf28c4
-EBUILD rviz-9999.ebuild 1681 BLAKE2B ce51638542b6abbebb13d647552646d5e8cd797845a386a347733acc02ab585d451e0fcfff19a7d798e99f79e37238751167d2331b83bc89ec03e76e56ca9a39 SHA512 19569262319e122cc37f572429315302b31da5b5f7de520cd9b60c8841fbdc617aaae0ff25d1e0b6dd9b007e0d49e735cd5ddded586efb4750d6a87c3e211f34
+EBUILD rviz-1.13.6.ebuild 1730 BLAKE2B 0c376a9574f637050337c23c476785ec06768876a505c076afa2351b3e2526d62b113e1f31079a2f41df01fb3a8a958c79f139f03f1c77ebc89641382bc7de43 SHA512 d1aacd39332373f9cdde1ae3e0ec045e7359f5d792eab7ed78cffd4c98851e8e2840b9157684510a0e37f2640c89663386dc6e368da0970cd64cd89cf7862fea
+EBUILD rviz-9999.ebuild 1730 BLAKE2B 0c376a9574f637050337c23c476785ec06768876a505c076afa2351b3e2526d62b113e1f31079a2f41df01fb3a8a958c79f139f03f1c77ebc89641382bc7de43 SHA512 d1aacd39332373f9cdde1ae3e0ec045e7359f5d792eab7ed78cffd4c98851e8e2840b9157684510a0e37f2640c89663386dc6e368da0970cd64cd89cf7862fea
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.13.6.ebuild b/dev-ros/rviz/rviz-1.13.6.ebuild
new file mode 100644
index 000000000000..358973db8678
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.13.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 virtualx
+
+DESCRIPTION="3D visualization tool for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/assimp
+	<dev-games/ogre-1.10:=
+	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/tinyxml2:=
+
+	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-libs/console_bridge:=
+	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
+}
+
+src_test() {
+	virtx ros-catkin_src_test
+}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 46cc11490699..358973db8678 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ ROS_REPO_URI="https://github.com/ros-visualization/rviz"
 KEYWORDS="~amd64"
 PYTHON_COMPAT=( python2_7 )
 
-inherit ros-catkin
+inherit ros-catkin virtualx
 
 DESCRIPTION="3D visualization tool for ROS"
 LICENSE="BSD"
@@ -66,3 +66,7 @@ src_configure() {
 	local mycatkincmakeargs=( "-DUseQt5=ON" )
 	ros-catkin_src_configure
 }
+
+src_test() {
+	virtx ros-catkin_src_test
+}