--- /usr/portage/app-doc/doxygen/doxygen-1.5.8-r1.ebuild	2009-07-12 16:35:18.000000000 +0200
+++ app-doc/doxygen/doxygen-1.6.0.ebuild	2009-08-21 08:28:07.000000000 +0200
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
 
 RDEPEND="qt4? ( x11-libs/qt-gui:4 )
@@ -25,7 +25,7 @@
 	virtual/libiconv
 	media-libs/libpng
 	virtual/ghostscript
-	!nodot? ( >=media-gfx/graphviz-2.6
+	!nodot? ( >=media-gfx/graphviz-2.20.0
 		media-libs/freetype )"
 DEPEND=">=sys-apps/sed-4
 	sys-devel/flex
@@ -51,14 +51,8 @@
 		done
 	fi
 
-	# 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"
-	# backport fix for bug #266693
-	epatch "${FILESDIR}/${P}-kdedocs.patch"
-
-	# remove internal libpng - see bug #210237
-	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
+	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+	epatch "${FILESDIR}/${PN}-1.5-dot-eps.patch"
 
 	# fix final DESTDIR issue
 	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \