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

[Michael Palimaka]

commit:     d3ce129aa329b8c9556d1fa0add21a221825e584
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sat Mar 31 18:09:14 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sat Mar 31 18:09:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d3ce129a

[x11-libs/qt-*] Sync with portage.

(Portage version: 2.1.10.52/git/Linux x86_64, unsigned Manifest commit)

---
 x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild |  129 +++++++--------
 x11-libs/qt-core/qt-core-4.8.9999.ebuild           |   69 ++++----
 .../qt-dbus/files/qt-4.6-master-nolibx11.patch     |   20 ---
 .../qt-dbus-4.7-qdbusintegrator-no-const.patch     |   11 ++
 x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild           |   36 +++--
 .../qt-declarative/qt-declarative-4.8.9999.ebuild  |   70 ++++----
 x11-libs/qt-demo/qt-demo-4.8.9999.ebuild           |   53 ++++---
 x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch      |   84 +++++++++
 x11-libs/qt-gui/qt-gui-4.8.9999.ebuild             |  177 ++++++++++----------
 .../files/qt-multimedia-4.8.0-alsa.patch           |   25 +++
 .../qt-multimedia/qt-multimedia-4.8.9999.ebuild    |   85 +++++-----
 x11-libs/qt-opengl/files/qtbug-9691-Xdefs.patch    |   97 -----------
 x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild       |   64 ++++----
 x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild       |   57 ++++---
 x11-libs/qt-phonon/files/qtbug-9691-Xdefs.patch    |   97 -----------
 x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild       |   45 +++---
 .../qt-qt3support/qt-qt3support-4.8.9999.ebuild    |   42 +++---
 .../qt-script/files/qt-4.6-master-nolibx11.patch   |   20 ---
 x11-libs/qt-script/qt-script-4.8.9999.ebuild       |   55 ++++---
 x11-libs/qt-sql/files/qt-4.6-master-nolibx11.patch |   20 ---
 x11-libs/qt-sql/qt-sql-4.8.9999.ebuild             |   51 +++---
 x11-libs/qt-svg/qt-svg-4.8.9999.ebuild             |   57 ++++---
 .../qt-test/files/qt-4.6-master-nolibx11.patch     |   20 ---
 x11-libs/qt-test/qt-test-4.8.9999.ebuild           |   50 +++---
 .../files/qt-webkit-4.8.0-c++0x-fix.patch          |  101 +++++++++++
 x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild       |   50 +++---
 .../files/qt-4.6-master-nolibx11.patch             |   20 ---
 .../qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild  |   45 +++---
 28 files changed, 809 insertions(+), 841 deletions(-)

diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
index 71b63ee..f3bef74 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.9999.ebuild
@@ -2,88 +2,90 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
-	QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
 
-DESCRIPTION="The assistant help module for the Qt toolkit"
+DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
+SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
-else
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
 fi
 IUSE="compat doc +glib qt3support trace webkit"
-SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
 
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=,trace?]
-	~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=,sqlite]
-	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )"
+DEPEND="
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support=,trace?]
+	~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=,sqlite]
+	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,debug=,qpa=] )
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	# Pixeltool isn't really assistant related, but it relies on
-	# the assistant libraries. doc/qch/
+	# the assistant libraries.
 	QT4_TARGET_DIRECTORIES="
 		tools/assistant
 		tools/pixeltool
 		tools/qdoc3"
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="
-			tools/
-			demos/
-			examples/
-			src/
-			include/
-			doc/"
-	fi
+	QT4_EXTRACT_DIRECTORIES="
+		tools
+		demos
+		examples
+		src
+		include
+		doc"
+
+	use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay"
 
-	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		tools/qttracereplay"
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		${QT4_EXTRACT_DIRECTORIES}"
 
-	qt4-build${QT_ECLASS}_pkg_setup
+	qt4-build_pkg_setup
 }
 
 src_unpack() {
-	qt4-build${QT_ECLASS}_src_unpack
+	qt4-build_src_unpack
+
 	# compat version
 	# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
 	if use compat; then
-		unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz
-		mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \
+		unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
+		mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \
 			"${S}"/tools/assistant/compat ||
 				die "moving compat to the right place failed"
-		tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ ||
+		tar xzf "${FILESDIR}"/${PN}-4.7-include.tar.gz -C "${S}"/include/ ||
 			die "unpacking the include files failed"
 	fi
 }
 
 src_prepare() {
-	qt4-build${QT_ECLASS}_src_prepare
-	use compat && epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
+	qt4-build_src_prepare
+
+	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
 
 	# bug 401173
-	! use webkit && epatch "${FILESDIR}"/disable-webkit.patch
+	use webkit || epatch "${FILESDIR}"/disable-webkit.patch
 
 	# bug 348034
 	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
 }
 
 src_configure() {
-	myconf="${myconf} -no-xkb -no-fontconfig -no-xrandr
+	myconf+="
+		-no-xkb -no-fontconfig -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-svg $(qt_use qt3support) $(qt_use webkit)"
-	! use glib && myconf="${myconf} -no-glib"
+		-no-fontconfig -no-multimedia -no-svg
+		$(qt_use qt3support) $(qt_use webkit)"
+	use glib || myconf+=" -no-glib"
 
-	qt4-build${QT_ECLASS}_src_configure
+	qt4-build_src_configure
 }
 
 src_compile() {
@@ -91,51 +93,34 @@ src_compile() {
 	export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
 	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
 
-	qt4-build${QT_ECLASS}_src_compile
+	qt4-build_src_compile
 
 	# ugly hack to build docs
-	cd "${S}"
 	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
-	# live ebuild cannot build qch_docs. It will build them through emake docs
-	if [[ ${PV} != 4*9999 ]]; then
-		emake qch_docs || die "emake qch_docs failed "
-	fi
+
 	if use doc; then
-		emake docs || die "emake docs failed"
+		emake docs
+	else
+		emake qch_docs
 	fi
-	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die
 }
 
 src_install() {
-	qt4-build${QT_ECLASS}_src_install
-	cd "${S}"
-	#see src_compile note
-	if [[ ${PV} != 4*9999 ]]; then
-		emake INSTALL_ROOT="${D}" install_qchdocs \
-		|| die "failed to install qch docs"
-	fi
+	qt4-build_src_install
+
+	emake INSTALL_ROOT="${D}" install_qchdocs
+	# do not compress .qch files
+	docompress -x "${QTDOCDIR}"/qch
+
 	if use doc; then
-		emake INSTALL_ROOT="${D}" install_htmldocs \
-			|| die "failed to install htmldocs"
-		# Now it is time for the live ebuild to install the qch docs
-		if [[ ${PV} == 4*9999 ]]; then
-			emake INSTALL_ROOT="${D}" install_qchdocs \
-				|| die "failed to install qch docs"
-		fi
+		emake INSTALL_ROOT="${D}" install_htmldocs
 	fi
-	dobin "${S}"/bin/qdoc3 || die "Failed to install qdoc3"
-	# install correct assistant icon, bug 241208
-	dodir /usr/share/pixmaps/ || die "dodir failed"
-	insinto /usr/share/pixmaps/
-	doins tools/assistant/tools/assistant/images/assistant.png ||
-		die "doins failed"
-	# Note: absolute image path required here!
-	make_desktop_entry assistant Assistant \
-		"${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \
-			|| die "make_desktop_entry failed"
+
+	doicon tools/assistant/tools/assistant/images/assistant.png
+	make_desktop_entry assistant Assistant assistant 'Qt;Development'
 
 	if use compat; then
-		insinto /usr/share/qt4/mkspecs/features || die "insinto failed"
-		doins tools/assistant/compat/features/assistant.prf || die "doins failed"
+		insinto /usr/share/qt4/mkspecs/features
+		doins tools/assistant/compat/features/assistant.prf
 	fi
 }

diff --git a/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
index 71e7b4d..3a56e19 100644
--- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild
@@ -2,28 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
-	QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+glib iconv optimized-qmake qt3support ssl"
 
-DEPEND="sys-libs/zlib
+DEPEND="
+	sys-libs/zlib
 	glib? ( dev-libs/glib )
 	ssl? ( dev-libs/openssl )
+	!<x11-libs/cairo-1.10.2-r2
 	!<x11-libs/qt-4.4.0:4
-	!<x11-libs/cairo-1.10.2-r2"
+"
 RDEPEND="${DEPEND}"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support] )"
