Add patch for Qt's immodule, bug #124033. Thanks to Martin Meredith <mez@ubuntu.com> for reporting.

(Portage version: 2.1_pre5-r4)

7 files changed, 785 insertions, 11 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index ce4eb2694b89..7b06a47b535c 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.290 2006/03/09 14:20:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.291 2006/03/09 18:38:12 flameeyes Exp $
+
+*qt-3.3.5-r1 (09 Mar 2006)
+*qt-3.3.4-r9 (09 Mar 2006)
+
+  09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/qt-3.3.5-immodule.patch, +qt-3.3.4-r9.ebuild, +qt-3.3.5-r1.ebuild:
+  Add patch for Qt's immodule, bug #124033. Thanks to Martin Meredith
+  <mez@ubuntu.com> for reporting.
 
   09 Mar 2006; Aron Griffis <agriffis@gentoo.org> qt-4.1.1.ebuild:
   Mark 4.1.1 ~ia64
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 6a002468f792..9f3d9fe57ba8 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6c3560d61ccbc9ca225e22cfcdde7dca ChangeLog 6787
 RMD160 90fc908c79f82490974d2dff1cb1fac0e38dc2b9 ChangeLog 6787
 SHA256 d052a4ae71af4f5dd1a53c7247c2dfeac3f3a3299749bc40e76c5871a1f2b3c4 ChangeLog 6787
@@ -19,9 +16,15 @@ SHA256 6f91a102c81eca3191df63a6d3b79794587199f0485ffe5d42fc20fa063d53be files/00
 MD5 7b2e89178256792970af91c675736674 files/digest-qt-3.3.4-r8 590
 RMD160 be12f3901344be36b1ca42df80a5d4bd29e98a27 files/digest-qt-3.3.4-r8 590
 SHA256 ff67af4e95cf1dbfcf39a908b99339305f6cf0031c9e325298fe6f742ec050c0 files/digest-qt-3.3.4-r8 590
+MD5 7b2e89178256792970af91c675736674 files/digest-qt-3.3.4-r9 590
+RMD160 be12f3901344be36b1ca42df80a5d4bd29e98a27 files/digest-qt-3.3.4-r9 590
+SHA256 ff67af4e95cf1dbfcf39a908b99339305f6cf0031c9e325298fe6f742ec050c0 files/digest-qt-3.3.4-r9 590
 MD5 094349442aca1132e3c97aee2dcde34a files/digest-qt-3.3.5 400
 RMD160 4baa572b1b10addcc646e0522f56176ef57f4898 files/digest-qt-3.3.5 400
 SHA256 b4d24ef5f1e74872de2ad2e5f9cb69747ecfd0ed3c03876605875dd68ef0bebb files/digest-qt-3.3.5 400
+MD5 76a040705fa29dc7da83216569142baf files/digest-qt-3.3.5-r1 590
+RMD160 79d4f921d8013694dd79265328e740b45252b6ee files/digest-qt-3.3.5-r1 590
+SHA256 707e8b079fec72ff5275990e8fac73eb019cd6ace7929a777899e2d71159d38e files/digest-qt-3.3.5-r1 590
 MD5 fa53e425bec204779eaa1d7b79705f74 files/digest-qt-4.1.0-r1 81
 RMD160 8cccc49ae11ec6a6a2321407e4e83974ecb48cd2 files/digest-qt-4.1.0-r1 81
 SHA256 978ae137f1276ae9af1ca77fad93c55465907b29c0c37d2f52a5c50600745e3b files/digest-qt-4.1.0-r1 81
@@ -52,6 +55,9 @@ SHA256 fae7ae9dc04b44ce8e8751947eb77471175769ff6ad439e78e79879743ae35a6 files/qt
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
 RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb files/qt-3.3.4-qclipboard-hack.patch 1662
 SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c files/qt-3.3.4-qclipboard-hack.patch 1662
