9 files changed, 77 insertions, 102 deletions
diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 24dc8acda30c..387e27f0bdfc 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.57 2015/02/24 20:13:20 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.58 2015/02/24 20:27:17 pesa Exp $
+
+  24 Feb 2015; Davide Pesavento <pesa@gentoo.org>
+  -files/qtgui-5.4.0-bigendian.patch:
+  Delete unused patch.
 
   24 Feb 2015; Michael Palimaka <kensington@gentoo.org> qtgui-5.4.1.ebuild:
   Remove failing patch that was applied upstream.
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 1f1974b0b1e3..6d44ec57a219 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -8,7 +8,6 @@ AUX qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch 1440 SHA256 f76ec92367e32c
 AUX qtgui-4.8.5-keyboard-shortcuts.patch 1706 SHA256 597fe8717279af4db6bc074588ef9973b2a48e5249ea3e6e85266ce949335921 SHA512 60a3c28b9fd8032e5ee314f2dc6d043981441858d7b3a3da0d97d87c39599d7e09e398625c03bf44974c3782a824ab8f997f579fcd26e4a023bb7cfe04c0f443 WHIRLPOOL 77269a9d4285f3f8fb544299f5ed938430362cb45eecfa9506beee1cf3fbfa757113d35f40c25f3288c45591fd22a9b4ce64627e9c96d4b0cd25f701be20d5eb
 AUX qtgui-4.8.5-libjpeg-9.patch 2852 SHA256 4b692de233f1cd9bf13a48166610af9f7b1257b56170f73f5989bf1d4b4d9b49 SHA512 ab42d08cca5e570af0400b483d9cf263ab5656b294314d6b7222d0b32f80da9688fcc2ad02fec70460011b4d526673a459758ee48e3fe3c0726c3da896ecb3e4 WHIRLPOOL 2ceee8488ad499f1397c3ac678a75dbcb1968e33275f1767a78cdd09b8c1a6db6140e215b00828900f2cdec107c436c877d78fb71e6d84aee713981509cc0c91
 AUX qtgui-4.8.5-qclipboard-delay.patch 1135 SHA256 7119cdc3450e1e36e01ce3273c5131b89c6e4a03f08652f5fa4eb0919d3b4bd0 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517 WHIRLPOOL a45f6cfda0fd6f137c091eb82039900ac6f39d2b277ab9125b74e0828e2bb809561f1ef11328af1c5c1c20f5ca06e39e66881219c6101b1134126ca482d2aac9
-AUX qtgui-5.4.0-bigendian.patch 384 SHA256 9f03a0d3ca2c32d101f67c1c26b1fdf1ff4d937a10fe302e0d335d3025f9d9b9 SHA512 835ccaacad918d3b69914a3bfdab5e3be70fae8cbbf798517b2db726106fb0cee971f39bd8e80d123e3d2539fea6a14d9ffea1d33bb4dc6a681c6459107c6cf7 WHIRLPOOL 9a6f905fc2eb2ab34b46b28b0a510c8eda5da5e2f6846229a1ce8639b4c5bc2aec913b1972231d900881383d7dbe7945d248d66932c922c3a0eb32ca00f6616e
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
@@ -16,23 +15,24 @@ DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf8578
 EBUILD qtgui-4.8.5-r3.ebuild 6299 SHA256 d49aca808e9bfb951a2fcec3893c4d6f396c0719b284fe658f3cbbf6ad86a114 SHA512 5293d98e566e39f6f0f9130fbca7453aeff394643735a6206e60d7469300f5faaa29f14f4786cbc3539e16cb8569d2e0fe1c1d84706c7449e253a15d509eeb39 WHIRLPOOL 261fc5e58658a0a06f77980f5027d77f0d341ca17d4b59120a6599641ccccc746f5964e277cf4d2bb0233d18555dbf73fd1da82749082fc20a7f99ce7dda0239
 EBUILD qtgui-4.8.6-r1.ebuild 6103 SHA256 b4f7f3c899282aef7207fb66f8d077f8e67443b3e89e14277c161880355b1147 SHA512 4136a0d9dd7894e51dc3be5f63bf2137e8d099eaf4b2fb0d58e587a4c53da26fcad9ac33bd2e0bf02645cf43e6c64085bdaf7963364280410d1013d9046ff73b WHIRLPOOL ba69efbc58ec919a7abdece6437521d5e1965a1adda6732de969e41f60fc5efb0be3588f8f46b65d0c9c94f6fce7a97e0a2f9fada0d1f052d8c2250ca322c8c4
 EBUILD qtgui-5.4.1.ebuild 3374 SHA256 503fc1fdafa5228c15dea5ad2fe0d29321d08cf788668f249e33cfb5a329710a SHA512 118716f7369f9d5b0430a8fb7496d9028f48dc7937642a49519134f84e51f3e5487ab9b366393bb72e5ce330a95517f8ad4a53be5d10fb7ba9f7dd4e24c2c261 WHIRLPOOL 523bfcbd63de5ed24db094017535710eec03095701bdc71731aea099423398b32f927683bb4268770b22034704121130a7a97924c2f4fadc357e5b7cc657d299
