commit: 7302a67c078138acda3be229e230babb19eba4c5 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Thu Dec 17 02:39:23 2015 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Thu Dec 17 02:39:23 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7302a67c
dev-qt/qt-creator: sync Package-Manager: portage-2.2.26 dev-qt/qt-creator/qt-creator-9999.ebuild | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index d12592a..5248c5b 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -2,9 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW" -inherit eutils l10n multilib qmake-utils virtualx + +inherit eutils l10n qmake-utils virtualx DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" HOMEPAGE="http://doc.qt.io/qtcreator/"; @@ -53,7 +54,7 @@ RDEPEND=" >=dev-qt/qtxml-${QT_PV} >=sys-devel/gdb-7.5[client,python] clang? ( >=sys-devel/clang-3.6:= ) - qbs? ( >=dev-util/qbs-1.4.2 ) + qbs? ( >=dev-util/qbs-1.4.4 ) systemd? ( sys-apps/systemd:= ) webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) " @@ -82,7 +83,7 @@ PDEPEND=" src_unpack() { if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then - eerror "GCC version 4.7 or later is required to build Qt Creator" + eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}" die "GCC >= 4.7 required" fi @@ -94,6 +95,8 @@ src_unpack() { } src_prepare() { + default + # disable unwanted plugins for plugin in "${QTC_PLUGINS[@]#[+-]}"; do if ! use ${plugin%:*}; then @@ -135,8 +138,7 @@ src_configure() { } src_test() { - cd tests/auto || die - VIRTUALX_COMMAND=default virtualmake + cd tests/auto && virtx default } src_install() {
