From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E43AC59CA5 for ; Thu, 24 Mar 2016 11:19:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61CDDE07FA; Thu, 24 Mar 2016 11:18:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31F9621C01C for ; Thu, 24 Mar 2016 11:18:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 453B3340BEF for ; Thu, 24 Mar 2016 11:18:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 925F4879 for ; Thu, 24 Mar 2016 11:18:52 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1458818322.a57d490fe983f28a222704d43ff5cb5037129721.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/rviz/Manifest dev-ros/rviz/rviz-1.11.13.ebuild dev-ros/rviz/rviz-9999.ebuild X-VCS-Directories: dev-ros/rviz/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: a57d490fe983f28a222704d43ff5cb5037129721 X-VCS-Branch: master Date: Thu, 24 Mar 2016 11:18:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 38f8a29c-e65e-441a-8050-f9e88a93318f X-Archives-Hash: b617500b92f0502ecf0b14bba22b5b12 commit: a57d490fe983f28a222704d43ff5cb5037129721 Author: Alexis Ballier gentoo org> AuthorDate: Thu Mar 24 11:15:29 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Mar 24 11:18:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57d490f dev-ros/rviz: add qt5 useflag and bump to 1.11.13 Package-Manager: portage-2.2.28 Signed-off-by: Alexis Ballier gentoo.org> dev-ros/rviz/Manifest | 1 + .../rviz/{rviz-9999.ebuild => rviz-1.11.13.ebuild} | 22 +++++++++++++++++----- dev-ros/rviz/rviz-9999.ebuild | 22 +++++++++++++++++----- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest index 87d1cc3..4b1e0b5 100644 --- a/dev-ros/rviz/Manifest +++ b/dev-ros/rviz/Manifest @@ -1 +1,2 @@ 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 diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-1.11.13.ebuild similarity index 84% copy from dev-ros/rviz/rviz-9999.ebuild copy to dev-ros/rviz/rviz-1.11.13.ebuild index 43b31fc..61c0440 100644 --- a/dev-ros/rviz/rviz-9999.ebuild +++ b/dev-ros/rviz/rviz-1.11.13.ebuild @@ -13,17 +13,24 @@ inherit ros-catkin DESCRIPTION="3D visualization tool for ROS" LICENSE="BSD" SLOT="0" -IUSE="" +IUSE="qt5" RDEPEND=" dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qtcore:4 - dev-qt/qtsvg:4 + 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-cpp/eigen:3 dev-cpp/yaml-cpp @@ -59,3 +66,8 @@ DEPEND="${RDEPEND} dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )" + +src_configure() { + local mycatkincmakeargs=( "-DUseQt5=$(usex qt5 ON OFF)" ) + ros-catkin_src_configure +} diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild index 43b31fc..61c0440 100644 --- a/dev-ros/rviz/rviz-9999.ebuild +++ b/dev-ros/rviz/rviz-9999.ebuild @@ -13,17 +13,24 @@ inherit ros-catkin DESCRIPTION="3D visualization tool for ROS" LICENSE="BSD" SLOT="0" -IUSE="" +IUSE="qt5" RDEPEND=" dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - dev-qt/qtcore:4 - dev-qt/qtsvg:4 + 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-cpp/eigen:3 dev-cpp/yaml-cpp @@ -59,3 +66,8 @@ DEPEND="${RDEPEND} dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )" + +src_configure() { + local mycatkincmakeargs=( "-DUseQt5=$(usex qt5 ON OFF)" ) + ros-catkin_src_configure +}