From a11ba9ffa8140a9c55c950a6947bc472b489a10a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Aug 2022 14:01:21 +0100 Subject: gentoo auto-resync : 03:08:2022 - 14:01:21 --- media-gfx/zbar/Manifest | 2 +- media-gfx/zbar/zbar-0.23.90.ebuild | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'media-gfx/zbar') diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index 0532298ab547..49dc8dbd219b 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -3,5 +3,5 @@ AUX zbar-0.23.90-fix-qt5x11extras-detect.patch 641 BLAKE2B ec0b86a83a149ef2a6258 AUX zbar-0.23.90-fix-unittest.patch 2711 BLAKE2B 58d1bbebf60bb9533a7c2b40a29afa7e8229b79a925ebcd05e26c3a67c2144173baedc31f0d92d0341c51ccfb3763e95840ce2073012e7b61a0f252287d5d6b4 SHA512 cc5aaef37155ad72d6b72e05c2f53523268e15b84f573117e780e3f39cc4df3981d080558db83d0fb52d2daa47beeaab4f194e4f912e732648ac4c5bc683e11d AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7 DIST zbar-0.23.90.tar.gz 1005314 BLAKE2B 5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb -EBUILD zbar-0.23.90.ebuild 5281 BLAKE2B 34bd1339b94f540bbcb53581fad678514437d6e9f60da233a6ab8e06a61035358641913062e61c81ebad7960aa86e018da0338c8d080fbadf5c4738c5ef91208 SHA512 aa351ab9b6dac1787e8dd21cd0406a6e3fb64e36e30c773c2d06a95dfa52b52d9f477fef2be40a28e7f1a7747230ed6f456365e1c266b0a637f2b53de7710b17 +EBUILD zbar-0.23.90.ebuild 5343 BLAKE2B d28ca4e3082775f317500147cf0a47f91c51db424e26999f9451ff1a3ce652c80670b1aef7a1ec6b82738c4357eacb1fb21507989e3aea492ec77a9a9ee79647 SHA512 916e34bcde9df476223fa881bc4048543f79de4e78aca1334df282e2aa48e41181bf0751490316822b67e6789673defefbfcb74128d30fae073bfbb741925634 MISC metadata.xml 738 BLAKE2B a5f5f0f157f7339f3dd39dde18b79427b35c6ce0b079b1ed03a0f2de821bc14f3a9c76fbd68bfd836444a4750a604be0012e4501207e75dfe4fc39aef7e65827 SHA512 334a091fc54d950a8b3e7572af7ae9766d20fd0d49aaa9fd18f5ea75966b45a53a861e290bcf9ca0fd8cc160cba669185aa01a9c8e77a585f2cb84d10f3b1e80 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 -- cgit v1.2.3