16 files changed, 29 insertions, 102 deletions
diff --git a/media-gfx/graphviz/files/digest-graphviz-1.10 b/media-gfx/graphviz/files/digest-graphviz-1.10
deleted file mode 100644
index 31dcbc15cf0b..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-1.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e1402531abff68d146bf94e72b44dc2a graphviz-1.10.tar.gz 3357416
-RMD160 2cccc756d4156936d32659e77348238d8e9ac49c graphviz-1.10.tar.gz 3357416
-SHA256 2400b786c605d8b022b52767038942f93494b0239da1d5541c7b5394207753a0 graphviz-1.10.tar.gz 3357416
diff --git a/media-gfx/graphviz/files/digest-graphviz-1.12 b/media-gfx/graphviz/files/digest-graphviz-1.12
deleted file mode 100644
index 6b4347afc89e..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-1.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 84910caae072c714d107ca9f3e54ace0 graphviz-1.12.tar.gz 3371279
-RMD160 bba80d67e94c140e0977e02c13f15fc096ecfe64 graphviz-1.12.tar.gz 3371279
-SHA256 6f7b5f72258e1254f62ff0baed1faeab83e764b7946384d417e306ae0e04e64e graphviz-1.12.tar.gz 3371279
diff --git a/media-gfx/graphviz/files/digest-graphviz-1.12-r1 b/media-gfx/graphviz/files/digest-graphviz-1.12-r1
deleted file mode 100644
index 9580622064d6..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-1.12-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 673dfc4f812d7e13c39517c1109d6b65 graphviz-1.12-configure.ac.bz2 7502
-RMD160 976c94a596a3b991f7e247cbcdfe23772387dea6 graphviz-1.12-configure.ac.bz2 7502
-SHA256 d03368f0cb81e05dd200735dbd90b355518cd1c9ed2681b80e10a8ab147a70af graphviz-1.12-configure.ac.bz2 7502
-MD5 84910caae072c714d107ca9f3e54ace0 graphviz-1.12.tar.gz 3371279
-RMD160 bba80d67e94c140e0977e02c13f15fc096ecfe64 graphviz-1.12.tar.gz 3371279
-SHA256 6f7b5f72258e1254f62ff0baed1faeab83e764b7946384d417e306ae0e04e64e graphviz-1.12.tar.gz 3371279
diff --git a/media-gfx/graphviz/files/digest-graphviz-1.16 b/media-gfx/graphviz/files/digest-graphviz-1.16
deleted file mode 100644
index 993e724aee25..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-1.16
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 4bb340f3154679f952a1a45fdf11ffc1 graphviz-1.16-panic.patch.tar.bz2 201
-RMD160 99c11a90d912e05040aa08b8765a37da99a64745 graphviz-1.16-panic.patch.tar.bz2 201
-SHA256 96a2b2a1f84116b4ca10b46a554cad2845742dd3b294e0affde431c9d1e30fa1 graphviz-1.16-panic.patch.tar.bz2 201
-MD5 a2a3bd1b9fe807c46e676fb9a3f0ba22 graphviz-1.16.tar.gz 4387670
-RMD160 c21988105cc1fe29b65abe5c26977c0a0083092f graphviz-1.16.tar.gz 4387670
-SHA256 5efa714f0634b42da99696db8610f82d734cb94d06efb5deae5b7c8e755b08df graphviz-1.16.tar.gz 4387670
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.12 b/media-gfx/graphviz/files/digest-graphviz-2.12
new file mode 100644
index 000000000000..43a66a1d5721
--- /dev/null
+++ b/media-gfx/graphviz/files/digest-graphviz-2.12
@@ -0,0 +1,3 @@
+MD5 e5547bc0ec47943c72f5c3e2b5dff58f graphviz-2.12.tar.gz 4607023
+RMD160 68d55176cd5ce0e6a25c90b443529747e738d5c6 graphviz-2.12.tar.gz 4607023
+SHA256 5191892d7950c28754659f703234f7888f132440a049f0d396f287b202f9e37f graphviz-2.12.tar.gz 4607023
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.2 b/media-gfx/graphviz/files/digest-graphviz-2.2
deleted file mode 100644
index 67cac05e38e2..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9275d30695a5c22f360acbef7b85acd3 graphviz-2.2.tar.gz 4379295
-RMD160 d1f97c236d045a43f8369f2fba3e4167b778eda7 graphviz-2.2.tar.gz 4379295
-SHA256 ede074976937086b490882c203da986213e80e2a02b20b8b1349f0b9a9f6ca7b graphviz-2.2.tar.gz 4379295
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.2.1 b/media-gfx/graphviz/files/digest-graphviz-2.2.1
deleted file mode 100644
index 38e21010d364..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-2.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bb46d8ada39436cb672922f0c8b1339c graphviz-2.2.1.tar.gz 4371071
-RMD160 9e82389d40dfa71643ba1a8b0867051fe32175d2 graphviz-2.2.1.tar.gz 4371071
-SHA256 281fb1a4692ef26fd2bb4ebdecc9a86a965922b6a319dc2b4375cfb6b2ad9ca2 graphviz-2.2.1.tar.gz 4371071
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.2.1-r1 b/media-gfx/graphviz/files/digest-graphviz-2.2.1-r1
deleted file mode 100644
index 38e21010d364..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-2.2.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bb46d8ada39436cb672922f0c8b1339c graphviz-2.2.1.tar.gz 4371071
-RMD160 9e82389d40dfa71643ba1a8b0867051fe32175d2 graphviz-2.2.1.tar.gz 4371071
-SHA256 281fb1a4692ef26fd2bb4ebdecc9a86a965922b6a319dc2b4375cfb6b2ad9ca2 graphviz-2.2.1.tar.gz 4371071
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.4 b/media-gfx/graphviz/files/digest-graphviz-2.4
deleted file mode 100644
index 45ab1f64a8ce..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f1074d38a7eeb5e5b2ebfdb643aebf8a graphviz-2.4.tar.gz 4074857
-RMD160 a9cf7ea13d01eb7e06f3dd1c705a0f9f36db9b48 graphviz-2.4.tar.gz 4074857
-SHA256 1b1b9348af629fd58a4a16ab0fbff9954a183194f72466255b2bd08a2ded095b graphviz-2.4.tar.gz 4074857
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.6 b/media-gfx/graphviz/files/digest-graphviz-2.6
deleted file mode 100644
index 775cb0fc8ae5..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d61fc4f8660be31503d4f9ab6f26bf0 graphviz-2.6.tar.gz 4109848
-RMD160 555c6c635b5271b09ffb7ee142192a1b4ec07919 graphviz-2.6.tar.gz 4109848
-SHA256 5208949dd8702205a5d65dfee4439870e36681aa076220cb159d28536fa2cca9 graphviz-2.6.tar.gz 4109848
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.8 b/media-gfx/graphviz/files/digest-graphviz-2.8
deleted file mode 100644
index 7b7f660f37dd..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-2.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ca921b4a9bcd86da4a1092bb17a57d83 graphviz-2.8.tar.gz 4243130
-RMD160 d3b46e9777e9db5ead4fdf5274c6bd10823fe4cd graphviz-2.8.tar.gz 4243130
-SHA256 be0c4b7e49f7c226c68d54bb47018f3b3bfb51bb992f5ad71da875cad13367ca graphviz-2.8.tar.gz 4243130
diff --git a/media-gfx/graphviz/files/gdgen.c.patch b/media-gfx/graphviz/files/gdgen.c.patch
deleted file mode 100644
index dabb37d50bc4..000000000000
--- a/media-gfx/graphviz/files/gdgen.c.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gdgen.c-orig	2002-12-04 11:21:19.000000000 -0800
-+++ gdgen.c	2002-12-04 11:22:52.000000000 -0800
-@@ -754,8 +754,11 @@
- 	else {
- 	suffix = strrchr(imagefile,'.');
- 	if (!suffix) suffix = imagefile; else suffix++;
-+	#ifdef HAVE_LIBPNG
- 	if (!strcasecmp(suffix,"png")) rv = gdImageCreateFromPng(in);
--	else if (!strcasecmp(suffix,"gif")) rv = gdImageCreateFromGif(in);
-+	else //this split seems to be the easiest way to disable png correctly
-+	#endif
-+	  if (!strcasecmp(suffix,"gif")) rv = gdImageCreateFromGif(in);
- 	else if (!strcasecmp(suffix,"jpeg")||!strcasecmp(suffix,"jpg")) rv = gdImageCreateFromJpeg(in);
- 	else if (!strcasecmp(suffix,"wbmp")) rv = gdImageCreateFromWBMP(in);
- 	else if (!strcasecmp(suffix,"xbm")) rv = gdImageCreateFromXbm(in);
diff --git a/media-gfx/graphviz/files/graphviz-1.12-build.patch b/media-gfx/graphviz/files/graphviz-1.12-build.patch
deleted file mode 100644
index 38c8b39b58f3..000000000000
--- a/media-gfx/graphviz/files/graphviz-1.12-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- INSTALL	2 Nov 2000 01:15:04 -0000	1.2
-+++ INSTALL	23 Apr 2004 18:09:34 -0000	1.3
-@@ -21,8 +21,8 @@ diffs or instructions to the address giv
- be considered for the next release.  If at some point `config.cache'
- contains results you don't want to keep, you may remove or edit it.
- 
--   The file `configure.in' is used to create `configure' by a program
--called `autoconf'.  You only need `configure.in' if you want to change
-+   The file `configure.ac' is used to create `configure' by a program
-+called `autoconf'.  You only need `configure.ac' if you want to change
- it or regenerate `configure' using a newer version of `autoconf'.
- 
- The simplest way to compile this package is:
-===================================================================
---- Makefile.am	2004-03-02 00:03:27.000000000 +0100
-+++ Makefile.am	2004-07-24 02:50:30.000000000 +0200
-@@ -8,7 +8,7 @@
- SUBDIRS = cdt agraph agutil doc pathplan graph gd dotneato \
- 	dotty graphs lefty lneato ns \
- 	tclstubs tclhandle gdtclft tcldot tclpathplan \
--        tkstubs tkspline tools contrib dynagraph windows
-+        tkstubs tkspline tools contrib dynagraph
- 
- #dag fdp geo grid incr shape tcldgr tcldgl
- 
-@@ -27,6 +27,6 @@
- 	FAQ.txt MINTERMS.txt autogen.sh depcomp ast_common.h.in \
- 	Makefile.old Config.mk configure.old INSTALL.old \
- 	Makeargs config.h.old compat_getopt.h LICENSE.html iffe \
--	makearch dot.demo features m4
-+	makearch dot.demo features m4 windows
- 
- DISTCLEANFILES = pkgIndex.tcl ast_common.h FEATURE/* graphviz-@VERSION@*
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
new file mode 100644
index 000000000000..c2f8cfb6cfb9
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.12-find-system-libgd.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..834a9a04240e
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.12-notcl.patch
@@ -0,0 +1,15 @@
+--- graphviz-2.12/tclpkg/gv/Makefile.am.old	2007-02-12 12:26:18.000000000 +0900
++++ graphviz-2.12/tclpkg/gv/Makefile.am	2007-02-12 12:31:29.000000000 +0900
+@@ -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
++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.4.conf b/media-gfx/graphviz/files/graphviz-2.4.conf
deleted file mode 100644
index a139e6760993..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.4.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-libgvplugin_neato_layout.so.0 neato_layout {
-	layout {
-		neato 0
-		fdp 0
-		twopi 0
-		circo 0
-	}
-}
-libgvplugin_usershape_gd.so.0 usershape_gd {
-	usershape {
-		png-gd 0
-	}
-}
-libgvplugin_dot_layout.so.0 dot_layout {
-	layout {
-		dot 0
-	}
-}