[gentoo-commits] proj/qt:master commit in: dev-qt/qt-creator/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     203cc8f58ee090791ab5554c073488844e4465c2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 00:52:43 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 00:52:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=203cc8f5

dev-qt/qt-creator: sync with gentoo.git

Package-Manager: portage-2.2.20.1

 dev-qt/qt-creator/qt-creator-9999.ebuild | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 286c608..e878225 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -44,17 +44,16 @@ RDEPEND="
 	>=dev-qt/qthelp-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}[ssl]
 	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtquick1-${QT_PV}
 	>=dev-qt/qtquickcontrols-${QT_PV}
 	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
 	>=dev-qt/qtsvg-${QT_PV}
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clang? ( >=sys-devel/clang-3.2:= )
-	qbs? ( >=dev-util/qbs-1.4.0-r1 )
+	qbs? ( >=dev-util/qbs-1.4.2 )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "
@@ -81,6 +80,15 @@ PDEPEND="
 	valgrind? ( dev-util/valgrind )
 "
 
+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"
+		die "GCC >= 4.7 required"
+	fi
+
+	default
+}
+
 src_prepare() {
 	# disable unwanted plugins
 	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do