media-gfx/inkscape-{1.0_beta1,9999}: fix graphics package selection

if both imagemagick and graphicsmagick are selected, inkscape
build system prefers imagemagick over graphicsmagick but
we want to prefer graphicsmagick over imagemagick

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
index eb490840c8eeb2bba7894534286c7fd0e8d59039..17f18b03979f8e6d071ef3e2de03050e1646a7df 100644 (file)
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -127,7 +127,7 @@ src_configure() {
                -DWITH_PROFILING=OFF
                -DWITH_LIBCDR=$(usex cdr)
                -DWITH_DBUS=$(usex dbus)
-               -DWITH_IMAGE_MAGICK=$(usex imagemagick) # requires ImageMagick 6
+               -DWITH_IMAGE_MAGICK=$(use imagemagick && use !graphicsmagick && echo "yes" || echo "no") # requires ImageMagick 6
                -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
                -DWITH_JEMALLOC=$(usex jemalloc)
                -DENABLE_LCMS=$(usex lcms)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 5957563e4f420758f9e9c019365eca838bd673d0..ba2909d315c4e50e181f0f3cdde7b2539c6d5abd 100644 (file)
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -124,7 +124,7 @@ src_configure() {
                -DWITH_PROFILING=OFF
                -DWITH_LIBCDR=$(usex cdr)
                -DWITH_DBUS=$(usex dbus)
-               -DWITH_IMAGE_MAGICK=$(usex imagemagick) # requires ImageMagick 6
+               -DWITH_IMAGE_MAGICK=$(use imagemagick && use !graphicsmagick && echo "yes" || echo "no") # requires ImageMagick 6
                -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
                -DWITH_JEMALLOC=$(usex jemalloc)
                -DENABLE_LCMS=$(usex lcms)