Remove widgets USE flag wrt bug #448178 as it causes build failure when disabled.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 24 insertions, 23 deletions

diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index d0a3739703ca..95778660a479 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtwebkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.15 2014/09/16 14:47:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.16 2014/09/25 11:15:09 kensington Exp $
+
+  25 Sep 2014; Michael Palimaka <kensington@gentoo.org> qtwebkit-5.3.2.ebuild:
+  Remove widgets USE flag wrt bug #448178 as it causes build failure when
+  disabled.
 
 *qtwebkit-5.3.2 (16 Sep 2014)
 
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index ae57ae13d689..4484763c9bbf 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -7,25 +7,24 @@ AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb6758
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qtwebkit-opensource-src-5.3.2.tar.xz 33445540 SHA256 e47122ed15e8e1cc32e11b3cd89bacc056437215134a204899f2fddb4fd92e5b SHA512 f04e18b550fe0feb1451361339f0a71cd95f65f6a1989b157ed79291e20fb42490f176fc30932ccf4326865ae6f01688b6ad5af7ac6a434d25add5f6557d175c WHIRLPOOL dd5313db10ef23feb134235f7df93733b1d6a93dd0d1e324b6688559f05625edabed6e069df5ba783cc5f8e91649adc373e803fc2fd16c5b984473fc1a145523
 EBUILD qtwebkit-4.8.5.ebuild 2053 SHA256 04be7ac80d16a4f2b9f12039d86ab9de9d645256f11ae9eebe5d0544ebb62253 SHA512 1bec3aec1bbc90f3148d798bd57cb4d92cd638048905e33d3aac8e3844b341839ceb4f50b41b54532dcbd87a3454e9a464c4e47953202e03519e5bd16cd9275a WHIRLPOOL 08d7e1948d1aff0806a4ade799effd42ae462d859d59321e10610020c4f038468735843e7d042a9a64970a8eae756adfb7b0927cd59b816de160dbeccbd05109
