summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2018-08-04 20:40:51 +0200
committerAlexis Ballier <aballier@gentoo.org>2018-08-04 20:46:36 +0200
commit7dbed979e405db582417dfa2619a2954ec05807d (patch)
treeabdf00b41187cba9859c54c1e77b0e6031d2192a
parentdev-ros/rviz: Remove old (diff)
downloadgentoo-7dbed979.tar.gz
gentoo-7dbed979.tar.bz2
gentoo-7dbed979.zip
dev-ros/rviz: lock ogre dep
Closes: https://bugs.gentoo.org/659608 Package-Manager: Portage-2.3.44, Repoman-2.3.10
-rw-r--r--dev-ros/rviz/rviz-1.13.1-r1.ebuild (renamed from dev-ros/rviz/rviz-1.13.1.ebuild)5
-rw-r--r--dev-ros/rviz/rviz-9999.ebuild2
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
index e91a1a39c000..46cc11490699 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 ffbd4e5c47bd..46cc11490699 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