| 1 |
commit: 48c9cdacf049a7af3a8ead57312188e813b47108 |
| 2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 2 10:12:21 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 2 10:13:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c9cdac |
| 7 |
|
| 8 |
media-gfx/zbar: fix configure logic for imagemagick<->graphicsmagick |
| 9 |
|
| 10 |
- tested on stable amd64. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/784362 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
media-gfx/zbar/zbar-0.23.90.ebuild | 5 +++-- |
| 16 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/zbar/zbar-0.23.90.ebuild b/media-gfx/zbar/zbar-0.23.90.ebuild |
| 19 |
index 46b85c382176..3389a83eaacd 100644 |
| 20 |
--- a/media-gfx/zbar/zbar-0.23.90.ebuild |
| 21 |
+++ b/media-gfx/zbar/zbar-0.23.90.ebuild |
| 22 |
@@ -72,6 +72,7 @@ DEPEND="${COMMON_DEPEND} |
| 23 |
|
| 24 |
BDEPEND=" |
| 25 |
app-text/xmlto |
| 26 |
+ sys-devel/gettext |
| 27 |
virtual/pkgconfig |
| 28 |
gtk? ( dev-util/glib-utils ) |
| 29 |
nls? ( |
| 30 |
@@ -146,12 +147,12 @@ multilib_src_configure() { |
| 31 |
|
| 32 |
if multilib_is_native_abi; then |
| 33 |
# both must be enabled to use GraphicsMagick |
| 34 |
- if use graphicsmagick; then |
| 35 |
+ if use imagemagick && use graphicsmagick; then |
| 36 |
myeconfargs+=( |
| 37 |
--with-graphicsmagick |
| 38 |
--without-imagemagick |
| 39 |
) |
| 40 |
- elif use imagemagick; then |
| 41 |
+ elif ! use graphicsmagick && use imagemagick; then |
| 42 |
myeconfargs+=( |
| 43 |
--with-imagemagick |
| 44 |
--without-graphicsmagick |
Archives