gentoo resync : 25.09.2021

3 files changed, 21 insertions, 16 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 9562cc2d1624..bdf2f077b4f9 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,9 @@
 AUX README.gentoo 446 BLAKE2B e4307a45b86109e63d8057050ad66d1f77a2382ae717f1fad521756a356ff08203fc3aad20e39e437606797351b8c7f453b7d01ac1b299256ce8ed64ece888a8 SHA512 dd4c927bff4b8f66b8e149929e766378ecef0832952898a0070f0c0eb1b303b7c0cda7b8c3ed4031f12490785a593375c3aac8f30f305fa3245096eab36d189c
 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
 DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.7.29123.0808_x86_64.tar.xz 52593340 BLAKE2B 25b2bdc4d9531b31d1ce74989c6ab4561fa7b39874a956194133c14c8331fdf1e024b4c8355675e2f964faea2ae1681cc377a85f800e547de7232a478ae40dd8 SHA512 65eddd5a11f9ac11ac0cc0402f989ac0afd3edf1f56f0c39ebe2875f2341c5e0d2a1a454ed0c09138c65e2a9e4543ae575b1c1bcef0c8f8465a6a488f0faf265
 DIST zoom-5.7.31792.0820_x86_64.tar.xz 62059660 BLAKE2B bb15170f9a87143b50171041006ad65ffe5ce80b711769c83f0c5936bcad3e8f9417b32cb9f1f71734eb990744cb4be5d3e4b10c93b579af59b8fcc6337b75e9 SHA512 0248eb4b1d5d8b289eb67d8e55da7f20eb06c33698fc9f1beeaf8c36a133a9edae2aa2fd51f8866049c88e7bc6c47df80dfe9a0c8c24776dc6ddfe8ca646b27b
+DIST zoom-5.8.0.16_x86_64.tar.xz 55714984 BLAKE2B 1e9cecc3ae838976cdd7e343d9eca27a615290df079e60edef44d03fe66ff6be8715162a66ceb0030a9f798123b4a7c68622b5ad402f0d4c5f6d76c5f315b74c SHA512 ddc20b57a58c9f102651b3361f7eb7daecbcf943684470247ba23f911dc52c4ea015aeaf9f2ed7d9b378617dc6fa69d2b37103ea7826f5bfd61b150d6e6cb3c6
 EBUILD zoom-5.4.53391.1108-r3.ebuild 3167 BLAKE2B 9aba2dc82ebd4c97f7dc97b6718141e35416316f51111ce145b9844bf1172fea80c3080a1d8ff34964e42742e243d1fc157906e2c55450b39170f01cb36a55b4 SHA512 52fc56dcfadaa4b9822475525a7958d8bbe5351038ee209426e1440af613598bed0f75dabdd79450206b6c9a36564f3ecf43dd3a98182368789744c99a589cbf
-EBUILD zoom-5.7.29123.0808.ebuild 4189 BLAKE2B a024abc94ef953f75d770b041adf50f8b2e9f3edcc9dc77f0c9295bcda21a32b503c10aff773cc8866e6d83f27ff8dc5517e2a208f7752de37490dbb9676e723 SHA512 81db6cc78abc3e8939fb030cfe5ddffdd66b98a235de8708716fa92f87f94dea3debd512df9ab1a6f77d1c7502785e87f37b2f7476679f10691b99c97fb9cd03
 EBUILD zoom-5.7.31792.0820.ebuild 4085 BLAKE2B ca206778b4acea7bd0628f4b9d1af91a9eb67ff49b51de8fd0537ecf02d6ab1b5254010f0e5b2c5aa6ddfc1bda049c337dde09dd809aa35d04ea7af4b8c87a54 SHA512 6a88e45fb45f3afbee7301dd079d6b5caa0dee5547a3580f363ca986155821dbe2dcb242d7e23f228bf12456726a8cec0e02e322a116d95c5ce1eb15b2cca21c
