Add missing patch file.

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

10 files changed, 470 insertions, 51 deletions

diff --git a/dev-qt/qtsql/ChangeLog b/dev-qt/qtsql/ChangeLog
index 4bfd9ac236d9..77a7d39cbe07 100644
--- a/dev-qt/qtsql/ChangeLog
+++ b/dev-qt/qtsql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtsql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.16 2014/09/11 01:46:33 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.17 2014/09/11 02:14:01 pesa Exp $
+
+  11 Sep 2014; Davide Pesavento <pesa@gentoo.org>
+  +files/qtsql-5.3.1-path-filtering.patch, qtsql-5.3.1-r3.ebuild:
+  Add missing patch file.
 
 *qtsql-5.3.1-r3 (11 Sep 2014)
 
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 0eddd90f7074..8a3b0b1737ca 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qtsql-5.3.1-path-filtering.patch 919 SHA256 54cf01db78e68b20f43a5040679df82774d26132740ae222391c61d32d68ebe2 SHA512 794408389b83b2eef2a106682c3a98db40647c1d4449e957665bfbcd81462ba5744c69dfdcdc74f50fc2870ec5eb49e4738ec472838d26edc01cddb3e9caa8c6 WHIRLPOOL 50534ee0794aa98eba02176fe7dd122e37a84966a1866cca18052df7150aee638363c61420201519e4ffc7a923f398baadc409a1e43af520e649cf5440359e0d
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qtbase-opensource-src-5.3.1.tar.xz 46679724 SHA256 7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569 SHA512 b867d8c2f37007770d8105fea1820f8a2b1c2006474c28fbdc29fb7f7dcf9eee0960752805c833639eb7b0fd92c670f552bbc4a7064d0daf5bbac875d081500a WHIRLPOOL 997415bdae97c854916c055e2b5b8af47bc406a546aae24afa3e0fabcc53a3999efcfae7e17cf12dc1b87a79f29af5ae7069250fe6be6d9308f7e2df6001da27
 EBUILD qtsql-4.8.5.ebuild 2489 SHA256 92c0f2de46f73a5d211e39ff47a749c19055ab1f4822a6ffab839cbed6962192 SHA512 18c5833ad609ab5cb6ee7a387bc82d437668a7fc2a89c5a556dbcdd0b85b99484edf5dec23b7e74b59c3762b519d8f992f66fd9405576b5355276c3fc39281fc WHIRLPOOL ca18b091bc6ff37db51ae820df032e86b8a2e3ea2ad20d89dc8e331c6200da9300a2a466d710a240d81bc7256d6a17997cc61ef1bf441d092492972672c9ec75
-EBUILD qtsql-5.3.1-r3.ebuild 1572 SHA256 52d250fbd6fceca15b507caccce99f65951e26b7538346debad86d70ffe74dd5 SHA512 e6a9b5ccb07eb4a39ed8494d1575dfd3fda93643d41609abd431c69231ef6e12ae4b8c09ebc818841e657d31f77777b90b2ea05be86bae3fe08d947229ee465b WHIRLPOOL 1f4499f9fc8827042b06bb2fdb7bdae861f3b68395eaeccdc297025175066db85704add86b93763b6a350273c57b7c5549d58af9990aa679c87dabff3b8dc8b2
-MISC ChangeLog 21282 SHA256 82fcb8220dca4babe75dbe72d1e7fc2b17474a26bd9bb4966307e140d77afcbe SHA512 1595fa32f88bb10f16edecd5669742f7419eff84890c59a43a76fe0fb8960781419219b7f3f56401477eec1dc7120a0c52d7f18fc3baa1624808c4bbdf4676f3 WHIRLPOOL 404fe174db49ebe67b74c85af4b2197dee4cfec59b36c70166553adf5237c2f5494b09c865a6d2b43de345c2e06b88c74f8a9ab46126b49eb15ebb3022ec6346
+EBUILD qtsql-5.3.1-r3.ebuild 1580 SHA256 c11ab14bcd5be4dbbf7c4fdaa8e6d23829dc65ae9372ef058202f25529166781 SHA512 68792b211df238c3d803dcae42684975c41eb9e99381042233ce77631115fddfb8e5bcba13d80a16e2a22be84e864d7ae2289cf5317bc3f66ef2f3691264748f WHIRLPOOL cdf7a188d605aad2c16f8e670a2f3439168d3d33166a2732707662868b6c427ba13aa2b3dca0c5fe81618da109f966c167c541a065f3069a5f961d42a55c350e
+MISC ChangeLog 21425 SHA256 77234ca7ef80051a8b53d3a1fa0f1758cd8e47a8a0922f1bf4c169b5e7d71c6c SHA512 ea4f699bc7035ba4a499b361cdcc27e130c794ac105eb6235d605327c96076f35b1341730cbfc4236738be08000207b34c2a09e2bb8824edaa78c7221bdae3b2 WHIRLPOOL d39309898c63a7f55e55734cf9be36dc35557b605dff55b80f87f124cbcf65db8505a0bacb656765778daf1f7073c27cc584b22fb576a8d26b89ff6b65aeea4a
 MISC metadata.xml 497 SHA256 b8656eacac6224eb78d0425604a1be6927f97eee1b6f5202675ed11a53ac5cf3 SHA512 cd76998e07c6d8476506f200947f5c1da97f5b44490ac0c49b7187d135670329b8ff7e3b9c603b90fd22055959592112ae15e8b103b9f0b5594e9acbc7bb9046 WHIRLPOOL a54d06aa9e6970fae53a5be81ca24a1a38a1579e285b775ed4db4dbcc05c6194dc66aaa45152cab82720596f573e8bbe653f3a3a89c7f1b9951b2844527c0656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUEP76XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUEQVqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV92WcP/2WZqOllK5pgoGw5A6GAhMiC
