Old.

Package-Manager: portage-2.1.5

30 files changed, 70 insertions, 1401 deletions

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 5a4881d48de3..8d3267b84dd3 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.5 2008/05/15 12:43:23 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.6 2008/05/16 09:24:17 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-assistant-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-assistant-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-assistant/qt-assistant-4.4.0_rc1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.4.0_rc1.ebuild
deleted file mode 100644
index 4a2467e1856e..000000000000
--- a/x11-libs/qt-assistant/qt-assistant-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.0_rc1.ebuild,v 1.8 2008/04/10 13:39:18 ingmar Exp $
-
-inherit qt4-build
-
-DESCRIPTION="The assistant help module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="~x11-libs/qt-gui-${PV}
-	~x11-libs/qt-sql-${PV}"
-RDEPEND="${DEPEND}"
-
-# Pixeltool isn't really assistant related, but it relies on
-# the assistant libraries.
-QT4_TARGET_DIRECTORIES="tools/assistant tools/pixeltool"
-QT4_EXTRACT_DIRECTORIES="
-src/3rdparty/clucene/
-tools/shared/fontpanel"
-
-pkg_setup() {
-	qt4-build_pkg_setup
-
-	if ! built_with_use x11-libs/qt-sql sqlite; then
-		die "You must first emerge x11-libs/qt-sql with the \"sqlite\" use flag in order to use qt-assistant"
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-xmlpatterns -no-freetype -no-libtiff  -no-accessibility -no-fontconfig
-		-no-glib -no-opengl -no-qt3support -no-svg"
-
-	qt4-build_src_compile
-}
-
-src_install() {
-	qt4-build_src_install
-	domenu "${FILESDIR}"/assistant.desktop
-	use doc && dohtml -r doc/html/*
-}
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 750b3611207e..3251baf0e47d 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.5 2008/05/15 12:44:00 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.6 2008/05/16 09:25:01 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-core-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-core-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
deleted file mode 100644
index 071aed6dbdd1..000000000000
--- a/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v 1.13 2008/04/10 13:39:48 ingmar Exp $
-
-EAPI="1"
-inherit qt4-build
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc glib +qt3support ssl"
-
-RDEPEND="sys-libs/zlib
-	glib? ( dev-libs/glib )
-	ssl? ( dev-libs/openssl )
-	!<=x11-libs/qt-4.4.0_alpha:${SLOT}"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-QT4_TARGET_DIRECTORIES="
-src/tools/moc/
-src/tools/rcc/
-src/tools/uic/
-src/corelib/
-src/xml/
-src/network/
-src/plugins/codecs/"
-QT4_EXTRACT_DIRECTORIES="
-include/Qt/
-include/QtCore/
-include/QtNetwork/
-include/QtScript/
-include/QtXml/
-src/plugins/plugins.pro
-src/plugins/qpluginbase.pri
-src/src.pro
-src/3rdparty/des/
-src/3rdparty/harfbuzz/
-src/3rdparty/md4/
-src/3rdparty/md5/
-src/3rdparty/sha1/
-src/script/
-translations/"
-
-pkg_setup() {
-	qt4-build_pkg_setup
-
-	if has_version x11-libs/qt-core; then
-		# Check to see if they've changed the glib flag since the last time installing this package.
-
-		if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
-			ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
-			ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
-		elif ! use glib && built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
-			ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
-			ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
-		fi
-
-		# Check to see if they've changed the qt3support flag since the last time installing this package.
-		# If so, give a list of packages they need to uninstall first.
-
-		if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then
-			local need_to_remove
-			ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
-			for x in sql opengl gui qt3support; do
-				local pkg="x11-libs/qt-${x}"
-				if has_version $pkg; then
-					need_to_remove="${need_to_remove} ${pkg}"
-				fi
-			done
-			if [[ -n ${need_to_remove} ]]; then
-				die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
-			fi
-		elif ! use qt3support && built_with_use x11-libs/qt-core qt3support; then
-			local need_to_remove
-			ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
-			for x in sql opengl gui qt3support; do
-				local pkg="x11-libs/qt-${x}"
-				if has_version $pkg; then
-					need_to_remove="${need_to_remove} ${pkg}"
-				fi
-			done
-			if [[ -n ${need_to_remove} ]]; then
-				die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
-			fi
-		fi
-	fi
-}
-
-src_unpack() {
-	use doc && QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES}
-		doc/
-		tools/qdoc3/"
-
-	qt4-build_src_unpack
-}
-
-src_compile() {
-	unset QMAKESPEC
-	local myconf
-
-	myconf="${myconf}
-		$(qt_use glib)
-		$(qt_use ssl openssl)
-		$(qt_use qt3support)"
-
-	myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
-		-no-freetype -no-libtiff  -no-accessibility -no-fontconfig -no-opengl
-		-no-svg"
-
-	if ! use doc; then
-		myconf="${myconf} -nomake docs"
-	fi
-
-	qt4-build_src_compile
-}
-
-src_install() {
-	dobin "${S}"/bin/{qmake,moc,rcc,uic} || die "dobin failed."
-
-	install_directories src/{corelib,xml,network,plugins/codecs}
-
-	emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
-
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed."
-	fi
-
-	emake INSTALL_ROOT="${D}" install_translations || die "emake install_translations failed"
-
-	fix_library_files
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-
-	cat <<-EOF > "${T}/44qt4"
-	LDPATH=${libdirs:1}
-	EOF
-	doenvd "${T}/44qt4"
-
-	dodir /${QTDATADIR}/mkspecs/gentoo
-	mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo || \
-		die "Failed to move qconfig.pri"
-
-	sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
-		"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
-		"${D}${QTHEADERDIR}"/Qt/qconfig.h || die "sed for qconfig.h failed."
-
-	if use glib; then
-		QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
-		$(use ssl && echo QT_OPENSSL)"
-		install_qconfigs
-	fi
-
-	keepdir "${QTSYSCONFDIR}"
-}
diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index da9785de056d..34173ccb82fd 100644
--- a/x11-libs/qt-dbus/ChangeLog
+++ b/x11-libs/qt-dbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-dbus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.5 2008/05/15 12:44:36 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.6 2008/05/16 09:25:41 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-dbus-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-dbus-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
deleted file mode 100644
index 47ee38855b3a..000000000000
--- a/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.8 2008/04/10 13:40:18 ingmar Exp $
-
-inherit qt4-build
-
-DESCRIPTION="The DBus module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# depend on gui instead of core.  There's a GUI based viewer that's built, and since it's a desktop
-# protocol I don't know if there's value trying to derive it out into a core build
-# The library itself, however, only depends on core and xml
-DEPEND="~x11-libs/qt-core-${PV}
-	>=sys-apps/dbus-1.0.2"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-src/dbus
-tools/qdbus/qdbus
-tools/qdbus/qdbusxml2cpp
-tools/qdbus/qdbuscpp2xml"
-QCONFIG_ADD="dbus dbus-linked"
-QCONFIG_DEFINE="QT_DBUS"
-
-#FIXME: Check if these are still needed with the header package
-QT4_EXTRACT_DIRECTORIES="
-include/Qt/
-include/QtCore/
-include/QtDBus/
-src/corelib/global/
-src/corelib/io/
-src/corelib/kernel/
-src/corelib/thread/
-src/corelib/tools/
-"
-
-src_compile() {
-	local myconf
-	myconf="${myconf} -dbus-linked"
-
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 3d8b9404c680..d4f33a372061 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.5 2008/05/15 12:45:33 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.6 2008/05/16 09:26:27 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-gui-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-gui-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild b/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild
deleted file mode 100644
index 585750103974..000000000000
--- a/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild,v 1.11 2008/04/10 13:40:47 ingmar Exp $
-
-EAPI="1"
-inherit eutils qt4-build
-
-DESCRIPTION="The GUI module(s) for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES="input_devices_wacom"
-IUSE="+accessibility cups dbus debug glib mng nas nis tiff +qt3support xinerama ${IUSE_INPUT_DEVICES}"
-
-RDEPEND="
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfont
-	x11-libs/libSM
-	~x11-libs/qt-core-${PV}
-	~x11-libs/qt-script-${PV}
-	cups? ( net-print/cups )
-	dbus? ( ~x11-libs/qt-dbus-${PV} )
-	input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )
-	mng? ( >=media-libs/libmng-1.0.9 )
-	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/inputproto"
-
-QT4_TARGET_DIRECTORIES="
-src/gui
-tools/designer
-tools/linguist
-src/plugins/imageformats/gif
-src/plugins/imageformats/ico
-src/plugins/imageformats/jpeg"
-QT4_EXTRACT_DIRECTORIES="
-src/tools/rcc/
-tools/shared/"
-
-pkg_setup() {
-	use glib && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
-		~x11-libs/qt-core-${PV} glib"
-	use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
-		~x11-libs/qt-core-${PV} qt3support"
-
-	qt4-build_pkg_setup
-}
-
-src_unpack() {
-	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
-	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
-
-	qt4-build_src_unpack
-
-	# Don't build plugins this go around, because they depend on qt3support lib
-	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
-}
-
-src_compile() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	local myconf
-	myconf="$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use glib)
-		$(qt_use input_devices_wacom tablet)
-		$(qt_use mng libmng system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use qdbus)
-		$(qt_use qt3support)
-		$(qt_use xinerama)"
-
-	use nas	&& myconf="${myconf} -system-nas-sound"
-
-	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-xrender -xrandr -xkb -xshape -sm  -no-svg"
-
-	# Explictly don't compile these packages.
-	# Emerge "qt-webkit", "qt-phonon", etc for their functionality.
-	myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl"
-
-	qt4-build_src_compile
-}
-
-src_install() {
-	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
-		$(use input_devices_wacom && echo tablet) $(usev accessibility)
-		$(usev xinerama) $(usev cups) $(usev nas) gif png system-png system-jpeg
-		$(use mng && echo system-mng) $(use tiff && echo system-tiff)"
-	QCONFIG_REMOVE="no-gif no-png"
-	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-	$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
-	$(use mng && echo QT_IMAGEFORMAT_MNG) $(use nas && echo QT_NAS)
-	$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
-	$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
-	$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
-	qt4-build_src_install
-
-	domenu "${FILESDIR}"/{Designer,Linguist}.desktop
-}
diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog
index a39106986c35..bd4d8f071fa8 100644
--- a/x11-libs/qt-opengl/ChangeLog
+++ b/x11-libs/qt-opengl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-opengl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.5 2008/05/15 12:46:09 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.6 2008/05/16 09:27:09 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-opengl-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-opengl-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild b/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
deleted file mode 100644
index cb3aed10f846..000000000000
--- a/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.9 2008/04/10 13:41:17 ingmar Exp $
-
-EAPI="1"
-inherit qt4-build
-
-DESCRIPTION="The OpenGL module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="+qt3support"
-
-DEPEND="~x11-libs/qt-gui-${PV}
-	virtual/opengl
-	virtual/glu"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/opengl"
-QCONFIG_ADD="opengl"
-QCONFIG_DEFINE="QT_OPENGL"
-
-pkg_setup() {
-	use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
-		~x11-libs/qt-core-${PV} qt3support"
-	qt4-build_pkg_setup
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} -opengl
-		$(qt_use qt3support)"
-
-	# Not building tools/designer/src/plugins/tools/view3d as it's commented out of the build in the source
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog
index 479c2cc97f94..7074d4e941eb 100644
--- a/x11-libs/qt-phonon/ChangeLog
+++ b/x11-libs/qt-phonon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-phonon
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.5 2008/05/15 12:46:45 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.6 2008/05/16 09:27:51 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-phonon-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-phonon-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild
deleted file mode 100644
index e72369151411..000000000000
--- a/x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild,v 1.8 2008/04/10 13:41:46 ingmar Exp $
-
-inherit qt4-build
-
-DESCRIPTION="The Phonon module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-DEPEND="~x11-libs/qt-gui-${PV}
-	media-libs/gstreamer
-	media-libs/gst-plugins-base
-	dbus? ( =x11-libs/qt-dbus-${PV} )"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-src/phonon
-src/plugins/phonon"
-QT4_EXTRACT_DIRECTORIES="
-src/3rdparty/kdelibs/phonon/
-src/3rdparty/kdebase/runtime/phonon/"
-QCONFIG_ADD="phonon"
-QCONFIG_DEFINE="QT_GSTREAMER"
-
-src_compile() {
-	local myconf
-	myconf="${myconf} -phonon -no-opengl -no-svg
-		$(qt_use dbus qdbus)"
-
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog
index 84c967f16c81..99e15074d763 100644
--- a/x11-libs/qt-qt3support/ChangeLog
+++ b/x11-libs/qt-qt3support/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-qt3support
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.5 2008/05/15 12:47:21 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.6 2008/05/16 09:28:33 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-qt3support-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-qt3support-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
deleted file mode 100644
index 67dd1259c1c7..000000000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.14 2008/04/10 13:42:15 ingmar Exp $
-
-EAPI="1"
-inherit qt4-build
-
-DESCRIPTION="The Qt3 support module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="+accessibility"
-
-DEPEND="~x11-libs/qt-gui-${PV}
-	~x11-libs/qt-sql-${PV}"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-src/qt3support
-src/tools/uic3
-tools/designer/src/plugins/widgets
-tools/qtconfig
-tools/porting"
-QT4_EXTRACT_DIRECTORIES="
-src/tools/uic/
-"
-
-pkg_setup() {
-	QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
-		~x11-libs/qt-core-${PV} qt3support
-		~x11-libs/qt-gui-${PV} qt3support
-		~x11-libs/qt-sql-${PV} qt3support"
-	use accessibility && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
-		~x11-libs/qt-gui-${PV} accessibility"
-
-	qt4-build_pkg_setup
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} -qt3support -no-gstreamer -no-phonon
-		$(qt_use accessibility)"
-
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index 2b75cad65643..b7dbc3663b6f 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-script
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.5 2008/05/15 12:47:56 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.6 2008/05/16 09:29:16 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-script-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-script-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild b/x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild
deleted file mode 100644
index b64b8c24f6b6..000000000000
--- a/x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild,v 1.6 2008/04/10 13:42:44 ingmar Exp $
-
-inherit qt4-build
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/script/"
-QT4_EXTRACT_DIRECTORIES="
-include/Qt/
-include/QtCore/
-include/QtScript/
-src/corelib/global/
-src/corelib/kernel/
-src/corelib/plugin/"
-
-src_compile() {
-	local myconf
-	myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
-		-no-fontconfig -no-glib -no-opengl -no-svg"
-
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index e6665d791151..c104a424e67d 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-sql
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.6 2008/05/15 12:48:32 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.7 2008/05/16 09:29:59 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-sql-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-sql-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild b/x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild
deleted file mode 100644
index d3775dc3c1da..000000000000
--- a/x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild,v 1.7 2008/04/10 13:43:13 ingmar Exp $
-
-EAPI="1"
-inherit qt4-build
-
-DESCRIPTION="The SQL module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="firebird mysql odbc postgres +qt3support +sqlite"
-
-DEPEND="
-	~x11-libs/qt-core-${PV}
-	firebird? ( dev-db/firebird )
-	sqlite? ( dev-db/sqlite:3 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/libpq
-		dev-db/postgresql )
-	odbc? ( dev-db/unixODBC )"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers"
-
-pkg_setup() {
-	if ! (use firebird || use mysql || use odbc || use postgres || use sqlite); then
-		ewarn "You need to enable at least one SQL driver. Enable at least"
-		ewarn "one of these USE flags: \"firebird mysql odbc postgres sqlite\""
-		die "Enable at least one SQL driver."
-	fi
-
-	use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
-		~x11-libs/qt-core-${PV} qt3support"
-
-	qt4-build_pkg_setup
-}
-
-src_compile() {
-	local myconf
-	# Don't support sqlite2 anymore
-	myconf="${myconf} -no-sql-sqlite2
-		$(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I/usr/include/mysql -L/usr/$(get_libdir)/mysql ")
-		$(qt_use postgres sql-psql plugin) $(use postgres && echo "-I/usr/include/postgresql/pgsql ")
-		$(qt_use sqlite sql-sqlite plugin) $(qt_use sqlite system-sqlite)
-		$(qt_use odbc sql-odbc plugin)
-		$(qt_use qt3support)"
-
-	myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-xmlpatterns -no-freetype -no-libtiff  -no-accessibility -no-fontconfig
-		-no-glib -no-opengl -no-svg"
-
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog
index 81d77080835d..2153c00d0202 100644
--- a/x11-libs/qt-svg/ChangeLog
+++ b/x11-libs/qt-svg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-svg
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.5 2008/05/15 12:49:07 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.6 2008/05/16 09:30:41 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-svg-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-svg-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild b/x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild
deleted file mode 100644
index c38ba570fc76..000000000000
--- a/x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild,v 1.6 2008/04/10 13:43:42 ingmar Exp $
-
-inherit qt4-build
-
-DESCRIPTION="The SVG module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~x11-libs/qt-gui-${PV}"
-RDEPEND="${DEPEND}"
-
-QCONFIG_ADD="svg"
-QCONFIG_DEFINE="QT_SVG"
-QT4_TARGET_DIRECTORIES="
-src/svg
-src/plugins/imageformats/svg
-src/plugins/iconengines/svgiconengine"
-
-src_compile() {
-	local myconf
-	myconf="${myconf} -svg -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
-		-no-fontconfig -no-glib -no-opengl"
-
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog
index 3c32b6da1881..44d8baf9796c 100644
--- a/x11-libs/qt-test/ChangeLog
+++ b/x11-libs/qt-test/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-test
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.5 2008/05/15 12:49:46 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.6 2008/05/16 09:31:23 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-test-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-test-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild b/x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild
deleted file mode 100644
index f1de015fcd69..000000000000
--- a/x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild,v 1.5 2008/04/10 13:44:11 ingmar Exp $
-
-inherit qt4-build
-
-DESCRIPTION="The testing framework module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/testlib"
-
-src_compile() {
-	local myconf
-	myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
-		-no-fontconfig -no-glib -no-opengl -no-svg"
-
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 6c25e6f5daf3..cf83029acf13 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.5 2008/05/15 12:50:21 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.6 2008/05/16 09:32:05 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-webkit-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-webkit-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild
deleted file mode 100644
index 716cbfea4b72..000000000000
--- a/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild,v 1.10 2008/04/10 13:44:40 ingmar Exp $
-
-inherit qt4-build
-
-DESCRIPTION="The Webkit module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~x11-libs/qt-gui-${PV}"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"
-QT4_EXTRACT_DIRECTORIES="src/3rdparty/webkit src/3rdparty/sqlite"
-QCONFIG_ADD="webkit"
-QCONFIG_DEFINE="QT_WEBKIT"
-
-src_compile() {
-	local myconf
-	myconf="${myconf} -webkit"
-
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog
index fcf4515af718..0b47806bafe8 100644
--- a/x11-libs/qt-xmlpatterns/ChangeLog
+++ b/x11-libs/qt-xmlpatterns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-xmlpatterns
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.5 2008/05/15 12:50:54 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.6 2008/05/16 09:32:47 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-xmlpatterns-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-xmlpatterns-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild
deleted file mode 100644
index 50c8d7112d2d..000000000000
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild,v 1.5 2008/04/10 13:45:09 ingmar Exp $
-
-inherit qt4-build
-
-DESCRIPTION="The patternist module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns"
-QCONFIG_ADD="xmlpatterns"
-QCONFIG_DEFINE="QT_XMLPATTERNS"
-
-src_compile() {
-	local myconf
-	myconf="${myconf} -xmlpatterns"
-
-	qt4-build_src_compile
-}
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index f3f6f94c3f9c..2e3482a883f8 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.537 2008/05/15 12:40:50 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.538 2008/05/16 09:25:01 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org> -qt-3.3.4-r8.ebuild,
+  -qt-4.3.2-r1.ebuild, -qt-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-4.4.0 (15 May 2008)
 
diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild
deleted file mode 100644
index fc312b2017ca..000000000000
--- a/x11-libs/qt/qt-3.3.4-r8.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.29 2008/02/23 15:42:39 ingmar Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SRCTYPE="free"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-IMMQT_P="qt-x11-immodule-unified-qt3.3.4-20041203"
-
-SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
-	immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
-	immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )"
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-
-SLOT="3"
-KEYWORDS="amd64 ~mips x86"
-IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc"
-
-RDEPEND="x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libSM
-	xinerama? ( x11-libs/libXinerama )
-	virtual/xft
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/libmng
-	=media-libs/freetype-2.1*
-	nas? ( >=media-libs/nas-1.5 )
-	opengl? ( virtual/opengl virtual/glu )
-	mysql? ( virtual/mysql )
-	firebird? ( dev-db/firebird )
-	postgres? ( dev-db/postgresql )
-	cups? ( net-print/cups )"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )"
-PDEPEND="odbc? ( ~dev-db/qt-unixODBC-${PV} )"
-
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-
-QTBASE=/usr/qt/3
-
-pkg_setup() {
-	if use immqt && use immqt-bc ; then
-		ewarn
-		ewarn "immqt and immqt-bc are exclusive. You cannot set both."
-		ewarn "Please specify either immqt or immqt-bc."
-		ewarn
-		die
-	elif 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
-
-	export QTDIR=${S}
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		PLATCXX="g++"
-	elif [[ ${CXX/icc/} != ${CXX} ]]; then
-		PLATCXX="icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	if use kernel_linux; then
-		PLATNAME="linux"
-	elif use kernel_FreeBSD && use elibc_FreeBSD; then
-		PLATNAME="freebsd"
-	elif use kernel_Darwin && use elibc_Darwin; then
-		PLATNAME="darwin"
-	else
-		die "Unknown platform."
-	fi
-
-	# probably this should be '*-64' for 64bit archs
-	# in a fully multilib environment (no compatibility symlinks)
-	export PLATFORM="${PLATNAME}-${PLATCXX}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i -e 's:read acceptance:acceptance=yes:' configure
-
-	# Do not link with -rpath. See bug #75181.
-	find ${S}/mkspecs -name qmake.conf | xargs \
-		sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
-
-	# fix freeze caused by bad interaction with kde klipper (kde bug 80072)
-	epatch ${FILESDIR}/${P}-qclipboard-hack.patch
-
-	# KDE related patches
-	epatch ${FILESDIR}/0001-dnd_optimization.patch
-	epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
-	epatch ${FILESDIR}/0037-dnd-timestamp-fix.patch
-	epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
-	epatch ${FILESDIR}/${P}-0051-qtoolbar_77047.patch
-	epatch ${FILESDIR}/${P}-0047-fix-kmenu-widget.diff
-
-	# patches for gcc4
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${FILESDIR}/${P}-gcc4-volatile.patch"
-
-	# patch for ulibc (bug #100246)
-	epatch "${FILESDIR}/qt-ulibc.patch"
-
-	if use immqt || use immqt-bc ; then
-		epatch ../${IMMQT_P}.diff
-		epatch ${FILESDIR}/${P}-immodule-focus.patch
-		sh make-symlinks.sh || die "make symlinks failed"
-	fi
-
-	# known working flags wrt #77623
-	use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
-	# set c/xxflags and ldflags
-	strip-flags
-
-	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
-		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
-		append-flags -fno-stack-protector
-	fi
-
-	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}:" \
-		${S}/mkspecs/${PLATFORM}/qmake.conf || die
-
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e "s:/lib$:/$(get_libdir):" \
-			${S}/mkspecs/${PLATFORM}/qmake.conf || die
-	fi
-}
-
-src_compile() {
-	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"
-
-	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
-	# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
-	use nas		&& myconf="${myconf} -system-nas-sound"
-	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
-	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/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 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"
-	myconf="${myconf} -system-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-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 -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
-		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die
-
-	emake src-qmake src-moc sub-src || die
-
-	export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	emake sub-tools || die
-
-	if use examples; then
-		emake sub-tutorial sub-examples || die
-	fi
-
-	# Make the msg2qm utility (not made by default)
-	cd ${S}/tools/msg2qm
-	../../bin/qmake
-	emake
-
-	# Make the qembed utility (not made by default)
-	cd ${S}/tools/qembed
-	../../bin/qmake
-	emake
-
-}
-
-src_install() {
-	# binaries
-	into ${QTBASE}
-	dobin bin/*
-	dobin tools/msg2qm/msg2qm
-	dobin tools/qembed/qembed
-
-	# 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.so lib/lib{editor,qassistantclient,designercore}.a
-		dolib.so lib/libqt-mt.la
-		dolib.so lib/libqt-mt.so.3.3.4 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.4->3.3->3->.so
-		ln -s libqt-mt.so.3.3.4 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.4 libqt.so.3.3.4
-		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
-
-	# plugins
-	cd ${S}
-	local plugins=$(find plugins -name "lib*.so" -print)
-	for x in ${plugins}; do
-		exeinto ${QTBASE}/$(dirname ${x})
-		doexe ${x}
-	done
-
-	# Past this point just needs to be done once
-	is_final_abi || return 0
-
-	# includes
-	cd ${S}
-	dodir ${QTBASE}/include/private
-	cp include/* ${D}/${QTBASE}/include/
-	cp include/private/* ${D}/${QTBASE}/include/private/
-
-	# prl files
-	sed -i -e "s:${S}:${QTBASE}:g" ${S}/lib/*.prl
-	insinto ${QTBASE}/$(get_libdir)
-	doins ${S}/lib/*.prl
-
-	# pkg-config file
-	insinto ${QTBASE}/$(get_libdir)/pkgconfig
-	doins ${S}/lib/*.pc
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${QTBASE}/${libdir}"
-	done
-
-	# environment variables
-	if use ppc-macos; then
-		cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-DYLD_LIBRARY_PATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-EOF
-	else
-		cat <<EOF > ${T}/45qt3
-PATH=${QTBASE}/bin
-ROOTPATH=${QTBASE}/bin
-LDPATH=${libdirs:1}
-QMAKESPEC=${PLATFORM}
-MANPATH=${QTBASE}/doc/man
-EOF
-	fi
-	cat <<EOF > ${T}/50qtdir3
-QTDIR=${QTBASE}
-EOF
-
-	cat <<EOF > ${T}/50-qt3-revdep
-SEARCH_DIRS="${QTBASE}"
-EOF
-
-	doenvd ${T}/45qt3 ${T}/50qtdir3
-
-	insinto /etc/revdep-rebuild
-	doins ${T}/50-qt3-revdep
-
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
-	fi
-
-	insinto ${QTBASE}/tools/designer
-	doins -r tools/designer/templates
-
-	insinto ${QTBASE}
-	doins -r translations
-
-	keepdir ${QTBASE}/etc/settings
-
-	if use doc; then
-		insinto ${QTBASE}
-		doins -r ${S}/doc
-	fi
-
-	if use examples; then
-		find ${S}/examples ${S}/tutorial -name Makefile | \
-			xargs sed -i -e "s:${S}:${QTBASE}:g"
-
-		cp -r ${S}/examples ${D}${QTBASE}/
-		cp -r ${S}/tutorial ${D}${QTBASE}/
-	fi
-
-	# misc build reqs
-	insinto ${QTBASE}/mkspecs
-	doins -r ${S}/mkspecs/${PLATFORM}
-
-	sed -e "s:${S}:${QTBASE}:g" \
-		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
-
-	dodoc FAQ README README-QT.TXT changes*
-	if use immqt || use immqt-bc ; then
-		dodoc ${S}/README.immodule
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "After a rebuild of Qt, it can happen that Qt plugins (such as Qt/KDE styles,"
-	elog "or widgets for the Qt designer) are no longer recognized.  If this situation"
-	elog "occurs you should recompile the packages providing these plugins,"
-	elog "and you should also make sure that Qt and its plugins were compiled with the"
-	elog "same version of gcc.  Packages that may need to be rebuilt are, for instance,"
-	elog "kde-base/kdelibs, kde-base/kdeartwork and kde-base/kdeartwork-styles."
-	elog "See http://doc.trolltech.com/3.3/plugins-howto.html for more infos."
-	echo
-}
diff --git a/x11-libs/qt/qt-4.3.2-r1.ebuild b/x11-libs/qt/qt-4.3.2-r1.ebuild
deleted file mode 100644
index 01b545f94c46..000000000000
--- a/x11-libs/qt/qt-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2-r1.ebuild,v 1.9 2008/03/11 16:51:15 ingmar 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="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-IUSE_INPUT_DEVICES="input_devices_wacom"
-
-IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}"
-
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfont
-	x11-libs/libSM
-	!x11-libs/qt-core
-	xinerama? ( x11-libs/libXinerama )
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	mng? ( >=media-libs/libmng-1.0.9 )
-	tiff? ( media-libs/tiff )
-	nas? ( >=media-libs/nas-1.5 )
-	odbc? ( dev-db/unixODBC )
-	mysql? ( virtual/mysql )
-	firebird? ( dev-db/firebird )
-	sqlite3? ( =dev-db/sqlite-3* )
-	sqlite? ( =dev-db/sqlite-2* )
-	opengl? ( virtual/opengl virtual/glu )
-	postgres? ( dev-db/libpq )
-	cups? ( net-print/cups )
-	zlib? ( sys-libs/zlib )
-	glib? ( dev-libs/glib )
-	dbus? ( >=sys-apps/dbus-1.0.2 )
-	ssl? ( dev-libs/openssl )
-	input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )"
-
-DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/inputproto
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=/usr
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTPCDIR=/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=/usr/share/qt4
-	QTDOCDIR=/usr/share/doc/${PF}
-	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() {
-	local flag="$1"
-	local feature="$1"
-	local enableval=
-
-	[[ -n $2 ]] && feature=$2
-	[[ -n $3 ]] && enableval="-$3"
-
-	useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}"
-	return 0
-}
-
-qt_mkspecs_dir() {
-	 # Allows us to define which mkspecs dir we want to use.
-	local spec
-
-	case ${CHOST} in
-		*-freebsd*|*-dragonfly*)
-			spec="freebsd" ;;
-		*-openbsd*)
-			spec="openbsd" ;;
-		*-netbsd*)
-			spec="netbsd" ;;
-		*-darwin*)
-			spec="darwin" ;;
-		*-linux-*|*-linux)
-			spec="linux" ;;
-		*)
-			die "Unknown CHOST, no platform choosed."
-	esac
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		spec="${spec}-g++"
-	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-		spec="${spec}-icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	echo "${spec}"
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch
-
-	epatch "${FILESDIR}"/qsslsocket-fix.patch
-
-	cd "${S}"/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
-
-	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
-		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
-		append-flags -fno-stack-protector
-	fi
-
-	# Bug 178652
-	if [[ $(gcc-major-version) == "3" ]] && use amd64; then
-		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
-		append-flags -fno-gcse
-	fi
-
-	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}:" \
-		-e "/CONFIG/s:$: nostrip:" \
-		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
-
-	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
-	# separately as well.
-	cd "${S}"/mkspecs/common
-
-	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		g++.conf
-
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
-
-	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
-	sed -i -e "s:X11R6/::" linux.conf
-
-	cd "${S}"/qmake
-
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
-	-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix
-
-	cd "${S}"
-
-}
-
-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)"
-
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" != "4" ]]; then
-		myconf="${myconf} -no-reduce-exports"
-	fi
-
-	# Add a switch that will attempt to use recent binutils to reduce relocations.  Should be harmless for other
-	# cases.  From bug #178535
-	myconf="${myconf} -reduce-relocations"
-
-	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"
-
-	myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)"
-	myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)"
-	myconf="${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng system)"
-
-	use debug	&& myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-
-	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 -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase"
-	use sqlite3	&& myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2"
-	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
-	use dbus	&& myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
-	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
-	use qt3support		&& myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
-	use ssl		&& myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl"
-
-	use pch		&& myconf="${myconf} -pch" || myconf="${myconf} -no-pch"
-
-	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
-	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
-
-	if ! use examples; then
-		myconf="${myconf} -nomake examples"
-	fi
-
-	myconf="-stl -verbose -largefile -confirm-license \
-		-platform ${PLATFORM} -xplatform ${PLATFORM} -no-rpath \
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
-		-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
-		-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
-		-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	emake all || die
-}
-
-src_install() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	emake INSTALL_ROOT="${D}" install_subtargets || die
-	emake INSTALL_ROOT="${D}" install_qmake || die
-	emake INSTALL_ROOT="${D}" install_mkspecs || die
-
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs || die
-	fi
-
-	# Install the translations.	 This may get use flagged later somehow
-	emake INSTALL_ROOT="${D}" install_translations || die
-
-	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}/pkgconfig/*.pc
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
-	sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
-	# Move .pc files into the pkgconfig directory
-	dodir ${QTPCDIR}
-	mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
-
-	# Install .desktop files, from bug #174033
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/qt4/*.desktop
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
-	done
-
-	cat > "${T}/44qt4" << EOF
-LDPATH=${libdirs:1}
-QMAKESPEC=$(qt_mkspecs_dir)
-EOF
-	doenvd "${T}/44qt4"
-}
diff --git a/x11-libs/qt/qt-4.4.0_rc1.ebuild b/x11-libs/qt/qt-4.4.0_rc1.ebuild
deleted file mode 100644
index ac97eda4ebbf..000000000000
--- a/x11-libs/qt/qt-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.4.0_rc1.ebuild,v 1.16 2008/05/15 12:40:50 ingmar Exp $
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="opengl qt3support"
-
-DEPEND=""
-RDEPEND=">=x11-libs/qt-gui-${PV}
-	>=x11-libs/qt-svg-${PV}
-	>=x11-libs/qt-test-${PV}
-	>=x11-libs/qt-sql-${PV}
-	>=x11-libs/qt-svg-${PV}
-	>=x11-libs/qt-test-${PV}
-	>=x11-libs/qt-assistant-${PV}
-	>=x11-libs/qt-xmlpatterns-${PV}
-	opengl? ( >=x11-libs/qt-opengl-${PV} )
-	qt3support? ( >=x11-libs/qt-qt3support-${PV} )"