diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-11-12 17:51:41 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-11-12 17:51:41 +0100 |
| commit | 084dbfd447232f2bac30c24ef493a704b7ac103f (patch) | |
| tree | ff83821bcc1d31f17c8cda4957eb4c0d1d25ced5 /media-gfx | |
| parent | media-gfx/inkscape-{1.0_beta1,9999}: fix graphics package selection (diff) | |
| download | gentoo-084dbfd447232f2bac30c24ef493a704b7ac103f.tar.gz gentoo-084dbfd447232f2bac30c24ef493a704b7ac103f.tar.bz2 gentoo-084dbfd447232f2bac30c24ef493a704b7ac103f.zip | |
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>
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 4 | ||||
| -rw-r--r-- | 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) |