From 6205a3c5179677d3bb01104f94b0b850aa8514db Mon Sep 17 00:00:00 2001
From: Leonardo Valeri Manera <lvalerimanera@gmail.com>
Date: Wed, 7 May 2008 03:52:13 +0200
Subject: [PATCH] x11-libs/qt*: Moved qt-4.4.0_rc1 to new eclass.
 eclass/qt4-qt-copy: final tunings, setup for 4.4.0{,_rc1}

---
 eclass/patches/kdelibs/arch.patch                  |  17 -
 eclass/patches/kdelibs/gimpels.patch               |  11 -
 eclass/qca-plugin.eclass                           |  82 ----
 eclass/qt4-build.eclass                            | 513 ---------------------
 eclass/qt4-qt-copy.eclass                          |  55 ++-
 eclass/qt4.eclass                                  | 226 ---------
 x11-libs/qt-assistant/Manifest                     |   7 +-
 .../qt-assistant/qt-assistant-4.4.0_rc1.ebuild     |   2 +-
 x11-libs/qt-core/Manifest                          |   5 +-
 x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild          |  10 +-
 x11-libs/qt-dbus/Manifest                          |   5 +-
 x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild          |   2 +-
 x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild            |   6 +-
 x11-libs/qt-opengl/Manifest                        |   5 +-
 x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild      |   2 +-
 x11-libs/qt-phonon/Manifest                        |   5 +-
 x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild      |   2 +-
 x11-libs/qt-qt3support/Manifest                    |   5 +-
 .../qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild   |   2 +-
 x11-libs/qt-script/Manifest                        |   5 +-
 x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild      |   2 +-
 x11-libs/qt-sql/Manifest                           |   5 +-
 x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild            |   2 +-
 x11-libs/qt-svg/Manifest                           |   5 +-
 x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild            |   2 +-
 x11-libs/qt-test/Manifest                          |   5 +-
 x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild          |   2 +-
 x11-libs/qt-webkit/Manifest                        |   5 +-
 x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild      |   2 +-
 x11-libs/qt-xmlpatterns/Manifest                   |   5 +-
 .../qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild |   4 +-
 x11-libs/qt/Manifest                               |   2 +-
 x11-libs/qt/qt-4.4.0_rc1.ebuild                    |   5 +-
 33 files changed, 76 insertions(+), 937 deletions(-)
 delete mode 100644 eclass/patches/kdelibs/arch.patch
 delete mode 100644 eclass/patches/kdelibs/gimpels.patch
 delete mode 100644 eclass/qca-plugin.eclass
 delete mode 100644 eclass/qt4-build.eclass
 delete mode 100644 eclass/qt4.eclass
 rewrite x11-libs/qt-assistant/Manifest (77%)
 rewrite x11-libs/qt-core/Manifest (100%)
 rewrite x11-libs/qt-dbus/Manifest (100%)
 rewrite x11-libs/qt-opengl/Manifest (100%)
 rewrite x11-libs/qt-phonon/Manifest (100%)
 rewrite x11-libs/qt-qt3support/Manifest (100%)
 rewrite x11-libs/qt-script/Manifest (100%)
 rewrite x11-libs/qt-sql/Manifest (100%)
 rewrite x11-libs/qt-svg/Manifest (100%)
 rewrite x11-libs/qt-test/Manifest (100%)
 rewrite x11-libs/qt-webkit/Manifest (100%)
 rewrite x11-libs/qt-xmlpatterns/Manifest (100%)

