Add a patch to improve xinerama support, by Lubos Lunak.

Package-Manager: portage-2.1.2_rc2-r1

7 files changed, 484 insertions, 18 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 76de2cc95590..b0ba8a293e5c 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.389 2006/11/23 20:09:56 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.390 2006/11/24 15:01:53 flameeyes Exp $
+
+*qt-3.3.6-r5 (24 Nov 2006)
+
+  24 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/qt-3.3.6-seli-xinerama.patch, +qt-3.3.6-r5.ebuild:
+  Add a patch to improve xinerama support, by Lubos Lunak.
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> qt-3.3.4-r8.ebuild,
   qt-3.3.6-r1.ebuild, qt-3.3.6-r2.ebuild, qt-3.3.6-r3.ebuild,
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 31bd6001f898..d3fb84e20835 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
@@ -70,6 +73,10 @@ AUX qt-3.3.6-CVE-2006-4811.patch 955 RMD160 5732c149546be0b45b8ba4d21e54827deb21
 MD5 5e242e38c19bbfafce46a047f948f4ce files/qt-3.3.6-CVE-2006-4811.patch 955
 RMD160 5732c149546be0b45b8ba4d21e54827deb21dd5c files/qt-3.3.6-CVE-2006-4811.patch 955
 SHA256 7a14a9930ff6afbd46d4eb573fe3fd4d05608aa83e0c90214bf3adf4aaa1fe93 files/qt-3.3.6-CVE-2006-4811.patch 955
+AUX qt-3.3.6-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 SHA1 60b9c0a323d598aacca089d677c4b1c9709e70db SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503
+MD5 5a809da59debd0d8242c25c1f5ae7697 files/qt-3.3.6-seli-xinerama.patch 1960
+RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 files/qt-3.3.6-seli-xinerama.patch 1960
+SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503 files/qt-3.3.6-seli-xinerama.patch 1960
 AUX qt-3.3.6-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa SHA1 38bd5da513a2c28f3d941ba5644024643d835676 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3
 MD5 08ed7e5a6f33e7f88c7e86f13898fca2 files/qt-3.3.6-uic-fix.patch 711
 RMD160 19964cfc6714e2ad38659e268ef248501db606aa files/qt-3.3.6-uic-fix.patch 711
@@ -107,7 +114,7 @@ DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc7
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA1 37b59bb27d62562fcfbf9e32bd74001583060970 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
 DIST qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200 RMD160 51e480e651261796622a0d824ad549fd5e90089a SHA1 2b82583f1e922d73af7b147f5f03ea7821861a09 SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18
 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c
-DIST qt-x11-opensource-src-4.2.1.tar.gz 37069122 RMD160 af9935cb6a3ef3aa738e81389f13c09e837a2a01 SHA1 ef4d109608ea32d318b009c89f298da3d362e3fb SHA256 115e8f0380b55c182a42787d000fce7858b8e0cad4adfe37be3c544cd2ab5cb4
+DIST qt-x11-opensource-src-4.2.1.tar.gz 1770911 RMD160 31c2d46f337b6825e252e9c2035de4c8cc936301 SHA1 731d534a978bf01effc83556506d00a6dcece270 SHA256 59784f440adb32f344ba5ff171f432e14f09047dd23568663f1c9bded4b5c24a
 EBUILD qt-3.3.4-r8.ebuild 10573 RMD160 c648cc4fa51e34201c03ef86af041a4ca524be93 SHA1 035d6a2f2582906a2a6df117d319d5fff0054014 SHA256 8b0019f5bf598e2b691d5323b8ee5aae1e3953b8b0c67af81f382fa912f8c9ca
 MD5 0c1ef9ce30d3214fee92848f874a1e52 qt-3.3.4-r8.ebuild 10573
 RMD160 c648cc4fa51e34201c03ef86af041a4ca524be93 qt-3.3.4-r8.ebuild 10573
@@ -128,6 +135,10 @@ EBUILD qt-3.3.6-r4.ebuild 11098 RMD160 ec197f6ba6478d1be58df4ba17de0dc9c82a7bd0
 MD5 9d27863dc8108bcdbc55d4bad11e3c2c qt-3.3.6-r4.ebuild 11098
 RMD160 ec197f6ba6478d1be58df4ba17de0dc9c82a7bd0 qt-3.3.6-r4.ebuild 11098
 SHA256 ae32113764a96b6963097a0fa76d06541daf06bf7ed77ed1b3f1939ec861eeb4 qt-3.3.6-r4.ebuild 11098
