summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2017-12-18 10:52:04 +0100
committerMichael Weber <xmw@gentoo.org>2017-12-18 10:52:14 +0100
commit941ba5d5bd2504193c493f18c013a47e72a09237 (patch)
treefdb903eeefe3de0ac19c7fdad0ddb1f6211a42f9 /media-gfx/zbar
parentgames-fps/duke3d-data: Update Manifest hashes (diff)
downloadgentoo-941ba5d5bd2504193c493f18c013a47e72a09237.tar.gz
gentoo-941ba5d5bd2504193c493f18c013a47e72a09237.tar.bz2
gentoo-941ba5d5bd2504193c493f18c013a47e72a09237.zip
media-gfx/zbar: USE=imagemagick requires different configure switches, thanks ta2002.
Closes: https://bugs.gentoo.org/552350 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'media-gfx/zbar')
-rw-r--r--media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild11
1 files changed, 10 insertions, 1 deletions
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
index 6aa664bfb14a..b31650273b5d 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
@@ -86,12 +86,21 @@ multilib_src_configure() {
fi
append-cppflags -DNDEBUG
+
+ # different flags for image/graphics magick (bug 552350)
+ myimagemagick="--without-imagemagick"
+ has_version media-gfx/imagemagick &&
+ myimagemagick="$(multilib_native_use_with imagemagick)"
+ mygraphicsmagick="--without-graphicsmagick"
+ has_version media-gfx/graphicsmagick &&
+ mygraphicsmagick="$(multilib_native_use_with imagemagick graphicsmagick)"
ECONF_SOURCE=${S} \
econf \
$(multilib_native_use_with java) \
$(use_with jpeg) \
$(use_with gtk) \
- $(multilib_native_use_with imagemagick) \
+ ${myimagemagick} \
+ ${mygraphicsmagick} \
$(multilib_native_use_with python) \
$(use_with qt4 qt) \
$(use_enable static-libs static) \