-EgqfS8dyahstLLte2pprnN4PtIb9J7aFF8mCxDDIoCx92VqpS24047dXjgHvegbA
-1ird0vAn0Bd/k9WdSdckDsk3HdJzpnzfiKGG3hDvapwYboJG7kJMa08eaN7OTvBR
-7CZqqxGS5gpFCGq1Han7Eg52cue2dhvmkxYSUnp27iGX+Hbyze4MKkNZR1epcH1B
-w9rdmhliFjNV643ttDya3lOWc4yFBPy9RlvYuf+7MsmZ6pqaFu6gE0L5e4V+Vxe2
-BCAb04TdjoSYKhuEtse3X1PbRU0qID++7YkGpqWU+d8Vz5edqQkmYmjrrNvwDAYK
-v2eLQE182TKr8puZ9lhxUOFR7PqdfOwspdYrNMugw+2M7UP4S5OsejtdX4hUOdNe
-lzl910Xk2ZaOJREQgT8av0IlIyi7EQrSsCN1dn5x76eKp93wpU/CqPvzbAsciTeJ
-Esavj8hYFO+B82LShujUKw1Z54e/GaQyKfz4iYxHi3dvxyPwMAW88L4/55DYBwkd
-F6/M6Dcm7aA8l3ua7AhFb0Yg7KSLchP1qwcste9jj9u3HgjLQeoH0l6lRKP47zRe
-argKBMuR6HaraE8kYgfY5da2s+OEuxeAWTVNH8RQN1OnPCDULpQS+jnbPlEbRiFK
-RWu6YOyUrqUYtncQQAEN
-=uzzW
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9nKAP/j7lfIRMEPbblVMseYf0b4dk
+PNC383JjrmohdQpkvP1TxVwQcBE4cI60KBdrbFvzh6J9sFLTWePPwfP7J62W9SkO
+Qk+teHviTRlMGfpNOeKygwBrNOAKCP61Ho/gU9sgBS30rSyxF6yln+RCDOzIoEwd
+L104zxPnMqwmtZbsRM3cUlG1YPPRD0o5i7boo5XhQdhQmBQt1Yz8Onqmb2sYg78P
+4gERR1eqLKYuGoj8YnEQCu6DQFw6R3K7AaFn5OJAoS7IFo9fp5AYQrMPuLbTfL7f
+WgbTdmmrtJrJpdUQGT/u3S2gCYDkUEQZSZYMUuDc2TV709dH6fcpS5MNUmzFg9GB
+TRj3vmlvurdic5v/l3SdH7d6AUj1dzBgQRc0IGYms3OKKBi89QfjeqmA27VyDFjB
+Dc/D5f1cUbDmrr0o1LlOQT868mjbbytQppEe7Iy9hDYAtDt83VLTpn7mOV3Kkduu
+CFMacc7gcT1RUZhinDVPj7rru+9Mwkh5RuLFctySrogyNTKrCX8QPQYQSMh+YCaJ
+OXGNKUxUNiB3kkDUssim572uca8AdNXqf+zsoI1YhIDpjMuW34WY5P2AFEr2Dz+E
+WHnPJYi8HGr1w2/ujsFx01Pd/czO7o5i2N84TPXX9A6vSAd3g4/6ggZD393dneco
+N9rl4ryfc0asuBdvPL7Q
+=/UQ1
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch b/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch
new file mode 100644
index 000000000000..657189654b7c
--- /dev/null
+++ b/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch
@@ -0,0 +1,31 @@
+From 9de7b4d7501c7e8e9eb561d02149a52b05a2bc1d Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Fri, 27 Jun 2014 04:25:52 +1000
+Subject: [PATCH] Canonicalize inputs when filtering default system paths
+
+Contrary to expectations, various <foo>-config tools sometimes spit out
+denormalized paths, which breaks the text-based filtering, as it relies
+on exact matches with normalized paths.
+
+Change-Id: I0613ed24953a3bde19939d28d09572c88b43a361
+Task-number: QTBUG-39216
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
+---
+ configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure b/configure
+index 8c16b12..96cc82b 100755
+--- a/configure
++++ b/configure
+@@ -364,6 +364,7 @@ filterDefaultPaths()
+ {
+     local path
+     path=`cat`
++    path=`"$relpath/config.tests/unix/makeabs" "$path"`
+     echo "$1" | grep "^$path\$" > /dev/null || echo "$path"
+ }
+ 
+-- 
+1.8.5.5
+
diff --git a/dev-qt/qtsql/qtsql-5.3.1-r3.ebuild b/dev-qt/qtsql/qtsql-5.3.1-r3.ebuild
index 98a1477ae2be..2b3e0233d8ac 100644
--- a/dev-qt/qtsql/qtsql-5.3.1-r3.ebuild
+++ b/dev-qt/qtsql/qtsql-5.3.1-r3.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/qtsql/qtsql-5.3.1-r3.ebuild,v 1.1 2014/09/11 01:46:33 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-5.3.1-r3.ebuild,v 1.2 2014/09/11 02:14:01 pesa Exp $
 
 EAPI=5
 
