[gentoo-commits] proj/qt:master commit in: x11-libs/qt-opengl/, x11-libs/qt-script/, x11-libs/qt-qt3support/, ...

[Markos Chandras]

commit:     a4f70ce98520b4b2c3fd9adb3e1dcd8ef40951b8
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 09:13:35 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 09:13:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a4f70ce9

qt-*-4.7.9999: Removed from tree. Please upgrade to 4.8.9999

---
 profiles/package.mask                              |   21 ---
 x11-libs/qt-assistant/qt-assistant-4.7.9999.ebuild |   93 ------------
 x11-libs/qt-core/qt-core-4.7.9999.ebuild           |  156 --------------------
 x11-libs/qt-dbus/qt-dbus-4.7.9999.ebuild           |   39 -----
 .../qt-declarative/qt-declarative-4.7.9999.ebuild  |   54 -------
 x11-libs/qt-demo/qt-demo-4.7.9999.ebuild           |   51 -------
 x11-libs/qt-gui/qt-gui-4.7.9999.ebuild             |  155 -------------------
 .../qt-multimedia/qt-multimedia-4.7.9999.ebuild    |   47 ------
 x11-libs/qt-opengl/qt-opengl-4.7.9999.ebuild       |   48 ------
 x11-libs/qt-openvg/Manifest                        |    2 +-
 x11-libs/qt-phonon/qt-phonon-4.7.9999.ebuild       |   39 -----
 .../qt-qt3support/qt-qt3support-4.7.9999.ebuild    |   40 -----
 x11-libs/qt-script/qt-script-4.7.9999.ebuild       |   45 ------
 x11-libs/qt-simulator/qt-simulator-4.7.9999.ebuild |   87 -----------
 x11-libs/qt-sql/qt-sql-4.7.9999.ebuild             |   71 ---------
 x11-libs/qt-svg/qt-svg-4.7.9999.ebuild             |   48 ------
 x11-libs/qt-test/qt-test-4.7.9999.ebuild           |   34 -----
 x11-libs/qt-webkit/qt-webkit-4.7.9999.ebuild       |   52 -------
 .../qt-xmlpatterns/qt-xmlpatterns-4.7.9999.ebuild  |   36 -----
 19 files changed, 1 insertions(+), 1117 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 08d7840..1a2ecf4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -2,27 +2,6 @@
 # Add your name and the date, as well as an explanation for the mask
 # Make sure the atoms you add are valid!
 
-# Markos Chandras <hwoarang@g.o> (28 Jan 2012)
-# 4.7.9999 ebuilds are outdated and not supported anymore
-# Please upgrade to 4.8.9999 or 4.99999
-# 4.7.9999 ebuild will be removed in 10 days
-~x11-libs/qt-assistant-4.7.9999
-~x11-libs/qt-core-4.7.9999
-~x11-libs/qt-declarative-4.7.9999
-~x11-libs/qt-dbus-4.7.9999
-~x11-libs/qt-demo-4.7.9999
-~x11-libs/qt-gui-4.7.9999
-~x11-libs/qt-multimedia-4.7.9999
-~x11-libs/qt-opengl-4.7.9999
-~x11-libs/qt-phonon-4.7.9999
-~x11-libs/qt-qt3support-4.7.9999
-~x11-libs/qt-script-4.7.9999
-~x11-libs/qt-sql-4.7.9999
-~x11-libs/qt-svg-4.7.9999
-~x11-libs/qt-test-4.7.9999
-~x11-libs/qt-webkit-4.7.9999
-~x11-libs/qt-xmlpatterns-4.7.9999
-
 # Markos Chandras <hwoarang@g.o> (31 Dec 2011)
 # Masking latest releases
 =dev-python/sip-4.13.1_pre*

