Readding 4.0.1 so sparc will be happy :)

Package-Manager: portage-2.1.2_pre1

6 files changed, 227 insertions, 27 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 8d4aa9bff4d5..16b6264cee03 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,16 @@
 # 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.349 2006/09/20 18:47:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.350 2006/09/22 17:42:59 caleb Exp $
+
+*qt-4.0.1 (22 Sep 2006)
+
+  22 Sep 2006; Caleb Tennis <caleb@gentoo.org> qt-3.3.6-r1.ebuild,
+  qt-3.3.6-r2.ebuild, +qt-4.0.1.ebuild:
+  Readding 4.0.1 so sparc will be happy :)
+
+  22 Sep 2006; Caleb Tennis <caleb@gentoo.org> qt-3.3.6-r1.ebuild,
+  qt-3.3.6-r2.ebuild:
+  Fix icc compiler, bug #148211
 
 *qt-3.3.6-r2 (20 Sep 2006)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 0fcd2de2fdb0..c0d77c18a2f4 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,6 +1,3 @@
------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
@@ -89,20 +86,25 @@ DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a
 DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 SHA1 bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 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.0.1.tar.gz 20141717 RMD160 8a53a22c08ca5a31194bf5bc69cf86b7193dc95a SHA1 dcef02d681b0a9d6abacdc2a3f561e628b3ff8c8 SHA256 f52ff20671848bbfe34f5db493a60c1ef4e914b268237cba040418f31628dad6
 DIST qt-x11-opensource-src-4.1.4.tar.gz 32174985 RMD160 a7e8558f275751b1a6217827784c3b81f84d6d5f SHA1 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 SHA256 1687e40065023469fa308d47db6158a529ee42e740e38cb5c89e6f20ee68e59c
 DIST qt-x11-opensource-src-4.2.0-rc1.tar.gz 36935130 RMD160 03e8a54e170bf3be3c050833b56a6212bae50c6b SHA1 ea9bbd56b3f3cd6e921f0d495ce46877d9400754 SHA256 061c6071064bc635f783523c6d25138a21683cc14b7564645ab80d51c476248c
 EBUILD qt-3.3.4-r8.ebuild 10573 RMD160 9660a11866e6b0bf4203ceb777659201c3e7fcef SHA1 ce65fadc6e904bf74ae629c26838331e6eb95820 SHA256 c2925fcdea720e7ead24a5bf6b2e7b3a085872270002f9622a38f7aefccd75b7
 MD5 877a3cc6c39fccd65c18afffe30bf899 qt-3.3.4-r8.ebuild 10573
 RMD160 9660a11866e6b0bf4203ceb777659201c3e7fcef qt-3.3.4-r8.ebuild 10573
 SHA256 c2925fcdea720e7ead24a5bf6b2e7b3a085872270002f9622a38f7aefccd75b7 qt-3.3.4-r8.ebuild 10573