+MD5 3e41898f6a3f5ff8518f5df0cb1e23cf files/qt-3.3.5-immodule.patch 773
+RMD160 943d88ab880d793c58eee28d1aa8954f96ce3a5c files/qt-3.3.5-immodule.patch 773
+SHA256 a1cc1594c7795e034298aebb534bc4cb213af7fd0045036030d46e2c8f6edbd8 files/qt-3.3.5-immodule.patch 773
 MD5 dda33293dab89d46ad43994002aae1da files/qt-3.3.5-macos.patch 18154
 RMD160 3e9ffa9baf832ebc6f3e8a292f781b0a9e35740c files/qt-3.3.5-macos.patch 18154
 SHA256 0515b66ccf539d2449b44c43873bd89f0ab6ea007488644e5170b50c84d2003e files/qt-3.3.5-macos.patch 18154
@@ -76,6 +82,12 @@ SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 metadata
 MD5 ce2019145eb6b9a8a84382045fc34971 qt-3.3.4-r8.ebuild 10559
 RMD160 8eb8d75b41ee06f72d7aef7c6123ea30b16c00e4 qt-3.3.4-r8.ebuild 10559
 SHA256 90dab1336809080b00238e812702d920bf3aa3f1c6f10d9ccbe527414b2ea0fc qt-3.3.4-r8.ebuild 10559
+MD5 6fd9d4be4a555136fc5e15055488b001 qt-3.3.4-r9.ebuild 10619
+RMD160 f2a1461824dc52185d4c0794c6be621dadeb22d1 qt-3.3.4-r9.ebuild 10619
+SHA256 671d62732a5ee82cd6a4f7cdf7cc22ec01b25a0124c8bee76d16cd6584256f2b qt-3.3.4-r9.ebuild 10619
+MD5 8c22e83a64d762aaa4ee06099d666af0 qt-3.3.5-r1.ebuild 10600
+RMD160 406d7f141bf1d7595ba4e8aef671dc27acd38041 qt-3.3.5-r1.ebuild 10600
+SHA256 2778c466352950c04e3c2a928339f6c81fd564de687a348f6c2aa0ed3829c13f qt-3.3.5-r1.ebuild 10600
 MD5 79f2f90628493509cef5843f920efe80 qt-3.3.5.ebuild 10557
 RMD160 1c8ddde347518aa57d475ede75f1ee428795fa70 qt-3.3.5.ebuild 10557
 SHA256 4f51480d530779f6c0fb3ea9f6c508b9731a2febf436daa19c47e329ef710158 qt-3.3.5.ebuild 10557