diff --git a/x11-libs/qt-assistant/qt-assistant-4.7.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.7.9999.ebuild
deleted file mode 100644
index 3a64092..0000000
--- a/x11-libs/qt-assistant/qt-assistant-4.7.9999.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The assistant help module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="doc +glib qt3support trace"
-
-DEPEND="~x11-libs/qt-gui-${PV}[stable-branch=,glib=,trace?,qt3support=]
-	~x11-libs/qt-sql-${PV}[sqlite,stable-branch=,qt3support=]
-	~x11-libs/qt-webkit-${PV}[stable-branch=]
-	~x11-libs/qt-declarative-${PV}[stable-branch=,qt3support=]"
-RDEPEND="${DEPEND}"
-
-# Pixeltool isn't really assistant related, but it relies on
-# the assistant libraries. doc/qch/
-QT4_TARGET_DIRECTORIES="
-	tools/assistant
-	tools/pixeltool
-	tools/qdoc3"
-QT4_EXTRACT_DIRECTORIES="
-	tools/
-	demos/
-	examples/
-	src/
-	include/
-	doc/"
-
-pkg_setup() {
-	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		tools/qttracereplay"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		${QT4_EXTRACT_DIRECTORIES}"
-	qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
-	qt4-build-edge_src_prepare
-	sed -e "s/\(sub-qdoc3\.depends =\).*/\1/" \
-	    -i doc/doc.pri || die "patching qdoc3 depends failed"
-}
-
-src_configure() {
-	myconf="${myconf} -no-xkb -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-phonon
-		-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
-		-no-fontconfig -no-multimedia -no-qt3support -no-svg
-		$(qt_use qt3support)"
-	! use glib && myconf="${myconf} -no-glib"
-	qt4-build-edge_src_configure
-}
-
-src_compile() {
-	# help libQtHelp find freshly built libQtCLucene (bug #289811)
-	export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
-	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
-
-	qt4-build-edge_src_compile
-
-	# ugly hack to build docs
-	cd "${S}"
-	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-	emake qch_docs || die "emake qch_docs failed"
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-}
-
-src_install() {
-	qt4-build-edge_src_install
-	cd "${S}"
-	emake INSTALL_ROOT="${D}" install_qchdocs \
-		|| die "failed to install qch docs"
-	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs \
-			|| die "failed to install htmldocs"
-	fi
-	dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3"
-	# install correct assistant icon, bug 241208
-	dodir /usr/share/pixmaps/ || die
-	insinto /usr/share/pixmaps/
-	doins tools/assistant/tools/assistant/images/assistant.png || die
-	# Note: absolute image path required here!
-	make_desktop_entry assistant Assistant \
-		/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' || die
-}

