public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
Date: Tue,  2 Aug 2022 10:13:59 +0000 (UTC)	[thread overview]
Message-ID: <1659435236.48c9cdacf049a7af3a8ead57312188e813b47108.juippis@gentoo> (raw)

commit:     48c9cdacf049a7af3a8ead57312188e813b47108
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 10:12:21 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> 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 <juippis <AT> 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


             reply	other threads:[~2022-08-02 10:14 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-02 10:13 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-09-29 13:04 [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/ Arthur Zamarin
2023-04-12  1:50 Sam James
2023-04-11 19:05 Arthur Zamarin
2022-04-11  6:35 Jakov Smolić
2022-04-11  6:35 Jakov Smolić
2021-04-06 21:17 Sam James
2021-02-21 20:23 Sam James
2021-02-21 20:23 Sam James
2021-02-21 12:14 David Seifert
2020-12-13 10:34 Sam James
2020-05-17 16:42 Joonas Niilola
2020-02-24 18:07 Andreas Sturmlechner
2020-02-24 16:25 Agostino Sarubbo
2020-02-21  9:37 Agostino Sarubbo
2020-02-09 16:29 Michał Górny
2020-02-03 17:37 Andreas Sturmlechner
2019-02-12  9:39 Mikle Kolyada
2019-02-12  9:39 Mikle Kolyada
2019-02-12  9:39 Mikle Kolyada
2019-01-12 10:59 Pacho Ramos
2018-12-29 13:37 Andreas Sturmlechner
2018-12-29  9:16 Mikle Kolyada
2018-12-22 22:25 Thomas Deutschmann
2018-12-05 12:49 Louis Sautier
2018-12-05  9:53 Louis Sautier
2018-12-05  8:19 Louis Sautier
2018-11-25 17:36 Andreas Sturmlechner
2018-05-10 10:08 Andreas Sturmlechner
2018-05-10 10:08 Andreas Sturmlechner
2018-02-06 16:24 Thomas Deutschmann
2017-12-19 10:38 Jason Zaman
2017-12-18 10:37 Michael Weber
2017-12-18  9:52 Michael Weber
2017-12-18  9:19 Michael Weber
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2016-09-07  6:36 Andrew Savchenko
2015-08-10 23:16 Michael Weber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1659435236.48c9cdacf049a7af3a8ead57312188e813b47108.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox