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 859BF1387FF for ; Tue, 21 Oct 2014 17:34:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5C9DE0810; Tue, 21 Oct 2014 17:34:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B9FAE0810 for ; Tue, 21 Oct 2014 17:34:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 596023404A9 for ; Tue, 21 Oct 2014 17:34:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1BE8869B for ; Tue, 21 Oct 2014 17:34:39 +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: <1413912861.d60e12dcfb5c1f9d79e3a2e3ce615205d3a93b98.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: d60e12dcfb5c1f9d79e3a2e3ce615205d3a93b98 X-VCS-Branch: master Date: Tue, 21 Oct 2014 17:34:39 +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: 95f387a1-20f9-4c40-8e73-e46a874cc530 X-Archives-Hash: 62557197bbbed4baaf8b3aa46d9c10b2 commit: d60e12dcfb5c1f9d79e3a2e3ce615205d3a93b98 Author: Davide Pesavento gentoo org> AuthorDate: Tue Oct 21 17:34:21 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Oct 21 17:34:21 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d60e12dc [dev-qt/qt-creator] Sync with portage. Package-Manager: portage-2.2.14 --- dev-qt/qt-creator/metadata.xml | 6 +++++- dev-qt/qt-creator/qt-creator-9999.ebuild | 31 +++++++++++++++---------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index 9626a26..46801bc 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -11,9 +11,9 @@ 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 Add support for IBM ClearCase version control system (requires manual installation of ClearCase client) Enable cmake project manager plugin - Enable support for vim-like key bindings 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) @@ -21,4 +21,8 @@ Build plugin for QNX/Blackberry devices Add support for memory debugging using dev-util/valgrind + + https://bugreports.qt-project.org/ + http://qt-project.org/doc/qtcreator/ + diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 8deb747..94a7154 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.0.0.ebuild,v 1.1 2013/12/19 22:31:44 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 1.1 2014/10/14 23:34:31 pesa Exp $ EAPI=5 PLOCALES="cs de fr ja pl ru sl zh_CN zh_TW" -inherit eutils l10n multilib qt4-r2 +inherit eutils l10n multilib qmake-utils DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="http://qt-project.org/wiki/Category:Tools::QtCreator" -LICENSE="LGPL-2.1" +LICENSE="|| ( LGPL-2.1 LGPL-3 )" if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -29,26 +29,26 @@ fi SLOT="0" KEYWORDS="" +# TODO: qbs:qbsprojectmanager, winrt (both require qt5) QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar - clearcase cmake:cmakeprojectmanager cvs fakevim git ios mercurial - perforce python:pythoneditor qnx subversion valgrind) + clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git + ios mercurial perforce python:pythoneditor qnx subversion valgrind) IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}" # minimum Qt version required -QT_PV="4.8.0:4" +QT_PV="4.8.5:4" CDEPEND=" =dev-libs/botan-1.10*[threads] + >=dev-qt/designer-${QT_PV} >=dev-qt/qtcore-${QT_PV}[ssl] >=dev-qt/qtdeclarative-${QT_PV} - || ( - ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) - ( >=dev-qt/qtgui-${QT_PV} =dev-qt/qtgui-${QT_PV} >=dev-qt/qthelp-${QT_PV}[doc?] >=dev-qt/qtscript-${QT_PV} >=dev-qt/qtsql-${QT_PV} >=dev-qt/qtsvg-${QT_PV} + clang? ( >=sys-devel/clang-3.2:= ) " DEPEND="${CDEPEND} virtual/pkgconfig @@ -70,13 +70,12 @@ PDEPEND=" " src_prepare() { - qt4-r2_src_prepare - # disable unwanted plugins for plugin in "${QTC_PLUGINS[@]#[+-]}"; do if ! use ${plugin%:*}; then einfo "Disabling ${plugin%:*} plugin" - sed -i -re "/^\s+${plugin#*:}\>/d" src/plugins/plugins.pro \ + sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)${plugin#*:}\>/d" \ + src/plugins/plugins.pro \ || die "failed to disable ${plugin%:*} plugin" fi done @@ -85,8 +84,7 @@ src_prepare() { sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \ share/qtcreator/translations/translations.pro || die - # remove bundled qbs for now - # TODO: package it and re-enable the plugin + # remove bundled qbs rm -rf src/shared/qbs || die } @@ -95,6 +93,7 @@ src_configure() { tests/*" eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ + LLVM_INSTALL_DIR="${EPREFIX}/usr" \ TEST=$(use test && echo 1 || echo 0) \ USE_SYSTEM_BOTAN=1 } @@ -106,7 +105,7 @@ src_test() { EQMAKE4_EXCLUDE="valgrind/*" eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" - emake check + default } src_install() {