Add prefix support, revbump due to otherwise unresolvable USE deps

Package-Manager: portage--svn/cvs/Linux i686

33 files changed, 296 insertions, 342 deletions

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 56a0a496830c..9aaecaf7f9fb 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.63 2009/12/01 18:06:05 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.64 2009/12/25 15:33:39 abcd Exp $
+
+*qt-assistant-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-assistant-4.6.0.ebuild,
+  +qt-assistant-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-assistant-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.0.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild
index af08dd1fa044..f217fea3f4c9 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.6.0.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.1 2009/12/01 14:48:01 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:33:39 abcd 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"
+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}
-	~x11-libs/qt-sql-${PV}[sqlite]
-	~x11-libs/qt-webkit-${PV}
+	~x11-libs/qt-gui-${PV}[aqua=]
+	~x11-libs/qt-sql-${PV}[aqua=,sqlite]
+	~x11-libs/qt-webkit-${PV}[aqua=]
 "
 RDEPEND="${DEPEND}"
 
@@ -46,7 +46,7 @@ src_configure() {
 
 src_compile() {
 	# help libQtHelp find freshly built libQtCLucene (bug #289811)
-	export LD_LIBRARY_PATH="${S}/lib"
+	export LD_LIBRARY_PATH="${S}/lib" DYLD_LIBRARY_PATH="${S}/lib"
 	qt4-build_src_compile
 	# ugly hack to build docs
 	cd "${S}"
@@ -60,7 +60,7 @@ src_install() {
 	# note that emake install_qchdocs fails for undefined reason so we use a
 	# workaround
 	cd "${S}"
-	insinto "${QTDOCDIR}"
+	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"
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 87f461790fe1..f9c478584997 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.82 2009/12/23 12:50:15 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.83 2009/12/25 15:35:13 abcd Exp $
+
+*qt-core-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-core-4.6.0.ebuild,
+  +qt-core-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   23 Dec 2009; Dror Levin <spatz@gentoo.org> qt-core-4.6.0.ebuild,
   +files/qt-core-4.6.0-hebrew.patch:
diff --git a/x11-libs/qt-core/qt-core-4.6.0.ebuild b/x11-libs/qt-core/qt-core-4.6.0-r1.ebuild
index 60b1235bcd5d..f671df8be8a3 100644
--- a/x11-libs/qt-core/qt-core-4.6.0.ebuild
+++ b/x11-libs/qt-core/qt-core-4.6.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.3 2009/12/23 12:50:15 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:35:13 abcd 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"
+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="doc +glib iconv optimized-qmake qt3support ssl"
 
 RDEPEND="sys-libs/zlib
@@ -16,7 +16,7 @@ RDEPEND="sys-libs/zlib
 	!<x11-libs/qt-4.4.0:4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[qt3support] )"
+PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )"
 
 QT4_TARGET_DIRECTORIES="
 src/tools/bootstrap
@@ -171,9 +171,13 @@ src_install() {
 	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}
+	insinto ${QTTRANSDIR#${EPREFIX}}
 	doins translations/*.qm || die "doins translations failed"
 
 	setqtenv
@@ -182,22 +186,31 @@ src_install() {
 	# List all the multilib libdirs
 	local libdirs=
 	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/${libdir}/qt4"
+		libdirs+=:${EPREFIX}/usr/${libdir}/qt4
 	done
 
 	cat <<-EOF > "${T}/44qt4"
-	LDPATH=${libdirs:1}
+	LDPATH="${libdirs:1}"
 	EOF
 	doenvd "${T}/44qt4"
 
-	dodir /${QTDATADIR}/mkspecs/gentoo
+	dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
 	mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
 		|| die "Failed to move qconfig.pri"
 
-	sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
-			"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
-			"${D}${QTHEADERDIR}"/Qt/qconfig.h \
-		|| die "sed for qconfig.h failed"
+	# 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)
@@ -207,10 +220,12 @@ src_install() {
 
 	# remove some unnecessary headers
 	rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
-qatomic_macosx.h,\
 qatomic_windows.h,\
 qatomic_windowsce.h,\
 qt_windows.h}
 
-	keepdir "${QTSYSCONFDIR}"
+	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+	# Framework magic
+	fix_includes
 }
diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index c47ceba954df..2d6bdc904be4 100644
--- a/x11-libs/qt-dbus/ChangeLog
+++ b/x11-libs/qt-dbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-dbus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.54 2009/12/03 17:22:44 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.55 2009/12/25 15:37:14 abcd Exp $
+
+*qt-dbus-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-dbus-4.6.0.ebuild,
+  +qt-dbus-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   03 Dec 2009; Alex Alexander <wired@gentoo.org>
   +files/qt-4.6-nolibx11.diff, qt-dbus-4.6.0.ebuild:
diff --git a/x11-libs/qt-dbus/qt-dbus-4.6.0.ebuild b/x11-libs/qt-dbus/qt-dbus-4.6.0-r1.ebuild
index c950f251e48d..f0997443724e 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.6.0.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.6.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.2 2009/12/03 17:22:44 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:37:14 abcd 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="~x11-libs/qt-core-${PV}[debug=]
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]
 	>=sys-apps/dbus-1.0.2"
 RDEPEND="${DEPEND}"
 
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 9fcc33e0e5be..d2a48b7a9665 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.87 2009/12/07 15:19:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.88 2009/12/25 15:40:44 abcd Exp $
+
+*qt-gui-4.6.0-r2 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-gui-4.6.0.ebuild,
+  -qt-gui-4.6.0-r1.ebuild, +qt-gui-4.6.0-r2.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
 *qt-gui-4.6.0-r1 (07 Dec 2009)
 
diff --git a/x11-libs/qt-gui/qt-gui-4.6.0-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.0-r2.ebuild
index bbc9e852e427..41469f9f1211 100644
--- a/x11-libs/qt-gui/qt-gui-4.6.0-r1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.6.0-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 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.0-r1.ebuild,v 1.1 2009/12/07 15:19:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.0-r2.ebuild,v 1.1 2009/12/25 15:40:44 abcd Exp $
 
 EAPI="2"
 inherit 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"
+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="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xinerama"
 
 RDEPEND="media-libs/fontconfig
@@ -15,28 +15,32 @@ RDEPEND="media-libs/fontconfig
 	media-libs/jpeg
 	media-libs/libpng
 	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfont
-	x11-libs/libSM
-	x11-libs/libXi
-	~x11-libs/qt-core-${PV}[debug=,glib=,qt3support=]
-	~x11-libs/qt-script-${PV}[debug=]
+	~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}[debug=] )
-	gtk? ( x11-libs/gtk+:2 )
+	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}
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/inputproto"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=] )"
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/inputproto
+	)
+	xinerama? ( x11-proto/xineramaproto )"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
 
 QT4_TARGET_DIRECTORIES="
 src/gui
@@ -140,10 +144,6 @@ src_install() {
 
 	qt4-build_src_install
 
-	# remove some unnecessary headers
-	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \
-		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
-
 	# qt-creator
 	# some qt-creator headers are located
 	# under /usr/include/qt4/QtDesigner/private.
@@ -161,12 +161,12 @@ src_install() {
 		tools/designer/src/designer/images/designer.png \
 		|| die "doicon failed"
 	# Note: absolute image path required here!
-	make_desktop_entry /usr/bin/linguist Linguist \
-			/usr/share/pixmaps/linguist-128-32.png \
+	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 /usr/bin/designer Designer \
-			/usr/share/pixmaps/designer.png \
+	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-gui/qt-gui-4.6.0.ebuild b/x11-libs/qt-gui/qt-gui-4.6.0.ebuild
deleted file mode 100644
index 0f49973aa338..000000000000
--- a/x11-libs/qt-gui/qt-gui-4.6.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2009 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.0.ebuild,v 1.1 2009/12/01 14:50:46 tampakrap Exp $
-
-EAPI="2"
-inherit 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"
-IUSE="+accessibility cups dbus +glib gtk mng nas nis raster tiff qt3support xinerama"
-
-RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfont
-	x11-libs/libSM
-	x11-libs/libXi
-	~x11-libs/qt-core-${PV}[debug=,glib=,qt3support=]
-	~x11-libs/qt-script-${PV}[debug=]
-	cups? ( net-print/cups )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] )
-	gtk? ( x11-libs/gtk+:2 )
-	mng? ( >=media-libs/libmng-1.0.9 )
-	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff )
-	xinerama? ( x11-libs/libXinerama )
-	"
-DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/inputproto"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=] )"
-
-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"
-
-pkg_setup() {
-	if ! use qt3support; then
-		ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support."
-		ebeep 5
-	fi
-
-	if use raster; then
-		ewarn "WARNING: You have enabled raster backend rendering engine."
-		ewarn "This is a new feature and may lead to composite problems"
-		ewarn "screen corruption and broken qt4 or kde4 applications. "
-		ewarn "If you encounter such problems please"
-		ewarn "remove 'raster' use flag and re-compile qt-gui before"
-		ewarn "filling a bug on gentoo bugzilla."
-		ebeep 5
-	fi
-	qt4-build_pkg_setup
-}
-
-src_unpack() {
-	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
-	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
-	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build_src_unpack
-}
-
-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
-
-	# remove some unnecessary headers
-	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \
-		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
-
-	# 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 /usr/bin/linguist Linguist \
-			/usr/share/pixmaps/linguist-128-32.png \
-			'Qt;Development;GUIDesigner' \
-			|| die "linguist make_desktop_entry failed"
-	make_desktop_entry /usr/bin/designer Designer \
-			/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 c490354792bd..ad26abe2f4c3 100644
--- a/x11-libs/qt-multimedia/ChangeLog
+++ b/x11-libs/qt-multimedia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-multimedia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.4 2009/12/01 18:07:54 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.5 2009/12/25 15:41:27 abcd Exp $
+
+*qt-multimedia-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+  -qt-multimedia-4.6.0.ebuild, +qt-multimedia-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-multimedia-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.6.0.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild
index 925b5767379d..543b2834dfae 100644
--- a/x11-libs/qt-multimedia/qt-multimedia-4.6.0.ebuild
+++ b/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.1 2009/12/01 14:51:38 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:41:27 abcd Exp $
 
 EAPI="2"
 inherit qt4-build
 
 DESCRIPTION="The Qt multimedia module"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="~x11-libs/qt-core-${PV}[debug=]
-	~x11-libs/qt-gui-${PV}[debug=]
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog
index 884f76e9b26f..f46625d12233 100644
--- a/x11-libs/qt-opengl/ChangeLog
+++ b/x11-libs/qt-opengl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-opengl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.55 2009/12/01 18:17:25 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.56 2009/12/25 15:42:02 abcd Exp $
+
+*qt-opengl-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-opengl-4.6.0.ebuild,
+  +qt-opengl-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-opengl-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-opengl/qt-opengl-4.6.0.ebuild b/x11-libs/qt-opengl/qt-opengl-4.6.0-r1.ebuild
index 80be1427f9f0..7f05ee9fc066 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.6.0.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.6.0-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.1 2009/12/01 14:52:23 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:42:02 abcd 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"
+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}[debug=,qt3support=]
-	~x11-libs/qt-gui-${PV}[debug=,qt3support=]
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=]
 	virtual/opengl
 	virtual/glu"
 RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog
index 6b387377cc63..0e8cc3c0d5e8 100644
--- a/x11-libs/qt-phonon/ChangeLog
+++ b/x11-libs/qt-phonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-phonon
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.55 2009/12/11 14:57:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.56 2009/12/25 15:42:34 abcd Exp $
+
+*qt-phonon-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-phonon-4.6.0.ebuild,
+  +qt-phonon-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   11 Dec 2009; Raúl Porcel <armin76@gentoo.org> qt-phonon-4.5.3.ebuild:
   sparc stable
diff --git a/x11-libs/qt-phonon/qt-phonon-4.6.0.ebuild b/x11-libs/qt-phonon/qt-phonon-4.6.0-r1.ebuild
index 43845c79d958..e7cb72049415 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.6.0.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.6.0-r1.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.1 2009/12/01 14:53:16 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:42:34 abcd 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"
+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="dbus"
 
-DEPEND="~x11-libs/qt-gui-${PV}[debug=,glib,qt3support]
+DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support]
 	!kde-base/phonon-kde
 	!kde-base/phonon-xine
 	!media-sound/phonon
 	media-libs/gstreamer
 	media-libs/gst-plugins-base
-	dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] )"
+	aqua? ( ~x11-libs/qt-opengl-${PV}[aqua] )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="
diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog
index 564dccacd165..671c51b20dfd 100644
--- a/x11-libs/qt-qt3support/ChangeLog
+++ b/x11-libs/qt-qt3support/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-qt3support
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.59 2009/12/07 14:45:28 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.60 2009/12/25 15:43:07 abcd Exp $
+
+*qt-qt3support-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+  -qt-qt3support-4.6.0.ebuild, +qt-qt3support-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   07 Dec 2009; Alex Alexander <wired@gentoo.org> qt-qt3support-4.6.0.ebuild:
   removed invalid block
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.6.0-r1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.6.0-r1.ebuild
new file mode 100644
index 000000000000..72c6571128c6
--- /dev/null
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.6.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 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.0-r1.ebuild,v 1.1 2009/12/25 15:43:07 abcd 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 ~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-qt3support/qt-qt3support-4.6.0.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.6.0.ebuild
deleted file mode 100644
index a3b8c5a8b286..000000000000
--- a/x11-libs/qt-qt3support/qt-qt3support-4.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 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.0.ebuild,v 1.2 2009/12/07 14:45:28 wired 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"
-IUSE="+accessibility kde phonon"
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support]
-	~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support]
-	~x11-libs/qt-sql-${PV}[debug=,qt3support]
-	phonon? (
-		!kde? ( || ( ~x11-libs/qt-phonon-${PV}[debug=]
-			media-sound/phonon[gstreamer] ) )
-		kde? ( media-sound/phonon[gstreamer] ) )"
-
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-src/qt3support
-src/tools/uic3
-tools/designer/src/plugins/widgets
-tools/qtconfig
-tools/porting"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-src/
-include/
-tools/"
-
-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 85984a574efe..a8a51cb6cc8f 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-script
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.57 2009/12/03 17:23:22 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.58 2009/12/25 15:43:39 abcd Exp $
+
+*qt-script-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-script-4.6.0.ebuild,
+  +qt-script-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   03 Dec 2009; Alex Alexander <wired@gentoo.org>
   +files/qt-4.6-nolibx11.diff, qt-script-4.6.0.ebuild:
diff --git a/x11-libs/qt-script/qt-script-4.6.0.ebuild b/x11-libs/qt-script/qt-script-4.6.0-r1.ebuild
index 7e35c3e46112..fcd962a09c9f 100644
--- a/x11-libs/qt-script/qt-script-4.6.0.ebuild
+++ b/x11-libs/qt-script/qt-script-4.6.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.2 2009/12/03 17:23:22 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:43:39 abcd 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"
+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}[debug=]"
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/script/"
diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog
index ac0e632a1f64..4921a780c570 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.66 2009/12/03 17:23:59 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.67 2009/12/25 15:44:11 abcd Exp $
+
+*qt-sql-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-sql-4.6.0.ebuild,
+  +qt-sql-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   03 Dec 2009; Alex Alexander <wired@gentoo.org>
   +files/qt-4.6-nolibx11.diff, qt-sql-4.6.0.ebuild:
diff --git a/x11-libs/qt-sql/qt-sql-4.6.0.ebuild b/x11-libs/qt-sql/qt-sql-4.6.0-r1.ebuild
index b8c157d28887..873e99f50360 100644
--- a/x11-libs/qt-sql/qt-sql-4.6.0.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.6.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.2 2009/12/03 17:23:59 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:44:11 abcd 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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}[debug=,qt3support=]
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=]
 	firebird? ( dev-db/firebird )
 	mysql? ( virtual/mysql )
 	odbc? ( dev-db/unixODBC )
@@ -55,8 +55,8 @@ src_prepare() {
 src_configure() {
 	# Don't support sqlite2 anymore
 	myconf="${myconf} -no-sql-sqlite2
-		$(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I/usr/include/mysql -L/usr/$(get_libdir)/mysql ")
-		$(qt_use postgres sql-psql plugin) $(use postgres && echo "-I/usr/include/postgresql/pgsql ")
+		$(qt_use 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)"
diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog
index 252b4308189e..a5947c57342b 100644
--- a/x11-libs/qt-svg/ChangeLog
+++ b/x11-libs/qt-svg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-svg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.56 2009/12/01 18:11:40 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.57 2009/12/25 15:45:55 abcd Exp $
+
+*qt-svg-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-svg-4.6.0.ebuild,
+  +qt-svg-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   -qt-svg-4.6.0_rc1.ebuild:
diff --git a/x11-libs/qt-svg/qt-svg-4.6.0.ebuild b/x11-libs/qt-svg/qt-svg-4.6.0-r1.ebuild
index d2c3af5ec6a3..8c38fc1555c6 100644
--- a/x11-libs/qt-svg/qt-svg-4.6.0.ebuild
+++ b/x11-libs/qt-svg/qt-svg-4.6.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.1 2009/12/01 15:00:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:45:55 abcd 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"
+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}[debug=]"
+DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=]"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="
diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog
index d417da5b2db3..4bc8291fcced 100644
--- a/x11-libs/qt-test/ChangeLog
+++ b/x11-libs/qt-test/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-test
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.55 2009/12/03 17:24:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.56 2009/12/25 15:46:29 abcd Exp $
+
+*qt-test-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-test-4.6.0.ebuild,
+  +qt-test-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   03 Dec 2009; Alex Alexander <wired@gentoo.org>
   +files/qt-4.6-nolibx11.diff, qt-test-4.6.0.ebuild:
diff --git a/x11-libs/qt-test/qt-test-4.6.0.ebuild b/x11-libs/qt-test/qt-test-4.6.0-r1.ebuild
index a226dbb579f1..46b0d1c6f9ec 100644
--- a/x11-libs/qt-test/qt-test-4.6.0.ebuild
+++ b/x11-libs/qt-test/qt-test-4.6.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.2 2009/12/03 17:24:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:46:29 abcd 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"
+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}[debug=]"
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/testlib"
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index c5e0b9fb2622..8961b40b8a05 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.73 2009/12/18 15:25:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.74 2009/12/25 15:46:59 abcd Exp $
+
+*qt-webkit-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org> -qt-webkit-4.6.0.ebuild,
+  +qt-webkit-4.6.0-r1.ebuild, +files/qt-webkit-4.6.0-solaris-jsvalue.patch,
+  +files/qt-webkit-4.6.0-solaris-strnstr.patch:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   18 Dec 2009; Ben de Groot <yngwin@gentoo.org> qt-webkit-4.6.0.ebuild:
   Add dependency on qt-xmlpatterns, bug 297291.
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
new file mode 100644
index 000000000000..1244d48ea251
--- /dev/null
+++ b/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch
@@ -0,0 +1,21 @@
+../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/qt-webkit-4.6.0-solaris-strnstr.patch b/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-strnstr.patch
new file mode 100644
index 000000000000..e71f5c0aa115
--- /dev/null
+++ b/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-strnstr.patch
@@ -0,0 +1,27 @@
+(Open)Solaris doesn't have strnstr either:
+https://bugs.webkit.org/show_bug.cgi?id=30647
+http://trac.webkit.org/changeset/50533
+
+
+--- src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h
++++ src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h
+@@ -85,7 +85,7 @@
+ 
+ #endif
+ 
+-#if PLATFORM(WIN_OS) || PLATFORM(LINUX)
++#if PLATFORM(WIN_OS) || PLATFORM(LINUX) || PLATFORM(SOLARIS)
+ 
+ inline char* strnstr(const char* buffer, const char* target, size_t bufferLength)
+ {
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h
++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h
+@@ -85,7 +85,7 @@
+ 
+ #endif
+ 
+-#if PLATFORM(WIN_OS) || PLATFORM(LINUX)
++#if PLATFORM(WIN_OS) || PLATFORM(LINUX) || PLATFORM(SOLARIS)
+ 
+ inline char* strnstr(const char* buffer, const char* target, size_t bufferLength)
+ {
diff --git a/x11-libs/qt-webkit/qt-webkit-4.6.0.ebuild b/x11-libs/qt-webkit/qt-webkit-4.6.0-r1.ebuild
index 7811618c7e57..24c54efe7d1b 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.6.0.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.6.0-r1.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.2 2009/12/18 15:25:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:46:59 abcd 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="kde"
 
-DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl]
-	~x11-libs/qt-dbus-${PV}[debug=]
-	~x11-libs/qt-gui-${PV}[dbus,debug=]
-	~x11-libs/qt-xmlpatterns-${PV}[debug=]
-	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[dbus,debug=]
-		media-sound/phonon ) )
-	kde? ( media-sound/phonon )"
+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"
@@ -32,6 +32,8 @@ src_prepare() {
 	if use sparc; then
 		epatch "${FILESDIR}"/sparc-qt-webkit-sigbus.patch
 	fi
+	epatch "${FILESDIR}"/${P}-solaris-jsvalue.patch
+	epatch "${FILESDIR}"/${P}-solaris-strnstr.patch
 	qt4-build_src_prepare
 }
 
diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog
index f115b2b25a71..39fc10d9b0c7 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.54 2009/12/03 17:25:18 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.55 2009/12/25 15:47:32 abcd Exp $
+
+*qt-xmlpatterns-4.6.0-r1 (25 Dec 2009)
+
+  25 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+  -qt-xmlpatterns-4.5.3.ebuild, -qt-xmlpatterns-4.6.0.ebuild,
+  +qt-xmlpatterns-4.6.0-r1.ebuild:
+  Add prefix support, revbump due to otherwise unresolvable USE deps
 
   03 Dec 2009; Alex Alexander <wired@gentoo.org>
   +files/qt-4.6-nolibx11.diff, qt-xmlpatterns-4.6.0.ebuild:
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3.ebuild
deleted file mode 100644
index de8c93bb93f7..000000000000
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.5.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 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.5.3.ebuild,v 1.2 2009/10/29 11:29:08 fauli 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"
-IUSE=""
-
-DEPEND="~x11-libs/qt-core-${PV}[debug=]"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-include/QtCore
-include/QtNetwork
-include/QtXmlPatterns
-src/network/
-src/corelib/"
-
-QCONFIG_ADD="xmlpatterns"
-QCONFIG_DEFINE="QT_XMLPATTERNS"
-
-PATCHES=(
-	"${FILESDIR}/qt-4.5-nolibx11.diff"
-)
-
-src_configure() {
-	myconf="${myconf} -xmlpatterns"
-	qt4-build_src_configure
-}
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0-r1.ebuild
index 9bbbe84461f8..5850ca4f5a5a 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 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.0.ebuild,v 1.2 2009/12/03 17:25:18 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:47:32 abcd 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"
+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=""
 
-DEPEND="~x11-libs/qt-core-${PV}[debug=]"
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/xmlpatterns tools/xmlpatterns"