--- doxygen-1.5.7.1.ebuild	2008-12-30 11:32:25.000000000 +0100
+++ doxygen-1.5.7.1.ebuild	2008-12-30 11:19:16.000000000 +0100
@@ -4,7 +4,7 @@ 
 
 EAPI=1
 
-inherit eutils flag-o-matic toolchain-funcs qt3 fdo-mime
+inherit eutils flag-o-matic toolchain-funcs fdo-mime qt4
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
@@ -13,9 +13,9 @@ 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
+IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
 
-RDEPEND="qt3? ( x11-libs/qt:3 )
+RDEPEND="qt4? ( x11-libs/qt:4 )
 	latex? ( || (
 		( app-text/texlive-core
 		dev-texlive/texlive-genericrecommended
@@ -57,15 +57,10 @@ 
 	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
 	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
-	epatch "${FILESDIR}/${P}-substitute.patch"
 
 	# remove internal libpng - see bug #210237
 	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
 
-	if [ $(get_libdir) == "lib64" ] ; then
-		epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
-	fi
-
 	# fix final DESTDIR issue
 	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
 		addon/doxywizard/Makefile.in || die "sed failed"
@@ -93,14 +88,15 @@ 
 		my_conf="--prefix /usr"
 	fi
 
-	if use qt3; then
+	if use qt4; then
+	    export QTDIR=/usr
 		einfo "using QTDIR: '$QTDIR'."
 		export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
 		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
 		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
 		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-		./configure ${my_conf} $(use_with qt3 doxywizard) \
-		|| die 'configure with qt3 failed'
+		./configure ${my_conf} $(use_with qt4 doxywizard) \
+		|| die 'configure with qt4 failed'
 	else
 		./configure ${my_conf} || die 'configure failed'
 	fi
@@ -141,7 +137,7 @@ 
 	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
 		install || die '"make install" failed.'
 
-	if use qt3; then
+	if use qt4; then
 		doicon "${FILESDIR}/doxywizard.png"
 		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 		"doxywizard.png" "Application;Development"
@@ -163,7 +159,7 @@ 
 	fdo-mime_desktop_database_update
 
 	elog
-	elog "The USE flags qt3, doc, and latex will enable doxywizard, or"
+	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
 	elog "the html and pdf documentation, respectively.  For examples"
 	elog "and other goodies, see the source tarball.  For some example"
 	elog "output, run doxygen on the doxygen source using the Doxyfile"