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 141878b2bcd5209750125ef1dd8591de7546fc0c..db069d1e87cc8d1355553ad97404d9adef4b760e 100644 (file)
--- 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 08369700fb96873603e47603f23d49b8277c25cf..c38fe42d1a661a20f0931c014efbea338e503ab2 100644 (file)
--- 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? (