diff --git a/eclass/patches/kdelibs/arch.patch b/eclass/patches/kdelibs/arch.patch
deleted file mode 100644
index 8e2d3b7..0000000
--- a/eclass/patches/kdelibs/arch.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig	2008-04-06 18:54:16.000000000 +0600
-+++ configure	2008-04-06 18:59:17.000000000 +0600
-@@ -2348,6 +2348,14 @@
-             echo "    32-bit Intel 80x86 (i386)"
-         fi
-         HOST_ARCH=i386
-+        case "$ARCH" in
-+            x86|i?86)
-+            if [ "$OPT_VERBOSE" = "yes" ]; then
-+                echo "    ARCH is set to x86 or i386/i486/i586/i686 set ARCH to i386"
-+            fi
-+            ARCH=i386
-+            ;;
-+        esac
-         ;;
-     *:*:x86_64|*:*:amd64)
-         if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then
diff --git a/eclass/patches/kdelibs/gimpels.patch b/eclass/patches/kdelibs/gimpels.patch
deleted file mode 100644
index c474927..0000000
--- a/eclass/patches/kdelibs/gimpels.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/corelib/arch/qatomic_generic.h.orig	2008-04-06 10:27:23.000000000 +0600
-+++ src/corelib/arch/qatomic_generic.h	2008-04-06 10:27:47.000000000 +0600
-@@ -223,7 +223,7 @@
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
- {
-     return reinterpret_cast<T *>
--        (QBasicAtomicPointer_fetchAndStoreOrdered(&reinterpret_cast<void * volatile *>(&_q_value),
-+        (QBasicAtomicPointer_fetchAndStoreOrdered(reinterpret_cast<void * volatile *>(&_q_value),
-                                                   newValue));
- }
- 
diff --git a/eclass/qca-plugin.eclass b/eclass/qca-plugin.eclass
deleted file mode 100644
index a7336c9..0000000
--- a/eclass/qca-plugin.eclass
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.38 2008/03/26 01:23:13 rion Exp $
-
-# @ECLASS: qca-plugin.eclass
-# @MAINTAINER:
-# Rion <rion@plotinka.ru>
-# @BLURB: Eclass for QCA plugins
-# @DESCRIPTION:
-# This eclass will be used to build all svn qca plugins
-
-inherit eutils qt4 subversion 
-
-IUSE="debug"
-SLOT="2"
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca/"
-ESVN_PROJECT="qca"
-DEPEND=">=app-crypt/qca-${PV}"
-RDEPEND="${RDEPEND} >=app-crypt/qca-${PV}"
-
-# @FUNCTION: qca-plugin_pkg_setup
-# @MAINTAINER:
-# rion <rion@plotinka.ru>
-# @DESCRIPTION:
-# Default pkg_setup function for packages that depends on qt-plugin
-qca-plugin_pkg_setup() {
-	if use debug && ! built_with_use ">=app-crypt/qca-9999" debug; then
-		echo
-		eerror "You are trying to compile ${PN} with USE=\"debug\""
-		eerror "while qca is built without this flag. It will not work."
-		echo
-		eerror "Possible solutions to this problem are:"
-		eerror "a) install ${PN} without debug USE flag"
-		eerror "b) re-emerge qca with debug USE flag"
-		echo
-		die "can't emerge ${PN} with debug USE flag"
-	fi
-}
-
-
-# @FUNCTION: qca-plugin_src_unpack
-# @MAINTAINER:
-# rion <rion@plotinka.ru>
-# @DESCRIPTION:
-# Default pkg_setup function for packages that depends on qt-plugin
-qca-plugin_src_unpack() {
-	subversion_src_unpack
-	cd "${S}/plugins/${PN}"
-	qconf
-}
-
-
-# @FUNCTION: qca-plugin_src_compile
-# @MAINTAINER:
-# rion <rion@plotinka.ru>
-# @DESCRIPTION:
-# Default src_compile function for packages that depends on qt-plugin
-qca-plugin_src_compile() {
-	cd "${S}/plugins/${PN}"
-	# cannot use econf because of non-standard configure script
-	./configure \
-		--qtdir=/usr \
-		$(use debug && echo "--debug" || echo "--release") \
-		--no-separate-debug-info \
-		|| die "configure failed"
-
-	eqmake4 ${PN}.pro
-	emake || die "make failed"
-}                                  
-
-
-# @FUNCTION: qca-plugin_src_install
-# @MAINTAINER:
-# rion <rion@plotinka.ru>
-# @DESCRIPTION:
-# Default src_install function for packages that depends on qt-plugin
-qca-plugin_src_install() {
-	cd "${S}/plugins/${PN}"
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
deleted file mode 100644
index a266090..0000000
--- a/eclass/qt4-build.eclass
+++ /dev/null
@@ -1,513 +0,0 @@
-# Copyright 2007-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.9 2008/03/06 14:44:13 zlin Exp $
-
-# @ECLASS: qt4-build.eclass
-# @MAINTAINER:
-# Caleb Tennis <caleb@gentoo.org>
-# @BLURB: Eclass for Qt4 split ebuilds.
-# @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt4
-
-KMNAME="qt-copy"
-KMMODULE="patches"
-ESVN_PROJECT="KDE/${KMNAME}"
-ESVN_MIRROR="svn://anonsvn.kde.org/home/kde"
-ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
-ESVN_REPO_URI="${ESVN_REPO_URI}/${KMMODULE}"
-
-RESTRICT="mirror"
-
-inherit eutils multilib toolchain-funcs flag-o-matic subversion
-
-IUSE="${IUSE} debug qt-copy exceptions"
-
-case "${PV}" in
-	4.4.0_rc*)
-		SRCTYPE="${SRCTYPE:-opensource-src}"
-		MY_PV="${PV/_rc/-rc}"
-		SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${MY_PV}.tar.bz2"
-		;;
-    *)
-		SRCTYPE="${SRCTYPE:-opensource-src}"
-		MY_PV=${PV/_pre/-snapshot-}
-		SRC_URI="ftp://ftp.trolltech.com/qt/snapshots/qt-x11-${SRCTYPE}-${MY_PV}.tar.gz"
-		;;
-esac
-
-MY_P=qt-x11-${SRCTYPE}-${MY_PV}                     
-S=${WORKDIR}/${MY_P}
-
-case "${PV}" in
-        4.4.0_rc*)
-				SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-headers.tar.bz2"
-				;;                                                          
-        *)                                                                  
-				;;                                                          
-esac
-
-qt4-build_pkg_setup() {
-	# Check USE requirements
-	qt4-build_check_use
-
-	# Set up installation directories
-	QTBASEDIR=/usr/$(get_libdir)/qt4
-	QTPREFIXDIR=/usr
-	QTBINDIR=/usr/bin
-	QTLIBDIR=/usr/$(get_libdir)/qt4
-	QTPCDIR=/usr/$(get_libdir)/pkgconfig
-	QTDATADIR=/usr/share/qt4
-	QTDOCDIR=/usr/share/doc/qt-${PV}
-	QTHEADERDIR=/usr/include/qt4
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTSYSCONFDIR=/etc/qt4
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTDEMOSDIR=${QTDATADIR}/demos
-
-	PLATFORM=$(qt_mkspecs_dir)
-
-	PATH="${S}/bin:${PATH}"
-	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-}
-
-qt4_unpack() {
-	local target targets
-
-	case "${PV}" in
-		4.4.0_rc*)
-			if use !qt-copy; then
-				for target in configure LICENSE.{GPL2,GPL3,QPL} projects.pro \
-					src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
-					${QT4_EXTRACT_DIRECTORIES} ${QT4_TARGET_DIRECTORIES}; do
-						targets="${targets} ${MY_P}/${target}"
-				done
-				echo tar xjpf "${DISTDIR}/${MY_P}.tar.bz2" ${targets}
-		    	tar xjpf "${DISTDIR}/${MY_P}.tar.bz2" ${targets}
-			else
-				echo tar xjpf "${DISTDIR}/${MY_P}.tar.bz2"
-				tar xjpf "${DISTDIR}/${MY_P}.tar.bz2"
-			fi
-			echo tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
-			tar xjpf "${DISTDIR}"/${MY_P}-headers.tar.bz2
-			;;
-		*)
-			for target in configure LICENSE.SNAPSHOT.OPENSOURCE.{GPL2,GPL3} projects.pro \
-				src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
-				src/corelib/global \
-				${QT4_EXTRACT_DIRECTORIES} ${QT4_TARGET_DIRECTORIES}; do
-					targets="${targets} ${MY_P}/${target}"
-			done
-			#echo tar xzpf "${DISTDIR}/${MY_P}.tar.gz" ${targets}
-			#tar xzpf "${DISTDIR}/${MY_P}.tar.gz" ${targets}
-			echo tar xzpf "${DISTDIR}/${MY_P}.tar.gz"
-			tar xzpf "${DISTDIR}/${MY_P}.tar.gz"
-			;;
-	esac
-}
-
-qt4_qt-copy() {
-	S_="${S}"
-	S="${S}/patches"
-	subversion_src_unpack
-	for x in $(ls "${S}"); do
-		mv -vi ${x} $(echo ${x}|sed "s/[0-9]*/&_all_/;s/_all_-/_all_/")
-	done
-	S="${S_}"
-	cd "${S}"
-
-	EPATCH_SOURCE="${S}/patches"
-	EPATCH_EXCLUDE="0178_all_transparency-window-types.diff
-				   0217_all_qurl-isempty-regression.diff
-				   0218_all_qassert-macro-fix.diff
-				   0172_all_prefer-xrandr-over-xinerama.diff
-				   0184_all_dlopen-defaults-to-local.diff
-				   0215_all_compile-with-Xcursor-linkage.diff"
-	case "${PV}" in
-		4.4.0_rc*)
-			;;
-		*)
-			EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 0221_all__qdbus_to_dbus_fix.diff"
-			;;
-	esac
-	EPATCH_SUFFIX="diff" epatch
-}
-
-qt4-build_src_unpack() {
-	qt4_unpack
-	if [[ ${PN} != qt-core ]]; then
-		cd "${S}"
-		skip_qmake_build_patch
-		skip_project_generation_patch
-		symlink_binaries_to_buildtree
-	fi
-
-	sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		-e "s:X11R6/::" \
-		-i "${S}"/mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed ${S}/mkspecs/$(qt_mkspecs_dir)/qmake.conf failed"
-
-	sed -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
-		-i "${S}"/mkspecs/common/g++.conf || die "sed ${S}/mkspecs/common/g++.conf failed"
-
-	# Apply QT Copy patches:
-	use qt-copy && qt4_qt-copy
-}
-
-qt4-build_src_compile() {
-	# Don't let the user go too overboard with flags.  If you really want to, uncomment
-	# out the line below and give 'er a whirl.
-	strip-flags
-	replace-flags -O3 -O2
-
-	if [[ $(gcc-fullversion) == "3.4.6" && gcc-specs-ssp ]] ; then
-		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
-		append-flags -fno-stack-protector
-	fi
-
-	# Bug 178652
-	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
-		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
-		append-flags -fno-gcse
-	fi
-
-	myconf="$(standard_configure_options) ${myconf}"
-
-	echo ./configure ${myconf}
-	./configure ${myconf} || die "./configure failed"
-
-	build_target_directories
-}
-
-qt4-build_src_install() {
-	install_directories "${QT4_TARGET_DIRECTORIES}"
-	install_qconfigs
-	fix_library_files
-}
-
-standard_configure_options() {
-	local myconf=""
-
-	[[ $(get_libdir) != "lib" ]] && myconf="${myconf} -L/usr/$(get_libdir)"
-
-	# Disable visibility explicitly if gcc version isn't 4
-	if [[ "$(gcc-major-version)" -lt "4" ]]; then
-		myconf="${myconf} -no-reduce-exports"
-	fi
-
-	if use debug; then
-		myconf="${myconf} -debug -no-separate-debug-info"
-	else
-		myconf="${myconf} -release -no-separate-debug-info"
-	fi
-
-	# ARCH is set on Gentoo. QT now falls back to generic on an unsupported
-	# ${ARCH}. Therefore we convert it to supported values.
-	case "${ARCH}" in
-		amd64) myconf="${myconf} -arch x86_64" ;;
-		ppc|ppc64) myconf="${myconf} -arch powerpc" ;;
-		x86) myconf="${myconf} -arch i386" ;;
-		alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch ${ARCH}" ;;
-		hppa|sh) myconf="${myconf} -arch generic" ;;
-		*) die "${ARCH} is unsupported by this eclass. Please file a bug." ;;
-	esac
-
-	if [[ ${PN} != qt-xmlpatterns ]] && use !exceptions; then
-		myconf="${myconf} -no-exceptions"
-	fi
-
-	myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath
-		-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
-		-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
-		-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
-		-translationdir ${QTTRANSDIR} -examplesdir ${QTEXAMPLESDIR}
-		-demosdir ${QTDEMOSDIR} -silent -fast -reduce-relocations
-		-nomake examples -nomake demos"
-
-	echo "${myconf}"
-}
-
-build_target_directories() {
-	build_directories "${QT4_TARGET_DIRECTORIES}"
-}
-
-build_directories() {
-	local dirs="$@"
-	for x in ${dirs}; do
-		cd "${S}"/${x}
-		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
-		emake || die "emake failed"
-	done
-}
-
-install_directories() {
-	local dirs="$@"
-	for x in ${dirs}; do
-		pushd "${S}"/${x} >/dev/null || die "Can't pushd ${S}/${x}"
-		emake INSTALL_ROOT="${D}" install || die "emake install failed"
-		popd >/dev/null || die "Can't popd from ${S}/${x}"
-	done
-}
-
-# @ECLASS-VARIABLE: QCONFIG_ADD
-# @DESCRIPTION:
-# List options that need to be added to QT_CONFIG in qconfig.pri
-QCONFIG_ADD="${QCONFIG_ADD:-}"
-
-# @ECLASS-VARIABLE: QCONFIG_REMOVE
-# @DESCRIPTION:
-# List options that need to be removed from QT_CONFIG in qconfig.pri
-QCONFIG_REMOVE="${QCONFIG_REMOVE:-}"
-
-# @ECLASS-VARIABLE: QCONFIG_DEFINE
-# @DESCRIPTION:
-# List variables that should be defined at the top of QtCore/qconfig.h
-QCONFIG_DEFINE="${QCONFIG_DEFINE:-}"
-
-install_qconfigs() {
-	local x
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
-		for x in QCONFIG_ADD QCONFIG_REMOVE; do
-			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
-		done
-		insinto ${QTDATADIR}/mkspecs/gentoo
-		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
-	fi
-
-	if [[ -n ${QCONFIG_DEFINE} ]]; then
-		for x in ${QCONFIG_DEFINE}; do
-			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
-		done
-		insinto ${QTHEADERDIR}/Gentoo
-		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
-	fi
-}
-
-# Stubs for functions used by the Qt 4.4.0_technical_preview_1.
-qconfig_add_option() { : ; }
-qconfig_remove_option() { : ; }
-
-generate_qconfigs() {
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
-		local x qconfig_add qconfig_remove qconfig_new
-		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
-			[[ -f ${x} ]] || continue
-			qconfig_add="${qconfig_add} $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
-			qconfig_remove="${qconfig_remove} $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
-		done
-
-		# these error checks do not use die because dying in pkg_post{inst,rm}
-		# just makes things worse.
-		if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
-			# start with the qconfig.pri that qt-core installed
-			if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
-				eerror "cp qconfig failed."
-				return 1
-			fi
-
-			# generate list of QT_CONFIG entries from the existing list
-			# including qconfig_add and excluding qconfig_remove
-			for x in $(sed -n 's/^QT_CONFIG +=//p' \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
-					hasq ${x} ${qconfig_remove} || qconfig_new="${qconfig_new} ${x}"
-			done
-
-			# replace the existing QT_CONFIG list with qconfig_new
-			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
-				eerror "Sed for QT_CONFIG failed"
-				return 1
-			fi
-
-			# create Gentoo/qconfig.h
-			if [[ ! -e ${ROOT}${QTHEADERDIR}/Gentoo ]]; then
-				if ! mkdir -p "${ROOT}${QTHEADERDIR}"/Gentoo; then
-					eerror "mkdir ${QTHEADERDIR}/Gentoo failed"
-					return 1
-				fi
-			fi
-			: > "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			for x in "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
-				[[ -f ${x} ]] || continue
-				cat "${x}" >> "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			done
-		else
-			rm -f "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri
-			rm -f "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			rmdir "${ROOT}${QTDATADIR}"/mkspecs \
-				"${ROOT}${QTDATADIR}" \
-				"${ROOT}${QTHEADERDIR}"/Gentoo \
-				"${ROOT}${QTHEADERDIR}" 2>/dev/null
-		fi
-	fi
-}
-
-qt4-build_pkg_postrm() {
-	generate_qconfigs
-}
-
-qt4-build_pkg_postinst() {
-	generate_qconfigs
-}
-
-skip_qmake_build_patch() {
-	# Don't need to build qmake, as it's already installed from qt-core
-	sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed"
-}
-
-skip_project_generation_patch() {
-	# Exit the script early by throwing in an exit before all of the .pro files are scanned
-	sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
-		-i "${S}"/configure || die "Sed failed"
-}
-
-symlink_binaries_to_buildtree() {
-	for bin in qmake moc uic rcc; do
-		ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed."
-	done
-}
-
-fix_library_files() {
-	for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
-		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "Sed on ${libfile} failed."
-		fi
-	done
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
-	for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
-		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
-
-	# Move .pc files into the pkgconfig directory
-
-		dodir ${QTPCDIR}
-		mv ${libfile} "${D}"/${QTPCDIR}/ \
-			|| die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
-		fi
-	done
-
-	# Don't install an empty directory
-	rmdir "${D}"/${QTLIBDIR}/pkgconfig
-}
-
-qt_use() {
-	local flag="${1}"
-	local feature="${1}"
-	local enableval=
-
-	[[ -n ${2} ]] && feature=${2}
-	[[ -n ${3} ]] && enableval="-${3}"
-
-	if use ${flag}; then
-		echo "${enableval}-${feature}"
-	else
-		echo "-no-${feature}"
-	fi
-}
-
-# @ECLASS-VARIABLE: QT4_BUILT_WITH_USE_CHECK
-# @DESCRIPTION:
-# The contents of $QT4_BUILT_WITH_USE_CHECK gets fed to built_with_use
-# (eutils.eclass), line per line.
-#
-# Example:
-# @CODE
-# pkg_setup() {
-# 	use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
-# 		~x11-libs/qt-gui-${PV} qt3support"
-# 	qt4-build_check_use
-# }
-# @CODE
-
-# Run built_with_use on each flag and print appropriate error messages if any
-# flags are missing
-_qt_built_with_use() {
-	local missing opt pkg flag flags
-
-	if [[ ${1} = "--missing" ]]; then
-		missing="${1} ${2}" && shift 2
-	fi
-	if [[ ${1:0:1} = "-" ]]; then
-		opt=${1} && shift
-	fi
-
-	pkg=${1} && shift
-
-	for flag in "${@}"; do
-		flags="${flags} ${flag}"
-		if ! built_with_use ${missing} ${opt} ${pkg} ${flag}; then
-			flags="${flags}*"
-		else
-			[[ ${opt} = "-o" ]] && return 0
-		fi
-	done
-	if [[ "${flags# }" = "${@}" ]]; then
-		return 0
-	fi
-	if [[ ${opt} = "-o" ]]; then
-		eerror "This package requires '${pkg}' to be built with any of the following USE flags: '$*'."
-	else
-		eerror "This package requires '${pkg}' to be built with the following USE flags: '${flags# }'."
-	fi
-	return 1
-}
-
-# @FUNCTION: qt4-build_check_use
-# @DESCRIPTION:
-# Check if the listed packages in $QT4_BUILT_WITH_USE_CHECK are built with the
-# USE flags listed.
-#
-# If any of the required USE flags are missing, an eerror will be printed for
-# each package with missing USE flags.
-qt4-build_check_use() {
-	local line missing
-	while read line; do
-		[[ -z ${line} ]] && continue
-		if ! _qt_built_with_use ${line}; then
-			missing=true
-		fi
-	done <<< "${QT4_BUILT_WITH_USE_CHECK}"
-	if [[ -n ${missing} ]]; then
-		echo
-		eerror "Flags marked with an * are missing."
-		die "Missing USE flags found"
-	fi
-}
-
-qt_mkspecs_dir() {
-	# Allows us to define which mkspecs dir we want to use.
-	local spec
-
-	case ${CHOST} in
-		*-freebsd*|*-dragonfly*)
-			spec="freebsd" ;;
-		*-openbsd*)
-			spec="openbsd" ;;
-		*-netbsd*)
-			spec="netbsd" ;;
-		*-darwin*)
-			spec="darwin" ;;
-		*-linux-*|*-linux)
-			spec="linux" ;;
-		*)
-			die "Unknown CHOST, no platform choosen."
-	esac
-
-	CXX=$(tc-getCXX)
-	if [[ ${CXX/g++/} != ${CXX} ]]; then
-		spec="${spec}-g++"
-	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
-		spec="${spec}-icc"
-	else
-		die "Unknown compiler ${CXX}."
-	fi
-
-	echo "${spec}"
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postrm pkg_postinst
diff --git a/eclass/qt4-qt-copy.eclass b/eclass/qt4-qt-copy.eclass
index 632ee37..cefec38 100644
--- a/eclass/qt4-qt-copy.eclass
+++ b/eclass/qt4-qt-copy.eclass
@@ -7,59 +7,64 @@
 # Leonardo Valeri Manera <l.valerimanera@gmail.com>
 # @BLURB: Eclass for Qt4 split ebuilds with qt-copy
 # @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt4