diff --git a/x11-libs/qt-core/qt-core-4.7.9999.ebuild b/x11-libs/qt-core/qt-core-4.7.9999.ebuild
deleted file mode 100644
index 22ae4fe..0000000
--- a/x11-libs/qt-core/qt-core-4.7.9999.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
-SLOT="4"
-KEYWORDS=""
-IUSE="+glib iconv optimized-qmake private-headers qt3support ssl"
-
-DEPEND="sys-libs/zlib
-	glib? ( dev-libs/glib )
-	ssl? ( dev-libs/openssl )
-	!<x11-libs/qt-4.4.0:4"
-RDEPEND="${DEPEND}"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[qt3support,stable-branch=] )"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/tools/bootstrap
-		src/tools/moc
-		src/tools/rcc
-		src/tools/uic
-		src/corelib
-		src/xml
-		src/network
-		src/plugins/codecs
-		tools/linguist/lconvert
-		tools/linguist/lrelease
-		tools/linguist/lupdate"
-
-	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/3rdparty/easing
-		src/script
-		tools/linguist/shared
-		translations"
-	qt4-build-edge_pkg_setup
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		${QT4_EXTRACT_DIRECTORIES}"
-}
-
-src_prepare() {
-	# Don't pre-strip, bug 235026
-	for i in kr jp cn tw ; do
-		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
-	done
-
-	qt4-build-edge_src_prepare
-
-	# bug 172219
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
-	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
-}
-
-src_configure() {
-	unset QMAKESPEC
-
-	myconf="${myconf}
-		$(qt_use glib)
-		$(qt_use iconv)
-		$(qt_use optimized-qmake)
-		$(qt_use ssl openssl)
-		$(qt_use qt3support)"
-
-	myconf="${myconf} -no-xkb  -no-fontconfig -no-xrender -no-xrandr
-		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -no-cups -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 -no-gtkstyle -no-phonon-backend -no-script -no-scripttools
-		-no-cups -no-xsync -no-xinput -no-multimedia"
-	qt4-build-edge_src_configure
-}
-
-src_compile() {
-	# bug 259736
-	unset QMAKESPEC
-	qt4-build-edge_src_compile
-}
-
-src_install() {
-	dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die
-
-	install_directories src/{corelib,xml,network,plugins/codecs}
-
-	emake INSTALL_ROOT="${D}" install_mkspecs || die
-
-	#install private headers
-	if use private-headers; then
-		insinto ${QTHEADERDIR}/QtCore/private
-		find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
-	fi
-	# use freshly built libraries
-	local DYLD_FPATH=
-	[[ -d "${S}"/lib/QtCore.framework ]] \
-		&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
-	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
-	LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts || die
-	insinto ${QTTRANSDIR}
-	doins translations/*.qm || die
-
-	setqtenv
-	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
-
-	sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
-			"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
-			"${D}${QTHEADERDIR}"/Qt/qconfig.h \
-		|| die
-	if use glib; then
-		QCONFIG_DEFINE=" $(use glib && echo QT_GLIB)
-			$(use ssl && echo QT_OPENSSL)"
-		install_qconfigs
-	fi
-	#remove .la files
-	find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
-	# remove some unnecessary headers
-	rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
-qatomic_macosx.h,\
-qatomic_windows.h,\
-qatomic_windowsce.h,\
-qt_windows.h}
-
-	keepdir "${QTSYSCONFDIR}"
-}

diff --git a/x11-libs/qt-dbus/qt-dbus-4.7.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.7.9999.ebuild
deleted file mode 100644
index c1bee69..0000000
--- a/x11-libs/qt-dbus/qt-dbus-4.7.9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,stable-branch=]
-	>=sys-apps/dbus-1.0.2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/dbus
-		tools/qdbus/qdbus
-		tools/qdbus/qdbusxml2cpp
-		tools/qdbus/qdbuscpp2xml"
-	QCONFIG_ADD="dbus dbus-linked"
-	QCONFIG_DEFINE="QT_DBUS"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtCore
-		include/QtDBus
-		include/QtXml
-		src/corelib
-		src/xml"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} -dbus-linked"
-	qt4-build-edge_src_configure
-}

diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.9999.ebuild
deleted file mode 100644
index 92b05b3..0000000
--- a/x11-libs/qt-declarative/qt-declarative-4.7.9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="private-headers qt3support webkit"
-
-DEPEND="~x11-libs/qt-core-${PV}[stable-branch=,qt3support=]
-	~x11-libs/qt-gui-${PV}[stable-branch=,qt3support=]
-	~x11-libs/qt-multimedia-${PV}[stable-branch=]
-	~x11-libs/qt-opengl-${PV}[stable-branch=,qt3support=]
-	~x11-libs/qt-script-${PV}[stable-branch=]
-	~x11-libs/qt-sql-${PV}[stable-branch=,qt3support=]
-	~x11-libs/qt-svg-${PV}[stable-branch=]
-	~x11-libs/qt-webkit-${PV}[stable-branch=]
-	~x11-libs/qt-xmlpatterns-${PV}[stable-branch=]
-	qt3support? ( ~x11-libs/qt-qt3support-${PV}[stable-branch=] )
-	webkit? ( ~x11-libs/qt-webkit-${PV}[stable-branch=] )"
-RDEPEND="${DEPEND}"
-
-QCONFIG_ADD="declarative"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/declarative
-		tools/qml"
-	QT4_EXTRACT_DIRECTORIES="
-		include/
-		src/
-		tools/"
-		if use webkit; then
-			QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-			src/3rdparty/webkit/WebKit/qt/declarative"
-		fi
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} -declarative"
-	qt4-build-edge_src_configure
-}
-
-src_install() {
-	qt4-build-edge_src_install
-	if use private-headers; then
-		insinto ${QTHEADERDIR}/QtDeclarative/private
-		find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
-	fi
-}

diff --git a/x11-libs/qt-demo/qt-demo-4.7.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.7.9999.ebuild
deleted file mode 100644
index e86dcfa..0000000
--- a/x11-libs/qt-demo/qt-demo-4.7.9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="Demonstration module of the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="qt3support"
-
-DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[stable-branch=]
-	~x11-libs/qt-core-${PV}:${SLOT}[stable-branch=,qt3support=]
-	~x11-libs/qt-dbus-${PV}:${SLOT}[stable-branch=]
-	~x11-libs/qt-gui-${PV}:${SLOT}[stable-branch=,qt3support]
-	~x11-libs/qt-declarative-${PV}:${SLOT}[stable-branch=,webkit]
-	~x11-libs/qt-multimedia-${PV}:${SLOT}[stable-branch=]
-	~x11-libs/qt-opengl-${PV}:${SLOT}[stable-branch=,qt3support=]
-	|| ( ~x11-libs/qt-phonon-${PV}:${SLOT}[stable-branch=] media-libs/phonon )
-	~x11-libs/qt-script-${PV}:${SLOT}[stable-branch=]
-	~x11-libs/qt-sql-${PV}:${SLOT}[stable-branch=]
-	~x11-libs/qt-svg-${PV}:${SLOT}[stable-branch=]
-	~x11-libs/qt-test-${PV}:${SLOT}[stable-branch=]
-	~x11-libs/qt-webkit-${PV}:${SLOT}[stable-branch=]
-	~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="demos
-		examples"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		doc/src/images
-		src/
-		include/
-		tools/"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} $(qt_use qt3support)"
-	qt4-build-edge_src_configure
-}
-
-src_install() {
-	insinto ${QTDOCDIR}/src
-	doins -r "${S}"/doc/src/images || die
-
-	qt4-build-edge_src_install
-}

diff --git a/x11-libs/qt-gui/qt-gui-4.7.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.7.9999.ebuild
deleted file mode 100644
index d756e71..0000000
--- a/x11-libs/qt-gui/qt-gui-4.7.9999.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit confutils eutils qt4-build-edge
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers +raster tiff trace qt3support xinerama"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	virtual/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfont
-	x11-libs/libSM
-	x11-libs/libXi
-	~x11-libs/qt-core-${PV}[debug=,glib=,qt3support=,stable-branch=]
-	~x11-libs/qt-script-${PV}[debug=,stable-branch=]
-	cups? ( net-print/cups )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[debug=,stable-branch=] )
-	gtkstyle? ( x11-libs/gtk+:2 )
-	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 )
-	gtkstyle? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) )
-	x11-proto/xextproto
-	x11-proto/inputproto"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=,stable-branch=] )"
-
-pkg_setup() {
-	if ! use qt3support; then
-		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
-	fi
-
-	confutils_use_depend_all gtk glib
-
-	QT4_TARGET_DIRECTORIES="
-		src/gui
-		src/scripttools
-		tools/designer
-		tools/linguist/linguist
-		src/plugins/imageformats/gif
-		src/plugins/imageformats/ico
-		src/plugins/imageformats/jpeg
-		src/plugins/inputmethods"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include
-		src
-		tools/linguist/phrasebooks
-		tools/linguist/shared
-		tools/shared"
-
-	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"
-	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
-	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}	src/plugins/graphicssystems/trace"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
-	qt4-build-edge_src_prepare
-
-	# 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_configure() {
-	export PATH="${S}/bin:${PATH}"
-	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
-	myconf="$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use egl)
-		$(qt_use glib)
-		$(qt_use mng libmng system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use dbus qdbus)
-		$(qt_use dbus)
-		$(qt_use qt3support)
-		$(qt_use gtkstyle)
-		$(qt_use xinerama)"
-
-	use nas	&& myconf="${myconf} -system-nas-sound"
-	use raster && myconf="${myconf} -graphicssystem raster"
-
-	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 -no-webkit
-		-no-phonon -no-opengl"
-
-	qt4-build-edge_src_configure
-}
-
-src_install() {
-	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
-		$(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-edge_src_install
-
-	# qt-creator
-	# some qt-creator headers are located
-	# under /usr/include/qt4/QtDesigner/private.
-	# those headers are just includes of the headers
-	# which are located under tools/designer/src/lib/*
-	# So instead of installing both, we create the private folder
-	# and drop tools/designer/src/lib/* headers in it.
-	dodir /usr/include/qt4/QtDesigner/private/ || die
-	insinto /usr/include/qt4/QtDesigner/private/
-	doins "${S}"/tools/designer/src/lib/shared/* || die
-	doins "${S}"/tools/designer/src/lib/sdk/* || die
-	#install private headers
-	if use private-headers; then
-		insinto ${QTHEADERDIR}/QtGui/private
-		find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
-	fi
-
-	# install correct designer and linguist icons, bug 241208
-	doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
-		tools/designer/src/designer/images/designer.png || die
-	# Note: absolute image path required here!
-	make_desktop_entry linguist Linguist \
-			/usr/share/pixmaps/linguist-128-32.png \
-			'Qt;Development;GUIDesigner' || die
-	make_desktop_entry designer Designer \
-			/usr/share/pixmaps/designer.png \
-			'Qt;Development;GUIDesigner' || die
-}

diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.7.9999.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.7.9999.ebuild
deleted file mode 100644
index 2cd10c8..0000000
--- a/x11-libs/qt-multimedia/qt-multimedia-4.7.9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Qt multimedia module"
-SLOT="4"
-KEYWORDS=""
-IUSE="iconv"
-
-DEPEND="media-libs/alsa-lib
-	~x11-libs/qt-core-${PV}[debug=,stable-branch=]
-	~x11-libs/qt-gui-${PV}[debug=,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/multimedia"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt/
-		include/QtCore/
-		include/QtGui/
-		include/QtMultimedia/
-		src/src.pro
-		src/corelib/
-		src/gui/
-		src/plugins
-		src/3rdparty
-		src/tools"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} $(qt_use iconv) -no-xkb  -no-fontconfig -no-xrender
-		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-		-no-opengl -no-nas-sound -no-dbus -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-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite
-		-no-sql-sqlite2 -no-sql-odbc -no-glib -no-opengl -no-svg -no-gtkstyle
-		-no-phonon-backend -no-script -no-scripttools -no-cups -no-xsync
-		-no-xinput"
-
-	qt4-build-edge_src_configure
-}

diff --git a/x11-libs/qt-opengl/qt-opengl-4.7.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.7.9999.ebuild
deleted file mode 100644
index 9d8e4c9..0000000
--- a/x11-libs/qt-opengl/qt-opengl-4.7.9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="egl qt3support"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=,stable-branch=]
-	~x11-libs/qt-gui-${PV}[debug=,egl=,qt3support=,stable-branch=]
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/opengl
-		src/plugins/graphicssystems/opengl"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include/QtCore
-		include/QtGui
-		include/QtOpenGL
-		src/corelib
-		src/gui
-		src/opengl
-		src/plugins
-		src/3rdparty"
-
-	QCONFIG_ADD="opengl"
-	QCONFIG_DEFINE="QT_OPENGL $(use egl && echo QT_EGL)"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} -opengl
-		$(qt_use egl)
-		$(qt_use qt3support)"
-
-	qt4-build-edge_src_configure
-
-	# Not building tools/designer/src/plugins/tools/view3d as it's
-	# commented out of the build in the source
-}

diff --git a/x11-libs/qt-openvg/Manifest b/x11-libs/qt-openvg/Manifest
index 4590e46..23bd05a 100644
--- a/x11-libs/qt-openvg/Manifest
+++ b/x11-libs/qt-openvg/Manifest
@@ -1,2 +1,2 @@
 DIST qt-everywhere-opensource-src-4.7.0.tar.gz 208320257 RMD160 3e9c0f0d9843b5c03ad4bd6193aff98531ee0746 SHA1 a5796c8f468c8f59249e5c696f913864c979f411 SHA256 e05256d560ca7d674cd4310bb791748900ad14ad662cbfe22b6d72ada43e7955
-DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a
+DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a SHA512 adca9f9ea9914eb7715277ec61e0710f4492e0562fce5e72d02e88c2df58b4fbc77a4346abd8ebf79aa8eff94d0075191a8709fbb502785682ba37ee2151ae7f WHIRLPOOL 79b16f663cb49e029cb0d86cb0a98854e975746f6e7f5ef1707d7851325556c5a248e8eaf9393d234099058d6e54ef69767ce653bf9a665cca87d2f2a5829e8d

diff --git a/x11-libs/qt-phonon/qt-phonon-4.7.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.7.9999.ebuild
deleted file mode 100644
index 2452118..0000000
--- a/x11-libs/qt-phonon/qt-phonon-4.7.9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="dbus"
-
-DEPEND="~x11-libs/qt-gui-${PV}[debug=,glib,qt3support,stable-branch=]
-	!kde-base/phonon-kde
-	!kde-base/phonon-xine
-	!media-libs/phonon
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta
-	dbus? ( ~x11-libs/qt-dbus-${PV}[debug=,stable-branch=] )"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-	src/phonon
-	src/plugins/phonon
-	tools/designer/src/plugins/phononwidgets"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-	include/
-	src
-	tools"
-
-QCONFIG_ADD="phonon"
-QCONFIG_DEFINE="QT_GSTREAMER"
-
-src_configure() {
-	myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg
-		$(qt_use dbus qdbus)"
-
-	qt4-build-edge_src_configure
-}

diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.7.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.7.9999.ebuild
deleted file mode 100644
index ff4cf94..0000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.7.9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Qt3 support module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="+accessibility kde phonon"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support,stable-branch=]
-	~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support,stable-branch=]
-	~x11-libs/qt-sql-${PV}[debug=,qt3support,stable-branch=]
-	phonon? (
-		!kde? ( || ( ~x11-libs/qt-phonon-${PV}[debug=,stable-branch=]
-			media-libs/phonon[gstreamer] ) )
-		kde? ( media-libs/phonon[gstreamer] ) )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/qt3support
-		src/tools/uic3
-		tools/designer/src/plugins/widgets
-		tools/qtconfig
-		tools/porting"
-	QT4_EXTRACT_DIRECTORIES="src include tools"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} -qt3support
-		$(qt_use phonon gstreamer)
-		$(qt_use phonon)
-		$(qt_use accessibility)"
-	qt4-build-edge_src_configure
-}

diff --git a/x11-libs/qt-script/qt-script-4.7.9999.ebuild b/x11-libs/qt-script/qt-script-4.7.9999.ebuild
deleted file mode 100644
index 9a7c009..0000000
--- a/x11-libs/qt-script/qt-script-4.7.9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The ECMAScript module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="iconv private-headers"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/script/"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt/
-		include/QtCore/
-		include/QtScript/
-		src/corelib/"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} $(qt_use iconv) -no-xkb  -no-fontconfig -no-xrender
-		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-		-no-opengl -no-nas-sound -no-dbus -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
-		-no-gtkstyle"
-	qt4-build-edge_src_configure
-}
-
-src_install() {
-	qt4-build-edge_src_install
-	#install private headers
-	if use private-headers; then
-		insinto ${QTHEADERDIR}/QtScript/private
-		find "${S}"/src/script -type f -name "*_p.h" -exec doins {} \;
-	fi
-}

diff --git a/x11-libs/qt-simulator/qt-simulator-4.7.9999.ebuild b/x11-libs/qt-simulator/qt-simulator-4.7.9999.ebuild
deleted file mode 100644
index 5584c3d..0000000
--- a/x11-libs/qt-simulator/qt-simulator-4.7.9999.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-EGIT_REPO_URI="git://gitorious.org/~qtbynokia/qt/simulator-qt.git"
-EGIT_BRANCH="4.7"
-#EGIT_BRANCH="4.7.0-beta1"
-
-inherit git multilib qt4-r2 toolchain-funcs
-
-DESCRIPTION="Qt Simulator is a simulator for Qt applications intended to run on Nokia devices"
-HOMEPAGE="http://labs.trolltech.com/page/Projects/Tools/QtSimulator"
-SRC_URI=""
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-KEYWORDS=""
-IUSE="debug qt3support xmlpatterns multimedia phonon svg webkit \
-script dbus"
-
-DEPEND="~x11-libs/qt-gui-${PV}"
-RDEPEND="${DEPEND}"
-	
-pkg_setup() {
-	PLATFORM="simulator"
-}
-
-src_unpack() {
-	git_src_unpack
-	qt4-r2_src_unpack
-}
-
-src_prepare() {
-	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
-		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix
-			CXXFLAGS failed"
-	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
-		"${S}/qmake/Makefile.unix" || die "sed
-			qmake/Makefile.unix LDFLAGS failed"
-	sed -i '/^QMAKE_CFLAGS_\(RELEASE\|DEBUG\)/s:+=.*:+=:' \
-		mkspecs/common/g++.conf
-	sed -e "s:\(^SYSTEM_VARIABLES\):CC=$(tc-getCC)\nCXX=$(tc-getCXX)\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
-		-i configure || die "sed qmake compilers failed"
-	find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
-		xargs -0 \
-			sed -e "s:\(\$MAKE\):\1 CC=$(tc-getCC) CXX=$(tc-getCXX) LD=$(tc-getCXX) LINK=$(tc-getCXX):g" \
-				-i || die "sed test compilers failed"
-}
-
-src_configure() {
-	local myconf=""
-	local datadir="/usr/share/qt4"
-	local libdir="/usr/$(get_libdir)/qt4"
-
-	myconf+="-prefix    '/usr' 
-		-prefix-install 
-		-hostprefix     '/usr' 
-		-libdir         '${libdir}' 
-		-headerdir      '/usr/include/qt4' 
-		-plugindir      '${libdir}/plugins' 
-		-docdir         '/usr/share/doc/${PF}' 
-		-demosdir       '${datadir}/demos' 
-		-examplesdir    '${datadir}/examples' 
-		-sysconfdir     '/etc/qt4' 
-		-translationdir '${datadir}/translations' 
-		-opensource -confirm-license -stl -verbose
-		"
-	
-	for module in ${IUSE}; do
-		if [ ${module} = "debug" ]; then
-			myconf+=" $(use debug && echo -debug || echo -release)"
-		else
-			myconf+=" $(use ${module} && echo -${module} || echo -no-${module})"
-		fi
-	done
-	! use webkit && myconf+=" -no-javascript-jit"
-
-	./configure ${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LINK="$(tc-getCXX)" || die "emake failed"
-}

diff --git a/x11-libs/qt-sql/qt-sql-4.7.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.7.9999.ebuild
deleted file mode 100644
index 5f8b332..0000000
--- a/x11-libs/qt-sql/qt-sql-4.7.9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="firebird freetds iconv mysql odbc postgres qt3support +sqlite"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support=,stable-branch=]
-	firebird? ( dev-db/firebird )
-	freetds? ( dev-db/freetds )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/sql src/plugins/sqldrivers"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt/
-		include/QtCore/
-		include/QtSql/
-		include/QtScript/
-		src/src.pro
-		src/corelib/
-		src/plugins
-		src/3rdparty
-		src/tools"
-
-	if ! ( use firebird || use freetds || 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 fretds mysql odbc postgres sqlite\"."
-		die "Enable at least one SQL driver."
-	fi
-
-	qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
-	qt4-build-edge_src_prepare
-
-	sed -e '/pg_config --libs/d' -i "${S}"/configure \
-		|| die "sed to fix postgresql usage in ./configure failed"
-}
-
-src_configure() {
-	# 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) $(use sqlite && echo '-system-sqlite')
-		$(qt_use odbc sql-odbc plugin)
-		$(qt_use freetds sql-tds plugin)
-		$(qt_use firebird sql-ibase plugin)
-		$(qt_use qt3support)"
-
-	myconf="${myconf} $(qt_use iconv) -no-xkb  -no-fontconfig -no-xrender
-		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-		-no-opengl -no-nas-sound -no-dbus -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 -no-gtkstyle"
-
-	qt4-build-edge_src_configure
-}

diff --git a/x11-libs/qt-svg/qt-svg-4.7.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.7.9999.ebuild
deleted file mode 100644
index 6baecaf..0000000
--- a/x11-libs/qt-svg/qt-svg-4.7.9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The SVG module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="iconv"
-
-DEPEND="~x11-libs/qt-gui-${PV}[debug=,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/svg
-		src/plugins/imageformats/svg
-		src/plugins/iconengines/svgiconengine"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtSvg/
-		include/Qt/
-		include/QtGui/
-		include/QtCore/
-		include/QtXml/
-		src/corelib/
-		src/gui/
-		src/plugins/
-		src/xml
-		src/3rdparty"
-
-	QCONFIG_ADD="svg"
-	QCONFIG_DEFINE="QT_SVG"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} $(qt_use iconv) -svg -no-xkb  -no-fontconfig -no-xrender
-		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-		-no-opengl -no-nas-sound -no-dbus -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-gtkstyle
-		-v -continue"
-	qt4-build-edge_src_configure
-}

diff --git a/x11-libs/qt-test/qt-test-4.7.9999.ebuild b/x11-libs/qt-test/qt-test-4.7.9999.ebuild
deleted file mode 100644
index add153e..0000000
--- a/x11-libs/qt-test/qt-test-4.7.9999.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The testing framework module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="iconv"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/testlib"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtTest/
-		include/QtCore/
-		src/corelib/"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} $(qt_use iconv) -no-xkb  -no-fontconfig -no-xrender
-		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
-		-no-opengl -no-nas-sound -no-dbus -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-edge_src_configure
-}

diff --git a/x11-libs/qt-webkit/qt-webkit-4.7.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.7.9999.ebuild
deleted file mode 100644
index 47bd0d8..0000000
--- a/x11-libs/qt-webkit/qt-webkit-4.7.9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The Webkit module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE="dbus +jit kde"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl,stable-branch=]
-	~x11-libs/qt-gui-${PV}[dbus?,debug=,stable-branch=]
-	~x11-libs/qt-xmlpatterns-${PV}[debug=,stable-branch=]
-	~x11-libs/qt-xmlpatterns-${PV}[debug=,stable-branch=]
-	dbus? ( ~x11-libs/qt-dbus-${PV}[debug=,stable-branch=] )
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[dbus=,debug=,stable-branch=]
-		media-libs/phonon ) )
-	kde? ( media-libs/phonon )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/3rdparty/webkit/JavaScriptCore
-		src/3rdparty/webkit/WebCore
-		tools/designer/src/plugins/qwebview"
-	QT4_EXTRACT_DIRECTORIES="
-		include/
-		src/
-		tools/"
-
-	QCONFIG_ADD="webkit"
-	QCONFIG_DEFINE="QT_WEBKIT"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_prepare() {
-	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
-	# drop qt_webkit_version.pri from installation files since qt-core
-	# installs it
-	sed -i "/INSTALLS += modfile/d" src/3rdparty/webkit/WebCore/WebCore.pro
-	sed -i "/INSTALLS += target headers modfile/s: modfile::" \
-		src/3rdparty/webkit/WebCore/WebCore.pro
-	qt4-build-edge_src_prepare
-}
-
-src_configure() {
-	myconf="${myconf} -system-sqlite -webkit $(qt_use jit javascript-jit) $(qt_use dbus qdbus)"
-	qt4-build-edge_src_configure
-}

diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.9999.ebuild
deleted file mode 100644
index aca4396..0000000
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.7.9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-inherit qt4-build-edge
-
-DESCRIPTION="The patternist module for the Qt toolkit"
-SLOT="4"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,exceptions,stable-branch=]"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/QtCore
-		include/QtNetwork
-		include/QtXml
-		include/QtXmlPatterns
-		src/network/
-		src/xml/
-		src/corelib/"
-
-	QCONFIG_ADD="xmlpatterns"
-	QCONFIG_DEFINE="QT_XMLPATTERNS"
-
-	qt4-build-edge_pkg_setup
-}
-
-src_configure() {
-	myconf="${myconf} -xmlpatterns"
-	qt4-build-edge_src_configure
-}