Update media-gfx/graphviz-2.38.0-r1

3 files changed, 39 insertions, 5 deletions

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 0c53beb6..dd2b86f9 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,6 +1,7 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2513 SHA256 700bb3b33fc03adf69b1c2fba4f558f2e8888aa8f460ad7212194effd0c9e41a SHA512 74913a39bb0897f8158182ee8d6197a08eabc547d86f29d31ddae99d45718f105fc954f9d9f9111cce4c7838a82db9ab6d75a8b57516dda05b01946654d528d9 WHIRLPOOL a34616172989142404a119706a88a53507beabae69658d91383ffb51a2018d8ff6239587d27036e98731fef7a4caa2562c8512fd3cf6fec7fe4a6168b5488d89
 AUX graphviz-2.34.0-dot-pangocairo-link.patch 950 SHA256 1f44e988d99dc1781266b5c5af7bcc9ff49173a15594ab9365faf1804d4e9fe9 SHA512 678defa8525063e4e5d70380a2a23662f59a8c2d4ce3ef9ec77acc5dc3a2c096d1e9e53f419a01e5e47d6af00c96f848aeb9c95a395143ed4219bde5bbed4e6e WHIRLPOOL 26c7e493bce8668ceb25ea83100e0aa12196b13b367f3ec73f9a31e194ecda9cf1ad751c2f177cc23303bf9802edac8d2f46d9dc558dfc3111dd2d3b3c84437f
+AUX graphviz-2.38.0-ghostscript-9.18.patch 753 SHA256 b82a0026d528b9e6ffe74798361fd6404bf9dedd87c646d667ff19534a4498d8 SHA512 19327b3fbfecdad1990fd4d9668c3f318da5907c1a8c7e3abd1f1f5a0703c474975b7f08425eb2c0f5c32522ebea614d02b4db9e83cce7fb975458fb87cafc62 WHIRLPOOL 90b8e0ecbf5bfbfbf262af384d8faa2e91e31ed06762c12c8a542caadc64b0634046cdd5245da79e7525d0226064c4f36e6fd93bc2741e2979c21e44c15a810a
 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
 EBUILD graphviz-2.36.0.ebuild 7550 SHA256 c2c5c9fbd4b384601383d9354ca9478ae0224d2f95bc959cbe973d57c65879f5 SHA512 65b29a7c95ea5ddf6c8c84c12a9cf37b4303959d854137c929d7ec143c1424d47f0003155e2853ef588cb6a111d3b6a31be99be0560cd9c73a0174b61cd047d6 WHIRLPOOL 5f02b5dc85d1775a8304f35960449810e540b0ac2c1d3284e0532c6bf7ade89215a81d7dd9e139955eb1307b1115b2efbee56ddf1382803380497ca4c8a1f3c2
-EBUILD graphviz-2.38.0-r1.ebuild 7896 SHA256 33151bbb9aea8f82edcd3eb0493ae63ba9e6bfcec820c4aac079379a201ec128 SHA512 77fbcc3777f59c36f28058db1c3b198081ce89fb5116d2a173c618e3768e31478ef19584752e1ec57597b7317efc07fa680559191b01e5c6ad147d1449785ea3 WHIRLPOOL 7dae299b463bf7a6f535b487648916af9d8c35b3d66475d3933ac1bf483334b442358b0519477a25c0ace33aad20f020932705644666f10cc49726d7f246190a
+EBUILD graphviz-2.38.0-r1.ebuild 7957 SHA256 811d894e21e48f41e6f0c43cb097b4e8e16b96ea42d9eef35703fcffb20dec2d SHA512 8c18b18703199244c3e21d3ed7272255f1b17d33d9b5de53b329ccc169a522811928b7575dc276f10992a06feb89debb51601627e0ea0ab07ebaf61e23a8c8fa WHIRLPOOL e57f2bdb2e00c53f689ca6d5d1216facc571aa6fde20d7aeedf36dd1854c01610d89941dcc554002f320845ca736850bdc6c38b7796470a1a598880572ea1a8c
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 00000000..9d0d78a1
--- /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 6cb892e6..6f928122 100644
--- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: a8c0d4446aea959158da70d6b6163827348c5b0c $
+# $Id: bea6c12d4b2f2e2a16ed54c8406f1259e3445488 $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -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; }