Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/
Date: Sat, 04 Aug 2018 18:47:04
Message-Id: 1533408396.7dbed979e405db582417dfa2619a2954ec05807d.aballier@gentoo
1 commit: 7dbed979e405db582417dfa2619a2954ec05807d
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 4 18:40:51 2018 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 4 18:46:36 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbed979
7
8 dev-ros/rviz: lock ogre dep
9
10 Closes: https://bugs.gentoo.org/659608
11 Package-Manager: Portage-2.3.44, Repoman-2.3.10
12
13 dev-ros/rviz/{rviz-1.13.1.ebuild => rviz-1.13.1-r1.ebuild} | 5 ++---
14 dev-ros/rviz/rviz-9999.ebuild | 2 +-
15 2 files changed, 3 insertions(+), 4 deletions(-)
16
17 diff --git a/dev-ros/rviz/rviz-1.13.1.ebuild b/dev-ros/rviz/rviz-1.13.1-r1.ebuild
18 similarity index 96%
19 rename from dev-ros/rviz/rviz-1.13.1.ebuild
20 rename to dev-ros/rviz/rviz-1.13.1-r1.ebuild
21 index e91a1a39c00..46cc1149069 100644
22 --- a/dev-ros/rviz/rviz-1.13.1.ebuild
23 +++ b/dev-ros/rviz/rviz-1.13.1-r1.ebuild
24 @@ -17,7 +17,7 @@ IUSE=""
25 RDEPEND="
26 dev-libs/boost:=[threads]
27 media-libs/assimp
28 - dev-games/ogre
29 + <dev-games/ogre-1.10:=
30 virtual/opengl
31 dev-qt/qtwidgets:5
32 dev-qt/qtcore:5
33 @@ -25,7 +25,7 @@ RDEPEND="
34 dev-cpp/eigen:3
35 dev-cpp/yaml-cpp:=
36 dev-libs/urdfdom:=
37 - dev-libs/tinyxml:=
38 + dev-libs/tinyxml2:=
39
40 dev-ros/angles
41 dev-ros/image_geometry
42 @@ -34,7 +34,6 @@ RDEPEND="
43 dev-ros/laser_geometry
44 dev-ros/message_filters
45 dev-ros/pluginlib
46 - dev-libs/tinyxml2:=
47 >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
48 dev-ros/resource_retriever
49 dev-ros/rosbag[${PYTHON_USEDEP}]
50
51 diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
52 index ffbd4e5c47b..46cc1149069 100644
53 --- a/dev-ros/rviz/rviz-9999.ebuild
54 +++ b/dev-ros/rviz/rviz-9999.ebuild
55 @@ -17,7 +17,7 @@ IUSE=""
56 RDEPEND="
57 dev-libs/boost:=[threads]
58 media-libs/assimp
59 - dev-games/ogre
60 + <dev-games/ogre-1.10:=
61 virtual/opengl
62 dev-qt/qtwidgets:5
63 dev-qt/qtcore:5