[x11-libs/qt-(core|gui)] sync with portage

7 files changed, 174 insertions, 29 deletions

diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 4593bf2..064295f 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,7 +1,10 @@
 AUX CVE-2013-0254.patch 2694 SHA256 708714e387b607e4c28182420af42f9169c632c909feef6224190053da0c869f SHA512 227ed44a8e90eb63402cd6658bff1244e3684c4f9757aa9c3cf53e60127f6324a978d82f2de25e6a718b88392d51641e9b8010d313a25a0154f871c0dcc94182 WHIRLPOOL 472b5ca7da456ae9e6c62072be6f6c1fb71c13450d8108745a7f14d5f7511e299377a7cd88f6bf5e03b906259a0a6961115e7012e998878ba306d8a67b4fc935
+AUX blacklist-mis-issued-Turktrust-certs.patch 5939 SHA256 abf2632243cd5b82dfcb2f297908c37ee79e42240a5539eb4738713470658bc8 SHA512 5f4d5be5389b3b2423a33cb09ace4514b53fb96ad0d95e2d02dca7673a9a37b879f739e0988b4bd5e90976ca83ad802ce8179da7433e6ffc3f519a151b8aeec3 WHIRLPOOL ab4a4d61654aa159e82f66d6600a932296f5ee5c0778009dd69f899866a4f1bf3d7b6cb858092f75cd00582fcf357e963e4c7cf0a363ba9bab1cb2455b4fd9c5
+AUX fix-call-to-QMetaObject-metaCall-from-updateProperty.patch 1570 SHA256 bca22cbb85b852101ba90bb03a96922f35f8bc158e5781d62dcedea6481d832b SHA512 119c44be4cc2195dd593b5a4c3986b267a12a3e415c057f36ff953c980eaff9df68171440782d5e81803961df062fe25506bef8e564b220caf10ccfb462b6839 WHIRLPOOL 0a1931d941a8bfd62835864b4042019a5d96b44f4da04f911a9f721e30a0304d0aa24ce8205edbe222e0c6b37fb544fcb1c451ad8d6402d70554d1ee04e3fd1a
+AUX moc-workaround-for-BOOST_JOIN.patch 728 SHA256 4e39ec7fe8084c42ee09d14d2fe874f6d408db447a3e078006c6f2d722e8c0b7 SHA512 9530a50fab3ef08c805b7a3b3e85ad2ea86c6c014a2e5702ca00a21e8445477699bc5280edcdce5defbc37fe43f50f7581677281ca9897fcc55ac68eefd3c81f WHIRLPOOL 302dc275378046661353cc69ac93a062d331f7932ca733b0dc1f1770604d54e698ff473477a8e082bac196134e7590573f5bb2ca895d17347dbcd471233b1d28
 AUX moc-workaround-for-boost-1.48.patch 571 SHA256 f8c10e753515cf77a606c88bc97e1536526b1b15431fd1c7c8eb78f28aa49771 SHA512 b192108be3328637bd30279e61104abbdaec8bcc66962a1081abde1188d4d2f67c0674ed12280bad630849d8d748cb9bbc4178878b96e87ae67d8531aae13701 WHIRLPOOL 5e9df8db26a2e4fe60cd8c0483ec39825deb520f9a370a3ccc2723bf6f017c23e8c3d86295f1e5d7fba44ea1d7f0465e6d039066622ebdb39f5d8524b0016cba
 AUX qt-ccache.patch 2126 SHA256 f300bf8c218060111b7b9d3abaf50802eeb0cba11b7a284e7d5f9be9c5e9eaf1 SHA512 34c66ed9810848f7ed5a21a6f106904a9731a9c32efedf9ab6bc0b8226470522c7d111297c6fdb6f6db7b8f52087745cb38ec85c0d2e6dd0f042cba3b0d79d4f WHIRLPOOL 5d358be55fcd6671c5b1793027f17859449e623fe91e39f695fddb6e4766c0a2e2f2354265796c23322dc0334fcdb8b3e03e7eec6ca3c5945999516922e88060
 AUX qt-cxxflags.patch 799 SHA256 c2daf63c38bf018b66e054b44b2d87e459d18e48d66b13d130fa58d9fc8a4f21 SHA512 4080116da656d83f44c69c4f89b7e74855341db9b556d551fdc55941ba384b766ec0d1da75d3b6d6bfc4f77c1c16416dcd8bb46fa39a012c8a24c448fb511ae3 WHIRLPOOL ae0a015bc6168645fcdb26e64b8b9a92d99da24d787d0fde511b310398f2fd2e46913dd06e106860610e9a3fac22e3278e77cea56fb794acbf02a3f6805e048d
 AUX set-pkg-config-locations-directly-to-install-dir.patch 2048 SHA256 862b2be51a7bff1e97be70f1bcdc9b6bbbfbea3f7b7de5805e7320c401103cc5 SHA512 0cdc8ff580ee2b291764615dc9f05f0d8078e0baeedc8e5869f843c11db2755a2c2f2c757dca1ffccb8a3dc07cbdb9c46c1a2e9f6791edb4f1e20675c9bbd9d0 WHIRLPOOL 93da7613c1cc5004bee55dbe4decccebf1c10db2be695ddc80bc5407a097b7a18f58ec31d481d76d7f1ca71f4f7a8dbeeea5108aecea06d50f625896e1a742c6
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
-EBUILD qt-core-4.8.4-r131.ebuild 5207 SHA256 fb70a31d1a26e9e4b51c2224a6fc2eb50696a9b225e7300fa25faaf9d8f94ace SHA512 c07b1bac710771b120da13301897b356d61be9006b1ebe4c9647111c1ffae022e853b728c8651ef33a2efc7647c84381cebc46b877447aeaaa33da597cf03f10 WHIRLPOOL abea91bd217f1738138c99d652f5ac9e1eed67339d4a0dca46c6158f3fb77b443feb623d39edcc6d688dce80c3bb4a787cf3b4d9916d038def89d4dff40215e6
+EBUILD qt-core-4.8.4-r132.ebuild 5342 SHA256 f2e1d57370efff572dc9b909a00650f0b093c8f536ea519db89bff4c908ffc6f SHA512 5b997d814626c72afdd6e0c52a1d3744b6a5bd6da08c63ab7bdbbc588f3bccf2b636cde6b86a093f7a8c926425f416078ac977045a7fe843323764da925fc796 WHIRLPOOL e00f288d82f10a143d38b4db47cfc44b8788aa412c8ff0d5db1f5d01d964f4a6b4e7c3718fb934eee6b954f125fcb7bad0ece4519dcc087e8de26e55ed21594f
diff --git a/x11-libs/qt-core/files/blacklist-mis-issued-Turktrust-certs.patch b/x11-libs/qt-core/files/blacklist-mis-issued-Turktrust-certs.patch
new file mode 100644
index 0000000..c2245cc
--- /dev/null
+++ b/x11-libs/qt-core/files/blacklist-mis-issued-Turktrust-certs.patch
@@ -0,0 +1,107 @@
+From 451462b1e0304e0cb6c2872e4f5688bc2e556dca Mon Sep 17 00:00:00 2001
+From: Peter Hartmann <phartmann@rim.com>
+Date: Fri, 4 Jan 2013 11:06:14 +0100
+Subject: [PATCH 80/90] SSL certificates: blacklist mis-issued Turktrust
+ certificates
+
+Those certificates have erroneously set the CA attribute to true,
+meaning everybody in possesion of their keys can issue certificates on
+their own.
+
+backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase
+
+Task-number: QTBUG-28937
+Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23
+Reviewed-by: Richard J. Moore <rich@kde.org>
+---
+ src/network/ssl/qsslcertificate.cpp                |  3 +++
+ ...ted-turktrust-e-islem.kktcmerkezbankasi.org.pem | 24 +++++++++++++++++
+ .../blacklisted-turktrust-ego.gov.tr.pem           | 31 ++++++++++++++++++++++
+ 3 files changed, 58 insertions(+)
+ create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem
+ create mode 100644 tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem
+
+diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
+index 038187f..37799d1 100644
+--- a/src/network/ssl/qsslcertificate.cpp
++++ b/src/network/ssl/qsslcertificate.cpp
+@@ -825,6 +825,9 @@ static const char *certificate_blacklist[] = {
+ 
+     "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust
+     "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust
++
++    "2087",                                            "*.EGO.GOV.TR", // Turktrust mis-issued intermediate certificate
++    "2148",                                            "e-islem.kktcmerkezbankasi.org", // Turktrust mis-issued intermediate certificate
+     0
+ };
+ 
+diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem
+new file mode 100644
+index 0000000..33f2ef4
+--- /dev/null
++++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-e-islem.kktcmerkezbankasi.org.pem
+@@ -0,0 +1,24 @@
++-----BEGIN CERTIFICATE-----
++MIID8DCCAtigAwIBAgICCGQwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD
++nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl
++cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
++acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo
++YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDgwNTA3MDc1MVow
++gaMxCzAJBgNVBAYTAlRSMRAwDgYDVQQIEwdMZWZrb3NhMRAwDgYDVQQHEwdMZWZr
++b3NhMRwwGgYDVQQKExNLS1RDIE1lcmtleiBCYW5rYXNpMSYwJAYDVQQDEx1lLWlz
++bGVtLmtrdGNtZXJrZXpiYW5rYXNpLm9yZzEqMCgGCSqGSIb3DQEJARYbaWxldGlA
++a2t0Y21lcmtlemJhbmthc2kub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
++CgKCAQEAw1hUpuRFY67NsZ6C9rzRAPCb9RVpi4nZzJIA1TvIfr4hMPM0X5jseMf5
++GvgJQ+cBMZtooDd7BbZNy2z7O5A+8PYFaMDdokCENx2ePIqAVuO6C5UAqM7J3n6R
++rhjOvqiw6dTQMbtXhjFao+YMuBVvRuuhGHBDK3Je64T/KLzcmAUlRJEuy+ZMe7Aa
++tUaSDr/jy5DMA5xEYOdsnS5Zo30lRG+9vqbxb8CQi+E97sNjY+W4lEgJKQWMNh5r
++Cxo4Hinkm3CKyKX3PAS+DDVI3LQiCiIQUOMA2+1P5aTPTkpqlbjqhbWTWAPWOKCF
++9d83p3RMXOYt5GahS8rg5u6+toEC1QIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYw
++DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAwjWz5tsUvYORVW8K
++JSK/biHFrAnFotMtoTKEewRmnYaYjwXIr1IPaBqhjkGGviLN2eOH/v97Uli6HC4l
++zhKHfMQUS9KF/f5nGcH8iQBy/gmFsfJQ1KDC6GNM4CfMGIzyxjYhP0VzdUtKX3PA
++l5EqgMUcdqRDy6Ruz55+JkdvCL1nAC7xH+czJcZVwysTdGfLTCh6VtYPgIkeL6U8
++3xQAyMuOHm72exJljYFqIsiNvGE0KufCqCuH1PD97IXMrLlwGmKKg5jP349lySBp
++Jjm6RDqCTT+6dUl2jkVbeNmco99Y7AOdtLsOdXBMCo5x8lK8zwQWFrzEms0joHXC
++pWfGWA==
++-----END CERTIFICATE-----
+diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem
+new file mode 100644
+index 0000000..e9d048f
+--- /dev/null
++++ b/tests/auto/qsslcertificate/more-certificates/blacklisted-turktrust-ego.gov.tr.pem
+@@ -0,0 +1,31 @@
++-----BEGIN CERTIFICATE-----
++MIIFPTCCBCWgAwIBAgICCCcwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAMMNFTD
++nFJLVFJVU1QgRWxla3Ryb25payBTdW51Y3UgU2VydGlmaWthc8SxIEhpem1ldGxl
++cmkxCzAJBgNVBAYTAlRSMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
++acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAo
++YykgS2FzxLFtICAyMDA1MB4XDTExMDgwODA3MDc1MVoXDTIxMDcwNjA3MDc1MVow
++bjELMAkGA1UEBhMCVFIxDzANBgNVBAgMBkFOS0FSQTEPMA0GA1UEBwwGQU5LQVJB
++MQwwCgYDVQQKDANFR08xGDAWBgNVBAsMD0VHTyBCSUxHSSBJU0xFTTEVMBMGA1UE
++AwwMKi5FR08uR09WLlRSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++v5zoj2Bpdl7R1M/zF6Qf4su2F8vDqISKvuTuyJhNAHhFGHCsHjaixGMHspuz0l3V
++50kq/ECWbN8kKaeTrB112QOrWTU276iup1Gh+OlEOiR9vlQ4VAP00dWUjD6z9HQF
++Ci8W3EsEtiiHiYOU9BcPpPkaUbECwP4nGVwR8aPwhB5PGBJc98romdvciYkUpSOO
++wkuSRtooA7tRlLFu72QaNpXN1NueB36I3aajPk0YyiXy2w8XlgK7QI4PSSBnSq+Q
++blFocWVmLhF94je7py6lCnllrIFXpR3FWZLD5GcI6HKlBS78AQ+IMBLFHhsEVw5N
++Qj90chSZClfBWBZzIaV9RwIDAQABo4IBpDCCAaAwHwYDVR0jBBgwFoAUq042AzDS
++29UKaL6HpVBs/PZwpSUwHQYDVR0OBBYEFGT7G4Y9uEryRIL5Vj3qJsD047M0MA4G
++A1UdDwEB/wQEAwIBBjBFBgNVHSAEPjA8MDoGCWCGGAMAAwEBATAtMCsGCCsGAQUF
++BwIBFh9odHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc3VlMA8GA1UdEwEB/wQF
++MAMBAf8wSQYDVR0fBEIwQDA+oDygOoY4aHR0cDovL3d3dy50dXJrdHJ1c3QuY29t
++LnRyL3NpbC9UVVJLVFJVU1RfU1NMX1NJTF9zMi5jcmwwgaoGCCsGAQUFBwEBBIGd
++MIGaMG4GCCsGAQUFBzAChmJodHRwOi8vd3d3LnR1cmt0cnVzdC5jb20udHIvc2Vy
++dGlmaWthbGFyL1RVUktUUlVTVF9FbGVrdHJvbmlrX1N1bnVjdV9TZXJ0aWZpa2Fz
++aV9IaXptZXRsZXJpX3MyLmNydDAoBggrBgEFBQcwAYYcaHR0cDovL29jc3AudHVy
++a3RydXN0LmNvbS50cjANBgkqhkiG9w0BAQUFAAOCAQEAj89QCCyoW0S20EcYDZAn
++vFLFmougK97Bt68iV1OM622+Cyeyf4Sz+1LBk1f9ni3fGT0Q+RWZJYWq5YuSBiLV
++gk3NLcxnwe3wmnvErUgq1QDtAaNlBWMEMklOlWGfJ0eWaillUskJbDd4KwgZHDEj
++7g/jYEQqU1t0zoJdwM/zNsnLHkhwcWZ5PQnnbpff1Ct/1LH/8pdy2eRDmRmqniLU
++h8r2lZfJeudVZG6yIbxsqP3t2JCq5c2P1jDhAGF3g9DiskH0CzsRdbVpoWdr+PY1
++Xz/19G8XEpX9r+IBJhLdbkpVo0Qh0A10mzFP/GUk5f/8nho2HvLaVMhWv1qKcF8I
++hQ==
++-----END CERTIFICATE-----
+-- 
+1.8.1
+
diff --git a/x11-libs/qt-core/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch b/x11-libs/qt-core/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch
new file mode 100644
index 0000000..d59ac49
--- /dev/null
+++ b/x11-libs/qt-core/files/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch
@@ -0,0 +1,35 @@
+From 03e96961b0f4fc2c290271c6e50a11aa334a40ff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org>
+Date: Sun, 3 Feb 2013 23:07:07 -0500
+Subject: [PATCH] Fix call to QMetaObject::metaCall from updateProperty
+
+Create an array of arguments in the same way
+QMetaObject::write does
+
+Task-number: QTBUG-29082
+Change-Id: I4ea5ab5dcd6b55cf0a127b855b5aac27a9d4a305
+---
+ src/corelib/animation/qpropertyanimation.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
+index dcf779a..9869d7e 100644
+--- a/src/corelib/animation/qpropertyanimation.cpp
++++ b/src/corelib/animation/qpropertyanimation.cpp
+@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue)
+ 
+     if (newValue.userType() == propertyType) {
+         //no conversion is needed, we directly call the QMetaObject::metacall
+-        void *data = const_cast<void*>(newValue.constData());
+-        QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data);
++        //check QMetaProperty::write for an explanation of these
++        int status = -1;
++        int flags = 0;
++        void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags };
++        QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv);
+     } else {
+         targetValue->setProperty(propertyName.constData(), newValue);
+     }
+-- 
+1.8.1.2
+
diff --git a/x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch b/x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch
new file mode 100644
index 0000000..fa82334
--- /dev/null
+++ b/x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch
@@ -0,0 +1,15 @@
+diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148	2012-11-23 04:09:53.000000000 -0600
++++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp	2013-02-11 07:07:18.942748176 -0600
+@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
+     Moc moc;
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
++
++    // Workaround a bugs while parsing some boost headers. See QTBUG-22829
++    pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++
+     QByteArray filename;
+     QByteArray output;
+     FILE *in = 0;
diff --git a/x11-libs/qt-core/qt-core-4.8.4-r131.ebuild b/x11-libs/qt-core/qt-core-4.8.4-r132.ebuild
index 2220775..c3eece0 100644
--- a/x11-libs/qt-core/qt-core-4.8.4-r131.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.4-r132.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.4-r2.ebuild,v 1.3 2013/02/09 20:11:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.4-r4.ebuild,v 1.1 2013/02/15 10:20:02 pesa Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+glib iconv icu qt3support ssl"
 
