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

since this change both imagemagick and graphicsmagick USE flags
must be enabled to use graphicsmagick

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 17f18b03979f8e6d071ef3e2de03050e1646a7df..da91d92ffc503f36b4539de630e1586644ed8324 100644 (file)
--- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild
@@ -127,8 +127,8 @@ src_configure() {
                -DWITH_PROFILING=OFF
                -DWITH_LIBCDR=$(usex cdr)
                -DWITH_DBUS=$(usex dbus)
-               -DWITH_IMAGE_MAGICK=$(use imagemagick && use !graphicsmagick && echo "yes" || echo "no") # requires ImageMagick 6
-               -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
+               -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+               -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
                -DWITH_JEMALLOC=$(usex jemalloc)
                -DENABLE_LCMS=$(usex lcms)
                -DWITH_NLS=$(usex nls)

diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index ba2909d315c4e50e181f0f3cdde7b2539c6d5abd..bb14d85592ec9b35ffba697e79023f0282bc9471 100644 (file)
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -124,8 +124,8 @@ src_configure() {
                -DWITH_PROFILING=OFF
                -DWITH_LIBCDR=$(usex cdr)
                -DWITH_DBUS=$(usex dbus)
-               -DWITH_IMAGE_MAGICK=$(use imagemagick && use !graphicsmagick && echo "yes" || echo "no") # requires ImageMagick 6
-               -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick)
+               -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+               -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
                -DWITH_JEMALLOC=$(usex jemalloc)
                -DENABLE_LCMS=$(usex lcms)
                -DWITH_NLS=$(usex nls)