+PDEPEND="
+	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support] )
+"
 
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
@@ -66,16 +68,16 @@ pkg_setup() {
 			tools/linguist/shared
 			translations"
 	fi
-	qt4-build${QT_ECLASS}_pkg_setup
+	qt4-build_pkg_setup
 }
 
 src_prepare() {
 	# Don't pre-strip, bug 235026
-	for i in kr jp cn tw ; do
+	for i in kr jp cn tw; do
 		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
 	done
 
-	qt4-build${QT_ECLASS}_src_prepare
+	qt4-build_src_prepare
 
 	# bug 172219
 	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
@@ -98,29 +100,30 @@ src_configure() {
 		$(qt_use ssl openssl)
 		$(qt_use qt3support)"
 
-	qt4-build${QT_ECLASS}_src_configure
+	qt4-build_src_configure
 }
 
 src_install() {
-	dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
+	dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
 
 	install_directories src/{corelib,xml,network,plugins/codecs}
 
-	emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
+	emake INSTALL_ROOT="${D}" install_mkspecs
 
-	#install private headers
+	# install private headers
 	insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
-	find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
+	find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
 
 	# 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_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 \
+		LD_LIBRARY_PATH="${S}/lib" \
+		"${S}"/bin/lrelease translations/*.ts \
 		|| die "generating translations failed"
 	insinto "${QTTRANSDIR#${EPREFIX}}"
-	doins translations/*.qm || die "doins translations failed"
+	doins translations/*.qm
 
 	setqtenv
 	fix_library_files
@@ -131,23 +134,22 @@ src_install() {
 		libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
 	done
 
-	cat <<-EOF > "${T}/44qt4"
+	cat <<-EOF > "${T}"/44qt4
 	LDPATH="${libdirs:1}"
 	EOF
-	doenvd "${T}/44qt4"
+	doenvd "${T}"/44qt4
 
-	dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo || die "dodir failed"
+	dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
 	mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
-		|| die "Failed to move qconfig.pri"
+		|| die "failed to move qconfig.pri"
 
 	# Framework hacking
-	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
-		#TODO do this better
+	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+		# TODO: do this better
 		sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
 				"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
 			|| die "sed for qconfig.h failed."
-		dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo ||
-			die "dosym failed"
+		dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
 	else
 		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
 				"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
@@ -155,11 +157,8 @@ src_install() {
 			|| die "sed for qconfig.h failed"
 	fi
 
-	if use glib; then
-		QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
-			$(use ssl && echo QT_OPENSSL)"
-		install_qconfigs
-	fi
+	QCONFIG_DEFINE="QT_ZLIB"
+	install_qconfigs
 
 	# remove .la files
 	find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm

diff --git a/x11-libs/qt-dbus/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-dbus/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-dbus/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then

diff --git a/x11-libs/qt-dbus/files/qt-dbus-4.7-qdbusintegrator-no-const.patch b/x11-libs/qt-dbus/files/qt-dbus-4.7-qdbusintegrator-no-const.patch
new file mode 100644
index 0000000..086eb47
--- /dev/null
+++ b/x11-libs/qt-dbus/files/qt-dbus-4.7-qdbusintegrator-no-const.patch
@@ -0,0 +1,11 @@
+--- src/dbus/qdbusintegrator.cpp.orig	2011-03-12 02:11:32.313467991 +0100
++++ src/dbus/qdbusintegrator.cpp	2011-03-12 02:11:03.795809176 +0100
+@@ -71,7 +71,7 @@
+ static bool isDebugging;
+ #define qDBusDebug              if (!::isDebugging); else qDebug
+ 
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+ 
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }

diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
index 3975740..cd9c7d8 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.9999.ebuild
@@ -2,33 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
-	QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The DBus module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE=""
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]
-	>=sys-apps/dbus-1.0.2"
+DEPEND="
+	>=sys-apps/dbus-1.2
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
+)
+
 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"
 
 	if [[ ${PV} != 4*9999 ]]; then
 		QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
@@ -39,10 +41,14 @@ pkg_setup() {
 			src/xml"
 	fi
 
-	qt4-build${QT_ECLASS}_pkg_setup
+	QCONFIG_ADD="dbus dbus-linked"
+	QCONFIG_DEFINE="QT_DBUS"
+
+	qt4-build_pkg_setup
 }
 
 src_configure() {
-	myconf="${myconf} -dbus-linked"
-	qt4-build${QT_ECLASS}_src_configure
+	myconf+=" -dbus-linked"
+
+	qt4-build_src_configure
 }

diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
index 186934a..10a1211 100644
--- a/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
+++ b/x11-libs/qt-declarative/qt-declarative-4.8.9999.ebuild
@@ -1,35 +1,34 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The Declarative module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
-
 IUSE="+accessibility qt3support webkit"
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
-	~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support=]
-	~x11-libs/qt-opengl-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
-	~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
-	~x11-libs/qt-svg-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
-	qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=] )
-	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,qpa=,debug=] )
-	"
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+	~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support=]
+	~x11-libs/qt-opengl-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+	~x11-libs/qt-svg-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=]
+	qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=] )
+	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,c++0x=,debug=,qpa=] )
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	QCONFIG_ADD="declarative"
-
 	QT4_TARGET_DIRECTORIES="
 		src/declarative
 		src/imports
@@ -38,33 +37,40 @@ pkg_setup() {
 		tools/qmlplugindump"
 
 	if use webkit; then
-		QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-			src/3rdparty/webkit/Source/WebKit/qt/declarative"
+		QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
 	fi
 
 	QT4_EXTRACT_DIRECTORIES="
-		include/
-		src/
-		tools/
-		translations/"
+		include
+		src
+		tools
+		translations"
 
-	qt4-build-edge_pkg_setup
+	QCONFIG_ADD="declarative"
+	QCONFIG_DEFINE="QT_DECLARATIVE"
+
+	qt4-build_pkg_setup
 }
 
 src_configure() {
-	myconf="${myconf} -declarative -no-gtkstyle
-			$(qt_use accessibility) $(qt_use qt3support) $(qt_use webkit)"
-	qt4-build-edge_src_configure
+	myconf+="
+		-declarative -no-gtkstyle
+		$(qt_use accessibility)
+		$(qt_use qt3support)
+		$(qt_use webkit)"
+	qt4-build_src_configure
 }
 
 src_install() {
-	qt4-build-edge_src_install
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
+	qt4-build_src_install
+
+	# install private headers
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
 		insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
 		# ran for the 2nd time, need it for the updated headers
 		fix_includes
 	else
 		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
 	fi
-	find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
+	find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
 }

diff --git a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
index 5205aaa..e7188d5 100644
--- a/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
+++ b/x11-libs/qt-demo/qt-demo-4.8.9999.ebuild
@@ -1,60 +1,67 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.1.ebuild,v 1.1 2012/03/29 22:11:13 pesa Exp $
 
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="Demonstration module of the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 IUSE="kde qt3support"
 
-DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+DEPEND="
+	~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
 	~x11-libs/qt-core-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
 	~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
 	~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,webkit]
 	~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
 	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
 	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-		media-libs/phonon[aqua=,debug=] ) )
-	kde? ( media-libs/phonon[aqua=,debug=] )
+	kde? ( media-libs/phonon[aqua=] )
+	!kde? ( || (
+		~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+		media-libs/phonon[aqua=]
+	) )
 	~x11-libs/qt-script-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
 	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
 	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
 	~x11-libs/qt-test-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
 	~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]"
-
+	~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.6-plugandpaint.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
+)
 
 pkg_setup() {
-	QT4_TARGET_DIRECTORIES="demos
+	QT4_TARGET_DIRECTORIES="
+		demos
 		examples"
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		doc/src/images
-		src/
-		include/
-		tools/"
+		src
+		include
+		tools"
 
-	qt4-build-edge_pkg_setup
+	qt4-build_pkg_setup
 }
 
 src_configure() {
-	myconf="${myconf} $(qt_use qt3support) -no-openvg"
-	qt4-build-edge_src_configure
+	myconf="${myconf} $(qt_use qt3support)"
+	qt4-build_src_configure
 }
 
 src_install() {
 	insinto "${QTDOCDIR#${EPREFIX}}"/src
-	doins -r "${S}"/doc/src/images || die "Installing images failed."
+	doins -r "${S}"/doc/src/images
 
-	qt4-build-edge_src_install
+	qt4-build_src_install
 }

diff --git a/x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch b/x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch
new file mode 100644
index 0000000..e0305e1
--- /dev/null
+++ b/x11-libs/qt-gui/files/qt-gui-4.7.3-cups.patch
@@ -0,0 +1,84 @@
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
+@@ -569,6 +569,32 @@
+ void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
+ {
+     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
++
++    if (cups) {
++        const ppd_option_t* duplex = cups->ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                options.duplexShort->setChecked(true);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                options.duplexLong->setChecked(true);
++            else
++                options.noDuplex->setChecked(true);
++        }
++
++        if (cups->currentPPD()) {
++            // set default color
++            if (cups->currentPPD()->color_device)
++                options.color->setChecked(true);
++            else
++                options.grayscale->setChecked(true);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups->ppdOption("Collate");
++        if (collate)
++            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
++    }
+ }
+ #endif
+ 
+diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
+--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
+@@ -627,6 +627,44 @@
+                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
+         setOutputFormat(QPrinter::PdfFormat);
+     }
++
++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
++    // fill in defaults from ppd file
++    QCUPSSupport cups;
++
++    int printernum = -1;
++    for (int i = 0; i < cups.availablePrintersCount(); i++) {
++        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
++            printernum = i;
++    }
++    if (printernum >= 0) {
++        cups.setCurrentPrinter(printernum);
++
++        const ppd_option_t* duplex = cups.ppdOption("Duplex");
++        if (duplex) {
++            // copy default ppd duplex to qt dialog
++            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
++                setDuplex(DuplexShortSide);
++            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
++                setDuplex(DuplexLongSide);
++            else
++                setDuplex(DuplexNone);
++        }
++
++        if (cups.currentPPD()) {
++            // set default color
++            if (cups.currentPPD()->color_device)
++                setColorMode(Color);
++            else
++                setColorMode(GrayScale);
++        }
++
++        // set collation
++        const ppd_option_t *collate = cups.ppdOption("Collate");
++        if (collate)
++            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
++    }
++#endif
+ }
+ 
+ /*!

diff --git a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
index fb41abd..309bd3b 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.9999.ebuild
@@ -2,21 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
-	QT_ECLASS="-edge"
-fi
-inherit eutils confutils qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The GUI module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
+IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
 
-IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama"
+REQUIRED_USE="
+	gtkstyle? ( glib )
+"
 
 RDEPEND="
 	app-admin/eselect-qtgraphicssystem
@@ -28,13 +29,16 @@ RDEPEND="
 	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,glib=,qt3support=]
 	~x11-libs/qt-script-${PV}[aqua=,c++0x=,qpa=,debug=]
 	!aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
 		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
 		x11-libs/libXcursor
-		x11-libs/libXfont
-		x11-libs/libSM
+		x11-libs/libXext
 		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
 	)
 	cups? ( net-print/cups )
 	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
@@ -43,16 +47,20 @@ RDEPEND="
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
 	tiff? ( media-libs/tiff:0 )
-	xinerama? ( x11-libs/libXinerama )"
+"
 DEPEND="${RDEPEND}
 	!aqua? (
-		x11-proto/xextproto
 		x11-proto/inputproto
+		x11-proto/xextproto
+		xinerama? ( x11-proto/xineramaproto )
+		xv? ( x11-proto/videoproto )
 	)
-	xinerama? ( x11-proto/xineramaproto )"
-RDEPEND="${RDEPEND}
-	!~x11-themes/qgtkstyle-4.7.2"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,qpa=,debug=] )"
+"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,debug=,qpa=] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.3-cups.patch"
+)
 
 pkg_setup() {
 	# this belongs to pkg_pretend, we have to upgrade to EAPI 4 :)
@@ -73,11 +81,9 @@ pkg_setup() {
 		eerror "re-enable the disabled use flag and/or reinstall cairo."
 		ewarn
 		echo
-		die "can't build qt-gui with gtkstyle USE if cairo has qt4 USE enabled"
+		die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled"
 	fi
 
-	confutils_use_depend_all gtkstyle glib
-
 	QT4_TARGET_DIRECTORIES="
 		src/gui
 		src/scripttools
@@ -88,32 +94,33 @@ pkg_setup() {
 		src/plugins/imageformats/jpeg
 		src/plugins/inputmethods"
 
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="
-			include
-			src
-			tools"
-	fi
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools"
 
+	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
 	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}"
-
 	# mac version does not contain qtconfig?
 	[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
 
-	qt4-build${QT_ECLASS}_pkg_setup
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
 }
 
 src_prepare() {
-	qt4-build${QT_ECLASS}_src_prepare
+	qt4-build_src_prepare
+
+	# Add -xvideo to the list of accepted configure options
+	sed -i -e 's:|-xinerama|:&-xvideo|:' configure
 
 	# 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 || die
+	sed -i -e 's:CONFIG(shared:# &:g' tools/designer/src/src.pro
 }
 
 src_configure() {
@@ -122,8 +129,10 @@ src_configure() {
 
 	myconf="$(qt_use accessibility)
 		$(qt_use cups)
+		$(use gif || echo -no-gif)
 		$(qt_use glib)
 		$(qt_use mng libmng system)
+		$(qt_use nas nas-sound system)
 		$(qt_use nis)
 		$(qt_use tiff libtiff system)
 		$(qt_use dbus qdbus)
@@ -131,46 +140,56 @@ src_configure() {
 		$(qt_use egl)
 		$(qt_use qt3support)
 		$(qt_use gtkstyle)
-		$(qt_use xinerama)"
+		$(qt_use xinerama)
+		$(qt_use xv xvideo)"
 
-	use gif || myconf="${myconf} -no-gif"
-	use nas	&& myconf="${myconf} -system-nas-sound"
+	myconf+="
+		-system-libpng -system-libjpeg
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
+		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
 
-	[[ x86_64-apple-darwin* ]] && myconf="${myconf} -no-ssse3" #367045
+	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
 
-	myconf="${myconf} -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${QT_ECLASS}_src_configure
+	qt4-build_src_configure
 
 	if use gtkstyle; then
 		einfo "patching the Makefile to fix qgtkstyle compilation"
 		sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile ||
 			die "sed failed"
 	fi
-	einfo "patching the Makefile to fix bug #361277"
-	sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile ||
-		die "sed failed"
+	sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || die "sed failed"
 }
 
 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
+	QCONFIG_ADD="
+		mitshm x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
+		fontconfig gif png system-png jpeg system-jpeg
+		$(usev accessibility)
+		$(usev cups)
 		$(use mng && echo system-mng)
-		$(use tiff && echo system-tiff)"
-	QCONFIG_REMOVE="no-gif no-png"
+		$(usev nas)
+		$(usev nis)
+		$(use tiff && echo system-tiff)
+		$(usev xinerama)
+		$(use xv && echo xvideo)"
+	QCONFIG_REMOVE="no-gif no-jpeg no-png"
 	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
+			$(use cups && echo QT_CUPS)
+			$(use egl && echo QT_EGL)
+			QT_FONTCONFIG
+			$(use gtkstyle && echo QT_STYLE_GTK)
+			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
 			$(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"
+			$(use nis && echo QT_NIS)
+			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
+			QT_SESSIONMANAGER QT_SHAPE QT_XCURSOR QT_XFIXES
+			$(use xinerama && echo QT_XINERAMA)
+			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
+			$(use xv && echo QT_XVIDEO)"
 
-	qt4-build${QT_ECLASS}_src_install
+	qt4-build_src_install
 
 	# qt-creator
 	# some qt-creator headers are located
@@ -184,51 +203,39 @@ src_install() {
 	else
 		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
 	fi
-	doins "${S}"/tools/designer/src/lib/shared/* || die
-	doins "${S}"/tools/designer/src/lib/sdk/* || die
-
-	#touch the available graphics systems
-	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
-		die "could not create ${ED}/usr/share/qt4/graphicssystems/"
-	echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
-		die "could not create ${ED}/usr/share/qt4/graphicssystems/raster"
-	touch "${ED}/usr/share/qt4/graphicssystems/native" ||
-		die "could not touch ${ED}/usr/share/qt4/graphicssystems/native"
-
-	#install private headers
+	doins "${S}"/tools/designer/src/lib/shared/*
+	doins "${S}"/tools/designer/src/lib/sdk/*
+
+	# install private headers
 	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
 		insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
 	else
 		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
 	fi
-	find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \;
+	find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
 
 	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
 		# rerun to get links to headers right
 		fix_includes
 	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 "doicon failed"
-	# Note: absolute image path required here!
-	make_desktop_entry linguist Linguist \
-			/usr/share/pixmaps/linguist-128-32.png \
-			'Qt;Development;GUIDesigner' \
-			|| die "linguist make_desktop_entry failed"
-	make_desktop_entry designer Designer \
-			/usr/share/pixmaps/designer.png \
-			'Qt;Development;GUIDesigner' \
-			|| die "designer make_desktop_entry failed"
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
+	touch "${ED}"/usr/share/qt4/graphicssystems/native || die
+
+	doicon tools/designer/src/designer/images/designer.png \
+		tools/linguist/linguist/images/icons/linguist-128-32.png
+	make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner'
+	make_desktop_entry linguist Linguist linguist-128-32 'Qt;Development;GUIDesigner'
 }
 
 pkg_postinst() {
 	# raster is the default graphicssystems, set it if first install
 	eselect qtgraphicssystem set raster --use-old
-	elog "Starting with qt 4.8.0, you may choose the active Qt Graphics System"
+	elog "Starting with Qt 4.8.0, you may choose the active Qt Graphics System"
 	elog "by using a new eselect module called qtgraphicssystem."
 	elog "Run"
 	elog "  eselect qtgraphicssystem"
-	elog "for more information"
+	elog "for more information."
 }

diff --git a/x11-libs/qt-multimedia/files/qt-multimedia-4.8.0-alsa.patch b/x11-libs/qt-multimedia/files/qt-multimedia-4.8.0-alsa.patch
new file mode 100644
index 0000000..8bd40ed
--- /dev/null
+++ b/x11-libs/qt-multimedia/files/qt-multimedia-4.8.0-alsa.patch
@@ -0,0 +1,25 @@
+--- qt-everywhere-opensource-src-4.8.0.orig/configure	2012-03-13 00:45:02.502205702 +0100
++++ qt-everywhere-opensource-src-4.8.0/configure	2012-03-13 00:47:40.386231881 +0100
+@@ -1049,7 +1049,7 @@
+         VAL=no
+         ;;
+     #Qt style yes options
+-    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
++    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu|-alsa)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         VAL=yes
+         ;;
+@@ -2399,6 +2399,13 @@
+         else
+             UNKNOWN_OPT=yes
+         fi
++        ;;
++    alsa)
++        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
++            CFG_ALSA="$VAL"
++        else
++            UNKNOWN_OPT=yes
++        fi
+         ;;
+     *)
+         UNKNOWN_OPT=yes

diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
index 86483d8..a86bd6b 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.9999.ebuild
@@ -2,56 +2,59 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
 
-DESCRIPTION="The Qt multimedia module"
+inherit qt4-build
+
+DESCRIPTION="The Multimedia module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 fi
+IUSE="alsa"
 
-IUSE="iconv"
-
-DEPEND="!aqua? ( media-libs/alsa-lib )
-	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]"
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,qpa=]
+	alsa? ( media-libs/alsa-lib )
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
+)
+
 pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/multimedia"
-
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-			include/Qt/
-			include/QtCore/
-			include/QtGui/
-			include/QtMultimedia/
-			include/QtNetwork/
-			src/src.pro
-			src/3rdparty/
-			src/corelib/
-			src/gui/
-			src/network/
-			src/plugins/
-			src/tools/"
-	fi
-
-	qt4-build-edge_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"
+
+	QCONFIG_ADD="multimedia"
+	QCONFIG_DEFINE="QT_MULTIMEDIA"
+
+	qt4-build_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
+	myconf+="
+		-multimedia -audio-backend
+		$(qt_use alsa)
+		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
+		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
+
+	qt4-build_src_configure
 }

diff --git a/x11-libs/qt-opengl/files/qtbug-9691-Xdefs.patch b/x11-libs/qt-opengl/files/qtbug-9691-Xdefs.patch
deleted file mode 100644
index dfd351d..0000000
--- a/x11-libs/qt-opengl/files/qtbug-9691-Xdefs.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- qt/src/opengl/qglpaintdevice.cpp.ark	2010-04-12 17:10:24.569947561 +0200
-+++ qt/src/opengl/qglpaintdevice.cpp	2010-04-12 17:17:02.170326744 +0200
-@@ -39,8 +39,15 @@
- **
- ****************************************************************************/
- 
-+#include <QtCore/qglobal.h>
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // for Bool
-+#endif
- #include <private/qglpaintdevice_p.h>
- #include <private/qgl_p.h>
-+#if defined(Q_WS_X11) && !defined(Status)
-+#define Status int
-+#endif
- #include <private/qglpixelbuffer_p.h>
- #include <private/qglframebufferobject_p.h>
- #include <private/qwindowsurface_gl_p.h>
---- qt/src/opengl/qglpixelbuffer.cpp.ark	2010-04-12 17:11:21.820358541 +0200
-+++ qt/src/opengl/qglpixelbuffer.cpp	2010-04-12 17:12:35.950561190 +0200
-@@ -82,6 +82,10 @@
- #include <private/qpaintengineex_opengl2_p.h>
- #endif
- 
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // for Bool, needed by GL/glx.h
-+#define Status int
-+#endif
- #include <qglpixelbuffer.h>
- #include <private/qglpixelbuffer_p.h>
- #include <qimage.h>
---- qt/src/opengl/qglpixelbuffer_x11.cpp.ark	2010-04-12 17:21:23.483840735 +0200
-+++ qt/src/opengl/qglpixelbuffer_x11.cpp	2010-04-12 17:22:39.463626818 +0200
-@@ -40,11 +40,15 @@
- ****************************************************************************/
- #include <qlibrary.h>
- #include <qdebug.h>
--#include <private/qgl_p.h>
- #include <private/qt_x11_p.h>
-+#include <private/qgl_p.h>
- #include <private/qpaintengine_opengl_p.h>
- 
- #include <qx11info_x11.h>
-+#include <X11/Xdefs.h> // for Bool
-+#ifndef Status
-+#define Status int
-+#endif
- #include <GL/glx.h>
- #include <qimage.h>
- 
---- qt/src/opengl/qgl_x11.cpp.ark	2010-04-12 17:20:07.366862655 +0200
-+++ qt/src/opengl/qgl_x11.cpp	2010-04-12 17:21:02.240510982 +0200
-@@ -39,9 +39,6 @@
- **
- ****************************************************************************/
- 
--#include "qgl.h"
--#include "qgl_p.h"
--
- #include "qmap.h"
- #include "qapplication.h"
- #include "qcolormap.h"
-@@ -82,6 +79,11 @@
- #endif // Q_OS_VXWORKS
- #include <X11/Xatom.h>
- 
-+#include "qgl.h"
-+#include "qgl_p.h"
-+
-+#include <X11/Xdefs.h>
-+
- #if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)
- #include <dlfcn.h>
- #endif
---- qt/src/opengl/qpaintengine_opengl.cpp.ark	2010-04-12 17:17:13.883240412 +0200
-+++ qt/src/opengl/qpaintengine_opengl.cpp	2010-04-12 17:18:26.056568593 +0200
-@@ -48,6 +48,10 @@
- #include "qapplication.h"
- #include "qbrush.h"
- #include "qgl.h"
-+#include <qglobal.h>
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // Needed for Bool, needed by GL/glx.h
-+#endif
- #include <private/qgl_p.h>
- #include <private/qglpaintdevice_p.h>
- #include <private/qpainter_p.h>
-@@ -57,6 +61,9 @@
- #include "qpen.h"
- #include "qvarlengtharray.h"
- #include <private/qpainter_p.h>
-+#ifdef Q_WS_X11
-+#define Status int
-+#endif
- #include <private/qglpixelbuffer_p.h>
- #include <private/qbezier_p.h>
- #include <qglframebufferobject.h>

diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
index a87661a..83838d3 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.8.9999.ebuild
@@ -2,65 +2,63 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
-	QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The OpenGL module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-
 IUSE="egl qt3support"
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
-	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,egl=,qt3support=]
-	virtual/opengl"
+DEPEND="
+	virtual/opengl
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,egl=,qpa=,qt3support=]
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/opengl
 		src/plugins/graphicssystems/opengl"
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="
-			include/QtCore
-			include/QtGui
-			include/QtOpenGL
-			src/corelib
-			src/gui
-			src/opengl
-			src/plugins
-			src/3rdparty"
-	fi
+
+	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${QT_ECLASS}_pkg_setup
+	QCONFIG_DEFINE="QT_OPENGL"
+
+	qt4-build_pkg_setup
 }
 
 src_configure() {
-	myconf="${myconf} -opengl
+	myconf+="
+		-opengl
 		$(qt_use qt3support)
 		$(qt_use egl)"
 
-	qt4-build${QT_ECLASS}_src_configure
+	qt4-build_src_configure
 
 	# Not building tools/designer/src/plugins/tools/view3d as it's
 	# commented out of the build in the source
 }
 
 src_install() {
-	qt4-build${QT_ECLASS}_src_install
+	qt4-build_src_install
 
-	#touch the available graphics systems
-	mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
-		die "could not create ${ED}/usr/share/qt4/graphicssystems/"
-	echo "experimental" > "${ED}/usr/share/qt4/graphicssystems/opengl" ||
-		die "could not create ${ED}/usr/share/qt4/graphicssystems/opengl"
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
 }

diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
index 14ab72f..1cd981c 100644
--- a/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
+++ b/x11-libs/qt-openvg/qt-openvg-4.8.9999.ebuild
@@ -2,60 +2,61 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The OpenVG module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
 else
-	KEYWWORDS=""
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-
 IUSE="qt3support"
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
+DEPEND="
+	media-libs/mesa[egl,openvg]
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
 	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,egl,qpa=,qt3support=]
-	media-libs/mesa[openvg]"
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/openvg
 		src/plugins/graphicssystems/openvg"
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="
-			include/QtCore
-			include/QtGui
-			include/QtOpenVG
-			src/corelib
-			src/gui
-			src/openvg
-			src/plugins
-			src/3rdparty"
-	fi
+
+	QT4_EXTRACT_DIRECTORIES="
+		include/QtCore
+		include/QtGui
+		include/QtOpenVG
+		src/corelib
+		src/gui
+		src/openvg
+		src/plugins
+		src/3rdparty"
+
 	QCONFIG_ADD="openvg"
 	QCONFIG_DEFINE="QT_OPENVG"
 
-	qt4-build-edge_pkg_setup
+	qt4-build_pkg_setup
 }
 
 src_configure() {
 	gltype="desktop"
 
-	myconf="${myconf} -openvg -egl
+	myconf+="
+		-openvg -egl
 		$(qt_use qt3support)"
 
-	qt4-build-edge_src_configure
+	qt4-build_src_configure
 }
 
 src_install() {
-	qt4-build-edge_src_install
+	qt4-build_src_install
 
-	#touch the available graphics systems
-	mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||
-		die "could not create ${D}/usr/share/qt4/graphicssystems/"
-	echo "experimental" > "${D}/usr/share/qt4/graphicssystems/openvg" ||
-		die "could not create ${D}/usr/share/qt4/graphicssystems/openvg"
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
 }

