Add webkit USE flag wrt bug 538236. Remove unused debug USE flag from 3.4 ebuild.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

4 files changed, 45 insertions, 25 deletions

diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog
index 3e81078cabd1..5e4cb6436346 100644
--- a/dev-qt/qt-creator/ChangeLog
+++ b/dev-qt/qt-creator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qt-creator
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.49 2015/04/28 16:11:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.50 2015/05/04 00:09:31 pesa Exp $
+
+  04 May 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-3.2.2.ebuild,
+  qt-creator-3.4.0.ebuild:
+  Add webkit USE flag wrt bug 538236. Remove unused debug USE flag from 3.4
+  ebuild.
 
   28 Apr 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-3.4.0.ebuild:
   Raise dev-util/qbs dep to match bundled version and to fix bug 537244.
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index f4cd8bac15d3..829bd9d5598e 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -5,26 +5,26 @@ DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb
 DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb79537f3d8d251dbc3c9808d0ff377efe5c4fad7dbd8f0 SHA512 f85381eb6f56d787e5efe02407c4b6f949fd2a766a25567ceccb3a002ec7dd9c6277d9cf39ef0afdd8e110d7bc7436344756225784009a2e01ba9fd8428f885e WHIRLPOOL aa65009cffbc10161cdd9f8e70121c5b2e80df034bb1e06400558a947dcf3284cc23d1b162f85a7ed19af216f0d94d0c5f997c0072c3f19149f64e528fde36a7
 DIST qt-creator-opensource-src-3.4.0.tar.gz 23199469 SHA256 b80baf5be9b0421b3d951a8a0eb411a65cf008f4c753f5a80d205e90fa4fe112 SHA512 26d527a914b073f16dffe92314635af975c5878221dfbb8b7d0d0279d38e7934b062a4087f352fe619da2db1f66a090dc3f93ac2c1596438bd3d3f08d67e3d82 WHIRLPOOL 92e695b4f02634cf54d4126c2b81e50879040a6fbd4adb564068af086d80197a683035428c1409400c53644df0a875d0921032243cabdf1ced03875c4b25ae8c
 EBUILD qt-creator-2.8.1.ebuild 3150 SHA256 034e4af5d417417ca6e9b833a87f826eea5d812b518913f6c504cd3a88db9e32 SHA512 41be818bee40a55d4313a7126ec99bc90a502e2182cbb53def233ae0f9e465145fe8379087910554ecb39f44a05a7e69b0e18ab519cce7b66b2d8f35cdeb983b WHIRLPOOL 9adcf26642e8bd341a44b61f5fd859375658a2835eec8e090d3f68f70be5efad68e9b030e53a6f76f1deaac870f053843b3b1ba9159cc5f2edc1a5bc418ac251