-MISC ChangeLog 40527 SHA256 9345b26ef6e7ff93a434e9725d0749a1a2e90663f7c965b947741532f620ac05 SHA512 b3420979b865775bb2af4118aeb1df63269b047b117efcb8df1929a89bf24e4b62bb93dd0b81536ac9d3422278670774282b15f8f597f7b485f889afb360afc9 WHIRLPOOL 5b563071169b7b8a65763d3cb9ed84ae5a176cbc136b6e3eccc73505d06c2d0a7ca6e55e7dad521b44641b41064eb9a929e2dd6bac9cfc150f53da9fecfe81de
+MISC ChangeLog 40633 SHA256 c17ae98105029c6418aabeaf540b679b9b709916d941483515b6c2ab74c58fa3 SHA512 d9366b6a8a489fb7193f342b8ad511362ce94b83507ae5037c93ca3187217de9cd4b73bdf10d8b59731194dd04951631901f4e76b1ff81cac2fd21d8addbb182 WHIRLPOOL b8a1d3c51dc95a018a1cf218b9945c9515d16af603af81bed421d28ccf2cb69c84f9732dc261d6ee8c70a10833b4aa52238eb88f5c50e69fa17c7618999c314d
 MISC metadata.xml 1611 SHA256 da317017f121f7acacc658d65facb20779201ee298d329540d86b8c078050d4b SHA512 6f2a48dc6396a64ee1cc472de618f54d8653090e8f57cd7997f3ff8d6f5ade41af5204a92f99426b71986c3313675ec55c655de0c9475b066cc0fbd3b8933500 WHIRLPOOL 10cc6992a3505ee99485125e9988ee9a40d95ad670ed81be6fe3f1f47292a980ab97f14dbf551390dd67dfaaa92862fb106810ead8ea379e814eb97e1a067096
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJU7Nt6RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7H1iD/95lwKiNYME4BUBx9gNfxPz1PHnOFhq73w8X8h7TNL1kpNB8J5F/ebJndGM
-w4pDEwJDZSRx/SpdYK5r5YCMTc5Jb+GdgaYXr65iaM3Ri/dLCymj9VHV8mkR4+U0
-Fwma7PQXdRKV3t9ZhBFwBKn/P8UUuk9znLdrQOW3GovKEH5S9uIk28muJGZkHiuI
-dxweh3Op8MJavPI1o/cU72WlKDHQ2URKO4e8NXyQC6GpFxTATl4thhhEcx2Uh8eI
-V5+4w0JptVfikxWtr7Q5a82TiMZVJV4Ia0bUGAvbh3S3zud3r5yURtHMhdyDoc1H
-a0BHeeztLhC9DEtL3ZL1bo6D5U9gf/OxK+a/Zf3WM+XIcWU0pCDjqf/BZOfxNov3
-wzd81+ixZYR8yrx1n5jPCUW1xMJzjP8sO8pNDEM0tBTmbgcT88Ea0dDkPc27+qDR
-VE8QOfEaPwD/nnWX8r3TpJsDQIVijOo+fJXQOo1PavQDrak9bNXXZgmpYa2qOfAi
-SguRtmbjaNwfVn/n01UH6Fszga5oR79R23jLQ0o05zlQvtnGBBcd7h38pBfP6pPE
-YwAu09ObzeRnUzCSuvYbocV/StETDxZppYGy6Gm5pIkvQ69RDWsCFATKd3Gy0ydy
-PzFdPeLMaLpmSZFfAhHOw6PaA3eTjZMN5uNGG4rz27BLYuDT3A==
-=yddN
+iQJ8BAEBCABmBQJU7N6mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9qlsQAJkNjcNad0Mtt7OfOGhArtzf
+zG8WB7GgaJs8/c2UMEI78eDCXodVoh8lq2rPYROZl4KhXHWnq0REAiCQmVUDaEt0
+Pcdc7IdDbWqBhTtk78/YzrECZ8PWBldc3n+iG1ViYn0FAF/s5kFAK+8z7BPuyMph
+8NdZJxpmh6gei7BUssWT3YJsU0yG+YRdb5YmeHDyAf71NIWLd2uuY5rLUSsIjW1N
+fsmYSac7nkwk3yPF9SpWjHJUHWmP2/7f2JqJwJy0lTJCMLtFXSlopQt3eNOnFrlj
+AnbCV9MBwQKvGUrqI1TUHiNIqBpF0MI4K3JWYOT6UKP6X1W3nAtOGCPHRu2YWTPw
+L1y8zNqDTwXyNWxPEawhOOQu6j8ExF67EBm52OSWBdpIZTsjeBY/SG2pK0T040kS
+RGVeOZxpHbRWZZxu29SuAmBkc2nGZJrgHp2lFpCN/iWQM8D0I8lO3YvjMfm4j85M
+sm3jkZPPj92a/MohOs/if1fEwxzkguz1bVKYoYZ0W+5BrLq++xWM7bkPbK2As2ok
+/5PapKoTUy91wup3dEKuD53+gtvUrlHSF7Vemc+I2cxG6JVgS7by00W9DOpP4CxO
+ZiiItqYapgvk1dSDTaE4QfLsIUisFKGKkM/9dOTs3y6INRojivSfwZXLoXHUQccW
+z9hwBq1TbKEQ/Vywn9vH
+=qyHL
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/files/qtgui-5.4.0-bigendian.patch b/dev-qt/qtgui/files/qtgui-5.4.0-bigendian.patch
deleted file mode 100644
index c56ce32c8a82..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.4.0-bigendian.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/gui/image/qimage_conversions.cpp
-+++ b/src/gui/image/qimage_conversions.cpp
-@@ -2252,7 +2252,7 @@
-         convert_ARGB_to_ARGB_PM,
- #else
-         0,
--        0
-+        0,
- #endif
-         0, 0, 0, 0
-     }, // Format_RGBA8888
-@@ -2281,7 +2281,7 @@
- #else
-         0,
-         0,
--        0
-+        0,
- #endif
-         0, 0, 0, 0
-     }, // Format_RGBA8888_Premultiplied
diff --git a/dev-qt/qtsql/ChangeLog b/dev-qt/qtsql/ChangeLog
index c927dbfbe43f..98f6f442a49a 100644
--- a/dev-qt/qtsql/ChangeLog
+++ b/dev-qt/qtsql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtsql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.28 2015/02/24 18:46:21 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.29 2015/02/24 20:25:06 pesa Exp $
+
+  24 Feb 2015; Davide Pesavento <pesa@gentoo.org>
+  -files/qtsql-5.3.1-path-filtering.patch:
+  Delete unused patch.
 
 *qtsql-5.4.1 (24 Feb 2015)
 
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 9407f0420fd0..4cbd16313985 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,9 +1,30 @@
-AUX qtsql-5.3.1-path-filtering.patch 919 SHA256 54cf01db78e68b20f43a5040679df82774d26132740ae222391c61d32d68ebe2 SHA512 794408389b83b2eef2a106682c3a98db40647c1d4449e957665bfbcd81462ba5744c69dfdcdc74f50fc2870ec5eb49e4738ec472838d26edc01cddb3e9caa8c6 WHIRLPOOL 50534ee0794aa98eba02176fe7dd122e37a84966a1866cca18052df7150aee638363c61420201519e4ffc7a923f398baadc409a1e43af520e649cf5440359e0d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
 EBUILD qtsql-4.8.5.ebuild 2491 SHA256 4b025b64c2efa0a0c68013336770a70bc50c176cba79c2bd846592bb14e3d29b SHA512 31e89c38831796cb66beca7c07e0359f2523be923eb6a05ec91ddd82452b5b6d6b8efe66863c21a02b4a84e14f3486f9b0d2eff970d2b1995a747d80260a5924 WHIRLPOOL d85c1715c7cce491637873aed8aa6f60d8d5682d7f881721279d21800710f8b5580aa8abc862769b270a102669904e5ba22614bbebc21953e6c5c0f80105fc51
 EBUILD qtsql-4.8.6-r1.ebuild 2492 SHA256 c7c19c2e0790be91793a388c378c5bcb6ade401372f463120881dcef280dd221 SHA512 d2c8e294126346945184dd7c9bbddc7bea455a4d9989ed5e233171b9311b030f2cb4497193cdff62d5fd4b6c81d9f186080a00bc303279d5866ba4e403b25f39 WHIRLPOOL befa0cab98377e69e5b573467def50a536bb7983733724215db34aa4e9c43fbb2763fa3847bf93538e390590b7f63c5eda37560de6cd8b8b03c98c653c26f846
 EBUILD qtsql-5.4.1.ebuild 1527 SHA256 67542306c520ef16257473d82280a31f3033de59b76751669081ca57a5358de4 SHA512 d8a2666414255e6746c926dadbf42dd8f9debd65bb521691f2f5fd7a6a8784f859aa7c02b77011d614af94298a3351e41c0210746e0f3acc90b69e5d9d892ed8 WHIRLPOOL ffd685053b81042cbb474a9c75077ca9bec7f6ec307397501c790e85e8171953aa6cc4ef8ec0320dd6561044cafbc7a36165db043c8aff6ea3a5b6964b585fac
