dev-ros/rviz: lock ogre dep

Closes: https://bugs.gentoo.org/659608
Package-Manager: Portage-2.3.44, Repoman-2.3.10

diff --git a/dev-ros/rviz/rviz-1.13.1.ebuild b/dev-ros/rviz/rviz-1.13.1-r1.ebuild
similarity index 96%
rename from dev-ros/rviz/rviz-1.13.1.ebuild
rename to dev-ros/rviz/rviz-1.13.1-r1.ebuild
index e91a1a39c000a2f07306f45eee25e4e6369411ff..46cc11490699ec672c1bf2397ad4b5d707503315 100644 (file)
--- a/dev-ros/rviz/rviz-1.13.1.ebuild
+++ b/dev-ros/rviz/rviz-1.13.1-r1.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="
        dev-libs/boost:=[threads]
        media-libs/assimp
-       dev-games/ogre
+       <dev-games/ogre-1.10:=
        virtual/opengl
        dev-qt/qtwidgets:5
        dev-qt/qtcore:5
@@ -25,7 +25,7 @@ RDEPEND="
        dev-cpp/eigen:3
        dev-cpp/yaml-cpp:=
        dev-libs/urdfdom:=
-       dev-libs/tinyxml:=
+       dev-libs/tinyxml2:=
 
        dev-ros/angles
        dev-ros/image_geometry
@@ -34,7 +34,6 @@ 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}]

diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index ffbd4e5c47bde97f62c54d2b09a66e6995cf1561..46cc11490699ec672c1bf2397ad4b5d707503315 100644 (file)
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="
        dev-libs/boost:=[threads]
        media-libs/assimp
-       dev-games/ogre
+       <dev-games/ogre-1.10:=
        virtual/opengl
        dev-qt/qtwidgets:5
        dev-qt/qtcore:5