dev-ros/rviz: EAPI 7, force single-precision ogre

Bug: https://bugs.gentoo.org/710540
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14757
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/dev-ros/rviz/rviz-1.13.1-r2.ebuild b/dev-ros/rviz/rviz-1.13.1-r2.ebuild
new file mode 100644 (file)
index 0000000..787bbed
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.13.1-r2.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+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
+}

diff --git a/dev-ros/rviz/rviz-1.13.3-r1.ebuild b/dev-ros/rviz/rviz-1.13.3-r1.ebuild
new file mode 100644 (file)
index 0000000..787bbed
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.13.3-r1.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+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
+}

diff --git a/dev-ros/rviz/rviz-1.13.6-r1.ebuild b/dev-ros/rviz/rviz-1.13.6-r1.ebuild
new file mode 100644 (file)
index 0000000..1e9f682
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.13.6-r1.ebuild
@@ -0,0 +1,71 @@
+# 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-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 358973db8678c752ac228e018e312c79972535dc..4c97b1574bab782f5ad78b6d868113453181a905 100644 (file)
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
+KEYWORDS=""
 
 inherit ros-catkin virtualx
 
@@ -17,7 +16,7 @@ IUSE=""
 RDEPEND="
        dev-libs/boost:=[threads]
        media-libs/assimp
-       <dev-games/ogre-1.10:=
+       <dev-games/ogre-1.10:=[-double-precision]
        virtual/opengl
        dev-qt/qtwidgets:5
        dev-qt/qtcore:5