-EBUILD qt-creator-3.2.2.ebuild 3521 SHA256 9edfe4295c86ff8bb6a284cd201b63e439ae15a530d106eff99ff94ba8d26535 SHA512 c964e6259e18432388d7b87db027628d411ae5f3d12bf8554f977371efd930490b502b34b2e4d49196e682dc7302d56f6816e288f38f6dd3620ce93a16e2ebe8 WHIRLPOOL 62d456a063b2eb965f0ee3749b30a889aa2107104bbff26a65e58fd3c515022060e0200033314c2b7f8f57956717d3f80f56be222c51ff87b6e975fc3b69b897
-EBUILD qt-creator-3.4.0.ebuild 4167 SHA256 d8a5e23d7895b45442df1a5bf468a17a8d87c449cd76e640caedea84f36337db SHA512 7a01ec52060f9481db7ccf94579f8114e6b80f8eb38b1ed469746f835e693691668bc5315290ec9ea3e979e4f71c2b21e4d375338fdb37ea5d95e6ff28501ff7 WHIRLPOOL 8f325fb06c7e4dda0781e55a03095989a42a1dc32a4c85c7275c94dba8b1b09d8f88089079669cb99f50aca14cfe311ca1f28b5271d1f6a647263d28765f66ee
-MISC ChangeLog 29162 SHA256 1fa74b8b636504378e278b3fefb031ef9585defb6777c1af30d301739db8525e SHA512 204295ded50ec1283abd6b82b7d737d8a3aedc88597ac876000ce44ba97209e49572091366a1d6cd1d335f2e660e872ffe358a327f3b6acd4a91b05c43168d71 WHIRLPOOL e225db2ac7190fefb41fcc1d6c374588836626db48d0e2cd5516f69122ee3ab0ead8d3907f6e10554a41da6f672fed47cd1d395a980145398105d3cb227585a5
+EBUILD qt-creator-3.2.2.ebuild 3829 SHA256 0aeb60b14e881f8b1a496e26de6cd1fe13dba462d4a9fd67e674458d32a506f8 SHA512 c21d1fdecbf0572f00c2c8afd1a17f823c6329cadebb70931a8067f3197c6add2b5f2e7e1ac07afd812d2a7ec77b488dd7e62048c1cbfe2814bbeed382b2c1ea WHIRLPOOL 2d220d054109014299d2fe574946d06e39c88f7fab6e5e9e6122a21e80fe24749d68ee7567e2d40c42c49c9dab8028c3cfc2c03c965811f8a3104c0769e176a9
+EBUILD qt-creator-3.4.0.ebuild 4398 SHA256 4a9bc5a7b3326d878fb508f69383fdbfca2319b2c84b96300fc6f0458306696a SHA512 1ceef3cc6875a7b7e5103cf3e37e82ba1dcd94dfeb761c95676da9023caf01f447585bc737a4427ab8a65f8ff68192815622284717111ee4e928bf656ce085a7 WHIRLPOOL 62dd3e77303ec1a52343d384c61ee8f0db9511de2fe77ff02c12da181e1fc78115acdeccd9eb3262b03e08b24ceb9f31ffd60817c4afe11125b8b44f568769d4
+MISC ChangeLog 29351 SHA256 f6af48f1cfc7ba6cf5e568986db1ba03f85652cfee4806d883a4c02976236bfa SHA512 1a7081e9b260999a247332805180d3baf3ca2c4665d76b78b48eeaa188874db79cfc675753fc5c4879bc9f8ebc575e878e4c943df5e278272579798b1b06cfce WHIRLPOOL a87ea2e1e65df809ea360f46ff310e4fd06cbdf179191f767165539dbf70e03b1e49fd529cccbb0a9da97ecc998c4699e8a10e4a3c9dfa3e47c6a331dce45e6a
 MISC metadata.xml 1820 SHA256 e438e4152bace75a28ff1ca22324d0e1ade63d2bbafa81b4b5a33a456ae130e4 SHA512 351e7f71c578552fa8e167307372a300ecba64a59aa089184dcd7d20ebe3763c4ee294bdfd0262b95b0995e238412f02ef90d18f43db87bb8360ab0cc8b3f7ea WHIRLPOOL 2eeb30fc5eea23140d462169f2f1fee019f518f44cfbfe07cc841f3a8117b20c1c5b8af9692ab1a4774359c9822312deaef431395f17c1b80dca0cb99d82c466
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVP7FEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVRrjEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9HUEP/1P35fIV7N9vkOd/v5GkTkwH
-4p+wG65r5WwhC2uEdkORowk+/8Y5CTA81b89mU/UNvEVVQ0V9RecF1BMa8y0WgPI
-SQ/dJkY6gvGkBJa2kKMIN0OiqVlJsnt/+23e/DB30x8W4ZxLs6gN/5f1wPhtC80s
-LeqeLo8MS5IS5G56z91rno01sxk69er35vkNxhuFKdFyPWEgEtO6atHlUDUPL/PW
-vtirDiHtJ/nRqPBDPHkm9mJhL34iKZ9lJltNp5F0lNKzqiaDUGbdSvH45h0NCxB6
-snRn2LNcVhWBSavWiq3TtqVz23qvFcNMMmZouWsm1PPo1sf2S1kUpYpaMPuuwxdP
-WcSVzf+DPcmC4zTTaZEqJio/3775kmp/zdN2oIRm/LiAYbQD7TsmPp91XHmGJ9Et
-4BWCdIxRtFt2iVbNOg4dGqZpPTBdhOLIbe/snIK0EM1z9jI02uLLrS4Zfr3N2ar5
-k6oY5km5+hnZyZIq2jJab3EycTmO8tZnhdNaCInHlsE9s0gqg1dm4wFNkIrz3lVW
-8CB21wtqYgM4RxyXj4EzxUcv2F4i+ZFBdMOnL4EDCd7XpRjztwm/xwqKAcuWubSN
-F0l611inUoDTnc9bPXH7h6vy6Pqa0Strerp/AVnw8QGSAMW0uTxFGMtdhRW3NNdo
-d7u3DWu5hAsMbCe0tE6D
-=EiGA
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9YjYQAK81awEOTdcqG2+F/R1Mt/Jq
+2zpPQwkJ1iYLUnBaeTzk7NddTvamVCAFhBIPwWpOp1zTr3PTOQ3kjoWkvkx65aVa
+h1IjpGCc+71LfHE1lw9EYi0gkFTYsVl/fxc2G+poChfHy/xsEdnvaRp5xmKz9bQ9
+WBtjspJ4TGkMkELHYEgv2eIe3feqrt0WiHB8rbWgjQC8k8AEh74KAmHIvXdomngg
+TAvbs/oB/xOWkUZ0aN6HLc76twZTRviBfzynl6bGUKH2JFZwuo2C1i41wppeBIJM
+XBjqLotbGWFBQY45vuXvqcyxgyS3waDzbCyaatDkDlZVYZcIXNBRULSfyubD/2yb
+9WpSA2TOKT1FqQsonrLnTq1vSIe6RGQUhMoaLguHd003hRD+Z3do4xveeHz4D1dC
+TW6LyLevzFB7yjkpKy4YVRDx9Eg4Dlg4IdAzpVMJtyFPvlwb933lNf9EncTdBOvp
+ELfQb6B3kvfP4Stg6zbwphjy+hw4K7QZc2XCbTXnsrWS/LmHq+rbR7cUipJ7kQZn
+rIVCSR6jXldNSlA8AbuouWXq2b6p+/83sGRgP+WwwEEFxKL7y40Iid1a/WSU6hik
+/0S2XZ5sdH+vR8ZdKYkZdJh8lQ0RbQF9YVfuVgqRfgPDi8swDoHUzzPHyGOb0SMB
+jOXSGc8TPYxiauwNCP3s
+=UCTG
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
index 10a643dab81e..805ad0fe1a85 100644
--- a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.2.2.ebuild,v 1.7 2015/04/01 20:57:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.2.2.ebuild,v 1.8 2015/05/04 00:09:31 pesa Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
 QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
 	clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git
 	ios mercurial perforce python:pythoneditor qnx subversion valgrind)
