Latest snapshot

Package-Manager: portage-2.0.51.22-r1

10 files changed, 46 insertions, 452 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index e71637e0dfa6..4df393f8b8ae 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.229 2005/06/18 12:31:32 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.230 2005/06/20 20:01:59 caleb Exp $
+
+*qt-4.0.0_rc1-r3 (20 Jun 2005)
+
+  20 Jun 2005; Caleb Tennis <caleb@gentoo.org> -files/qt4b2r3_nomkdir.patch,
+  -qt-4.0.0_beta2-r3.ebuild, -qt-4.0.0_rc1.ebuild, -qt-4.0.0_rc1-r2.ebuild,
+  +qt-4.0.0_rc1-r3.ebuild:
+  Newest snapshot
 
 *qt-3.3.4-r5 (18 Jun 2005)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 5803167eaaf6..765cf17c576a 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,42 +1,37 @@
+MD5 016c3e144c65ab89a45ffff611a9da54 qt-3.3.4-r3.ebuild 8950
 MD5 88875c77c2482de25169850cfc19faf5 qt-3.3.3-r1.ebuild 7987
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 d9f916370f1950762a23b8f04dd22232 qt-4.0.0_rc1.ebuild 6125
-MD5 e5e1f28d1973386abc7d593bd7330d62 qt-3.3.4-r4.ebuild 9306
+MD5 3775ebac71f6df7674c3f01e5e5bcc0d qt-4.0.0_rc1-r3.ebuild 6066
 MD5 97fed8fbf48cf5353098d6f736d01383 qt-3.3.4-r5.ebuild 9088
-MD5 016c3e144c65ab89a45ffff611a9da54 qt-3.3.4-r3.ebuild 8950
-MD5 296d844b1aebc379dc3ea8e972cdde95 ChangeLog 38077
-MD5 32ad8d8bffefcdf4d7885199b7c55890 qt-4.0.0_beta2-r3.ebuild 5983
-MD5 75ce8582791a0d174df19da9843fafb9 qt-4.0.0_rc1-r2.ebuild 6711
 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4rc1_nomkdir.patch 866
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r4 166
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
+MD5 e5e1f28d1973386abc7d593bd7330d62 qt-3.3.4-r4.ebuild 9306
+MD5 8a33e8e8b0c67ee09a499a3b9c97f7a6 ChangeLog 38307
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
-MD5 bed89221628547eb8f12da37622493e0 files/digest-qt-4.0.0_rc1 90
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
-MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
+MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
+MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 e8aa618af5aad24e1925959fd2c6acd5 files/digest-qt-4.0.0_rc1-r3 104
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
-MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
 MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
-MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r5 166
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r4 166
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r5 166
+MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
 MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 99d57476c4605ca076db91f8f086a326 files/digest-qt-4.0.0_beta2-r3 100
-MD5 efa1381655dae2c9afb77ac85fa6ef09 files/digest-qt-4.0.0_rc1-r2 104
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
-MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
+MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
 MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
-MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
 MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4b2r3_nomkdir.patch 866
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
+MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4rc1_nomkdir.patch 866
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
+MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
+MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_beta2-r3 b/x11-libs/qt/files/digest-qt-4.0.0_beta2-r3
deleted file mode 100644
index 7992977d7bd1..000000000000
--- a/x11-libs/qt/files/digest-qt-4.0.0_beta2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a38e0644e9dd38bbb06b87f22e68fb60 qt-x11-opensource-4.0.0-rc1-snapshot-20050603.tar.bz2 15510110
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_rc1 b/x11-libs/qt/files/digest-qt-4.0.0_rc1
deleted file mode 100644
index f48da9c018ee..000000000000
--- a/x11-libs/qt/files/digest-qt-4.0.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7f48c9f7de7fd93a414e45ef691ebea qt-x11-opensource-desktop-4.0.0-rc1.tar.bz2 15465019
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_rc1-r2 b/x11-libs/qt/files/digest-qt-4.0.0_rc1-r2
deleted file mode 100644
index 74ac15e2b867..000000000000
--- a/x11-libs/qt/files/digest-qt-4.0.0_rc1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 225f36f33cffc54772bc6282a322676d qt-x11-opensource-desktop-4.0.0-snapshot-20050616.tar.bz2 15587263
diff --git a/x11-libs/qt/files/digest-qt-4.0.0_rc1-r3 b/x11-libs/qt/files/digest-qt-4.0.0_rc1-r3
new file mode 100644
index 000000000000..4ef65517c56d
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-4.0.0_rc1-r3
@@ -0,0 +1 @@
+MD5 324cb375b974cbbd472f3dc247d7893f qt-x11-opensource-desktop-4.0.0-snapshot-20050620.tar.bz2 15655155
diff --git a/x11-libs/qt/files/qt4b2r3_nomkdir.patch b/x11-libs/qt/files/qt4b2r3_nomkdir.patch
deleted file mode 100644
index 97ba71085e5a..000000000000
--- a/x11-libs/qt/files/qt4b2r3_nomkdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2005-06-03 13:38:58.316152040 -0500
-+++ configure	2005-06-03 13:39:36.673320864 -0500
-@@ -1071,16 +1071,6 @@
- [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations #default
- QT_INSTALL_TRANSLATIONS=`$relpath/config.tests/unix/makeabs "$QT_INSTALL_TRANSLATIONS"`
- 
--#settings
--if [ "$PLATFORM_MAC" = "yes" ]; then
--   [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=/Library/Preferences/Qt #default
--else
--   [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS=/etc/xdg #default
--fi
--if mkdir -p "$QT_INSTALL_SETTINGS" >/dev/null 2>&1; then
--  QT_INSTALL_SETTINGS=`(cd "$QT_INSTALL_SETTINGS"; /bin/pwd)` #absolute
--fi
--
- #examples
- [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES=$QT_INSTALL_PREFIX/examples #default
- QT_INSTALL_EXAMPLES=`$relpath/config.tests/unix/makeabs "$QT_INSTALL_EXAMPLES"`
diff --git a/x11-libs/qt/qt-4.0.0_beta2-r3.ebuild b/x11-libs/qt/qt-4.0.0_beta2-r3.ebuild
deleted file mode 100644
index edd562a5d614..000000000000
--- a/x11-libs/qt/qt-4.0.0_beta2-r3.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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_beta2-r3.ebuild,v 1.3 2005/06/04 12:18:48 caleb Exp $
-
-inherit eutils flag-o-matic
-
-SRCTYPE="opensource"
-SNAPSHOT="20050603"
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/snapshots/qt-x11-${SRCTYPE}-${PV/_beta2/-rc1}-snapshot-${SNAPSHOT}.tar.bz2"
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="-*"
-IUSE="accessibility cups debug doc examples firebird gif ipv6 jpeg mng mysql nas nis odbc opengl postgres png sqlite xinerama zlib"
-
-DEPEND="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 )"
-
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_beta2/-rc1}-snapshot-${SNAPSHOT}
-
-pkg_setup() {
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=${S}
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTDOCDIR=/usr/share/qt4/doc
-	QTDATADIR=/usr/share/qt4
-	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=/usr/$(get_libdir)/qt4/plugins
-	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=/usr/share/qt4/translations
-
-	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}
-
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
-	cd mkspecs/$(qt_mkspecs_dir)
-	# set c/xxflags and ldflags
-	strip-flags
-
-	# Qt4 moc does not work with -O3, unfortunately.
-	replace-flags -O3 -O2
-	filter-flags -finline-functions
-
-	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
-	cd ${S}
-
-	epatch ${FILESDIR}/qt4-rpath.patch
-	epatch ${FILESDIR}/qt4b2r3_nomkdir.patch
-
-	sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
-}
-
-src_compile() {
-	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	# Fixes for 89704
-	export LC_ALL=C
-	export LANG=C
-
-	# Let's just allow writing to these directories during Qt emerge
-	# as it makes Qt much happier.
-	addwrite "${QTBASE}/etc/settings"
-	addwrite "$HOME/.qt"
-
-	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" || 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} ${myconf} || die
-
-	emake sub-tools-all-ordered || die
-}
-
-src_install() {
-	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	# make INSTALL_ROOT=${D} sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered || die
-	# make INSTALL_ROOT=${D} install_qmake sub-tools-install_subtargets-ordered || die
-	# Using install_qmake forces lots of other things to build.  Bypass it for now.
-
-	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
-	if use examples; then
-		dodir ${QTDATADIR}/examples
-		cp -a ${S}/examples/* ${D}/${QTDATADIR}/examples
-		dodir ${QTDATADIR}/demos
-		cp -a ${S}/demos/* ${D}/${QTDATADIR}/demos
-	fi
-
-	#install -c ${S}/bin/qmake ${D}${QTBINDIR}/qmake
-	make INSTALL_ROOT=${D} install_qmake || die
-	make INSTALL_ROOT=${D} install_mkspecs || die
-
-	# Fix symlink
-	cd ${D}/${QTDATADIR}/mkspecs
-	rm default
-	ln -s $(qt_mkspecs_dir) default
-	cd ${S}
-
-	if use doc; then
-		make INSTALL_ROOT=${D} install_htmldocs || die
-	fi
-
-	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}/pkgconfig/*.pc
-	sed -i -e "s:${S}:${QTBASEDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
-
-	# Don't need to install stray linguist files
-	rm -rf ${D}/${DATADIR}/phrasebooks/linguist
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-	cat > ${D}/etc/env.d/44qt4 << EOF
-PATH=${QTBINDIR}
-ROOTPATH=${QTBINDIR}
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-}
diff --git a/x11-libs/qt/qt-4.0.0_rc1-r2.ebuild b/x11-libs/qt/qt-4.0.0_rc1-r3.ebuild
index 77341bcd6592..90cdc4d050ef 100644
--- a/x11-libs/qt/qt-4.0.0_rc1-r2.ebuild
+++ b/x11-libs/qt/qt-4.0.0_rc1-r3.ebuild
@@ -1,11 +1,11 @@
 # 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_rc1-r2.ebuild,v 1.1 2005/06/16 15:52:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_rc1-r3.ebuild,v 1.1 2005/06/20 20:01:59 caleb Exp $
 
 inherit eutils flag-o-matic
 
 SRCTYPE="opensource-desktop"
-SNAPSHOT="20050616"
+SNAPSHOT="20050620"
 #SNAPSHOT=""
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
@@ -144,27 +144,21 @@ src_install() {
 	export PATH="${S}/bin:${PATH}"
 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
-	# make INSTALL_ROOT=${D} sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered || die
-	# make INSTALL_ROOT=${D} install_qmake sub-tools-install_subtargets-ordered || die
-	# Using install_qmake forces lots of other things to build.  Bypass it for now.
-
 	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
+
 	if use examples; then
-		make INSTALL_ROOT=${D} sub-examples-install_subtargets
-		# dodir ${QTDATADIR}/examples
-		# cp -a ${S}/examples/* ${D}/${QTDATADIR}/examples
-		# dodir ${QTDATADIR}/demos
-		# cp -a ${S}/demos/* ${D}/${QTDATADIR}/demos
+		make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
 	fi
 
 	make INSTALL_ROOT=${D} install_qmake || die
 	make INSTALL_ROOT=${D} install_mkspecs || die
 
-	# The QtDesigner and QtAssistant header files aren't installed..not sure why
-	#cp -a ${S}/include/QtDesigner ${D}/${QTHEADERDIR}/QtDesigner
-	#rm -rf ${D}/${QTHEADERDIR}/QtDesigner/private
+	if use doc; then
+		make INSTALL_ROOT=${D} install_htmldocs || die
+	fi
 
-	#cp -a ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
+	# The QtAssistant header files aren't installed..not sure why
+	cp -a ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
 
 	# Fix symlink
 	cd ${D}/${QTDATADIR}/mkspecs
@@ -174,17 +168,10 @@ src_install() {
 
 	mkdir -p ${D}/${QTSYSCONFDIR}
 
-	if use doc; then
-		make INSTALL_ROOT=${D} install_htmldocs || die
-	fi
-
-	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}/pkgconfig/*.pc
-	sed -i -e "s:${S}:${QTBASEDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
-
-	# Don't need to install stray linguist files
-	rm -rf ${D}/${DATADIR}/phrasebooks/linguist
+	#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}/pkgconfig/*.pc
+	#sed -i -e "s:${S}:${QTBASEDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
 
 	# List all the multilib libdirs
 	local libdirs
diff --git a/x11-libs/qt/qt-4.0.0_rc1.ebuild b/x11-libs/qt/qt-4.0.0_rc1.ebuild
deleted file mode 100644
index aed2ea224b4d..000000000000
--- a/x11-libs/qt/qt-4.0.0_rc1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# 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_rc1.ebuild,v 1.3 2005/06/14 18:48:48 caleb Exp $
-
-inherit eutils flag-o-matic
-
-SRCTYPE="opensource-desktop"
-#SNAPSHOT="20050603"
-SNAPSHOT=""
-DESCRIPTION="QT version ${PV}"
-HOMEPAGE="http://www.trolltech.com/"
-
-#SRC_URI="ftp://ftp.trolltech.com/qt/snapshots/qt-x11-${SRCTYPE}-${PV}-snapshot-${SNAPSHOT}.tar.bz2"
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV/_rc1/-rc1}.tar.bz2"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV/_rc1/-rc1}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="-*"
-IUSE="accessibility cups debug doc examples firebird gif ipv6 jpeg mng mysql nas nis odbc opengl postgres png sqlite xinerama zlib"
-
-DEPEND="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=${S}
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTDOCDIR=/usr/share/qt4/doc
-	QTDATADIR=/usr/share/qt4
-	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=/usr/$(get_libdir)/qt4/plugins
-	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=/usr/share/qt4/translations
-
-	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}
-
-	cp configure configure.orig
-	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
-
-	cd mkspecs/$(qt_mkspecs_dir)
-	# set c/xxflags and ldflags
-	strip-flags
-
-	# Qt4 moc does not work with -O3, unfortunately.
-	replace-flags -O3 -O2
-	filter-flags -finline-functions
-
-	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
-	cd ${S}
-
-	epatch ${FILESDIR}/qt4-rpath.patch
-	epatch ${FILESDIR}/qt4b2r3_nomkdir.patch
-
-	sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
-}
-
-src_compile() {
-	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	# Fixes for 89704
-	export LC_ALL=C
-	export LANG=C
-
-	# Let's just allow writing to these directories during Qt emerge
-	# as it makes Qt much happier.
-	# addwrite "${QTBASE}/etc/settings"
-	# addwrite "$HOME/.qt"
-
-	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} ${myconf} || die
-
-	emake sub-tools-all-ordered || die
-}
-
-src_install() {
-	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	# make INSTALL_ROOT=${D} sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered || die
-	# make INSTALL_ROOT=${D} install_qmake sub-tools-install_subtargets-ordered || die
-	# Using install_qmake forces lots of other things to build.  Bypass it for now.
-
-	make INSTALL_ROOT=${D} sub-tools-install_subtargets-ordered || die
-	if use examples; then
-		dodir ${QTDATADIR}/examples
-		cp -a ${S}/examples/* ${D}/${QTDATADIR}/examples
-		dodir ${QTDATADIR}/demos
-		cp -a ${S}/demos/* ${D}/${QTDATADIR}/demos
-	fi
-
-	#install -c ${S}/bin/qmake ${D}${QTBINDIR}/qmake
-	make INSTALL_ROOT=${D} install_qmake || die
-	make INSTALL_ROOT=${D} install_mkspecs || die
-
-	# Fix symlink
-	cd ${D}/${QTDATADIR}/mkspecs
-	rm default
-	ln -s $(qt_mkspecs_dir) default
-	cd ${S}
-
-	mkdir -p ${D}/${QTSYSCONFDIR}
-
-	if use doc; then
-		make INSTALL_ROOT=${D} install_htmldocs || die
-	fi
-
-	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}/pkgconfig/*.pc
-	sed -i -e "s:${S}:${QTBASEDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
-
-	# Don't need to install stray linguist files
-	rm -rf ${D}/${DATADIR}/phrasebooks/linguist
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-
-	mkdir -p ${D}/etc/env.d
-
-	cat > ${D}/etc/env.d/44qt4 << EOF
-PATH=${QTBINDIR}
-ROOTPATH=${QTBINDIR}
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-}