-EBUILD qt-3.3.6-r1.ebuild 11023 RMD160 c5b20312ede50c9b78d9d6d16ec99e1f9e2d2794 SHA1 50e45969ea670af6d722c5db39926dff550359d0 SHA256 7524658092111b7a0ee8196f98e134fdf88b7369de2256a75054240e6748c48d
-MD5 1d3a6ed017477163656b657483c3e47a qt-3.3.6-r1.ebuild 11023
-RMD160 c5b20312ede50c9b78d9d6d16ec99e1f9e2d2794 qt-3.3.6-r1.ebuild 11023
-SHA256 7524658092111b7a0ee8196f98e134fdf88b7369de2256a75054240e6748c48d qt-3.3.6-r1.ebuild 11023
-EBUILD qt-3.3.6-r2.ebuild 11033 RMD160 2e7c0c8819eeb2b8532e1e675dd0ac42f20ec03c SHA1 422fa6107eb1b04fbae3784128b9483e32b75055 SHA256 83736936205dd0edc4c8df6f85d75b770d4a6ea117d88232c107a48844006e1b
-MD5 4d7097e128b86df7edc5410e30d43687 qt-3.3.6-r2.ebuild 11033
-RMD160 2e7c0c8819eeb2b8532e1e675dd0ac42f20ec03c qt-3.3.6-r2.ebuild 11033
-SHA256 83736936205dd0edc4c8df6f85d75b770d4a6ea117d88232c107a48844006e1b qt-3.3.6-r2.ebuild 11033
+EBUILD qt-3.3.6-r1.ebuild 11024 RMD160 907c8e4e7ebf1aa3dce8e024c45cd06cb1fbc232 SHA1 1a7beb82d41ca8a43ce6bba72cc136003726273d SHA256 19cf7af728daa6354cbe1bd86639fa4a43439cf8b23999e7045e4d1103a524ba
+MD5 b664fe3b9b8adf6b76abf9517cd2555b qt-3.3.6-r1.ebuild 11024
+RMD160 907c8e4e7ebf1aa3dce8e024c45cd06cb1fbc232 qt-3.3.6-r1.ebuild 11024
+SHA256 19cf7af728daa6354cbe1bd86639fa4a43439cf8b23999e7045e4d1103a524ba qt-3.3.6-r1.ebuild 11024
+EBUILD qt-3.3.6-r2.ebuild 11030 RMD160 96ef54995aa8c578984fd403d14aeeb0135de7fd SHA1 63602f1d1d93fd6500971522447d3442ba1d95e6 SHA256 67c00045cde56109b63024292d1aeabc28cf18f5a47a6f552895fc56c66741ce
+MD5 2cb9557db030664fa57ea0b9bfe01336 qt-3.3.6-r2.ebuild 11030
+RMD160 96ef54995aa8c578984fd403d14aeeb0135de7fd qt-3.3.6-r2.ebuild 11030
+SHA256 67c00045cde56109b63024292d1aeabc28cf18f5a47a6f552895fc56c66741ce qt-3.3.6-r2.ebuild 11030
+EBUILD qt-4.0.1.ebuild 5932 RMD160 8f84953c5ea4b376012531f295c24b767bb1bcc4 SHA1 6654c84bad2cbcb11995421a563f02e2ee276f39 SHA256 1a17eedccf3118fba09ce154a4209927adc780b8ba91d37607ada9f8903381bf
+MD5 acd92f9a9f1d37fcd7a4b744e5d5a88d qt-4.0.1.ebuild 5932
+RMD160 8f84953c5ea4b376012531f295c24b767bb1bcc4 qt-4.0.1.ebuild 5932
+SHA256 1a17eedccf3118fba09ce154a4209927adc780b8ba91d37607ada9f8903381bf qt-4.0.1.ebuild 5932
 EBUILD qt-4.1.4.ebuild 6752 RMD160 77709d3a7c72a3a64e2e46b44164ed1ad3fe04d0 SHA1 f8ea73ec0352d39827fac91a4d697d652a0c5fe0 SHA256 149481eae2815f9e65922d72026b096299f19368a3f1af0704d6dacc0eb9bb3e
 MD5 69c90c718544b9afaea468265802b111 qt-4.1.4.ebuild 6752
 RMD160 77709d3a7c72a3a64e2e46b44164ed1ad3fe04d0 qt-4.1.4.ebuild 6752
@@ -111,10 +113,10 @@ EBUILD qt-4.2.0_rc1.ebuild 6706 RMD160 f4fa747c12eaf38ff31c51ab749cad93ca521fb8
 MD5 427399b875cf9a84de35c3faee3b757b qt-4.2.0_rc1.ebuild 6706
 RMD160 f4fa747c12eaf38ff31c51ab749cad93ca521fb8 qt-4.2.0_rc1.ebuild 6706
 SHA256 0ea021121d7d43ae3a07c1c551f49cd4b9ecf76d12e93462ff23182f04a21253 qt-4.2.0_rc1.ebuild 6706
-MISC ChangeLog 14981 RMD160 29af60b0acc416ccb2d19bd286bf46fc20a2d70e SHA1 fd59d1771852ff8e2f4af97b0a72b0188b0195f6 SHA256 b3e602eb8da58c6175c4334ce21d3212059734ba6b1f57291bdf127735d41a09
-MD5 8a487b112e0a7a9589c7057d73ab2951 ChangeLog 14981
-RMD160 29af60b0acc416ccb2d19bd286bf46fc20a2d70e ChangeLog 14981
-SHA256 b3e602eb8da58c6175c4334ce21d3212059734ba6b1f57291bdf127735d41a09 ChangeLog 14981
+MISC ChangeLog 15275 RMD160 524bdb2722044d4e6a6a84d4f73f693c474ed0ba SHA1 aabfa4671be7d318e723560e0016a6ba5afc1557 SHA256 f3b9eafd3852f139c096846b958fc71f38fe4fdf8ab54b2fbb082bb3edcf9b82
+MD5 457f1ae08d7a9c27e64aadbab5b2bfdc ChangeLog 15275
+RMD160 524bdb2722044d4e6a6a84d4f73f693c474ed0ba ChangeLog 15275
+SHA256 f3b9eafd3852f139c096846b958fc71f38fe4fdf8ab54b2fbb082bb3edcf9b82 ChangeLog 15275
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -128,16 +130,12 @@ SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/di
 MD5 cb9c5c7f7299bdac934aa277f9760be4 files/digest-qt-3.3.6-r2 611
 RMD160 51c1e6017e264628589e4dbcdb7ec8de8227bb79 files/digest-qt-3.3.6-r2 611
 SHA256 f0db2f527947c400fd2407bedb02a4463e0baa0c448fe35bffe46d2de070a1f0 files/digest-qt-3.3.6-r2 611
