remove old versions

Package-Manager: portage-2.1_pre4-r1

6 files changed, 8 insertions, 405 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 06422382eb13..199a71dee46f 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.287 2006/02/22 18:00:12 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.288 2006/02/22 18:01:28 caleb Exp $
+
+  22 Feb 2006; Caleb Tennis <caleb@gentoo.org> -qt-4.0.1.ebuild,
+  -qt-4.1.0.ebuild:
+  remove old versions
 
 *qt-4.1.1 (22 Feb 2006)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 2f43e4cd7028..727048c1fc4b 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,6 +1,6 @@
-MD5 c5ed3f832b63f24655d66856dfb66f9f ChangeLog 6414
-RMD160 6a75bb2ef46d7433d5f31e549ae0ef67a25ef44a ChangeLog 6414
-SHA256 ab23eb064077b114fa7bbeff0f497ae86bfea06fe0399acd0c075296536c6f23 ChangeLog 6414
+MD5 5343f40bc26723e2c85a715a5f6e381a ChangeLog 6522
+RMD160 acb5b43a121b7ef6a3352ef407690487a0b27763 ChangeLog 6522
+SHA256 3c79e6df634bf8a541a43f869b8e7ce9e857629c3fe416efc7cf35df6dec1d2e ChangeLog 6522
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
 SHA256 b8c330553cce93475913494a241d6a27fe07bc1b8ef880b9c565342efa7857e1 files/0001-dnd_optimization.patch 5623
@@ -19,12 +19,6 @@ SHA256 6af5ac8b3384495dbaa0278866c733a7f5b958ac411c9997c46fed542fed59dc files/di
 MD5 7c3ccffe55767c77fab3a32c5bb296ac files/digest-qt-3.3.5 166
 RMD160 6d3678c168aae913795068852cad6e3e8cd14782 files/digest-qt-3.3.5 166
 SHA256 9be93d987e2b0efd7ebf4bbfe5bf4e262ec2f808d1d0fdf3c1bf1efd89f1e7a6 files/digest-qt-3.3.5 166
-MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81
-RMD160 73b1a8a9a50e73e6774260d60fc74edd205a2a28 files/digest-qt-4.0.1 81
-SHA256 fdbfe87abad72bb5884f229ed954cb32de87c1a5ffc93ab7c47e71c0201da766 files/digest-qt-4.0.1 81
-MD5 fa53e425bec204779eaa1d7b79705f74 files/digest-qt-4.1.0 81
-RMD160 8cccc49ae11ec6a6a2321407e4e83974ecb48cd2 files/digest-qt-4.1.0 81
-SHA256 978ae137f1276ae9af1ca77fad93c55465907b29c0c37d2f52a5c50600745e3b files/digest-qt-4.1.0 81
 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
@@ -82,18 +76,12 @@ SHA256 3042a116b1340cff4e70e3c9d338adb1bc962dc19790e3dce65ca9c82c54aeff qt-3.3.4
 MD5 9751150bfb0d625193e04b9747d9f40a qt-3.3.5.ebuild 10443
 RMD160 f10c1bd26c4f1ffd70a8291729c1f121196708ca qt-3.3.5.ebuild 10443
 SHA256 50ee04ec2094d747764aab3af9ca45e20ea19b129c6963e85765f79bf78b9905 qt-3.3.5.ebuild 10443
-MD5 b3c513259a35a93f7887b52ce29fdd16 qt-4.0.1.ebuild 5950
-RMD160 0377de84d4151e0d667aa4d62f830ffdf172da55 qt-4.0.1.ebuild 5950
-SHA256 e4398b7f0471b8b2d99d1449012d0fde5c97f5f1ce83f909a76c70ff249bed6d qt-4.0.1.ebuild 5950
 MD5 d2603f63c8272769089394a4f2ef8e37 qt-4.1.0-r1.ebuild 6259
 RMD160 c285258c72255415d73bdf0c73aefc3c14bf3725 qt-4.1.0-r1.ebuild 6259
 SHA256 3cb16cf9927dd59274859605bb484bc8c9b1746c2e49bb76c443a4204455a30d qt-4.1.0-r1.ebuild 6259
 MD5 a04ae47c7787c6585983cbdac19eaf90 qt-4.1.0-r2.ebuild 6451
 RMD160 161b17ad35f5878e247ae8dd14f25131aa0253e3 qt-4.1.0-r2.ebuild 6451
 SHA256 12afba544cd95d5be5caf7ab0cd634e7e74ed1deb5967e3c1f3af1c0f09a8ec6 qt-4.1.0-r2.ebuild 6451
-MD5 646d36bb71f8b40f3f91ee8bed5e059a qt-4.1.0.ebuild 6251
-RMD160 c3505d4340126afc04dbb73a57b4257b87f9a0a0 qt-4.1.0.ebuild 6251
-SHA256 ddcea23ccd022c0c80ca37f58a6c60b8819f774ed589153632d5344e8ce0a475 qt-4.1.0.ebuild 6251
 MD5 ad0699c74c5b1c044a317f3a09c241cf qt-4.1.1.ebuild 6342
 RMD160 c8c98afa8cb3888d09398f58f5d05689f8ffc87f qt-4.1.1.ebuild 6342
 SHA256 6d88b761991ab0c2605fc6eb4e1cddd014de3a21db44691fd0ed4642b84e18b5 qt-4.1.1.ebuild 6342
diff --git a/x11-libs/qt/files/digest-qt-4.0.1 b/x11-libs/qt/files/digest-qt-4.0.1
deleted file mode 100644
index bc1cd358b7a6..000000000000
--- a/x11-libs/qt/files/digest-qt-4.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2db4a4d797d37d0605b776420327503a qt-x11-opensource-src-4.0.1.tar.gz 20141717
diff --git a/x11-libs/qt/files/digest-qt-4.1.0 b/x11-libs/qt/files/digest-qt-4.1.0
deleted file mode 100644
index 87b17979288a..000000000000
--- a/x11-libs/qt/files/digest-qt-4.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e3982a54f56b6420d3062b20524410a qt-x11-opensource-src-4.1.0.tar.gz 25634393
diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild
deleted file mode 100644
index d0c2ae49ea2c..000000000000
--- a/x11-libs/qt/qt-4.0.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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.16 2006/01/13 12:56:28 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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-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"
-}
diff --git a/x11-libs/qt/qt-4.1.0.ebuild b/x11-libs/qt/qt-4.1.0.ebuild
deleted file mode 100644
index ba352dc99ff3..000000000000
--- a/x11-libs/qt/qt-4.1.0.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# 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.1.0.ebuild,v 1.3 2006/01/03 12:12:06 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/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="-*"
-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-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/libpq )
-	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
-	QTPCDIR=/usr/$(get_libdir)/pkgconfig
-	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
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" qmake.conf
-
-	cd ${S}
-	epatch ${FILESDIR}/qt4-nomkdir.patch
-	epatch ${FILESDIR}/qt-4.1.0-configure-no-mysql.diff
-	epatch ${FILESDIR}/qt-4.1.0-debug-and-release.diff
-
-	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
-
-	# Move .pc files into the pkgconfig directory
-	dodir ${QTPCDIR}
-	mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR}
-
-	# 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"
-}