@@ -29,9 +29,11 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/moc-workaround-for-boost-1.48.patch"
+	"${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch"
 	"${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch"
+	"${FILESDIR}/blacklist-mis-issued-Turktrust-certs.patch"
 	"${FILESDIR}/CVE-2013-0254.patch"
+	"${FILESDIR}/fix-call-to-QMetaObject-metaCall-from-updateProperty.patch"
     "${FILESDIR}/qt-ccache.patch"
     "${FILESDIR}/qt-cxxflags.patch"
 )
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index dee4bed..5ef7724 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -2,4 +2,4 @@ AUX CVE-2013-0254.patch 6449 SHA256 c25f54ed3fdfed4cc945e53f7a848f88be8bda899c8e
 AUX qt-cxxflags.patch 799 SHA256 c2daf63c38bf018b66e054b44b2d87e459d18e48d66b13d130fa58d9fc8a4f21 SHA512 4080116da656d83f44c69c4f89b7e74855341db9b556d551fdc55941ba384b766ec0d1da75d3b6d6bfc4f77c1c16416dcd8bb46fa39a012c8a24c448fb511ae3 WHIRLPOOL ae0a015bc6168645fcdb26e64b8b9a92d99da24d787d0fde511b310398f2fd2e46913dd06e106860610e9a3fac22e3278e77cea56fb794acbf02a3f6805e048d
 AUX qt-gui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