+MD5 5eb6bb64b8317c80bc0329c305360051 files/digest-qt-4.0.1 289
+RMD160 0c60b1444c62cf8510092270b70c35d9a7e2e6a2 files/digest-qt-4.0.1 289
+SHA256 7011458697a6b1bac72f600a9cfb16250ced3738fa0a6bc15fef3321ce2c6fe1 files/digest-qt-4.0.1 289
 MD5 b9b9bc9b7b1b1958eb7763599b4e0855 files/digest-qt-4.1.4 289
 RMD160 4556fe65639da69c4df58db22e9fa1e31415a8bb files/digest-qt-4.1.4 289
 SHA256 69249cbc9d21c3f1b247fb5f3b0bbf222ae2b506786f73f636a6506bd421cb26 files/digest-qt-4.1.4 289
 MD5 ea1cb36339ecc7954be532597c153c79 files/digest-qt-4.2.0_rc1 301
 RMD160 b055b1a3cfaee416de3d615c8b6fff1c9f150b61 files/digest-qt-4.2.0_rc1 301
 SHA256 2ec5ae0152c97cf52bf9a42854f2c202f97b1bf4b3f72c14e30bbd98f2f7352b files/digest-qt-4.2.0_rc1 301
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFEYzUAiZjviIA2XgRAk5hAJ9EHoYBsVX9K+LhkoBBMJEiHALddACfbux4
-oBVkchWeWWW8zAY0XuVqZIM=
-=dkzi
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/digest-qt-4.0.1 b/x11-libs/qt/files/digest-qt-4.0.1
new file mode 100644
index 000000000000..40b192924350
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.0.1
@@ -0,0 +1,3 @@
+MD5 2db4a4d797d37d0605b776420327503a qt-x11-opensource-src-4.0.1.tar.gz 20141717
+RMD160 8a53a22c08ca5a31194bf5bc69cf86b7193dc95a qt-x11-opensource-src-4.0.1.tar.gz 20141717
+SHA256 f52ff20671848bbfe34f5db493a60c1ef4e914b268237cba040418f31628dad6 qt-x11-opensource-src-4.0.1.tar.gz 20141717
diff --git a/x11-libs/qt/qt-3.3.6-r1.ebuild b/x11-libs/qt/qt-3.3.6-r1.ebuild
index 8abeffd48c02..c787c7246272 100644
--- a/x11-libs/qt/qt-3.3.6-r1.ebuild
+++ b/x11-libs/qt/qt-3.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.12 2006/08/23 12:39:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r1.ebuild,v 1.13 2006/09/22 17:42:59 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -68,7 +68,7 @@ pkg_setup() {
 	CXX=$(tc-getCXX)
 	if [[ ${CXX/g++/} != ${CXX} ]]; then
 		PLATCXX="g++"
-	elif [[ ${CXX/icc/} != ${CXX} ]]; then
+	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
 		PLATCXX="icc"
 	else
 		die "Unknown compiler ${CXX}."
diff --git a/x11-libs/qt/qt-3.3.6-r2.ebuild b/x11-libs/qt/qt-3.3.6-r2.ebuild
index 80cf688c86cb..ac8a9050aca6 100644
--- a/x11-libs/qt/qt-3.3.6-r2.ebuild
+++ b/x11-libs/qt/qt-3.3.6-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.1 2006/09/20 18:47:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6-r2.ebuild,v 1.2 2006/09/22 17:42:59 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -69,7 +69,7 @@ pkg_setup() {
 	if [[ ${CXX/g++/} != ${CXX} ]]; then
 		PLATCXX="g++"
 	elif [[ ${CXX/icc/} != ${CXX} ]]; then
-		PLATCXX="icc"
+		PLATCXX="icpc"
 	else
 		die "Unknown compiler ${CXX}."
 	fi
diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild
new file mode 100644
index 000000000000..167b33a12d7b
--- /dev/null
+++ b/x11-libs/qt/qt-4.0.1.ebuild
@@ -0,0 +1,189 @@
+# 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-4.0.1.ebuild,v 1.18 2006/09/22 17:42:59 caleb Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+SRCTYPE="opensource-src"
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
+HOMEPAGE="http://www.trolltech.com/"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+SLOT="4"
+KEYWORDS="~sparc"
+IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"
+
+DEPEND="|| ( ( x11-libs/libXrandr
+			x11-libs/libXcursor
+			x11-libs/libXi
+			x11-libs/libXfont
+			x11-libs/libSM
+			x11-proto/xextproto
+			x11-proto/inputproto
+			xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
+		)
+		virtual/x11
+	)
+	virtual/xft
+	>=media-libs/freetype-2
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	mng? ( media-libs/libmng )
+	nas? ( >=media-libs/nas-1.5 )
+	odbc? ( dev-db/unixODBC )
+	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 )"
+
+pkg_setup() {
+	QTBASEDIR=/usr/$(get_libdir)/qt4
+	QTPREFIXDIR=/usr/$(get_libdir)/qt4
+	QTBINDIR=/usr/bin
+	QTLIBDIR=/usr/$(get_libdir)/qt4
+	QTDATADIR=/usr/share/doc/${PF}
+	QTDOCDIR=${QTDATADIR}/doc
+	QTHEADERDIR=/usr/include/qt4
+	QTPLUGINDIR=${QTLIBDIR}/plugins
+	QTSYSCONFDIR=/etc/qt4
+	QTTRANSDIR=${QTDATADIR}/translations
+	QTEXAMPLESDIR=${QTDATADIR}/examples
+	QTDEMOSDIR=${QTDATADIR}/demos
+
+	PLATFORM=$(qt_mkspecs_dir)
+}
+
+qt_use() {
+	useq ${1} && echo "-${1}" || echo "-no-${1}"
+	return 0
+}
+
+qt_mkspecs_dir() {
+	# Allows us to define which mkspecs dir we want to use.  Currently we only use
+	# linux-g++ or linux-g++-64, but others could be used for various platforms.
+
+	if [[ $(get_libdir) == "lib" ]]; then
+		echo "linux-g++"
+	else
+		echo "linux-g++-64"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	sed -i -e 's:read acceptance:acceptance=yes:' configure
+
+	cd mkspecs/$(qt_mkspecs_dir)
+	# set c/xxflags and ldflags
+
+	# Don't let the user go too overboard with flags.  If you really want to, uncomment
+	# out the line below and give 'er a whirl.
+	strip-flags
+	replace-flags -O3 -O2
+
+	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
+
+	# Do not link with -rpath. See bug #75181.
+	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" \
+		qmake.conf
+	cd ${S}
+
+	epatch ${FILESDIR}/qt4-nomkdir.patch
+
+	if [[ "$(gcc-major-version)" == "4" ]]; then
+		einfo "Visibility support: auto"
+	else
+		einfo "Visibility support: disabled"
+		sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
+	fi
+}
+
+src_compile() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+
+	myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
+	myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
+
+	use nas		&& myconf="${myconf} -system-nas-sound"
+	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
+	use png		&& myconf="${myconf} -system-libpng" || myconf="${myconf} -qt-libpng"
+	use jpeg	&& myconf="${myconf} -system-libjpeg" || myconf="${myconf} -qt-libjpeg"
+	use debug	&& myconf="${myconf} -debug-and-release" || myconf="${myconf} -release"
+	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
+
+	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
+	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql"
+	use firebird	&& myconf="${myconf} -plugin-sql-ibase" || 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"
+
+	myconf="${myconf} -tablet -xrender -xrandr -xkb -xshape -sm"
+
+	./configure -stl -verbose -largefile \
+		-platform ${PLATFORM} -xplatform ${PLATFORM} \
+		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
+		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
+		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
+		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die
+
+	emake sub-tools-all-ordered || die
+	if use examples; then
+		emake sub-examples-all-ordered || die
+	fi
+}
+
+src_install() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
+
+	if use examples; then
+		make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
+		make INSTALL_ROOT=${D} sub-demos-install_subtargets || die
+	fi
+
+	make INSTALL_ROOT=${D} install_qmake || die
+	make INSTALL_ROOT=${D} install_mkspecs || die
+
+	if use doc; then
+		make INSTALL_ROOT=${D} install_htmldocs || die
+	fi
+
+	# The QtAssistant header files aren't installed..not sure why
+	cp -pPR ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
+
+	keepdir "${QTSYSCONFDIR}"
+
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:/usr/${libdir}/qt4"
+	done
+
+	cat > "${T}/44qt4" << EOF
+PATH=${QTBINDIR}
+ROOTPATH=${QTBINDIR}
+LDPATH=${libdirs:1}
+QMAKESPEC=$(qt_mkspecs_dir)
+EOF
+	doenvd "${T}/44qt4"
+}