Lots of shifting of stuff going on - see the ChangeLog for details

11 files changed, 40 insertions, 386 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index d563c2552540..10d2181692aa 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.77 2003/07/21 21:26:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.78 2003/07/31 02:55:27 caleb Exp $
+
+qt-3.2.0 (30 Jul 2003)
+
+  30 Jul 2003; Caleb Tennis <caleb@gentoo.org>:
+  Add qt-3.2.0, but it's staying masked for a little while longer.
+  Also, remove the two 3.2.0_beta ebuilds.
+
+  30 Jul 2003; Caleb Tennis <caleb@gentoo.org>:
+  Remove qt-3.1.2-r5 and revert its changes back into 3.1.2-r4 as it
+  was minor enough not to warrant a revision
+
+  Also, add in complextext rendering patch.  Closes bug #25038.
+
+  And, while I'm at it, bump -r4 to stable x86.
 
   21 Jul 2003; Martin Schlemmer <azarah@gentoo.org> qt-3.1.2-r3.ebuild,
   qt-3.1.2-r4.ebuild, qt-3.1.2-r5.ebuild,
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index a662902b5679..8549abfcce0a 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,21 +1,17 @@
 MD5 7062a33109675195e6164249461c094d qt-3.1.2-r3.ebuild 5132
 MD5 0a5904be76bb25b35a03f3a5502aec90 qt-2.3.2-r1.ebuild 2323
-MD5 d8f9c7d8ddb12f1a412670d497215015 qt-3.2.0_beta2.ebuild 4497
 MD5 c0200496fd1c371b27238e33e95fbe9e qt-3.0.5-r2.ebuild 3983
 MD5 774f04a75d56c8b4da7772786d16b843 qt-3.1.0-r3.ebuild 4846
-MD5 ebf74a8997cbf38dd9e7435890843043 qt-3.1.2-r4.ebuild 5294
+MD5 7aab104486a1992ef1575e8420d839e8 qt-3.1.2-r4.ebuild 5293
 MD5 3666aed2bc53e3d5cedf5fc6e424ed50 qt-3.1.1-r2.ebuild 4666
-MD5 3627ad1834d18f1177b8513aad877540 qt-3.2.0.ebuild 4478
-MD5 c2132b103f6e0021dd147ef1d37d9296 ChangeLog 13157
+MD5 715afb6be76e4a616ee0ed132caf8c9f qt-3.2.0.ebuild 4472
+MD5 3ca89ed20a702712a2558ad2b745b61f ChangeLog 13339
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 c31bb1b07af43f08f17f8c9ad1470cce qt-3.2.0_beta1.ebuild 4497
 MD5 2d5b68b38185a30a28ffb2b652258cb8 files/45qt3 83
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
 MD5 edd5c27031cc5f29070a9094425f09d9 files/digest-qt-3.2.0 72
 MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
 MD5 04fdd1779f4aca06b809528a2d0bad7a files/qt-3.1.2-coreutils-fixup.patch 4203
-MD5 75f50432ffd304d181e2799f7cdba228 files/digest-qt-3.2.0_beta1 74
-MD5 0de4098994a7001bb679af6df6932f90 files/digest-qt-3.2.0_beta2 74
 MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
 MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
 MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r3 72
