From 084dbfd447232f2bac30c24ef493a704b7ac103f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Tue, 12 Nov 2019 17:51:41 +0100 Subject: [PATCH] media-gfx/inkscape-{1.0_beta1,9999}: fix graphics package selection logic MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 4 ++-- media-gfx/inkscape/inkscape-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild index 17f18b03979f..da91d92ffc50 100644 --- 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 ba2909d315c4..bb14d85592ec 100644 --- 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) -- 2.26.2