diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-11-12 17:02:05 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-11-12 17:02:32 +0100 |
| commit | 2e153a018f756a46e3b98f43a4df42c6215c5912 (patch) | |
| tree | ffadd619c5f4d24c47fa2195aa6d656575be1f9d /media-gfx/inkscape | |
| parent | media-libs/libvisio: ppc stable wrt bug #692304 (diff) | |
| download | gentoo-2e153a018f756a46e3b98f43a4df42c6215c5912.tar.gz gentoo-2e153a018f756a46e3b98f43a4df42c6215c5912.tar.bz2 gentoo-2e153a018f756a46e3b98f43a4df42c6215c5912.zip | |
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>
Diffstat (limited to 'media-gfx/inkscape')
| -rw-r--r-- | media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/inkscape/inkscape-9999.ebuild | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild index eb490840c8ee..17f18b03979f 100644 --- 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 5957563e4f42..ba2909d315c4 100644 --- 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) |