diff --git a/x11-libs/qt-phonon/files/qtbug-9691-Xdefs.patch b/x11-libs/qt-phonon/files/qtbug-9691-Xdefs.patch
deleted file mode 100644
index dfd351d..0000000
--- a/x11-libs/qt-phonon/files/qtbug-9691-Xdefs.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- qt/src/opengl/qglpaintdevice.cpp.ark	2010-04-12 17:10:24.569947561 +0200
-+++ qt/src/opengl/qglpaintdevice.cpp	2010-04-12 17:17:02.170326744 +0200
-@@ -39,8 +39,15 @@
- **
- ****************************************************************************/
- 
-+#include <QtCore/qglobal.h>
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // for Bool
-+#endif
- #include <private/qglpaintdevice_p.h>
- #include <private/qgl_p.h>
-+#if defined(Q_WS_X11) && !defined(Status)
-+#define Status int
-+#endif
- #include <private/qglpixelbuffer_p.h>
- #include <private/qglframebufferobject_p.h>
- #include <private/qwindowsurface_gl_p.h>
---- qt/src/opengl/qglpixelbuffer.cpp.ark	2010-04-12 17:11:21.820358541 +0200
-+++ qt/src/opengl/qglpixelbuffer.cpp	2010-04-12 17:12:35.950561190 +0200
-@@ -82,6 +82,10 @@
- #include <private/qpaintengineex_opengl2_p.h>
- #endif
- 
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // for Bool, needed by GL/glx.h
-+#define Status int
-+#endif
- #include <qglpixelbuffer.h>
- #include <private/qglpixelbuffer_p.h>
- #include <qimage.h>
---- qt/src/opengl/qglpixelbuffer_x11.cpp.ark	2010-04-12 17:21:23.483840735 +0200
-+++ qt/src/opengl/qglpixelbuffer_x11.cpp	2010-04-12 17:22:39.463626818 +0200
-@@ -40,11 +40,15 @@
- ****************************************************************************/
- #include <qlibrary.h>
- #include <qdebug.h>
--#include <private/qgl_p.h>
- #include <private/qt_x11_p.h>
-+#include <private/qgl_p.h>
- #include <private/qpaintengine_opengl_p.h>
- 
- #include <qx11info_x11.h>
-+#include <X11/Xdefs.h> // for Bool
-+#ifndef Status
-+#define Status int
-+#endif
- #include <GL/glx.h>
- #include <qimage.h>
- 
---- qt/src/opengl/qgl_x11.cpp.ark	2010-04-12 17:20:07.366862655 +0200
-+++ qt/src/opengl/qgl_x11.cpp	2010-04-12 17:21:02.240510982 +0200
-@@ -39,9 +39,6 @@
- **
- ****************************************************************************/
- 
--#include "qgl.h"
--#include "qgl_p.h"
--
- #include "qmap.h"
- #include "qapplication.h"
- #include "qcolormap.h"
-@@ -82,6 +79,11 @@
- #endif // Q_OS_VXWORKS
- #include <X11/Xatom.h>
- 
-+#include "qgl.h"
-+#include "qgl_p.h"
-+
-+#include <X11/Xdefs.h>
-+
- #if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)
- #include <dlfcn.h>
- #endif
---- qt/src/opengl/qpaintengine_opengl.cpp.ark	2010-04-12 17:17:13.883240412 +0200
-+++ qt/src/opengl/qpaintengine_opengl.cpp	2010-04-12 17:18:26.056568593 +0200
-@@ -48,6 +48,10 @@
- #include "qapplication.h"
- #include "qbrush.h"
- #include "qgl.h"
-+#include <qglobal.h>
-+#ifdef Q_WS_X11
-+#include <X11/Xdefs.h> // Needed for Bool, needed by GL/glx.h
-+#endif
- #include <private/qgl_p.h>
- #include <private/qglpaintdevice_p.h>
- #include <private/qpainter_p.h>
-@@ -57,6 +61,9 @@
- #include "qpen.h"
- #include "qvarlengtharray.h"
- #include <private/qpainter_p.h>
-+#ifdef Q_WS_X11
-+#define Status int
-+#endif
- #include <private/qglpixelbuffer_p.h>
- #include <private/qbezier_p.h>
- #include <qglframebufferobject.h>

diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
index 85980f4..efb3818 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.8.9999.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.7.4.ebuild,v 1.1 2011/09/08 09:21:01 wired Exp $
+# $Header: $
 
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The Phonon module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-
 IUSE="dbus qt3support"
 
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+DEPEND="
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
 	!kde-base/phonon-kde
 	!kde-base/phonon-xine
 	!media-libs/phonon
 	!media-sound/phonon
 	!aqua? ( media-libs/gstreamer
-			 media-plugins/gst-plugins-meta )
+		 media-plugins/gst-plugins-meta )
 	aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )"
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,c++0x=,qpa=,debug=] )
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -31,23 +33,24 @@ pkg_setup() {
 		src/phonon
 		src/plugins/phonon
 		tools/designer/src/plugins/phononwidgets"
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-			include/
-			src
-			tools"
-	fi
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include
+		src
+		tools"
 
 	QCONFIG_ADD="phonon"
-	use aqua || QCONFIG_DEFINE="QT_GSTREAMER"
+	QCONFIG_DEFINE="QT_PHONON
+			$(use !aqua && echo QT_GSTREAMER)"
 
-	qt4-build-edge_pkg_setup
+	qt4-build_pkg_setup
 }
 
 src_configure() {
-	myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg
+	myconf+="
+		-phonon -phonon-backend -no-opengl -no-svg
 		$(qt_use dbus qdbus)
 		$(qt_use qt3support)"
 
-	qt4-build-edge_src_configure
+	qt4-build_src_configure
 }

diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
index 59b4e58..2978a7f 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.9999.ebuild
@@ -1,27 +1,25 @@
 # Copyright 1999-2012 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.7.4.ebuild,v 1.1 2011/09/08 09:21:19 wired Exp $
+# $Header: $
 
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
-	QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS}
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The Qt3 support module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-
 IUSE="+accessibility"
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]
-	~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,qpa=,debug=,qt3support]
-	~x11-libs/qt-sql-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support]"
-
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support]
+	~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=,qt3support]
+	~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support]
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -30,15 +28,19 @@ pkg_setup() {
 		src/tools/uic3
 		tools/designer/src/plugins/widgets
 		tools/porting"
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="src include tools"
-	fi
 
-	qt4-build${QT_ECLASS}_pkg_setup
+	QT4_EXTRACT_DIRECTORIES="
+		src
+		include
+		tools"
+
+	qt4-build_pkg_setup
 }
 
 src_configure() {
-	myconf="${myconf} -qt3support
+	myconf+="
+		-qt3support
 		$(qt_use accessibility)"
-	qt4-build${QT_ECLASS}_src_configure
+
+	qt4-build_src_configure
 }

diff --git a/x11-libs/qt-script/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-script/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-script/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then

diff --git a/x11-libs/qt-script/qt-script-4.8.9999.ebuild b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
index 24d6b3c..0c84dda 100644
--- a/x11-libs/qt-script/qt-script-4.8.9999.ebuild
+++ b/x11-libs/qt-script/qt-script-4.8.9999.ebuild
@@ -2,50 +2,59 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The ECMAScript module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="iconv +jit"
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]"
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/script/"
-
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt/
-		include/QtCore/
-		include/QtScript/
-		src/3rdparty/javascriptcore/
-		src/corelib/"
-	fi
-
-	qt4-build-edge_pkg_setup
+	QT4_TARGET_DIRECTORIES="
+		src/script"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtScript
+		src/3rdparty/javascriptcore
+		src/corelib"
+
+	QCONFIG_ADD="script"
+	QCONFIG_DEFINE="QT_SCRIPT"
+
+	qt4-build_pkg_setup
 }
 
 src_configure() {
-	myconf="${myconf} $(qt_use iconv) $(qt_use jit javascript-jit) -no-xkb
-		-no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
+	myconf+="
+		$(qt_use iconv)
+		$(qt_use jit javascript-jit)
+		-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
+
+	qt4-build_src_configure
 }
 
 src_install() {
 	qt4-build_src_install
-	#install private headers
+
+	# install private headers
 	insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
-	find "${S}"/src/script -type f -name "*_p.h" -exec doins {} \;
+	find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
 }

