--- qt-3.3.4-r3.ebuild.orig	2005-04-27 04:36:49.000000000 +0200
+++ qt-3.3.4-r3.ebuild	2005-04-29 01:01:16.000000000 +0200
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r3.ebuild,v 1.6 2005/04/19 01:30:25 gustavoz Exp $
+# $Header: $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic x11-prefix
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -39,6 +39,8 @@
 QTBASE=/usr/qt/3
 
 pkg_setup() {
+	x11-prefix_pkg_setup
+
 	if use immqt ; then
 		ewarn
 		ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
@@ -100,6 +102,9 @@
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		qmake.conf || die
+	# fix the X11 prefix
+	sed -i "s:/usr/X11R6:${X11_PREFIX}:" qmake.conf || die
+
 	cd ${S}
 }
 
@@ -144,7 +149,7 @@
 
 	emake src-qmake src-moc sub-src || die
 
-	export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
+	export DYLD_LIBRARY_PATH="${S}/lib:${X11_PREFIX}/lib:${DYLD_LIBRARY_PATH}"
 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
 	emake sub-tools || die