Version bump.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

54 files changed, 1109 insertions, 404 deletions

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index c228a5fbe395..868b9f74aec0 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.69 2010/02/09 21:03:45 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.70 2010/02/15 15:08:26 spatz Exp $
+
+*qt-assistant-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> +qt-assistant-4.6.2.ebuild:
+  Version bump.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-assistant-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.2.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.2.ebuild
new file mode 100644
index 000000000000..6e76d6f86b0f
--- /dev/null
+++ b/x11-libs/qt-assistant/qt-assistant-4.6.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.2.ebuild,v 1.1 2010/02/15 15:08:26 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The assistant help module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="~x11-libs/qt-gui-${PV}[aqua=]
+	~x11-libs/qt-sql-${PV}[aqua=,sqlite]
+	~x11-libs/qt-webkit-${PV}[aqua=]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.6.1-tools.patch" )
+
+# 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="${QT4_TARGET_DIRECTORIES}
+tools/
+demos/
+examples/
+src/
+include/
+doc/"
+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-glib -no-multimedia -no-qt3support -no-svg"
+	qt4-build_src_configure
+}
+
+src_compile() {
+	# help libQtHelp find freshly built libQtCLucene (bug #289811)
+	export LD_LIBRARY_PATH="${S}/lib"
+	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
+	qt4-build_src_compile
+	# ugly hack to build docs
+	cd "${S}"
+	qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die "qmake projects faied"
+	emake qch_docs || die "emake docs failed"
+}
+
+src_install() {
+	qt4-build_src_install
+	# install documentation
+	# note that emake install_qchdocs fails for undefined reason so we use a
+	# workaround
+	cd "${S}"
+	insinto ${QTDOCDIR#${EPREFIX}}
+	doins -r "${S}"/doc/qch || die "doins qch documentation failed"
+	dobin "${S}"/bin/qdoc3 || die "Installing qdoc3 failed"
+	#emake INSTALL_ROOT="${D}" install_qchdocs || die "emake install_qchdocs	failed"
+	# install correct assistant icon, bug 241208
+	dodir /usr/share/pixmaps/ || die "dodir failed"
+	insinto /usr/share/pixmaps/ || die "insinto failed"
+	doins tools/assistant/tools/assistant/images/assistant.png \
+		|| die "doins failed"
+	# Note: absolute image path required here!
+	make_desktop_entry /usr/bin/assistant Assistant \
+		/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \
+			|| die "make_desktop_entry failed"
+}
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 38baad714763..7132fd81a82c 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.89 2010/02/10 20:11:28 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.90 2010/02/15 15:08:44 spatz Exp $
+
+*qt-core-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
+  -files/qt-core-4.6.0-hebrew.patch, qt-core-4.6.1.ebuild,
+  +files/qt-4.6-nolibx11.patch, -files/qt-core-4.6.1-nolibx11.patch,
+  +qt-core-4.6.2.ebuild:
+  Version bump, rename patch.
 
   10 Feb 2010; Ben de Groot <yngwin@gentoo.org> qt-core-4.6.1.ebuild:
   Move QT4_EXTRACT_DIRECTORIES stuff to pkg_setup, to fix compilation on
diff --git a/x11-libs/qt-core/files/qt-core-4.6.1-nolibx11.patch b/x11-libs/qt-core/files/qt-4.6-nolibx11.patch
index e5d13327b8ce..e5d13327b8ce 100644
--- a/x11-libs/qt-core/files/qt-core-4.6.1-nolibx11.patch
+++ b/x11-libs/qt-core/files/qt-4.6-nolibx11.patch
diff --git a/x11-libs/qt-core/files/qt-core-4.6.0-hebrew.patch b/x11-libs/qt-core/files/qt-core-4.6.0-hebrew.patch
deleted file mode 100644
index 5275fbbf4561..000000000000
--- a/x11-libs/qt-core/files/qt-core-4.6.0-hebrew.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From ddf34f39efcbe679f1a8216df58da0c61e98ec79 Mon Sep 17 00:00:00 2001
-From: Lars Knoll <lars.knoll@nokia.com>
-Date: Mon, 21 Dec 2009 14:30:40 +0100
-Subject: [PATCH] update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155
-
-Fix a regression in Hebrew text rendering that got introduced
-in Harfbuzz.
-Fix some uninitialized variables.
-
-Task-number: http://bugreports.qt.nokia.com/browse/QTBUG-6436
-Reviewed-by: Simon Hausmann
----
- src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c   |    4 +---
- src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp |    3 +++
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c
-index 2bda386..67029be 100644
---- a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c
-+++ b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c
-@@ -56,8 +56,6 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
- 
-     assert(shaper_item->item.script == HB_Script_Hebrew);
- 
--    HB_HeuristicSetGlyphAttributes(shaper_item);
--
- #ifndef NO_OPENTYPE
-     if (HB_SelectScript(shaper_item, hebrew_features)) {
- 
-@@ -65,7 +63,7 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
-         if (!HB_ConvertStringToGlyphIndices(shaper_item))
-             return FALSE;
- 
--
-+        HB_HeuristicSetGlyphAttributes(shaper_item);
-         HB_OpenTypeShape(shaper_item, /*properties*/0);
-         return HB_OpenTypePosition(shaper_item, availableGlyphs, /*doLogClusters*/TRUE);
-     }
-diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
-index bfb03ab..bfc7bd4 100644
---- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
-+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
-@@ -980,6 +980,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
-     HB_Stream gdefStream;
- 
-     gdefStream = getTableStream(font, tableFunc, TTAG_GDEF);
-+    error = HB_Err_Not_Covered;
-     if (!gdefStream || (error = HB_Load_GDEF_Table(gdefStream, &face->gdef))) {
-         //DEBUG("error loading gdef table: %d", error);
-         face->gdef = 0;
-@@ -987,6 +988,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
- 
-     //DEBUG() << "trying to load gsub table";
-     stream = getTableStream(font, tableFunc, TTAG_GSUB);
-+    error = HB_Err_Not_Covered;
-     if (!stream || (error = HB_Load_GSUB_Table(stream, &face->gsub, face->gdef, gdefStream))) {
-         face->gsub = 0;
-         if (error != HB_Err_Not_Covered) {
-@@ -998,6 +1000,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
-     _hb_close_stream(stream);
- 
-     stream = getTableStream(font, tableFunc, TTAG_GPOS);
-+    error = HB_Err_Not_Covered;
-     if (!stream || (error = HB_Load_GPOS_Table(stream, &face->gpos, face->gdef, gdefStream))) {
-         face->gpos = 0;
-         DEBUG("error loading gpos table: %d", error);
--- 
-1.6.6.rc4
-
diff --git a/x11-libs/qt-core/qt-core-4.6.1.ebuild b/x11-libs/qt-core/qt-core-4.6.1.ebuild
index 321421ca8dc3..b5f710e9c87d 100644
--- a/x11-libs/qt-core/qt-core-4.6.1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1.ebuild,v 1.4 2010/02/10 20:11:28 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1.ebuild,v 1.5 2010/02/15 15:08:44 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}
 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
 )
 
 pkg_setup() {
diff --git a/x11-libs/qt-core/qt-core-4.6.2.ebuild b/x11-libs/qt-core/qt-core-4.6.2.ebuild
new file mode 100644
index 000000000000..0e7ff4b02516
--- /dev/null
+++ b/x11-libs/qt-core/qt-core-4.6.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.2.ebuild,v 1.1 2010/02/15 15:08:44 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+SLOT="4"
+KEYWORDS="~alpha ~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"
+IUSE="doc +glib iconv optimized-qmake qt3support ssl"
+
+RDEPEND="sys-libs/zlib
+	glib? ( dev-libs/glib )
+	ssl? ( dev-libs/openssl )
+	!<x11-libs/qt-4.4.0:4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+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"
+
+	if use doc; then
+		QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES}
+			doc/"
+		QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+			tools/qdoc3"
+	fi
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+				${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+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_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"
+
+	if ! use doc; then
+		myconf="${myconf} -nomake docs"
+	fi
+
+	qt4-build_src_configure
+}
+
+src_compile() {
+	# bug 259736
+	unset QMAKESPEC
+	qt4-build_src_compile
+}
+
+src_install() {
+	dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
+
+	install_directories src/{corelib,xml,network,plugins/codecs}
+
+	emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
+
+	if use doc; then
+		emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed"
+	fi
+
+	# 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 "generating translations faied"
+	insinto ${QTTRANSDIR#${EPREFIX}}
+	doins translations/*.qm || die "doins translations failed"
+
+	setqtenv
+	fix_library_files
+
+	# List all the multilib libdirs
+	local libdirs=
+	for libdir in $(get_all_libdirs); do
+		libdirs+=:${EPREFIX}/usr/${libdir}/qt4
+	done
+
+	cat <<-EOF > "${T}/44qt4"
+	LDPATH="${libdirs:1}"
+	EOF
+	doenvd "${T}/44qt4"
+
+	dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
+	mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
+		|| die "Failed to move qconfig.pri"
+
+	# Framework hacking
+	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
+	else
+		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
+				"${D}${QTHEADERDIR}"/Qt/qconfig.h \
+			|| die "sed for qconfig.h failed"
+	fi
+
+	if use glib; then
+		QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
+				$(use ssl && echo QT_OPENSSL)"
+		install_qconfigs
+	fi
+
+	# remove some unnecessary headers
+	rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
+qatomic_windows.h,\
+qatomic_windowsce.h,\
+qt_windows.h}
+
+	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+	# Framework magic
+	fix_includes
+}
diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index 1f3beca77d8b..34b8550b3034 100644
--- a/x11-libs/qt-dbus/ChangeLog
+++ b/x11-libs/qt-dbus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-dbus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.59 2010/02/09 21:04:46 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.60 2010/02/15 15:09:03 spatz Exp $
+
+*qt-dbus-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
+  qt-dbus-4.6.1.ebuild, +qt-dbus-4.6.2.ebuild, +files/qt-4.6-nolibx11.patch,
+  -files/qt-4.6.1-nolibx11.patch:
+  Version bump, rename patch.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-dbus-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff b/x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff
deleted file mode 100644
index d3c1d1f75121..000000000000
--- a/x11-libs/qt-dbus/files/qt-4.6-nolibx11.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.old	2009-12-03 18:52:58.061117684 +0200
-+++ configure	2009-12-03 18:53:09.065116496 +0200
-@@ -5010,15 +5010,6 @@
-         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-4.6.1-nolibx11.patch b/x11-libs/qt-dbus/files/qt-4.6-nolibx11.patch
index e5d13327b8ce..e5d13327b8ce 100644
--- a/x11-libs/qt-dbus/files/qt-4.6.1-nolibx11.patch
+++ b/x11-libs/qt-dbus/files/qt-4.6-nolibx11.patch
diff --git a/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild
index fe8557450555..0da53ae8f485 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild,v 1.2 2010/01/20 12:30:20 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.1.ebuild,v 1.3 2010/02/15 15:09:03 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -31,7 +31,7 @@ src/corelib
 src/xml"
 
 PATCHES=(
-	"${FILESDIR}/qt-${PV}-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
 )
 
 src_configure() {
diff --git a/x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild b/x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild
new file mode 100644
index 000000000000..0a67bffe8594
--- /dev/null
+++ b/x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.2.ebuild,v 1.1 2010/02/15 15:09:03 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The DBus module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~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"
+IUSE=""
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]
+	>=sys-apps/dbus-1.0.2"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="
+src/dbus
+tools/qdbus/qdbus
+tools/qdbus/qdbusxml2cpp
+tools/qdbus/qdbuscpp2xml"
+QCONFIG_ADD="dbus dbus-linked"
+QCONFIG_DEFINE="QT_DBUS"
+
+#FIXME: Check if these are still needed with the header package
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+include/QtCore
+include/QtDBus
+include/QtXml
+src/corelib
+src/xml"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+src_configure() {
+	myconf="${myconf} -dbus-linked"
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog
index 666c9317df1f..5785742440f9 100644
--- a/x11-libs/qt-demo/ChangeLog
+++ b/x11-libs/qt-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-demo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.42 2010/02/09 21:05:33 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.43 2010/02/15 15:09:21 spatz Exp $
+
+*qt-demo-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> +qt-demo-4.6.2.ebuild:
+  Version bump.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-demo-4.6.0.ebuild:
   Remove old.
diff --git a/x11-libs/qt-demo/qt-demo-4.6.2.ebuild b/x11-libs/qt-demo/qt-demo-4.6.2.ebuild
new file mode 100644
index 000000000000..491bd5760972
--- /dev/null
+++ b/x11-libs/qt-demo/qt-demo-4.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.6.2.ebuild,v 1.1 2010/02/15 15:09:21 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="Demonstration module of the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="kde"
+
+DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-core-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-gui-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=]
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=]
+		media-sound/phonon[aqua=] ) )
+	kde? ( media-sound/phonon[aqua=] )
+	~x11-libs/qt-script-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-test-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=]
+	~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=]"
+
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="demos
+	examples"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+	doc/src/images
+	src/
+	include/
+	tools/"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
+)
+
+src_install() {
+	insinto "${QTDOCDIR#${EPREFIX}}"/src
+	doins -r "${S}"/doc/src/images || die "Installing images failed."
+
+	qt4-build_src_install
+}
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index bb77bb309306..ef5fe6443a1b 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.97 2010/02/10 20:11:56 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.98 2010/02/15 15:09:39 spatz Exp $
+
+*qt-gui-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org>
+  -files/qt-gui-4.6.0-fix-qgraphicsscence.patch, +qt-gui-4.6.2.ebuild:
+  Version bump.
 
   10 Feb 2010; Ben de Groot <yngwin@gentoo.org> qt-gui-4.6.1.ebuild:
   Move QT4_EXTRACT_DIRECTORIES stuff to pkg_setup, to fix compilation on
diff --git a/x11-libs/qt-gui/files/qt-gui-4.6.0-fix-qgraphicsscence.patch b/x11-libs/qt-gui/files/qt-gui-4.6.0-fix-qgraphicsscence.patch
deleted file mode 100644
index d56412ba5d93..000000000000
--- a/x11-libs/qt-gui/files/qt-gui-4.6.0-fix-qgraphicsscence.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 705880f0045ac39140f980d69aec68869213e379 Mon Sep 17 00:00:00 2001
-From: Alexis Menard <alexis.menard@nokia.com>
-Date: Thu, 26 Nov 2009 13:47:34 +0100
-Subject: [PATCH] Fix a crash in KDE/Plasma with QGraphicsView. TopLevel list of items
- was corrupted.
-
-This nasty bug was triggered when the index sort the top level list of
-items. We forgot to set the flag topLevelSequentialOrdering to false
-so when an item was removed from the top level list it was using the
-sibling index which can be not valid anymore since the list is not
-sorted by sequential order. So it let some dangling pointers in the
-list which make processDirtyItemRecursive crash the next paint event.
-
-Reviewed-by:bnilsen
-Reviewed-by:andreas
----
- src/gui/graphicsview/qgraphicsscene_p.h          |    3 +-
- 2 files changed, 34 insertions(+), 1 deletions(-)
-
-diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h
-index a1d0496..69e4d5b 100644
---- a/src/gui/graphicsview/qgraphicsscene_p.h
-+++ b/src/gui/graphicsview/qgraphicsscene_p.h
-@@ -78,7 +78,7 @@ class QGraphicsSceneIndex;
- class QGraphicsView;
- class QGraphicsWidget;
- 
--class QGraphicsScenePrivate : public QObjectPrivate
-+class Q_AUTOTEST_EXPORT QGraphicsScenePrivate : public QObjectPrivate
- {
-     Q_DECLARE_PUBLIC(QGraphicsScene)
- public:
-@@ -265,6 +265,7 @@ public:
-     {
-         if (needSortTopLevelItems) {
-             qSort(topLevelItems.begin(), topLevelItems.end(), qt_notclosestLeaf);
-+            topLevelSequentialOrdering = false;
-             needSortTopLevelItems = false;
-         }
-     }
diff --git a/x11-libs/qt-gui/qt-gui-4.6.2.ebuild b/x11-libs/qt-gui/qt-gui-4.6.2.ebuild
new file mode 100644
index 000000000000..e60636315b7a
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.6.2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.2.ebuild,v 1.1 2010/02/15 15:09:39 spatz Exp $
+
+EAPI="2"
+inherit confutils eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~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"
+IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xinerama"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/jpeg:0
+	media-libs/libpng
+	sys-libs/zlib
+	~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,debug=]
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXcursor
+		x11-libs/libXfont
+		x11-libs/libSM
+		x11-libs/libXi
+	)
+	cups? ( net-print/cups )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
+	gtk? ( x11-libs/gtk+:2[aqua=] )
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	tiff? ( media-libs/tiff )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/inputproto
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
+
+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"
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_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 glib)
+		$(qt_use mng libmng system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use dbus qdbus)
+		$(qt_use qt3support)
+		$(qt_use gtk 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"
+
+	# Explicitly don't compile these packages.
+	# Emerge "qt-webkit", "qt-phonon", etc for their functionality.
+	myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl"
+
+	qt4-build_src_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_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/
+	insinto /usr/include/qt4/QtDesigner/private/
+	doins "${S}"/tools/designer/src/lib/shared/*
+	doins "${S}"/tools/designer/src/lib/sdk/*
+
+	# 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 "${EPREFIX}"/usr/bin/linguist Linguist \
+			"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "linguist make_desktop_entry failed"
+	make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \
+			"${EPREFIX}"/usr/share/pixmaps/designer.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "designer make_desktop_entry failed"
+}
diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog
index c822592afcb7..0b82f77e99e5 100644
--- a/x11-libs/qt-multimedia/ChangeLog
+++ b/x11-libs/qt-multimedia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-multimedia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.11 2010/02/09 21:14:30 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.12 2010/02/15 15:10:01 spatz Exp $
+
+*qt-multimedia-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> +qt-multimedia-4.6.2.ebuild:
+  Version bump.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> qt-multimedia-4.6.1.ebuild:
   Add ~ppc64 to newer version as well.
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.6.2.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.6.2.ebuild
new file mode 100644
index 000000000000..57cad875c313
--- /dev/null
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.6.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.6.2.ebuild,v 1.1 2010/02/15 15:10:01 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The Qt multimedia module"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="iconv"
+
+# currently supported audio backends are: alsa, mac, win32
+DEPEND="!aqua? ( media-libs/alsa-lib )
+	~x11-libs/qt-core-${PV}[aqua=,debug=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=]"
+RDEPEND="${DEPEND}"
+
+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"
+
+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_src_configure
+}
diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog
index 7f30baca4355..8e5f3106daed 100644
--- a/x11-libs/qt-opengl/ChangeLog
+++ b/x11-libs/qt-opengl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-opengl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.58 2010/02/09 21:07:02 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.59 2010/02/15 15:10:36 spatz Exp $
+
+*qt-opengl-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> +qt-opengl-4.6.2.ebuild:
+  Version bump.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-opengl-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-opengl/qt-opengl-4.6.2.ebuild b/x11-libs/qt-opengl/qt-opengl-4.6.2.ebuild
new file mode 100644
index 000000000000..22d9cd6486b1
--- /dev/null
+++ b/x11-libs/qt-opengl/qt-opengl-4.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.6.2.ebuild,v 1.1 2010/02/15 15:10:36 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The OpenGL module for the Qt toolkit"
+SLOT="4"
+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"
+IUSE="qt3support"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=]
+	virtual/opengl
+	virtual/glu"
+RDEPEND="${DEPEND}"
+
+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"
+
+src_configure() {
+	myconf="${myconf} -opengl
+		$(qt_use qt3support)"
+
+	qt4-build_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-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog
index 22eea92f3e6e..c6d79807d74a 100644
--- a/x11-libs/qt-phonon/ChangeLog
+++ b/x11-libs/qt-phonon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-phonon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.64 2010/02/09 21:07:35 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.65 2010/02/15 15:10:53 spatz Exp $
+
+*qt-phonon-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> +qt-phonon-4.6.2.ebuild:
+  Version bump.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-phonon-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-phonon/qt-phonon-4.6.2.ebuild b/x11-libs/qt-phonon/qt-phonon-4.6.2.ebuild
new file mode 100644
index 000000000000..fb4766bd7fcc
--- /dev/null
+++ b/x11-libs/qt-phonon/qt-phonon-4.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 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.6.2.ebuild,v 1.1 2010/02/15 15:10:53 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The Phonon module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="dbus"
+
+DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support]
+	!kde-base/phonon-kde
+	!kde-base/phonon-xine
+	!media-sound/phonon
+	!aqua? ( media-libs/gstreamer
+			 media-plugins/gst-plugins-meta )
+	aqua? ( ~x11-libs/qt-opengl-${PV}[aqua] )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	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"
+	use aqua || QCONFIG_DEFINE="QT_GSTREAMER"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg
+		$(qt_use dbus qdbus)"
+
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog
index 97abf74c169d..0d87a02651ed 100644
--- a/x11-libs/qt-qt3support/ChangeLog
+++ b/x11-libs/qt-qt3support/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-qt3support
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.63 2010/02/09 21:08:03 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.64 2010/02/15 15:11:11 spatz Exp $
+
+*qt-qt3support-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> +qt-qt3support-4.6.2.ebuild:
+  Version bump.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-qt3support-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.6.2.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.6.2.ebuild
new file mode 100644
index 000000000000..0866f6ba0a09
--- /dev/null
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 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.6.2.ebuild,v 1.1 2010/02/15 15:11:11 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The Qt3 support module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~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"
+IUSE="+accessibility kde phonon"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support]
+	~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support]
+	~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support]
+	phonon? (
+		!kde? ( || ( ~x11-libs/qt-phonon-${PV}[aqua=,debug=]
+			media-sound/phonon[aqua=,gstreamer] ) )
+		kde? ( media-sound/phonon[aqua=,gstreamer] ) )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/qt3support
+		src/tools/uic3
+		tools/designer/src/plugins/widgets
+		tools/porting"
+
+	QT4_EXTRACT_DIRECTORIES="src include tools"
+
+	# mac version does not contain qtconfig?
+	[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf="${myconf} -qt3support
+		$(qt_use phonon gstreamer)
+		$(qt_use phonon)
+		$(qt_use accessibility)"
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index c45c600874d1..913aecd82e56 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-script
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.61 2010/02/09 21:08:58 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.62 2010/02/15 15:11:28 spatz Exp $
+
+*qt-script-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
+  qt-script-4.6.1.ebuild, +qt-script-4.6.2.ebuild,
+  +files/qt-4.6-nolibx11.patch, -files/qt-4.6.1-nolibx11.patch:
+  Version bump, rename patch.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-script-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-script/files/qt-4.6-nolibx11.diff b/x11-libs/qt-script/files/qt-4.6-nolibx11.diff
deleted file mode 100644
index d3c1d1f75121..000000000000
--- a/x11-libs/qt-script/files/qt-4.6-nolibx11.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.old	2009-12-03 18:52:58.061117684 +0200
-+++ configure	2009-12-03 18:53:09.065116496 +0200
-@@ -5010,15 +5010,6 @@
-         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/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-script/files/qt-4.6-nolibx11.patch
index e5d13327b8ce..e5d13327b8ce 100644
--- a/x11-libs/qt-script/files/qt-4.6.1-nolibx11.patch
+++ b/x11-libs/qt-script/files/qt-4.6-nolibx11.patch
diff --git a/x11-libs/qt-script/qt-script-4.6.1.ebuild b/x11-libs/qt-script/qt-script-4.6.1.ebuild
index 9e19c114875e..058f58009afa 100644
--- a/x11-libs/qt-script/qt-script-4.6.1.ebuild
+++ b/x11-libs/qt-script/qt-script-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.1.ebuild,v 1.2 2010/01/20 12:34:37 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.1.ebuild,v 1.3 2010/02/15 15:11:28 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -23,7 +23,7 @@ src/3rdparty/javascriptcore/
 "
 
 PATCHES=(
-	"${FILESDIR}/qt-${PV}-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
 )
 
 src_configure() {
diff --git a/x11-libs/qt-script/qt-script-4.6.2.ebuild b/x11-libs/qt-script/qt-script-4.6.2.ebuild
new file mode 100644
index 000000000000..c1c12e0c59e3
--- /dev/null
+++ b/x11-libs/qt-script/qt-script-4.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.2.ebuild,v 1.1 2010/02/15 15:11:28 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The ECMAScript module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~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"
+IUSE="iconv"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/script/"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+include/Qt/
+include/QtCore/
+include/QtScript/
+src/corelib/
+src/3rdparty/javascriptcore/
+"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+src_configure() {
+	myconf="${myconf} $(qt_use iconv) -script -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_src_configure
+}
diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index 4fcaaf61f4fa..2e68eb051446 100644
--- a/x11-libs/qt-sql/ChangeLog
+++ b/x11-libs/qt-sql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-sql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.73 2010/02/09 21:09:36 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.74 2010/02/15 15:11:49 spatz Exp $
+
+*qt-sql-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
+  qt-sql-4.6.1.ebuild, +files/qt-4.6-nolibx11.patch, +qt-sql-4.6.2.ebuild:
+  Version bump, rename patch.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-sql-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-sql/files/qt-4.6-nolibx11.diff b/x11-libs/qt-sql/files/qt-4.6-nolibx11.diff
deleted file mode 100644
index d3c1d1f75121..000000000000
--- a/x11-libs/qt-sql/files/qt-4.6-nolibx11.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.old	2009-12-03 18:52:58.061117684 +0200
-+++ configure	2009-12-03 18:53:09.065116496 +0200
-@@ -5010,15 +5010,6 @@
-         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/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-sql/files/qt-4.6-nolibx11.patch
index e5d13327b8ce..e5d13327b8ce 100644
--- a/x11-libs/qt-test/files/qt-4.6.1-nolibx11.patch
+++ b/x11-libs/qt-sql/files/qt-4.6-nolibx11.patch
diff --git a/x11-libs/qt-sql/qt-sql-4.6.1.ebuild b/x11-libs/qt-sql/qt-sql-4.6.1.ebuild
index 4b437c6fdfe2..d0c321dd31c0 100644
--- a/x11-libs/qt-sql/qt-sql-4.6.1.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.1.ebuild,v 1.3 2010/01/21 12:55:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.1.ebuild,v 1.4 2010/02/15 15:11:49 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -31,7 +31,7 @@ src/3rdparty
 src/tools"
 
 PATCHES=(
-	"${FILESDIR}/qt-${PV}-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
 )
 
 pkg_setup() {
diff --git a/x11-libs/qt-sql/qt-sql-4.6.2.ebuild b/x11-libs/qt-sql/qt-sql-4.6.2.ebuild
new file mode 100644
index 000000000000..72902caf326d
--- /dev/null
+++ b/x11-libs/qt-sql/qt-sql-4.6.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.2.ebuild,v 1.1 2010/02/15 15:11:49 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~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"
+IUSE="firebird iconv mysql odbc postgres qt3support +sqlite"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+	firebird? ( dev-db/firebird )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( virtual/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )"
+RDEPEND="${DEPEND}"
+
+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"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+pkg_setup() {
+	if ! (use firebird || use mysql || use odbc || use postgres || use sqlite); then
+		ewarn "You need to enable at least one SQL driver. Enable at least"
+		ewarn "one of these USE flags: \"firebird mysql odbc postgres sqlite\""
+		die "Enable at least one SQL driver."
+	fi
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_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${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql ")
+		$(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql ")
+		$(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo '-system-sqlite')
+		$(qt_use odbc sql-odbc 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_src_configure
+}
diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog
index 5cd7217a18d1..5193b2fe2b4d 100644
--- a/x11-libs/qt-svg/ChangeLog
+++ b/x11-libs/qt-svg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-svg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.59 2010/02/09 21:10:08 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.60 2010/02/15 15:12:04 spatz Exp $
+
+*qt-svg-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> +qt-svg-4.6.2.ebuild:
+  Version bump.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-svg-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-svg/qt-svg-4.6.2.ebuild b/x11-libs/qt-svg/qt-svg-4.6.2.ebuild
new file mode 100644
index 000000000000..92afbd2a97d8
--- /dev/null
+++ b/x11-libs/qt-svg/qt-svg-4.6.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 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.6.2.ebuild,v 1.1 2010/02/15 15:12:04 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The SVG module for the Qt toolkit"
+SLOT="4"
+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"
+IUSE="iconv"
+
+DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=]"
+RDEPEND="${DEPEND}"
+
+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"
+
+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
+		-v -no-fontconfig -no-glib -no-opengl -no-gtkstyle -continue"
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog
index 65a88d0b0ed6..23545b360e4e 100644
--- a/x11-libs/qt-test/ChangeLog
+++ b/x11-libs/qt-test/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-test
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.59 2010/02/09 21:10:36 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.60 2010/02/15 15:12:21 spatz Exp $
+
+*qt-test-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
+  qt-test-4.6.1.ebuild, +qt-test-4.6.2.ebuild, +files/qt-4.6-nolibx11.patch,
+  -files/qt-4.6.1-nolibx11.patch:
+  Version bump, rename patch.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-test-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-test/files/qt-4.6-nolibx11.diff b/x11-libs/qt-test/files/qt-4.6-nolibx11.diff
deleted file mode 100644
index d3c1d1f75121..000000000000
--- a/x11-libs/qt-test/files/qt-4.6-nolibx11.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.old	2009-12-03 18:52:58.061117684 +0200
-+++ configure	2009-12-03 18:53:09.065116496 +0200
-@@ -5010,15 +5010,6 @@
-         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/files/qt-4.6.1-nolibx11.patch b/x11-libs/qt-test/files/qt-4.6-nolibx11.patch
index e5d13327b8ce..e5d13327b8ce 100644
--- a/x11-libs/qt-xmlpatterns/files/qt-4.6.1-nolibx11.patch
+++ b/x11-libs/qt-test/files/qt-4.6-nolibx11.patch
diff --git a/x11-libs/qt-test/qt-test-4.6.1.ebuild b/x11-libs/qt-test/qt-test-4.6.1.ebuild
index 4ee0abfedc7e..f633501bdcdd 100644
--- a/x11-libs/qt-test/qt-test-4.6.1.ebuild
+++ b/x11-libs/qt-test/qt-test-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.6.1.ebuild,v 1.2 2010/01/20 12:36:38 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.6.1.ebuild,v 1.3 2010/02/15 15:12:21 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -20,7 +20,7 @@ include/QtCore/
 src/corelib/"
 
 PATCHES=(
-	"${FILESDIR}/qt-${PV}-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
 )
 
 src_configure() {
diff --git a/x11-libs/qt-test/qt-test-4.6.2.ebuild b/x11-libs/qt-test/qt-test-4.6.2.ebuild
new file mode 100644
index 000000000000..dec5bc36e8a7
--- /dev/null
+++ b/x11-libs/qt-test/qt-test-4.6.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 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.6.2.ebuild,v 1.1 2010/02/15 15:12:21 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The testing framework module for the Qt toolkit"
+SLOT="4"
+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"
+IUSE="iconv"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/testlib"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+include/QtTest/
+include/QtCore/
+src/corelib/"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+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_src_configure
+}
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index b199f74e7f28..dff1e523cc6e 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.78 2010/02/09 21:11:05 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.79 2010/02/15 15:12:39 spatz Exp $
+
+*qt-webkit-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org>
+  -files/qt-webkit-4.6.0-solaris-jsvalue.patch, qt-webkit-4.6.1.ebuild,
+  +qt-webkit-4.6.2.ebuild, -files/sparc-qt-webkit-sigbus.patch:
+  Version bump, drop failing sparc patch.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-webkit-4.6.0-r1.ebuild:
   Remove old.
diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch b/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch
deleted file mode 100644
index 1244d48ea251..000000000000
--- a/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-../JavaScriptCore/runtime/JSValue.h:479: error: cast from ‘JSC::JSCell*’
-to ‘int32_t’ loses precision
-
-Fix inspired by:
-http://bugreports.qt.nokia.com/browse/QTBUG-6948
-
-Seems already to have been fixed upstream webkit in a different way
-(PLATFORM(UNIX) iso DARWIN/LINUX/SOLARIS)
-
-
---- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-+++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -709,7 +709,7 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS))
-+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS) || PLATFORM(SOLARIS))
- #define WTF_USE_JSVALUE64 1
- #elif PLATFORM(ARM) || PLATFORM(PPC64)
- #define WTF_USE_JSVALUE32 1
diff --git a/x11-libs/qt-webkit/files/sparc-qt-webkit-sigbus.patch b/x11-libs/qt-webkit/files/sparc-qt-webkit-sigbus.patch
deleted file mode 100644
index 7bb297f988ef..000000000000
--- a/x11-libs/qt-webkit/files/sparc-qt-webkit-sigbus.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-commit 11c220f6d31898a7a1dfafd5d96619fefe6ba597
-Author: Mike Hommey <glandium@debian.org>
-Date:   Sun Jul 6 10:37:28 2008 +0200
-
-    Fixed some alignment problems on sparc
-    
-    (and some that might occur on arm, too).
-    
-    Some compiler warnings about alignment remain, but I don't know if they are
-    a real problem yet.
-
-diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
-index 1ba1290..7f08646 100644
---- a/JavaScriptCore/wtf/FastMalloc.cpp
-+++ b/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -1824,13 +1824,13 @@ static TCMalloc_Central_FreeListPadded central_cache[kNumClasses];
- 
- // Page-level allocator
- static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
--static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
-+static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
- static bool phinited = false;
- 
- // Avoid extra level of indirection by making "pageheap" be just an alias
- // of pageheap_memory.
- typedef union {
--    void* m_memory;
-+    uint64_t* m_memory;
-     TCMalloc_PageHeap* m_pageHeap;
- } PageHeapUnion;
- 
-diff --git a/JavaScriptCore/wtf/ListHashSet.h b/JavaScriptCore/wtf/ListHashSet.h
-index 5aa13cd..ce09222 100644
---- a/JavaScriptCore/wtf/ListHashSet.h
-+++ b/JavaScriptCore/wtf/ListHashSet.h
-@@ -122,7 +122,7 @@ namespace WTF {
-             : m_freeList(pool())
-             , m_isDoneWithInitialFreeList(false)
-         { 
--            memset(m_pool.pool, 0, sizeof(m_pool.pool));
-+            memset(m_pool, 0, sizeof(m_pool));
-         }
- 
-         Node* allocate()
-@@ -166,7 +166,7 @@ namespace WTF {
-         }
- 
-     private:
--        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
-         Node* pastPool() { return pool() + m_poolSize; }
- 
-         bool inPool(Node* node)
-@@ -177,10 +177,7 @@ namespace WTF {
-         Node* m_freeList;
-         bool m_isDoneWithInitialFreeList;
-         static const size_t m_poolSize = 256;
--        union {
--            char pool[sizeof(Node) * m_poolSize];
--            double forAlignment;
--        } m_pool;
-+        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
-     };
- 
-     template<typename ValueArg> struct ListHashSetNode {
-diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
-index d935052..ce44c25 100644
---- a/JavaScriptCore/wtf/Platform.h
-+++ b/JavaScriptCore/wtf/Platform.h
-@@ -172,6 +172,23 @@
- #define WTF_PLATFORM_X86_64 1
- #endif
- 
-+/* PLATFORM(SPARC) */
-+#if   defined(__sparc__) \
-+   || defined(__sparc)
-+#define WTF_PLATFORM_SPARC 1
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#endif
-+
-+/* For undefined platforms */
-+#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
-+#include <sys/param.h>
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#elif  __BYTE_ORDER == __PDP_ENDIAN
-+#define WTF_PLATFORM_MIDDLE_ENDIAN 1
-+#endif
-+#endif
-+
- /* Compiler */
- 
- /* COMPILER(MSVC) */
-diff --git a/JavaScriptCore/wtf/Vector.h b/JavaScriptCore/wtf/Vector.h
-index 41ab32c..671b20b 100644
---- a/JavaScriptCore/wtf/Vector.h
-+++ b/JavaScriptCore/wtf/Vector.h
-@@ -386,8 +386,7 @@ namespace WTF {
-         static const size_t m_inlineBufferSize = inlineCapacity * sizeof(T);
-         T* inlineBuffer() { return reinterpret_cast<T*>(&m_inlineBuffer); }
- 
--        // FIXME: Nothing guarantees this buffer is appropriately aligned to hold objects of type T.
--        char m_inlineBuffer[m_inlineBufferSize];
-+        uint64_t m_inlineBuffer[(m_inlineBufferSize + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
-     };
- 
-     template<typename T, size_t inlineCapacity = 0>
-diff --git a/WebCore/platform/text/AtomicString.cpp b/WebCore/platform/text/AtomicString.cpp
-index d908dca..1460904 100644
---- a/WebCore/platform/text/AtomicString.cpp
-+++ b/WebCore/platform/text/AtomicString.cpp
-@@ -94,7 +94,7 @@ static inline bool equal(StringImpl* string, const UChar* characters, unsigned l
-     if (string->length() != length)
-         return false;
- 
--#if PLATFORM(ARM)
-+#if PLATFORM(ARM) || PLATFORM(SPARC)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
-diff --git a/WebCore/platform/text/StringHash.h b/WebCore/platform/text/StringHash.h
-index 1eba8c7..8e16b51 100644
---- a/WebCore/platform/text/StringHash.h
-+++ b/WebCore/platform/text/StringHash.h
-@@ -46,6 +46,15 @@ namespace WebCore {
-             if (aLength != bLength)
-                 return false;
- 
-+#if PLATFORM(ARM) || PLATFORM(SPARC)
-+            const UChar* aChars = a->characters();
-+            const UChar* bChars = b->characters();
-+            for (unsigned i = 0; i != aLength; ++i)
-+                if (*aChars++ != *bChars++)
-+                    return false;
-+
-+            return true;
-+#else
-             const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters());
-             const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters());
- 
-@@ -58,6 +67,7 @@ namespace WebCore {
-                 return false;
- 
-             return true;
-+#endif
-         }
- 
-         static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); }
diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild
index 53f8421026b8..6c234dd88d36 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild,v 1.2 2010/01/19 16:03:27 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.1.ebuild,v 1.3 2010/02/15 15:12:39 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -27,12 +27,12 @@ tools/"
 QCONFIG_ADD="webkit"
 QCONFIG_DEFINE="QT_WEBKIT"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch
+)
+
 src_prepare() {
 	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
-	if use sparc; then
-		epatch "${FILESDIR}"/sparc-qt-webkit-sigbus.patch
-	fi
-	epatch "${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch
 	qt4-build_src_prepare
 }
 
diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild
new file mode 100644
index 000000000000..5c5b7f272756
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2.ebuild,v 1.1 2010/02/15 15:12:39 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The Webkit module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~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"
+IUSE="kde"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
+	~x11-libs/qt-dbus-${PV}[aqua=,debug=]
+	~x11-libs/qt-gui-${PV}[aqua=,dbus,debug=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus,debug=]
+		media-sound/phonon[aqua=] ) )
+	kde? ( media-sound/phonon[aqua=] )"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"
+QT4_EXTRACT_DIRECTORIES="
+include/
+src/
+tools/"
+QCONFIG_ADD="webkit"
+QCONFIG_DEFINE="QT_WEBKIT"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch
+)
+
+src_prepare() {
+	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
+	qt4-build_src_prepare
+}
+
+src_configure() {
+	myconf="${myconf} -webkit"
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog
index 42c676f76b3c..821f693168fc 100644
--- a/x11-libs/qt-xmlpatterns/ChangeLog
+++ b/x11-libs/qt-xmlpatterns/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-xmlpatterns
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.59 2010/02/09 21:11:33 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.60 2010/02/15 15:12:57 spatz Exp $
+
+*qt-xmlpatterns-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> -files/qt-4.6-nolibx11.diff,
+  qt-xmlpatterns-4.6.1.ebuild, +qt-xmlpatterns-4.6.2.ebuild,
+  +files/qt-4.6-nolibx11.patch, -files/qt-4.6.1-nolibx11.patch:
+  Version bump, rename patch.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org>
   -qt-xmlpatterns-4.6.0-r1.ebuild:
diff --git a/x11-libs/qt-xmlpatterns/files/qt-4.6-nolibx11.diff b/x11-libs/qt-xmlpatterns/files/qt-4.6-nolibx11.diff
deleted file mode 100644
index d3c1d1f75121..000000000000
--- a/x11-libs/qt-xmlpatterns/files/qt-4.6-nolibx11.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.old	2009-12-03 18:52:58.061117684 +0200
-+++ configure	2009-12-03 18:53:09.065116496 +0200
-@@ -5010,15 +5010,6 @@
-         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-core/files/qt-4.6-nolibx11.diff b/x11-libs/qt-xmlpatterns/files/qt-4.6-nolibx11.patch
index d3c1d1f75121..e5d13327b8ce 100644
--- a/x11-libs/qt-core/files/qt-4.6-nolibx11.diff
+++ b/x11-libs/qt-xmlpatterns/files/qt-4.6-nolibx11.patch
@@ -1,6 +1,6 @@
---- configure.old	2009-12-03 18:52:58.061117684 +0200
-+++ configure	2009-12-03 18:53:09.065116496 +0200
-@@ -5010,15 +5010,6 @@
+--- configure-orig	2010-01-20 14:18:32.466798257 +0200
++++ configure	2010-01-20 14:18:58.516799116 +0200
+@@ -5059,15 +5059,6 @@
          X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
      fi
  
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild
index d91344201336..c3ab11da2fd7 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.6.1.ebuild,v 1.2 2010/01/20 12:38:09 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.1.ebuild,v 1.3 2010/02/15 15:12:57 spatz Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -27,7 +27,7 @@ QCONFIG_ADD="xmlpatterns"
 QCONFIG_DEFINE="QT_XMLPATTERNS"
 
 PATCHES=(
-	"${FILESDIR}/qt-${PV}-nolibx11.patch"
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
 )
 
 src_configure() {
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.2.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.2.ebuild
new file mode 100644
index 000000000000..f11a48718f43
--- /dev/null
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 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.6.2.ebuild,v 1.1 2010/02/15 15:12:57 spatz Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The patternist module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~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"
+IUSE=""
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+include/QtCore
+include/QtXml
+include/QtNetwork
+include/QtXmlPatterns
+src/network/
+src/xml/
+src/corelib/"
+
+QCONFIG_ADD="xmlpatterns"
+QCONFIG_DEFINE="QT_XMLPATTERNS"
+
+PATCHES=(
+	"${FILESDIR}/qt-4.6-nolibx11.patch"
+)
+
+src_configure() {
+	myconf="${myconf} -xmlpatterns"
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 1d509a8bc9f0..9a0729edcdff 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.613 2010/02/09 21:08:33 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.614 2010/02/15 15:08:02 spatz Exp $
+
+*qt-4.6.2 (15 Feb 2010)
+
+  15 Feb 2010; Dror Levin <spatz@gentoo.org> +qt-4.6.2.ebuild:
+  Version bump.
 
   09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-4.6.0.ebuild:
   Remove old.
diff --git a/x11-libs/qt/qt-4.6.2.ebuild b/x11-libs/qt/qt-4.6.2.ebuild
new file mode 100644
index 000000000000..dda45d156254
--- /dev/null
+++ b/x11-libs/qt/qt-4.6.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.6.2.ebuild,v 1.1 2010/02/15 15:08:02 spatz Exp $
+
+EAPI=2
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+HOMEPAGE="http://qt.nokia.com/"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="dbus kde opengl qt3support"
+
+DEPEND=""
+RDEPEND="~x11-libs/qt-core-${PV}
+	~x11-libs/qt-gui-${PV}
+	~x11-libs/qt-svg-${PV}
+	~x11-libs/qt-sql-${PV}
+	~x11-libs/qt-script-${PV}
+	~x11-libs/qt-xmlpatterns-${PV}
+	dbus? ( ~x11-libs/qt-dbus-${PV} )
+	opengl? ( ~x11-libs/qt-opengl-${PV} )
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV} media-sound/phonon ) )
+	kde? ( media-sound/phonon )
+	qt3support? ( ~x11-libs/qt-qt3support-${PV} )
+	~x11-libs/qt-webkit-${PV}
+	~x11-libs/qt-test-${PV}
+	~x11-libs/qt-multimedia-${PV}
+	~x11-libs/qt-assistant-${PV}"
+
+pkg_postinst() {
+	echo
+	elog "Please note that this meta package is only provided for convenience."
+	elog "No packages should depend directly on this meta package, but on the"
+	elog "specific split Qt packages needed. This ebuild will be removed in"
+	elog "future versions. Users that want all Qt components installed are"
+	elog "advised to use the set currently available in qting-edge overlay."
+	echo
+}