--- /usr/portage/eclass/qt4.eclass	2007-07-17 14:05:44.000000000 +0200
+++ qt4.eclass	2007-07-29 17:46:57.487344639 +0200
@@ -13,7 +13,9 @@
 # 08.16.06 - Renamed qt_min_* to qt4_min_* to avoid conflicts with the qt3 eclass.
 #    - Caleb Tennis <caleb@gentoo.org>
 
-inherit versionator eutils
+inherit eutils multilib toolchain-funcs versionator
+
+IUSE="${IUSE} debug"
 
 QTPKG="x11-libs/qt-"
 QT4MAJORVERSIONS="4.3 4.2 4.1 4.0"
@@ -51,12 +53,86 @@
 	echo "${VERSIONS}"
 }
 
-EXPORT_FUNCTIONS pkg_setup
-
 qt4_pkg_setup() {
-	for x in $QT4_BUILT_WITH_USE_CHECK; do
-		if ! built_with_use =x11-libs/qt-4* $x; then
-			die "This package requires Qt4 to be built with the ${x} use flag."
+	for x in ${QT4_BUILT_WITH_USE_CHECK}; do
+		if ! built_with_use =x11-libs/qt-4* ${x}; then
+			die "This package requires Qt4 to be built with the '${x}' USE flag."
 		fi
 	done
+
+	if use debug && ! built_with_use =x11-libs/qt-4* debug; then
+		ewarn
+		ewarn "You are trying to compile ${PN} package with USE=\"debug\""
+		ewarn "while qt4 is build without this particular flag."
+		ewarn "It will not work."
+		ewarn
+		ewarn "Possible solutions to this problem are:"
+		ewarn "a) install package ${PN} without debug USE flag"
+		ewarn "b) re-emerge qt4 with debug USE flag enabled"
+		ewarn
+		die "can't emerge ${PN} with debug USE flag"
+	fi
 }
+
+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 use debug; then
+		echo -e "$CONFIG -= release\nCONFIG += no_fixpath debug" >> ${projprofile}
+	else
+		echo -e "$CONFIG -= 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