diff --git a/x11-libs/qt-sql/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-sql/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-sql/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then

diff --git a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
index 6f5dca6..d783419 100644
--- a/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.8.9999.ebuild
@@ -1,55 +1,50 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-if [[ ${PV} == 4*9999 ]]; then
-	QT_ECLASS="-edge"
-fi
+EAPI=4
 
-inherit qt4-build${QT_ECLASS}
+inherit qt4-build
 
 DESCRIPTION="The SQL module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="firebird freetds mysql odbc postgres qt3support +sqlite"
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+REQUIRED_USE="
+	|| ( firebird freetds mysql odbc postgres sqlite )
+"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=,qt3support=]
 	firebird? ( dev-db/firebird )
 	freetds? ( dev-db/freetds )
 	mysql? ( virtual/mysql )
 	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
 	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )"
+	sqlite? ( dev-db/sqlite:3 )
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
-	src/sql
-	src/plugins/sqldrivers"
+		src/sql
+		src/plugins/sqldrivers"
 
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		include/Qt/
-		include/QtCore/
-		include/QtSql/
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtSql
 		src/src.pro
-		src/corelib/
+		src/corelib
 		src/plugins
 		src/tools/tools.pro"
-	fi
-
-	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 freetds mysql odbc postgres sqlite \""
-		die "Enable at least one SQL driver."
-	fi
 
-	qt4-build${QT_ECLASS}_pkg_setup
+	qt4-build_pkg_setup
 }
 
 src_configure() {
@@ -73,5 +68,5 @@ src_configure() {
 		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
 		-no-glib"
 
-	qt4-build${QT_ECLASS}_src_configure
+	qt4-build_src_configure
 }

diff --git a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
index 1c363da..478df04 100644
--- a/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
+++ b/x11-libs/qt-svg/qt-svg-4.8.9999.ebuild
@@ -1,20 +1,25 @@
 # Copyright 1999-2012 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.7.4.ebuild,v 1.1 2011/09/08 09:22:11 wired Exp $
+# $Header: $
 
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The SVG module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-IUSE="+accessibility iconv"
+IUSE="+accessibility"
 
-DEPEND="~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=]"
+DEPEND="
+	sys-libs/zlib
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qpa=]
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -22,35 +27,35 @@ pkg_setup() {
 		src/svg
 		src/plugins/imageformats/svg
 		src/plugins/iconengines/svgiconengine"
-	if [[ ${PV} != 4*9999 ]]; then
-		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"
-	fi
+
+	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
+	qt4-build_pkg_setup
 }
 
 src_configure() {
-	myconf="${myconf} -svg
+	myconf+="
+		-svg
 		$(qt_use accessibility)
-		$(qt_use iconv)
-		-no-xkb -no-xrender
+		-no-xkb  -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-fontconfig -no-glib -no-gtkstyle"
-	qt4-build-edge_src_configure
+
+	qt4-build_src_configure
 }

diff --git a/x11-libs/qt-test/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-test/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-test/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then

diff --git a/x11-libs/qt-test/qt-test-4.8.9999.ebuild b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
index 904ef58..3a781f8 100644
--- a/x11-libs/qt-test/qt-test-4.8.9999.ebuild
+++ b/x11-libs/qt-test/qt-test-4.8.9999.ebuild
@@ -1,39 +1,45 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.7.4.ebuild,v 1.1 2011/09/08 09:22:28 wired Exp $
+# $Header: $
 
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
+
+inherit qt4-build
 
 DESCRIPTION="The testing framework module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
-IUSE="iconv"
+IUSE=""
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=]"
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qpa=]
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	QT4_TARGET_DIRECTORIES="src/testlib"
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-			include/QtTest/
-			include/QtCore/
-			src/corelib/"
-	fi
-
-	qt4-build-edge_pkg_setup
+	QT4_TARGET_DIRECTORIES="
+		src/testlib"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/QtTest
+		include/QtCore
+		src/corelib"
+
+	qt4-build_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
+	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-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
+		-no-accessibility -no-fontconfig -no-glib -no-svg"
+
+	qt4-build_src_configure
 }

diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.8.0-c++0x-fix.patch b/x11-libs/qt-webkit/files/qt-webkit-4.8.0-c++0x-fix.patch
new file mode 100644
index 0000000..8213da4
--- /dev/null
+++ b/x11-libs/qt-webkit/files/qt-webkit-4.8.0-c++0x-fix.patch
@@ -0,0 +1,101 @@
+All this is needed for qt-webkit to build if c++0x use is enabled
+while using gcc-4.6 ...
+
+you also need to append -fpermissive to the compiler flags
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h
++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h
+@@ -23,6 +23,7 @@
+ #define TypeTraits_h
+ 
+ #include "Platform.h"
++#include <tr1/memory>
+ 
+ #if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ #include <type_traits>
+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h
++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/TypeTraits.h
+@@ -23,6 +23,7 @@
+ #define TypeTraits_h
+ 
+ #include "Platform.h"
++#include <tr1/memory>
+ 
+ #if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
+ #include <type_traits>
+--- src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
++++ src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+@@ -1106,7 +1106,7 @@ RegisterID* BytecodeGenerator::emitLoad(RegisterID* dst, double number)
+     // FIXME: Our hash tables won't hold infinity, so we make a new JSValue each time.
+     // Later we can do the extra work to handle that like the other cases.  They also don't
+     // work correctly with NaN as a key.
+-    if (isnan(number) || number == HashTraits<double>::emptyValue() || HashTraits<double>::isDeletedValue(number))
++    if (std::isnan(number) || number == HashTraits<double>::emptyValue() || HashTraits<double>::isDeletedValue(number))
+         return emitLoad(dst, jsNumber(number));
+     JSValue& valueInMap = m_numberMap.add(number, JSValue()).first->second;
+     if (!valueInMap)
+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
+@@ -137,8 +137,10 @@ inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); }
+ inline long long abs(long long num) { return _abs64(num); }
+ #endif
+ 
++#ifndef __GXX_EXPERIMENTAL_CXX0X__
+ inline bool isinf(double num) { return !_finite(num) && !_isnan(num); }
+ inline bool isnan(double num) { return !!_isnan(num); }
++#endif
+ inline bool signbit(double num) { return _copysign(1.0, num) < 0; }
+ 
+ inline double nextafter(double x, double y) { return _nextafter(x, y); }
+@@ -240,8 +242,10 @@ inline int clampToInteger(unsigned value)
+ 
+ #if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)
+ using std::isfinite;
++#ifndef __GXX_EXPERIMENTAL_CXX0X__
+ using std::isinf;
+ using std::isnan;
++#endif
+ using std::signbit;
+ #endif
+ 
+--- src/3rdparty/webkit/Source/WebCore/bindings/js/JSGeolocationCustom.cpp
++++ src/3rdparty/webkit/Source/WebCore/bindings/js/JSGeolocationCustom.cpp
+@@ -80,7 +80,7 @@ static PassRefPtr<PositionOptions> createPositionOptions(ExecState* exec, JSValu
+         if (exec->hadException())
+             return 0;
+         // If the value is positive infinity, there's nothing to do.
+-        if (!(isinf(timeoutNumber) && (timeoutNumber > 0))) {
++        if (!(std::isinf(timeoutNumber) && (timeoutNumber > 0))) {
+             // Wrap to int32 and force non-negative to match behavior of window.setTimeout.
+             options->setTimeout(max(0, timeoutValue.toInt32(exec)));
+             if (exec->hadException())
+@@ -95,7 +95,7 @@ static PassRefPtr<PositionOptions> createPositionOptions(ExecState* exec, JSValu
+         double maximumAgeNumber = maximumAgeValue.toNumber(exec);
+         if (exec->hadException())
+             return 0;
+-        if (isinf(maximumAgeNumber) && (maximumAgeNumber > 0)) {
++        if (std::isinf(maximumAgeNumber) && (maximumAgeNumber > 0)) {
+             // If the value is positive infinity, clear maximumAge.
+             options->clearMaximumAge();
+         } else {
+--- src/3rdparty/webkit/Source/WebCore/html/HTMLInputElement.cpp
++++ src/3rdparty/webkit/Source/WebCore/html/HTMLInputElement.cpp
+@@ -332,7 +332,7 @@ void HTMLInputElement::applyStep(double count, ExceptionCode& ec)
+         return;
+     }
+     double newValue = current + step * count;
+-    if (isinf(newValue)) {
++    if (std::isinf(newValue)) {
+         ec = INVALID_STATE_ERR;
+         return;
+     }
+--- src/3rdparty/webkit/Source/WebCore/html/NumberInputType.cpp
++++ src/3rdparty/webkit/Source/WebCore/html/NumberInputType.cpp
+@@ -132,7 +132,7 @@ bool NumberInputType::stepMismatch(const String& value, double step) const
+     if (!parseToDoubleForNumberType(value, &doubleValue))
+         return false;
+     doubleValue = fabs(doubleValue - stepBase());
+-    if (isinf(doubleValue))
++    if (std::isinf(doubleValue))
+         return false;
+     // double's fractional part size is DBL_MAN_DIG-bit. If the current value
+     // is greater than step*2^DBL_MANT_DIG, the following computation for

diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
index bfeebbe..5201820 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.9999.ebuild
@@ -2,29 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
-if [[ ${PV} == 4*9999 ]]; then
-	QT_ECLASS="-edge"
-fi
-inherit qt4-build${QT_ECLASS} flag-o-matic
+inherit qt4-build flag-o-matic
 
 DESCRIPTION="The WebKit module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-else
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+gstreamer +jit"
 
 DEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu
+	x11-libs/libX11
 	x11-libs/libXrender
-	~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,ssl]
-	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,qpa=,debug=]
-	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,ssl,qpa=]
+	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=]
 	gstreamer? (
 		dev-libs/glib:2
 		media-libs/gstreamer:0.10
@@ -32,36 +30,44 @@ DEPEND="
 	)"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch"
+)
+
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/3rdparty/webkit/Source/JavaScriptCore
 		src/3rdparty/webkit/Source/WebCore
 		src/3rdparty/webkit/Source/WebKit/qt
 		tools/designer/src/plugins/qwebview"
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="
-			include/
-			src/
-			tools/"
-	fi
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools"
 
 	QCONFIG_ADD="webkit"
 	QCONFIG_DEFINE="QT_WEBKIT"
 
-	qt4-build${QT_ECLASS}_pkg_setup
+	qt4-build_pkg_setup
 }
 
 src_prepare() {
 	use c++0x && append-cxxflags -fpermissive
 
+	# Fix version number in generated pkgconfig file, bug 406443
+	sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
+		src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
+
 	# Always enable icu to avoid build failure, bug 407315
 	sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
 		src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
 
+	# Remove -Werror from CXXFLAGS
 	sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
 		src/3rdparty/webkit/Source/WebKit.pri || die
 
-	qt4-build${QT_ECLASS}_src_prepare
+	qt4-build_src_prepare
 }
 
 src_configure() {
@@ -69,7 +75,7 @@ src_configure() {
 		-webkit
 		-icu -system-sqlite
 		$(qt_use jit javascript-jit)
-		$(use gstreamer || echo -DENABLE_VIDEO=0)
-	"
-	qt4-build${QT_ECLASS}_src_configure
+		$(use gstreamer || echo -DENABLE_VIDEO=0)"
+
+	qt4-build_src_configure
 }

diff --git a/x11-libs/qt-xmlpatterns/files/qt-4.6-master-nolibx11.patch b/x11-libs/qt-xmlpatterns/files/qt-4.6-master-nolibx11.patch
deleted file mode 100644
index 14e5fce..0000000
--- a/x11-libs/qt-xmlpatterns/files/qt-4.6-master-nolibx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.9999/configure
-===================================================================
---- qt-everywhere-opensource-src-4.6.9999.orig/configure
-+++ qt-everywhere-opensource-src-4.6.9999/configure
-@@ -5069,15 +5069,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
-         X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
-     fi
- 
--    # Check we actually have X11 :-)
--    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
--    if [ $? != "0" ]; then
--        echo "Basic XLib functionality test failed!"
--        echo " You might need to modify the include and library search paths by editing"
--        echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
--    fi
--
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-     if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
-         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then

diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
index c280792..72da16e 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.9999.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.7.4.ebuild,v 1.1 2011/09/08 09:23:04 wired Exp $
+# $Header: $
 
-EAPI="4"
-inherit qt4-build-edge
+EAPI=4
 
-DESCRIPTION="The patternist module for the Qt toolkit"
+inherit qt4-build
+
+DESCRIPTION="The XmlPatterns module for the Qt toolkit"
 SLOT="4"
-if [[ ${PV} != 4*9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE=""
 
-DEPEND="~x11-libs/qt-core-${PV}[aqua=,c++0x=,qpa=,debug=,exceptions]"
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,exceptions,qpa=]
+"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -22,24 +26,23 @@ pkg_setup() {
 		tools/xmlpatterns
 		tools/xmlpatternsvalidator"
 
-	if [[ ${PV} != 4*9999 ]]; then
-		QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-			include/QtCore
-			include/QtNetwork
-			include/QtXml
-			include/QtXmlPatterns
-			src/network/
-			src/xml/
-			src/corelib/"
-	fi
+	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
+	qt4-build_pkg_setup
 }
 
 src_configure() {
-	myconf="${myconf} -xmlpatterns"
-	qt4-build-edge_src_configure
+	myconf+=" -xmlpatterns"
+
+	qt4-build_src_configure
 }