-EBUILD qt-gui-4.8.4-r131.ebuild 8108 SHA256 228b03e9a7cd57dcc676d4992c30e3fb5c762a3272c161bf86356e4fe18b26bc SHA512 0456250b7da364df4762f0709e24e0c4afe916460b5420ab565fa856953cc4903e25833bca3359cd7c822ecfa58d9dcf0c1b764f91f35c095ff9fec61a8af7f2 WHIRLPOOL ec2291d5757357488c6e2f05b58b4dd670d2b85844c4aa7c7dd103089de5ff74163b374e055b23b66344f344b9ae4d6dcb10fcccf2505f58dc18c425df84ab32
+EBUILD qt-gui-4.8.4-r132.ebuild 7257 SHA256 588ac5b560dd1f21b40221d6593ff76b423bc095066c322d350138f52bc3f22a SHA512 c74b0ffcb66938255918f3fc714213de1b95b41f897bc0f0291ac16807820bcd561afda6fb2b613ead6a67481e9ece3e3a96b0570bbf75eebb38dd67ddb2ee14 WHIRLPOOL c61a9b2a8679cd4ff9b89f114668c84aa37edc30c37faa04e9421c23580dad9d08d3e2d74e6731f667f27399e8c1299a8590ee43e398ed1023a64f1be058e941
diff --git a/x11-libs/qt-gui/qt-gui-4.8.4-r131.ebuild b/x11-libs/qt-gui/qt-gui-4.8.4-r132.ebuild
index 99b7cf5..126101d 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.4-r131.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.4-r132.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild,v 1.4 2013/02/09 20:11:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild,v 1.11 2013/02/12 23:59:29 ago Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
 
