--- /usr/portage/media-gfx/graphviz/graphviz-2.26.3-r3.ebuild	2011-03-28 23:01:15.000000000 +0200
+++ /usr/portage/media-gfx/graphviz/graphviz-2.28.0.ebuild	2011-06-24 14:51:32.000000000 +0200
@@ -14,7 +14,7 @@
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cairo doc examples gtk java lasi nls perl python ruby static-libs tcl"
+IUSE="cairo doc examples gtk java lasi nls perl python qt4 rsvg ruby static-libs tcl Xaw"
 
 # Requires ksh
 RESTRICT="test"
@@ -29,19 +29,21 @@
 	virtual/jpeg
 	virtual/libiconv
 	cairo?	(
-		x11-libs/libXaw
 		>=x11-libs/pango-1.12
 		>=x11-libs/cairo-1.1.10[svg]
 	)
 	gtk?	(
 		x11-libs/gtk+:2
-		x11-libs/libXaw
+		x11-libs/gdk-pixbuf:2
 		>=x11-libs/pango-1.12
 		>=x11-libs/cairo-1.1.10
 	)
 	lasi?	( media-libs/lasi )
+	qt4?	( x11-libs/qt-core x11-libs/qt-gui )
+	rsvg?	( gnome-base/librsvg )
 	ruby?	( dev-lang/ruby )
-	tcl?	( >=dev-lang/tcl-8.3 )"
+	tcl?	( >=dev-lang/tcl-8.3 )
+	Xaw?	( x11-libs/libXaw )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/flex
@@ -57,11 +59,8 @@
 # Rendering is done via the following plugins (/plugins):
 # - core, dot_layout, neato_layout, gd , dot
 #   the ones which are always compiled in, depend on zlib, gd
-# - gtk
-#   Directly depends on gtk-2.
-#   gtk-2 depends on pango, cairo and libX11 directly.
 # - gdk-pixbuf
-#   Disabled, GTK-1 junk.
+#   
 # - ming
 #   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
 #   incomplete.
@@ -104,7 +103,7 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libtool.patch
+	epatch "${FILESDIR}"/graphviz-lefty-automagic.patch
 
 	# ToDo: Do the same thing for examples and/or
 	#       write a patch for a configuration-option
@@ -114,19 +113,6 @@
 			| xargs sed -i -e '/html_DATA/d' -e '/pdf_DATA/d' || die
 	fi
 
-	# This is an old version of libtool
-	rm -rf libltdl
-	sed -i -e '/libltdl/d' configure.ac || die
-	sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac || die
-
-	# Update this file from our local libtool which is much newer than the
-	# bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD.
-	if has_version ">=sys-devel/libtool-2" ; then
-		cp "${EPREFIX}"/usr/share/libtool/config/install-sh config || die
-	else
-		cp "${EPREFIX}"/usr/share/libtool/install-sh config || die
-	fi
-
 	# no nls, no gettext, no iconv macro, so disable it
 	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
 
@@ -134,15 +120,12 @@
 	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
 
 	# replace the whitespace with tabs
-	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
+	# sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
 
 	eautoreconf
 }
 
 src_configure() {
-	# libtool file collision, bug 276609
-	local myconf="--disable-ltdl-install"
-
 	# Core functionality:
 	# All of X, cairo-output, gtk need the pango+cairo functionality
 	if use gtk || use cairo; then
@@ -153,6 +136,10 @@
 	myconf="${myconf}
 		$(use_with cairo pangocairo)
 		$(use_with gtk)
+		$(use_with gtk gdk-pixbuf)
+		$(use_with qt4 qt)
+		$(use_with rsvg)
+		$(use_with Xaw lefty)
 		$(use_with lasi)
 		--with-digcola
 		--with-fontconfig
@@ -160,7 +147,6 @@
 		--with-ipsepcola
 		--with-libgd
 		--with-sfdp
-		--without-gdk-pixbuf
 		--without-ming"
 
 	# new/experimental features, to be tested, disable for now
@@ -169,7 +155,6 @@
 		--without-devil
 		--without-digcola
 		--without-ipsepcola
-		--without-rsvg
 		--without-smyrna"
 
 	# Bindings: