From: Leonardo Valeri Manera <lvalerimanera@gmail.com>
Date: Sun, 11 May 2008 23:47:02 +0000 (+0200)
Subject: x11-libs/qt: delete old extraversions, rebase to current portage ebuilds.
X-Git-Url: https://repo.or.cz/w/gentoo-soor-overlay.git/commitdiff_plain/77f9888f9bf8123f9063f2bff4c7cfccb05a089b

x11-libs/qt: delete old extraversions, rebase to current portage ebuilds.
---

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 89f2600..58e3547 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,33 +1,38 @@
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439
 AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1
+AUX 0037-dnd-timestamp-fix.patch 2138 RMD160 c11fffd7801fb357beb2d489e6e7cc4edefc3030 SHA1 cda25e150541c3a2ba56ec6974e2771b8aaad0de SHA256 490eb5c21dc30e0beac0aac8a4b6159d56a5e3e7fe40daad39f0c0823648917d
 AUX 0038-dragobject-dont-prefer-unknown.patch 2551 RMD160 0a89aec1a6f9672a927029ca01a1bd8573552745 SHA1 3a2371a520d800904350bb9e6e445d6b3092bb88 SHA256 b5c0d00d1ac84302bc2123ccdfdab473cd0daf12f4ba70d6318084d9f744242c
 AUX 0044-qscrollview-windowactivate-fix.diff 1584 RMD160 978cc6c473b668e1bfd5969cce9307719baecf0a SHA1 657ff8ab47aafbd6469688f489fd3788ccb98907 SHA256 f73798b72251d6fe97ed8e661719ba29983c087587ed952618ec4a97bf1816d5
 AUX 0047-fix-kmenu-widget.diff 992 RMD160 bada5e23043d314b15f3af1eda70c8833112ebce SHA1 d67e34b540c2f19e7e3e3715535a6732f447b22c SHA256 0dadffc3218b04eb327baf51c1f681843046cdf07a52b943f46373cd8384c275
 AUX 0048-qclipboard_hack_80072.patch 1662 RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb SHA1 5c174acaf3b148f8d70345f68c7f22352450d582 SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c
 AUX 0081-format-string-fixes.diff 6496 RMD160 80e884eaa0784d982609cd2e4690d547036fd2aa SHA1 e2641cbfc8ae47e5122fa31dc8529d723a813b05 SHA256 d831c45eecfc8c6a0011a7c5cc182a4949b4995de4fa92bd76ff1e42b530e1f9
+AUX 0185-fix-format-strings.diff 9650 RMD160 e49b2a2e1eab94d529879a0f0ea4f77ceaae6ca8 SHA1 371f9f84dde01b7e56afe2445255fc4f1054bf34 SHA256 b8ccdb916a9e3099f741885a0ee62420a86f4c8693e2d30d25d1e41491963b60
 AUX qsslsocket-fix.patch 1547 RMD160 bfa729876c0e7c1562ce6a383055e135a658e265 SHA1 f8d2a98c660d45fede3559181f8563c70e698a2b SHA256 281a343e09a769f34019a20a3fff0725209af7e7ef5d7962e25bff3a5e92d1a1
+AUX qt-3.3.4-0047-fix-kmenu-widget.diff 992 RMD160 bada5e23043d314b15f3af1eda70c8833112ebce SHA1 d67e34b540c2f19e7e3e3715535a6732f447b22c SHA256 0dadffc3218b04eb327baf51c1f681843046cdf07a52b943f46373cd8384c275
+AUX qt-3.3.4-0051-qtoolbar_77047.patch 1278 RMD160 c28fc4f367c30073470fbca316d13a7892b1adfe SHA1 7dd9c06079cb7c6f4b6c002948582fce1f190dde SHA256 ea2f2c3c7d1839696aaafc08ba207f6a061895e57a0913074d1f013b9b455cc0
+AUX qt-3.3.4-gcc4-volatile.patch 2480 RMD160 ac21760168e86067e7d438cd071eabe1e22f33b0 SHA1 e88cd72a738f82cde8d06fa23f5d76236791ceee SHA256 e86af42112302e46985d7c2d4739d771aba2e3568b24f0879ab87132d332a0f8
+AUX qt-3.3.4-gcc4.patch 1002 RMD160 fa263a5c095069f4f90746f0e6f29e49ad999bea SHA1 e1628b465c1d65940c691581323604f7cdcb6e8f SHA256 1fb0c47495566ab556b4d2cae0db277a3f701ff408d4a8615839d70fa5df6fc1
+AUX qt-3.3.4-immodule-focus.patch 877 RMD160 64adf25a67c0eedad839925380c8fe77fb887b9d SHA1 811a26738f286e0b8e5f9495ab4e97277d52c525 SHA256 4185c82a1fed2a8a69f95ab975582d33db4b542c96cc82e090d30e3a01297bdf
+AUX qt-3.3.4-qclipboard-hack.patch 1662 RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb SHA1 5c174acaf3b148f8d70345f68c7f22352450d582 SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c
+AUX qt-3.3.8-immqt+gcc-4.3.patch 756 RMD160 b4379b8c66b2708301f9883ecc1be55ae916a20f SHA1 179825f382fab2cadd097f7597292a69ef71d575 SHA256 d281c1e1f20cdc4f3351eede25287ba3b6bd80cbb0e6f5a9f997394521feb6bd
+AUX qt-3.3.8-mips.patch 1326 RMD160 0fd662a36c2fe0013e7204218ddfc8c604467269 SHA1 a8d1cf81f4b2c35c46b1d0efacd5e5ad7811ec49 SHA256 982a92c010df448cb83c2e6a8f46a4f8979d8b5708b2942485cca962621f0caf
 AUX qt-3.3.8-mysql-unload-crash.diff 1150 RMD160 02f9d2c720503ec851be2c5488b0153823ab8a62 SHA1 bb6aad81cce143c23ff7840b1d79f6b2007a0c04 SHA256 d494e386cab40f7f7a1803745c220c6104b56b73419981b20d49fc0750996076
 AUX qt-3.3.8-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 SHA1 60b9c0a323d598aacca089d677c4b1c9709e70db SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503
 AUX qt-3.3.8-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa SHA1 38bd5da513a2c28f3d941ba5644024643d835676 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3
 AUX qt-3.3.8-unicode-off-by-one.patch 328 RMD160 819e449f2e8682c25f33d6e105d093ddfdecc828 SHA1 98da33f1146df9229b57f20f31140b237df51eb8 SHA256 4b80c5b46178bed62ceebda1240197969aae2a0fb6eca6d294843372df11a111
 AUX qt-3.3.8-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 SHA1 692ada218ed717b8b2fc5f5f67cf747bb50f59e4 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407
 AUX qt-4.2.3-hppa-ldcw-fix.patch 986 RMD160 6435fcf447a2f13bbb9d3060a2712fcd35db622c SHA1 e199a2f8db72f798bd9b76a12c6dae3a9a436fac SHA256 fa69fc4498e9dba703f15c8bcb6c28ee3bfc62f078abae5714634b81817267d1
+AUX qt-4.3.1-unicode-off-by-one.patch 457 RMD160 27ebac8c8ae6700c3428f794066f1cdda19d4675 SHA1 713895b064e669a884f5236904659eb65aecc88e SHA256 cde6bd6bae54eb94cba96752deecb0e21e7f851d8de4a5fbf4ae2034d863f33b
 AUX qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 SHA1 2f09deb7e354797ee72aa65a35c882a5ed5fd86c SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d
 AUX qt4/Assistant.desktop 368 RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d SHA1 515684005a50bfa19ed84fb4105fbb9317ad5d99 SHA256 77b0852193675857141e0ce9ac521cfdab1506a822436a0dec4c4221a680cc4b
 AUX qt4/Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA1 2ca9fc952d204635a2b62480cf4531faf2938110 SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741
 AUX qt4/Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7
 AUX utf8-bug-qt3.diff 2670 RMD160 f5db1461cd82ac98417ab641228e15816d160724 SHA1 ca5ecb29c7f1c826d48703339a3371038e306bb7 SHA256 aab526bcff76ccf981ce3095bf6f26b26823f9078a672c89fe78331b6d975aa0
 DIST qt-copy-3.3.8-patches-1.1.tar.lzma 29108 RMD160 79001cea8e687de898fa83eb455bbba2f3e2fa21 SHA1 cf784e56c983d1d00591a910a9042b7136b073c8 SHA256 6018b31e3e428681b8d3f7f7919bb1c2ea95f07255b2ef3efcb6cd7456130cab
-DIST qt-copy-4.3.2-patches-1.0.tar.lzma 12564 RMD160 60bcf3974b343a44dac75a1323fcc49c60f56e98 SHA1 c65c34c71e5f80da889c6b8948e95cd06f15a2ef SHA256 c041f6740b22a6d0fb62166f21c5c2b8bbefb7a6970f1d2adc8544fe19b05b12
-DIST qt-copy-4.3.3-patches-1.1.tar.lzma 14319 RMD160 657964577d4d068fb4cc6e81af494275c1b8975f SHA1 214e670412839f3eebee64fc2a14579bf98faa40 SHA256 de521e665a4c250f4b7dc076ccfe9d5cdbbbb2bddf76cb1fdf5571b46b3270c1
 DIST qt-copy-4.3.4-patches-1.0.tar.lzma 11182 RMD160 9099b60b08c4991399a4c5226954f8df614b2ffb SHA1 c361579aa73a7b990ccf2297f7c5248e0c123b24 SHA256 ffb80c1995aa1f7590d5a9d9423b1aa6e9bc2bbdddec8d4cff7ce7ec5680dbe0
 DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
