From: Lars Wendler <polynomial-c@gentoo.org>
Date: Thu, 7 Nov 2019 08:08:18 +0000 (+0100)
Subject: media-gfx/inkscape: Attempt to fix build against imagemagick
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=259b9bc5efe4e4b4d9463ad120d55f2a5812e769;p=gentoo.git

media-gfx/inkscape: Attempt to fix build against imagemagick

Bug: https://bugs.gentoo.org/656730
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---

diff --git a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
index 141878b2bcd5..db069d1e87cc 100644
--- a/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
+++ b/media-gfx/inkscape/files/inkscape-0.92.1-automagic.patch
@@ -74,7 +74,7 @@ diff -ruN inkscape-0.92.1.orig/configure.ac inkscape-0.92.1/configure.ac
 +
 +magick_ok="no"
 +if test "x$enable_magick" = "xyes"; then
-+	PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
++	PKG_CHECK_MODULES(IMAGEMAGICK, Magick++, magick_ok=yes, magick_ok=no)
 +	if test "x$magick_ok" = "xyes"; then
 +		AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
 +	fi
diff --git a/media-gfx/inkscape/inkscape-0.92.4.ebuild b/media-gfx/inkscape/inkscape-0.92.4.ebuild
index 08369700fb96..c38fe42d1a66 100644
--- a/media-gfx/inkscape/inkscape-0.92.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.4.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
 	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	spell? (