commit: d60e12dcfb5c1f9d79e3a2e3ce615205d3a93b98
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 17:34:21 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> 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 @@
<flag name="autotools">Enable autotools project manager plugin</flag>
<flag name="baremetal">Build plugin for bare metal devices</flag>
<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version
control system</flag>
+ <flag name="clang">Build clang-based code model plugin</flag>
<flag name="clearcase">Add support for IBM ClearCase version control
system (requires manual installation of ClearCase client)</flag>
<flag name="cmake">Enable cmake project manager plugin</flag>
- <flag name="fakevim">Enable support for vim-like key bindings</flag>
<flag name="ios">Build plugin for Apple iOS devices</flag>
<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg>
version control system</flag>
<flag name="perforce">Add support for Perforce version control system
(requires manual installation of Perforce client)</flag>
@@ -21,4 +21,8 @@
<flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
<flag name="valgrind">Add support for memory debugging using
<pkg>dev-util/valgrind</pkg></flag>
</use>
+<upstream>
+ <bugs-to>https://bugreports.qt-project.org/</bugs-to>
+ <doc>http://qt-project.org/doc/qtcreator/</doc>
+</upstream>
</pkgmetadata>
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-4.8.5:4 )
- )
+ >=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() {
