Old.

Package-Manager: portage-2.1.4.4

28 files changed, 69 insertions, 976 deletions

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index f3a6fbde72de..165e026a39c5 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.2 2008/03/05 23:13:57 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.3 2008/03/05 23:30:44 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-assistant-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-assistant-4.4.0_beta1 (05 Mar 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 9e30239787e5..000000000000
--- a/x11-libs/qt-assistant/qt-assistant-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,64 +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.6 2008/01/22 14:11:44 caleb Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The assistant help module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-RDEPEND="~x11-libs/qt-gui-${PV}
-	~x11-libs/qt-sql-${PV}"
-
-DEPEND="${RDEPEND}"
-
-# pixeltool isn't really assistant related, but it relies on
-# the assistant libraries, so we'll put it here for now
-
-QT4_TARGET_DIRECTORIES="tools/assistant tools/pixeltool"
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-
-	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-qdbus -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"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
-
-src_install() {
-	qt4-build_src_install
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/Assistant.desktop
-}
-
-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
-}
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 274af36d83f1..77af17131f00 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.2 2008/03/05 23:07:18 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.3 2008/03/05 23:23:52 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-core-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-core-4.4.0_beta1 (05 Mar 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 f1dd8222a2f6..000000000000
--- a/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,135 +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.11 2008/01/22 16:06:46 caleb Exp $
-
-EAPI=1
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-IUSE="doc glib qt3support ssl"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	sys-libs/zlib
-	glib? ( dev-libs/glib )
-	!<=x11-libs/qt-4.4_rc:4"
-
-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"
-
-src_unpack() {
-	qt4-build_src_unpack
-}
-
-src_compile() {
-	unset QMAKESPEC
-	local myconf=$(standard_configure_options)
-
-	use ssl		&& myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl"
-	use glib	&& myconf="${myconf} -glib" || myconf="${myconf} -no-glib"
-	use qt3support	&& myconf="${myconf} -qt3support" || myconf="${myconf} -no-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-qdbus -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"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
-
-src_install() {
-	dobin "${S}"/bin/qmake
-	dobin "${S}"/bin/moc
-	dobin "${S}"/bin/rcc
-	dobin "${S}"/bin/uic
-
-	install_directories src/corelib src/xml src/network src/plugins/codecs
-
-	# TODO: don't override qconfig.pri when a new fresh set of options if there are some already installed on the system
-	cd "${S}" && emake INSTALL_ROOT="${D}" install_mkspecs || die
-
-	use doc && emake INSTALL_ROOT="${D}" install_htmldocs
-
-	emake INSTALL_ROOT="${D}" install_translations
-
-	fix_library_files
-
-	# 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}
-EOF
-	doenvd "${T}/44qt4"
-
-	# If we already have a qconfig.pri installed on the system, don't overwrite it with a new one.
-	if [ -a ${QTDATADIR}/mkspecs/qconfig.pri ]; then
-		rm "${D}"/${QTDATDIR}/mkspecs/qconfig.pri
-	fi
-}
-
-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 un-emerge 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 un-emerge 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 un-emerge these packages before continuing: \n\t\t${need_to_remove}"
-			fi
-		fi
-	fi
-}
diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index 79d61cc4ce46..43008e83cf31 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.2 2008/03/05 23:08:24 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.3 2008/03/05 23:24:53 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-dbus-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-dbus-4.4.0_beta1 (05 Mar 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 b6e9eb1e554d..000000000000
--- a/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 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.6 2007/12/23 20:08:29 caleb Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The DBus module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-# 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
-
-RDEPEND="~x11-libs/qt-core-4.4.0_rc1
-	>=sys-apps/dbus-1.0.2"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/qdbus tools/qdbus/qdbuscpp2xml tools/qdbus/qdbusxml2cpp tools/qdbus/qdbus"
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-
-	myconf="${myconf} -qdbus"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
-
-pkg_postinst()
-{
-	qconfig_add_option qdbus
-}
-
-pkg_postrm()
-{
-	qconfig_remove_option qdbus
-}
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 0dbe41792ab7..dbeeb626d96a 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.2 2008/03/05 23:09:00 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.3 2008/03/05 23:25:22 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-gui-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-gui-4.4.0_beta1 (05 Mar 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 6495998245ec..000000000000
--- a/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,175 +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.9 2008/01/23 12:12:35 caleb Exp $
-
-inherit eutils qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The GUI module(s) for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-IUSE_INPUT_DEVICES="input_devices_wacom"
-
-IUSE="accessibility cups dbus debug mng nas nis tiff xinerama ${IUSE_INPUT_DEVICES}"
-
-RDEPEND="~x11-libs/qt-core-${PV}
-	~x11-libs/qt-script-${PV}
-	dbus? ( ~x11-libs/qt-dbus-${PV} )
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfont
-	x11-libs/libSM
-	xinerama? ( x11-libs/libXinerama )
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/libpng
-	media-libs/jpeg
-	sys-libs/zlib
-	mng? ( >=media-libs/libmng-1.0.9 )
-	tiff? ( media-libs/tiff )
-	nas? ( >=media-libs/nas-1.5 )
-	cups? ( net-print/cups )
-	input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )"
-
-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 src/plugins/designer"
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	epatch "${FILESDIR}"/xinerama.patch
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-
-	# Don't build plugins this go around, because they depend on qt3support lib
-	sed -i -e "s:CONFIG(shared:#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=$(standard_configure_options)
-
-	myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
-	myconf="${myconf} $(qt_use nis)"
-
-	use nas		&& myconf="${myconf} -system-nas-sound"
-
-	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg"
-	myconf="${myconf} $(qt_use tiff libtiff system)"
-	myconf="${myconf} $(qt_use mng libmng system)"
-
-	myconf="${myconf} -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc"
-
-	if built_with_use ~x11-libs/qt-core-${PV} glib; then
-		myconf="${myconf} -glib"
-	else
-		myconf="${myconf} -no-glib"
-	fi
-
-	if built_with_use ~x11-libs/qt-core-${PV} qt3support; then
-		myconf="${myconf} -qt3support"
-	else
-		myconf="${myconf} -no-qt3support"
-	fi
-
-	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
-	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
-
-	# Explictly don't compile these packages.
-	# Emerge "qt-webkit", "qt-phonon", etc for their functionality.
-	myconf="${myconf} -no-webkit -no-phonon -no-qdbus -no-opengl"
-
-	use dbus && myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	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"
-
-	build_target_directories
-}
-
-src_install() {
-	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_install
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/Designer.desktop
-	doins "${FILESDIR}"/Linguist.desktop
-}
-
-pkg_postinst()
-{
-	qconfig_add_option x11sm
-	qconfig_add_option xshape
-	qconfig_add_option xcursor
-	qconfig_add_option xfixes
-	qconfig_add_option xrandr
-	qconfig_add_option xrender
-	qconfig_add_option xkb
-	qconfig_add_option fontconfig
-	use input_devices_wacom && qconfig_add_option tablet
-	use accessibility && qconfig_add_option accessibility
-	use xinerama && qconfig_add_option xinerama
-	use cups && qconfig_add_option cups
-	use nas && qconfig_add_option nas
-
-	qconfig_remove_option no-gif
-	qconfig_add_option gif
-
-	qconfig_remove_option no-png
-	qconfig_add_option png
-	qconfig_add_option system-png
-
-	# Need to do the same for tiff and mng
-}
-
-pkg_postrm()
-{
-	qconfig_remove_option x11sm
-	qconfig_remove_option xshape
-	qconfig_remove_option xcursor
-	qconfig_remove_option xfixes
-	qconfig_remove_option xrandr
-	qconfig_remove_option xrender
-	qconfig_remove_option xkb
-	qconfig_remove_option fontconfig
-
-	qconfig_remove_option tablet
-	qconfig_remove_option accessibility
-	qconfig_remove_option xinerama
-	qconfig_remove_option cups
-	qconfig_remove_option nas
-
-	qconfig_remove_option png
-	qconfig_remove_option system-png
-	qconfig_add_option no-png
-
-	qconfig_remove_option gif
-	qconfig_add_option no-gif
-
-	# Need to do the same for tiff and mng
-}
diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog
index b4c9ea3fe323..9b9e34501aba 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.2 2008/03/05 23:10:07 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.3 2008/03/05 23:26:19 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-opengl-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-opengl-4.4.0_beta1 (05 Mar 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 f06ac89cecb3..000000000000
--- a/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 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.7 2007/12/22 18:18:39 caleb Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The OpenGL module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-RDEPEND="~x11-libs/qt-gui-${PV}
-	( virtual/opengl virtual/glu )"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/opengl"
-
-src_unpack() {
-
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-	myconf="${myconf} -opengl"
-
-	if built_with_use ~x11-libs/qt-core-${PV} qt3support; then
-		myconf="${myconf} -qt3support"
-	else
-		myconf="${myconf} -no-qt3support"
-	fi
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-
-	# Not building tools/designer/src/plugins/tools/view3d as it's commented out of the build in the source
-}
-
-pkg_postinst()
-{
-	qconfig_add_option opengl
-}
-
-pkg_postrm()
-{
-	qconfig_remove_option opengl
-}
diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog
index d8a3c066d1f5..7a7cb8373530 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.2 2008/03/05 23:12:52 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.3 2008/03/05 23:29:12 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-phonon-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-phonon-4.4.0_beta1 (05 Mar 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 e1c2dfdd361f..000000000000
--- a/x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 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.6 2007/12/22 17:46:11 caleb Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The Phonon module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-IUSE="dbus"
-
-RDEPEND="~x11-libs/qt-gui-${PV}
-	media-libs/gstreamer
-	media-libs/gst-plugins-base
-	dbus? ( =x11-libs/qt-dbus-${PV} )"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/phonon src/plugins/phonon"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/abstractaudiooutput.cpp.diff
-
-	# 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
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-
-	myconf="${myconf} -phonon"
-	use dbus	&& myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
-
-pkg_postinst()
-{
-	qconfig_add_option phonon
-}
-
-pkg_postrm()
-{
-	qconfig_remove_option phonon
-}
diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog
index 370b08e6d466..039fb4733167 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.2 2008/03/05 23:10:41 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.3 2008/03/05 23:26:53 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-qt3support-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-qt3support-4.4.0_beta1 (05 Mar 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 e98593dbbc66..000000000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,62 +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.12 2008/01/05 00:11:32 caleb Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The Qt3 support module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-RDEPEND="~x11-libs/qt-gui-${PV}
-	~x11-libs/qt-sql-${PV}"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/qt3support tools/designer/src/plugins/widgets tools/qtconfig src/tools/uic3 tools/porting"
-
-pkg_setup() {
-	qt4-build_pkg_setup
-
-	if ! built_with_use =x11-libs/qt-core-4* qt3support; then
-		eerror "In order for the qt-qt3support package to install, you must set the \"qt3support\" use flag, then"
-		eerror "re-emerge the following packages: x11-libs/qt-core, x11-libs/qt-gui, x11-libs/qt-sql."
-		die
-	fi
-}
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-
-	if built_with_use ~x11-libs/qt-gui-${PV} accessibility; then
-		myconf="${myconf} -accessibility"
-	else
-		myconf="${myconf} -no-accessibility"
-	fi
-
-	myconf="${myconf} -qt3support"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
-
-# Don't postinst qt3support into qconfig.pri here, it's handled in qt-core by way of the use flag.
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index 4b2977e2dc48..ce18a58a91d7 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.2 2008/03/05 23:07:51 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.3 2008/03/05 23:24:19 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-script-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-script-4.4.0_beta1 (05 Mar 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 5a4dc061b2c7..000000000000
--- a/x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 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.4 2007/12/22 23:06:15 mr_bones_ Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-RDEPEND="~x11-libs/qt-core-${PV}"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/script"
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-
-	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-qdbus -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 ${myconf}"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index 8ddb7a7178c0..c7230eb13d44 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.2 2008/03/05 23:09:33 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.3 2008/03/05 23:25:52 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-sql-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-sql-4.4.0_beta1 (05 Mar 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 cd8c27dbe9d0..000000000000
--- a/x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 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.5 2007/12/24 14:39:52 caleb Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The SQL module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-IUSE="firebird mysql odbc postgres sqlite"
-
-RDEPEND="~x11-libs/qt-core-${PV}
-		mysql? ( virtual/mysql )
-		firebird? ( dev-db/firebird )
-		sqlite? ( =dev-db/sqlite-3* )
-		postgres? ( dev-db/libpq )
-		odbc? ( dev-db/unixODBC )"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers"
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-
-	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 sqlite      && myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite"
-	use odbc        && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
-
-	# Don't support sqlite2 anymore
-	myconf="${myconf} -no-sql-sqlite2"
-
-	if built_with_use ~x11-libs/qt-core-${PV} qt3support; then
-		myconf="${myconf} -qt3support"
-	else
-		myconf="${myconf} -no-qt3support"
-	fi
-	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-qdbus -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"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog
index 5c7c137d4712..1adface79451 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.2 2008/03/05 23:12:19 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.3 2008/03/05 23:28:45 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-svg-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-svg-4.4.0_beta1 (05 Mar 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 4af900fd0e06..000000000000
--- a/x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 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.4 2007/12/22 23:06:57 mr_bones_ Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The SVG module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-RDEPEND="~x11-libs/qt-gui-${PV}"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/svg src/plugins/imageformats/svg src/plugins/iconengines/svgiconengine"
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-
-	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-qdbus -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 ${myconf}"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog
index d83ac8c5e8af..58a77f9aaf3b 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.2 2008/03/05 23:11:13 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.3 2008/03/05 23:27:21 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-test-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-test-4.4.0_beta1 (05 Mar 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 9262b6fa7538..000000000000
--- a/x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 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.3 2007/12/22 23:07:18 mr_bones_ Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The testing framework module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-RDEPEND="~x11-libs/qt-core-${PV}"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/qtestlib"
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-
-	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-qdbus -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 ${myconf}"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 321e5e17ef20..fcc27ae60f18 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.2 2008/03/05 23:13:24 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.3 2008/03/05 23:30:14 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-webkit-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-webkit-4.4.0_beta1 (05 Mar 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 7a6bfb05c636..000000000000
--- a/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 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.8 2007/12/22 18:16:33 caleb Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The Webkit module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-RDEPEND="~x11-libs/qt-gui-${PV}"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"
-
-src_unpack() {
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-
-	myconf="${myconf} -webkit"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
-
-pkg_postinst()
-{
-	qconfig_add_option webkit
-}
-
-pkg_postrm()
-{
-	qconfig_remove_option webkit
-}
diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog
index dff72289863c..96e5311ebe59 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.2 2008/03/05 23:11:46 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.3 2008/03/05 23:28:17 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -qt-xmlpatterns-4.4.0_rc1.ebuild:
+  Old.
 
 *qt-xmlpatterns-4.4.0_beta1 (05 Mar 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 3d295fdb8bd8..000000000000
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 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.3 2007/12/22 18:17:11 caleb Exp $
-
-inherit qt4-build
-
-SRCTYPE="preview-opensource-src"
-DESCRIPTION="The patternist module for the Qt toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV/_rc/-tp}
-
-SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-S=${WORKDIR}/qt-x11-${SRCTYPE}-${MY_PV}
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-RDEPEND="~x11-libs/qt-core-${PV}"
-
-DEPEND="${RDEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/patternist"
-
-src_unpack() {
-
-	qt4-build_src_unpack
-
-	skip_qmake_build_patch
-	skip_project_generation_patch
-	install_binaries_to_buildtree
-}
-
-src_compile() {
-	local myconf=$(standard_configure_options)
-	myconf="${myconf} -xmlpatterns"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die
-
-	build_target_directories
-}
-
-pkg_postinst()
-{
-	qconfig_add_option xmlpatterns
-}
-
-pkg_postrm()
-{
-	qconfig_remove_option xmlpatterns
-}
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 50caa551ca58..ed81c5fcd9ba 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # 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.520 2008/03/05 19:10:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.521 2008/03/05 23:32:09 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> -qt-4.4.0_rc1.ebuild:
+  Old.
 
   05 Mar 2008; Jeroen Roovers <jer@gentoo.org> qt-4.4.0_rc1.ebuild:
   Remove ~hppa again.
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 a3a379f3e510..000000000000
--- a/x11-libs/qt/qt-4.4.0_rc1.ebuild
+++ /dev/null
@@ -1,23 +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.13 2008/03/05 19:10:08 jer Exp $
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
-HOMEPAGE="http://www.trolltech.com/"
-
-LICENSE="|| ( QPL-1.0 GPL-2 )"
-SLOT="4"
-KEYWORDS="~x86"
-
-IUSE="opengl qt3support"
-
-RDEPEND="~x11-libs/qt-gui-${PV}
-	opengl? ( ~x11-libs/qt-opengl-${PV} )
-	qt3support? ( ~x11-libs/qt-qt3support-${PV} )
-	~x11-libs/qt-svg-${PV}
-	~x11-libs/qt-test-${PV}
-	~x11-libs/qt-sql-${PV}
-	~x11-libs/qt-svg-${PV}
-	~x11-libs/qt-xmlpatterns-${PV}
-	~x11-libs/qt-test-${PV}
-	~x11-libs/qt-assistant-${PV}"