[gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/

[Miroslav Šulc]

commit:     2e153a018f756a46e3b98f43a4df42c6215c5912
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 16:02:05 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 16:02:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e153a01

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 <AT> gentoo.org>

 media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 2 +-
 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 eb490840c8e..17f18b03979 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 5957563e4f4..ba2909d315c 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)