-IUSE="debug doc test ${QTC_PLUGINS[@]%:*}"
+IUSE="debug doc test webkit ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="4.8.5:4"
@@ -47,8 +47,9 @@ RDEPEND="
 	>=dev-qt/qtscript-${QT_PV}
 	>=dev-qt/qtsql-${QT_PV}
 	>=dev-qt/qtsvg-${QT_PV}[accessibility]
-	>=sys-devel/gdb-7.4[client(+),python]
+	>=sys-devel/gdb-7.5[client,python]
 	clang? ( >=sys-devel/clang-3.2:= )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -75,6 +76,12 @@ src_prepare() {
 		fi
 	done
 
+	# automagic dep on qtwebkit (bug 538236)
+	if ! use webkit; then
+		sed -i -e 's/contains(QT_CONFIG, webkit).*$/DEFINES += QT_NO_WEBKIT/' \
+			src/plugins/help/help.pro || die "failed to disable webkit"
+	fi
+
 	# disable broken or unreliable tests
 	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
 	sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die
@@ -112,9 +119,10 @@ src_install() {
 	# install documentation
 	if use doc; then
 		emake docs
-		insinto /usr/share/doc/${PF}
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
 		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
 
 	# install desktop file
diff --git a/dev-qt/qt-creator/qt-creator-3.4.0.ebuild b/dev-qt/qt-creator/qt-creator-3.4.0.ebuild
index 8601e3b97e84..e0c5eba70216 100644
--- a/dev-qt/qt-creator/qt-creator-3.4.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.4.0.ebuild,v 1.2 2015/04/28 16:11:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v 1.3 2015/05/04 00:09:31 pesa Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
 	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
 	perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="debug doc systemd test ${QTC_PLUGINS[@]%:*}"
+IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="5.3.2:5"
@@ -59,6 +59,7 @@ RDEPEND="
 	clang? ( >=sys-devel/clang-3.2:= )
 	qbs? ( >=dev-util/qbs-1.4.0 )
 	systemd? ( sys-apps/systemd:= )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
@@ -93,6 +94,12 @@ src_prepare() {
 		fi
 	done
 
+	# automagic dep on qtwebkit (bug 538236)
+	if ! use webkit; then
+		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webkit"
+	fi
+
 	# disable broken or unreliable tests
 	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
 	sed -i -e '/dumpers\.pro/d' tests/auto/debugger/debugger.pro || die