gentoo resync : 24.07.2021

3 files changed, 18 insertions, 10 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 8cff239745d1..92402a95c5f7 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,9 @@
-AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
+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.6.22045.0607_x86_64.tar.xz 51749804 BLAKE2B 73d37f9118bc8b3dd424ec903e72cb6f1da9c7a8b87319845befe0b4f10f9793ef603481d8e3e6c6af51dd7b342eb5bb157fbb8eb495b48641a70b62ae96534f SHA512 04e7c1b483c769b4d809f31fa615a2fedd3229edba13da7f51231c38a810d6cef7458c6b9aa504097c2bf1b4fbf81df1a6d9e0921dc6df1b9a8cb02038fcdd7a
 DIST zoom-5.7.26030.0627_x86_64.tar.xz 52351944 BLAKE2B d34e11aa148945e9b1093c5f78b5930a58a7e4011b07e1ae3b6873ba0d1b1774ca6ef28fba6678b962e70b7340079dc4795d54e1bf4ce4702fc653a5dd06a21d SHA512 aa0af2d95c8c65a4f1af7a3de6cb9626b8c88f662922ccc7f59fbcc9cc5ba3c3398c50687b381126a3fbd84c9662e926727635fcc50025c834bedb08bcaf9961
+DIST zoom-5.7.28852.0718_x86_64.tar.xz 52589228 BLAKE2B 61337f7722a48b258c13cd389f7bae9d3cbc4c2c3468c7b413bde4a87b24e5f64989a516f3073882cbf70f898b6ad188c9a5876ab3d75e2dd5f688ff94f706a4 SHA512 8a00fb01f5af0dfcc1a9e13058f7d3e492545d827d157effe3d19a0846a53ce2427172ce4b33a95f0420259876b5e16c44122f5753632278e5967ec222657f2b
 EBUILD zoom-5.4.53391.1108-r3.ebuild 3167 BLAKE2B 9aba2dc82ebd4c97f7dc97b6718141e35416316f51111ce145b9844bf1172fea80c3080a1d8ff34964e42742e243d1fc157906e2c55450b39170f01cb36a55b4 SHA512 52fc56dcfadaa4b9822475525a7958d8bbe5351038ee209426e1440af613598bed0f75dabdd79450206b6c9a36564f3ecf43dd3a98182368789744c99a589cbf
-EBUILD zoom-5.6.22045.0607.ebuild 4067 BLAKE2B 34f531a6d88b26c1e87d4435c70f26d958a5d93d56c23bff4beab0718ae21a7c44df9e86ab473c07b934bff77f750e6436f80ad5135dfd83c5f142abf799fec8 SHA512 5869d42749458346455f341dea4baeaae6a4e879696dbfcd68833f6bdb171809b905ecc0b6038e666c50b870ad44718782b0038e573fb7154e2887e20f40a0de
 EBUILD zoom-5.7.26030.0627.ebuild 4067 BLAKE2B 34f531a6d88b26c1e87d4435c70f26d958a5d93d56c23bff4beab0718ae21a7c44df9e86ab473c07b934bff77f750e6436f80ad5135dfd83c5f142abf799fec8 SHA512 5869d42749458346455f341dea4baeaae6a4e879696dbfcd68833f6bdb171809b905ecc0b6038e666c50b870ad44718782b0038e573fb7154e2887e20f40a0de
+EBUILD zoom-5.7.28852.0718.ebuild 4189 BLAKE2B a024abc94ef953f75d770b041adf50f8b2e9f3edcc9dc77f0c9295bcda21a32b503c10aff773cc8866e6d83f27ff8dc5517e2a208f7752de37490dbb9676e723 SHA512 81db6cc78abc3e8939fb030cfe5ddffdd66b98a235de8708716fa92f87f94dea3debd512df9ab1a6f77d1c7502785e87f37b2f7476679f10691b99c97fb9cd03
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/files/README.gentoo b/net-im/zoom/files/README.gentoo
index 06f1f9b3dce0..12e5058b397a 100644
--- a/net-im/zoom/files/README.gentoo
+++ b/net-im/zoom/files/README.gentoo
@@ -3,3 +3,6 @@ display compositing. If you encounter a black window when sharing
 the screen, then one of the following actions should help:
 - Enable compositing in your window manager if it is supported
 - Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)
+
+To enable screen sharing on GNOME Wayland, edit ~/.config/zoomus.conf
+and change the value of enableWaylandShare to true.
diff --git a/net-im/zoom/zoom-5.6.22045.0607.ebuild b/net-im/zoom/zoom-5.7.28852.0718.ebuild
index 514387cfdd02..2d1b6688d0d6 100644
--- a/net-im/zoom/zoom-5.6.22045.0607.ebuild
+++ b/net-im/zoom/zoom-5.7.28852.0718.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -90,19 +90,19 @@ src_install() {
 	doins -r json ringtone sip timezones translations
 	doins *.pcm *.sh Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
 
 	local quazip_so="libquazip1-qt5.so"
 	if has_version "<dev-libs/quazip-1.0"; then
 		quazip_so="libquazip5.so"
 	fi
-	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
+	dosym -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
 	else
-		dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
 	fi
 
 	if use bundled-qt; then
@@ -126,7 +126,7 @@ src_install() {
 		)
 	fi
 
-	make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "")
+	make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)
 	make_desktop_entry "zoom %U" Zoom zoom-icon "" \
 		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
 	doicon zoom-icon.svg
@@ -137,6 +137,11 @@ src_install() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
+
+	local FORCE_PRINT_ELOG v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1
+	done
 	readme.gentoo_print_elog
 }