commit:     7dbed979e405db582417dfa2619a2954ec05807d
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  4 18:40:51 2018 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Aug  4 18:46:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbed979

dev-ros/rviz: lock ogre dep

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

 dev-ros/rviz/{rviz-1.13.1.ebuild => rviz-1.13.1-r1.ebuild} | 5 ++---
 dev-ros/rviz/rviz-9999.ebuild                              | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

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 e91a1a39c00..46cc1149069 100644
--- 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 ffbd4e5c47b..46cc1149069 100644
--- 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

Reply via email to