gentoo resync : 05.12.2021

3 files changed, 20 insertions, 4 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index c69211847dfd..58cd3158802e 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.8.0.16_x86_64.tar.xz 55714984 BLAKE2B 1e9cecc3ae838976cdd7e343d9eca27a615290df079e60edef44d03fe66ff6be8715162a66ceb0030a9f798123b4a7c68622b5ad402f0d4c5f6d76c5f315b74c SHA512 ddc20b57a58c9f102651b3361f7eb7daecbcf943684470247ba23f911dc52c4ea015aeaf9f2ed7d9b378617dc6fa69d2b37103ea7826f5bfd61b150d6e6cb3c6
-DIST zoom-5.8.3.145_x86_64.tar.xz 54803848 BLAKE2B 5cb2e79eb78484bf4b13f2787d25f11beed38b32b46f111a3a78617f6dfbec202337ad52cfb8dd5e386284b9f543253dc22018e524396cc57d0763540ef9de04 SHA512 cddd7d8e1d8fa15037506a2fdbb60172b16a7e19adc59b0812bb9feedba022024f5a4733cdc6f461806218c13697280469357b3c2b297547216841fa6777e19c
+DIST zoom-5.8.4.210_x86_64.tar.xz 54613448 BLAKE2B 676697987ab188fef9317d6a25cb3cd6679afc7c268b008302198ef866eda297e97ca19dc22d4241a1b62edeca2ef3885e590ebb773c6556f2d1d1a7954cc28a SHA512 7e0f1d43aeeddd84c590c2bce758981afd3feaa148e54e3dffbd61879ea46750beb8fb36bfd7f43e72b0a17c2f48dfa3a6e3273fef19510202a0570f8cf5e1f1
+DIST zoom-5.8.6.739_x86_64.tar.xz 55756408 BLAKE2B 5a0def3ebc239a55fbcba3aebfcf47d9121d0c7ad7bfb10477a0adce40fba278a15e74253261960c7c8fe452c1b0661c05aa9f48a79cd20e0e33048c247d9aba SHA512 5b2dbc9c914a8ec75978664b1cab19c3c7f8bc4a1e75772e5194b45c35e7ae8a2e5ed6c6fedd4be6ffd8af8736805163581ea5daefca1c9b914eff450f250200
 EBUILD zoom-5.4.53391.1108-r3.ebuild 3167 BLAKE2B 9aba2dc82ebd4c97f7dc97b6718141e35416316f51111ce145b9844bf1172fea80c3080a1d8ff34964e42742e243d1fc157906e2c55450b39170f01cb36a55b4 SHA512 52fc56dcfadaa4b9822475525a7958d8bbe5351038ee209426e1440af613598bed0f75dabdd79450206b6c9a36564f3ecf43dd3a98182368789744c99a589cbf
-EBUILD zoom-5.8.0.16.ebuild 4243 BLAKE2B 2deb0cbf7114084bf2017edc760c836ae3805b3ab16d187e2baf0b4a159617c41a69aed5e83f09e6e5d5fc19122d78ffff6a4c9d7c0fd71bdc52a547af8a8713 SHA512 83030731be137d6eba1d93873bf9569eeac1ee3a3d638f1cbfb0a39de23fbb043bfc8f82bc213a8ea515d12eca09a18ce43f7caf5a53d90d3c3fe1c326111714
-EBUILD zoom-5.8.3.145.ebuild 4243 BLAKE2B 2deb0cbf7114084bf2017edc760c836ae3805b3ab16d187e2baf0b4a159617c41a69aed5e83f09e6e5d5fc19122d78ffff6a4c9d7c0fd71bdc52a547af8a8713 SHA512 83030731be137d6eba1d93873bf9569eeac1ee3a3d638f1cbfb0a39de23fbb043bfc8f82bc213a8ea515d12eca09a18ce43f7caf5a53d90d3c3fe1c326111714
+EBUILD zoom-5.8.4.210.ebuild 4614 BLAKE2B d0789a75393336153ec518cd7bbbf441c5c14d6c6d7dc5bd8a78a5d423e243359799a107f8351efd72f13551a1628a2991c27f9e70b3ff6f15a3d523b6898ecc SHA512 511bb652f1600c51c5742bba23e9b9d2dcd03e3272d54422219e3610e0c2f705b222515e6428e6cbbe529b55327299047642315dba8a53bd09a608a7f161c91d
+EBUILD zoom-5.8.6.739.ebuild 4614 BLAKE2B d0789a75393336153ec518cd7bbbf441c5c14d6c6d7dc5bd8a78a5d423e243359799a107f8351efd72f13551a1628a2991c27f9e70b3ff6f15a3d523b6898ecc SHA512 511bb652f1600c51c5742bba23e9b9d2dcd03e3272d54422219e3610e0c2f705b222515e6428e6cbbe529b55327299047642315dba8a53bd09a608a7f161c91d
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.8.0.16.ebuild b/net-im/zoom/zoom-5.8.4.210.ebuild
index 263454606292..0409bcc28c40 100644
--- a/net-im/zoom/zoom-5.8.0.16.ebuild
+++ b/net-im/zoom/zoom-5.8.4.210.ebuild
@@ -124,6 +124,14 @@ src_install() {
 			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
 				platforms/libqwayland*.so || die
 		)
+	else
+		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
+		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
+			ewarn "You have disabled the bundled-qt USE flag."
+			ewarn "You may experience problems when running Zoom with"
+			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
+			ewarn "See https://bugs.gentoo.org/798681 for details."
+		fi
 	fi
 
 	make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)
diff --git a/net-im/zoom/zoom-5.8.3.145.ebuild b/net-im/zoom/zoom-5.8.6.739.ebuild
index 263454606292..0409bcc28c40 100644
--- a/net-im/zoom/zoom-5.8.3.145.ebuild
+++ b/net-im/zoom/zoom-5.8.6.739.ebuild
@@ -124,6 +124,14 @@ src_install() {
 			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
 				platforms/libqwayland*.so || die
 		)
+	else
+		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
+		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
+			ewarn "You have disabled the bundled-qt USE flag."
+			ewarn "You may experience problems when running Zoom with"
+			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
+			ewarn "See https://bugs.gentoo.org/798681 for details."
+		fi
 	fi
 
 	make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)