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 0E8851381F3 for ; Thu, 21 Apr 2016 15:38:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93FBDE0857; Thu, 21 Apr 2016 15:38:43 +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 14B89E0857 for ; Thu, 21 Apr 2016 15:38:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 EBB3E340C40 for ; Thu, 21 Apr 2016 15:38:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 96F19CB for ; Thu, 21 Apr 2016 15:38:40 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1461253113.2f3be820264b2c7b3ec415d4f42426a2c10a2a2e.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qt-creator/metadata.xml dev-qt/qt-creator/qt-creator-9999.ebuild X-VCS-Directories: dev-qt/qt-creator/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 2f3be820264b2c7b3ec415d4f42426a2c10a2a2e X-VCS-Branch: master Date: Thu, 21 Apr 2016 15:38:40 +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: a422613c-ce55-4d0f-8289-204eceaa5538 X-Archives-Hash: cd9cfb5a181ab3d0a5c45eea87130b51 commit: 2f3be820264b2c7b3ec415d4f42426a2c10a2a2e Author: Davide Pesavento gentoo org> AuthorDate: Thu Apr 21 15:38:33 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Apr 21 15:38:33 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2f3be820 dev-qt/qt-creator: update live ebuild and USE descriptions Package-Manager: portage-2.2.28 dev-qt/qt-creator/metadata.xml | 8 ++++++-- dev-qt/qt-creator/qt-creator-9999.ebuild | 26 +++++++++++++++++--------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index 1e2c4f3..3fec6b3 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -14,17 +14,21 @@ Enable autotools project manager plugin Build plugin for bare metal devices Add support for dev-vcs/bzr version control system - Build clang-based code model plugin + Build clang-based code model plugin + Build clang-based static analyzer plugin Add support for IBM ClearCase version control system (requires manual installation of ClearCase client) Enable cmake project manager plugin + Enable GLSL source code editor Build plugin for Apple iOS devices Add support for dev-vcs/mercurial version control system Add support for Perforce version control system (requires manual installation of Perforce client) Enable Python source code editor Enable QBS project manager plugin - Build plugin for QNX/Blackberry devices + Build plugin for QNX devices Add support for retrieving application output from journald Add support for memory debugging using dev-util/valgrind + Use dev-qt/qtwebengine to view documentation + Use dev-qt/qtwebkit to view documentation Build plugin for WinRT devices diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index e813af2..c636321 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -9,7 +9,7 @@ inherit eutils l10n qmake-utils virtualx DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="http://doc.qt.io/qtcreator/" -LICENSE="|| ( LGPL-2.1 LGPL-3 )" +LICENSE="GPL-3" SLOT="0" if [[ ${PV} == *9999 ]]; then @@ -27,13 +27,13 @@ else S=${WORKDIR}/${MY_P} fi -QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal - bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial - perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt) -IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}" +QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar + clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor + ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt) +IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}" # minimum Qt version required -QT_PV="5.4.0:5" +QT_PV="5.5.0:5" RDEPEND=" =dev-libs/botan-1.10*[-bindist,threads] @@ -53,9 +53,10 @@ RDEPEND=" >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} >=sys-devel/gdb-7.5[client,python] - clang? ( >=sys-devel/clang-3.6:= ) - qbs? ( >=dev-util/qbs-1.4.4 ) + clangcodemodel? ( >=sys-devel/clang-3.6.2:= ) + qbs? ( >=dev-util/qbs-1.4.5 ) systemd? ( sys-apps/systemd:= ) + webengine? ( >=dev-qt/qtwebengine-5.6.0:5 ) webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) " DEPEND="${RDEPEND} @@ -73,6 +74,7 @@ unset x PDEPEND=" autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) + clangstaticanalyzer? ( sys-devel/clang ) cmake? ( dev-util/cmake ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) @@ -112,6 +114,12 @@ src_prepare() { src/plugins/help/help.pro || die "failed to disable webkit" fi + # automagic dep on qtwebengine + if ! use webengine; then + sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \ + src/plugins/help/help.pro || die "failed to disable webengine" + fi + # disable broken or unreliable tests sed -i -e '/SUBDIRS/ s/\//' tests/auto/debugger/debugger.pro || die sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die @@ -128,7 +136,7 @@ src_prepare() { src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ - $(use clang && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \ + $(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ CONFIG+=qbs_enable_project_file_updates \