From 4b4d352fc9761396c68812d8eccc63b7b14d6558 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 3 Aug 2022 13:53:01 +0100
Subject: gentoo auto-resync : 03.08.2022 - 13:42:43

---
 media-gfx/Manifest.gz              | Bin 38311 -> 38320 bytes
 media-gfx/fontforge/Manifest       |   2 +-
 media-gfx/fontforge/metadata.xml   |   2 +-
 media-gfx/zbar/Manifest            |   2 +-
 media-gfx/zbar/zbar-0.23.90.ebuild |   5 +++--
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'media-gfx')

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5f19207a6a31..99bc975c7d9e 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index c6dd5d1c9545..7d590094c366 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -3,4 +3,4 @@ DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36f
 DIST fontforge-20220308.tar.xz 13719032 BLAKE2B 66939a77014b086b95ea21c3af2a2c910c19ebba000d50e514000667a6b193f5a90fc55b6046793811cac3a7330c479973746ac09041f21b0237047105f4d305 SHA512 9975cffec8aa47bcb8c22405bea544cd263dc939b253e8fba2fbaa3b90a60e05b98eaf58365db8ae854d1fff8e641866a7e2e027003ae03a77104d6650dafb6c
 EBUILD fontforge-20201107.ebuild 2863 BLAKE2B 1c6ca7f18f00c3f09f145593d391f074d9d76d6aec893fe4f871b554b053bbfa870901c49b182ef4c34176e5a2e793f88369746794ecdd94b0096378722a0ec5 SHA512 8f5baa9a193d1cd047fc33e6d9848f1cb4bb0be16a351c838ad0a0be0cae3a77c534f7638b4e6e93cfb2d7def79692e1222f91fd122f54950a1a07fe0454b645
 EBUILD fontforge-20220308.ebuild 2783 BLAKE2B 2a4bb4e24c967d2ff7471ded38b7b6a37ab80524fdca06740abf41367a16c6d87badbee70afcc32facc68e768d0f666c53c3122e84d549068b247db362e830a1 SHA512 4d524e41c152206c89170af81f960c8251eccee956f3e12491804b4c1074d2b80f1f8bf6caf57f89a614ad63235b513701c7670fa64702da0f510aa2931dfb6e
-MISC metadata.xml 862 BLAKE2B bc7359c628af9d645b87f43a50a2f0f0d6ab1d80e3dbb0134f4b0d668990202276e4c66da640b7b63baa53d7ef7bdca90ad097566a995a02ab90efac88553884 SHA512 a6a55768f8e0a81591a44547ca0a135ad24833c0fec1f402348cb17512b8354c6c254f12a4fe62a615f955427a6893e12c9dc34d808e04a9d7065fbcf854a276
+MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280
diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
index 5d479ac6d92b..a0e158816c12 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -16,7 +16,7 @@
 		<flag name="woff2">Enable support for WOFF2 format</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">troydhanson/uthash</remote-id>
+		<remote-id type="github">fontforge/fontforge</remote-id>
 		<remote-id type="sourceforge">fontforge</remote-id>
 	</upstream>
 </pkgmetadata>
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