-EBUILD qtwebkit-5.3.2.ebuild 2882 SHA256 dc30ede84d89f0e90aac233a2f7b48fb3eb74d22887af6abaab9ae91e253be8a SHA512 c3734d5a4bb5fe3f2d38672285d910377ead174aaf52d8e816b91121a907bb6dc255e6cfb6ecc37b54cc83748e520d1f52050c1dd877453e204b0c3558c849a7 WHIRLPOOL a92f574c044903c3eab4401df21cd22cf8c9bf435e21b92412485539b33a8edac5f1c2970596cca33cad4bc696938c0048e86240b9b97e19d39c9556908b4c8f
-MISC ChangeLog 27714 SHA256 09372cef1f905b69a42d0b2b0a654840cbfe46d7a5190ba4d6837da85e9cf35c SHA512 2cfe1f879d63f05b6fad5bdcdcf053569771c35c9a20c51f3d519ceaff5f0843dd0d5b335f025fef73be7de28589a393d4a60ebe262ed0014e67c1dfa8ec1b21 WHIRLPOOL 028af117bed4902777aba2316e12447ce7a54c7726cac013f95426931cc4fac77568738e7e2fd771bf066b1d47043a43f444e07e0400a9bc21a7246d5581231f
+EBUILD qtwebkit-5.3.2.ebuild 2775 SHA256 11e4d677b323598e42cda70ef7604f7fb49e3433f6b73b54e75f8a3eb0e61bcf SHA512 6281162c2cb701fbbe34a523e29e824aced09e6b9c9da50934458a5e0081ca2cf7679f78e8e0a72b2dcf048952422a2bdf102e783893b6a3518943468606f740 WHIRLPOOL d2b5a3e12248287afa69557e1b3740564c78ce6190870d6cda5667e6e62352bf9bcd2ffab6d2868b11ba092bf9f7275923c37b37a948195d4bac8b47665d7a0f
+MISC ChangeLog 27886 SHA256 37f15c0424b6fab6551e8ecddadabbaa8b9ce802b0b971269ad1d29d75f6916a SHA512 606100bf08d923061201c73531658c7d048421f496ee6e64bb1b40d6712bde4fac0dd20e44b9c7d773e13268097198c39a25169133689c8ed0a636eaa4cf501a WHIRLPOOL cb9ea4fd50553dca4f828a2f7e848143dcb660109ac93ca68f037acd7267e1d495662658e17ab81047ad8b826e0fafcee85c73fbfbfee93268f6ae81a7a37bc5
 MISC metadata.xml 1082 SHA256 b41ae0961662a0f93c8a494d5fd3c3d982760c4cc5ba9d15406e5c34fee4e971 SHA512 33c1192bb2e6efa6480a91b89ed90838a9d9067ba1c3c94b333de2b08035c58bed7bb0d85959c597df2b68e2a35432eb054a465c616012ca6e12e03e6cf96da6 WHIRLPOOL 3e9b3f27c5fef88ce3930eccb58023e9dd8da52708ceb3d565d89d2934ee5c58b954d0686c2aa5d86497ecdf412753628a6e1e71bd39a8e6a5d92e5bbb3c4805
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUGE2NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV972AP/0KwO3+VXqfHo43JXmDLwY3o
-3jmX2IUudXPQLKb8KNS5MFO50+8zGNHe+T+d1UgBvNAZfTfWJEu+JFbRJdnzkigL
-aPDpGqOLU7NSyVJfSYDD+aX/n39xc/AjbcfluMXZSGdiYYHBwANzoO2EUJV/Es5p
-zhPsiCsbSA4MfEzoQLokAp5gKFltYnzWEET1gov5Tu7x4zqXpMbF+qvMmsXEoRAC
-aBuShSjUEuhLXxpTLV9wY+V0Q+cTMkKRUH5PMkZQ0jrrrXE/DXI7sTQno/qk/hR4
-4MxXlMQOHjwg7haSAyJhcEeo0zFQZ2Te2gICb7MCehvjwsV4I+nnVBRFzK/N+Cr8
-NHobKd25A9ICgxXiOwWAagpz1D9S4Qhlno2NJY6exneoDGaP4TIVUvWmtUGrXQVi
-RaLs2VnSX9IaxxWfZ0DWNB8XF0w3ONphWQZuQalP6t8Fwz0k8Joe0/7388Mzianj
-DVbltzkl0CQ/BbIXdFKybQy/OFa0VQdUY/C+SU4omc5huOLigknjIF1MwQYhwP/w
-qai4nnC5tyT9YlhIQ6lZns2BN+M/A/o7RP1NjagYWKy/L3ygIwSUCoZELGeDJlTv
-t3Yk/3fhET9otYpwDwQXO5WXiVSnyUGmZ1KgSPWYpvpUFd2lBtYGwP1APPn/bIvg
-26zXPxP99mOgZn4wtW/l
-=/6mJ
+iQJiBAEBCABMBQJUI/nORRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7Kq5EACpoT7o+3tWiae7sYDM5y1MXUkS5hdfM4RNUsezjVGdcxEieqaFcEe28vKq
+YI8kIxRgrLeQNShITZxgWHGRQ857pyZv1gKlyrG3IBf66dOh/I7o+R7L2Ed6OdwQ
+9J/Nuwmg/BEKQcmvkbSV9PkWwIgzRMlvo4TrcHfWKr7uYmk10ZgTHWBMgLC5JHPT
+8iDQ9m4HkkYT28sk5jdGZws1cKAGl9R5lwBU4V1guh5AKlzCWUeimvBYQp0rQys6
+pPcLmkMlhyacfpULq+TukkE7m9gdy30qJFf1FPfsUuCMre1zbaMEEIUwQgznSFim
+vkp87NVQDHLdEgXvCyTowkrrSdFQF5jNzRnVMTEwhBcQbwIS2Pfen6oAP6V97YRK
+k/au6SdUyk81trGwKcclqfakanIvkZGg5ZYDvHEtYBdkwYDkj4rtDTBPRP3/meTS
+SdTqc6gFb5dKOghaeNpa8rbmHcg/6r9UgSiMyGgu6ItsfGux4uXBn8G/4iGZ/vwK
+roCI+Qs+4sRGKqx6b89GMINtYxbz7ZXnARAG+oyLI12pue1Tx2uGTcFT3tEmyWMJ
+sU8agZ59ocID1Vbd0MqpBE8VzHaRta52xicivWlbYrgIyC0G04M7YPq6CkzITNGW
+G0UAVK+n09AlXtn4WPy44x3UaCXBKWjmWm5ny5Fc0Ntp6Q4ylg==
+=gFef
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.2.ebuild
index c72d9fb1f1b9..a01aea54c7c1 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.2.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2.ebuild,v 1.1 2014/09/16 14:47:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2.ebuild,v 1.2 2014/09/25 11:15:09 kensington Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets xslt"
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -27,6 +27,7 @@ RDEPEND="
 	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
 	>=dev-qt/qtsql-${PV}:5[debug=]
+	>=dev-qt/qtwidgets-${PV}:5[debug=]
 	media-libs/fontconfig:1.0
 	media-libs/libpng:0=
 	sys-libs/zlib
@@ -47,7 +48,6 @@ RDEPEND="
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
 	udev? ( virtual/udev )
 	webp? ( media-libs/libwebp:0= )
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
 	xslt? (
 		libxml2? ( dev-libs/libxslt )
 		!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
@@ -76,8 +76,6 @@ src_prepare() {
 		Tools/qmake/mkspecs/features/features.prf || die
 	use webp         || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
-	use widgets      || sed -i -e '/SUBDIRS += webkitwidgets/d' \
-		Source/QtWebKit.pro || die
 	use xslt         || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
 		Tools/qmake/mkspecs/features/features.prf || die