--- graphviz-2.26.3-r2.ebuild	2010-10-06 00:02:38.000000000 +0300
+++ /tmp/graphviz-2.26.3-r2.ebuild	2010-10-06 00:02:21.000000000 +0300
@@ -104,18 +104,13 @@
 			| 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
+	# Use system copy of libtool 2.x
+	epatch "${FILESDIR}"/${P}-libtool.patch
+	rm -rf libltdl m4/{libtool,lt*}.m4
 
 	# 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
+	cp "${EPREFIX}"/usr/share/libtool/config/install-sh config || die
 
 	# no nls, no gettext, no iconv macro, so disable it
 	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }
@@ -130,9 +125,6 @@
 }
 
 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