[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/

[Alexis Ballier]

commit:     e1ab3f57af7b570a62864ffc2d4a7932e129e17d
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 16:32:51 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 16:32:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ab3f57

dev-ros/rviz: bump to 1.12.0. Allow only qt5 as qt4 does not work, bug #580072

Package-Manager: portage-2.2.28

 dev-ros/rviz/Manifest                                |  1 +
 .../rviz/{rviz-9999.ebuild => rviz-1.12.0.ebuild}    | 20 ++++++--------------
 dev-ros/rviz/rviz-9999.ebuild                        | 20 ++++++--------------
 3 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 7c990a2..3d5821e 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,3 +1,4 @@
 DIST rviz-1.11.10.tar.gz 4526836 SHA256 
0b1f91042d9e4c90c7c40602a2f479632f432c7ce40801e5508a0077281eadbe SHA512 
552a7482f90ce70933bbf93aa7dc29e6ef1685998b508dfd60af2c8e60f43d88ae6c1b5a8585494248d79c5ac7c1c1ade784acd1260ef3aea62ee61050fecafe
 WHIRLPOOL 
47dbd86a3f07e6a78808e5abd0f7a5a17c75839e025479f036def64be042b266adb758426f02bde2c0c0c3fd9a764150a742ad0ed42cc90cddcf6bfc0f2b5a0e
 DIST rviz-1.11.13.tar.gz 4532451 SHA256 
97189c47427f1d0d7d3599777544bd001da27694f7225d7fe3c3eab1c064b9b4 SHA512 
652355cfe062d22858925329081458b61a95d2f2d8ecf10f746b238e124553706dd2fa507c8191450d0f9a3907ebcfd2b1440212b918b7da69bd9f3b16d5a5a2
 WHIRLPOOL 
9dc30f05150304a9306b9bb41ca06ccc27271f8b4e9537128ec3a0d5ab9205598f423f234ebbf7619dd323f53ca81f0150a814bb47d280e7818159d4dbbcae2d
 DIST rviz-1.11.14.tar.gz 4532724 SHA256 
89b77d11315318e2f3737e0f04803df2b7808ff00e50c0d6ed0ae03ab3773d3e SHA512 
5d912050876b55ed405a5d31e6602db04e802e1b8cfd8f411f318519fa8c45d096fb17b3009ca195cf07345666f27d5a7b61a248d1bb88ec63b775c9fa6fa0e1
 WHIRLPOOL 
75b67c5702251a021da98a0da86c827209259231f02af6be78c79200716d6c5495541adc1c977076f8faaef35ae6ec986635639993586314456aafcf8b619a63
+DIST rviz-1.12.0.tar.gz 4531765 SHA256 
28753abc7dd3a3888b37b6eb2d7b66bbf74cd42b7eb08410e0f21ffd357aafa0 SHA512 
33b7a7fafb3b0565507a799e98c2fc2908a5b6e8ed68e013604583a2c7806693754665e363edd7e0f053fdc0f7522353cbbdee7e37a3e7e421ab3144f2ab68d9
 WHIRLPOOL 
2ac5771dcf5f67be5b51686a39efaca8887a3bdbd493a584281d7d32aa2d0a235729b667fd998535116cda0d43becd198ace05c993f09c4bef93541e4eeed480

diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-1.12.0.ebuild
similarity index 84%
copy from dev-ros/rviz/rviz-9999.ebuild
copy to dev-ros/rviz/rviz-1.12.0.ebuild
index 61c0440..23a35fa 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-1.12.0.ebuild
@@ -13,24 +13,16 @@ inherit ros-catkin
 DESCRIPTION="3D visualization tool for ROS"
 LICENSE="BSD"
 SLOT="0"
-IUSE="qt5"
+IUSE=""
 
 RDEPEND="
        dev-libs/boost:=[threads]
        media-libs/assimp
        dev-games/ogre
        virtual/opengl
-       qt5? (
-               dev-qt/qtwidgets:5
-               dev-qt/qtcore:5
-               dev-qt/qtopengl:5
-       )
-       !qt5? (
-               dev-qt/qtgui:4
-               dev-qt/qtopengl:4
-               dev-qt/qtcore:4
-               dev-qt/qtsvg:4
-       )
+       dev-qt/qtwidgets:5
+       dev-qt/qtcore:5
+       dev-qt/qtopengl:5
        dev-cpp/eigen:3
        dev-cpp/yaml-cpp
 
@@ -41,7 +33,7 @@ RDEPEND="
        dev-ros/laser_geometry
        dev-ros/message_filters
        dev-ros/pluginlib
-       dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+       >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
        dev-ros/resource_retriever
        dev-ros/rosbag[${PYTHON_USEDEP}]
        dev-ros/rosconsole
@@ -68,6 +60,6 @@ DEPEND="${RDEPEND}
        )"
 
 src_configure() {
-       local mycatkincmakeargs=( "-DUseQt5=$(usex qt5 ON OFF)" )
+       local mycatkincmakeargs=( "-DUseQt5=ON" )
        ros-catkin_src_configure
 }

diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 61c0440..23a35fa 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -13,24 +13,16 @@ inherit ros-catkin
 DESCRIPTION="3D visualization tool for ROS"
 LICENSE="BSD"
 SLOT="0"
-IUSE="qt5"
+IUSE=""
 
 RDEPEND="
        dev-libs/boost:=[threads]
        media-libs/assimp
        dev-games/ogre
        virtual/opengl
-       qt5? (
-               dev-qt/qtwidgets:5
-               dev-qt/qtcore:5
-               dev-qt/qtopengl:5
-       )
-       !qt5? (
-               dev-qt/qtgui:4
-               dev-qt/qtopengl:4
-               dev-qt/qtcore:4
-               dev-qt/qtsvg:4
-       )
+       dev-qt/qtwidgets:5
+       dev-qt/qtcore:5
+       dev-qt/qtopengl:5
        dev-cpp/eigen:3
        dev-cpp/yaml-cpp
 
@@ -41,7 +33,7 @@ RDEPEND="
        dev-ros/laser_geometry
        dev-ros/message_filters
        dev-ros/pluginlib
-       dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+       >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
        dev-ros/resource_retriever
        dev-ros/rosbag[${PYTHON_USEDEP}]
        dev-ros/rosconsole
@@ -68,6 +60,6 @@ DEPEND="${RDEPEND}
        )"
 
 src_configure() {
-       local mycatkincmakeargs=( "-DUseQt5=$(usex qt5 ON OFF)" )
+       local mycatkincmakeargs=( "-DUseQt5=ON" )
        ros-catkin_src_configure
 }