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>
This commit is contained in:
Miroslav Šulc
2019-11-12 17:51:41 +01:00
parent 2e153a018f
commit 084dbfd447
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -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)
+2 -2
View File
@@ -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)