-# with qt-copy.
-
-RESTRICT="mirror primaryuri"
+# This eclass contains overlays the standard qt4-build eclass
+# with an optional function that applies qt-copy patches,
+# either from a tarball or from svn trunk.
 
 inherit eutils multilib toolchain-funcs flag-o-matic subversion qt4-build
 
-IUSE="${IUSE} +qt-copy"
+IUSE="+qt-copy"
 
-DEPEND="${DEPEND}
-		qt-copy? ( app-arch/lzma-utils )"
+case ${PV} in
+	4.4.0_rc1)
+		QT_COPY_PV="1.0"
+		;;
+	4.4.0)
+		QT_COPY_PV="1.0"
+		;;
+	*)
+		;;
+esac
 
-if [[ -n ${QT_COPY_SNAP} ]]; then
-	SRC_URI="${SRC_URI}
-			 qt-copy? ( http://jyujin.de/~creidiki/qt-copy/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma )"
+if [[ -n ${QT_COPY_PV} ]]; then
+	SRC_URI="qt-copy? ( http://jyujin.de/~creidiki/qt-copy/qt-copy-${PV}-patches-${QT_COPY_PV}.tar.lzma )"
+	DEPEND="qt-copy? ( app-arch/lzma-utils )"
 fi
 
 qt4_qt-copy() {
-	if [[ -z ${QT_COPY_SNAP} ]]; then
+	if [[ -z ${QT_COPY_PV} ]]; then
 		S_="${S}"
 		S="${S}/patches"
+
 		KMNAME="qt-copy"
 		KMMODULE="patches"
 		ESVN_PROJECT="KDE/${KMNAME}"
 		ESVN_MIRROR="svn://anonsvn.kde.org/home/kde"
 		ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
 		ESVN_REPO_URI="${ESVN_REPO_URI}/${KMMODULE}"
+
 		subversion_src_unpack
+
 		for x in $(ls "${S}"); do
 			mv -vi ${x} $(echo ${x}|sed "s/[0-9]*/&_all_/;s/_all_-/_all_/")
 		done
+
 		S="${S_}"
 		cd "${S}"
 
 		EPATCH_SOURCE="${S}/patches"
-		EPATCH_EXCLUDE="0178_all_transparency-window-types.diff
-						0217_all_qurl-isempty-regression.diff
-						0218_all_qassert-macro-fix.diff
-						0172_all_prefer-xrandr-over-xinerama.diff
-						0184_all_dlopen-defaults-to-local.diff
-						0215_all_compile-with-Xcursor-linkage.diff"
-		case "${PV}" in
-			4.4.0_rc*)
-				;;
+		EPATCH_EXCLUDE=""
+		case ${PV} in
 			*)
