13 files changed, 12 insertions, 959 deletions
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 895ef871cb54..1f6dd5b04d35 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.212 2010/01/14 06:54:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.213 2010/01/14 17:57:43 maekke Exp $
+
+  14 Jan 2010; Markus Meier <maekke@gentoo.org> -graphviz-2.12.ebuild,
+  -files/graphviz-2.12-bindings.patch, -files/graphviz-2.12-configure.patch,
+  -files/graphviz-2.12-find-system-libgd.patch,
+  -files/graphviz-2.12-notcl.patch,
+  -files/graphviz-2.12-parallel-build.patch,
+  -files/graphviz-2.16.1-pango-optional.patch,
+  -files/graphviz-2.16.1-python-345.patch,
+  -files/graphviz-2.16.1-python-buildfix.patch,
+  -files/graphviz-2.16.1-tcltk.patch, -graphviz-2.20.3.ebuild:
+  old
 
   14 Jan 2010; Jeroen Roovers <jer@gentoo.org> graphviz-2.24.0-r2.ebuild:
   Stable for HPPA (bug #284689).
diff --git a/media-gfx/graphviz/files/graphviz-2.12-bindings.patch b/media-gfx/graphviz/files/graphviz-2.12-bindings.patch
deleted file mode 100644
index d5b3bde52700..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.12-bindings.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- configure.ac~	2007-03-04 20:20:30.000000000 +0000
-+++ configure.ac	2007-03-04 20:20:39.000000000 +0000
-@@ -606,6 +606,7 @@
-   PERL_ARCHLIB=`$PERL -e 'use Config; print $Config{archlib};'`
-   PERL_INCLUDES=-I$PERL_ARCHLIB/CORE
-   PERL_LIBS="-L$PERL_ARCHLIB/CORE -lperl"
-+  PERL_INSTALL_DIR="`$PERL -e 'use Config; print $Config{vendorarch};'`"
-   save_CPPFLAGS=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $PERL_INCLUDES"
-   AC_CHECK_HEADER(EXTERN.h,,[
-@@ -616,6 +617,7 @@
- fi
- AC_SUBST(PERL_INCLUDES)
- AC_SUBST(PERL_LIBS)
-+AC_SUBST(PERL_INSTALL_DIR)
- fi
- fi
- AM_CONDITIONAL(WITH_PERL, [test "x$PERL" != "x"])
-@@ -684,6 +686,7 @@
-     PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
-     PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
-     PYTHON_LIBS="-L$PYTHON_PREFIX/lib$LIBPOSTFIX -lpython$PYTHON_VERSION_SHORT"
-+    PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
-     save_CPPFLAGS=$CPPFLAGS
-     CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-     AC_CHECK_HEADER(Python.h,,[
-@@ -695,6 +698,7 @@
- fi
- AC_SUBST(PYTHON_INCLUDES)
- AC_SUBST(PYTHON_LIBS)
-+AC_SUBST(PYTHON_INSTALL_DIR)
- fi
- fi
- fi
-@@ -715,6 +719,7 @@
- if test "x$RUBY" != "x"; then
-   RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
-   RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` -lruby"
-+  RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
-   save_CPPFLAGS=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
-   AC_CHECK_HEADER(ruby.h,,[
-@@ -725,6 +730,7 @@
- fi
- AC_SUBST(RUBY_INCLUDES)
- AC_SUBST(RUBY_LIBS)
-+AC_SUBST(RUBY_INSTALL_DIR)
- fi
- fi
- fi
---- tclpkg/gv/Makefile.am~	2007-03-04 21:22:38.000000000 +0000
-+++ tclpkg/gv/Makefile.am	2007-03-04 21:23:24.000000000 +0000
-@@ -70,7 +70,7 @@
- gv_ocaml.cpp $(OCAML_hdr): gv.i
- 	$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
- 
--pkgperldir = $(pkglibdir)/perl
-+pkgperldir = @PERL_INSTALL_DIR@
- PERL_hdr = gv.pm
- nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_hdr)
- libgv_perl_la_SOURCES = $(BASESOURCES)
-@@ -88,7 +88,7 @@
- gv_php.cpp $(PHP_hdr): gv.i
- 	$(SWIG) -c++ -php -o gv_php.cpp $(srcdir)/gv.i
- 
--pkgpythondir = $(pkglibdir)/python
-+pkgpythondir = @PYTHON_INSTALL_DIR@
- PYTHON_hdr = gv.py
- nodist_libgv_python_la_SOURCES = gv_python.cpp $(PYTHON_hdr)
- libgv_python_la_SOURCES = $(BASESOURCES)
-@@ -97,7 +97,7 @@
- gv_python.cpp $(PYTHON_hdr): gv.i
- 	$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
- 
--pkgrubydir = $(pkglibdir)/ruby
-+pkgrubydir = @RUBY_INSTALL_DIR@
- RUBY_hdr = 
- nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_hdr)
- libgv_ruby_la_SOURCES = $(BASESOURCES)
-@@ -118,6 +118,7 @@
- pkginclude_DATA = gv.i gv.cpp
- pkglib_LTLIBRARIES = 
- TESTS =
-+mann_MANS =
- if WITH_SWIG
- if WITH_SHARP
- pkgsharp_DATA = $(SHARP_hdr) gv_sharp.man
-@@ -150,9 +151,11 @@
- TESTS += test_ocaml
- endif
- if WITH_PERL
--pkgperl_DATA = $(PERL_hdr) gv_perl.man
-+pkgperl_DATA = $(PERL_hdr)
-+if WITH_TCL
-+mann_MANS += gv_perl.man
-+endif
- pkgperl_LTLIBRARIES = libgv_perl.la
--TESTS += test_perl
- endif
- if WITH_PHP
- pkgphp_DATA = $(PHP_hdr) gv_php.man
-@@ -160,19 +163,21 @@
- TESTS += test_php
- endif
- if WITH_PYTHON
--pkgpython_DATA = $(PYTHON_hdr) gv_python.man
-+pkgpython_DATA = $(PYTHON_hdr)
-+if WITH_TCL
-+mann_MANS += gv_python.man
-+endif
- pkgpython_LTLIBRARIES = libgv_python.la
--TESTS += test_python
- endif
- if WITH_RUBY
--pkgruby_DATA = $(RUBY_hdr) gv_ruby.man
-+if WITH_TCL
-+mann_MANS += gv_ruby.man
-+endif
- pkgruby_LTLIBRARIES = libgv_ruby.la
--TESTS += test_ruby
- endif
- if WITH_TCL
- pkgtcl_DATA = $(TCL_hdr) gv_tcl.man
- pkgtcl_LTLIBRARIES = libgv_tcl.la
--TESTS += test_tcl
- 
- all-local: pkgIndex.tcl
- 
-@@ -192,11 +197,21 @@
- endif
- 
- install-data-hook:
-+if WITH_LUA
- 	(cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;  $(LN_S) libgv_lua.so gv.so;)
--	(cd $(DESTDIR)$(pkgperldir);   rm -f gv.so;  $(LN_S) libgv_perl.so gv.so;)
--	(cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
--	(cd $(DESTDIR)$(pkgrubydir);   rm -f gv.so;  $(LN_S) libgv_ruby.so gv.so;)
-+endif
-+if WITH_PERL
-+	(cd $(DESTDIR)$(pkgperldir);   rm -f gv.so libgv_perl.so libgv_perl.so.0 libgv_perl.la;  mv libgv_perl.so.0.0.0 gv.so;)
-+endif
-+if WITH_PYTHON
-+	(cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so libgv_python.so libgv_python.so.0 libgv_python.la; mv libgv_python.so.0.0.0 _gv.so;)
-+endif
-+if WITH_RUBY
-+	(cd $(DESTDIR)$(pkgrubydir);   rm -f gv.so libgv_ruby.so libgv_ruby.so.0 libgv_ruby.la;  mv libgv_ruby.so.0.0.0 gv.so;)
-+endif
-+if WITH_TCL
- 	(cd $(DESTDIR)$(pkgtcldir);    rm -f gv.so;  $(LN_S) libgv_tcl.so gv.so;)
-+endif
- 
- uninstall-hook:
- 	(cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;)
-\ No newline at end of file
diff --git a/media-gfx/graphviz/files/graphviz-2.12-configure.patch b/media-gfx/graphviz/files/graphviz-2.12-configure.patch
deleted file mode 100644
index bdad04225445..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.12-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.ac.orig	2007-02-17 22:39:20.000000000 +0100
-+++ configure.ac	2007-02-17 22:41:17.000000000 +0100
-@@ -1255,6 +1255,16 @@
- dnl -----------------------------------
- dnl INCLUDES and LIBS for GNOMEUI.
- 
-+AC_ARG_WITH(gtk,
-+  [AC_HELP_STRING([--with-gnomeui],
-+                  [use gnomeui library])])
-+
-+### default is to build with gtk+
-+if test "x$with_gnomeui" != "xno"; then
-+    with_gnomeui=yes
-+fi
-+
-+if test "x$with_gnomeui" = "xyes"; then
- PKG_CHECK_MODULES(GNOMEUI, [libgnomeui-2.0],
-         [HAVE_GNOMEUI=1
-         AC_DEFINE_UNQUOTED(HAVE_GNOMEUI,1,
-@@ -1262,6 +1272,7 @@
-         [AC_MSG_WARN(gnomeui library not available. using alternate code for firefox interaction)])
- AC_SUBST(GNOMEUI_CFLAGS)
- AC_SUBST(GNOMEUI_LIBS)
-+fi
- AM_CONDITIONAL(WITH_GNOMEUI, [test "x$HAVE_GNOMEUI" != "x"])
- 
- dnl -----------------------------------
diff --git a/media-gfx/graphviz/files/graphviz-2.12-find-system-libgd.patch b/media-gfx/graphviz/files/graphviz-2.12-find-system-libgd.patch
deleted file mode 100644
index c2f8cfb6cfb9..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.12-find-system-libgd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- graphviz-2.12/contrib/diffimg/Makefile.am.orig	2006-06-27 07:29:56.000000000 -0500
-+++ graphviz-2.12/contrib/diffimg/Makefile.am	2007-02-03 00:39:07.204232103 -0600
-@@ -11,7 +11,7 @@
- 
- diffimg_SOURCES = diffimg.c
- 
--if WITH_LIBGD
-+if WITH_MYLIBGD
- diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
- 	@FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
- else
diff --git a/media-gfx/graphviz/files/graphviz-2.12-notcl.patch b/media-gfx/graphviz/files/graphviz-2.12-notcl.patch
deleted file mode 100644
index f409bc6d200b..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.12-notcl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tclpkg/gv/Makefile.am.orig	2007-02-17 22:48:51.000000000 +0100
-+++ tclpkg/gv/Makefile.am	2007-02-17 22:50:31.000000000 +0100
-@@ -184,7 +184,12 @@
- gv_sharp.man gv_guile.man gv_io.man gv_java.man gv_lua.man \
- gv_ocaml.man gv_perl.man gv_php.man gv_python.man gv_ruby.man \
- gv_tcl.man: gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
--	tclsh $(srcdir)/gv_doc_writer.tcl "$(srcdir)"
-+if WITH_TCL
-+	$(TCLSH) $(srcdir)/gv_doc_writer.tcl "$(srcdir)"
-+else
-+	echo "Not building man pages as they would require tcl"
-+	touch $@
-+endif
- 
- install-data-hook:
- 	(cd $(DESTDIR)$(pkgluadir);    rm -f gv.so;  $(LN_S) libgv_lua.so gv.so;)
diff --git a/media-gfx/graphviz/files/graphviz-2.12-parallel-build.patch b/media-gfx/graphviz/files/graphviz-2.12-parallel-build.patch
deleted file mode 100644
index ab19b4f01f51..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.12-parallel-build.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ru graphviz-2.12.orig/tclpkg/gv/Makefile.am graphviz-2.12/tclpkg/gv/Makefile.am
---- graphviz-2.12.orig/tclpkg/gv/Makefile.am	2006-09-12 19:34:43.000000000 +0200
-+++ graphviz-2.12/tclpkg/gv/Makefile.am	2007-04-07 23:18:32.000000000 +0200
-@@ -20,7 +20,8 @@
- libgv_sharp_la_SOURCES = $(BASESOURCES)
- libgv_sharp_la_LIBADD = $(BASELIBS) @SHARP_LIBS@ 
- libgv_sharp_la_LDFLAGS = 
--gv_sharp.cpp $(SHARP_hdr): gv.i
-+$(SHARP_hdr): gv_sharp.cpp
-+gv_sharp.cpp: gv.i
- 	$(SWIG) -c++ -csharp -namespace gv -o gv_sharp.cpp $(srcdir)/gv.i
- 
- pkgguiledir = $(pkglibdir)/guile
-@@ -29,7 +30,8 @@
- libgv_guile_la_SOURCES = $(BASESOURCES)
- libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
- libgv_guile_la_LDFLAGS = 
--gv_guile.cpp $(GUILE_hdr): gv.i
-+$(GUILE_hdr): gv_guile.cpp
-+gv_guile.cpp: gv.i
- 	$(SWIG) -c++ -guile -o gv_guile.cpp $(srcdir)/gv.i
- 	$(SED) -e 's/SWIG_GUILE_INIT_STATIC void/void/' <gv_guile.cpp >t
- 	mv -f t gv_guile.cpp
-@@ -49,7 +51,8 @@
- libgv_java_la_SOURCES = $(BASESOURCES) 
- libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@
- libgv_java_la_LDFLAGS = 
--gv_java.cpp $(JAVA_hdr): gv.i
-+$(JAVA_hdr): gv_java.cpp
-+gv_java.cpp: gv.i
- 	$(SWIG) -c++ -java -o gv_java.cpp $(srcdir)/gv.i
- 
- pkgluadir = $(pkglibdir)/lua
-@@ -67,7 +70,8 @@
- libgv_ocaml_la_SOURCES = $(BASESOURCES)
- libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
- libgv_ocaml_la_LDFLAGS = 
--gv_ocaml.cpp $(OCAML_hdr): gv.i
-+$(OCAML_hdr): gv_ocaml.cpp
-+gv_ocaml.cpp: gv.i
- 	$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
- 
- pkgperldir = $(pkglibdir)/perl
-@@ -76,7 +80,8 @@
- libgv_perl_la_SOURCES = $(BASESOURCES)
- libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
- libgv_perl_la_LDFLAGS = 
--gv_perl.cpp $(PERL_hdr): gv.i
-+$(PERL_hdr): gv_perl.cpp
-+gv_perl.cpp: gv.i
- 	$(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i
- 
- pkgphpdir = $(pkglibdir)/php
-@@ -85,7 +90,8 @@
- libgv_php_la_SOURCES = $(BASESOURCES)
- libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
- libgv_php_la_LDFLAGS = 
--gv_php.cpp $(PHP_hdr): gv.i
-+$(PHP_hdr): gv_php.cpp
-+gv_php.cpp: gv.i
- 	$(SWIG) -c++ -php -o gv_php.cpp $(srcdir)/gv.i
- 
- pkgpythondir = $(pkglibdir)/python
-@@ -94,7 +100,8 @@
- libgv_python_la_SOURCES = $(BASESOURCES)
- libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@
- libgv_python_la_LDFLAGS = 
--gv_python.cpp $(PYTHON_hdr): gv.i
-+$(PYTHON_hdr): gv_python.cpp
-+gv_python.cpp: gv.i
- 	$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
- 
- pkgrubydir = $(pkglibdir)/ruby
-@@ -103,7 +110,8 @@
- libgv_ruby_la_SOURCES = $(BASESOURCES)
- libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@
- libgv_ruby_la_LDFLAGS = 
--gv_ruby.cpp $(RUBY_hdr): gv.i
-+$(RUBY_hdr): gv_ruby.cpp
-+gv_ruby.cpp: gv.i
- 	$(SWIG) -c++ -ruby -o gv_ruby.cpp $(srcdir)/gv.i
- 
- pkgtcldir = $(pkglibdir)/tcl
-@@ -112,7 +120,8 @@
- libgv_tcl_la_SOURCES = $(BASESOURCES)
- libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) @TCL_LIBS@
- libgv_tcl_la_LDFLAGS = 
--gv_tcl.cpp $(TCL_hdr): gv.i
-+$(TCL_hdr): gv_tcl.cpp
-+gv_tcl.cpp: gv.i
- 	$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
- 
- pkginclude_DATA = gv.i gv.cpp
diff --git a/media-gfx/graphviz/files/graphviz-2.16.1-pango-optional.patch b/media-gfx/graphviz/files/graphviz-2.16.1-pango-optional.patch
deleted file mode 100644
index 977f92c04e9b..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.16.1-pango-optional.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-This patch makes it possible to build cmd/dot without haing Pango on a system.
-
-Additionally, it cleans up the massive duplication that was taking place in
-cmd/dot/Makefile.am, without affecting the end result.
-
-Tested with:
-- external libGD + no system cairo/pango
-- external libGD + system cairo/pango
-
-I did not test internal combinations using internal libGD, but I'm reasonably
-certain they will work fine.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Date: 20 December 2007
-
-diff -Nuar -NuarwbB graphviz-2.16.1.orig/cmd/dot/Makefile.am graphviz-2.16.1/cmd/dot/Makefile.am
---- graphviz-2.16.1.orig/cmd/dot/Makefile.am	2007-12-20 18:23:03.354935000 -0800
-+++ graphviz-2.16.1/cmd/dot/Makefile.am	2007-12-20 18:48:09.566483255 -0800
-@@ -67,91 +67,84 @@
- # Workaround is to link explicity to the .libs/libxxx.a
- # A better approach is probably to provide an explicit list of builtins
- # like $(top_srcdir)/lib/gvc/dot_builtins.c
-+
-+# Static build
- dot_static_SOURCES = dot.c $(top_srcdir)/lib/gvc/no_demand_loading.c
- dot_static_LDFLAGS = -export-dynamic -dlpreopen self -export-symbols-regex '.*_LTX_library'
--if WITH_MYLIBGD
--if WITH_PANGOCAIRO
--dot_static_LDADD = \
-+dot_static_LDADD_plugins = \
- 	$(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
- 	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
- 	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
--	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
--	$(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a \
-+	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a
-+if WITH_PANGOCAIRO
-+dot_static_LDADD_plugins += \
-+	$(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a
-+endif
-+
-+dot_static_LDADD_lib_int = \
- 	$(top_builddir)/lib/gvc/libgvc_C.la \
- 	$(top_builddir)/lib/pathplan/libpathplan_C.la \
- 	$(top_builddir)/lib/graph/libgraph_C.la \
--	$(top_builddir)/lib/cdt/libcdt_C.la \
-+	$(top_builddir)/lib/cdt/libcdt_C.la
-+dot_static_LDADD_lib_ext =
-+
-+if WITH_MYLIBGD
-+dot_static_LDADD_lib_int += \
- 	$(top_builddir)/lib/gd/libgvgd_C.la \
--       	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
- else
--dot_static_LDADD = \
--	$(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
--	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
--	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
--	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
--	$(top_builddir)/lib/gvc/libgvc_C.la \
--	$(top_builddir)/lib/pathplan/libpathplan_C.la \
--	$(top_builddir)/lib/graph/libgraph_C.la \
--	$(top_builddir)/lib/cdt/libcdt_C.la \
--	$(top_builddir)/lib/gd/libgvgd_C.la \
--       	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
-+dot_static_LDADD_lib_ext += \
-+	@GD_LIBS@
- endif
--else
--dot_static_LDADD = \
--	$(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
--	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
--	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
--	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
--	$(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a \
--	$(top_builddir)/lib/gvc/libgvc_C.la \
--	$(top_builddir)/lib/pathplan/libpathplan_C.la \
--	$(top_builddir)/lib/graph/libgraph_C.la \
--	$(top_builddir)/lib/cdt/libcdt_C.la \
--       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
-+
-+dot_static_LDADD_lib_ext += \
-+	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@
-+if WITH_PANGOCAIRO
-+dot_static_LDADD_lib_ext += \
-+       	@PANGOCAIRO_LIBS@
- endif
-+dot_static_LDADD_lib_ext += \
-+	@MATH_LIBS@
-+
-+dot_static_LDADD = $(dot_static_LDADD_plugins) $(dot_static_LDADD_lib_int) $(dot_static_LDADD_lib_ext)
- 
-+# Dynamic build
- dot_builtins_SOURCES = dot.c $(top_srcdir)/lib/gvc/dot_builtins.c $(top_srcdir)/lib/gvc/no_demand_loading.c
--if WITH_MYLIBGD
--if WITH_PANGOCAIRO
--dot_builtins_LDADD = \
-+
-+dot_builtins_LDADD_plugins = \
- 	$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
- 	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
- 	$(top_builddir)/plugin/core/libgvplugin_core.la \
--	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
--	$(top_builddir)/plugin/pango/libgvplugin_pango.la \
-+	$(top_builddir)/plugin/gd/libgvplugin_gd.la
-+if WITH_PANGOCAIRO
-+dot_builtins_LDADD_plugins += \
-+	$(top_builddir)/plugin/pango/libgvplugin_pango.la
-+endif
-+
-+dot_builtins_LDADD_lib_int = \
- 	$(top_builddir)/lib/gvc/libgvc_builtins.la \
- 	$(top_builddir)/lib/pathplan/libpathplan.la \
- 	$(top_builddir)/lib/graph/libgraph.la \
--	$(top_builddir)/lib/cdt/libcdt.la \
--	$(top_builddir)/lib/gd/libgvgd_C.la \
--       	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
-+	$(top_builddir)/lib/cdt/libcdt.la
-+dot_builtins_LDADD_lib_ext =
-+
-+if WITH_MYLIBGD
-+dot_builtins_LDADD_lib_int += \
-+	$(top_builddir)/lib/gd/libgvgd_C.la
- else
--dot_builtins_LDADD = \
--	$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
--	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
--	$(top_builddir)/plugin/core/libgvplugin_core.la \
--	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
--	$(top_builddir)/lib/gvc/libgvc_builtins.la \
--	$(top_builddir)/lib/pathplan/libpathplan.la \
--	$(top_builddir)/lib/graph/libgraph.la \
--	$(top_builddir)/lib/cdt/libcdt.la \
--	$(top_builddir)/lib/gd/libgvgd_C.la \
--       	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
-+dot_builtins_LDADD_lib_ext += \
-+	@GD_LIBS@
- endif
--else
--dot_builtins_LDADD = \
--	$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
--	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
--	$(top_builddir)/plugin/core/libgvplugin_core.la \
--	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
--	$(top_builddir)/plugin/pango/libgvplugin_pango.la \
--	$(top_builddir)/lib/gvc/libgvc_builtins.la \
--	$(top_builddir)/lib/pathplan/libpathplan.la \
--	$(top_builddir)/lib/graph/libgraph.la \
--	$(top_builddir)/lib/cdt/libcdt.la \
--       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
-+
-+dot_builtins_LDADD_lib_ext += \
-+	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@
-+if WITH_PANGOCAIRO
-+dot_builtins_LDADD_lib_ext += \
-+       	@PANGOCAIRO_LIBS@
- endif
-+dot_builtins_LDADD_lib_ext += \
-+	@MATH_LIBS@
- 
-+dot_builtins_LDADD = $(dot_builtins_LDADD_plugins) $(dot_builtins_LDADD_lib_int) $(dot_builtins_LDADD_lib_ext)
- 
- EXTRA_DIST = Makefile.old dot.1 dot.pdf
- 
diff --git a/media-gfx/graphviz/files/graphviz-2.16.1-python-345.patch b/media-gfx/graphviz/files/graphviz-2.16.1-python-345.patch
deleted file mode 100644
index 166198ddde28..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.16.1-python-345.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-don't instal dead symlinks, reported in bug #212872
-
-diff -ru graphviz-2.16.1.orig/tclpkg/gv/Makefile.am graphviz-2.16.1/tclpkg/gv/Makefile.am
---- graphviz-2.16.1.orig/tclpkg/gv/Makefile.am	2008-03-15 14:51:01.000000000 +0100
-+++ graphviz-2.16.1/tclpkg/gv/Makefile.am	2008-03-15 14:57:18.000000000 +0100
-@@ -298,8 +298,14 @@
- endif
- if WITH_PYTHON
- 	(cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
-+endif
-+if WITH_PYTHON23
- 	(cd $(DESTDIR)$(pkgpython23dir); rm -f _gv.so; $(LN_S) libgv_python23.so _gv.so;)
-+endif
-+if WITH_PYTHON24
- 	(cd $(DESTDIR)$(pkgpython24dir); rm -f _gv.so; $(LN_S) libgv_python24.so _gv.so;)
-+endif
-+if WITH_PYTHON25
- 	(cd $(DESTDIR)$(pkgpython25dir); rm -f _gv.so; $(LN_S) libgv_python25.so _gv.so;)
- endif
- if WITH_RUBY
diff --git a/media-gfx/graphviz/files/graphviz-2.16.1-python-buildfix.patch b/media-gfx/graphviz/files/graphviz-2.16.1-python-buildfix.patch
deleted file mode 100644
index 6a12b9678500..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.16.1-python-buildfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From Gentoo bug #202618
-diff -ur graphviz-2.16.1.orig/tclpkg/gv/Makefile.am graphviz-2.16.1/tclpkg/gv/Makefile.am
---- graphviz-2.16.1.orig/tclpkg/gv/Makefile.am	2007-12-17 22:10:02.000000000 +0100
-+++ graphviz-2.16.1/tclpkg/gv/Makefile.am	2007-12-17 22:12:40.000000000 +0100
-@@ -124,7 +124,8 @@
- libgv_python_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
- libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@
- libgv_python_la_LDFLAGS = -module -avoid-version
--gv_python.cpp $(PYTHON_data): gv.i
-+$(PYTHON_data): gv_python.cpp
-+gv_python.cpp: gv.i
- 	$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
- 
- pkgpython23dir = $(pkglibdir)/python23
diff --git a/media-gfx/graphviz/files/graphviz-2.16.1-tcltk.patch b/media-gfx/graphviz/files/graphviz-2.16.1-tcltk.patch
deleted file mode 100644
index 9e587e02dc18..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.16.1-tcltk.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix tcl/tc building for 8.5 - bug 181526
-
-diff -ur graphviz-2.16.1.orig/tclpkg/tkspline/Makefile.am graphviz-2.16.1/tclpkg/tkspline/Makefile.am
---- graphviz-2.16.1.orig/tclpkg/tkspline/Makefile.am	2007-12-29 01:13:37.000000000 +0100
-+++ graphviz-2.16.1/tclpkg/tkspline/Makefile.am	2007-12-29 01:13:58.000000000 +0100
-@@ -11,7 +11,7 @@
- 
- # If all else fails there is a local copy of tkInt.h in tkstubs/
- AM_CPPFLAGS = \
--	-I@TK_SRC_DIR@/generic \
-+	-I@TK_SRC_DIR@/generic -I@TK_SRC_DIR@/unix \
- 	-I@TCL_SRC_DIR@/generic \
- 	@TCL_INCLUDES@ @TCLINT_INCLUDES@ \
- 	@TK_INCLUDES@ @TKINT_INCLUDES@ -I$(top_srcdir)/tclpkg/tkstubs
diff --git a/media-gfx/graphviz/graphviz-2.12.ebuild b/media-gfx/graphviz/graphviz-2.12.ebuild
deleted file mode 100644
index 72807293ef0a..000000000000
--- a/media-gfx/graphviz/graphviz-2.12.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.25 2010/01/07 16:06:33 armin76 Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit eutils autotools multilib python
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="-*"
-IUSE="doc examples gnome gtk nls pango perl python ruby X tcl tk"
-
-RDEPEND=">=media-libs/gd-2.0.28
-	>=sys-libs/zlib-1.2.3
-	>=media-libs/freetype-2.1.3
-	>=media-libs/libpng-1.2.5
-	>=media-libs/jpeg-6b
-	>=dev-libs/expat-1.95.5
-	=dev-libs/glib-2*
-	virtual/libiconv
-	media-libs/fontconfig
-	pango? ( x11-libs/pango )
-	gnome? ( gnome-base/libgnomeui )
-	gtk? ( >=x11-libs/gtk+-2 )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( dev-lang/ruby )
-	X? ( x11-libs/libXaw x11-libs/libXpm )
-	tcl? ( >=dev-lang/tcl-8.3 )
-	tk? ( >=dev-lang/tk-8.3 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	tcl? ( dev-lang/swig )"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd (the ones which are always compiled in, depend on zlib, gd)
-# - gtk (depends on gtk-2, cairo, libX11, gtk-2 depends on cairo and libX11 as well)
-# - ming ( depends on ming-3.0 which is still p.masked)
-# - pango ( depends on pango and cairo, but pango depends on cairo as well)
-# - xlib ( depends on libX11, Xrender AND pango, can make use of gnomeui and inotify support)
-# - ming ( depends on ming-3 which is still masked, ?)
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... broken on ~x86
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvpr, lefty, lneato, tools/* :)
-# Lefty needs Xaw and X to build
-
-pkg_setup() {
-	if use tcl && ! built_with_use dev-lang/swig tcl ; then
-		eerror "SWIG has to be built with tcl support."
-		die "Missing tcl USE-flag for dev-lang/swig"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-notcl.patch"
-	epatch "${FILESDIR}/${P}-find-system-libgd.patch"
-	epatch "${FILESDIR}/${P}-configure.patch"
-	epatch "${FILESDIR}/${P}-bindings.patch"
-	epatch "${FILESDIR}/${P}-parallel-build.patch"
-
-	sed -i \
-		-e 's:LC_COLLATE=C:LC_ALL=C:g' \
-		lib/common/Makefile.* || die "sed failed" # bug 134834
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i \
-			-e '/html_DATA/d' \
-			-e '/pdf_DATA/d'
-	fi
-
-	# This is an old version of libtool
-	rm -rf libltdl
-	sed -i -e '/libltdl/d' \
-		configure.ac || die "sed failed"
-
-	# Update this file from our local libtool which is much newer than the
-	# bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD.
-	cp /usr/share/libtool/install-sh config
-
-	# no nls, no gettext, no iconv macro, so disable it
-	use nls || sed -i '/^AM_ICONV/d' configure.ac
-
-	# Nuke the dead symlinks for the bindings
-	sed -i \
-		-e '/$(pkgluadir)/d' \
-		tclpkg/gv/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	# If we want pango, we need --with-x, otherwise
-	# nothing gets built. Dependencies should be ok.
-	local myconf=""
-	if use X || use pango ; then
-		myconf="--with-x"
-	else
-		myconf="--without-x"
-	fi
-
-	econf \
-		--enable-ltdl \
-		--with-libgd \
-		--with-digcola \
-		--with-ipsepcola \
-		--without-ming \
-		--disable-{sharp,io} \
-		$(use_enable tcl) \
-		$(use_enable tk) \
-		--disable-guile \
-		--disable-java \
-		--disable-ocaml \
-		--disable-lua \
-		$(use_enable perl) \
-		--disable-php \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_with gtk) \
-		$(use_with pango pangocairo) \
-		${myconf} \
-		$(use_with gnome gnomeui) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	sed -i \
-		-e "s:htmldir:htmlinfodir:g" \
-		doc/info/Makefile
-
-	emake DESTDIR="${D}" \
-		txtdir=/usr/share/doc/${PF} \
-		htmldir=/usr/share/doc/${PF}/html \
-		htmlinfodir=/usr/share/doc/${PF}/html/info \
-		pdfdir=/usr/share/doc/${PF}/pdf \
-		pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
-		install || die "emake install failed"
-
-	use examples || rm -rf "${D}/usr/share/graphviz/demo"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c
-	if use python ; then
-		python_mod_optimize
-	fi
-}
-
-pkg_postrm() {
-	if use python ; then
-		python_mod_cleanup
-	fi
-}
diff --git a/media-gfx/graphviz/graphviz-2.20.3.ebuild b/media-gfx/graphviz/graphviz-2.20.3.ebuild
deleted file mode 100644
index 6ed46efa6ccd..000000000000
--- a/media-gfx/graphviz/graphviz-2.20.3.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.20.3.ebuild,v 1.13 2010/01/07 16:06:33 armin76 Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit eutils autotools multilib python
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="cairo cgraph doc examples gnome gtk java jpeg nls perl png python ruby tcl"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/expat-2.0.0
-	>=dev-libs/glib-2.11.1
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.28
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.10
-	virtual/libiconv
-	cairo?  (
-		x11-libs/libXaw
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10
-	)
-	ruby?	( dev-lang/ruby )
-	tcl?	( >=dev-lang/tcl-8.3 )
-	gtk?	(
-		>=x11-libs/gtk+-2
-		x11-libs/libXaw
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10
-		gnome? ( gnome-base/libgnomeui )
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.20
-	sys-devel/flex
-	java?	( dev-lang/swig )
-	nls?	( >=sys-devel/gettext-0.14.5 )
-	perl?	( dev-lang/swig )
-	python?	( dev-lang/swig )
-	ruby?	( dev-lang/swig )
-	tcl?	( dev-lang/swig )"
-
-# Dependency description / Maintainer-Info:
-
-# 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
-#   Disabled, depends on ming-3.0 which is still p.masked.
-# - cairo:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib :
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support,
-#   needs libXaw for UI
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... broken on ~x86
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvpr, lefty, lneato, tools/* :)
-# Lefty needs Xaw and X to build
-
-pkg_setup() {
-	if use tcl && ! built_with_use --missing true dev-lang/swig tcl ; then
-		eerror "SWIG has to be built with tcl support."
-		die "Missing tcl USE-flag for dev-lang/swig"
-	fi
-
-	# bug 181147
-	local gdflags
-	use png && gdflags="png"
-	use jpeg && gdflags="${gdflags} jpeg"
-	if [[ -n ${gdflags} ]] && ! built_with_use media-libs/gd ${gdflags} ; then
-		local diemsg="Re-emerge media-libs/gd with USE=\"${gdflags}\""
-		eerror "${diemsg}"
-		die "${diemsg}"
-	fi
-
-	# bug 202781
-	if use cairo && ! built_with_use x11-libs/cairo svg ; then
-		eerror "x11-libs/cairo has to be built with svg support"
-		die "emerge x11-libs/cairo with USE=\"svg\""
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| 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
-
-	# 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 /usr/share/libtool/config/install-sh config || die
-	else
-		cp /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; }
-
-	# Nuke the dead symlinks for the bindings
-	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
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	# Core functionality:
-	# All of X, cairo-output, gtk need the pango+cairo functionality
-	if use gtk ; then
-		myconf="${myconf} --with-x"
-	elif use cairo ; then
-		myconf="${myconf} --with-x"
-	else
-		myconf="${myconf} --without-x"
-	fi
-	myconf="${myconf}
-		$(use_with cgraph)
-		$(use_with gtk)
-		$(use_with cairo pangocairo)
-		--without-ming
-		--with-digcola
-		--with-ipsepcola
-		--with-fontconfig
-		--with-freetype2
-		--with-libgd
-		--without-gdk-pixbuf"
-
-	# new/experimental features, to be tested, disable for now
-	myconf="${myconf}
-		--without-sfdp
-		--without-smyrna
-		--without-digcola
-		--without-ipsepcola"
-
-	use gtk && myconf="${myconf} $(use_with gnome gnomeui)"
-
-	# Bindings:
-	myconf="${myconf}
-		--disable-guile
-		$(use_enable java)
-		--disable-io
-		--disable-lua
-		--disable-ocaml
-		$(use_enable perl)
-		--disable-php
-		$(use_enable python)
-		--disable-r
-		$(use_enable ruby)
-		--disable-sharp
-		$(use_enable tcl)"
-
-	econf \
-		--enable-ltdl \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir=/usr/share/doc/${PF} \
-		htmldir=/usr/share/doc/${PF}/html \
-		htmlinfodir=/usr/share/doc/${PF}/html/info \
-		pdfdir=/usr/share/doc/${PF}/pdf \
-		pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
-		install || die "emake install failed"
-
-	use examples || rm -rf "${D}/usr/share/graphviz/demo"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c
-	if use python ; then
-		python_mod_optimize
-	fi
-}
-
-pkg_postrm() {
-	if use python ; then
-		python_mod_cleanup
-	fi
-}
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index bbf96303e444..a3b67d0a18db 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -29,14 +29,8 @@ documents
 a database of telephone calls or e-mail messages
 </longdescription>
 <use>
-	<flag name='cgraph'>
-		Enables cgraph (PostScript plotting library in C) library
-	</flag>
 	<flag name='lasi'>
 		Enables PostScript output via <pkg>media-libs/lasi</pkg> library
 	</flag>
-	<flag name='pango'>
-		Enables the rendering of the graphs using pango &amp; cairo (with antialiasing support)
-	</flag>
 </use>
 </pkgmetadata>