gentoo resync : 20.03.2021

4 files changed, 46 insertions, 6 deletions

diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 8cdf1f30b56f..70c493e060c3 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,5 +1,6 @@
 AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
 AUX zbar-0.23-r1-nonbash.patch 5528 BLAKE2B f4679013abb66143a5203d861367f51ee8b791addff66347d81622549f954e1bcd54a19695fa4ce8bacbf5aa2fe0a195ec75068ff6b93fa2df0c4f82af9e3d65 SHA512 7705ae4281b92086eda749fb334a59cdc33e79bec0bb9820c78344fcac235b9b3f4314899e8eeeaa44a372adda71f14ec553f3c1c147f57bfe1cba298d3cd0ab
+AUX zbar-0.23.1-autoconf-2.70.patch 1280 BLAKE2B c4e9fd97047c49599477e387590372404c47b66f960bf1e0ffd80c7c694cf59cf080660899e1abc0f33eadd7087e5ba6d40e55e853f0569374a3be0934001450 SHA512 e7317dcd5e3dacce52dd27ce8d37afd07d2b193fa8f40e237a5f4bca911bda1e38ac74b0fd770976c0659ccc44b576775ba291d8135e426ad7a793fbdb104401
 AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122
 AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120
 AUX zbar-0.23.1_musl_include_locale_h.patch 512 BLAKE2B 9f675b24aecd0a65ef3a2d41731594c10b1086abbfac649b6eeca1ba873c1b54d8287bebb48b2119aa0638d60228f25714f7a1811f7645930bc003395489ca3e SHA512 6addf046928db5743cc58ec67aad891c199f9d839198181cfbf57912cc0780f53fdac9fa15b25e1ffd17cf0aaf74318094f3283facdff2fa259285a5bc2bb957
@@ -11,5 +12,5 @@ AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1
 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
 EBUILD zbar-0.23-r1.ebuild 5071 BLAKE2B 92487f7fd2c94a6bee21827729c0ed4bbbde6c1b552e5da271a96a277d2d1c4d20b0b8baf80b769e89bb65bc9fe0ca0db483342bcbcf0daf466edc82f399dbe3 SHA512 f4d5affd6ea81be0b0aaacd168a0a45c854a49b7aeda4d042aa26eef4e0492ece016c21c7887aad1c1644c0095f04eb94277ba12276b0e1c8e5c4d98f977b4b4
-EBUILD zbar-0.23.1.ebuild 5286 BLAKE2B 8134b9a4418963c437be927b68a087b8d18fd533195dc05892b091038f500d62a86f23540ae81659dffa973abbfd8603a62c3839924f14f17405c48b8c60ff52 SHA512 34b395448f86e886460be4687f144c961779acf1ddbdd4e9c460fd4848543285d8084e1303c6d422263e143877f98b75b4a556899d98236feaaca4791a7f9081
-MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19
+EBUILD zbar-0.23.1.ebuild 5328 BLAKE2B 625e339803ae037096dd0dddae0553cb11d4a0a7f7ae144f7e8e5a85964fba652c66ee05bae302c290d837914d2f95f6aaaf91a0277ea6714ab53b7d12bbd7c6 SHA512 41f92ac81780148a1672306eb185f0d1899a5dd607e831a50d69c2a2c594125221172a9907ed63f15f163421917032e45902a1c8701ababe0048728a8e735c78
+MISC metadata.xml 961 BLAKE2B c3ad2c531212c82cef3e1fbae09030591863b82d2b404ad65b696b5ebab4d5abe85e9f0e8733e543af393b395940241ddfc3885a0a3654b33d88ce8d60253e91 SHA512 635d3ba26ffc33e712944153cbd062eb7a6b83f492223ead8e67ff7d6e9c1f336641af56e52d1afca032c3a5716d36954d6222cbd0a076d12d2f4f0159683317
diff --git a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
new file mode 100644
index 000000000000..be9547ead111
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
@@ -0,0 +1,38 @@
+https://github.com/mchehab/zbar/commit/89e7900d85dd54ef351a7ed582aec6a5a5d7fa37
+https://bugs.gentoo.org/775656
+
+From 89e7900d85dd54ef351a7ed582aec6a5a5d7fa37 Mon Sep 17 00:00:00 2001
+From: Boyuan Yang <byang@debian.org>
+Date: Thu, 31 Dec 2020 12:56:26 -0500
+Subject: [PATCH] configure.ac: Fix quote issue (autoconf 2.70 compat)
+
+One of the AS_IF() macro was not properly quoted. This commit
+fixes that issue.
+
+This patch closes: #132 (fixes this bug report).
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index df0220a8..db4bc902 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -656,7 +656,7 @@ AS_IF([test "x$with_qt" != "xno"],
+ 					    [with_qt="no"])])])
+ 
+ AS_IF([test "x$with_qt" != "xno"],
+-   AS_IF([test "x$with_qt5" != "xno"],
++   [AS_IF([test "x$with_qt5" != "xno"],
+     [AC_CHECK_PROGS(MOC, [moc-qt5 moc])
+      AC_MSG_NOTICE([using moc from $MOC])
+      QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
+@@ -672,7 +672,7 @@ dnl -fPIC has no effect on Windows and breaks windres
+      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
+      AC_MSG_NOTICE([using Qt version $QT_VERSION])
+      qt_pkgconfig_file="zbar-qt.pc"
+-     ]))
++     ])])
+ 
+ AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
+ 
diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index 064f2be75872..14483e82c58e 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>email@linxon.ru</email>
 		<name>Yury Martynov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index 2f529efbe041..d74a878a969a 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -84,8 +84,9 @@ PATCHES=(
 	"${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch"
 	"${FILESDIR}/${P}_fix_unittest.patch"
 	"${FILESDIR}/${P}_musl_include_locale_h.patch"
-	"${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch"
-	"${FILESDIR}/zbar-0.23_fix_python_detect.patch"
+	"${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
+	"${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
+	"${FILESDIR}/${P}-autoconf-2.70.patch"
 )
 
 DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )