dev-qt/qt-creator: version bump

Package-Manager: portage-2.3.0
johu · Jul 9, 2016 · 7e6473d · 7e6473d
1 parent 1c44304
commit 7e6473d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,2 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
-DIST qt-creator-opensource-src-4.0.2.tar.gz 21651190 SHA256 c2fce74fef0cc3a8f5c03d7ed1e95ccfe508d855ee750647896876824fcaee10 SHA512 117b3f90a44b509fec47b1c623db76b83f1ead669b3bba5a591d4be09737f677be7a5ff5d4882087ac3118471f664ae012266857c4cdade74dcccf25730044c5 WHIRLPOOL b50b529da52d465fd7c798aff7183bac49f074184c0e29ce383a3f4dd64b2f825f40d9513e086040e22450fcf7dd254b667c9566ad37d6901ee65837aa007e1a
+DIST qt-creator-opensource-src-4.0.3.tar.gz 21972901 SHA256 a213a9b66e7e0eb906036a1587256fc0f7bac33912d9ae5e6117459231f56449 SHA512 7b06b9d2cb050008cbbceeb2f18ad2264a2366db9ad37474b63d0a6d30a3bde86ecb770678beb88af4d5be7550e947c689d23956e2062796cbf9476006c0528a WHIRLPOOL 7d515a038dec69980305a43545d952a1083f00add756e82cd0b568bc2c31c8eb81667822295b352cad2c54c3a447a31e9c8203db25d945023fc70ff2f0d01cd5
diff --git a/dev-qt/qt-creator/qt-creator-4.0.2.ebuild → dev-qt/qt-creator/qt-creator-4.0.3.ebuild b/dev-qt/qt-creator/qt-creator-4.0.2.ebuild → dev-qt/qt-creator/qt-creator-4.0.3.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n qmake-utils virtualx
+inherit eutils l10n qmake-utils toolchain-funcs virtualx
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -60,7 +60,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.1 )
+	qbs? ( >=dev-util/qbs-1.5.2 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
@@ -71,8 +71,8 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? ( >=dev-qt/qttest-${QT_PV} )
 "
+# qt translations must be installed for qt-creator translations to work
 for x in ${PLOCALES}; do
-	# qt translations must be installed for qt-creator translations to work
 	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
 done
 unset x
@@ -90,9 +90,12 @@ 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 ${PV}"
-		die "GCC >= 4.7 required"
+	if tc-is-gcc; then
+		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 ${PV}"
+			die "GCC >= 4.7 required"
+		fi
 	fi
 
 	if [[ ${PV} == *9999 ]]; then