+EBUILD qt-3.3.6-r5.ebuild 11206 RMD160 a71d905b6b11f807aa840370a9a2ff3d5773de98 SHA1 a10147f87d04587b1608aad0e868af917259471b SHA256 ddd8ced1700723073c329903ab7fe5b227ae3a6c1ab6db3929b3ccaa1b8c4f4d
+MD5 9132d2b82ac3ee623d031973ecfbc872 qt-3.3.6-r5.ebuild 11206
+RMD160 a71d905b6b11f807aa840370a9a2ff3d5773de98 qt-3.3.6-r5.ebuild 11206
+SHA256 ddd8ced1700723073c329903ab7fe5b227ae3a6c1ab6db3929b3ccaa1b8c4f4d qt-3.3.6-r5.ebuild 11206
 EBUILD qt-4.1.4-r2.ebuild 6833 RMD160 e5046bc0ea6587700e78393c0c67659b194186cc SHA1 9968a694f9027c7e481f5d09241309bfe5910315 SHA256 1c2b3ccb6609f9c90fec29ca88b1cc0e817a74a6b931b9c560ddeab94090589b
 MD5 db9293c4f3b6f7ff70b16a598b38ce42 qt-4.1.4-r2.ebuild 6833
 RMD160 e5046bc0ea6587700e78393c0c67659b194186cc qt-4.1.4-r2.ebuild 6833
@@ -140,10 +151,10 @@ EBUILD qt-4.2.1.ebuild 7901 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 SHA1
 MD5 0d748095dcbdd4785ae4e10838d3f8bd qt-4.2.1.ebuild 7901
 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 qt-4.2.1.ebuild 7901
 SHA256 91be57c3a8c1e6376472c5a2aa48bac1845fba83691c0737bd2bdb2294713dab qt-4.2.1.ebuild 7901
-MISC ChangeLog 21149 RMD160 8a8c2cf68fafe87f1680f09a33569311900b9b6a SHA1 0e157de37ee543a405c39c989e8577b068b5dcd8 SHA256 177e1bcc3a1d4feb5b176e8cf479d0332476e8db0c185727dc14d7e48f3809bf
-MD5 c126bf2ef57465a8c2873c26b038c5d3 ChangeLog 21149
-RMD160 8a8c2cf68fafe87f1680f09a33569311900b9b6a ChangeLog 21149
-SHA256 177e1bcc3a1d4feb5b176e8cf479d0332476e8db0c185727dc14d7e48f3809bf ChangeLog 21149
+MISC ChangeLog 21355 RMD160 789b6fbbd13fdbe4a77005ffdda9e4061496c0d9 SHA1 b92e86fcb30e81b0b6a867522448fc9e96fd1fff SHA256 ec561504e902daa8f3e00a915974d1bfc964daf03968d072937d8e74c57ce816
+MD5 df6f009091fcf4301ab316752ad89147 ChangeLog 21355
+RMD160 789b6fbbd13fdbe4a77005ffdda9e4061496c0d9 ChangeLog 21355
+SHA256 ec561504e902daa8f3e00a915974d1bfc964daf03968d072937d8e74c57ce816 ChangeLog 21355
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -163,12 +174,22 @@ SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/di
 MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6-r4 611
 RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6-r4 611
 SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6-r4 611
+MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6-r5 611
+RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6-r5 611
+SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6-r5 611
 MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4-r2 289
 RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4-r2 289
 SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4-r2 289
