media-gfx/graphviz: Add conditional macro definition

Gentoo-bug: 574484
* Merged the 3 following upstream commits into one patch:
- https://github.com/ellson/graphviz/commit/8da53964edec8a665c3996d483df243eb150c2c4
- https://github.com/ellson/graphviz/commit/f97c86e975aa472272d0a5b5a042b96eb77ebbc0
- https://github.com/ellson/graphviz/commit/c3e9169655c1fca8006d3d455381848730531bd4

Package-Manager: portage-2.3.0

2 files changed, 36 insertions, 3 deletions

diff --git a/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch b/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch
new file mode 100644
index 000000000000..9d0d78a1580a
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch
@@ -0,0 +1,32 @@
+From 8da53964edec8a665c3996d483df243eb150c2c4 Mon Sep 17 00:00:00 2001
+From: Jakob Nixdorf <flocke@shadowice.org>
+Date: Fri, 22 Jan 2016 20:10:42 +0100
+Subject: [PATCH] Fix build with ghostscript-9.18.
+
+--- a/plugin/gs/gvloadimage_gs.c
++++ b/plugin/gs/gvloadimage_gs.c
+@@ -32,6 +32,24 @@
+ #include <ghostscript/ierrors.h>
+ #include <cairo/cairo.h>
+ 
++
++/**
++ * Ensure compatibility with Ghostscipt versions newer than 9.18
++ * while maintaining compatibility with the older versions.
++ **/
++
++#ifndef e_VMerror
++#define e_VMerror gs_error_VMerror
++#endif
++
++#ifndef e_unregistered
++#define e_unregistered gs_error_unregistered
++#endif
++
++#ifndef e_invalidid
++#define e_invalidid gs_error_invalidid
++#endif
++
+ #ifdef WIN32
+ #define NUL_FILE "nul"
+ #else
diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
index a8c0d4446aea..bea6c12d4b2f 100644
--- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -140,7 +140,8 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \
-		"${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch
+		"${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch \
+		"${FILESDIR}"/${PN}-2.38.0-ghostscript-9.18.patch
 
 	# ToDo: Do the same thing for examples and/or
 	#       write a patch for a configuration-option
@@ -155,7 +156,7 @@ src_prepare() {
 	# 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
+	rm -rf libltdl || die
 
 	# no nls, no gettext, no iconv macro, so disable it
 	use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; }