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

[Miroslav Šulc]

commit:     084dbfd447232f2bac30c24ef493a704b7ac103f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 16:51:41 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 16:51:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084dbfd4

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

 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 17f18b03979..da91d92ffc5 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 ba2909d315c..bb14d85592e 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)