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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5548E158095 for ; Tue, 2 Aug 2022 10:14:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E31AE0EE6; Tue, 2 Aug 2022 10:14:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 054AFE0EE6 for ; Tue, 2 Aug 2022 10:14:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7E1D340FE5 for ; Tue, 2 Aug 2022 10:14:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 304F550A for ; Tue, 2 Aug 2022 10:13:59 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1659435236.48c9cdacf049a7af3a8ead57312188e813b47108.juippis@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.23.90.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 48c9cdacf049a7af3a8ead57312188e813b47108 X-VCS-Branch: master Date: Tue, 2 Aug 2022 10:13:59 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 67c3a6a1-7323-4b6c-836e-6ac8cbc70b5a X-Archives-Hash: 926103148cdf64748342e13fa1e72650 commit: 48c9cdacf049a7af3a8ead57312188e813b47108 Author: Joonas Niilola gentoo org> AuthorDate: Tue Aug 2 10:12:21 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 2 10:13:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c9cdac media-gfx/zbar: fix configure logic for imagemagick<->graphicsmagick - tested on stable amd64. Closes: https://bugs.gentoo.org/784362 Signed-off-by: Joonas Niilola gentoo.org> media-gfx/zbar/zbar-0.23.90.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-gfx/zbar/zbar-0.23.90.ebuild b/media-gfx/zbar/zbar-0.23.90.ebuild index 46b85c382176..3389a83eaacd 100644 --- a/media-gfx/zbar/zbar-0.23.90.ebuild +++ b/media-gfx/zbar/zbar-0.23.90.ebuild @@ -72,6 +72,7 @@ DEPEND="${COMMON_DEPEND} BDEPEND=" app-text/xmlto + sys-devel/gettext virtual/pkgconfig gtk? ( dev-util/glib-utils ) nls? ( @@ -146,12 +147,12 @@ multilib_src_configure() { if multilib_is_native_abi; then # both must be enabled to use GraphicsMagick - if use graphicsmagick; then + if use imagemagick && use graphicsmagick; then myeconfargs+=( --with-graphicsmagick --without-imagemagick ) - elif use imagemagick; then + elif ! use graphicsmagick && use imagemagick; then myeconfargs+=( --with-imagemagick --without-graphicsmagick