@@ -19,6 +19,7 @@ REQUIRED_USE="
 	gtkstyle? ( glib )
 "
 
+# cairo[-qt4] is needed because of bug 454066
 RDEPEND="
 	app-admin/eselect-qtgraphicssystem
 	media-libs/fontconfig
@@ -43,7 +44,10 @@ RDEPEND="
 	cups? ( net-print/cups )
 	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
 	egl? ( media-libs/mesa[egl] )
-	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
+	gtkstyle? (
+		x11-libs/cairo[-qt4]
+		x11-libs/gtk+:2[aqua=]
+	)
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
 	tiff? ( media-libs/tiff:0 )
@@ -65,27 +69,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	# this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
-	# was planning to use a dep, but to reproduce this you have to
-	# clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed.
-	# no need to restrict normal first time users for that :)
-	if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then
-		echo
-		eerror "When building qt-gui[gtkstyle] from scratch with cairo present,"
-		eerror "cairo must have the qt4 use flag disabled, otherwise the gtk"
-		eerror "style cannot be built."
-		ewarn
-		eerror "You have the following options:"
-		eerror "  - rebuild cairo with -qt4 USE"
-		eerror "  - build qt-gui with -gtkstyle USE"
-		ewarn
-		eerror "After you successfully install qt-gui, you'll be able to"
-		eerror "re-enable the disabled use flag and/or reinstall cairo."
-		ewarn
-		echo
-		die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled"
-	fi
-
 	QT4_TARGET_DIRECTORIES="
 		src/gui
 		src/scripttools