[x11-libs/qt-(core|gui)] version bump to 4.8.4

12 files changed, 61 insertions, 350 deletions

diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 716b4b5..f001c30 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,9 +1,5 @@
-AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
-AUX blacklist-diginotar-certs.diff 6153 SHA256 461a6c1b0618119251ab03ee668aaa93f6a8b8ba1298d8eb928f87df70c76d75 SHA512 ec8bcef856a1aeeccf3b3edaf08cb441ef46edadc8704c8898e115647abc83608f1b89cde72a0164e92638ff95b65b6e5a9c68c07f0b8b9ddc12db57d008315f WHIRLPOOL 011787e35e85239e69c5947ea9574fc8c66d52bd16bb5f5981fecb76496cc6b6c106f8ff09339170717cca6942a2088ae00292b56247aa2778063b541cc3540d
 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-core-4.7.4-fix-libreoffice-crash.patch 1958 SHA256 097021dfb6c25d8d8ca31a8a1bf70e35f9962113ce44791ad682fb54f4604844 SHA512 245968b50d3753bce819858b016c3c2338ef8edd5565c6ebaf5eabb97970a7b7d45e03a235be41d0fec371db9cc97fdb93987e6b837563f8fe2eece791d7395e WHIRLPOOL bda1d5134ebca9f98b38e6eee876ae57cfa26f3ecc465cb1f89d13ad8a4e372a0410d4ec0da18cbe18cc7b86e8f9ab402b99e113d741c80c55660ac8225cc854
-AUX qt-core-4.8.1-localized-time.patch 414 SHA256 cfba302368ff281f94541549c9489517a5f13467583d87dd966ec255b92ff92e SHA512 f98e64ef6d866bb285c4eaeb891113bdc39e060fb990b44cce5d9fd969084b6acb0a215c2116753282e73b4d5c1892dc08326625c713d64317c6553b783192c0 WHIRLPOOL e4c4e0becffa91520b26bed2925832341c4156212e9e53c75b6313a3b98a02c96d000be8d625286bed2f7a89e11a8961c8354901e3c8cb0e6d2bc89d1ee1e132
 AUX qt-cxxflags.patch 791 SHA256 f2a7391dd78f152f1cd90cd62b84e4001be2176addfe1e3ca7c50c09b3a686fd SHA512 5bcdfc5ef0e7f0a2d388f13348ac66a6c0acbed7c043eef77e299d4cbb5e7d36cd172b585e560d96ee21de5482c4c31473ce9cee21525f301d8d659d68974b5d WHIRLPOOL aec5f5103302a3d8253ef904aace2e65f594c36e30a5584ea93406a770372757432ec5ec9e43105b8f7e113e8937d1f1fcbc7c1f7e7c8af0a10fb4b50d9cea9b
-DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
-EBUILD qt-core-4.8.3-r121.ebuild 4817 SHA256 043b27b5ffd581acb985e868990edc58c14e84e90deab8cac0ee62da4a556a72 SHA512 129ff5b16897cb5d512408255e41d41032cf98a4540beb6bfd322e72b9ea0171774ffff564d17abe82ae519d3b829d637c11312c914085c500400e27178e122b WHIRLPOOL 5307fb1d1a7e0f9ebc6625a14fe2b70d90c6c348cb9ca995444f119389c9c4f9f816c4e63e0ffe03739222d1beb67ada496300c2e2fe95324e90d4d0564bdcf7
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+EBUILD qt-core-4.8.4-r121.ebuild 5096 SHA256 c82379b303336bce8b2cd917db2b5feecfada87e1122880a0cee1c51a4625d8f SHA512 af90c8afdf0d8cbfae3584e253c81f3a6962d49754bb2bc1bd964a2c53bf92ceb54f72066c3537a18fec676495c3437377959c5c16937bf767903edca2d9f9c2 WHIRLPOOL 22463382abf0cdc6ef996c468d3e34dd1ea18c6e12e2f700f8e8998d2de0faa43115833263a0f69324170c7e587ca157e351baddb3020abda491dc9d43735479
diff --git a/x11-libs/qt-core/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-core/files/4.8.2-qatomic-x32.patch
deleted file mode 100644
index 5f352b1..0000000
--- a/x11-libs/qt-core/files/4.8.2-qatomic-x32.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <davidepesa@gmail.com>
-Date: Thu, 14 Jun 2012 00:44:43 +0200
-Subject: [PATCH] Fix qatomic inline asm for x32 ABI.
-
-Drop the 'q' suffix from x86_64 asm instructions. It's not needed,
-because the assembler can automatically determine the proper size
-based on the target, and it is in fact causing compilation failures
-on x32.
-
-Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/corelib/arch/qatomic_x86_64.h |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h
-index c2627c8..dc78140 100644
---- a/src/corelib/arch/qatomic_x86_64.h
-+++ b/src/corelib/arch/qatomic_x86_64.h
-@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu
- {
-     unsigned char ret;
-     asm volatile("lock\n"
--                 "cmpxchgq %3,%2\n"
-+                 "cmpxchg %3,%2\n"
-                  "sete %1\n"
-                  : "=a" (newValue), "=qm" (ret), "+m" (_q_value)
-                  : "r" (newValue), "0" (expectedValue)
-@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
- {
--    asm volatile("xchgq %0,%1"
-+    asm volatile("xchg %0,%1"
-                  : "=r" (newValue), "+m" (_q_value)
-                  : "0" (newValue)
-                  : "memory");
-@@ -192,7 +192,7 @@ template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
- {
-     asm volatile("lock\n"
--                 "xaddq %0,%1"
-+                 "xadd %0,%1"
-                  : "=r" (valueToAdd), "+m" (_q_value)
-                  : "0" (valueToAdd * sizeof(T))
-                  : "memory");
--- 
-1.7.10
-
diff --git a/x11-libs/qt-core/files/blacklist-diginotar-certs.diff b/x11-libs/qt-core/files/blacklist-diginotar-certs.diff
deleted file mode 100644
index 12eeb3a..0000000
--- a/x11-libs/qt-core/files/blacklist-diginotar-certs.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
-gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=382171
---- src/network/ssl/qsslcertificate.cpp
-+++ src/network/ssl/qsslcertificate.cpp
-@@ -803,22 +803,47 @@
- // These certificates are known to be fraudulent and were created during the comodo
- // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
- static const char *certificate_blacklist[] = {
--    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
--    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
--    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
--    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
--    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
--    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
--    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
--    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
--    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo
-+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo
-+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo
-+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo
-+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo
-+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo
-+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo
-+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo
-+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo
-+
-+    "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // leaf certificate issued by DigiNotar
-+    "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", // DigiNotar root
-+    "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar Root
-+    "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root
-+    "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA G2", // other DigiNotar Root CA
-+    "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA G2"
-+    "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar Root
-+
-+    "1184640176",                                      "DigiNotar Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust
-+    "120000525",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "120000505",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "120000515",                                       "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+    "20015536",                                        "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar intermediate cross-signed by the Dutch government
-+    "20001983",                                        "DigiNotar PKIoverheid CA Organisatie - G2", // DigiNotar intermediate cross-signed by the Dutch government
-+    "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root
-+    "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA 2025", // DigiNotar intermediate
-+//    "(has not been seen in the wild so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate
-+//    "(has not been seen in the wild so far)", "Koninklijke Notariele Beroepsorganisatie CA", // compromised during DigiNotar breach
-+//    "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach
-+    "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-+    "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-     0
- };
- 
- bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
- {
-     for (int a = 0; certificate_blacklist[a] != 0; a++) {
--        if (certificate.serialNumber() == certificate_blacklist[a])
-+        QString blacklistedCommonName = QString::fromUtf8(certificate_blacklist[(a+1)]);
-+        if (certificate.serialNumber() == certificate_blacklist[a++] &&
-+            (certificate.subjectInfo(QSslCertificate::CommonName) == blacklistedCommonName ||
-+             certificate.issuerInfo(QSslCertificate::CommonName) == blacklistedCommonName))
-             return true;
-     }
-     return false;
---- src/network/ssl/qsslsocket_openssl.cpp
-+++ src/network/ssl/qsslsocket_openssl.cpp
-@@ -1183,12 +1183,16 @@
-     X509 *x509 = q_SSL_get_peer_certificate(ssl);
-     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
-     q_X509_free(x509);
--    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
--        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
--        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
--        emit q->error(QAbstractSocket::SslHandshakeFailedError);
--        plainSocket->disconnectFromHost();
--        return false;
-+
-+    // check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer)
-+    foreach (const QSslCertificate &cert, configuration.peerCertificateChain) {
-+        if (QSslCertificatePrivate::isBlacklisted(cert)) {
-+            q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+            q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+            emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+            plainSocket->disconnectFromHost();
-+            return false;
-+        }
-     }
- 
-     // Start translating errors.
diff --git a/x11-libs/qt-core/files/qt-core-4.7.4-fix-libreoffice-crash.patch b/x11-libs/qt-core/files/qt-core-4.7.4-fix-libreoffice-crash.patch
deleted file mode 100644
index 0350183..0000000
--- a/x11-libs/qt-core/files/qt-core-4.7.4-fix-libreoffice-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/corelib/global/qnamespace.qdoc.sav	2011-08-23 14:02:27.000000000 +0200
-+++ src/corelib/global/qnamespace.qdoc	2011-11-22 13:06:00.879288001 +0100
-@@ -167,6 +167,10 @@
-            attribute is true. This attribute must be set after QApplication is
-            constructed. This is only supported in Symbian^3 and later Symbian releases.
- 
-+    \value AA_X11InitThreads Calls XInitThreads() as part of the QApplication
-+           construction in order to make Xlib calls thread-safe.
-+
-+
-     \omitvalue AA_AttributeCount
- */
- 
---- src/corelib/global/qnamespace.h.sav	2011-08-23 14:02:27.000000000 +0200
-+++ src/corelib/global/qnamespace.h	2011-11-22 13:07:35.925288002 +0100
-@@ -544,6 +544,7 @@ public:
-         AA_MacDontSwapCtrlAndMeta = 7,
-         AA_S60DontConstructApplicationPanes = 8,
-         AA_S60DisablePartialScreenInputMode = 9,
-+        AA_X11InitThreads = 10,
- 
-         // Add new attributes before this line
-         AA_AttributeCount
---- src/gui/kernel/qapplication_x11.cpp.sav	2011-08-23 14:02:27.000000000 +0200
-+++ src/gui/kernel/qapplication_x11.cpp	2011-11-22 13:06:00.881288001 +0100
-@@ -1739,6 +1739,9 @@ void qt_init(QApplicationPrivate *priv,
-     } else {
-         // Qt controls everything (default)
- 
-+        if (QApplication::testAttribute(Qt::AA_X11InitThreads))
-+            XInitThreads();
-+
-         // Set application name and class
-         char *app_class = 0;
-         if (argv && argv[0]) {
---- src/gui/image/qpixmap.cpp.sav	2011-08-23 14:02:27.000000000 +0200
-+++ src/gui/image/qpixmap.cpp	2011-11-22 13:06:39.723288001 +0100
-@@ -99,7 +99,7 @@ static bool qt_pixmap_thread_test()
-         return false;
-     }
- #ifndef Q_WS_WIN
--    if (qApp->thread() != QThread::currentThread()) {
-+    if (!QApplication::testAttribute(Qt::AA_X11InitThreads) && qApp->thread() != QThread::currentThread()) {
-         qWarning("QPixmap: It is not safe to use pixmaps outside the GUI thread");
-         return false;
-     }
diff --git a/x11-libs/qt-core/files/qt-core-4.8.1-localized-time.patch b/x11-libs/qt-core/files/qt-core-4.8.1-localized-time.patch
deleted file mode 100644
index 39931cf..0000000
--- a/x11-libs/qt-core/files/qt-core-4.8.1-localized-time.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/corelib/tools/qlocale_unix.cpp.org	2012-04-14 11:02:06.425917171 +0200
-+++ src/corelib/tools/qlocale_unix.cpp	2012-04-14 11:02:50.247920549 +0200
-@@ -68,6 +68,8 @@
-             lang = QByteArray("C");
-         if (numeric.isEmpty())
-             numeric = lang;
-+	if (time.isEmpty())
-+	    time = lang;
-         if (monetary.isEmpty())
-             monetary = lang;
-         if (lc_messages_var.isEmpty())
diff --git a/x11-libs/qt-core/qt-core-4.8.3-r121.ebuild b/x11-libs/qt-core/qt-core-4.8.4-r121.ebuild
index 62831e4..3f8d255 100644
--- a/x11-libs/qt-core/qt-core-4.8.3-r121.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.4-r121.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.3.ebuild,v 1.1 2012/09/14 07:33:26 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.4.ebuild,v 1.1 2012/12/05 03:14:14 yngwin Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 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"
 fi
-IUSE="+glib iconv icu optimized-qmake qt3support ssl"
+IUSE="+glib iconv icu qt3support ssl"
 
 DEPEND="
 	sys-libs/zlib
@@ -25,13 +25,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 PDEPEND="
-	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qt3support] )
+	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] )
 "
 
 PATCHES=(
 	"${FILESDIR}/moc-workaround-for-boost-1.48.patch"
-        "${FILESDIR}/qt-cxxflags.patch"
-        "${FILESDIR}/qt-ccache.patch"
+	"${FILESDIR}/qt-ccache.patch"
+	"${FILESDIR}/qt-cxxflags.patch"
 )
 
 pkg_setup() {
@@ -89,6 +89,13 @@ src_prepare() {
 		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
 	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
 		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
+
+	# bug 427782
+	sed -i -e "/^CPPFLAGS/s/-g//" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
+	sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
+		-e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
+		"${S}/configure" || die "sed configure setBootstrapVariable failed"
 }
 
 src_configure() {
@@ -102,7 +109,6 @@ src_configure() {
 		$(qt_use glib)
 		$(qt_use iconv)
 		$(qt_use icu)
-		$(qt_use optimized-qmake)
 		$(use ssl && echo -openssl-linked || echo -no-openssl)
 		$(qt_use qt3support)"
 
@@ -167,7 +173,7 @@ src_install() {
 	install_qconfigs
 
 	# remove .la files
-	find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm
+	prune_libtool_files
 
 	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
 
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index b46b243..b6f3b97 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,7 +1,5 @@
-AUX 4.8.2-qatomic-x32.patch 1962 SHA256 a8b115dfa57142d7f9c4e5f4210e16e2416b4e27a0ac52fa6437558eec8ae4da SHA512 32e85edc50de856b39fe2ae15cca3fb6758de125012e89697dc461b05bbdef93a6084ef752f76a2b6be0d6b3e408987247dd147b127aacfac23c1515a82bd56a WHIRLPOOL 70952230ed04d7bdd4dd48fdc5ac3d99550187a81e830b0f4ad923288482a202af2ecb01275ef9b9de6f2c832a6d871d92c85f6ed5c107016ab64d4e4fa05590
+AUX 44qt4-gtkstyle 33 SHA256 6e0047d93a89c0bd404a1ff26f534570fc41de7dfaf15cf171bad927cee7d8c3 SHA512 f2ffe31d3a4b77bc2cfa5fee6716b6cfa0978d4e3c6a3fa5fa7431788575e274c431f9e482223ffabe0ac255f97496c0776031d35d6eb7cf16b47e7db5228dee WHIRLPOOL be1dd16c4db2e3abf134f35ba6ae4295fd772abbed0b1dc7f38b40e8ec8b9608ac0f24d46515cd9e17d3cc6341167afde87cf93a401846cb8c8b6314840595f4
 AUX qt-cxxflags.patch 791 SHA256 f2a7391dd78f152f1cd90cd62b84e4001be2176addfe1e3ca7c50c09b3a686fd SHA512 5bcdfc5ef0e7f0a2d388f13348ac66a6c0acbed7c043eef77e299d4cbb5e7d36cd172b585e560d96ee21de5482c4c31473ce9cee21525f301d8d659d68974b5d WHIRLPOOL aec5f5103302a3d8253ef904aace2e65f594c36e30a5584ea93406a770372757432ec5ec9e43105b8f7e113e8937d1f1fcbc7c1f7e7c8af0a10fb4b50d9cea9b
 AUX qt-gui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
-AUX qt-gui-4.7.4-fix-libreoffice-crash.patch 1958 SHA256 097021dfb6c25d8d8ca31a8a1bf70e35f9962113ce44791ad682fb54f4604844 SHA512 245968b50d3753bce819858b016c3c2338ef8edd5565c6ebaf5eabb97970a7b7d45e03a235be41d0fec371db9cc97fdb93987e6b837563f8fe2eece791d7395e WHIRLPOOL bda1d5134ebca9f98b38e6eee876ae57cfa26f3ecc465cb1f89d13ad8a4e372a0410d4ec0da18cbe18cc7b86e8f9ab402b99e113d741c80c55660ac8225cc854
-AUX qt-gui-4.8.1-fix-calligra-crash.patch 1074 SHA256 94bcdce1b4d737bf7492bb1936502054fa9c66d1d55dfb437c644166b0281d7e SHA512 2cd94d03f9126548052d93c52ca6050cb908bdad55c6a4cba42f3d87cf17ae55976765a4d5bfc7b62c20faeb5f10ec679812ef8b4cd5e17e7c004a7932242257 WHIRLPOOL 610ebd81e8603fdacbc86d62cad001bc9d7a2c750ddda218bc38c9e4f9c90da9354b7f385989d93dbc90f144c1ca1e0853df5b2a6c927650c9f725719d368bfb
-DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b
-EBUILD qt-gui-4.8.3-r121.ebuild 6987 SHA256 8fdba055f031d245e7faa3d61bdba3cbc51c7f5cb89e4e9be332df4f2337d3b4 SHA512 85e8af676ebb555a2b926a3722eb652a69cfb14d62b18a6ebb2642a63aae1b9a9c97daa5d69a29699a53e4d61029f1714b68543d19874b4f0f2b730783b4711b WHIRLPOOL 3f73986600d1fda8d33ae122f33a2a91177792c086c07aa86cfe88b5a27a1e475712f0a4f19903293d249ab700817adbe12d3a6f3975f4e433d1e5945f66a997
+DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+EBUILD qt-gui-4.8.4-r121.ebuild 8230 SHA256 0d2e05ee2915ac2c64772f20cdcf93cd2624750b218b710d068f3205573a8e28 SHA512 97a356e0f76ecbe8ea415dbd5c61353c1eeb677c2cb005ae8ef9cdb3aecdc5f197c6f2e2870feeb9bae21bdc38982316e9a3290e04c8935e1341981bfd098803 WHIRLPOOL 1127194fef6d6cdad96e800a206bfc9c88b09a103f95064f01e7ba67102e0eada701aa17fa822307a582d59ced1ff9d1dcd0b696988357b9078b356c03c80c3a
diff --git a/x11-libs/qt-gui/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-gui/files/4.8.2-qatomic-x32.patch
deleted file mode 100644
index 5f352b1..0000000
--- a/x11-libs/qt-gui/files/4.8.2-qatomic-x32.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <davidepesa@gmail.com>
-Date: Thu, 14 Jun 2012 00:44:43 +0200
-Subject: [PATCH] Fix qatomic inline asm for x32 ABI.
-
-Drop the 'q' suffix from x86_64 asm instructions. It's not needed,
-because the assembler can automatically determine the proper size
-based on the target, and it is in fact causing compilation failures
-on x32.
-
-Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/corelib/arch/qatomic_x86_64.h |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h
-index c2627c8..dc78140 100644
---- a/src/corelib/arch/qatomic_x86_64.h
-+++ b/src/corelib/arch/qatomic_x86_64.h
-@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu
- {
-     unsigned char ret;
-     asm volatile("lock\n"
--                 "cmpxchgq %3,%2\n"
-+                 "cmpxchg %3,%2\n"
-                  "sete %1\n"
-                  : "=a" (newValue), "=qm" (ret), "+m" (_q_value)
-                  : "r" (newValue), "0" (expectedValue)
-@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValu
- template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
- {
--    asm volatile("xchgq %0,%1"
-+    asm volatile("xchg %0,%1"
-                  : "=r" (newValue), "+m" (_q_value)
-                  : "0" (newValue)
-                  : "memory");
-@@ -192,7 +192,7 @@ template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
- {
-     asm volatile("lock\n"
--                 "xaddq %0,%1"
-+                 "xadd %0,%1"
-                  : "=r" (valueToAdd), "+m" (_q_value)
-                  : "0" (valueToAdd * sizeof(T))
-                  : "memory");
--- 
-1.7.10
-
diff --git a/x11-libs/qt-gui/files/44qt4-gtkstyle b/x11-libs/qt-gui/files/44qt4-gtkstyle
new file mode 100644
index 0000000..217da24
--- /dev/null
+++ b/x11-libs/qt-gui/files/44qt4-gtkstyle
@@ -0,0 +1 @@
+GTK2_RC_FILES="$HOME/.gtkrc-2.0"
diff --git a/x11-libs/qt-gui/files/qt-gui-4.7.4-fix-libreoffice-crash.patch b/x11-libs/qt-gui/files/qt-gui-4.7.4-fix-libreoffice-crash.patch
deleted file mode 100644
index 0350183..0000000
--- a/x11-libs/qt-gui/files/qt-gui-4.7.4-fix-libreoffice-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/corelib/global/qnamespace.qdoc.sav	2011-08-23 14:02:27.000000000 +0200
-+++ src/corelib/global/qnamespace.qdoc	2011-11-22 13:06:00.879288001 +0100
-@@ -167,6 +167,10 @@
-            attribute is true. This attribute must be set after QApplication is
-            constructed. This is only supported in Symbian^3 and later Symbian releases.
- 
-+    \value AA_X11InitThreads Calls XInitThreads() as part of the QApplication
-+           construction in order to make Xlib calls thread-safe.
-+
-+
-     \omitvalue AA_AttributeCount
- */
- 
---- src/corelib/global/qnamespace.h.sav	2011-08-23 14:02:27.000000000 +0200
-+++ src/corelib/global/qnamespace.h	2011-11-22 13:07:35.925288002 +0100
-@@ -544,6 +544,7 @@ public:
-         AA_MacDontSwapCtrlAndMeta = 7,
-         AA_S60DontConstructApplicationPanes = 8,
-         AA_S60DisablePartialScreenInputMode = 9,
-+        AA_X11InitThreads = 10,
- 
-         // Add new attributes before this line
-         AA_AttributeCount
---- src/gui/kernel/qapplication_x11.cpp.sav	2011-08-23 14:02:27.000000000 +0200
-+++ src/gui/kernel/qapplication_x11.cpp	2011-11-22 13:06:00.881288001 +0100
-@@ -1739,6 +1739,9 @@ void qt_init(QApplicationPrivate *priv,
-     } else {
-         // Qt controls everything (default)
- 
-+        if (QApplication::testAttribute(Qt::AA_X11InitThreads))
-+            XInitThreads();
-+
-         // Set application name and class
-         char *app_class = 0;
-         if (argv && argv[0]) {
---- src/gui/image/qpixmap.cpp.sav	2011-08-23 14:02:27.000000000 +0200
-+++ src/gui/image/qpixmap.cpp	2011-11-22 13:06:39.723288001 +0100
-@@ -99,7 +99,7 @@ static bool qt_pixmap_thread_test()
-         return false;
-     }
- #ifndef Q_WS_WIN
--    if (qApp->thread() != QThread::currentThread()) {
-+    if (!QApplication::testAttribute(Qt::AA_X11InitThreads) && qApp->thread() != QThread::currentThread()) {
-         qWarning("QPixmap: It is not safe to use pixmaps outside the GUI thread");
-         return false;
-     }
diff --git a/x11-libs/qt-gui/files/qt-gui-4.8.1-fix-calligra-crash.patch b/x11-libs/qt-gui/files/qt-gui-4.8.1-fix-calligra-crash.patch
deleted file mode 100644
index 431141f..0000000
--- a/x11-libs/qt-gui/files/qt-gui-4.8.1-fix-calligra-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit cac12f4592477d99ef6fffaad40345bf85ef53b5
-Author: Jiang Jiang <jiang.jiang@nokia.com>
-Date:   Mon Apr 2 12:32:05 2012 +0200
-
-    Fix a crash in cursorToX() when new block is added
-    
-    When an empty new block is being added, the layoutData->memory data
-    will be 0, thus QTextEngine::attributes() will return 0. We should
-    only access the attributes pointer when some text actually exist.
-    
-    Task-number: QTBUG-24718
-    Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33
-
-diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
-index ee658d9..16f7150 100644
---- a/src/gui/text/qtextlayout.cpp
-+++ b/src/gui/text/qtextlayout.cpp
-@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
-     int pos = *cursorPos;
-     int itm;
-     const HB_CharAttributes *attributes = eng->attributes();
-+    if (!attributes) {
-+        *cursorPos = 0;
-+        return x.toReal();
-+    }
-     while (pos < line.from + line.length && !attributes[pos].charStop)
-         pos++;
-     if (pos == line.from + (int)line.length) {
\ No newline at end of file
diff --git a/x11-libs/qt-gui/qt-gui-4.8.3-r121.ebuild b/x11-libs/qt-gui/qt-gui-4.8.4-r121.ebuild
index 381814e..425bf78 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.3-r121.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.4-r121.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.3.ebuild,v 1.1 2012/09/14 07:49:53 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4.ebuild,v 1.1 2012/12/05 03:20:44 yngwin Exp $
 
 EAPI=4
 
@@ -26,8 +26,8 @@ RDEPEND="
 	media-libs/libpng:0
 	sys-libs/zlib
 	virtual/jpeg
-	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,glib=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=,c++0x=,debug=]
+	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,debug=]
 	!aqua? (
 		x11-libs/libICE
 		x11-libs/libSM
@@ -41,10 +41,9 @@ RDEPEND="
 		xv? ( x11-libs/libXv )
 	)
 	cups? ( net-print/cups )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,debug=] )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
 	egl? ( media-libs/mesa[egl] )
-	gtkstyle? ( x11-libs/gtk+:2[aqua=]
-		!x11-libs/cairo[qt4] )
+	gtkstyle? ( x11-libs/gtk+:2[aqua=] )
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
 	tiff? ( media-libs/tiff:0 )
@@ -57,7 +56,7 @@ DEPEND="${RDEPEND}
 		xv? ( x11-proto/videoproto )
 	)
 "
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,debug=] )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.7.3-cups.patch"
@@ -65,6 +64,27 @@ 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
@@ -205,14 +225,13 @@ src_install() {
 	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
 	touch "${ED}"/usr/share/qt4/graphicssystems/native || die
 
-	doicon tools/designer/src/designer/images/designer.png \
-		tools/linguist/linguist/images/icons/linguist-128-32.png
-	use dbus && doicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png
+	doicon tools/designer/src/designer/images/designer.png
+	newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
+	newicon tools/qtconfig/images/appicon.png qtconfig.png
+	use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
 	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
-	make_desktop_entry linguist Linguist linguist-128-32 'Qt;Development;GUIDesigner'
-
-	# see bug 388551
-	use gtkstyle && doenvd "${FILESDIR}"/44qt4-gtkstyle
+	make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
+	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
 }
 
 pkg_postinst() {
@@ -222,4 +241,13 @@ pkg_postinst() {
 	elog "Starting with Qt 4.8, you may choose the active Qt Graphics System"
 	elog "by using a new eselect module called qtgraphicssystem."
 	elog "Run \`eselect qtgraphicssystem\` for more information."
+
+	if use gtkstyle; then
+		# see bug 388551
+		elog
+		elog "For Qt's GTK style to work, you need to either export"
+		elog "the following variable into your environment:"
+		elog '  GTK2_RC_FILES="$HOME/.gtkrc-2.0"'
+		elog "or alternatively install gnome-base/libgnomeui"
+	fi
 }