-DIST qt-x11-opensource-src-4.3.2.tar.gz 43462686 RMD160 b73a3d7a1edd11987544291cce80b56f5a499969 SHA1 265fb56ded2e7ff101ebd722bd2bc1638f96057d SHA256 70198d61d038007c787bab62700d35cbd3fc925b53fe920672f2a0afbae7e276
-DIST qt-x11-opensource-src-4.3.3.tar.gz 42341802 RMD160 410daca03b6802ba5cc6662219c2ba7a190bd292 SHA1 77d00e2438efa793f6c16c54b64c8ba440ee3228 SHA256 89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570
 DIST qt-x11-opensource-src-4.3.4.tar.gz 43988710 RMD160 eb081e599e61bcaa126981aecbe2db480be35eca SHA1 639f6469d5aa07c51c2aa6795f8e3de3aab8cd25 SHA256 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2
-EBUILD qt-3.3.8-r4.ebuild 12274 RMD160 481db97b099847e0c2b82bb92d31ee8399398df7 SHA1 dc303b84d885269039aedd9c66bbfa1a8c5af099 SHA256 09c6269d13da3f9a9430975ffa9cd015be0f1833ee5335b62a78555e82d78c4d
-EBUILD qt-4.3.2-r1.ebuild 9367 RMD160 a5bc55e0516ecdc07bd56680fdb0d1f0a68a2cf4 SHA1 c1e3e017e998b4abbf702d83f3b888b8b0b479a3 SHA256 f725f1b0559d2f3359bcfd0ff00724e518459c79156ccf834661bf05fbcaddb5
-EBUILD qt-4.3.3.ebuild 9291 RMD160 e1483cbd359e7bee499e0f1ab1bdb7f8a456f52d SHA1 5bc335a1c890d8813fb7fd024a6028596a85ca91 SHA256 18723ba276cad71cf62f94c53763fee52c1f6ee2637d49fefc50a0858c51a2d7
-EBUILD qt-4.3.4-r1.ebuild 9593 RMD160 7f95386b0175b183310a4ba378d600faad4342a0 SHA1 40d9af379f530d6867a7c6df4ad139229f7ad69e SHA256 6555bac59d9a42f111e355abf992c02e9c9f0d7f2b0a944e5083830b2fc703e8
+EBUILD qt-3.3.8-r4.ebuild 12290 RMD160 ee7bf63851e2075bcc7b0fbafd2b1eedf454f163 SHA1 7a2d3eba5b42a914579aa4d41b5d93371b8ac576 SHA256 f853635008a0c28bce5d344cd95e7425a96b4c34d9357a3f5a85bbf108d11a87
+EBUILD qt-4.3.4-r1.ebuild 9567 RMD160 eb79e06a2402507f72e0673221e267bb27d72a44 SHA1 6d90b4d4ea5b4ecc25d186a606fbe2054103d7b6 SHA256 cfa9d53925f713d93a08e58cd7f420e4a877671ba887bd23402546361b32c25c
 EBUILD qt-4.4.0_rc1.ebuild 786 RMD160 fd060847d0b76e1e0f26e29f84b6d68edf35e78a SHA1 5e739a0196bac2222b2f4be796e8ab8c4ddbe3a7 SHA256 0667333ff92d2ff38e8021bb62506b1e4586aa73b2bb1e3c0d5684d87d0bbc7f
