From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 dev-ros/rviz/Manifest              |  8 ++---
 dev-ros/rviz/rviz-1.13.6-r1.ebuild | 71 ------------------------------------
 dev-ros/rviz/rviz-1.14.0.ebuild    | 71 ------------------------------------
 dev-ros/rviz/rviz-1.14.1.ebuild    | 74 ++++++++++++++++++++++++++++++++++++++
 dev-ros/rviz/rviz-9999.ebuild      | 39 ++++++++++----------
 5 files changed, 98 insertions(+), 165 deletions(-)
 delete mode 100644 dev-ros/rviz/rviz-1.13.6-r1.ebuild
 delete mode 100644 dev-ros/rviz/rviz-1.14.0.ebuild
 create mode 100644 dev-ros/rviz/rviz-1.14.1.ebuild

(limited to 'dev-ros/rviz')

diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index c499ce877a6e..2fbf1581c653 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,6 +1,4 @@
-DIST rviz-1.13.6.tar.gz 5096543 BLAKE2B f51750803ca2e133dd225de5b28bf3730b89fd6df9650b662fdbf9ab28551eaadbbd8bab50fd17e8a980702fc9d162ea41b1a3319c14309fdcb15714b8103e3c SHA512 d9f462cf25cc1386a6bfad4dee27e6963ba15e3714f7556df6f79db7eeaa1b43f60461630e6e8d354fd0c56755b7a2b8b38d98fcee4343dd30559a771b0cd157
-DIST rviz-1.14.0.tar.gz 5118043 BLAKE2B 2f5236c3b8bcb0421ebbbc76648ad421b38ad0cb4c6b2c107ef0532c2a84a1c2430b4c648ff6facc634c3247dd8dcb62dd4fe787bbe5c4c5db5a904380b11dc3 SHA512 7ab3d8b751268b6e76fb39184ba0f245cc19b45ef1bb59fa74ada594b12ec2c9c7024a91005a946c0b2c0d977442a8e64570837ab80a10b762729d3f5840411b
-EBUILD rviz-1.13.6-r1.ebuild 1723 BLAKE2B bc99acf8f0f6c783486467d9e7f7305c96150e8137f62a2e0719eaf1a7d99391f4589e693943d51a487e63778cc904fa99afc08a7d28a9a12c43958934606301 SHA512 4a4e0858aded3a6300e281ebcba7caf4ba5e8c0ee215d1e9e02524e758b2c003934277d5e4f10dd59d911838a78fbdcaacc1da98e6acd8a50b712ce7b483ea58
-EBUILD rviz-1.14.0.ebuild 1715 BLAKE2B 13f47a63badc18199c2c88ff83d22a23188bb8344ff6575f3be301f16a46b3b4c95122b4ccc155d797a6eb14bfe2e1b6591f3b0cabf47440c9b8c3f0d1901964 SHA512 a2f5c144f4011e349e79fcc073964b3ee2f9ea3281ec3eafebf91670812eedd2d1b03701420f063a710c57fe7d367dc9f387c4c43a6531b9ce60f41c51545563
-EBUILD rviz-9999.ebuild 1715 BLAKE2B 13f47a63badc18199c2c88ff83d22a23188bb8344ff6575f3be301f16a46b3b4c95122b4ccc155d797a6eb14bfe2e1b6591f3b0cabf47440c9b8c3f0d1901964 SHA512 a2f5c144f4011e349e79fcc073964b3ee2f9ea3281ec3eafebf91670812eedd2d1b03701420f063a710c57fe7d367dc9f387c4c43a6531b9ce60f41c51545563
+DIST rviz-1.14.1.tar.gz 5119463 BLAKE2B c318c84d47fe4579b5554f073d013bb21189c2bff6edb286aea737837e67683a457ffaa0af1c05f1aedd96336689a0975fb8e72fb09af5bd8904bc29e1ee994b SHA512 deefb4f35bc301df2eca310104100c5d01d41a5c5c0204e59519faa8ba6c04efbce5304d1507804d5a42ca904086ea22891cd448b9d5e0d500fe9a7c9be94863
+EBUILD rviz-1.14.1.ebuild 1799 BLAKE2B 46a2b6080400308093b570ef37d74024c8c735d44b72de1390ae161684d5f1c2dc9cb8fc11b97e6e5b01237ec23486d99bf963256a252983f2c061263ca5b151 SHA512 389a7bc6f931d5c6889ab99555d825084c0ea14512dc668cc8fe0a49136195f4266f839633bf07eddeca3927ad0c12d68ff7aa9148cb15c155eba3fb40ff7eb1
+EBUILD rviz-9999.ebuild 1799 BLAKE2B 46a2b6080400308093b570ef37d74024c8c735d44b72de1390ae161684d5f1c2dc9cb8fc11b97e6e5b01237ec23486d99bf963256a252983f2c061263ca5b151 SHA512 389a7bc6f931d5c6889ab99555d825084c0ea14512dc668cc8fe0a49136195f4266f839633bf07eddeca3927ad0c12d68ff7aa9148cb15c155eba3fb40ff7eb1
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.13.6-r1.ebuild b/dev-ros/rviz/rviz-1.13.6-r1.ebuild
deleted file mode 100644
index 1e9f682c7ffe..000000000000
--- a/dev-ros/rviz/rviz-1.13.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS="~amd64"
-
-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:=[-double-precision]
-	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-1.14.0.ebuild b/dev-ros/rviz/rviz-1.14.0.ebuild
deleted file mode 100644
index 4c97b1574bab..000000000000
--- a/dev-ros/rviz/rviz-1.14.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS=""
-
-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:=[-double-precision]
-	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-1.14.1.ebuild b/dev-ros/rviz/rviz-1.14.1.ebuild
new file mode 100644
index 000000000000..219df40698dd
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.14.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros-visualization/rviz"
+KEYWORDS="~amd64"
+CATKIN_HAS_MESSAGES=yes
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+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:=[-double-precision]
+	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_SINGLE_USEDEP}]
+	dev-ros/resource_retriever
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosconsole
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/tf
+	dev-ros/urdf
+	dev-ros/media_export
+
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_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}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+		dev-cpp/gtest
+	)"
+BDEPEND="
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx ros-catkin_src_test
+}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 4c97b1574bab..219df40698dd 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -4,7 +4,10 @@
 EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS=""
+KEYWORDS="~amd64"
+CATKIN_HAS_MESSAGES=yes
+
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit ros-catkin virtualx
 
@@ -33,38 +36,38 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/message_filters
 	dev-ros/pluginlib
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosconsole
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_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/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
 	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
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
 		dev-cpp/gtest
 	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
+BDEPEND="
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+"
 
 src_test() {
 	virtx ros-catkin_src_test
-- 
cgit v1.2.3