diff --git a/x11-libs/qt/files/digest-qt-3.1.2-r5 b/x11-libs/qt/files/digest-qt-3.1.2-r5
deleted file mode 100644
index adcf5a71e37e..000000000000
--- a/x11-libs/qt/files/digest-qt-3.1.2-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 156591717687799c69cf3f8b64a898f2 qt-x11-free-3.1.2.tar.bz2 13358932
diff --git a/x11-libs/qt/files/digest-qt-3.2.0 b/x11-libs/qt/files/digest-qt-3.2.0
new file mode 100644
index 000000000000..bed65a0f7fba
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.2.0
@@ -0,0 +1 @@
+MD5 9a639588000d0274666bcbb19e3d0af6 qt-x11-free-3.2.0.tar.bz2 14213184
diff --git a/x11-libs/qt/files/digest-qt-3.2.0_beta1 b/x11-libs/qt/files/digest-qt-3.2.0_beta1
deleted file mode 100644
index a8b60fe65abd..000000000000
--- a/x11-libs/qt/files/digest-qt-3.2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 508034be1018a30326288f2c096fcd9b qt-x11-free-3.2.0b1.tar.bz2 13762095
diff --git a/x11-libs/qt/files/digest-qt-3.2.0_beta2 b/x11-libs/qt/files/digest-qt-3.2.0_beta2
deleted file mode 100644
index 9e013b2026ab..000000000000
--- a/x11-libs/qt/files/digest-qt-3.2.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f81fd944e912fa5d814fcdcd3efadace qt-x11-free-3.2.0b2.tar.bz2 14197078
diff --git a/x11-libs/qt/files/qt-3.1.2-thai-complextext.patch b/x11-libs/qt/files/qt-3.1.2-thai-complextext.patch
new file mode 100644
index 000000000000..7c9dea19cf3c
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.1.2-thai-complextext.patch
@@ -0,0 +1,12 @@
+diff -Nuar qt-x11-free-3.1.2/src/kernel/qcomplextext.cpp qt-x11-free-3.1.2-complextext/src/kernel/qcomplextext.cpp
+--- qt-x11-free-3.1.2/src/kernel/qcomplextext.cpp	2003-04-03 00:22:39.000000000 +0700
++++ qt-x11-free-3.1.2-complextext/src/kernel/qcomplextext.cpp	2003-04-03 00:22:19.000000000 +0700
+@@ -855,7 +855,7 @@
+ 	}
+ 
+ 	// combining marks of different class don't interact. Reset the rectangle.
+-	if ( cmb != lastCmb ) {
++	if ( eCmb != lastCmb ) {
+ 	    //qDebug( "resetting rect" );
+ 	    attachmentRect = baseRect;
+ 	}
diff --git a/x11-libs/qt/qt-3.1.2-r4.ebuild b/x11-libs/qt/qt-3.1.2-r4.ebuild
index 1a297dae12ef..4b9b2e993760 100644
--- a/x11-libs/qt/qt-3.1.2-r4.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r4.ebuild,v 1.2 2003/07/21 21:26:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r4.ebuild,v 1.3 2003/07/31 02:55:27 caleb Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="3"
 LICENSE="QPL-1.0 | GPL-2"
 
 # WARNING: do not give this ebuild keywords that >=kdelibs-3.1.1, >=kdebase-3.1.1-r1 don't have
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
 
@@ -60,6 +60,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-qlistview-dnd.diff
 	# Fix issues with coreutils's head and tail commands
 	epatch ${FILESDIR}/${P}-coreutils-fixup.patch
+
+	use cjk && epatch ${FILESDIR}/${P}-korean-xim.patch
+	epatch ${FILESDIR}/${P}-thai-complextext.patch
 	
 	cp configure configure.orig
 	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
@@ -132,7 +135,7 @@ src_install() {
 	dobin bin/*
 
 	# libraries
-	dolib lib/libqt-mt.so.3.1.2 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a
+	dolib lib/libqt-mt.so.3.1.2 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a lib/*.la lib/*.prl
 	cd ${D}$QTBASE/lib
 	for x in libqui.so
 	do
diff --git a/x11-libs/qt/qt-3.1.2-r5.ebuild b/x11-libs/qt/qt-3.1.2-r5.ebuild
deleted file mode 100644
index 4f94dd9cc97f..000000000000
--- a/x11-libs/qt/qt-3.1.2-r5.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r5.ebuild,v 1.4 2003/07/22 19:34:59 tester Exp $
-
-inherit eutils
-
-IUSE="cups nas postgres opengl mysql odbc gif cjk"
-
-S="${WORKDIR}/qt-x11-free-${PV}"
-
-DESCRIPTION="QT version ${PV}"
-SLOT="3"
-LICENSE="QPL-1.0 | GPL-2"
-
-# WARNING: do not give this ebuild keywords that >=kdelibs-3.1.1, >=kdebase-3.1.1-r1 don't have
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
-
-HOMEPAGE="http://www.trolltech.com/"
-
-DEPEND="virtual/x11
-	media-libs/libpng
-	media-libs/lcms
-	media-libs/jpeg
-	>=media-libs/libmng-1.0.0
-	>=media-libs/freetype-2
-	virtual/xft
-	nas? ( >=media-libs/nas-1.4.1 )
-	odbc? ( >=dev-db/unixODBC-2.0 )
-	mysql? ( >=dev-db/mysql-3.2.10 )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( >=dev-db/postgresql-7.2 )
-	!=kde-base/kdelibs-3.1
-	!=kde-base/kdelibs-3.1-r1
-	!=kde-base/kdelibs-3.1-r2
-	!=kde-base/kdelibs-3.1-r3
-	!=kde-base/kdebase-3.1
-	!=kde-base/kdebase-3.1-r1
-	!=kde-base/kdebase-3.1.1"
-# WARNING: the versions blocked above are known to be buggy. DO NOT use them with this qt	
-
-RDEPEND="$DEPEND
-	doc? ( ~app-doc/qt-docs-$PV )"
-	
-QTBASE=/usr/qt/3
-export QTDIR=${S}
-
-src_unpack() {
-
-	export QTDIR=${S}
-
-	unpack ${A}
-
-	cd ${S}
-	
-	epatch ${FILESDIR}/designer.diff
-	epatch ${FILESDIR}/${P}-qmlined.diff
-	epatch ${FILESDIR}/${P}-r3-qsocket.diff
-	epatch ${FILESDIR}/${P}-qlistview-dnd.diff
-	# Fix issues with coreutils's head and tail commands
-	epatch ${FILESDIR}/${P}-coreutils-fixup.patch
-
-	use cjk && epatch ${FILESDIR}/${P}-korean-xim.patch
-	
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-	
-	cd mkspecs/linux-g++
-	# use env's $CC, $CXX
-	if [ -n "$CXX" ]; then
-	    einfo 'Using environment definition of $CXX'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
-	fi
-	if [ -n "$CC" ]; then
-	    einfo 'Using environment definition of $CC'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
-	fi
-	
-	# hppa people, please review the following
-	
-	# hppa need some additional flags
-	if [ "${ARCH}" = "hppa" ]; then
-		echo "QMAKE_CFLAGS += -fPIC -ffunction-sections" >> qmake.conf
-		echo "QMAKE_CXXFLAGS += -fPIC -ffunction-sections" >> qmake.conf
-		echo "QMAKE_LFLAGS += -ffunction-sections -Wl,--stub-group-size=25000" >> qmake.conf
-	fi
-}
-
-src_compile() {
-    
-	# fix #11144; qt wants to create lock files etc. in that directory
-	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
-
-	export QTDIR=${S}
-	
-	export LDFLAGS="-ldl"
-
-	use cups || myconf="${myconf} -no-cups"
-	use nas		&& myconf="${myconf} -system-nas-sound"
-	use gif		&& myconf="${myconf} -qt-gif"
-	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
-	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
-	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
-	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
-	
-	# avoid wasting time building things we won't install
-	rm -rf tutorial examples
-
-	export YACC='byacc -d'
-	
-	./configure -sm -thread -stl -system-zlib -system-libjpeg -verbose \
-		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
-		-system-libpng -ldl -lpthread -xft -platform linux-g++ -xplatform \
-		linux-g++ -xrender -prefix ${QTBASE} -fast ${myconf} || die
-
-	export QTDIR=${S}
-
-	emake src-qmake src-moc sub-src sub-tools || die
-
-}
-
-src_install() {
-
-	export QTDIR=${S}
-
-	cd ${S}
-
-	# binaries
-	into $QTBASE
-	dobin bin/*
-
-	# libraries
-	dolib lib/libqt-mt.so.3.1.2 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a
-	cd ${D}$QTBASE/lib
-	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.1.2->3.1->3->.so
-	ln -s libqt-mt.so.3.1.2 libqt-mt.so.3.1
-	ln -s libqt-mt.so.3.1 libqt-mt.so.3
-	ln -s libqt-mt.so.3 libqt-mt.so
-
-	# libqt -> libqt-mt symlinks
-	ln -s libqt-mt.so.3.1.2 	libqt.so.3.1.2
-	ln -s libqt-mt.so.3.1		libqt.so.3.1
-	ln -s libqt-mt.so.3		libqt.so.3
-	ln -s libqt-mt.so		libqt.so
-
-	# includes
-	cd ${S}
-	dodir ${QTBASE}/include/private
-	cp include/* ${D}/${QTBASE}/include/
-	cp include/private/* ${D}/${QTBASE}/include/private/
-
-	# misc
-	insinto /etc/env.d
-	doins ${FILESDIR}/{45qt3,50qtdir3}
-
-	# misc build reqs
-	dodir ${QTBASE}/mkspecs
-	cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
-
-	sed -e "s:${S}:${QTBASE}:g" \
-	    ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
-
-	# plugins
-	cd ${S}
-	plugins=`find plugins -name "lib*.so" -print`
-	for x in $plugins; do
-		insinto ${QTBASE}/`dirname $x`
-	doins $x
-	done
-
-}
-pkg_postinst() {
-
-    ewarn "If you upgraded from QT 3.0.x to 3.1.x, you should remerge any copies"
-    ewarn "of kdelibs you have installed. Otherwise, other kde packages may not"
-    ewarn "compile properly. If you upgraded QT from 3.0.x to 3.1.x in the past"
-    ewarn "but have not remerged kdelib, since then, you should proobably do so now."
-
-}
diff --git a/x11-libs/qt/qt-3.2.0_beta1.ebuild b/x11-libs/qt/qt-3.2.0.ebuild
index f5f1c3b0c47a..95b0f75b67ee 100644
--- a/x11-libs/qt/qt-3.2.0_beta1.ebuild
+++ b/x11-libs/qt/qt-3.2.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.0_beta1.ebuild,v 1.2 2003/06/13 20:51:28 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.0.ebuild,v 1.1 2003/07/31 02:55:27 caleb Exp $
 
 inherit eutils
 
 IUSE="cups nas postgres opengl mysql odbc gif"
 
-MY_P="qt-x11-free-3.2.0b1"
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${PV}
 
 DESCRIPTION="QT version ${PV}"
 SLOT="3"
@@ -15,7 +14,7 @@ LICENSE="QPL-1.0 | GPL-2"
 
 KEYWORDS="~x86"
 
-SRC_URI="ftp://ftp.trolltech.com/qt/source/${MY_P}.tar.bz2"
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
 
 HOMEPAGE="http://www.trolltech.com/"
 
diff --git a/x11-libs/qt/qt-3.2.0_beta2.ebuild b/x11-libs/qt/qt-3.2.0_beta2.ebuild
deleted file mode 100644
index f8da0e93dee8..000000000000
--- a/x11-libs/qt/qt-3.2.0_beta2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.0_beta2.ebuild,v 1.1 2003/06/23 21:54:16 caleb Exp $
-
-inherit eutils
-
-IUSE="cups nas postgres opengl mysql odbc gif"
-
-MY_P="qt-x11-free-3.2.0b2"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="QT version ${PV}"
-SLOT="3"
-LICENSE="QPL-1.0 | GPL-2"
-
-KEYWORDS="~x86"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/${MY_P}.tar.bz2"
-
-HOMEPAGE="http://www.trolltech.com/"
-
-DEPEND="virtual/x11
-	media-libs/libpng
-	media-libs/lcms
-	media-libs/jpeg
-	>=media-libs/libmng-1.0.0
-	>=media-libs/freetype-2
-	virtual/xft
-	nas? ( >=media-libs/nas-1.4.1 )
-	odbc? ( >=dev-db/unixODBC-2.0 )
-	mysql? ( >=dev-db/mysql-3.2.10 )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="$DEPEND"
-	#doc? ( ~app-doc/qt-docs- )"
-	
-QTBASE=/usr/qt/3
-export QTDIR=${S}
-
-src_unpack() {
-
-	export QTDIR=${S}
-
-	unpack ${A}
-
-	cd ${S}
-	
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-	
-	cd mkspecs/linux-g++
-	# use env's $CC, $CXX
-	if [ -n "$CXX" ]; then
-	    einfo 'Using environment definition of $CXX'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
-	fi
-	if [ -n "$CC" ]; then
-	    einfo 'Using environment definition of $CC'
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
-	fi
-	
-	# hppa and alpha people, please review the following
-	
-	# hppa need some additional flags
-	if [ "${ARCH}" = "hppa" ]; then
-		echo "QMAKE_CFLAGS += -fPIC -ffunction-sections" >> qmake.conf
-		echo "QMAKE_CXXFLAGS += -fPIC -ffunction-sections" >> qmake.conf
-		echo "QMAKE_LFLAGS += -ffunction-sections -Wl,--stub-group-size=25000" >> qmake.conf
-	fi
-	
-	# on alpha we need to compile everything with -fPIC
-	if [ ${ARCH} == "alpha" ]; then
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= -O2:= -O2 -fPIC:" qmake.conf.orig > qmake.conf
-	    cat >> ${S}/tools/designer/editor/editor.pro <<_EOF_
-QMAKE_CFLAGS += -fPIC
-QMAKE_CXXFLAGS += -fPIC
-_EOF_
-	fi
-
-
-}
-
-src_compile() {
-    
-	# fix #11144; qt wants to create lock files etc. in that directory
-	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
-
-	export QTDIR=${S}
-	
-	export LDFLAGS="-ldl"
-
-	use cups || myconf="${myconf} -no-cups"
-	use nas		&& myconf="${myconf} -system-nas-sound"
-	use gif		&& myconf="${myconf} -qt-gif"
-	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
-	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
-	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
-	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
-	
-	# avoid wasting time building things we won't install
-	rm -rf tutorial examples
-
-	export YACC='byacc -d'
-	
-	./configure -sm -thread -stl -system-zlib -system-libjpeg -verbose \
-		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
-		-system-libpng -ldl -lpthread -xft -platform linux-g++ -xplatform \
-		linux-g++ -xrender -prefix ${QTBASE} -fast ${myconf} || die
-
-	export QTDIR=${S}
-
-	emake src-qmake src-moc sub-src sub-tools || die
-
-}
-
-src_install() {
-
-	export QTDIR=${S}
-
-	cd ${S}
-
-	# binaries
-	into $QTBASE
-	dobin bin/*
-
-	# libraries
-	dolib lib/libqt-mt.so.3.2.0 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.a
-	cd ${D}$QTBASE/lib
-	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.2.0->3.2->3->.so
-	ln -s libqt-mt.so.3.2.0 libqt-mt.so.3.2
-	ln -s libqt-mt.so.3.2 libqt-mt.so.3
-	ln -s libqt-mt.so.3 libqt-mt.so
-
-	# libqt -> libqt-mt symlinks
-	ln -s libqt-mt.so.3.2.0 	libqt.so.3.2.0
-	ln -s libqt-mt.so.3.2		libqt.so.3.2
-	ln -s libqt-mt.so.3		libqt.so.3
-	ln -s libqt-mt.so		libqt.so
-
-	# includes
-	cd ${S}
-	dodir ${QTBASE}/include/private
-	cp include/* ${D}/${QTBASE}/include/
-	cp include/private/* ${D}/${QTBASE}/include/private/
-
-	# misc
-	insinto /etc/env.d
-	doins ${FILESDIR}/{45qt3,50qtdir3}
-
-	# misc build reqs
-	dodir ${QTBASE}/mkspecs
-	cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
-
-	sed -e "s:${S}:${QTBASE}:g" \
-	    ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
-
-	# plugins
-	cd ${S}
-	plugins=`find plugins -name "lib*.so" -print`
-	for x in $plugins; do
-		insinto ${QTBASE}/`dirname $x`
-	doins $x
-	done
-
-}
-