-				EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 0221_all__qdbus_to_dbus_fix.diff"
+				EPATCH_EXCLUDE=""
 				;;
 		esac
 	else
-		echo lzma -dc "${DISTDIR}"/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma | tar --no-same-owner -xf -
-		lzma -dc "${DISTDIR}"/qt-copy-${PV}-patches-${QT_COPY_SNAP}.tar.lzma | tar --no-same-owner -xf -
-		EPATCH_SOURCE="${S}/qt-copy-${PV}-patches-${QT_COPY_SNAP}"
+		echo "lzma -dc ${DISTDIR}/qt-copy-${PV}-patches-${QT_COPY_PV}.tar.lzma | tar xf - --no-same-owner"
+		lzma -dc "${DISTDIR}"/qt-copy-${PV}-patches-${QT_COPY_PV}.tar.lzma | tar xf - --no-same-owner
+		EPATCH_SOURCE="${S}/qt-copy-${PV}-patches-${QT_COPY_PV}"
 	fi
+	EPATCH_MULTI_MSG="Applying Qt-copy patches ..."
 	EPATCH_SUFFIX="diff" epatch
 }
 
@@ -75,4 +80,4 @@ qt4-qt-copy_pkg_postinst() {
 	fi
 }
 
-EXPORT src_unpack pkg_postinst
+EXPORT_FUNCTIONS src_unpack pkg_postinst
diff --git a/eclass/qt4.eclass b/eclass/qt4.eclass
deleted file mode 100644
index bd418c5..0000000
--- a/eclass/qt4.eclass
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.38 2008/03/06 01:23:13 ingmar Exp $
-
-# @ECLASS: qt4.eclass
-# @MAINTAINER:
-# Caleb Tennis <caleb@gentoo.org>
-# @BLURB: Eclass for Qt4 packages
-# @DESCRIPTION:
-# This eclass contains various functions that may be useful
-# when dealing with packages using Qt4 libraries.
-
-# 08.16.06 - Renamed qt_min_* to qt4_min_* to avoid conflicts with the qt3 eclass.
-#    - Caleb Tennis <caleb@gentoo.org>
-
-inherit eutils multilib toolchain-funcs versionator
-
-QTPKG="x11-libs/qt-"
-QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.4.1_pre20080411 4.4.0_rc1 4.4.0_beta1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
-
-# @FUNCTION: qt4_min_version
-# @USAGE: [minimum version]
-# @DESCRIPTION:
-# This function should be called in package DEPENDs whenever it depends on qt4.
-# Simple example - in your depend, do something like this:
-# DEPEND="$(qt4_min_version 4.2)"
-# if the package can be build with qt-4.2 or higher.
-#
-# For builds that use an EAPI with support for SLOT dependencies, this will
-# return a SLOT dependency, rather than a list of versions.
-qt4_min_version() {
-	case ${EAPI:-0} in
-		# EAPIs without SLOT dependencies
-		0)	echo "|| ("
-			qt4_min_version_list "$@"
-			echo ")"
-			;;
-		# EAPIS with SLOT dependencies.
-		*)	echo ">=${QTPKG}${1}:4"
-			;;
-	esac
-}
-
-qt4_min_version_list() {
-	local MINVER="$1"
-	local VERSIONS=""
-
-	case "${MINVER}" in
-		4|4.0|4.0.0) VERSIONS="=${QTPKG}4*";;
-		4.1|4.1.0|4.2|4.2.0|4.3|4.3.0|4.4|4.4.0)
-			for x in ${QT4MAJORVERSIONS}; do
-				if $(version_is_at_least "${MINVER}" "${x}"); then
-					VERSIONS="${VERSIONS} =${QTPKG}${x}*"
-				fi
-			done
-			;;
-		4*)
-			for x in ${QT4VERSIONS}; do
-				if $(version_is_at_least "${MINVER}" "${x}"); then
-					VERSIONS="${VERSIONS} =${QTPKG}${x}"
-				fi
-			done
-			;;
-		*) VERSIONS="=${QTPKG}4*";;
-	esac
-
-	echo "${VERSIONS}"
-}
-
-# @FUNCTION: qt4_pkg_setup
-# @MAINTAINER:
-# Caleb Tennis <caleb@gentoo.org>
-# Przemyslaw Maciag <troll@gentoo.org>
-# @DESCRIPTION:
-# Default pkg_setup function for packages that depends on qt4. If you have to
-# create ebuilds own pkg_setup in your ebuild, call qt4_pkg_setup in it.
-# This function uses two global vars from ebuild:
-# - QT4_BUILT_WITH_USE_CHECK - contains use flags that need to be turned on for
-#   =x11-libs/qt-4*
-# - QT4_OPTIONAL_BUILT_WITH_USE_CHECK - qt4 flags that provides some
-#   functionality, but can alternatively be disabled in ${CATEGORY}/${PN}
-#   (so qt4 don't have to be recompiled)
-#
-# flags to watch for for Qt4.4:
-# zlib png | opengl dbus qt3support | sqlite3 ssl
-qt4_pkg_setup() {
-
-	QT4_BEST_VERSION="$(best_version =x11-libs/qt-4*)"
-	QT4_MINOR_VERSION="$(get_version_component_range 2 ${QT4_BEST_VERSION/*qt-/})"
-
-	local requiredflags=""
-	for x in ${QT4_BUILT_WITH_USE_CHECK}; do
-		if [[ "${QT4_MINOR_VERSION}" -ge 4 ]]; then
-		# The use flags are different in 4.4 and above, and it's a split package, so this is used to catch
-		# the various use flag combos specified in the ebuilds to make sure we don't error out.
-
-			if [[ ${x} == zlib || ${x} == png ]]; then
-				# Qt 4.4+ is built with zlib and png by default, so the use flags aren't needed
-				continue;
-			elif [[ ${x} == opengl || ${x} == dbus || ${x} == qt3support ]]; then
-				# Make sure the qt-${x} package has been already installed
-
-				if ! has_version x11-libs/qt-${x}; then
-					eerror "You must first install the x11-libs/qt-${x} package."
-					die "Install x11-libs/qt-${x}"
-				fi
-			elif [[ ${x} == ssl ]]; then
-				if ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl; then
-					eerror "You must first install the x11-libs/qt-core package with the ssl flag enabled."
-					die "Install x11-libs/qt-core with USE=\"ssl\""
-				fi
-			elif [[ ${x} == sqlite3 ]]; then
-				if ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite; then
-					eerror "You must first install the x11-libs/qt-sql package with the sqlite flag enabled."
-					die "Install x11-libs/qt-sql with USE=\"sqlite\""
-				fi
-			fi
-		elif ! built_with_use =x11-libs/qt-4* ${x}; then
-			requiredflags="${requiredflags} ${x}"
-		fi
-	done
-
-	local optionalflags=""
-	for x in ${QT4_OPTIONAL_BUILT_WITH_USE_CHECK}; do
-		if use ${x} && ! built_with_use =x11-libs/qt-4* ${x}; then
-			optionalflags="${optionalflags} ${x}"
-		fi
-	done
-
-	local diemessage=""
-	if [[ ${requiredflags} != "" ]]; then
-		eerror
-		eerror "(1) In order to compile ${CATEGORY}/${PN} first you need to build"
-		eerror "=x11-libs/qt-4* with USE=\"${requiredflags}\" flag(s)"
-		eerror
-		diemessage="(1) recompile qt4 with \"${requiredflags}\" USE flag(s) ; "
-	fi
-	if [[ ${optionalflags} != "" ]]; then
-		eerror
-		eerror "(2) You are trying to compile ${CATEGORY}/${PN} package with"
-		eerror "USE=\"${optionalflags}\""
-		eerror "while qt4 is built without this particular flag(s): it will"
-		eerror "not work."
-		eerror
-		eerror "Possible solutions to this problem are:"
-		eerror "a) install package ${CATEGORY}/${PN} without \"${optionalflags}\" USE flag(s)"
-		eerror "b) re-emerge qt4 with \"${optionalflags}\" USE flag(s)"
-		eerror
-		diemessage="${diemessage}(2) recompile qt4 with \"${optionalflags}\" USE flag(s) or disable them for ${PN} package\n"
-	fi
-
-	[[ ${diemessage} != "" ]] && die "can't emerge ${CATEGORY}/${PN}: ${diemessage}"
-}
-
-# @FUNCTION: eqmake4
-# @USAGE: [.pro file] [additional parameters to qmake]
-# @MAINTAINER:
-# Przemyslaw Maciag <troll@gentoo.org>
-# Davide Pesavento <davidepesa@gmail.com>
-# @DESCRIPTION:
-# Runs qmake on the specified .pro file (defaults to
-# ${PN}.pro if eqmake4 was called with no argument).
-# Additional parameters are passed unmodified to qmake.
-eqmake4() {
-	local LOGFILE="${T}/qmake-$$.out"
-	local projprofile="${1}"
-	[[ -z ${projprofile} ]] && projprofile="${PN}.pro"
-	shift 1
-
-	ebegin "Processing qmake ${projprofile}"
-
-	# file exists?
-	if [[ ! -f ${projprofile} ]]; then
-		echo
-		eerror "Project .pro file \"${projprofile}\" does not exists"
-		eerror "qmake cannot handle non-existing .pro files"
-		echo
-		eerror "This shouldn't happen - please send a bug report to bugs.gentoo.org"
-		echo
-		die "Project file not found in ${PN} sources"
-	fi
-
-	echo >> ${LOGFILE}
-	echo "******  qmake ${projprofile}  ******" >> ${LOGFILE}
-	echo >> ${LOGFILE}
-
-	# as a workaround for broken qmake, put everything into file
-	if has debug ${IUSE} && use debug; then
-		echo -e "\nCONFIG -= release\nCONFIG += no_fixpath debug" >> ${projprofile}
-	else
-		echo -e "\nCONFIG -= debug\nCONFIG += no_fixpath release" >> ${projprofile}
-	fi
-
-	/usr/bin/qmake ${projprofile} \
-		QTDIR=/usr/$(get_libdir) \
-		QMAKE=/usr/bin/qmake \
-		QMAKE_CC=$(tc-getCC) \
-		QMAKE_CXX=$(tc-getCXX) \
-		QMAKE_LINK=$(tc-getCXX) \
-		QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
-		QMAKE_CFLAGS_DEBUG="${CFLAGS}" \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}" \
-		QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
-		QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \
-		QMAKE_RPATH= \
-		"${@}" >> ${LOGFILE} 2>&1
-
-	local result=$?
-	eend ${result}
-
-	# was qmake successful?
-	if [[ ${result} -ne 0 ]]; then
-		echo
-		eerror "Running qmake on \"${projprofile}\" has failed"
-		echo
-		eerror "This shouldn't happen - please send a bug report to bugs.gentoo.org"
-		echo
-		die "qmake failed on ${projprofile}"
-	fi
-
-	return ${result}
-}
-
-EXPORT_FUNCTIONS pkg_setup
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
dissimilarity index 77%
index d389f4f..86898a5 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1,4 +1,3 @@
-AUX Assistant.desktop 368 RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d SHA1 515684005a50bfa19ed84fb4105fbb9317ad5d99 SHA256 77b0852193675857141e0ce9ac521cfdab1506a822436a0dec4c4221a680cc4b
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-assistant-4.4.0_rc1.ebuild 1390 RMD160 55b7ef10249abaf87ae62997a5e624a75771f939 SHA1 fdb9e6a97d93a92c9739a0591ebc57389aea61f3 SHA256 ddcffb66619870c39d8b85ed124d42a0de552f3471748eccc61c6ffd22e59005
+AUX Assistant.desktop 368 RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d SHA1 515684005a50bfa19ed84fb4105fbb9317ad5d99 SHA256 77b0852193675857141e0ce9ac521cfdab1506a822436a0dec4c4221a680cc4b
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-assistant-4.4.0_rc1.ebuild 1392 RMD160 e0171927005918b64432a388f43d9f1d97c72609 SHA1 8e7a4960faae8c0a00812bf85754ee8eec394f6e SHA256 b9a0e222b8abf98af8f4dbb441372efe5a53ad5eb151f19665fbcb3ee57861bd
diff --git a/x11-libs/qt-assistant/qt-assistant-4.4.0_rc1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.4.0_rc1.ebuild
index f851b79..a428475 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.4.0_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The assistant help module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
dissimilarity index 100%
index a02bf47..05b9800 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-core-4.4.0_rc1.ebuild 4878 RMD160 32ad7a8275cc2a1d91403c65cfbac56092e8279c SHA1 946dbe304bf4e5c0a72b83b5bda3245010e1a91f SHA256 71ac224fa027445e6534c2a83b5a8185b55910ae027b03fc6e65000baccbf8b6
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-core-4.4.0_rc1.ebuild 4758 RMD160 db0b74fbbf41241f5fd06c37a9b7f72d0adde118 SHA1 236d954102013ebfd0155b76529d8f2aea7be2c1 SHA256 e8bcd42609968140ec4a0358c08e2268ca787f3d228af73e3882be03d1868628
diff --git a/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
index e472954..65d05c1 100644
--- a/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="1"
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
 HOMEPAGE="http://www.trolltech.com/"
