[gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/

[Pacho Ramos]

commit:     26681eadc76506344ab74c6523af57753f5aaf88
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 10:05:12 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 10:05:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26681ead

media-gfx/graphviz: Drop old

Package-Manager: portage-2.2.22

 media-gfx/graphviz/Manifest                        |   3 -
 .../files/graphviz-2.28.0-Xaw-configure.patch      |  71 ------
 .../files/graphviz-2.28.0-automake-1.11.2.patch    |  33 ---
 .../graphviz-2.28.0-dot-pangocairo-link.patch      |  13 --
 .../files/graphviz-2.38-fix-backslashes.patch      |  34 ---
 media-gfx/graphviz/graphviz-2.28.0.ebuild          | 255 --------------------
 media-gfx/graphviz/graphviz-2.34.0.ebuild          | 260 ---------------------
 media-gfx/graphviz/graphviz-2.36.0.ebuild          | 256 --------------------
 ...-2.36.0-r1.ebuild => graphviz-2.38.0-r1.ebuild} |  20 +-
 media-gfx/graphviz/graphviz-2.38.0.ebuild          | 256 --------------------
 10 files changed, 13 insertions(+), 1188 deletions(-)

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 0d3b41f..c42f116 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,2 @@
 DIST graphviz-2.26.3.tar.gz 17092429 SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1 SHA512 6225141752318af0b50714d70d31dd1ef1bc414d134d22f066f159843991194215bb9bc4e8df38a194e1de67ebbf137d371e875948fa6a6eebfca9df1a414a6d WHIRLPOOL ca35d0ed9cb3751ae968e1c6d425efe42e8b681685eb66f975c0ff1b73e245fc3db6418ec69300331c94275fe3bfcdcd168b931b880c280f3dd63f1f03c4d4db
-DIST graphviz-2.28.0.tar.gz 19620087 SHA256 d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76 SHA512 d6dbcd99487e382f9ca83ef63a3ff3fbe9208f6d3969cf03d15b8944dfb58c7fefe1bf96939e3e69019ae9a562619c6d64ad24e390c408b7271caade443233e0 WHIRLPOOL f0274567661f16993a107f45685f0716e64ea493e064efd2e72a4680120cbee8989fb0eab6429d432d18106d42bfc37d4113816efb14e7888d00014b83dea72a
-DIST graphviz-2.34.0.tar.gz 23921350 SHA256 d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764 SHA512 73dc8c25bc5747fda717d6d2162a8b37bf883544a13b487354a6000d528816a69a021f33cbeec0f6e718a7e9905ab2a04ee63f787ca7f79226055b2da21f4832 WHIRLPOOL 0fe3bf7420eccef9de51789ae9a8d8cab55b6fae7382e557604fb974e04eaa1e0610392dc7f6d5fa85a0b83a3cc955a4ff08d594bf8805c7f06625c7d9ac9007
-DIST graphviz-2.36.0.tar.gz 23846318 SHA256 37fd66d8def158575c75c4f6dbf536839e4ee468aa59314eb472d1aecb076361 SHA512 cca1339cea8d36acbae647a78ff6743a4f77bfa208e74fef615a99dc7d380d2a0a0f0b3fc00de09a9f67c3fad16dc3837ef3aefbfce5a8a3d0f974ed5afbbab5 WHIRLPOOL c9f25f28869afef943121a24b580518d822eb76f30b4c874554f2f1dd4f16ffaf2683644c59746f4295aa574c4b5541f1205787870eed5567cd4bd5c755e5f8b
 DIST graphviz-2.38.0.tar.gz 25848858 SHA256 81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531 WHIRLPOOL b59bb517c4aa690ffd23e1b4d448d5dbaae5594eb1059d574e0cb3bf2091beb9ed867bd4fa7e8ca0259863f24849c96d4d1da056091922bf33ace7da43c8b5d4

diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch
deleted file mode 100644
index 095354f..0000000
--- a/media-gfx/graphviz/files/graphviz-2.28.0-Xaw-configure.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- configure.ac.old	2011-05-07 05:25:24.000000000 +0200
-+++ configure.ac	2011-06-24 13:24:49.000000000 +0200
-@@ -1924,6 +1924,10 @@
- # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
- #
- 
-+AC_ARG_WITH(lefty,
-+  [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
-+  [],[with_xaw=yes])
-+
- AC_ARG_WITH(Xpmincludedir,
-   [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
-   [XPM_INCLUDES="-I$withval"])
-@@ -1931,6 +1935,17 @@
-   [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
-   [XPM_LIBS="-L$withval"])
- 
-+AC_ARG_WITH(Xawincludedir,
-+  [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
-+  [XAW_INCLUDES="-I$withval"])
-+AC_ARG_WITH(Xawlibdir,
-+  [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
-+  [XAW_LIBS="-L$withval"])
-+
-+if test "x$with_xaw" != "xyes"; then
-+  use_lefty="No (disabled)"
-+else
-+
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
-@@ -1941,18 +1956,10 @@
-    AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
- LDFLAGS=$save_LDFLAGS
- CPPFLAGS=$save_CPPFLAGS
--AC_SUBST(XPM_INCLUDES)
--AC_SUBST(XPM_LIBS)
- 
- dnl -----------------------------------
- dnl INCLUDES and LIBS for XAW
- 
--AC_ARG_WITH(Xawincludedir,
--  [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
--  [XAW_INCLUDES="-I$withval"])
--AC_ARG_WITH(Xawlibdir,
--  [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
--  [XAW_LIBS="-L$withval"])
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
-@@ -1978,12 +1985,17 @@
- fi
- LDFLAGS=$save_LDFLAGS
- CPPFLAGS=$save_CPPFLAGS
-+
-+fi
-+
-+AC_SUBST(XPM_INCLUDES)
-+AC_SUBST(XPM_LIBS)
- AC_SUBST(XAW_INCLUDES)
- AC_SUBST(XAW_LIBS)
--AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
--if test "x$with_xaw" = "xno"; then
-+AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
-+if test "x$with_xaw" != "xyes"; then
-     if test "x$no_x" != "xyes"; then
--	AC_MSG_WARN(Lefty cannot be built)
-+	AC_MSG_WARN(Lefty will not be built)
-     fi
- fi
- 

diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch b/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
deleted file mode 100644
index 7b279fc..0000000
--- a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Install dir ( buiding with media-libs/ming ):
-    /usr/$(get_libdir)/graphviz/Bitstream_Vera_Serif.fdb
-    /usr/$(get_libdir)/graphviz/Bitstream_Vera_Sans.fdb
-    /usr/include/graphviz/gv.cpp
-    /usr/include/graphviz/gv.i
-
-Due to the following change, {pkglib,pkginclude}_DATA is invalid:
-    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
----
---- a/plugin/ming/Makefile.am
-+++ b/plugin/ming/Makefile.am
-@@ -17,7 +17,8 @@ lib_LTLIBRARIES = libgvplugin_ming.la
- else
- pkglib_LTLIBRARIES = libgvplugin_ming.la
- endif
--pkglib_DATA = Bitstream_Vera_Sans.fdb  Bitstream_Vera_Serif.fdb
-+fdblibdir = $(libdir)/@PACKAGE@
-+fdblib_DATA = Bitstream_Vera_Sans.fdb  Bitstream_Vera_Serif.fdb
- endif
- 
- libgvplugin_ming_C_la_SOURCES = \
---- a/tclpkg/gv/Makefile.am
-+++ b/tclpkg/gv/Makefile.am
-@@ -257,7 +257,7 @@ $(TCL_data): 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
-+pkginclude_HEADERS = gv.i gv.cpp
- pkglib_LTLIBRARIES = 
- man_MANS =
- DEVTSTS =

diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch b/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch
deleted file mode 100644
index cf1715c..0000000
--- a/media-gfx/graphviz/files/graphviz-2.28.0-dot-pangocairo-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmd/dot/Makefile.am	2012-05-29 01:00:08.965321443 +0200
-+++ cmd/dot/Makefile.am	2012-05-29 01:01:57.471964924 +0200
-@@ -115,8 +115,8 @@
- endif
- 
- if WITH_PANGOCAIRO
--dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS)
--dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS)
-+dot_static_LDADD += $(top_builddir)/plugin/pango/.libs/libgvplugin_pango_C.a $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
-+dot_builtins_LDADD += $(top_builddir)/plugin/pango/libgvplugin_pango.la $(PANGOCAIRO_LIBS) $(PANGOFT2_LIBS)
- endif
- 
- EXTRA_DIST = Makefile.old dot.1 dot.1.pdf osage.1 osage.1.pdf patchwork.1 patchwork.1.pdf dot.vcproj

diff --git a/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch b/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch
deleted file mode 100644
index b4e911d..0000000
--- a/media-gfx/graphviz/files/graphviz-2.38-fix-backslashes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-User reported a regression between 2.26 and 2.36
-when trying to .dot the following graph:
-
-    digraph g {
-        1 -> 2 [label="\\"]
-    }
-
-2.26 shows it as '\' while 2.36 fails as:
-    $ dot -Tpng a.dot -o a.png
-    Warning: 1.dot: syntax error in line 2 near ''
-
-Thanks to Ulya Trofimovich who found and bisected
-the problem down to this commit, which fixes problem
-only in git version.
-
-commit 386e47c14b3a8e83bdf3ec8772963213095a7294
-Author: Emden R. Gansner <erg@××××××××.edu>
-Date:   Thu Jan 30 08:45:06 2014 -0500
-
-    Remove change made in d19b672a3c06f0ae95b1da38b63b068f71eb266f until we can
-    remember why this change was made.
-
-diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
-index 0a31f0c..5bb30b7 100644
---- a/lib/cgraph/scan.l
-+++ b/lib/cgraph/scan.l
-@@ -199,6 +199,7 @@ ID		({NAME}|{NUMBER})
- ["]						BEGIN(qstring); beginstr();
- <qstring>["]			BEGIN(INITIAL); endstr(); return (T_qatom);
- <qstring>[\\]["]		addstr ("\"");
-+<qstring>[\\][\\]		addstr ("\\\\");
- <qstring>[\\][\n]		line_num++; /* ignore escaped newlines */
- <qstring>([^"\\]*|[\\])		addstr(yytext);
- [<]						BEGIN(hstring); html_nest = 1; beginstr();

diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
deleted file mode 100644
index b702ab3..0000000
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic multilib python-single-r1
-
-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"
-#original KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk gts java lasi nls perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0
-	!<=sci-chemistry/cluster-1.3.081231
-	virtual/jpeg:0
-	virtual/libiconv
-	X? (
-		x11-libs/libXaw
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-	cairo?	(
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10[svg]
-	)
-	devil?	( media-libs/devil[png,jpeg] )
-	postscript? ( app-text/ghostscript-gpl )
-	gtk?	( x11-libs/gtk+:2 )
-	gts?	( sci-libs/gts )
-	lasi?	( media-libs/lasi )
-	perl?   ( dev-lang/perl:= )
-	python?	( ${PYTHON_DEPS} )
-	qt4?	(
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	ruby?	( dev-lang/ruby )
-	svg?	( gnome-base/librsvg )
-	tcl?	( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	java?	( dev-lang/swig )
-	nls?	( >=sys-devel/gettext-0.14.5 )
-	perl?	( dev-lang/swig )
-	python?	(
-		dev-lang/swig
-		${PYTHON_DEPS}
-	)
-	ruby?	( dev-lang/swig )
-	tcl?	( dev-lang/swig )"
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# 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, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt4'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-Xaw-configure.patch \
-		"${FILESDIR}"/${P}-automake-1.11.2.patch \
-		"${FILESDIR}"/${P}-dot-pangocairo-link.patch
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# This is an old version of libtool
-	# use the ./configure option to exclude its use, and
-	# delete the dir since we don't need to eautoreconf it
-	rm -rf libltdl
-
-	# 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
-
-	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
-	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
-	eautoreconf
-}
-
-src_configure() {
-	# libtool file collision, bug 276609
-	local myconf="--without-included-ltdl --disable-ltdl-install"
-
-	myconf="${myconf}
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt4)
-		$(use_with lasi)
-		$(use_with svg rsvg)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		--without-gdk-pixbuf
-		--without-ming"
-
-	# new/experimental features, to be tested, disable for now
-	myconf="${myconf}
-		--without-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio"
-
-	# Bindings:
-	myconf="${myconf}
-		--disable-guile
-		--disable-io
-		$(use_enable java)
-		--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 \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	use python && python_optimize \
-		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c
-}

diff --git a/media-gfx/graphviz/graphviz-2.34.0.ebuild b/media-gfx/graphviz/graphviz-2.34.0.ebuild
deleted file mode 100644
index 5844049..0000000
--- a/media-gfx/graphviz/graphviz-2.34.0.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-#original KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0
-	!<=sci-chemistry/cluster-1.3.081231
-	virtual/jpeg:0
-	virtual/libiconv
-	X? (
-		x11-libs/libXaw
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-	cairo?	(
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10[svg]
-	)
-	devil?	( media-libs/devil[png,jpeg] )
-	postscript? ( app-text/ghostscript-gpl )
-	gtk?	( x11-libs/gtk+:2 )
-	gts?	( sci-libs/gts )
-	lasi?	( media-libs/lasi )
-	pdf?    ( app-text/poppler )
-	perl?   ( dev-lang/perl:= )
-	python?	( ${PYTHON_DEPS} )
-	qt4?	(
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	ruby?	( dev-lang/ruby )
-	svg?	( gnome-base/librsvg )
-	tcl?	( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	guile?  ( dev-scheme/guile dev-lang/swig )
-	java?	( >=virtual/jdk-1.5 dev-lang/swig )
-	nls?	( >=sys-devel/gettext-0.14.5 )
-	perl?	( dev-lang/swig )
-	python?	(
-		dev-lang/swig
-		${PYTHON_DEPS}
-	)
-	ruby?	( dev-lang/swig )
-	tcl?	( dev-lang/swig )"
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer 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, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt4'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-Xaw-configure.patch \
-		"${FILESDIR}"/${P}-dot-pangocairo-link.patch
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# This is an old version of libtool
-	# use the ./configure option to exclude its use, and
-	# delete the dir since we don't need to eautoreconf it
-	rm -rf libltdl
-
-	# 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
-
-	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
-	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	# libtool file collision, bug 276609
-	local myconf="--without-included-ltdl --disable-ltdl-install"
-
-	myconf="${myconf}
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt4)
-		$(use_with lasi)
-		$(use_with svg rsvg)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		$(use_enable gdk-pixbuf)
-		--without-ming"
-
-	# new/experimental features, to be tested, disable for now
-	myconf="${myconf}
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio"
-
-	# Bindings:
-	myconf="${myconf}
-		$(use_enable guile)
-		--disable-io
-		$(use_enable java)
-		--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 \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	use python && python_optimize \
-		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c
-}

diff --git a/media-gfx/graphviz/graphviz-2.36.0.ebuild b/media-gfx/graphviz/graphviz-2.36.0.ebuild
deleted file mode 100644
index 19ce277..0000000
--- a/media-gfx/graphviz/graphviz-2.36.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0
-	!<=sci-chemistry/cluster-1.3.081231
-	sys-devel/libtool
-	virtual/jpeg:0
-	virtual/libiconv
-	X? (
-		x11-libs/libXaw
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-	cairo?	(
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10[svg]
-	)
-	devil?	( media-libs/devil[png,jpeg] )
-	postscript? ( app-text/ghostscript-gpl )
-	gtk?	( x11-libs/gtk+:2 )
-	gts?	( sci-libs/gts )
-	lasi?	( media-libs/lasi )
-	pdf?	( app-text/poppler )
-	perl?   ( dev-lang/perl:= )
-	python?	( ${PYTHON_DEPS} )
-	qt4?	(
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	ruby?	( dev-lang/ruby )
-	svg?	( gnome-base/librsvg )
-	tcl?	( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	guile?	( dev-scheme/guile dev-lang/swig )
-	java?	( >=virtual/jdk-1.5 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 )"
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer 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, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt4'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
-		"${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# This is an old version of libtool
-	# use the ./configure option to exclude its use, and
-	# delete the dir since we don't need to eautoreconf it
-	rm -rf libltdl
-
-	# 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
-
-	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
-	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	# libtool file collision, bug 276609
-	local myconf="--without-included-ltdl --disable-ltdl-install"
-
-	myconf="${myconf}
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt4)
-		$(use_with lasi)
-		$(use_with svg rsvg)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		$(use_enable gdk-pixbuf)
-		--without-ming"
-
-	# new/experimental features, to be tested, disable for now
-	myconf="${myconf}
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio"
-
-	# Bindings:
-	myconf="${myconf}
-		$(use_enable guile)
-		--disable-io
-		$(use_enable java)
-		--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 \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	use python && python_optimize \
-		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c
-}

diff --git a/media-gfx/graphviz/graphviz-2.36.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
similarity index 96%
rename from media-gfx/graphviz/graphviz-2.36.0-r1.ebuild
rename to media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
index b29219c..6b1b1f6 100644
--- a/media-gfx/graphviz/graphviz-2.36.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
+WANT_AUTOMAKE=1.13 #547168
 
 inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
 
@@ -22,13 +23,13 @@ RESTRICT="test"
 RDEPEND="
 	sys-libs/zlib
 	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl:0
 	>=media-libs/fontconfig-2.3.95
 	>=media-libs/freetype-2.1.10
 	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
 	>=media-libs/libpng-1.2:0
 	!<=sci-chemistry/cluster-1.3.081231
-	sys-devel/libtool
 	virtual/jpeg:0
 	virtual/libiconv
 	X? (
@@ -54,12 +55,13 @@ RDEPEND="
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 	)
-	ruby?	( dev-lang/ruby )
+	ruby?	( dev-lang/ruby:* )
 	svg?	( gnome-base/librsvg )
 	tcl?	( >=dev-lang/tcl-8.3:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/flex
+	sys-devel/libtool
 	guile?	( dev-scheme/guile dev-lang/swig )
 	java?	( >=virtual/jdk-1.5 dev-lang/swig )
 	nls?	( >=sys-devel/gettext-0.14.5 )
@@ -141,9 +143,6 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
 		"${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
 
-	epatch \
-		"${FILESDIR}"/${PN}-2.38-fix-backslashes.patch
-
 	# ToDo: Do the same thing for examples and/or
 	#       write a patch for a configuration-option
 	#       and send it to upstream
@@ -185,8 +184,10 @@ src_configure() {
 		$(use_with devil)
 		$(use_with gtk)
 		$(use_with gts)
-		$(use_with qt4)
+		$(use_with qt4 qt)
 		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
 		$(use_with svg rsvg)
 		$(use_with X x)
 		$(use_with X xaw)
@@ -257,3 +258,8 @@ pkg_postinst() {
 	# to configure
 	dot -c
 }
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -f "${EROOT}usr/lib/graphviz/config{,6}"
+}

diff --git a/media-gfx/graphviz/graphviz-2.38.0.ebuild b/media-gfx/graphviz/graphviz-2.38.0.ebuild
deleted file mode 100644
index 19ce277..0000000
--- a/media-gfx/graphviz/graphviz-2.38.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt4 ruby svg static-libs tcl X elibc_FreeBSD"
-
-# Requires ksh
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/zlib
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0
-	!<=sci-chemistry/cluster-1.3.081231
-	sys-devel/libtool
-	virtual/jpeg:0
-	virtual/libiconv
-	X? (
-		x11-libs/libXaw
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-	cairo?	(
-		>=x11-libs/pango-1.12
-		>=x11-libs/cairo-1.1.10[svg]
-	)
-	devil?	( media-libs/devil[png,jpeg] )
-	postscript? ( app-text/ghostscript-gpl )
-	gtk?	( x11-libs/gtk+:2 )
-	gts?	( sci-libs/gts )
-	lasi?	( media-libs/lasi )
-	pdf?	( app-text/poppler )
-	perl?   ( dev-lang/perl:= )
-	python?	( ${PYTHON_DEPS} )
-	qt4?	(
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	ruby?	( dev-lang/ruby )
-	svg?	( gnome-base/librsvg )
-	tcl?	( >=dev-lang/tcl-8.3:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	guile?	( dev-scheme/guile dev-lang/swig )
-	java?	( >=virtual/jdk-1.5 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 )"
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 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.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer 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, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt4'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
-		"${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# This is an old version of libtool
-	# use the ./configure option to exclude its use, and
-	# delete the dir since we don't need to eautoreconf it
-	rm -rf libltdl
-
-	# 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
-
-	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
-	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	# libtool file collision, bug 276609
-	local myconf="--without-included-ltdl --disable-ltdl-install"
-
-	myconf="${myconf}
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt4)
-		$(use_with lasi)
-		$(use_with svg rsvg)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		$(use_enable gdk-pixbuf)
-		--without-ming"
-
-	# new/experimental features, to be tested, disable for now
-	myconf="${myconf}
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio"
-
-	# Bindings:
-	myconf="${myconf}
-		$(use_enable guile)
-		--disable-io
-		$(use_enable java)
-		--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 \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	use examples || rm -rf "${ED}"/usr/share/graphviz/demo
-
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	use python && python_optimize \
-		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python"
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c
-}