diff --git a/x11-libs/qt/files/0037-dnd-timestamp-fix.patch b/x11-libs/qt/files/0037-dnd-timestamp-fix.patch
new file mode 100644
index 0000000..234e1b7
--- /dev/null
+++ b/x11-libs/qt/files/0037-dnd-timestamp-fix.patch
@@ -0,0 +1,56 @@
+qt-bugs@ issue : 38794
+bugs.kde.org number : 69519
+applied: no
+author: Lubos Lunak <l.lunak@kde.org>
+
+ Hello,
+ 
+please consider applying the attached patch. It changes XDND handling code to 
+put the drop timestamp in the right field in the XdndDrop message according 
+to http://www.newplanetsoftware.com/xdnd/ . I'm not quite sure why the code 
+has the field moved by one, and puts 1<<24 in the flags, but I see it has a 
+todo mark next to it. The last snippet of the patch changes it to match the 
+XDND spec. I tested briefly with Gtk, Mozilla and OOo, and they still work 
+with the patch.
+
+The rest of the patch is for fixing part of 
+http://bugs.kde.org/show_bug.cgi?id=69519, when the user drags some data to 
+the desktop, and desktop in response popups a dialog asking for filename. 
+Without the X user timestamp (qt-bugs@ issue 24923) being updated after the 
+drop, KWin's focus stealing prevention will refuse to activate the dialog. As 
+the XdndDrop message is kind of an user action too, the timestamp should be 
+updated.
+
+--- src/kernel/qdnd_x11.cpp.sav	2004-01-05 19:18:33.000000000 +0100
++++ src/kernel/qdnd_x11.cpp	2004-01-08 19:08:52.000000000 +0100
+@@ -81,6 +81,7 @@ extern void qt_leave_modal( QWidget *wid
+ extern Window qt_x11_findClientWindow( Window, Atom, bool );
+ extern Atom qt_wm_state;
+ extern Time qt_x_time;
++extern Time qt_x_user_time;
+ 
+ // this stuff is copied from qclb_x11.cpp
+ 
+@@ -834,6 +835,9 @@ void qt_handle_xdnd_drop( QWidget *, con
+ 	//       l[0], qt_xdnd_dragsource_xid );
+ 	return;
+     }
++    
++    if( l[2] != 0 )
++        qt_x_user_time = l[2];
+     if ( qt_xdnd_source_object )
+ 	qt_xdnd_source_object->setTarget( qt_xdnd_current_widget );
+ 
+@@ -1366,9 +1370,9 @@ void QDragManager::drop()
+     drop.format = 32;
+     drop.message_type = qt_xdnd_drop;
+     drop.data.l[0] = object->source()->winId();
+-    drop.data.l[1] = 1 << 24; // flags
+-    drop.data.l[2] = 0; // ###
+-    drop.data.l[3] = qt_x_time;
++    drop.data.l[1] = 0; // flags
++    drop.data.l[2] = qt_x_time;
++    drop.data.l[3] = 0;
+     drop.data.l[4] = 0;
+ 
+     QWidget * w = QWidget::find( qt_xdnd_current_proxy_target );
diff --git a/x11-libs/qt/files/0185-fix-format-strings.diff b/x11-libs/qt/files/0185-fix-format-strings.diff
new file mode 100644
index 0000000..eed38b4
--- /dev/null
+++ b/x11-libs/qt/files/0185-fix-format-strings.diff
@@ -0,0 +1,261 @@
+qt-bugs@ issue : N171087
+Trolltech task ID : 
+bugs.kde.org number :
+applied: no
+author: Dirk Mueller <mueller@kde.org>
+
+This patch fixes various code issues with handling format strings
+None of them seem to be exceptionally bad, but its better safe
+than sorry.
+
+
+--- src/corelib/global/qglobal.h
++++ src/corelib/global/qglobal.h
+@@ -1266,8 +1266,16 @@ Q_CORE_EXPORT void qFatal(const char *, 
+ #ifdef QT3_SUPPORT
+ Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
+ #endif /* QT3_SUPPORT */
+-Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
+-Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
++Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++    __attribute__ ((format (printf, 2, 3)))
++#endif
++    ;
++Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++    __attribute__ ((format (printf, 1, 2)))
++#endif
++    ;
+ 
+ #if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM)
+ #define QT_NO_DEBUG_STREAM
+--- src/corelib/tools/qbytearray.h
++++ src/corelib/tools/qbytearray.h
+@@ -71,8 +71,16 @@ Q_CORE_EXPORT int qstricmp(const char *,
+ Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
+ 
+ // implemented in qvsnprintf.cpp
+-Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
+-Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
++Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++        __attribute__ ((format (printf, 3, 0)))
++#endif
++    ;
++Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++        __attribute__ ((format (printf, 3, 4)))
++#endif
++    ;
+ 
+ #ifdef QT3_SUPPORT
+ inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
+--- src/gui/painting/qprintengine_pdf_p.h
++++ src/gui/painting/qprintengine_pdf_p.h
+@@ -148,7 +148,11 @@ private:
+     void writePage();
+ 
+     int addXrefEntry(int object, bool printostr = true);
+-    void xprintf(const char* fmt, ...);
++    void xprintf(const char* fmt, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++        __attribute__ ((format (printf, 2, 3)))
++#endif
++        ;
+     inline void write(const QByteArray &data) {
+         stream->writeRawData(data.constData(), data.size());
+         streampos += data.size();
+--- src/gui/painting/qprintengine_pdf.cpp
++++ src/gui/painting/qprintengine_pdf.cpp
+@@ -386,9 +386,8 @@ int QPdfEnginePrivate::addConstantAlphaO
+         object = addXrefEntry(-1);
+         QByteArray alphaDef;
+         QPdf::ByteStream s(&alphaDef);
+-        s << "<< /ca " << (alpha/qreal(255.)) << ">>\n";
+-        xprintf(alphaDef.constData());
+-        xprintf("endobj\n");
++        s << "<< /ca " << (alpha/qreal(255.)) << ">>";
++        xprintf("%s\nendobj\n", alphaDef.constData());
+     }
+     currentPage->graphicStates.append(object);
+     return object;
+--- src/qt3support/tools/q3gcache.cpp
++++ src/qt3support/tools/q3gcache.cpp
+@@ -622,7 +622,7 @@ void Q3GCache::statistics() const
+ #if defined(QT_DEBUG)
+     QString line;
+     line.fill(QLatin1Char('*'), 80);
+-    qDebug(line.ascii());
++    qDebug("%s", line.ascii());
+     qDebug("CACHE STATISTICS:");
+     qDebug("cache contains %d item%s, with a total cost of %d",
+ 	   count(), count() != 1 ? "s" : "", tCost);
+@@ -643,7 +643,7 @@ void Q3GCache::statistics() const
+ 	   lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts);
+     qDebug("Statistics from internal dictionary class:");
+     dict->statistics();
+-    qDebug(line.ascii());
++    qDebug("%s", line.ascii());
+ #endif
+ }
+ 
+--- src/qt3support/tools/q3gdict.cpp
++++ src/qt3support/tools/q3gdict.cpp
+@@ -828,11 +828,11 @@ void Q3GDict::statistics() const
+     QString line;
+     line.fill(QLatin1Char('-'), 60);
+     double real, ideal;
+-    qDebug(line.ascii());
++    qDebug("%s", line.ascii());
+     qDebug("DICTIONARY STATISTICS:");
+     if (count() == 0) {
+         qDebug("Empty!");
+-        qDebug(line.ascii());
++        qDebug("%s", line.ascii());
+         return;
+     }
+     real = 0.0;
+@@ -853,7 +853,7 @@ void Q3GDict::statistics() const
+         while (b--)
+             *pbuf++ = '*';
+         *pbuf = '\0';
+-        qDebug(buf);
++        qDebug("%s", buf);
+         i++;
+     }
+     qDebug("Array size = %d", size());
+@@ -861,7 +861,7 @@ void Q3GDict::statistics() const
+     qDebug("Real dist  = %g", real);
+     qDebug("Rand dist  = %g", ideal);
+     qDebug("Real/Rand  = %g", real/ideal);
+-    qDebug(line.ascii());
++    qDebug("%s", line.ascii());
+ #endif // QT_DEBUG
+ }
+ 
+--- src/qt3support/tools/q3cstring.h
++++ src/qt3support/tools/q3cstring.h
+@@ -57,7 +57,11 @@ public:
+     }
+ 
+     Q3CString        copy()        const { return *this; }
+-    Q3CString    &sprintf(const char *format, ...);
++    Q3CString    &sprintf(const char *format, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++        __attribute__ ((format (printf, 2, 3)))
++#endif
++        ;
+ 
+     Q3CString        left(uint len)  const { return QByteArray::left(len); }
+     Q3CString        right(uint len) const { return QByteArray::right(len); }
+--- tools/designer/src/lib/uilib/formbuilderextra.cpp
++++ tools/designer/src/lib/uilib/formbuilderextra.cpp
+@@ -33,9 +33,7 @@ namespace QFormInternal {
+ #endif
+
+ void uiLibWarning(const QString &message) {
+-    QString prefixedMessage = QLatin1String("Designer: ");
+-    prefixedMessage += message;
+-    qWarning(prefixedMessage.toUtf8().constData());
++    qWarning("Designer: %s", qPrintable(message));
+ }
+
+ QFormBuilderExtra::QFormBuilderExtra() :
+--- tools/designer/src/lib/shared/qdesigner_utils.cpp
++++ tools/designer/src/lib/shared/qdesigner_utils.cpp
+@@ -40,9 +40,7 @@ namespace qdesigner_internal
+ {
+     QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message)
+     {
+-        QString prefixedMessage = QLatin1String("Designer: ");
+-        prefixedMessage += message;
+-        qWarning(prefixedMessage.toUtf8().constData());
++        qWarning("Designer: %s", qPrintable(message));
+     }
+
+     QString EnumType::id() const
+--- tools/qtestlib/src/qtest_global.h
++++ tools/qtestlib/src/qtest_global.h
+@@ -59,7 +59,11 @@ namespace QTest
+     enum SkipMode { SkipSingle = 1, SkipAll = 2 };
+     enum TestFailMode { Abort = 1, Continue = 2 };
+ 
+-    int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...);
++    int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++        __attribute__ ((format (printf, 3, 4)))
++#endif
++        ;
+ }
+ 
+ QT_END_HEADER
+--- tools/assistant/config.cpp
++++ tools/assistant/config.cpp
+@@ -73,12 +73,12 @@ Config *Config::loadConfig(const QString
+ 
+     QFile file(profileFileName);
+     if (!file.exists()) {
+-        qWarning( (QLatin1String("File does not exist: ") + profileFileName).toAscii().constData() );
++        qWarning( "File does not exist: %s", qPrintable(profileFileName) );
+         return 0;
+     }
+     DocuParser *parser = DocuParser::createParser( profileFileName );
+     if (!parser) {
+-        qWarning( (QLatin1String("Failed to create parser for file: ") + profileFileName).toAscii().constData() );
++        qWarning( "Failed to create parser for file: %s", qPrintable(profileFileName) );
+         return 0;
+     }
+     if (parser->parserVersion() < DocuParser::Qt320) {
+@@ -89,7 +89,7 @@ Config *Config::loadConfig(const QString
+     parser->parse(&file);
+     config->profil = profileParser->profile();
+     if (!config->profil) {
+-        qWarning( (QLatin1String("Config::loadConfig(), no profile in: ") + profileFileName).toAscii().constData() );
++        qWarning( "Config::loadConfig(), no profile in: %s", qPrintable(profileFileName) );
+         return 0;
+     }
+     config->profil->setProfileType(Profile::UserProfile);
+--- tools/assistant/index.cpp
++++ tools/assistant/index.cpp
+@@ -180,7 +180,7 @@ void Index::parseDocument( const QString
+ {
+     QFile file( filename );
+     if ( !file.open(QFile::ReadOnly) ) {
+-        qWarning( (QLatin1String("can not open file ") + filename).toAscii().constData() );
++        qWarning( "can not open file %s", qPrintable(filename) );
+         return;
+     }
+ 
+@@ -352,7 +352,7 @@ QString Index::getDocumentTitle( const Q
+ 
+     QFile file( fileName );
+     if ( !file.open( QFile::ReadOnly ) ) {
+-        qWarning( (QLatin1String("cannot open file ") + fileName).toAscii().constData() );
++        qWarning( "cannot open file %s", qPrintable(fileName) );
+         return fileName;
+     }
+     QTextStream s( &file );
+@@ -474,7 +474,7 @@ bool Index::searchForPattern( const QStr
+     QString fName = url.toLocalFile();
+     QFile file( fName );
+     if ( !file.open( QFile::ReadOnly ) ) {
+-        qWarning( (QLatin1String("cannot open file ") + fName).toAscii().constData() );
++        qWarning( "cannot open file %s", qPrintable(fName) );
+         return false;
+     }
+ 
+--- tools/linguist/shared/profileevaluator.h
++++ tools/linguist/shared/profileevaluator.h
+@@ -88,7 +88,11 @@ protected:
+ 
+ private:
+     void logMessage(const QString &msg, MessageType mt = MT_DebugLevel2);
+-    void logMessage(MessageType mt, const char *msg, ...);
++    void logMessage(MessageType mt, const char *msg, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++        __attribute__ ((format (printf, 3, 4)))
++#endif
++        ;
+     QString expandVariableReferences(const QString &value);
+     QString evaluateExpandFunction(const QByteArray &func, const QString &arguments);
diff --git a/x11-libs/qt/files/digest-qt-3.3.8-r4 b/x11-libs/qt/files/digest-qt-3.3.8-r4
deleted file mode 100644
index 3f8b5b6..0000000
--- a/x11-libs/qt/files/digest-qt-3.3.8-r4
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 74fe8dd6b480dc91f642158c3f02e33f qt-copy-3.3.8-patches-20080119.tar.bz2 30143
-RMD160 26875dc3b6a98366c15f758cc4be36ab7d501645 qt-copy-3.3.8-patches-20080119.tar.bz2 30143
-SHA256 4ab6549c481f1eb1469ea3dc8287f05381f24079ce3af240ccacc80b36421cbb qt-copy-3.3.8-patches-20080119.tar.bz2 30143
-MD5 37aec12c8c7b0e164957ec1aa3fd0189 qt-x11-free-3.3.8.tar.gz 17393124
-RMD160 65188370f6aa7093c9601783264825cf66b74eb4 qt-x11-free-3.3.8.tar.gz 17393124
-SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139 qt-x11-free-3.3.8.tar.gz 17393124
-MD5 7f056a1fa246004cb3ec19fc11a88dc1 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387
-RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387
-SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918 qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387
diff --git a/x11-libs/qt/files/digest-qt-4.3.2-r1 b/x11-libs/qt/files/digest-qt-4.3.2-r1
deleted file mode 100644
index 97f43e9..0000000
--- a/x11-libs/qt/files/digest-qt-4.3.2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bd42bf9dbcc6ed6b55803f518991b64e qt-copy-4.3.2-patches-20071205.tar.bz2 12753
-RMD160 dee35b4b5b68973ead38c3816a9fb198e5b172df qt-copy-4.3.2-patches-20071205.tar.bz2 12753
-SHA256 a8e87288fe0227d4f9f6de5ab347258a1792890d4cb38afe4dd19d025992eff1 qt-copy-4.3.2-patches-20071205.tar.bz2 12753
-MD5 a60490b36099bdd10c4d2f55430075b3 qt-x11-opensource-src-4.3.2.tar.gz 43462686
-RMD160 b73a3d7a1edd11987544291cce80b56f5a499969 qt-x11-opensource-src-4.3.2.tar.gz 43462686
-SHA256 70198d61d038007c787bab62700d35cbd3fc925b53fe920672f2a0afbae7e276 qt-x11-opensource-src-4.3.2.tar.gz 43462686
diff --git a/x11-libs/qt/files/digest-qt-4.3.3 b/x11-libs/qt/files/digest-qt-4.3.3
deleted file mode 100644
index 8cc099f..0000000
--- a/x11-libs/qt/files/digest-qt-4.3.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 aa19ead4911fc7bf67c4ba2dd85b7f4a qt-copy-4.3.3-patches-20080115.tar.bz2 12279
-RMD160 fe7a7d1a92906e9fab40563eb2bf849f95f41a5d qt-copy-4.3.3-patches-20080115.tar.bz2 12279
-SHA256 3d21f495c92826bc10eced03a860bc426a45e06edc5447cec1d27a05321b0f52 qt-copy-4.3.3-patches-20080115.tar.bz2 12279
-MD5 19678fe35170559cd6a6fa531c57799c qt-x11-opensource-src-4.3.3.tar.gz 42341802
-RMD160 410daca03b6802ba5cc6662219c2ba7a190bd292 qt-x11-opensource-src-4.3.3.tar.gz 42341802
-SHA256 89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 qt-x11-opensource-src-4.3.3.tar.gz 42341802
diff --git a/x11-libs/qt/files/qt-3.3.4-0047-fix-kmenu-widget.diff b/x11-libs/qt/files/qt-3.3.4-0047-fix-kmenu-widget.diff
new file mode 100644
index 0000000..fb0bb16
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.4-0047-fix-kmenu-widget.diff
@@ -0,0 +1,25 @@
+qt-bugs@ issue: N46882
+bugs.kde.org number: 77545
+applied: no
+author: Stephan Binner <binner@kde.org>
+
+Fix wrong K menu width for the case of enabled side pixmap and a menu title
+(like "Recently Used Applications") being longer than every other entry.
+
+Solution: Respect PanelKMenu::setMaximumSize() as up to Qt 3.2.3
+
+Index: src/widgets/qpopupmenu.cpp
+===================================================================
+RCS file: /home/kde/qt-copy/src/widgets/qpopupmenu.cpp,v
+retrieving revision 1.60
+diff -u -3 -p -b -r1.60 qpopupmenu.cpp
+--- src/widgets/qpopupmenu.cpp	29 Apr 2004 22:31:28 -0000	1.60
++++ src/widgets/qpopupmenu.cpp	30 Apr 2004 01:11:59 -0000
+@@ -2531,7 +2531,7 @@ QSize QPopupMenu::sizeHint() const
+ 
+     QPopupMenu* that = (QPopupMenu*) this;
+     //We do not need a resize here, just the sizeHint..
+-    return that->updateSize(FALSE, FALSE).expandedTo( QApplication::globalStrut() );
++    return that->updateSize(FALSE).expandedTo( QApplication::globalStrut() );
+ }
+
diff --git a/x11-libs/qt/files/qt-3.3.4-0051-qtoolbar_77047.patch b/x11-libs/qt/files/qt-3.3.4-0051-qtoolbar_77047.patch
new file mode 100644
index 0000000..40fbfdc
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.4-0051-qtoolbar_77047.patch
@@ -0,0 +1,29 @@
+qt-bugs@ issue : 54405
+applied: no
+author: Waldo Bastian <bastian@kde.org>
+
+KToolBarButton always uses a non-zero popup-delay because we would like
+to draw the menu-indicator on the toolbar buttons ourselves. Unfortunately
+that means that the menu-item in the toolbar-extension menu does not include
+any sub-menu either. With this patch, KToolBarButton can use a popup-delay
+of -1 so that we can still draw our own popup indicator _AND_ get the sub-menu
+in the toolbar-extension menu.
+
+This fixes http://bugs.kde.org/show_bug.cgi?id=77047
+
+Index: widgets/qtoolbar.cpp
+===================================================================
+RCS file: /home/kde/qt-copy/src/widgets/qtoolbar.cpp,v
+retrieving revision 1.56
+diff -u -p -r1.56 qtoolbar.cpp
+--- src/widgets/qtoolbar.cpp	21 Dec 2003 00:48:21 -0000	1.56
++++ src/widgets/qtoolbar.cpp	12 Aug 2004 11:42:21 -0000
+@@ -648,7 +648,7 @@ void QToolBar::createPopup()
+ 	        QString s = b->textLabel();
+ 	        if ( s.isEmpty() )
+ 		    s = b->text();
+-	        if ( b->popup() && b->popupDelay() == 0 )
++	        if ( b->popup() && b->popupDelay() <= 0 )
+ 		    id = d->extensionPopup->insertItem( b->iconSet(), s, b->popup() );
+ 		else
+ 		    id = d->extensionPopup->insertItem( b->iconSet(), s, b, SLOT( emulateClick() ) ) ;
diff --git a/x11-libs/qt/files/qt-3.3.4-gcc4-volatile.patch b/x11-libs/qt/files/qt-3.3.4-gcc4-volatile.patch
new file mode 100644
index 0000000..b88792f
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.4-gcc4-volatile.patch
@@ -0,0 +1,77 @@
+diff -Nur qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp qt-x11-free-3.3.4/src/tools/qlocale.cpp
+--- qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp	2005-01-21 18:16:05.000000000 +0100
++++ qt-x11-free-3.3.4/src/tools/qlocale.cpp	2005-08-20 16:05:53.000000000 +0200
+@@ -72,6 +72,12 @@
+ #   define NAN DBL_QNAN
+ #endif
+ 
++#if (defined(Q_CC_GNU) && defined(Q_OS_WIN)) || __GNUC__ == 4 || defined(QT_QLOCALE_NEEDS_VOLATILE)
++#   define NEEDS_VOLATILE volatile
++#else
++#   define NEEDS_VOLATILE
++#endif
++
+ enum {
+     LittleEndian,
+     BigEndian
+@@ -4068,9 +4074,9 @@
+ #error Exactly one of IEEE_BIG_OR_LITTLE_ENDIAN, VAX, or IBM should be defined.
+ #endif
+ 
+-inline ULong getWord0(double x)
++inline ULong getWord0(const NEEDS_VOLATILE double x)
+ {
+-    uchar *ptr = (uchar *)&x;
++    const NEEDS_VOLATILE uchar *ptr = reinterpret_cast<const NEEDS_VOLATILE uchar *>(&x);
+     if (ByteOrder == BigEndian) {
+         return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
+     } else {
+@@ -4078,9 +4084,9 @@
+     }
+ }
+ 
+-inline void setWord0(double *x, ULong l)
++inline void setWord0(NEEDS_VOLATILE double *x, ULong l)
+ {
+-    uchar *ptr = (uchar *)x;
++    NEEDS_VOLATILE uchar *ptr = reinterpret_cast<NEEDS_VOLATILE uchar *>(x);
+     if (ByteOrder == BigEndian) {
+         ptr[0] = (uchar)(l>>24);
+         ptr[1] = (uchar)(l>>16);
+@@ -4094,18 +4100,18 @@
+     }
+ }
+ 
+-inline ULong getWord1(double x)
++inline ULong getWord1(const NEEDS_VOLATILE double x)
+ {
+-    uchar *ptr = (uchar *)&x;
++    const NEEDS_VOLATILE uchar *ptr = reinterpret_cast<const NEEDS_VOLATILE uchar *>(&x);
+     if (ByteOrder == BigEndian) {
+         return (ptr[4]<<24) + (ptr[5]<<16) + (ptr[6]<<8) + ptr[7];
+     } else {
+         return (ptr[3]<<24) + (ptr[2]<<16) + (ptr[1]<<8) + ptr[0];
+     }
+ }
+-inline void setWord1(double *x, ULong l)
++inline void setWord1(NEEDS_VOLATILE double *x, ULong l)
+ {
+-    uchar *ptr = (uchar *)x;
++    NEEDS_VOLATILE uchar *ptr = reinterpret_cast<uchar NEEDS_VOLATILE *>(x);
+     if (ByteOrder == BigEndian) {
+         ptr[4] = (uchar)(l>>24);
+         ptr[5] = (uchar)(l>>16);
+@@ -5679,11 +5685,11 @@
+ #ifdef Q_OS_LINUX
+     fesetenv(&envp);
+ #endif
+-    
++
+     return s;
+ }
+ 
+-static char *_qdtoa( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)
++static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)
+ {
+     /*
+       Arguments ndigits, decpt, sign are similar to those
diff --git a/x11-libs/qt/files/qt-3.3.4-gcc4.patch b/x11-libs/qt/files/qt-3.3.4-gcc4.patch
new file mode 100644
index 0000000..9e4addd
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.4-gcc4.patch
@@ -0,0 +1,25 @@
+diff -Nur qt-x11-free-3.3.4.orig/configure qt-x11-free-3.3.4/configure
+--- qt-x11-free-3.3.4.orig/configure	2004-10-18 19:17:00.000000000 +0200
++++ qt-x11-free-3.3.4/configure	2005-07-19 17:17:35.000000000 +0200
+@@ -3030,6 +3030,9 @@
+     *3.*)
+ 	COMPILER_VERSION="3.*"
+ 	;;
++    *4.*)
++        COMPILER_VERSION="4.*"
++        ;;
+     *)
+ 	;;
+     esac
+diff -Nur qt-x11-free-3.3.4.orig/src/kernel/qsizepolicy.h qt-x11-free-3.3.4/src/kernel/qsizepolicy.h
+--- qt-x11-free-3.3.4.orig/src/kernel/qsizepolicy.h	2005-01-21 18:16:12.000000000 +0100
++++ qt-x11-free-3.3.4/src/kernel/qsizepolicy.h	2005-07-19 17:17:22.000000000 +0200
+@@ -88,7 +88,7 @@
+     }
+ 
+     void setHorData( SizeType d ) { data = (Q_UINT32)(data & ~HMask) | d; }
+-    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~(HMask << HSize)) |
++    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~VMask) |
+ 					   (d << HSize); }
+ 		
+     void setHeightForWidth( bool b ) { data = b ? (Q_UINT32)( data | ( 1 << 2*HSize ) )
diff --git a/x11-libs/qt/files/qt-3.3.4-immodule-focus.patch b/x11-libs/qt/files/qt-3.3.4-immodule-focus.patch
new file mode 100644
index 0000000..f20c1b1
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.4-immodule-focus.patch
@@ -0,0 +1,24 @@
+--- qt-x11-free-3.3.4/src/kernel/qwidget.cpp	2005-04-03 14:19:26.000000000 +0900
++++ qt-x11-free-3.3.4/src/kernel/qwidget.cpp-immqt	2005-04-03 14:27:00.000000000 +0900
+@@ -3293,7 +3293,10 @@
+ 	    // input context should be survived until focused again. So we
+ 	    // delegate the responsibility to input context via
+ 	    // unfocusInputContext().
+-	    if ( prev != this ) {
++	    if ( prev != this && prev->isInputMethodEnabled() &&
++    			(isInputMethodEnabled() || !testWFlags(WType_Popup))) {
++	    // If this is a popup and inputmethod is not enabled, then we
++	    // should not unfocus the current editing widget.
+ #if 0
+ 		prev->resetInputContext();
+ #else
+@@ -3307,7 +3310,8 @@
+ 	}
+ #endif
+ 	qApp->focus_widget = this;
+-	focusInputContext();
++	if ( isInputMethodEnabled() )
++	    focusInputContext();
+ 
+ #if defined(Q_WS_WIN)
+ 	if ( !topLevelWidget()->isPopup() )
diff --git a/x11-libs/qt/files/qt-3.3.4-qclipboard-hack.patch b/x11-libs/qt/files/qt-3.3.4-qclipboard-hack.patch
new file mode 100644
index 0000000..74c60fb
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.4-qclipboard-hack.patch
@@ -0,0 +1,48 @@
+qt-bugs@ issue : none, probably even won't be
+bugs.kde.org number : 80072
+applied: no
+author: Lubos Lunak <l.lunak@kde.org>
+
+A crude hack for KDE #80072. No good idea how to fix it properly yet :(.
+
+--- src/kernel/qclipboard_x11.cpp.sav	2004-04-30 12:00:06.000000000 +0200
++++ src/kernel/qclipboard_x11.cpp	2004-05-09 21:18:10.269264304 +0200
+@@ -109,6 +109,7 @@ static int pending_timer_id = 0;
+ static bool pending_clipboard_changed = FALSE;
+ static bool pending_selection_changed = FALSE;
+ 
++Q_EXPORT bool qt_qclipboard_bailout_hack = false;
+ 
+ // event capture mechanism for qt_xclb_wait_for_event
+ static bool waiting_for_data = FALSE;
+@@ -453,6 +454,15 @@ static int qt_xclb_event_filter(XEvent *
+     return 0;
+ }
+ 
++static bool selection_request_pending = false;
++
++static Bool check_selection_request_pending( Display*, XEvent* e, XPointer )
++    {
++    if( e->type == SelectionRequest && e->xselectionrequest.owner == owner->winId())
++        selection_request_pending = true;
++    return False;
++    }
++
+ bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event,
+ 			     int timeout )
+ {
+@@ -504,6 +514,14 @@ bool qt_xclb_wait_for_event( Display *dp
+     do {
+         if ( XCheckTypedWindowEvent(dpy,win,type,event) )
+ 	    return TRUE;
++        if( qt_qclipboard_bailout_hack ) {
++            XEvent dummy;
++            selection_request_pending = false;
++            if ( owner != NULL )
++                XCheckIfEvent(dpy,&dummy,check_selection_request_pending,NULL);
++            if( selection_request_pending )
++	        return TRUE;
++        }
+ 
+ 	now = QTime::currentTime();
+ 	if ( started > now )			// crossed midnight
diff --git a/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch b/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch
new file mode 100644
index 0000000..65610e3
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch
@@ -0,0 +1,20 @@
+--- plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp~	2007-04-05 09:47:44.000000000 +0000
++++ plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp	2007-04-05 09:48:08.000000000 +0000
+@@ -44,6 +44,7 @@
+ #include "qnoneinputcontextplugin.h"
+ #include <qinputcontextfactory.h>
+ #include <qsettings.h>
++#include <cstdlib>
+ 
+ 
+ QNoneInputContextPlugin::QNoneInputContextPlugin()
+--- plugins/src/inputmethods/simple/qsimpleinputcontext.cpp~	2007-04-05 09:48:46.000000000 +0000
++++ plugins/src/inputmethods/simple/qsimpleinputcontext.cpp	2007-04-05 09:48:54.000000000 +0000
+@@ -45,6 +45,7 @@
+ #include <qnamespace.h>
+ #include <qevent.h>
+ #include <qglobal.h>
++#include <algorithm>
+ 
+ static const int ignoreKeys[] = {
+     Qt::Key_Shift,
diff --git a/x11-libs/qt/files/qt-3.3.8-mips.patch b/x11-libs/qt/files/qt-3.3.8-mips.patch
new file mode 100644
index 0000000..1f70900
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.8-mips.patch
@@ -0,0 +1,39 @@
+Bug 210551.
+Fix compilation on mips
+
+Original commit message by Christopher Martin, debian bug 342545.
+
+   * Add a patch, courtesy of Steve Langasek, that fixes
+     qt-x11-free's longstanding intermittent FTBFS on hppa, caused
+     by "the bogus assumption in src/tools/qlocale.cpp that a
+     char[] can be cast to a double *." (Closes: #342545)
+
+--- qt-x11-free-3.3.6.orig/src/tools/qlocale.cpp
++++ qt-x11-free-3.3.6/src/tools/qlocale.cpp
+@@ -122,13 +122,24 @@
+ #endif
+ 
+ // We can't rely on -NAN, since all operations on a NAN should return a NAN.
++static double be_neg_nan; 
++static double le_neg_nan;
+ static const unsigned char be_neg_nan_bytes[] = { 0xff, 0xf8, 0, 0, 0, 0, 0, 0 };
+ static const unsigned char le_neg_nan_bytes[] = { 0, 0, 0, 0, 0, 0, 0xf8, 0xff };
++static bool neg_nan_init = false;
++
+ static inline double negNan()
+ {
++    if (!neg_nan_init)
++    {
++        memcpy(&be_neg_nan,be_neg_nan_bytes,sizeof(be_neg_nan_bytes));
++        memcpy(&le_neg_nan,le_neg_nan_bytes,sizeof(le_neg_nan_bytes));
++        neg_nan_init = true;
++    }
+     return (ByteOrder == BigEndian ?
+-            *((const double *) be_neg_nan_bytes) :
+-            *((const double *) le_neg_nan_bytes));
++            be_neg_nan : 
++            le_neg_nan);
++            
+ }
+ 
+ // Sizes as defined by the ISO C99 standard - fallback
diff --git a/x11-libs/qt/files/qt-4.3.1-unicode-off-by-one.patch b/x11-libs/qt/files/qt-4.3.1-unicode-off-by-one.patch
new file mode 100644
index 0000000..dccdd59
--- /dev/null
+++ b/x11-libs/qt/files/qt-4.3.1-unicode-off-by-one.patch
@@ -0,0 +1,12 @@
+--- src/corelib/codecs/qutfcodec.cpp
++++ src/corelib/codecs/qutfcodec.cpp
+@@ -140,7 +140,7 @@ void QUtf8Codec::convertToUnicode(QString *target, const char *chars, int len, C
+ 
+     int originalLength = target->length();
+     QString &result = *target;
+-    result.resize(originalLength + len); // worst case
++    result.resize(originalLength + len + 1); // worst case
+     QChar *qch = result.data() + originalLength;
+     uchar ch;
+     int invalid = 0;
+
diff --git a/x11-libs/qt/qt-3.3.8-r4.ebuild b/x11-libs/qt/qt-3.3.8-r4.ebuild
index b257c39..ef0da97 100644
--- a/x11-libs/qt/qt-3.3.8-r4.ebuild
+++ b/x11-libs/qt/qt-3.3.8-r4.ebuild
@@ -25,32 +25,33 @@ SLOT="3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres qt-copy sqlite xinerama immqt immqt-bc"
 
-DEPEND="x11-libs/libXcursor
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libSM
+RDEPEND="media-libs/jpeg
+		 media-libs/freetype:2
+		 >=media-libs/libmng-1.0.9
+		 media-libs/libpng:1.2
+		 sys-libs/zlib
+		 virtual/xft
+		 x11-libs/libXcursor
+		 x11-libs/libXi
+		 x11-libs/libXrandr
+		 x11-libs/libSM
+		 cups? ( net-print/cups )
+		 firebird? ( dev-db/firebird )
+		 mysql? ( virtual/mysql )
+		 nas? ( >=media-libs/nas-1.5 )
+		 opengl? ( virtual/opengl virtual/glu )
+		 postgres? ( dev-db/libpq )
+		 xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
 		x11-proto/inputproto
 		x11-proto/xextproto
-		xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
+		qt-copy? ( app-arch/lzma-utils )
+		xinerama? ( x11-proto/xineramaproto )
 		immqt? ( x11-proto/xineramaproto )
-		immqt-bc? ( x11-proto/xineramaproto )
-		virtual/xft
-		media-libs/libpng
-		media-libs/jpeg
-		>=media-libs/libmng-1.0.9
-		media-libs/freetype:2
-		sys-libs/zlib
-		nas? ( >=media-libs/nas-1.5 )
-		mysql? ( virtual/mysql )
-		firebird? ( dev-db/firebird )
-		opengl? ( virtual/opengl virtual/glu )
-		postgres? ( dev-db/libpq )
-		cups? ( net-print/cups )"
-RDEPEND="${DEPEND}
-		 qt-copy? ( app-arch/lzma-utils )"
+		immqt-bc? ( x11-proto/xineramaproto )"
 PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
 
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+S="${WORKDIR}"/qt-x11-${SRCTYPE}-${PV}
 
 QTBASE=/usr/qt/3
 
@@ -69,7 +70,7 @@ pkg_setup() {
 		ewarn
 	fi
 
-	export QTDIR=${S}
+	export QTDIR="${S}"
 
 	CXX=$(tc-getCXX)
 	if [[ ${CXX/g++/} != ${CXX} ]]; then
@@ -102,65 +103,62 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	sed -i -e 's:read acceptance:acceptance=yes:' configure
 
 	# Do not link with -rpath. See bug #75181.
-	find ${S}/mkspecs -name qmake.conf | xargs \
+	find "${S}"/mkspecs -name qmake.conf | xargs \
 		sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
 
 	# Patch for uic includehint errors (aseigo patch)
-	epatch ${FILESDIR}/${P}-uic-fix.patch
+	epatch "${FILESDIR}"/${P}-uic-fix.patch
 
 	# Patch for mysql unload crash (Bug #171883)
-	epatch ${FILESDIR}/${P}-mysql-unload-crash.diff
+	epatch "${FILESDIR}"/${P}-mysql-unload-crash.diff
 
 	# KDE related patches
-	epatch ${FILESDIR}/0001-dnd_optimization.patch
-	epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
-	epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
-	epatch ${FILESDIR}/0044-qscrollview-windowactivate-fix.diff
-	epatch ${FILESDIR}/0047-fix-kmenu-widget.diff
-	epatch ${FILESDIR}/0048-qclipboard_hack_80072.patch
+	epatch "${FILESDIR}"/0001-dnd_optimization.patch
+	epatch "${FILESDIR}"/0002-dnd_active_window_fix.patch
+	epatch "${FILESDIR}"/0038-dragobject-dont-prefer-unknown.patch
+	epatch "${FILESDIR}"/0044-qscrollview-windowactivate-fix.diff
+	epatch "${FILESDIR}"/0047-fix-kmenu-widget.diff
+	epatch "${FILESDIR}"/0048-qclipboard_hack_80072.patch
 
 	# possible rce, CVE-2007-3388
-	epatch ${FILESDIR}/0081-format-string-fixes.diff
+	epatch "${FILESDIR}"/0081-format-string-fixes.diff
 
 	# Bug #192472
-	epatch ${FILESDIR}/${P}-unicode-off-by-one.patch
+	epatch "${FILESDIR}"/${P}-unicode-off-by-one.patch
 
 	# ulibc patch (bug #100246)
-	epatch ${FILESDIR}/qt-ulibc.patch
+	epatch "${FILESDIR}"/qt-ulibc.patch
 
 	# xinerama patch: http://ktown.kde.org/~seli/xinerama/
-	epatch "${FILESDIR}/${P}-seli-xinerama.patch"
+	epatch "${FILESDIR}"/${P}-seli-xinerama.patch
 
-	epatch ${FILESDIR}/utf8-bug-qt3.diff
+	epatch "${FILESDIR}"/utf8-bug-qt3.diff
 
 	# Visibility patch, apply only on GCC 4.1 and later for safety
 	# [[ $(gcc-major-version)$(gcc-minor-version) -ge 41 ]] && \
-		epatch "${FILESDIR}/${P}-visibility.patch"
+		epatch "${FILESDIR}"/${P}-visibility.patch
 
 	if use immqt || use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff
 		sh make-symlinks.sh || die "make symlinks failed"
-		EPATCH_EXCLUDE="0080_all_net-wm-sync-request.diff"
-	else
-		EPATCH_EXCLUDE="0080_all_net-wm-sync-request-immqt-fix.diff"
+
+		epatch "${FILESDIR}"/${P}-immqt+gcc-4.3.patch
 	fi
 
-	if use ppc-macos ; then
-		epatch "${FILESDIR}/${PN}-3.3.5-macos.patch"
+	if use mips; then
+		epatch "${FILESDIR}"/${P}-mips.patch
 	fi
 
 	# Apply QT Copy patches:
 	if use qt-copy; then
-		ebegin "Applying the KDE Qt Copy patches"
-		for diff in $(ls "${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}"/* | sort); do
-			epatch "${diff}" || die
-		done
-		einfo "Done with patching"
+		EPATCH_MULTI_MSG="Applying QT-copy patches ..." \
+			EPATCH_FORCE="yes" EPATCH_SUFFIX="" epatch \
+			"${WORKDIR}"/qt-copy-${PV}-patches-${QT_COPY_SNAP}
 	fi
 
 	# known working flags wrt #77623
@@ -181,23 +179,23 @@ src_unpack() {
 		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
 		   -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
 		   -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
-		${S}/mkspecs/${PLATFORM}/qmake.conf || die
+		"${S}"/mkspecs/${PLATFORM}/qmake.conf || die
 
-	if [ $(get_libdir) != "lib" ] ; then
+	if [[ $(get_libdir) != "lib" ]] ; then
 		sed -i -e "s:/lib$:/$(get_libdir):" \
-			${S}/mkspecs/${PLATFORM}/qmake.conf || die
+			"${S}"/mkspecs/${PLATFORM}/qmake.conf || die
 	fi
 }
 
 src_compile() {
-	export SYSCONF=${D}${QTBASE}/etc/settings
+	export SYSCONF="${D}"${QTBASE}/etc/settings
 
 	# Let's just allow writing to these directories during Qt emerge
 	# as it makes Qt much happier.
 	addwrite "${QTBASE}/etc/settings"
 	addwrite "${HOME}/.qt"
 
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+	[[ $(get_libdir) != "lib" ]] && myconf="${myconf} -L/usr/$(get_libdir)"
 
 	# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
 	use nas		&& myconf="${myconf} -system-nas-sound"
@@ -247,12 +245,12 @@ src_compile() {
 	fi
 
 	# Make the msg2qm utility (not made by default)
-	cd ${S}/tools/msg2qm
+	cd "${S}"/tools/msg2qm
 	../../bin/qmake
 	emake
 
 	# Make the qembed utility (not made by default)
-	cd ${S}/tools/qembed
+	cd "${S}"/tools/qembed
 	../../bin/qmake
 	emake
 
@@ -269,9 +267,9 @@ src_install() {
 	if use ppc-macos; then
 		# dolib is broken on BSD because of missing readlink(1)
 		dodir ${QTBASE}/$(get_libdir)
-		cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die
+		cp -fR lib/*.{dylib,la,a} "${D}"/${QTBASE}/$(get_libdir) || die
 
-		cd ${D}/${QTBASE}/$(get_libdir)
+		cd "${D}"/${QTBASE}/$(get_libdir)
 		for lib in libqt-mt* ; do
 			ln -s ${lib} ${lib/-mt/}
 		done
@@ -279,7 +277,7 @@ src_install() {
 		dolib.so lib/lib{editor,qassistantclient,designercore}.a
 		dolib.so lib/libqt-mt.la
 		dolib.so lib/libqt-mt.so.${PV} lib/libqui.so.1.0.0
-		cd ${D}/${QTBASE}/$(get_libdir)
+		cd "${D}"/${QTBASE}/$(get_libdir)
 
 		for x in libqui.so ; do
 			ln -s $x.1.0.0 $x.1.0
@@ -300,7 +298,7 @@ src_install() {
 	fi
 
 	# plugins
-	cd ${S}
+	cd "${S}"
 	local plugins=$(find plugins -name "lib*.so" -print)
 	for x in ${plugins}; do
 		exeinto ${QTBASE}/$(dirname ${x})
@@ -311,19 +309,19 @@ src_install() {
 	is_final_abi || return 0
 
 	# includes
-	cd ${S}
+	cd "${S}"
 	dodir ${QTBASE}/include/private
-	cp include/* ${D}/${QTBASE}/include/
-	cp include/private/* ${D}/${QTBASE}/include/private/
+	cp include/* "${D}"/${QTBASE}/include/
+	cp include/private/* "${D}"/${QTBASE}/include/private/
 
 	# prl files
-	sed -i -e "s:${S}:${QTBASE}:g" ${S}/lib/*.prl
+	sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl
 	insinto ${QTBASE}/$(get_libdir)
-	doins ${S}/lib/*.prl
+	doins "${S}"/lib/*.prl
 
 	# pkg-config file
 	insinto ${QTBASE}/$(get_libdir)/pkgconfig
-	doins ${S}/lib/*.pc
+	doins "${S}"/lib/*.pc
 
 	# List all the multilib libdirs
 	local libdirs
@@ -333,7 +331,7 @@ src_install() {
 
 	# environment variables
 	if use ppc-macos; then
-		cat <<EOF > ${T}/45qt3
+		cat <<EOF > "${T}"/45qt3
 PATH=${QTBASE}/bin
 ROOTPATH=${QTBASE}/bin
 DYLD_LIBRARY_PATH=${libdirs:1}
@@ -342,7 +340,7 @@ MANPATH=${QTBASE}/doc/man
 PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
 EOF
 	else
-		cat <<EOF > ${T}/45qt3
+		cat <<EOF > "${T}"/45qt3
 PATH=${QTBASE}/bin
 ROOTPATH=${QTBASE}/bin
 LDPATH=${libdirs:1}
@@ -351,20 +349,20 @@ MANPATH=${QTBASE}/doc/man
 PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
 EOF
 	fi
-	cat <<EOF > ${T}/50qtdir3
+	cat <<EOF > "${T}"/50qtdir3
 QTDIR=${QTBASE}
 EOF
 
-	cat <<EOF > ${T}/50-qt3-revdep
+	cat <<EOF > "${T}"/50-qt3-revdep
 SEARCH_DIRS="${QTBASE}"
 EOF
 
 	insinto /etc/revdep-rebuild
-	doins ${T}/50-qt3-revdep
+	doins "${T}"/50-qt3-revdep
 
-	doenvd ${T}/45qt3 ${T}/50qtdir3
+	doenvd "${T}"/45qt3 "${T}"/50qtdir3
 
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
+	if [[ "${SYMLINK_LIB}" = "yes" ]]; then
 		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
 	fi
 
@@ -378,27 +376,27 @@ EOF
 
 	if use doc; then
 		insinto ${QTBASE}
-		doins -r ${S}/doc
+		doins -r "${S}"/doc
 	fi
 
 	if use examples; then
-		find ${S}/examples ${S}/tutorial -name Makefile | \
+		find "${S}"/examples "${S}"/tutorial -name Makefile | \
 			xargs sed -i -e "s:${S}:${QTBASE}:g"
 
-		cp -r ${S}/examples ${D}${QTBASE}/
-		cp -r ${S}/tutorial ${D}${QTBASE}/
+		cp -r "${S}"/examples "${D}"${QTBASE}/
+		cp -r "${S}"/tutorial "${D}"${QTBASE}/
 	fi
 
 	# misc build reqs
 	insinto ${QTBASE}/mkspecs
-	doins -r ${S}/mkspecs/${PLATFORM}
+	doins -r "${S}"/mkspecs/${PLATFORM}
 
 	sed -e "s:${S}:${QTBASE}:g" \
-		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+		"${S}"/.qmake.cache > "${D}"${QTBASE}/.qmake.cache
 
 	dodoc FAQ README README-QT.TXT changes*
 	if use immqt || use immqt-bc ; then
-		dodoc ${S}/README.immodule
+		dodoc "${S}"/README.immodule
 	fi
 }
 
diff --git a/x11-libs/qt/qt-4.3.2-r1.ebuild b/x11-libs/qt/qt-4.3.2-r1.ebuild
deleted file mode 100644
index 9cefdcb..0000000
--- a/x11-libs/qt/qt-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: Exp $
-
-EAPI="1"
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SRCTYPE="opensource-src"
-QT_COPY_SNAP="1.0"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-RESTRICT="primaryuri"
-
-SRC_URI="mirror://gentoo/qt-x11-${SRCTYPE}-${PV}.tar.gz
-		 ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz
-		 qt-copy? ( http://jyujin.de/~creidiki/qt-copy/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma )"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE_INPUT_DEVICES="input_devices_wacom"
-
-IUSE="+accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres +qt-copy +qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}"
-
-RDEPEND="x11-libs/libXrandr
-		 x11-libs/libXcursor
-		 x11-libs/libXfont
-		 x11-libs/libSM
-		 !x11-libs/qt-core
-		 xinerama? ( x11-libs/libXinerama )
-		 media-libs/fontconfig
-		 media-libs/freetype:2
-		 png? ( media-libs/libpng )
-		 jpeg? ( media-libs/jpeg )
-		 mng? ( >=media-libs/libmng-1.0.9 )
-		 tiff? ( media-libs/tiff )
-		 nas? ( >=media-libs/nas-1.5 )
-		 odbc? ( dev-db/unixODBC )
-		 mysql? ( virtual/mysql )
-		 firebird? ( dev-db/firebird )
-		 sqlite3? ( dev-db/sqlite:3 )
-		 sqlite? ( dev-db/sqlite:0 )
-		 opengl? ( virtual/opengl virtual/glu )
-		 postgres? ( dev-db/libpq )
-		 cups? ( net-print/cups )
-		 zlib? ( sys-libs/zlib )
-		 glib? ( dev-libs/glib )
-		 dbus? ( >=sys-apps/dbus-1.0.2 )
-		 ssl? ( dev-libs/openssl )
-		 input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )"
-
-DEPEND="${RDEPEND}
-		qt-copy? ( app-arch/lzma-utils )
-		xinerama? ( x11-proto/xineramaproto )
-		x11-proto/xextproto
-		x11-proto/inputproto
-		dev-util/pkgconfig"
-
-pkg_setup() {
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=/usr
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTPCDIR=/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=/usr/share/qt4
-	QTDOCDIR=/usr/share/doc/${PF}
-	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTDEMOSDIR=${QTDATADIR}/demos
-
-	PLATFORM=$(qt_mkspecs_dir)
-
-}
-
-qt_use() {
-	local flag="$1"
-	local feature="$1"
-	local enableval=
-
-	[[ -n $2 ]] && feature=$2
-	[[ -n $3 ]] && enableval="-$3"
-
-	useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
-	return 0
-}
-
-qt_mkspecs_dir() {
-	 # Allows us to define which mkspecs dir we want to use.
-	local spec
-
-	case ${CHOST} in
-		*-freebsd*|*-dragonfly*)
-			spec="freebsd" ;;
-		*-openbsd*)
-			spec="openbsd" ;;
-		*-netbsd*)
-			spec="netbsd" ;;
-		*-darwin*)
-			spec="darwin" ;;
-		*-linux-*|*-linux)
-			spec="linux" ;;
-		*)
-			die "Unknown CHOST, no platform choosed."
-	esac
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		spec="${spec}-g++"
-	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-		spec="${spec}-icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	echo "${spec}"
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch
-
-	epatch "${FILESDIR}"/qsslsocket-fix.patch
-
-	# Apply QT Copy patches:
-	if use qt-copy; then
-		ebegin "Applying the KDE Qt Copy patches"
-		for diff in $(ls "${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}"/* | sort); do
-			epatch "${diff}" || die
-		done
-		einfo "Done with patching"
-	fi
-
-	cd "${S}"/mkspecs/$(qt_mkspecs_dir)
-	# set c/xxflags and ldflags
-
-	# Don't let the user go too overboard with flags.  If you really want to, uncomment
-	# out the line below and give 'er a whirl.
-	strip-flags
-	replace-flags -O3 -O2
-
-	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
-		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
-		append-flags -fno-stack-protector
-	fi
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		-e "/CONFIG/s:$: nostrip:" \
-		qmake.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" qmake.conf
-
-	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
-	# separately as well.
-	cd "${S}"/mkspecs/common
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		g++.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" linux.conf
-
-	cd "${S}"/qmake
-
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
-	-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix
-
-	cd "${S}"
-
-}
-
-src_compile() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" != "4" ]]; then
-		myconf="${myconf} -no-reduce-exports"
-	fi
-
-	# Add a switch that will attempt to use recent binutils to reduce relocations.  Should be harmless for other
-	# cases.  From bug #178535
-	myconf="${myconf} -reduce-relocations"
-
-	myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
-	myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
-
-	use nas		&& myconf="${myconf} -system-nas-sound"
-
-	myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)"
-	myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)"
-	myconf="${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng system)"
-
-	use debug	&& myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-
-	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
-	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
-	use firebird	&& myconf="${myconf} -plugin-sql-ibase -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase"
-	use sqlite3	&& myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
-	use dbus	&& myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
-	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
-	use qt3support		&& myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
-	use ssl		&& myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl"
-
-	use pch		&& myconf="${myconf} -pch" || myconf="${myconf} -no-pch"
-
-	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
-	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
-
-	if ! use examples; then
-		myconf="${myconf} -nomake examples"
-	fi
-
-	myconf="-stl -verbose -largefile -confirm-license \
-		-platform ${PLATFORM} -xplatform ${PLATFORM} -no-rpath \
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
-		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
-		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
-		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	emake all || die
-}
-
-src_install() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	emake INSTALL_ROOT="${D}" install_subtargets || die
-	emake INSTALL_ROOT="${D}" install_qmake || die
-	emake INSTALL_ROOT="${D}" install_mkspecs || die
-
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs || die
-	fi
-
-	# Install the translations.	 This may get use flagged later somehow
-	emake INSTALL_ROOT="${D}" install_translations || die
-
-	keepdir "${QTSYSCONFDIR}"
-
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
-	sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
-	# Move .pc files into the pkgconfig directory
-	dodir ${QTPCDIR}
-	mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
-
-	# Install .desktop files, from bug #174033
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/qt4/*.desktop
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-
-	cat > "${T}/44qt4" << EOF
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-	doenvd "${T}/44qt4"
-}
-
-pkg_postinst() {
-	if use qt-copy ; then
-		ewarn "Do NOT report bugs to Gentoo's bugzilla when built with qt-copy!!!"
-	fi
-}
diff --git a/x11-libs/qt/qt-4.3.3.ebuild b/x11-libs/qt/qt-4.3.3.ebuild
deleted file mode 100644
index 46082d0..0000000
--- a/x11-libs/qt/qt-4.3.3.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SRCTYPE="opensource-src"
-QT_COPY_SNAP="1.1"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-RESTRICT="primaryuri"
-
-SRC_URI="mirror://gentoo/qt-x11-${SRCTYPE}-${PV}.tar.gz
-		 ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz
-		 qt-copy? ( http://jyujin.de/~creidiki/qt-copy/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma )"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE_INPUT_DEVICES="input_devices_wacom"
-
-IUSE="+accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres +qt-copy +qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}"
-
-RDEPEND="x11-libs/libXrandr
-		 x11-libs/libXcursor
-		 x11-libs/libXfont
-		 x11-libs/libSM
-		 !x11-libs/qt-core
-		 xinerama? ( x11-libs/libXinerama )
-		 media-libs/fontconfig
-		 media-libs/freetype:2
-		 png? ( media-libs/libpng )
-		 jpeg? ( media-libs/jpeg )
-		 mng? ( >=media-libs/libmng-1.0.9 )
-		 tiff? ( media-libs/tiff )
-		 nas? ( >=media-libs/nas-1.5 )
-		 odbc? ( dev-db/unixODBC )
-		 mysql? ( virtual/mysql )
-		 firebird? ( dev-db/firebird )
-		 sqlite3? ( dev-db/sqlite:3 )
-		 sqlite? ( dev-db/sqlite:0 )
-		 opengl? ( virtual/opengl virtual/glu )
-		 postgres? ( dev-db/libpq )
-		 cups? ( net-print/cups )
-		 zlib? ( sys-libs/zlib )
-		 glib? ( dev-libs/glib )
-		 dbus? ( >=sys-apps/dbus-1.0.2 )
-		 ssl? ( dev-libs/openssl )
-		 input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )"
-
-DEPEND="${RDEPEND}
-		qt-copy? ( app-arch/lzma-utils )
-		xinerama? ( x11-proto/xineramaproto )
-		x11-proto/xextproto
-		x11-proto/inputproto
-		dev-util/pkgconfig"
-
-pkg_setup() {
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=/usr
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTPCDIR=/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=/usr/share/qt4
-	QTDOCDIR=/usr/share/doc/${PV}
-	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTDEMOSDIR=${QTDATADIR}/demos
-
-	PLATFORM=$(qt_mkspecs_dir)
-
-}
-
-qt_use() {
-	local flag="$1"
-	local feature="$1"
-	local enableval=
-
-	[[ -n $2 ]] && feature=$2
-	[[ -n $3 ]] && enableval="-$3"
-
-	useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
-	return 0
-}
-
-qt_mkspecs_dir() {
-	 # Allows us to define which mkspecs dir we want to use.
-	local spec
-
-	case ${CHOST} in
-		*-freebsd*|*-dragonfly*)
-			spec="freebsd" ;;
-		*-openbsd*)
-			spec="openbsd" ;;
-		*-netbsd*)
-			spec="netbsd" ;;
-		*-darwin*)
-			spec="darwin" ;;
-		*-linux-*|*-linux)
-			spec="linux" ;;
-		*)
-			die "Unknown CHOST, no platform choosed."
-	esac
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		spec="${spec}-g++"
-	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-		spec="${spec}-icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	echo "${spec}"
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch
-
-	# Apply QT Copy patches:
-	if use qt-copy; then
-		ebegin "Applying the KDE Qt Copy patches"
-		for diff in $(ls "${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}"/* | sort); do
-			epatch "${diff}" || die
-		done
-		einfo "Done with patching"
-	fi
-
-	cd "${S}"/mkspecs/$(qt_mkspecs_dir)
-	# set c/xxflags and ldflags
-
-	# Don't let the user go too overboard with flags.  If you really want to, uncomment
-	# out the line below and give 'er a whirl.
-	strip-flags
-	replace-flags -O3 -O2
-
-	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
-		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
-		append-flags -fno-stack-protector
-	fi
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		-e "/CONFIG/s:$: nostrip:" \
-		qmake.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" qmake.conf
-
-	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
-	# separately as well.
-	cd "${S}"/mkspecs/common
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		g++.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" linux.conf
-
-	cd "${S}"/qmake
-
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
-	-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix
-
-	cd "${S}"
-
-}
-
-src_compile() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" != "4" ]]; then
-		myconf="${myconf} -no-reduce-exports"
-	fi
-
-	# Add a switch that will attempt to use recent binutils to reduce relocations.  Should be harmless for other
-	# cases.  From bug #178535
-	myconf="${myconf} -reduce-relocations"
-
-	myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
-	myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
-
-	use nas		&& myconf="${myconf} -system-nas-sound"
-
-	myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)"
-	myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)"
-	myconf="${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng system)"
-
-	use debug	&& myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-
-	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
-	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
-	use firebird	&& myconf="${myconf} -plugin-sql-ibase -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase"
-	use sqlite3	&& myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
-	use dbus	&& myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
-	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
-	use qt3support		&& myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
-	use ssl		&& myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl"
-
-	use pch		&& myconf="${myconf} -pch" || myconf="${myconf} -no-pch"
-
-	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
-	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
-
-	if ! use examples; then
-		myconf="${myconf} -nomake examples"
-	fi
-
-	myconf="-stl -verbose -largefile -confirm-license \
-		-platform ${PLATFORM} -xplatform ${PLATFORM} -no-rpath \
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
-		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
-		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
-		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	emake all || die
-}
-
-src_install() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	emake INSTALL_ROOT="${D}" install_subtargets || die
-	emake INSTALL_ROOT="${D}" install_qmake || die
-	emake INSTALL_ROOT="${D}" install_mkspecs || die
-
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs || die
-	fi
-
-	# Install the translations.	 This may get use flagged later somehow
-	emake INSTALL_ROOT="${D}" install_translations || die
-
-	keepdir "${QTSYSCONFDIR}"
-
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
-	sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
-	# Move .pc files into the pkgconfig directory
-	dodir ${QTPCDIR}
-	mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
-
-	# Install .desktop files, from bug #174033
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/qt4/*.desktop
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-
-	cat > "${T}/44qt4" << EOF
-LDPATH=${libdirs:1}
-EOF
-	doenvd "${T}/44qt4"
-}
-
-pkg_postinst() {
-	if use qt-copy ; then
-		ewarn "Do NOT report bugs to Gentoo's bugzilla when built with qt-copy!!!"
-	fi
-}
diff --git a/x11-libs/qt/qt-4.3.4-r1.ebuild b/x11-libs/qt/qt-4.3.4-r1.ebuild
index 6f13d84..5001b79 100644
--- a/x11-libs/qt/qt-4.3.4-r1.ebuild
+++ b/x11-libs/qt/qt-4.3.4-r1.ebuild
@@ -15,7 +15,8 @@ RESTRICT="primaryuri"
 SRC_URI="mirror://gentoo/qt-x11-${SRCTYPE}-${PV}.tar.gz
 		 ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz
 		 qt-copy? ( http://jyujin.de/~creidiki/qt-copy/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma )"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+S="${WORKDIR}"/qt-x11-${SRCTYPE}-${PV}
 
 LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
 SLOT="4"
@@ -35,7 +36,7 @@ RDEPEND="x11-libs/libXrandr
 		 xinerama? ( x11-libs/libXinerama )
 		 media-libs/fontconfig
 		 media-libs/freetype:2
-		 png? ( media-libs/libpng )
+		 png? ( media-libs/libpng:1.2 )
 		 jpeg? ( media-libs/jpeg )
 		 mng? ( >=media-libs/libmng-1.0.9 )
 		 tiff? ( media-libs/tiff )
@@ -131,11 +132,9 @@ src_unpack() {
 
 	# Apply QT Copy patches:
 	if use qt-copy; then
-		ebegin "Applying the KDE Qt Copy patches"
-		for diff in $(ls "${WORKDIR}/qt-copy-${PV}-patches-${QT_COPY_SNAP}"/* | sort); do
-			epatch "${diff}" || die
-		done
-		einfo "Done with patching"
+		EPATCH_MULTI_MSG="Applying QT-copy patches ..." \
+			EPATCH_FORCE="yes" EPATCH_SUFFIX="" epatch \
+		"${WORKDIR}"/qt-copy-${PV}-patches-${QT_COPY_SNAP}
 	fi
 
 	cd "${S}"/mkspecs/$(qt_mkspecs_dir)
@@ -201,7 +200,7 @@ src_compile() {
 	export PATH="${S}/bin:${PATH}"
 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+	[[ $(get_libdir) != "lib" ]] && myconf="${myconf} -L/usr/$(get_libdir)"
 
 	# Disable visibility explicitly if gcc version isn't 4
 	if [[ "$(gcc-major-version)" != "4" ]]; then
@@ -215,7 +214,7 @@ src_compile() {
 	myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
 	myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
 
-	use nas		&& myconf="${myconf} -system-nas-sound"
+	use nas     && myconf="${myconf} -system-nas-sound"
 
 	myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)"
 	myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)"