-MISC metadata.xml 616 BLAKE2B f57de9a9f963b3521a735f3ccef1d4b79ab9925ceacd51bb2d7f5bfcd60bd7ecfb16f5d03e9a28d391c50c4f827cbbe80b84d49b458dd61da37257e7f12b5b20 SHA512 59acdbb6cce4333f80977da909c746025b8d4677f6949cc26cc3c5db7a4a3f3a5ad834617c954b49e55d7eccf39b700f10bcb59dc1abfbefa6e7ded3e8e8b01b
+EBUILD zoom-5.8.0.16.ebuild 4243 BLAKE2B 2deb0cbf7114084bf2017edc760c836ae3805b3ab16d187e2baf0b4a159617c41a69aed5e83f09e6e5d5fc19122d78ffff6a4c9d7c0fd71bdc52a547af8a8713 SHA512 83030731be137d6eba1d93873bf9569eeac1ee3a3d638f1cbfb0a39de23fbb043bfc8f82bc213a8ea515d12eca09a18ce43f7caf5a53d90d3c3fe1c326111714
+MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/metadata.xml b/net-im/zoom/metadata.xml
index e476fbb646d4..641677fd6fef 100644
--- a/net-im/zoom/metadata.xml
+++ b/net-im/zoom/metadata.xml
@@ -11,9 +11,14 @@
     <email>mva@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="bundled-libjpeg-turbo">Use bundled libturbojpeg
-      instead of <pkg>media-libs/libjpeg-turbo</pkg></flag>
-    <flag name="bundled-qt">Use bundled Qt and icu instead of
-      system-wide libs</flag>
+    <flag name="bundled-libjpeg-turbo">
+      Use bundled libturbojpeg instead of <pkg>media-libs/libjpeg-turbo</pkg>
+    </flag>
+    <flag name="bundled-qt">
+      Use bundled Qt and icu instead of system-wide libs
+    </flag>
+    <flag name="opencl">
+      Use OpenCL for virtual background support (<pkg>virtual/opencl</pkg>)
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/net-im/zoom/zoom-5.7.29123.0808.ebuild b/net-im/zoom/zoom-5.8.0.16.ebuild
index 2d1b6688d0d6..263454606292 100644
--- a/net-im/zoom/zoom-5.7.29123.0808.ebuild
+++ b/net-im/zoom/zoom-5.8.0.16.ebuild
@@ -13,12 +13,12 @@ S="${WORKDIR}/${PN}"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland"
+IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
 RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
-	dev-libs/quazip:0=
+	>=dev-libs/quazip-1.0:0=
 	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
@@ -35,6 +35,7 @@ RDEPEND="!games-engines/zoom
 	x11-libs/libXtst
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-keysyms
+	opencl? ( virtual/opencl )
 	pulseaudio? ( media-sound/pulseaudio )
 	!pulseaudio? ( media-libs/alsa-lib )
 	wayland? ( dev-libs/wayland )
@@ -51,7 +52,6 @@ RDEPEND="!games-engines/zoom
 		dev-qt/qtnetwork:5
 		dev-qt/qtquickcontrols:5[widgets]
 		dev-qt/qtquickcontrols2:5
-		dev-qt/qtscript:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 		wayland? ( dev-qt/qtwayland )
@@ -88,16 +88,16 @@ src_install() {
 	insinto /opt/zoom
 	exeinto /opt/zoom
 	doins -r json ringtone sip timezones translations
-	doins *.pcm *.sh Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher
+	doins *.pcm Embedded.properties version.txt
+	doexe zoom zopen ZoomLauncher *.sh
 	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
 	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
 
-	local quazip_so="libquazip1-qt5.so"
-	if has_version "<dev-libs/quazip-1.0"; then
-		quazip_so="libquazip5.so"
+	if use opencl; then
+		doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
 	fi
-	dosym -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so