-MISC ChangeLog 22850 SHA256 a79a36548464cc7783c1f734af4a8d23d022878f0a99abfd68b1642637df08d2 SHA512 f6a99cd2d6daba6e887e537ee07346b9474ec9f886ca00cc479b022b73c9ec829c6bec2b726ddceab64c61ec2e0cf291387154ccb455d5a12c018eac9e104deb WHIRLPOOL 39ce5a700597458daf2e5c9b362c880ab388dbe5e542eecc18f93b7c55b53f4672196db097c013c2459be109c454d82bbcef299f3465f356f919191c8afc4d07
+MISC ChangeLog 22967 SHA256 e3e8fda122db895306a9623c72c423929bf6ea6deff07e4948d1b93dcc1bdd1a SHA512 50f5cabd815decf236e575925a697aed6a1bcaab9348f0c8fa615fda6593e2d8bb66617ec2a92f2280e975537c9c4b68b7daed84ac48b63b2a490f764d96ed3d WHIRLPOOL 837713759747daea152d3b9bbf094780a89e3e7bd1866505421bf9efb29ad4731fec77cdc782967efad2a6a61d48dd85d3d632c46efaecdc02548a22df71f90b
 MISC metadata.xml 488 SHA256 91e75b5ca67976cb4116b41198d28f71ea32ba3de262c4b08f2af5fe5e415ae3 SHA512 510ad3b092b9bd46d6b6af1eead24b565fc690ec3b8bf9082327973dc163003711a4d954de0aec43ad91703ba20e85248f49b0e0e4a73a43fab81ca4c2945038 WHIRLPOOL b02a637b20859aee4f7a0d6d78a8250f5b616d6a1d7b35e121f9bfbd6237383393cbec6adb4de07c7a9327fdd9681c6700df3db0dd3920ece0dbd90a12ac999c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJU7N4jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9hD8QAIs89sooS2QXZEnc1DlqS3x5