@@ -38,7 +38,9 @@ QT5_TARGET_SUBDIRS=(
 	src/plugins/sqldrivers
 )
 
-PATCHES=( "${FILESDIR}/${PN}-pathfiltering.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.3.1-path-filtering.patch"
+)
 
 src_configure() {
 	local myconf=(
diff --git a/dev-qt/qtwebsockets/ChangeLog b/dev-qt/qtwebsockets/ChangeLog
index 5e34af5da7ac..e61ffec49b04 100644
--- a/dev-qt/qtwebsockets/ChangeLog
+++ b/dev-qt/qtwebsockets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtwebsockets
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.1 2014/09/11 01:47:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.2 2014/09/11 02:09:06 pesa Exp $
+
+  11 Sep 2014; Davide Pesavento <pesa@gentoo.org>
+  +files/0001-Remove-dependency-on-unused-sql-module.patch:
+  Add missing patch file.
 
 *qtwebsockets-5.3.1-r3 (11 Sep 2014)
 
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 76bd95f74533..4028c71de0a6 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-Remove-dependency-on-unused-sql-module.patch 814 SHA256 f59bcb77f994146aaec6012ae858835c77d0abce9de589553544af8dd305a61a SHA512 70299d7fb5a9fd9f0f25335eaa096a72aee5edd97811a4f014087ee11a5b29ab48050c47e2f43d28ab55d334b4c87c75203883767496bee2b20cd6c0fd98f909 WHIRLPOOL 37954fda62a8e92d623f30eaab03401748cedf71a3b5747d7bdafb402a2321651e66fcbcfa30d5592c180b6899e1ebae94cb3a20935879bbe3dbb0fe16cd595a
 DIST qtwebsockets-opensource-src-5.3.1.tar.xz 68828 SHA256 5b68ce55bab94d0d9dfa86ef7a2c3f402e931cc12fd028766f531148b9e31ddc SHA512 555862851f4a55d302947a33ae9615afcfbe83cefc23fbd390a0d2ed5c7f31244df0886295aa27968731b7dbff93af9ed44451f53463f24f4adf0eefdfcc2929 WHIRLPOOL e0593780a683990a677df42c6f1efb4c49780b266e22c89e08d58daa9946a256b81b6ac3c4f615be28ec9eca5a13da19e12a2259865bd037d766868baa5bc2ac
 EBUILD qtwebsockets-5.3.1-r3.ebuild 746 SHA256 a73f4a2b008bbc7d9fb5a11a4463a4d0e94b14fe829f11cedaf7a69ae580add4 SHA512 cc63de3a3dc76f297c3bac6eddf5189d1b6569de15674a6178ac1363272e2e57ad7ebccf858bfb6968f7cf76056cb611e0cdca454b42f394c2ff803e055076ae WHIRLPOOL a65893a3ab55b9af7cbc3b85362fd324211dce716ecc60a973f9581605dcc56c344f951551fec4d7f1fc34415a57c54e76c17b589d829beb3d56ac5672b667d8
-MISC ChangeLog 375 SHA256 196e0b629e71cf3d8012b8b61b7ee239bfcddba0ff2c0b1b6666433f644d0238 SHA512 94781fb433f3b19504879b71ea6735774f12d5432a6879877907d8f975068604c70c6530a99c93156568ea849c0e5b5f04e4209e52f559b9efbfe9cdf0f54556 WHIRLPOOL fd104e2ca8453fdc0ce7c8da2bd23f6455d6aca2ed4e584833c5e463a9a1ede6c5f18792e597b890e12685b50519e2b550bb526311108fd90c1b38ab5c9ca6ea
+MISC ChangeLog 512 SHA256 de4eed03b57c406fdd313306bf208eb12796b1415b45d86dff3bdcba87e29f16 SHA512 1fbf1258dfb0adb0c0f4f1f1d6e7de8914c18d176f23d86d69130f845da9675999387af2896946d75268f4f421cb1208c61626a29840b2c3a7907efbd32cf067 WHIRLPOOL 1cedab500dee964666ff08cf1268237382381d3edb0041a2d3922f66ee6384e6d60911ab38141668ffdc348ab70f9f91874dd3b576b90d48bf9cf4c96f81ad57
 MISC metadata.xml 337 SHA256 7af7675fb67bcabc5e83bd191744e6da1bcc275e5188fbbbcb4327252b0b0e59 SHA512 88f142d94b50cd53a1aedf39be01e284d521f54d4fe978c9b7bc8d6efbcaf8dedf28d0e2558c2e0ffc9169f3d272e13f609e4deec7813846dce84d18516fe4bb WHIRLPOOL b69e942a94c1322388b1250a7c233b11bb7dcda00b4292ea1358cc3764d0f5d9b33206c5a45147391d433736683c646e0d0e79c4f1c1b78f06737df4487b421e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUEP8lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUEQRDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9bpoP/jWTtdUfOCF2oiZ24oS1N/BY
-goetsqx1yThwcaYdGNmfS+UXkyC2EKXH2FcdoUg6wquQ91trn7XFlxLO0p63tnXS
-UnGVBBiF8jxe5PzC6BsrTbs18i/SOoZ2wjwuSJ6SQ3IVopVlEDEq/w2FO9kyDIsa
-B3bMAkz7djdx6ZiwcxUpI+hE3KKyeCnSGJFipss5VSMfPLWaM5YcHG37bOMCdLvQ
-fQe9An3ECk+HefmgzJkTnYGVELTfyXqJOILmu37XnRYiUsmRqizggByDpWKUkz9x
-QQbtNLucYndocXLgE67tKrB6Thk5EZ85xHcW+0/cpWtP7m9UXM/QK9bsBv4SUwVL
-Dlt9C7huCvP+7j3pjjbOr4yy+K2SXnxn+Uw3yEWCN5iXiesSyIkdlmooRbC6XAvm
-8KiN+j1D377XzWxHZ7etc57YGMnuzuoHidwDQo7OYhxrIP0MGli3rTHApi+GdEVP
-HRZHLFF50MA2DGFIenxx6hX6sOEUP8Q3ypAnaIbsw4hyKohB3+M5oFuPIA9Y6v5N
-YDcXODR7YDnPwlOYuW5UKLLJC393bBKfKeFameIimzIQua7hW0RPxf0KGqjQ6qrd
-48L4hxz+DxyeVwGj7LBMrVJy2hHSoU2Ueffd5FmqDPxDc97yTT2zJPDc+4txew3j
-i4QFA+via/eJk++d80dl
-=hZA8
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9rzoQAK4j+TwT3f6WTr5Dir98ZfJB
+1LryJu4CppP6G3Gs+HPhjWa0pxSag3BFgrIfEMH3OtKJW+aIWf0ydRIymJSEz1g+
+Nh2lJlGMmzPasJRY2TAw54CWHZhsWDB7eQh+CK0kPBnIbiRmM1UzHEQckj/83+XR
+tn8suIcmJrl0mvLlXccEaGfxdjhEyvRPnCeAGzpU3JEmqWMPkYRWxK6TavA+TSpS
+jqKjIRiP5isOCtwR9JdIkXEV5aQAaLrjGukn9KgTK4j8Rb0ST41Y8O89lblCeLBt
+ClNXo7hlpa6p35F6ByjlPQgftXlS/Z4wqRF7BVYHfLAZndfc1n9cYH+ySNZ9WqsK
+mQ334+8GqotmG3PxnNOfOMt8OP1+4Bcn+xMfgnrgBCU6qLYboRqFf+qd6kwAWJRW
+wpSx9C1mPW27AmWf3axrLhBiEXv+FuxJI7ElfREA6QDl+4QTCZEe8QmrcWaOB8QD
+zzr4F8ME/JWIcJhQpUSKewosB59vnhP2Hjoz2Vtosh2d3wqJ4vkdLQJkzPwOWQWg
+vGlDYef1gFfxVCbcmLMjZOSNpJRY2OWGBWGd77qc0nnuUy6uvz9m6Yu7XPWcN77T
+xf9wvAdBURD/MCkLHwlqABTMzX/ns+J+tf7j6UPLtz/6EI5KRBNs+zLu5eZ+LjSZ
+GYRyWJlnfLtTSkJ0QEuE
+=YKI/
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch b/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch
new file mode 100644
index 000000000000..4c71a8df9b30
--- /dev/null
+++ b/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch
@@ -0,0 +1,28 @@
+From 6bd414a1f74f5a0ebfc1f4abcc140f7b3b536e1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
+Date: Tue, 20 May 2014 16:15:43 +0300
+Subject: Remove dependency on unused sql module
+
+Change-Id: I102bcb81ec53d022480e81a3632b93d42bf33403
+Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
+Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
+---
+ src/websockets/websockets.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/websockets/websockets.pro b/src/websockets/websockets.pro
+index 99e84b6..5b5ff78 100644
+--- a/src/websockets/websockets.pro
++++ b/src/websockets/websockets.pro
+@@ -1,7 +1,7 @@
+ load(qt_build_config)
+ TARGET = QtWebSockets
+ 
+-QT = core network core-private sql
++QT = core network core-private
+ 
+ TEMPLATE = lib
+ 
+-- 
+1.9.3
+
diff --git a/dev-qt/qtwidgets/ChangeLog b/dev-qt/qtwidgets/ChangeLog
index 59836e16911b..800a61472c11 100644
--- a/dev-qt/qtwidgets/ChangeLog
+++ b/dev-qt/qtwidgets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtwidgets
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.3 2014/09/11 01:47:22 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.4 2014/09/11 02:04:39 pesa Exp $
+
+  11 Sep 2014; Davide Pesavento <pesa@gentoo.org>
+  +files/qtwidgets-5.3.1-prefer-qpa.patch:
+  Add missing patch file.
 
 *qtwidgets-5.3.1-r3 (11 Sep 2014)
 
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 931b9129555d..c756ec5cb28a 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qtwidgets-5.3.1-prefer-qpa.patch 11173 SHA256 15f803723f91ee9346b3d4d94e8082bc646e6a1c45eeac7da8c8edfa76134e7a SHA512 f6a99ae3e655cec116696d56aacfd5d737726deadaffdeae9d6658291c845f7a98ae3a76678506233926b38e04118c6c83b678b1ed6354720e208ab1abff52b8 WHIRLPOOL 43f9985c423d0688577ccac5606c65ecc9173c5dba7e5d86d933db0fc16d8e6e5a95c24cf0740858438731d005e0710f5a178b823a95080fbde4c334b18dc55a
 DIST qtbase-opensource-src-5.3.1.tar.xz 46679724 SHA256 7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569 SHA512 b867d8c2f37007770d8105fea1820f8a2b1c2006474c28fbdc29fb7f7dcf9eee0960752805c833639eb7b0fd92c670f552bbc4a7064d0daf5bbac875d081500a WHIRLPOOL 997415bdae97c854916c055e2b5b8af47bc406a546aae24afa3e0fabcc53a3999efcfae7e17cf12dc1b87a79f29af5ae7069250fe6be6d9308f7e2df6001da27
 EBUILD qtwidgets-5.3.1-r3.ebuild 1288 SHA256 e241a57ad8135629684161a6ceb14dcbe79ccb372e2627d9681bfc889491cf78 SHA512 69eb879f32515721c7ea695f2de77bba4ce76e7ecd2270368c24b393c78a65fb297b08c19e797df200b3e22fd7fad35552d6527a01bb5bac9b76c520cf0a0fda WHIRLPOOL 2f9778efc3484a2c935edc93bc5cce795d316e8f91a984d261e99b4da1aad3a3c4cb53eb50786473227a962d86cab9168d58abd93fdffcf203ae1064de21eda9
-MISC ChangeLog 363 SHA256 9ae01cceb5e307db94a3c242e396d780c9421c7e4783a01b8360d69e5118052c SHA512 3c3de78622d28000671e361093ccc582f8c1f50968f449760caa0539d58d2b54646707d73da82d00f9992795e358871be4fe734cbf86327272409272688963f0 WHIRLPOOL a3406f963f2e6f2918d31cb48db7350c6ccb12bf1f7564db4647f45069a12b26e115d4633daadddc94a8bbf78d39d0277e9cdc1990e801ec5f26adb1fa43a83b
+MISC ChangeLog 483 SHA256 781a7caf815ed4f9b6bd93bdc659f25014f10545531b9ab7e4a0f87f2603a3c3 SHA512 2bef63c38351df5baa2b93f984aade92e3c89da1241e64429d31f24de1480b5db72b4ce8803680df22d8548c0e4aaa24f28da5dca1a9977381af09c8e9d6f5bf WHIRLPOOL 22026ca14cbc069f54fb9de3cc7921d2d1c6ecdb2071cdf509d3f3810bd9acec5dc1a873d649e971ffac2a7ee69c01ffc3ae30cf594758c8e0aab3e19decf5c0
 MISC metadata.xml 364 SHA256 7ea637bba935ccea1b6e4ac9e141e266bad2190959cd4aa8846174920b15b172 SHA512 87d52ba763c88ce8ce69926c436b772b4eb50a3acbb46088a6983a106e24339a9014134df705ad1626ce520d0b761ca522a1e206609c05485fd8d538996fea96 WHIRLPOOL 9bfe236b363c34cd9f81b2cdf405eff165473dc909132c40a37a00b88449214d7f4ec1a352a9f213e134b886adc3cb7dfa92726087f052a2fd2c3d2e719c4ffa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUEP8rXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUEQM4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9sM8QAIApt7V3DGsbteoR0RXr2+Rz
-gEfHhTI7/qmU9+Lj7E2l+tkTUZzb/WQhXypZMNH8CANsMrKImIoCXZxbHSbvZMfy
-oRDJA9kvbiCyW/ifBKcM5ErT4btQAGA2L2xUXoVelrrboc4yBtZNqEtJU7UYPlBq
-yj7dK+2SeNJdJhlrGfRE531Ghk7TV9+ebkGEVmOuakwiiezHxd0LCe4kosmuZcBw
-wCr6sML0bXpYhFvAaeS1NzmwscbVLFVRI8uOIlFypwWRj/4maU1UJMHitB9uGZey
-lmVNuRpYPlaDte3JRLH22tVNJzmNmA7DApkMWExzyA5EZGfeOscpEVCiSz0xXXUS
-ZdPNg7BzyEwotxNT6ef3aJYyMiSl3yhG9LgVMzFgk5ZWCH8Gu8QN9N2kM8KBmEIK
-e7Wid5b3x+r7snSvaN3IP3j2KNpUZCxX0oWXIoIEtJceU0p9Z0fbOOz2TXqNVX84
-FWQu4J5HISh0LPnY83Y2tGY6LIgXzlzNXEK/vqodDzvLMxS3i+3vu9KEDzyfgsGg
-wtq0zsw0ZeyXj/PzGLCXneClM5EZHppcjrj0fuxntoIkrQkMjxQ3tZsH5Wg0Pe5G
-G9rw+5k1vU9SITrod/9Ho4EOPhedyilrTL8WfrW25nmJuVFQLFANoI8zLPOtU9Pa
-364xteDIsAY54cpoTgT1
-=YfPs
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9ZS0QAJgbmZPfL15IFh+3AqZMMUke
+4Fd4dnsgzxYVfBMm44r+8OPAEomLYFh3UlACqsBwtnQ7oGEUqQNW+SHMYFA5xKsz
+3hopm4JFL6GZRqVe+epfCVJV3C1CmAHXIKauoKfhHykCUHsar8FuUCqmtya3IL5P
+zAXh8wHw5atb/146IbNuJKEK9ciOlCowY5mDx/4yNzzNs/YjnHKFWVTBqnYyZdsS
+8QsVLuyz8YDKg/KbVWH9IJQpFlXrmNZj5e9Ag9dWtbll9A+D1EvtJ9jWEcj+YPTs
+wWk3UDL4kKU7KLj4f5Zu/xnckHOSslLDZ1ByNkF4+HKVZi2ybXvUBcaCLZeekXVk
+h4KT8G84CopMdm/vGq3wfhpHuSzqi5mqII7a13ihr94pjU0ZQrLN4ABrTv5yvcga
+5OY0voMYz1Ntlym2fhHoIHf/CXZL5eWq9Awy0aqrJJkdXEmQfVnXJgMFk2yqF2Lz
+97rOr9ajCJO5SzifUITBWjKpEcYD+gNl+i3wsr3MoevLN3aSjtsKpf/5DuwY+wcR
+DgNq0pt6AVAethfRz1IynDFdwiMbuOjQZmNcKYJGyg/NA4mXeejUQR+LkGN9DFJt
+LldZKyK8Kn6eYTNtGVgL8FKfQq3eZ/ds4M3stHbZR2QXhC/6M4a+kdspcwgIxLpb
+V64Or9zS/i2HP3nNosop
+=BqX8
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch b/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch
new file mode 100644
index 000000000000..2a5d130ae4ed
--- /dev/null
+++ b/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch
@@ -0,0 +1,343 @@
+From f1ee10f81ac18789e9a7dc715b464415ba2bc2b8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
+Date: Wed, 19 Feb 2014 11:01:44 +0100
+Subject: Prefer QPA implementation in qsystemtrayicon_x11 if available
+
+In order to have the possibility to provide a custom QSystemTrayIcon
+implementation in the platform theme instead of the X11 xembed based
+one, the qpa implementation needs to be called. This was not possible
+as qpa and x11 implementation were compile time mutual exclusive.
+
+This change moves the qpa implementation in the shared part and the
+methods in qsystemtrayicon_qpa just delegate to them. In addition the
+_x11 part tries to create a QPlatformSystemTrayIcon through the
+platform theme and if that succeeds the implementation prefers the qpa
+variant and delegates to the same methods.
+
+Change-Id: I6b33acac63524a77ebdce39af6eb74666f8c7561
+Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
+Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
+---
+ src/widgets/util/qsystemtrayicon.cpp     | 68 ++++++++++++++++++++++++++++++++
+ src/widgets/util/qsystemtrayicon_p.h     |  9 +++++
+ src/widgets/util/qsystemtrayicon_qpa.cpp | 51 +++++-------------------
+ src/widgets/util/qsystemtrayicon_x11.cpp | 40 ++++++++++++++++++-
+ 4 files changed, 126 insertions(+), 42 deletions(-)
+
+diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
+index f1a69e6..fa318f3 100644
+--- a/src/widgets/util/qsystemtrayicon.cpp
++++ b/src/widgets/util/qsystemtrayicon.cpp
+@@ -672,6 +672,74 @@ void QBalloonTip::timerEvent(QTimerEvent *e)
+     QWidget::timerEvent(e);
+ }
+ 
++//////////////////////////////////////////////////////////////////////
++void QSystemTrayIconPrivate::install_sys_qpa()
++{
++    qpa_sys->init();
++    QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)),
++                     q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason)));
++    QObject::connect(qpa_sys, &QPlatformSystemTrayIcon::messageClicked,
++                     q_func(), &QSystemTrayIcon::messageClicked);
++    updateMenu_sys();
++    updateIcon_sys();
++    updateToolTip_sys();
++}
++
++void QSystemTrayIconPrivate::remove_sys_qpa()
++{
++    qpa_sys->cleanup();
++}
++
++QRect QSystemTrayIconPrivate::geometry_sys_qpa() const
++{
++    return qpa_sys->geometry();
++}
++
++void QSystemTrayIconPrivate::updateIcon_sys_qpa()
++{
++    qpa_sys->updateIcon(icon);
++}
++
++void QSystemTrayIconPrivate::updateMenu_sys_qpa()
++{
++    if (menu) {
++        if (!menu->platformMenu()) {
++            QPlatformMenu *platformMenu = qpa_sys->createMenu();
++            if (platformMenu)
++                menu->setPlatformMenu(platformMenu);
++        }
++        qpa_sys->updateMenu(menu->platformMenu());
++    }
++}
++
++void QSystemTrayIconPrivate::updateToolTip_sys_qpa()
++{
++    qpa_sys->updateToolTip(toolTip);
++}
++
++void QSystemTrayIconPrivate::showMessage_sys_qpa(const QString &message,
++                                                 const QString &title,
++                                                 QSystemTrayIcon::MessageIcon icon,
++                                                 int msecs)
++{
++    QIcon notificationIcon;
++    switch (icon) {
++    case QSystemTrayIcon::Information:
++        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation);
++        break;
++    case QSystemTrayIcon::Warning:
++        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning);
++        break;
++    case QSystemTrayIcon::Critical:
++        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical);
++        break;
++    default:
++        break;
++    }
++    qpa_sys->showMessage(message, title, notificationIcon,
++                     static_cast<QPlatformSystemTrayIcon::MessageIcon>(icon), msecs);
++}
++
+ QT_END_NAMESPACE
+ 
+ #endif // QT_NO_SYSTEMTRAYICON
+diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h
+index 211ef30..317664a 100644
+--- a/src/widgets/util/qsystemtrayicon_p.h
++++ b/src/widgets/util/qsystemtrayicon_p.h
+@@ -98,6 +98,15 @@ public:
+     QSystemTrayIconSys *sys;
+     QPlatformSystemTrayIcon *qpa_sys;
+     bool visible;
++
++private:
++    void install_sys_qpa();
++    void remove_sys_qpa();
++    void updateIcon_sys_qpa();
++    void updateToolTip_sys_qpa();
++    void updateMenu_sys_qpa();
++    QRect geometry_sys_qpa() const;
++    void showMessage_sys_qpa(const QString &msg, const QString &title, QSystemTrayIcon::MessageIcon icon, int secs);
+ };
+ 
+ class QBalloonTip : public QWidget
+diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp
+index f98aeaf..045641c 100644
+--- a/src/widgets/util/qsystemtrayicon_qpa.cpp
++++ b/src/widgets/util/qsystemtrayicon_qpa.cpp
+@@ -65,28 +65,20 @@ QSystemTrayIconPrivate::~QSystemTrayIconPrivate()
+ 
+ void QSystemTrayIconPrivate::install_sys()
+ {
+-    if (qpa_sys) {
+-        qpa_sys->init();
+-        QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)),
+-                         q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason)));
+-        QObject::connect(qpa_sys, SIGNAL(messageClicked()),
+-                         q_func(), SIGNAL(messageClicked()));
+-        updateMenu_sys();
+-        updateIcon_sys();
+-        updateToolTip_sys();
+-    }
++    if (qpa_sys)
++        install_sys_qpa();
+ }
+ 
+ void QSystemTrayIconPrivate::remove_sys()
+ {
+     if (qpa_sys)
+-        qpa_sys->cleanup();
++        remove_sys_qpa();
+ }
+ 
+ QRect QSystemTrayIconPrivate::geometry_sys() const
+ {
+     if (qpa_sys)
+-        return qpa_sys->geometry();
++        return geometry_sys_qpa();
+     else
+         return QRect();
+ }
+@@ -94,25 +86,19 @@ QRect QSystemTrayIconPrivate::geometry_sys() const
+ void QSystemTrayIconPrivate::updateIcon_sys()
+ {
+     if (qpa_sys)
+-        qpa_sys->updateIcon(icon);
++        updateIcon_sys_qpa();
+ }
+ 
+ void QSystemTrayIconPrivate::updateMenu_sys()
+ {
+-    if (qpa_sys && menu) {
+-        if (!menu->platformMenu()) {
+-            QPlatformMenu *platformMenu = qpa_sys->createMenu();
+-            if (platformMenu)
+-                menu->setPlatformMenu(platformMenu);
+-        }
+-        qpa_sys->updateMenu(menu->platformMenu());
+-    }
++    if (qpa_sys)
++        updateMenu_sys_qpa();
+ }
+ 
+ void QSystemTrayIconPrivate::updateToolTip_sys()
+ {
+     if (qpa_sys)
+-        qpa_sys->updateToolTip(toolTip);
++        updateToolTip_sys_qpa();
+ }
+ 
+ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
+@@ -138,25 +124,8 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &message,
+                                              QSystemTrayIcon::MessageIcon icon,
+                                              int msecs)
+ {
+-    if (!qpa_sys)
+-        return;
+-
+-    QIcon notificationIcon;
+-    switch (icon) {
+-    case QSystemTrayIcon::Information:
+-        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation);
+-        break;
+-    case QSystemTrayIcon::Warning:
+-        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning);
+-        break;
+-    case QSystemTrayIcon::Critical:
+-        notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical);
+-        break;
+-    default:
+-        break;
+-    }
+-    qpa_sys->showMessage(message, title, notificationIcon,
+-                     static_cast<QPlatformSystemTrayIcon::MessageIcon>(icon), msecs);
++    if (qpa_sys)
++        showMessage_sys_qpa(message, title, icon, msecs);
+ }
+ 
+ QT_END_NAMESPACE
+diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
+index 347e570..27d0418 100644
+--- a/src/widgets/util/qsystemtrayicon_x11.cpp
++++ b/src/widgets/util/qsystemtrayicon_x11.cpp
+@@ -55,6 +55,9 @@
+ #include <qscreen.h>
+ #include <qbackingstore.h>
+ #include <qpa/qplatformnativeinterface.h>
++#include <qpa/qplatformsystemtrayicon.h>
++#include <qpa/qplatformtheme.h>
++#include <private/qguiapplication_p.h>
+ #include <qdebug.h>
+ 
+ #ifndef QT_NO_SYSTEMTRAYICON
+@@ -209,16 +212,22 @@ void QSystemTrayIconSys::paintEvent(QPaintEvent *)
+ 
+ QSystemTrayIconPrivate::QSystemTrayIconPrivate()
+     : sys(0),
++      qpa_sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()),
+       visible(false)
+ {
+ }
+ 
+ QSystemTrayIconPrivate::~QSystemTrayIconPrivate()
+ {
++    delete qpa_sys;
+ }
+ 
+ void QSystemTrayIconPrivate::install_sys()
+ {
++    if (qpa_sys) {
++        install_sys_qpa();
++        return;
++    }
+     Q_Q(QSystemTrayIcon);
+     if (!sys && locateSystemTray()) {
+         sys = new QSystemTrayIconSys(q);
+@@ -229,6 +238,8 @@ void QSystemTrayIconPrivate::install_sys()
+ 
+ QRect QSystemTrayIconPrivate::geometry_sys() const
+ {
++    if (qpa_sys)
++        return geometry_sys_qpa();
+     if (!sys)
+         return QRect();
+     return sys->globalGeometry();
+@@ -236,6 +247,10 @@ QRect QSystemTrayIconPrivate::geometry_sys() const
+ 
+ void QSystemTrayIconPrivate::remove_sys()
+ {
++    if (qpa_sys) {
++        remove_sys_qpa();
++        return;
++    }
+     if (!sys)
+         return;
+     QBalloonTip::hideBalloon();
+@@ -246,17 +261,26 @@ void QSystemTrayIconPrivate::remove_sys()
+ 
+ void QSystemTrayIconPrivate::updateIcon_sys()
+ {
++    if (qpa_sys) {
++        updateIcon_sys_qpa();
++        return;
++    }
+     if (sys)
+         sys->updateIcon();
+ }
+ 
+ void QSystemTrayIconPrivate::updateMenu_sys()
+ {
+-
++    if (qpa_sys)
++        updateMenu_sys_qpa();
+ }
+ 
+ void QSystemTrayIconPrivate::updateToolTip_sys()
+ {
++    if (qpa_sys) {
++        updateToolTip_sys_qpa();
++        return;
++    }
+     if (!sys)
+         return;
+ #ifndef QT_NO_TOOLTIP
+@@ -266,6 +290,11 @@ void QSystemTrayIconPrivate::updateToolTip_sys()
+ 
+ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
+ {
++    QScopedPointer<QPlatformSystemTrayIcon> sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon());
++    if (sys)
++        return sys->isSystemTrayAvailable();
++
++    // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior
+     const QString platform = QGuiApplication::platformName();
+     if (platform.compare(QStringLiteral("xcb"), Qt::CaseInsensitive) == 0)
+        return locateSystemTray();
+@@ -274,12 +303,21 @@ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
+ 
+ bool QSystemTrayIconPrivate::supportsMessages_sys()
+ {
++    QScopedPointer<QPlatformSystemTrayIcon> sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon());
++    if (sys)
++        return sys->supportsMessages();
++
++    // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior
+     return true;
+ }
+ 
+ void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title,
+                                    QSystemTrayIcon::MessageIcon icon, int msecs)
+ {
++    if (qpa_sys) {
++        showMessage_sys_qpa(message, title, icon, msecs);
++        return;
++    }
+     if (!sys)
+         return;
+     const QPoint g = sys->globalGeometry().topLeft();
+-- 
+2.0.0
+