dev-qt/qt-creator: version bump

Package-Manager: portage-2.2.28

3 files changed, 15 insertions, 12 deletions

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index a84b87afe691..6a5106fa99a7 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,4 @@
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
-DIST qt-creator-opensource-src-4.0.0-rc1.tar.gz 22781346 SHA256 33e478b4c5d024bcab07fa6974b2af6818666812ff88f153405bedb557e0c566 SHA512 b109a5144c276183d2c9ae1d2406bf555536b3799bf3ea442d2fed37495eb2c79a2f3fbfbbd060fdbecd4d4a54804b56b9f81285127621ffb382de89b5bdb451 WHIRLPOOL f04b51d848230b7c791659e899a8e7c517488972447a1426aa36bf95e25803ee94dd2458fa0dabd7f5a68d156a8b0ceb789331dea3200dccd0d16d8cc560e3a0
+DIST qt-creator-opensource-src-4.0.0.tar.gz 21613655 SHA256 0cc21d720bafc72ce67f45a5553c618e8fffec3f2f23b94a2b2a9ba68ed0e2c8 SHA512 7c845636b60d6eb0c23171661d02d768c564e942a0b653213b12ec121fc9f9865fe859bc647566c19adeb6fc5d1832bb901df8dc00462cb5fde7bbd3c59c5a42 WHIRLPOOL d20cd3ba5a0ea8314439d67ba444291e4251045ed37e2948854a3c6e01c2b56a4c89f0e112aa7ef6109e32c4931d521b3d2cc8cec82182c8b60d7d8c77d767a5
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 2266727ccb15..6671b8a39690 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -30,6 +30,8 @@
 		<flag name="qnx">Build plugin for QNX devices</flag>
 		<flag name="systemd">Add support for retrieving application output from journald</flag>
 		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag>
+		<flag name="webkit">Use <pkg>dev-qt/qtwebkit</pkg> to view documentation</flag>
 		<flag name="winrt">Build plugin for WinRT devices</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.0.0.ebuild
index 9135dff10f5c..c0f6bbbd28a8 100644
--- a/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.0.0.ebuild
@@ -29,12 +29,14 @@ fi
 
 # TODO: unbundle sqlite
 #	allow disabling modeleditor plugin
-#	we can avoid building some libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
+#	it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
 	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
 	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
+IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
+
+REQUIRED_USE="?? ( webengine webkit )"
 
 # minimum Qt version required
 QT_PV="5.5.0:5"
@@ -58,8 +60,9 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( !dev-util/qbs )
+	qbs? ( >=dev-util/qbs-1.5.0 )
 	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "
 DEPEND="${RDEPEND}
@@ -118,11 +121,10 @@ src_prepare() {
 	fi
 
 	# automagic dep on qtwebengine
-	# TODO: re-enable behind USE flag when qtwebengine enters the tree
-	#if ! use webengine; then
+	if ! use webengine; then
 		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
 			src/plugins/help/help.pro || die "failed to disable webengine"
-	#fi
+	fi
 
 	# disable broken or unreliable tests
 	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
@@ -134,20 +136,19 @@ src_prepare() {
 		share/qtcreator/translations/translations.pro || die
 
 	# remove bundled qbs
-	#rm -rf src/shared/qbs || die # TODO
+	rm -rf src/shared/qbs || die
 }
 
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
 		$(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
 		$(use systemd && echo CONFIG+=journald) \
 		$(use test && echo BUILD_TESTS=1) \
 		USE_SYSTEM_BOTAN=1
-		# TODO: re-enable when upstream releases a compatible version of qbs
-		#$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
-		#CONFIG+=qbs_disable_rpath \
-		#CONFIG+=qbs_enable_project_file_updates \
 }
 
 src_test() {