+xB6Ee5QRYma7ncGGqmUClkDGzVArPu8hFD1P8IdCnpweyE9bnFb4nxwTNYXZtzRv
+noZJdHY/xPdTZT8Apt+kZ90AJYpJwec8mowpo9WECDLWGaYlOHYMM+TSoi6sxpRW
+2GCmABx7Jfk1r4Ta9rn2bfbKYTNzNVs8y8pXVzbzZbRjpcGUEtf1mffn24m1pqmQ
+pclhFWRqsZZoosFLQBaJRQRybU8xrQKwmGNUvS+hAV+jqw9h+gKVlzQbWT6YYB0R
+x8n3tj7xmozX2Ye9Snpvpq/V04/Mh2BzuyIhQsGy7wX5rl4lt+lyH26tLsthS/+W
+1p6A+a63/IMMRlK5lZfyLlOrySN4Gs5ppkIJebLlOABTJZosEV6Ya6k4SwNrbyuH
+1IfoWeg1HRN1uDQninpwsFTgr7dKRBj3M4lmrt0DjYT4puQDVxnvK58vjeeDZqa/
+l6+Vc7kgJIaeR50zCYbmkTzVqRCAkOB4gLlQkS5+WVh32cHtpAxrEfTTd9CBcgmA
+iTig7GE/DHZeKjmRytVsiYxyweM7yieVp1kel8oX5kB3LJszJYwCf+OvpS/hZ7JD
+MR33wwJzcXCVoIMr+CbXvMAiheNf8/VbA6Q56UfUNroGJPVLEhdeB1gjL2u4djHZ
+vsFjMktp6xq56pKPNJKm
+=mVnX
+-----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
deleted file mode 100644
index 657189654b7c..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/qtwebsockets/ChangeLog b/dev-qt/qtwebsockets/ChangeLog
index eb0b514d784c..e6db192292af 100644
--- a/dev-qt/qtwebsockets/ChangeLog
+++ b/dev-qt/qtwebsockets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtwebsockets
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.9 2015/02/24 18:45:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.10 2015/02/24 20:23:09 pesa Exp $
+
+  24 Feb 2015; Davide Pesavento <pesa@gentoo.org>
+  -files/0001-Remove-dependency-on-unused-sql-module.patch:
+  Delete unused patch.
 
 *qtwebsockets-5.4.1 (24 Feb 2015)
 
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 2fca3456e15f..8b4e11c7a91f 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,26 @@
-AUX 0001-Remove-dependency-on-unused-sql-module.patch 814 SHA256 f59bcb77f994146aaec6012ae858835c77d0abce9de589553544af8dd305a61a SHA512 70299d7fb5a9fd9f0f25335eaa096a72aee5edd97811a4f014087ee11a5b29ab48050c47e2f43d28ab55d334b4c87c75203883767496bee2b20cd6c0fd98f909 WHIRLPOOL 37954fda62a8e92d623f30eaab03401748cedf71a3b5747d7bdafb402a2321651e66fcbcfa30d5592c180b6899e1ebae94cb3a20935879bbe3dbb0fe16cd595a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST qtwebsockets-opensource-src-5.4.1.tar.xz 74784 SHA256 daf56f98c5e267253bd2d2e421472fc02faa1703a9063cc14cf8afce6967ab44 SHA512 f9dae7833033338c6f46fa11b5f9fc032e34a8febcdf9b1281ee080d65e0a92a10b15ac9b4de138e85444091cda917ca47defbd124601ebd197b54119d141bbc WHIRLPOOL e6dfbda86f26cc3b9c65414984061465ea2aae713716af64c618b63f03ce22e8f6baccb20709efb52d41161cde72116969097cd257f884769ff7a7f5f8ca89a4
 EBUILD qtwebsockets-5.4.1.ebuild 681 SHA256 a9ee069e2b070d5e0ebae9e87ca3c3d525beef8a47a058ef9d9ccf0df92584f1 SHA512 5a05df2131a6faa953aaee58fdfd8011f9744e42aa36f61878a108da91b90d008a7ce328776c467fd45e96f1fa4c56c92d332627dc313a73e5adeec7bdca82e9 WHIRLPOOL bb8c0ddd360d9803da469cd9dcbe2c442670d61ac5a91291c01e89e82b1bf99bf499f1024b81bdbaec9d3b7fce55ddf003e9108f423da028c6558fb30723549d