@@ -95,7 +95,7 @@ src_unpack() {
 		doc/
 		tools/qdoc3/"
 
-	qt4-build_src_unpack
+	qt4-qt-copy_src_unpack
 }
 
 src_compile() {
@@ -163,9 +163,3 @@ src_install() {
 
 	keepdir "${QTSYSCONFDIR}"
 }
-
-pkg_postinst() {
-	if use qt-copy ; then
-		ewarn "Do NOT report bugs to Gentoo's bugzilla when built with qt-copy!!!"
-	fi
-}
diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest
dissimilarity index 100%
index f40b411..ff5f6db 100644
--- a/x11-libs/qt-dbus/Manifest
+++ b/x11-libs/qt-dbus/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-dbus-4.4.0_rc1.ebuild 1107 RMD160 2d5856cd56452bc2ca16e775f9cf2dba90168494 SHA1 6c258dfbfe53e2b82564c71309b63cf1a0f1a7f6 SHA256 c86940d2dc3fac7f29581d57006fa139080ad63dd366423639cfc9eda2f6c6e8
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-dbus-4.4.0_rc1.ebuild 1109 RMD160 650c26677cbf2d47674b9762223cee0038f5a1fa SHA1 dc6d039ef177de14c15f0b5b132289bcc42a7325 SHA256 e5c02f4b9980c40e235b1134baa128600a5b957ca77b2dbe0fe3ed7e3eb1b5bf
diff --git a/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
index 92cd410..a526b10 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The DBus module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild b/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild
index ed29f35..eaae4d7 100644
--- a/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="1"
-inherit eutils qt4-build
+inherit eutils qt4-qt-copy
 
 DESCRIPTION="The GUI module(s) for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
@@ -17,7 +17,7 @@ IUSE="+accessibility cups dbus debug glib mng nas nis tiff +qt3support xinerama
 
 RDEPEND="
 	media-libs/fontconfig
-	>=media-libs/freetype-2
+	media-libs/freetype:2
 	media-libs/jpeg
 	media-libs/libpng
 	sys-libs/zlib
@@ -64,7 +64,7 @@ src_unpack() {
 	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
 	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
 
-	qt4-build_src_unpack
+	qt4-qt-copy_src_unpack
 
 	# 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
diff --git a/x11-libs/qt-opengl/Manifest b/x11-libs/qt-opengl/Manifest
dissimilarity index 100%
index c946adc..96ee7fa 100644
--- a/x11-libs/qt-opengl/Manifest
+++ b/x11-libs/qt-opengl/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-opengl-4.4.0_rc1.ebuild 856 RMD160 154f846fb5a2f8b84895743dfd79cccbc5ba45db SHA1 90868e365f5bf3cfae217ef36e40795f53618203 SHA256 0067e1620b9810902790eacc3c9b8d55fa2beb6ee44d9effa166be15a226550e
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-opengl-4.4.0_rc1.ebuild 858 RMD160 379cb746209d879a92edddef5368f922c7ac4a8d SHA1 e50aec0d404b56f86548114fc011f5f50765d1d4 SHA256 8f8817a5b3b8e98973398997aa9f7759afcaae66e35f3c77a6a6a4582e317fe1
diff --git a/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild b/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
index ba45e29..8956b2d 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="1"
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The OpenGL module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-phonon/Manifest b/x11-libs/qt-phonon/Manifest
dissimilarity index 100%
index b54989b..fbb06bf 100644
--- a/x11-libs/qt-phonon/Manifest
+++ b/x11-libs/qt-phonon/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-phonon-4.4.0_rc1.ebuild 778 RMD160 7e99e47a794554776613fb14998ac35862159f74 SHA1 20556f96169929bc66862676e4c2c1b84400b5db SHA256 bb382b5d484527a929b475de08ea04e263f5a5a0e9e41573ae7ce64477042b24
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-phonon-4.4.0_rc1.ebuild 780 RMD160 61d2ee9a2a061578bb734bb74b27f6392538e433 SHA1 062bf85856e4eac42804a05dba49a8bc6341b3d9 SHA256 650f7b1a80ded464c8be41819d59541e31b1e1567ad68756bcf36f727bed8b71
diff --git a/x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild
index 306bb51..c41c46c 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.4.0_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The Phonon module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-qt3support/Manifest b/x11-libs/qt-qt3support/Manifest
dissimilarity index 100%
index 5aeb86b..3af8031 100644
--- a/x11-libs/qt-qt3support/Manifest
+++ b/x11-libs/qt-qt3support/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-qt3support-4.4.0_rc1.ebuild 1036 RMD160 7d52e6cd1e3d9ecc82257e67f7c4f0e9934a99dc SHA1 3d7a395a1f3adeaa96ada890d61b60e6693cdd94 SHA256 26186ce892870e9d279cae35e4645a6fe9f9332ba58af4d9166d831f5bd5e822
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-qt3support-4.4.0_rc1.ebuild 1038 RMD160 95f9ed47d7e02e98cdd9898c06300c1a3eb9abe1 SHA1 4681b543ca9d70f3de663711160172929eeb2713 SHA256 b4c35ed97f84b7f23107202d279613b0cbc411c1d68b8d1d38530f9dde5b3622
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
index 7076163..ef47b4c 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="1"
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The Qt3 support module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
dissimilarity index 100%
index 439d396..876721b 100644
--- a/x11-libs/qt-script/Manifest
+++ b/x11-libs/qt-script/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-script-4.4.0_rc1.ebuild 997 RMD160 b8c0e8eb1ab9dd3b17a33e64920f98ac04775894 SHA1 3386a02ee33f464a5b66388c67d4c43e45bb6c56 SHA256 05372c07410a6afbfe0d6460d8bebf655383a2dd98870cabf9f16d89e1d437d1
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-script-4.4.0_rc1.ebuild 999 RMD160 57a98611b8ce5f21f6ff62807586f9081078e6f2 SHA1 1daab6dd7950b7128912aec0483419ae003dc35d SHA256 4e96b3383c7d1a94d89e6ddc61d2760de66b0b76ddf93da3a66dbff7f59b3450
diff --git a/x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild b/x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild
index e3ebf3e..0421897 100644
--- a/x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-script/qt-script-4.4.0_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The ECMAScript module for the Qt toolkit"
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest
dissimilarity index 100%
index 4f2cb8a..75d53e4 100644
--- a/x11-libs/qt-sql/Manifest
+++ b/x11-libs/qt-sql/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-sql-4.4.0_rc1.ebuild 1902 RMD160 e603bc47378a94d69a9625307f04a0795ba21507 SHA1 376ecb7b627818590a5f9e65130dad6801aec073 SHA256 15a3790ae9f133e6951ef93db26bfb23c4aaee574a8a1b73e08897f554e6ac0e
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-sql-4.4.0_rc1.ebuild 1904 RMD160 abe7651af4804341103f00ce969befe6e927cb03 SHA1 8118fca26d9f092b13b5b4194f7f059575eb3010 SHA256 342a29273ac8ddfbf11aa39484aa74a9a5f565ad433a5bd1c204fd3b1c808d48
diff --git a/x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild b/x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild
index 58b55ec..67a718f 100644
--- a/x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-sql/qt-sql-4.4.0_rc1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="1"
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The SQL module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-svg/Manifest b/x11-libs/qt-svg/Manifest
dissimilarity index 100%
index 8c77270..eba98f6 100644
--- a/x11-libs/qt-svg/Manifest
+++ b/x11-libs/qt-svg/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-svg-4.4.0_rc1.ebuild 960 RMD160 46eb7f85959c0d7a44f4d57678dd7d10e7c678cb SHA1 502efa797c8e5e80678e7218a114b0f50e7f264d SHA256 c93acfbd4cc88f70e67a5aa685bcc4a2c8f5f72f2595caab111bd1b3f9c2a3d6
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-svg-4.4.0_rc1.ebuild 962 RMD160 c235506d74b0bac7987ccb028062df23175140c3 SHA1 cb7c4e1c015167ffc2b67a0c6771fe261e257566 SHA256 a2696a16647304ae4580d495f70e69fe60735e4fde46975f36c1fb818bcc615f
diff --git a/x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild b/x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild
index 01f70f2..f374d4d 100644
--- a/x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-svg/qt-svg-4.4.0_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The SVG module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-test/Manifest b/x11-libs/qt-test/Manifest
dissimilarity index 100%
index 85bd729..cf2655a 100644
--- a/x11-libs/qt-test/Manifest
+++ b/x11-libs/qt-test/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-test-4.4.0_rc1.ebuild 872 RMD160 a0975477f584fc284b82b752d637c1355ad99d57 SHA1 a954f01dd6a0865f5a4323ad1747b39d1b65b0cd SHA256 2600df52e327915a35490c395adb1f4a1a8eda2dc00f430b8b2e25333de47b3a
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-test-4.4.0_rc1.ebuild 874 RMD160 44df66069fa6a1a56840eb0cca992fad793ef7fd SHA1 0cc60d0cc924be9d3a00818573fbfed4b1157e40 SHA256 3b8fe708dd4c2ff5c3dbd9ff3e0c663a83809aea9490337b49afe0be4d0cfaf6
diff --git a/x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild b/x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild
index f5d8438..406467d 100644
--- a/x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-test/qt-test-4.4.0_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The testing framework module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
dissimilarity index 100%
index 8801e8e..e7bb87d 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-webkit-4.4.0_rc1.ebuild 649 RMD160 e3175726540b795a3c43f26aacb79a47de6beb18 SHA1 a411a5df4e4c12a025a799b9d9832266fef4f750 SHA256 e275a6f38fd950feadbf5ada126638795eabb1a3128a2a9de0abe74852cc0a04
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-webkit-4.4.0_rc1.ebuild 651 RMD160 6e0665785850d907db2f29b9e68805bb4626fc99 SHA1 c91dad7bce70f0f1028b5214bacf81bdad035555 SHA256 8b818bfffc0d1e23cad7819f0e1e8aad0271e551e00ccf33fb36cc3ac3179b8c
diff --git a/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild
index 5bbf48a..dedcc4e 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The Webkit module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
diff --git a/x11-libs/qt-xmlpatterns/Manifest b/x11-libs/qt-xmlpatterns/Manifest
dissimilarity index 100%
index ecad1b2..8576e1d 100644
--- a/x11-libs/qt-xmlpatterns/Manifest
+++ b/x11-libs/qt-xmlpatterns/Manifest
@@ -1,3 +1,2 @@
-DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
-DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
-EBUILD qt-xmlpatterns-4.4.0_rc1.ebuild 593 RMD160 f06b798d43ffc6f26a705699fd40007e1fb1629f SHA1 d832b58b1d1f0ec350a90676b434df77a565b528 SHA256 6861b497683c5141f98bb664ce89508b63f26e992d958530c20cc52f7f3c7fc6
+DIST qt-copy-4.4.0_rc1-patches-1.0.tar.lzma 8672 RMD160 d8394baf59e59cc364798535e68266a90be47502 SHA1 af42b888d54f1654640414c59495623ca8496630 SHA256 cb29625b6b91031edc4bda1986ecff5dbf26c428f7da32a5ed37c47f564e1fd0
+EBUILD qt-xmlpatterns-4.4.0_rc1.ebuild 584 RMD160 fab2e9e62ad1ea49dcf1da8419d318b2802e54ec SHA1 c20516ecc97010a599bcaee986d18a7a83e0c625 SHA256 418fe31d1b57e063b591dd905be85a2630c8f5ed4dc4c7a0d423545583efd436
diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild
index d63ae6a..951a158 100644
--- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild
+++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.4.0_rc1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="1"
-inherit qt4-build
+inherit qt4-qt-copy
 
 DESCRIPTION="The patternist module for the Qt toolkit."
 HOMEPAGE="http://www.trolltech.com/"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.trolltech.com/"
 LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="+exceptions"
+IUSE=""
 
 DEPEND="~x11-libs/qt-core-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 9a1958c..89f2600 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -30,4 +30,4 @@ EBUILD qt-3.3.8-r4.ebuild 12274 RMD160 481db97b099847e0c2b82bb92d31ee8399398df7
 EBUILD qt-4.3.2-r1.ebuild 9367 RMD160 a5bc55e0516ecdc07bd56680fdb0d1f0a68a2cf4 SHA1 c1e3e017e998b4abbf702d83f3b888b8b0b479a3 SHA256 f725f1b0559d2f3359bcfd0ff00724e518459c79156ccf834661bf05fbcaddb5
 EBUILD qt-4.3.3.ebuild 9291 RMD160 e1483cbd359e7bee499e0f1ab1bdb7f8a456f52d SHA1 5bc335a1c890d8813fb7fd024a6028596a85ca91 SHA256 18723ba276cad71cf62f94c53763fee52c1f6ee2637d49fefc50a0858c51a2d7
 EBUILD qt-4.3.4-r1.ebuild 9593 RMD160 7f95386b0175b183310a4ba378d600faad4342a0 SHA1 40d9af379f530d6867a7c6df4ad139229f7ad69e SHA256 6555bac59d9a42f111e355abf992c02e9c9f0d7f2b0a944e5083830b2fc703e8
-EBUILD qt-4.4.0_rc1.ebuild 746 RMD160 b25a6145ec05b08c87f2c1ec32d67bc8c739666d SHA1 2536fd111d09aab3ce29a8caa5f84f57f6c8eb6c SHA256 bd9b27ef5ac177d884d0fa2ef801c6f6093470d2a4913bc465f73bcfea38d0d4
+EBUILD qt-4.4.0_rc1.ebuild 786 RMD160 fd060847d0b76e1e0f26e29f84b6d68edf35e78a SHA1 5e739a0196bac2222b2f4be796e8ab8c4ddbe3a7 SHA256 0667333ff92d2ff38e8021bb62506b1e4586aa73b2bb1e3c0d5684d87d0bbc7f
diff --git a/x11-libs/qt/qt-4.4.0_rc1.ebuild b/x11-libs/qt/qt-4.4.0_rc1.ebuild
index b4ba427..2869d58 100644
--- a/x11-libs/qt/qt-4.4.0_rc1.ebuild
+++ b/x11-libs/qt/qt-4.4.0_rc1.ebuild
@@ -10,9 +10,9 @@ LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="opengl qt3support"
+IUSE="dbus opengl qt3support"
 
-DEPEND="!=x11-libs/qt-4.4.3*:4"
+DEPEND="!=x11-libs/qt-4.3*:4"
 RDEPEND="${DEPEND}
 		 ~x11-libs/qt-gui-${PV}
 		 ~x11-libs/qt-svg-${PV}
@@ -23,5 +23,6 @@ RDEPEND="${DEPEND}
 		 ~x11-libs/qt-assistant-${PV}
 		 ~x11-libs/qt-xmlpatterns-${PV}
 		 ~x11-libs/qt-webkit-${PV}
+		 dbus? ( ~x11-libs/qt-dbus-${PV} )
 		 opengl? ( ~x11-libs/qt-opengl-${PV} )
 		 qt3support? ( ~x11-libs/qt-qt3support-${PV} )"
-- 
2.11.4.GIT