@@ -88,10 +100,3 @@ SHA256 12afba544cd95d5be5caf7ab0cd634e7e74ed1deb5967e3c1f3af1c0f09a8ec6 qt-4.1.0
 MD5 dec77c41b5849f0ebdcde7fa9ea25690 qt-4.1.1.ebuild 6351
 RMD160 f301ece0c483410df03fb22be0e381f2e3e5a18e qt-4.1.1.ebuild 6351
 SHA256 b67eda7a5fa11318f3887762ab3625832b0ea77a3e7ecd02ae84f9c9eefeefbd qt-4.1.1.ebuild 6351
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEEDmsJrHF4yAQTrARAn+WAJkBsQx/FvFbQDJhD98WSwgacj4nxQCgigGx
-MUvMJBaXVHj//aiELu85P7g=
-=NYBZ
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-3.3.4-r9 b/x11-libs/qt/files/digest-qt-3.3.4-r9
new file mode 100644
index 000000000000..e746bdb718f8
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.4-r9
@@ -0,0 +1,6 @@
+MD5 027f4e82fbe592b39d2f160bfb3a73af qt-x11-free-3.3.4.tar.bz2 14439722
+RMD160 3298331d545511956eb0910cbc5867a2a453ea1e qt-x11-free-3.3.4.tar.bz2 14439722
+SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3 qt-x11-free-3.3.4.tar.bz2 14439722
+MD5 85fdf8ac3264a8849ebae74aa9c37a9b qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389
+RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389
+SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6 qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389
diff --git a/x11-libs/qt/files/digest-qt-3.3.5-r1 b/x11-libs/qt/files/digest-qt-3.3.5-r1
new file mode 100644
index 000000000000..5153d7824e82
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.5-r1
@@ -0,0 +1,6 @@
+MD5 05d04688c0c0230ed54e89102d689ca4 qt-x11-free-3.3.5.tar.bz2 14431679
+RMD160 376ae3fc36c70ec864653ca78582ba29410def7f qt-x11-free-3.3.5.tar.bz2 14431679
+SHA256 aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96 qt-x11-free-3.3.5.tar.bz2 14431679
+MD5 2d1a6979301ee81da404f63670211416 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
+RMD160 18fe91f54f2f18c2b1b2b870b36c7545132ed166 qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
+SHA256 a3c31dd54aaf1a88222715a2140f9a4ed4eaf240930c94c506bbde15f00f746a qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2 110612
diff --git a/x11-libs/qt/files/qt-3.3.5-immodule.patch b/x11-libs/qt/files/qt-3.3.5-immodule.patch
new file mode 100644
index 000000000000..faa0e87854f3
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.5-immodule.patch
@@ -0,0 +1,19 @@
+Index: qt-x11-free-3.3.5/src/kernel/qapplication_x11.cpp
+===================================================================
+--- qt-x11-free-3.3.5.orig/src/kernel/qapplication_x11.cpp
++++ qt-x11-free-3.3.5/src/kernel/qapplication_x11.cpp
+@@ -5220,11 +5220,12 @@ bool QETWidget::translateKeyEventInterna
+     } else {
+ 	key = (int)(long)keyDict->find( keycode );
+ 	if ( key )
+-	    if( !willRepeat ) // Take out key of dictionary only if this call.
++	    if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call.
+ 		keyDict->take( keycode );
+ 	long s = (long)textDict->find( keycode );
+ 	if ( s ) {
+-	    textDict->take( keycode );
++	    if ( statefulTranslation )
++	        textDict->take( keycode );
+ 	    ascii = (char)(s-256);
+ 	}
+     }
diff --git a/x11-libs/qt/qt-3.3.4-r9.ebuild b/x11-libs/qt/qt-3.3.4-r9.ebuild
new file mode 100644
index 000000000000..c7e733d10a7e
--- /dev/null
+++ b/x11-libs/qt/qt-3.3.4-r9.ebuild
@@ -0,0 +1,363 @@
+# 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.4-r9.ebuild,v 1.1 2006/03/09 18:38:13 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.4-20041203"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
+	immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
+	immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="cups debug doc examples firebird gif ipv6 mysql nas 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
+	)
+	virtual/xft
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/libmng
+	>=media-libs/freetype-2
+	nas? ( >=media-libs/nas-1.5 )
+	mysql? ( dev-db/mysql )
+	firebird? ( dev-db/firebird )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( dev-db/postgresql )
+	cups? ( net-print/cups )"
+#	zlib? ( sys-libs/zlib )"
+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/icc/} != ${CXX} ]]; then
+		PLATCXX="icc"
+	else
+		die "Unknown compiler ${CXX}."
+	fi
+
+	if use kernel_linux; then
+		PLATNAME="linux"
+	elif use kernel_FreeBSD && use elibc_FreeBSD; then
+		PLATNAME="freebsd"
+	elif use kernel_Darwin && use elibc_Darwin; then
+		PLATNAME="darwin"
+	else
+		die "Unknown platform."
+	fi
+
+	# 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 =:'
+
+	# fix freeze caused by bad interaction with kde klipper (kde bug 80072)
+	epatch ${FILESDIR}/${P}-qclipboard-hack.patch
+
+	# KDE related patches
+	epatch ${FILESDIR}/0001-dnd_optimization.patch
+	epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
+	epatch ${FILESDIR}/0037-dnd-timestamp-fix.patch
+	epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
+	epatch ${FILESDIR}/${P}-0051-qtoolbar_77047.patch
+	epatch ${FILESDIR}/${P}-0047-fix-kmenu-widget.diff
+
+	# patches for gcc4
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-gcc4-volatile.patch"
+
+	# patch for ulibc (bug #100246)
+	epatch "${FILESDIR}/qt-ulibc.patch"
+
+	if use immqt || use immqt-bc ; then
+		epatch ../${IMMQT_P}.diff
+		epatch ${FILESDIR}/${P}-immodule-focus.patch
+		epatch "${FILESDIR}/${PN}-3.3.5-immodule.patch"
+		sh make-symlinks.sh || die "make symlinks failed"
+	fi
+
+	if use ppc-macos ; then
+		epatch ${FILESDIR}/${P}-macos.patch
+	fi
+
+	# known working flags wrt #77623
+	use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
+	# set c/xxflags and ldflags
+	strip-flags
+	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}:" \
+		${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 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"
+#	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
+	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'
+
+	./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 lib/lib{editor,qassistantclient,designercore}.a
+		dolib lib/libqt-mt.la
+		dolib lib/libqt-mt.so.3.3.4 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.4->3.3->3->.so
+		ln -s libqt-mt.so.3.3.4 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.3.3.4 libqt.so.3.3.4
+		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
+EOF
+	else
+		cat <<EOF > ${T}/45qt3
+PATH=${QTBASE}/bin
+ROOTPATH=${QTBASE}/bin
+LDPATH=${libdirs:1}
+QMAKESPEC=${PLATFORM}
+MANPATH=${QTBASE}/doc/man
+EOF
+	fi
+	cat <<EOF > ${T}/50qtdir3
+QTDIR=${QTBASE}
+EOF
+
+	cat <<EOF > ${T}/50-qt3-revdep
+SEARCH_DIRS="${QTBASE}"
+EOF
+
+	insinto /etc/env.d
+	doins ${T}/45qt3 ${T}/50qtdir3
+
+	insinto /etc/revdep-rebuild
+	doins ${T}/50-qt3-revdep
+
+	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
+}
diff --git a/x11-libs/qt/qt-3.3.5-r1.ebuild b/x11-libs/qt/qt-3.3.5-r1.ebuild
new file mode 100644
index 000000000000..5a0f733f11ea
--- /dev/null
+++ b/x11-libs/qt/qt-3.3.5-r1.ebuild
@@ -0,0 +1,367 @@
+# 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.5-r1.ebuild,v 1.1 2006/03/09 18:38:13 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.5-20051018"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
+	immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
+	immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib 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
+	)
+	virtual/xft
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/libmng
+	>=media-libs/freetype-2
+	nas? ( >=media-libs/nas-1.5 )
+	mysql? ( dev-db/mysql )
+	firebird? ( dev-db/firebird )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( dev-db/postgresql )
+	cups? ( net-print/cups )
+	zlib? ( sys-libs/zlib )"
+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/icc/} != ${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-*)
+			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
+
+	# fix freeze caused by bad interaction with kde klipper (kde bug 80072)
+#	epatch ${FILESDIR}/${P}-qclipboard-hack.patch
+
+	# KDE related patches
+	epatch ${FILESDIR}/0001-dnd_optimization.patch
+	epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
+#	epatch ${FILESDIR}/0037-dnd-timestamp-fix.patch
+	epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
+#	epatch ${FILESDIR}/${P}-0051-qtoolbar_77047.patch
+#	epatch ${FILESDIR}/${P}-0047-fix-kmenu-widget.diff
+
+	# ulibc patch (bug #100246)
+	epatch ${FILESDIR}/qt-ulibc.patch
+
+	if use immqt || use immqt-bc ; then
+		epatch ../${IMMQT_P}.diff
+		epatch "${FILESDIR}/${P}-immodule.patch"
+		sh make-symlinks.sh || die "make symlinks failed"
+	fi
+
+	if use ppc-macos ; then
+		epatch ${FILESDIR}/${P}-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}:" \
+		${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 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"
+	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-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'
+
+	./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 lib/lib{editor,qassistantclient,designercore}.a
+		dolib lib/libqt-mt.la
+		dolib lib/libqt-mt.so.3.3.5 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.3.3.5 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.3.3.5 libqt.so.3.3.5
+		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
+EOF
+	else
+		cat <<EOF > ${T}/45qt3
+PATH=${QTBASE}/bin
+ROOTPATH=${QTBASE}/bin
+LDPATH=${libdirs:1}
+QMAKESPEC=${PLATFORM}
+MANPATH=${QTBASE}/doc/man
+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
+}