-MISC ChangeLog 1365 SHA256 4cbdd70205c787a54207014da9ceba93b86ed94c533079ff0e33908020849ad6 SHA512 78bd7a26fb173539eb1019d469fc9c95228dd42180e96572af150c1130da6395955a381adffcf230352e5cb6ed012b51b232135fcb06474910b5fe0037e19bd1 WHIRLPOOL 09bd43ac182c822c6af434192a5ff24133a23ba8c4308fa0eb069739c153a71bf1e704ffee68b92d504cf11baca91fae8f06d94a9bd248a558e933c3d6252857
+MISC ChangeLog 1500 SHA256 86c79893afccbd9d986a60b0ab2350628404686e0d3203095a71fc7c563873d5 SHA512 871590ea2d25b0904078462e6c4b8128eca93f7644b194e676e948cbc37bef9ac396ae5237b37d896cad4d31dc1a42434b0a69644c196d1be09b0f99a41e4837 WHIRLPOOL 4ebf4e311bba411d0d0962efe55f3e7c92864597dbd7fff2e4d0095c94f4b3dc3ad4d95dded826583227e2cbab438a823ce2ab2dbcd8b6b48d048b55499d8613
 MISC metadata.xml 328 SHA256 23497fbb9a498c0d9631987427e939a7b05721e8de06d0767461cd70f7b3cb52 SHA512 0709500b4784b39054809b60d281d267009185804ef971e899d5cc2917ca4bf67a4bbf06270df5ea177e71f6785da69cc22e68e907f801cfa0a3ee1289947106 WHIRLPOOL 753a593d48db3ce884180a3c440bf3c3d800d23df14732850c8252d705f6e2639cd8ba43f180c7b033ac15befd0245ed1f3e679b7b94b865a96d43187ceb5123
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJU7N21XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9/tgP/jvx2lVcnthG+IdJMgNSlwFh
+gUhVgH3Q/tzsl/R5xHN6cKFsItMnTAcDavFFhhmP1ju3wfNCDcDA13+2eFNQPdkH
+cBISJ4oI8kts8Tvk90IRaEzDUZMb4wgeBMfA38We3TEupnwOiV1J3sp82aKcLlsv
+fOYVax4u5tHLE+u7Gr268imvSsFo4nsEz7L+nJ3sWkhgcwBR4iIlNWULaufwnOGz
+kXGK0goN8m5DucTnm1Ycilrp7f2hK1KcTW3ykEyWNtMLxqKht2Cm2INEvujY7Rq3
+RKYFFzbRO/dNPR+FZ/Jy2pAX4aytEye4Kzna+LkrPdC1oXzM34Ba6F/bBhs9Xyci
+o2ytuTVr2XPDX4l0ficV2mia4qNX6+49UOqh0BDwS9WaRX8oQ/roXNsDymMXAl9Z
+JXRL7mP83jdZ3JjKK7ZVjsmuVYK2STTNmSsOi9d/2myWruaDY9FTyURw+46qloBP
+e0zMYP1LTgApNQKB6uXWDCqL2KBjqXIDZaq/PKo8awcWwqtURzSHBMCQkA1glH6f
+9Wn4OOQJK1hVjluOK2fy+C3Eu+bkk3TkjwoXBhjSxcdgQ6qDvL1a+n3T42kk5YL0
+KDiZPLLHHV3Kl9OyNHj5xBXnfo5rL8YZdhrvuAytwnnIv7TfYenp15rmnlqbZPlr
+T7keEZRRHBqBTBlOF0Hi
+=2f5J
+-----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
deleted file mode 100644
index 4c71a8df9b30..000000000000
--- a/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-