Revbump for multilib fixes. Only leaving multilib archs in KEYWORDS.

14 files changed, 439 insertions, 45 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 477ab272f89b..060e00f0ff01 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.180 2004/12/28 22:03:05 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.181 2005/01/08 10:36:27 eradicator Exp $
+
+*qt-3.3.3-r2 (08 Jan 2005)
+
+  08 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +qt-2.3.2-r2.ebuild, +qt-3.3.3-r2.ebuild:
+  Revbump for multilib fixes.  Only leaving multilib archs in KEYWORDS.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 2713226021cb..6a09c309a474 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,38 +1,52 @@
-MD5 577403a7f68d79ee98d299dc79ac06f1 qt-4.0.0_beta1-r1.ebuild 5696
-MD5 6e61efd43e5e4d7d3a18031b108a331b qt-3.3.3-r1.ebuild 8034
-MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893
-MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287
-MD5 5d82c6565d0f7cd22378670d038b92fb qt-3.3.1-r2.ebuild 5743
-MD5 dd2582a706c85fae669ad6decfc5d8b0 qt-4.0.0_beta1.ebuild 4772
-MD5 93786ccf88773cd8dedf50c542d83446 ChangeLog 30189
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4fdb9a51cc91e670e26f64e7bec359c4 ChangeLog 30394
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 569f680d545c45974e9b33297ffae90e qt-3.3.3.ebuild 6893
-MD5 143e75d55f6c24c66ab5d8f89bb7e4c7 qt-3.2.3-r1.ebuild 5154
-MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
+MD5 f48889277f11c39d5f2160b262e7c314 qt-2.3.2-r1.ebuild 2289
+MD5 dd2127b3c7bc12b24621d172b6a075af qt-3.2.3-r1.ebuild 5159
+MD5 0c35ff70fb6ff95611499d6fb69d8afc qt-3.3.1-r2.ebuild 5745
+MD5 fbe7f8bc183824f9c17974b1a493c94d qt-3.3.2.ebuild 6895
+MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
+MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
+MD5 6eabb11b45974186ee77341995c7b215 qt-4.0.0_beta1-r1.ebuild 5702
+MD5 13c659d1e84ee9edb8e9c64d08fb06a9 qt-4.0.0_beta1.ebuild 4777
+MD5 0ad44cc079ec84d426754d8821c4246e qt-3.3.3-r2.ebuild 8173
+MD5 df5a45237731feecaec3d1c0dd72e735 qt-2.3.2-r2.ebuild 2596
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
-MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165
-MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
-MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
-MD5 5754b897216dcf52901cfb4de6770d6e files/digest-qt-4.0.0_beta1-r1 99
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
 MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
 MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
+MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165
+MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
 MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
-MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
-MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
+MD5 1402aee539796a7165cdd4646346da50 files/digest-qt-4.0.0_beta1 81
+MD5 5754b897216dcf52901cfb4de6770d6e files/digest-qt-4.0.0_beta1-r1 99
 MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
+MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
+MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
+MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 383147673319909aa3b692646be3c3dd files/qt4b1.patch 564
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
 MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
-MD5 1402aee539796a7165cdd4646346da50 files/digest-qt-4.0.0_beta1 81
+MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
 MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
-MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
+MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 37722e33e1a10fcc58463d13979e0f05 files/qt4-qtprf.patch 470
+MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 383147673319909aa3b692646be3c3dd files/qt4b1.patch 564
+MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r2 65
+MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r2 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB37e8ArHZZzCEUG0RAvAPAJ9R7Jel5Y9wCdFeUad/rhlktUg10QCfUsEg
+BN3PJ7R4ZFH0ZGSxyYCKVbs=
+=jThv
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-2.3.2-r2 b/x11-libs/qt/files/digest-qt-2.3.2-r2
new file mode 100644
index 000000000000..a0f2871d4ee3
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-2.3.2-r2
@@ -0,0 +1 @@
+MD5 8b74c7bd9ff0c4752a009f2e5a6482e4 qt-x11-2.3.2.tar.gz 8978412
diff --git a/x11-libs/qt/files/digest-qt-3.3.3-r2 b/x11-libs/qt/files/digest-qt-3.3.3-r2
new file mode 100644
index 000000000000..caaa95d83463
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.3-r2
@@ -0,0 +1,3 @@
+MD5 3e0a0c8429b0a974b39b5f535ddff01c qt-x11-free-3.3.3.tar.bz2 14424812
+MD5 1053683f0d27854babc2a03db7360e23 qt-x11-immodule-unified-qt3.3.3-20040910.diff.gz 135277
+MD5 5ba58ddd3bf3d9c6f717b2366d1a5743 qt-3.3.3-darwin-fink.patch.gz 22581
diff --git a/x11-libs/qt/qt-2.3.2-r1.ebuild b/x11-libs/qt/qt-2.3.2-r1.ebuild
index be618a66daa9..1ebcce14f63e 100644
--- a/x11-libs/qt/qt-2.3.2-r1.ebuild
+++ b/x11-libs/qt/qt-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r1.ebuild,v 1.30 2004/10/25 17:29:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r1.ebuild,v 1.31 2005/01/08 10:36:27 eradicator Exp $
 
 DESCRIPTION="QT ${PV}, an X11 widget set and general library used by KDE et al"
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt/qt-2.3.2-r2.ebuild b/x11-libs/qt/qt-2.3.2-r2.ebuild
new file mode 100644
index 000000000000..06c2dd347e70
--- /dev/null
+++ b/x11-libs/qt/qt-2.3.2-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r2.ebuild,v 1.1 2005/01/08 10:36:27 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="QT ${PV}, an X11 widget set and general library used by KDE et al"
+HOMEPAGE="http://www.trolltech.com/"
+SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${PV}.tar.gz"
+
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="2"
+#KEYWORDS="x86 ppc sparc hppa alpha amd64 ia64"
+# -r2 is just the same as -r1 with multilib fixes
+KEYWORDS="~amd64 ~hppa ~sparc"
+IUSE="gif opengl nas debug"
+
+RDEPEND="virtual/x11
+	media-libs/libpng
+	media-libs/lcms
+	>=media-libs/libmng-1.0.0
+	>=media-libs/freetype-2
+	gif? ( media-libs/giflib
+		media-libs/libungif )
+	nas? ( >=media-libs/nas-1.4.1 )
+	opengl? ( virtual/opengl virtual/glu )"
+DEPEND="${RDEPEND}
+	sys-devel/gcc"
+
+QTBASE=/usr/qt/2
+export QTDIR=${S}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	chmod +w configure
+	cp configure configure.orig
+	sed -e "s:read acceptance:acceptance=yes:" configure.orig > configure
+
+	cd ${S}/configs
+	cp linux-g++-shared linux-g++-shared.orig
+	sed -e "s/SYSCONF_CXXFLAGS	/SYSCONF_CXXFLAGS = ${CXXFLAGS} \#/" \
+	-e "s/SYSCONF_CFLAGS	/SYSCONF_CFLAGS = ${CFLAGS} \#/" \
+	linux-g++-shared.orig > linux-g++-shared || die
+}
+
+src_compile() {
+	export LDFLAGS="$LDFLAGS -ldl"
+	local myconf
+
+	use opengl || myconf="$myconf -no-opengl"
+	use nas \
+		&& myconf="${myconf} -system-nas-sound" \
+		|| myconf="${myconf} -no-nas-sound"
+
+	use gif	&& myconf="${myconf} -gif"
+
+	use debug \
+		&& myconf="${myconf} -debug" \
+		|| myconf="${myconf} -release"
+
+	./configure \
+		-sm -thread -system-zlib -system-jpeg ${myconf} \
+		-system-libmng -system-libpng -gif -platform linux-g++ \
+		-ldl -lpthread -no-g++-exceptions -no-xft || die
+
+	make symlinks src-moc sub-src sub-tools || die
+}
+
+src_install() {
+	# binaries
+	into $QTBASE
+	dobin bin/*
+
+	# libraries
+	dolib.so lib/libqt.so.${PV} lib/libqt-mt.so.${PV} lib/libqutil.so.1.0.0
+	cd ${D}$QTBASE/$(get_libdir)
+	for x in libqt.so libqt-mt.so
+	do
+		ln -s $x.2.3.2 $x.2.3
+		ln -s $x.2.3 $x.2
+		ln -s $x.2 $x
+	done
+	ln -s libqutil.so.1.0.0 libqutil.so.1.0
+	ln -s libqutil.so.1.0 libqutil.so.1
+	ln -s libqutil.so.1 libqutil.so
+
+	# includes
+	cd ${S}
+	dodir ${QTBASE}/include
+	cp include/* ${D}/${QTBASE}/include/
+
+	# misc
+	insinto /etc/env.d
+	doins ${FILESDIR}/{50qt2,45qtdir2}
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:/usr/qt/2/${libdir}"
+	done
+	dosed "s~^LDPATH=.*$~LDPATH=${libdirs:1}~" /etc/env.d/50qt2
+}
diff --git a/x11-libs/qt/qt-3.2.3-r1.ebuild b/x11-libs/qt/qt-3.2.3-r1.ebuild
index c098a3fc6a28..e4022f9a3897 100644
--- a/x11-libs/qt/qt-3.2.3-r1.ebuild
+++ b/x11-libs/qt/qt-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.3-r1.ebuild,v 1.11 2004/12/02 12:07:42 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.3-r1.ebuild,v 1.12 2005/01/08 10:36:27 eradicator Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/x11-libs/qt/qt-3.3.1-r2.ebuild b/x11-libs/qt/qt-3.3.1-r2.ebuild
index 526834928f20..61ad364bd056 100644
--- a/x11-libs/qt/qt-3.3.1-r2.ebuild
+++ b/x11-libs/qt/qt-3.3.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.1-r2.ebuild,v 1.11 2004/10/25 17:29:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.1-r2.ebuild,v 1.12 2005/01/08 10:36:27 eradicator Exp $
 
 inherit eutils
 
diff --git a/x11-libs/qt/qt-3.3.2.ebuild b/x11-libs/qt/qt-3.3.2.ebuild
index 2e2aacee5d9a..d4f10493f28e 100644
--- a/x11-libs/qt/qt-3.3.2.ebuild
+++ b/x11-libs/qt/qt-3.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.2.ebuild,v 1.19 2004/10/25 17:29:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.2.ebuild,v 1.20 2005/01/08 10:36:27 eradicator Exp $
 
 inherit eutils
 
diff --git a/x11-libs/qt/qt-3.3.3-r1.ebuild b/x11-libs/qt/qt-3.3.3-r1.ebuild
index 9ff7a0464d7e..7e79afc3254d 100644
--- a/x11-libs/qt/qt-3.3.3-r1.ebuild
+++ b/x11-libs/qt/qt-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.8 2004/12/22 11:20:57 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.9 2005/01/08 10:36:27 eradicator Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/x11-libs/qt/qt-3.3.3-r2.ebuild b/x11-libs/qt/qt-3.3.3-r2.ebuild
new file mode 100644
index 000000000000..c18d1b01cb53
--- /dev/null
+++ b/x11-libs/qt/qt-3.3.3-r2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r2.ebuild,v 1.1 2005/01/08 10:36:27 eradicator Exp $
+
+inherit eutils flag-o-matic
+
+SRCTYPE="free"
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+
+IMMQT_P="qt-x11-immodule-unified-qt3.3.3-20040910"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
+	immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
+	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
+	ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )"
+
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="3"
+#KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~hppa ~mips ~ppc64 ~ia64 ~ppc-macos"
+#-r2 is the same as -r1 but with multilib fixes
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~sparc"
+IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
+
+DEPEND="virtual/x11 virtual/xft
+	media-libs/libpng media-libs/jpeg media-libs/libmng
+	>=media-libs/freetype-2
+	gif? ( media-libs/giflib media-libs/libungif )
+	nas? ( >=media-libs/nas-1.5 )
+	odbc? ( dev-db/unixODBC )
+	mysql? ( dev-db/mysql )
+	sqlite? ( =dev-db/sqlite-2* )
+	firebird? ( dev-db/firebird )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( dev-db/postgresql )
+	cups? ( net-print/cups )
+	zlib? ( sys-libs/zlib )
+	icc? ( dev-lang/icc )"
+
+# old immodules may cause segfaults on some qt applications,
+# especially qtconfig
+PDEPEND="!<=app-i18n/scim-qtimm-0.7
+	!<=app-i18n/uim-qt-0.1.7"
+
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+QTBASE=/usr/qt/3
+export QTDIR=${S}
+
+pkg_setup() {
+	if 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
+
+	if useq ppc-macos ; then
+		export PLATFORM=darwin-g++
+		export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
+		export INSTALL_ROOT=""
+	else
+		export PLATFORM=linux-g++
+		#use icc && export PLATFORM=linux-icc
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	export QTDIR=${S}
+	cd ${S}
+
+	cp configure configure.orig
+	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
+
+	epatch ${FILESDIR}/qt-no-rpath-uic.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
+		gzcat ${FILESDIR}/${P}-darwin-fink.patch.gz | sed -e "s:@QTBASE@:${QTBASE}:g" > ${T}/${P}-darwin-fink.patch
+		epatch ${T}/${P}-darwin-fink.patch
+	fi
+
+	cd mkspecs/${PLATFORM}
+	# 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}:" \
+		qmake.conf || die
+	cd ${S}
+}
+
+src_compile() {
+	export QTDIR=${S}
+	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"
+
+	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" || 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 odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
+	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-odbc -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 -lpthread -xft -platform ${PLATFORM} -xplatform \
+		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
+		-dlopen-opengl || die
+
+	export QTDIR=${S}
+
+	emake src-qmake src-moc sub-src || die
+	DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" \
+	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die
+}
+
+src_install() {
+	export QTDIR=${S}
+
+	# binaries
+	into $QTBASE
+	dobin bin/*
+
+	# 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.3 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.3->3.3->3->.so
+		ln -s libqt-mt.so.3.3.3 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.3 libqt.so.3.3.3
+		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
+
+	# 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}
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:/usr/qt/3/${libdir}"
+	done
+	dosed "s~^LDPATH=.*$~LDPATH=${libdirs:1}~" /etc/env.d/45qt3
+
+	dodir ${QTBASE}/tools/designer/templates
+	cd ${S}
+	cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates
+
+	dodir ${QTBASE}/translations
+	cd ${S}
+	cp translations/* ${D}/${QTBASE}/translations
+
+	dodir ${QTBASE}/etc
+	keepdir ${QTBASE}/etc/settings
+
+	dodir ${QTBASE}/doc
+
+	if use doc; then
+		cp -r ${S}/doc ${D}/${QTBASE}
+
+		cd ${S}/examples
+		find . -name Makefile | while read MAKEFILE
+		do
+			cp ${MAKEFILE} ${MAKEFILE}.old
+			sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE}
+			rm -f ${MAKEFILE}.old
+		done
+
+		cp -r ${S}/examples ${D}/${QTBASE}
+
+		cd ${S}/tutorial
+		find . -name Makefile | while read MAKEFILE
+		do
+			cp ${MAKEFILE} ${MAKEFILE}.old
+			sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE}
+			rm -f ${MAKEFILE}.old
+		done
+
+		cp -r ${S}/tutorial ${D}/${QTBASE}
+	fi
+
+	if use immqt || use immqt-bc ; then
+		dodoc ${S}/README.immodule
+	fi
+
+	# misc build reqs
+	dodir ${QTBASE}/mkspecs
+	cp -R ${S}/mkspecs/${PLATFORM} ${D}/${QTBASE}/mkspecs/
+
+	sed -e "s:${S}:${QTBASE}:g" \
+		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+
+	if use ppc-macos ; then
+		dosed "s:linux-g++:${PLATFORM}:" /etc/env.d/45qt3 \
+			"s:\$(QTBASE):\$(QTDIR):g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf \
+			"s:${S}:${QTBASE}:g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf ${QTBASE}/lib/libqt-mt.la || die
+	fi
+
+	# plugins
+	cd ${S}
+	plugins=`find plugins -name "lib*.so" -print`
+	for x in $plugins; do
+		insinto ${QTBASE}/`dirname $x`
+		doins $x
+	done
+}
diff --git a/x11-libs/qt/qt-3.3.3.ebuild b/x11-libs/qt/qt-3.3.3.ebuild
index 745ee2b4e8a5..5f7c59f70415 100644
--- a/x11-libs/qt/qt-3.3.3.ebuild
+++ b/x11-libs/qt/qt-3.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.18 2004/11/08 21:46:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.19 2005/01/08 10:36:27 eradicator Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild
index 3c7a81112548..67aa06fbabe3 100644
--- a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild
+++ b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.9 2004/12/31 01:47:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.10 2005/01/08 10:36:27 eradicator Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/x11-libs/qt/qt-4.0.0_beta1.ebuild b/x11-libs/qt/qt-4.0.0_beta1.ebuild
index 6d301ba1718a..51a28c9e7768 100644
--- a/x11-libs/qt/qt-4.0.0_beta1.ebuild
+++ b/x11-libs/qt/qt-4.0.0_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1.ebuild,v 1.1 2004/12/28 03:16:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1.ebuild,v 1.2 2005/01/08 10:36:27 eradicator Exp $
 
 inherit eutils flag-o-matic