From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BEFF139083 for ; Mon, 18 Dec 2017 09:52:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81C47E0F75; Mon, 18 Dec 2017 09:52:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6033CE0F75 for ; Mon, 18 Dec 2017 09:52:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4917B33BEE5 for ; Mon, 18 Dec 2017 09:52:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CEA1AE74 for ; Mon, 18 Dec 2017 09:52:22 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1513590734.941ba5d5bd2504193c493f18c013a47e72a09237.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 941ba5d5bd2504193c493f18c013a47e72a09237 X-VCS-Branch: master Date: Mon, 18 Dec 2017 09:52:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ce11a932-ecdb-4be8-9a81-a85a48596c3a X-Archives-Hash: dccecc479574eb861f0152bdd68517b0 commit: 941ba5d5bd2504193c493f18c013a47e72a09237 Author: Michael Weber gentoo org> AuthorDate: Mon Dec 18 09:52:04 2017 +0000 Commit: Michael Weber gentoo org> CommitDate: Mon Dec 18 09:52:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941ba5d5 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 media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild index 6aa664bfb14..b31650273b5 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) \