-MD5 5745eb95fbcdbb57fd56f19f6394b9aa files/digest-qt-4.2.1 289
-RMD160 fec797f1d0080976deb53495aa1a83e94ff245bc files/digest-qt-4.2.1 289
-SHA256 47a0446def545c4863c0121b96fd6437e5a47a24e9eaf5a9b4bb91935235d02a files/digest-qt-4.2.1 289
-MD5 5745eb95fbcdbb57fd56f19f6394b9aa files/digest-qt-4.2.1-r1 289
-RMD160 fec797f1d0080976deb53495aa1a83e94ff245bc files/digest-qt-4.2.1-r1 289
-SHA256 47a0446def545c4863c0121b96fd6437e5a47a24e9eaf5a9b4bb91935235d02a files/digest-qt-4.2.1-r1 289
+MD5 06cd2127a4f46887bbaed0c9f59c3280 files/digest-qt-4.2.1 286
+RMD160 56eb4ea61e2c4069f3196ebd1a1234cd53cbb5c3 files/digest-qt-4.2.1 286
+SHA256 e57536eb6de67deb1127666fb52e12ff4450a86c442122ea8c7f96d84367dcb3 files/digest-qt-4.2.1 286
+MD5 06cd2127a4f46887bbaed0c9f59c3280 files/digest-qt-4.2.1-r1 286
+RMD160 56eb4ea61e2c4069f3196ebd1a1234cd53cbb5c3 files/digest-qt-4.2.1-r1 286
+SHA256 e57536eb6de67deb1127666fb52e12ff4450a86c442122ea8c7f96d84367dcb3 files/digest-qt-4.2.1-r1 286
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFZwl0AiZjviIA2XgRAh7QAJ4sdqAACq7O/a96oAnc6prKYwHjiwCePKBf
+cOgpIa5jh+hH6EBaezuuHSQ=
+=6diP
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-3.3.6-r5 b/x11-libs/qt/files/digest-qt-3.3.6-r5
new file mode 100644
index 000000000000..935dada8500c
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.6-r5
@@ -0,0 +1,6 @@
+MD5 dc1384c03ac08af21f6fefab32d982cf qt-x11-free-3.3.6.tar.bz2 14565843
+RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 qt-x11-free-3.3.6.tar.bz2 14565843
+SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae qt-x11-free-3.3.6.tar.bz2 14565843
+MD5 08e49b5372bd44f973d8f2263458a5b6 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
+RMD160 51e480e651261796622a0d824ad549fd5e90089a qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
+SHA256 e67d8720903ded64c1e2eadc91f2fd8cfb5d08e0d71addf17499f21a0891df18 qt-x11-immodule-unified-qt3.3.6-20060317-gentoo.diff.bz2 110200
diff --git a/x11-libs/qt/files/digest-qt-4.2.1 b/x11-libs/qt/files/digest-qt-4.2.1
index c5644a01599f..291d476456a6 100644
--- a/x11-libs/qt/files/digest-qt-4.2.1
+++ b/x11-libs/qt/files/digest-qt-4.2.1
@@ -1,3 +1,3 @@
-MD5 2ab1c88084f55b94809f025a8503bf18 qt-x11-opensource-src-4.2.1.tar.gz 37069122
-RMD160 af9935cb6a3ef3aa738e81389f13c09e837a2a01 qt-x11-opensource-src-4.2.1.tar.gz 37069122
-SHA256 115e8f0380b55c182a42787d000fce7858b8e0cad4adfe37be3c544cd2ab5cb4 qt-x11-opensource-src-4.2.1.tar.gz 37069122
+MD5 fc9a668ab85390bf10ff3ae3a72895d0 qt-x11-opensource-src-4.2.1.tar.gz 1770911
+RMD160 31c2d46f337b6825e252e9c2035de4c8cc936301 qt-x11-opensource-src-4.2.1.tar.gz 1770911
+SHA256 59784f440adb32f344ba5ff171f432e14f09047dd23568663f1c9bded4b5c24a qt-x11-opensource-src-4.2.1.tar.gz 1770911
diff --git a/x11-libs/qt/files/digest-qt-4.2.1-r1 b/x11-libs/qt/files/digest-qt-4.2.1-r1
index c5644a01599f..291d476456a6 100644
--- a/x11-libs/qt/files/digest-qt-4.2.1-r1
+++ b/x11-libs/qt/files/digest-qt-4.2.1-r1
@@ -1,3 +1,3 @@
-MD5 2ab1c88084f55b94809f025a8503bf18 qt-x11-opensource-src-4.2.1.tar.gz 37069122
-RMD160 af9935cb6a3ef3aa738e81389f13c09e837a2a01 qt-x11-opensource-src-4.2.1.tar.gz 37069122
-SHA256 115e8f0380b55c182a42787d000fce7858b8e0cad4adfe37be3c544cd2ab5cb4 qt-x11-opensource-src-4.2.1.tar.gz 37069122
+MD5 fc9a668ab85390bf10ff3ae3a72895d0 qt-x11-opensource-src-4.2.1.tar.gz 1770911
+RMD160 31c2d46f337b6825e252e9c2035de4c8cc936301 qt-x11-opensource-src-4.2.1.tar.gz 1770911
+SHA256 59784f440adb32f344ba5ff171f432e14f09047dd23568663f1c9bded4b5c24a qt-x11-opensource-src-4.2.1.tar.gz 1770911
diff --git a/x11-libs/qt/files/qt-3.3.6-seli-xinerama.patch b/x11-libs/qt/files/qt-3.3.6-seli-xinerama.patch
new file mode 100644
index 000000000000..9fdd97a3d3ef
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.6-seli-xinerama.patch
@@ -0,0 +1,49 @@
+--- src/kernel/qapplication_x11.cpp.sav	2006-06-01 13:31:04.000000000 +0200
++++ src/kernel/qapplication_x11.cpp	2006-06-01 13:33:07.000000000 +0200
+@@ -271,6 +271,7 @@ Atom		qt_net_wm_frame_strut		= 0;	// KDE
+ Atom		qt_net_wm_state_stays_on_top	= 0;	// KDE extension
+ Atom		qt_net_wm_pid		= 0;
+ Atom		qt_net_wm_user_time	= 0;
++Atom            qt_net_wm_full_placement = 0; // KDE extension
+ // Enlightenment support
+ Atom		qt_enlightenment_desktop	= 0;
+ 
+@@ -1922,6 +1923,7 @@ void qt_init_internal( int *argcptr, cha
+ 			    &qt_net_wm_state_stays_on_top );
+ 	qt_x11_intern_atom( "_NET_WM_PID", &qt_net_wm_pid );
+ 	qt_x11_intern_atom( "_NET_WM_USER_TIME", &qt_net_wm_user_time );
++	qt_x11_intern_atom( "_NET_WM_FULL_PLACEMENT", &qt_net_wm_full_placement );
+ 	qt_x11_intern_atom( "ENLIGHTENMENT_DESKTOP", &qt_enlightenment_desktop );
+ 	qt_x11_intern_atom( "_NET_WM_NAME", &qt_net_wm_name );
+ 	qt_x11_intern_atom( "_NET_WM_ICON_NAME", &qt_net_wm_icon_name );
+--- src/dialogs/qdialog.cpp.sav	2006-03-17 14:33:44.000000000 +0100
++++ src/dialogs/qdialog.cpp	2006-06-01 13:38:00.000000000 +0200
+@@ -670,6 +670,11 @@ bool QDialog::event( QEvent *e )
+ 
+ #if defined(Q_WS_X11)
+ extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
++#include <private/qt_x11_p.h>
++#undef FocusIn
++// defined in qapplication_x11.cpp
++extern Atom qt_net_wm_full_placement;
++extern bool qt_net_supports(Atom atom);
+ #endif // Q_WS_X11
+ 
+ /*!
+@@ -691,10 +696,12 @@ void QDialog::show()
+ 
+     if ( !did_resize )
+ 	adjustSize();
+-    if ( has_relpos && !did_move ) {
+-	adjustPositionInternal( parentWidget(), TRUE );
+-    } else if ( !did_move ) {
+-	adjustPositionInternal( parentWidget() );
++    if( !qt_net_supports( qt_net_wm_full_placement )) {
++	if ( has_relpos && !did_move ) {
++	    adjustPositionInternal( parentWidget(), TRUE );
++	} else if ( !did_move ) {
++	    adjustPositionInternal( parentWidget() );
++	}
+     }
+ 
+     if (windowState() != state)
diff --git a/x11-libs/qt/qt-3.3.6-r5.ebuild b/x11-libs/qt/qt-3.3.6-r5.ebuild
new file mode 100644
index 000000000000..d14e53ccc85c
--- /dev/null
+++ b/x11-libs/qt/qt-3.3.6-r5.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r5.ebuild,v 1.1 2006/11/24 15:01:53 flameeyes Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+SRCTYPE="free"
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
+HOMEPAGE="http://www.trolltech.com/"
+
+IMMQT_P="qt-x11-immodule-unified-qt3.3.6-20060317-gentoo"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
+	immqt? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )
+	immqt-bc? ( mirror://gentoo/${IMMQT_P}.diff.bz2 )"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+
+SLOT="3"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc-macos ppc64 sparc x86 ~x86-fbsd"
+IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
+
+DEPEND="|| ( ( x11-libs/libXcursor
+			x11-libs/libXi
+			x11-libs/libXrandr
+			x11-libs/libSM
+			x11-proto/inputproto
+			x11-proto/xextproto
+			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
+
+		)
+		<virtual/x11-7
+	)
+	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/postgresql )
+	cups? ( net-print/cups )"
+PDEPEND="odbc? ( ~dev-db/qt-unixODBC-$PV )"
+
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+QTBASE=/usr/qt/3
+
+pkg_setup() {
+	if use immqt && use immqt-bc ; then
+		ewarn
+		ewarn "immqt and immqt-bc are exclusive. You cannot set both."
+		ewarn "Please specify either immqt or immqt-bc."
+		ewarn
+		die
+	elif use immqt ; then
+		ewarn
+		ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
+		ewarn "you have to recompile everything depending on Qt after you install it."
+		ewarn "Be aware."
+		ewarn
+	fi
+
+	export QTDIR=${S}
+
+	CXX=$(tc-getCXX)
+	if [[ ${CXX/g++/} != ${CXX} ]]; then
+		PLATCXX="g++"
+	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
+		PLATCXX="icc"
+	else
+		die "Unknown compiler ${CXX}."
+	fi
+
+	case ${CHOST} in
+		*-freebsd*|*-dragonfly*)
+			PLATNAME="freebsd" ;;
+		*-openbsd*)
+			PLATNAME="openbsd" ;;
+		*-netbsd*)
+			PLATNAME="netbsd" ;;
+		*-darwin*)
+			PLATNAME="darwin" ;;
+		*-linux-*|*-linux)
+			PLATNAME="linux" ;;
+		*)
+			die "Unknown CHOST, no platform choosed."
+	esac
+
+	# probably this should be '*-64' for 64bit archs
+	# in a fully multilib environment (no compatibility symlinks)
+	export PLATFORM="${PLATNAME}-${PLATCXX}"
+}
+
+src_unpack() {
+	unpack ${A}
+	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 \
+		sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
+
+	# Patch for uic includehint errors (aseigo patch)
+	epatch ${FILESDIR}/${P}-uic-fix.patch
+
+	# 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
+
+	# ulibc patch (bug #100246)
+	epatch ${FILESDIR}/qt-ulibc.patch
+
+	# bug #151838
+	epatch "${FILESDIR}/${P}-CVE-2006-4811-bis.patch"
+
+	# xinerama patch: http://ktown.kde.org/~seli/xinerama/
+	epatch "${FILESDIR}/${P}-seli-xinerama.patch"
+
+	# 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"
+
+	if use immqt || use immqt-bc ; then
+		epatch ../${IMMQT_P}.diff
+		sh make-symlinks.sh || die "make symlinks failed"
+	fi
+
+	if use ppc-macos ; then
+		epatch "${FILESDIR}/${PN}-3.3.5-macos.patch"
+	fi
+
+	# known working flags wrt #77623
+	use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
+	# set c/xxflags and ldflags
+	strip-flags
+	append-flags -fno-strict-aliasing
+	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 "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
+		   -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
+
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e "s:/lib$:/$(get_libdir):" \
+			${S}/mkspecs/${PLATFORM}/qmake.conf || die
+	fi
+}
+
+src_compile() {
+	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)"
+
+	# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
+	use nas		&& myconf="${myconf} -system-nas-sound"
+	use nis		&& myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
+	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
+	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/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
+	use firebird    && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
+	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
+	use cups	&& myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
+	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
+	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
+	use xinerama    && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
+
+	myconf="${myconf} -system-zlib"
+
+	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
+	use immqt-bc	&& myconf="${myconf} -inputmethod"
+	use immqt	&& myconf="${myconf} -inputmethod -inputmethod-ext"
+
+	if use ppc-macos ; then
+		myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-psql -no-cups -lresolv -shared"
+		myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
+		myconf="${myconf} -L${S}/lib -I${S}/include"
+		sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die
+	fi
+
+	export YACC='byacc -d'
+	tc-export CC CXX
+	export LINK="$(tc-getCXX)"
+
+	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
+		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
+		-system-libpng -xft -platform ${PLATFORM} -xplatform \
+		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
+		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die
+
+	emake src-qmake src-moc sub-src || die
+
+	export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	emake sub-tools || die
+
+	if use examples; then
+		emake sub-tutorial sub-examples || die
+	fi
+
+	# Make the msg2qm utility (not made by default)
+	cd ${S}/tools/msg2qm
+	../../bin/qmake
+	emake
+
+	# Make the qembed utility (not made by default)
+	cd ${S}/tools/qembed
+	../../bin/qmake
+	emake
+
+}
+
+src_install() {
+	# binaries
+	into ${QTBASE}
+	dobin bin/*
+	dobin tools/msg2qm/msg2qm
+	dobin tools/qembed/qembed
+
+	# libraries
+	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
+
+		cd ${D}/${QTBASE}/$(get_libdir)
+		for lib in libqt-mt* ; do
+			ln -s ${lib} ${lib/-mt/}
+		done
+	else
+		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)
+
+		for x in libqui.so ; do
+			ln -s $x.1.0.0 $x.1.0
+			ln -s $x.1.0 $x.1
+			ln -s $x.1 $x
+		done
+
+		# version symlinks - 3.3.5->3.3->3->.so
+		ln -s libqt-mt.so.${PV} libqt-mt.so.3.3
+		ln -s libqt-mt.so.3.3 libqt-mt.so.3
+		ln -s libqt-mt.so.3 libqt-mt.so
+
+		# libqt -> libqt-mt symlinks
+		ln -s libqt-mt.so.${PV} libqt.so.${PV}
+		ln -s libqt-mt.so.3.3 libqt.so.3.3
+		ln -s libqt-mt.so.3 libqt.so.3
+		ln -s libqt-mt.so libqt.so
+	fi
+
+	# plugins
+	cd ${S}
+	local plugins=$(find plugins -name "lib*.so" -print)
+	for x in ${plugins}; do
+		exeinto ${QTBASE}/$(dirname ${x})
+		doexe ${x}
+	done
+
+	# Past this point just needs to be done once
+	is_final_abi || return 0
+
+	# includes
+	cd ${S}
+	dodir ${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
+	insinto ${QTBASE}/$(get_libdir)
+	doins ${S}/lib/*.prl
+
+	# pkg-config file
+	insinto ${QTBASE}/$(get_libdir)/pkgconfig
+	doins ${S}/lib/*.pc
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${QTBASE}/${libdir}"
+	done
+
+	# environment variables
+	if use ppc-macos; then
+		cat <<EOF > ${T}/45qt3
+PATH=${QTBASE}/bin
+ROOTPATH=${QTBASE}/bin
+DYLD_LIBRARY_PATH=${libdirs:1}
+QMAKESPEC=${PLATFORM}
+MANPATH=${QTBASE}/doc/man
+PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
+EOF
+	else
+		cat <<EOF > ${T}/45qt3
+PATH=${QTBASE}/bin
+ROOTPATH=${QTBASE}/bin
+LDPATH=${libdirs:1}
+QMAKESPEC=${PLATFORM}
+MANPATH=${QTBASE}/doc/man
+PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
+EOF
+	fi
+	cat <<EOF > ${T}/50qtdir3
+QTDIR=${QTBASE}
+EOF
+
+	cat <<EOF > ${T}/50-qt3-revdep
+SEARCH_DIRS="${QTBASE}"
+EOF
+
+	insinto /etc/revdep-rebuild
+	doins ${T}/50-qt3-revdep
+
+	insinto /etc/env.d
+	doins ${T}/45qt3 ${T}/50qtdir3
+
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
+	fi
+
+	insinto ${QTBASE}/tools/designer
+	doins -r tools/designer/templates
+
+	insinto ${QTBASE}
+	doins -r translations
+
+	keepdir ${QTBASE}/etc/settings
+
+	if use doc; then
+		insinto ${QTBASE}
+		doins -r ${S}/doc
+	fi
+
+	if use examples; then
+		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}/
+	fi
+
+	# misc build reqs
+	insinto ${QTBASE}/mkspecs
+	doins -r ${S}/mkspecs/${PLATFORM}
+
+	sed -e "s:${S}:${QTBASE}:g" \
+		${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
+	fi
+}
+
+pkg_postinst() {
+	echo
+	einfo "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
+	einfo "or widgets for the Qt designer) are no longer recognized.  If this situation"
+	einfo "occurs you should recompile the packages providing these plugins,"
+	einfo "and you should also make sure that Qt and its plugins were compiled with the"
+	einfo "same version of gcc.  Packages that may need to be rebuilt are, for instance,"
+	einfo "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
+	einfo "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
+	echo
+}