gentoo resync : 12.05.2022

4 files changed, 35 insertions, 26 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 613572b88125..678b8b6d1eb8 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,6 +1,5 @@
-AUX README.gentoo 446 BLAKE2B e4307a45b86109e63d8057050ad66d1f77a2382ae717f1fad521756a356ff08203fc3aad20e39e437606797351b8c7f453b7d01ac1b299256ce8ed64ece888a8 SHA512 dd4c927bff4b8f66b8e149929e766378ecef0832952898a0070f0c0eb1b303b7c0cda7b8c3ed4031f12490785a593375c3aac8f30f305fa3245096eab36d189c
-DIST zoom-5.10.0.2450_x86_64.tar.xz 128642016 BLAKE2B 917a39c239737c46596b7a7d6c41b3a94ee9932839b4657a9e65f35542420feeb759b48aa346353eef52a90a000feb35addb45d799b5a53ba9acc33b5d5dfec4 SHA512 0cc464ed8db1dc0687c49fbea04aaa5ea63c3d8f0dcc280cc88fc4130be240b3a150e499ad8b0daab5f41ce4030414662656e5d9fe4a86399da83019ade1dae2
+DIST zoom-5.10.4.2845_x86_64.tar.xz 129882272 BLAKE2B e1d1e4aa460e56afc906ec2a0b9f8fd3c4ef40bfcc303993b01bde8d84f9935ab867c1527922771c19df451c4452b3838bcb262fbd43bcb65c2b35c021c56c07 SHA512 60115858e391c064893cdb85362fba733c48326acc8bb46e01fd8d6b1875ec0f2b53bf9c85b64a0d33456a781a9c613208705fa4cf03d87959d5254caf00c14f
 DIST zoom-5.9.6.2225_x86_64.tar.xz 57384044 BLAKE2B a6712499d903fa715170b9a50bf3fd1fadf7f403f4c9a9ff5ed890faf65ffd5564d06f64f26ca596598ef2c5cb53b4a477d8b08f7f7d44282911a890a00900d2 SHA512 f2899377c66cada60bf08326b7cd06a64b659d06fbdc19f0d6f1f0a6458bbfa0a40e59bdfb7ab4fe4877c0bde2f29fd0bfb8e05227b3c7cca66880e713345f10
-EBUILD zoom-5.10.0.2450-r3.ebuild 5105 BLAKE2B 5552660683934daf9876057ef69d95b1b942ca93b5e10c352be08f458ae28c87098ffa3ce063c46664f692cbd97ced4d6ba4410f58829115ae8cc11077b6d572 SHA512 343c58c068fda91ff2b9c2608c90dce3c2cd4b7937ddedece18c09193ddc00b842ad7ca91b5ac2c273f44856b03260185713a474169846697a5deab359fe1478
-EBUILD zoom-5.9.6.2225-r1.ebuild 4790 BLAKE2B dd44f435b9acd3e342d252f11f80661eccbe4b0a05277c729029167208a221f763ef0bf9989bf14e3e0d1ab88b75dc953fba7b542901405256db1bb307e72c10 SHA512 aad93a7fcb53bf6dbcfff9c36737d5a77933d099dcaf96e2f7908305e8469d0ceb68235dd42f91d8b64beba8924dd1943133abec651235630c8a1d98639b2ff1
+EBUILD zoom-5.10.4.2845-r2.ebuild 5735 BLAKE2B c036cdd9727db8da6ce14ba85e59e757be3343d409bf2e5a51c74bd94cdde345969e4c47807297fbe8a76b2654eeb0409b06f76337a5b2cdbe2bb614f1bec38e SHA512 6965dfeb4e66dab5feca573b29c48533d355b23b133fba63a52f8f14b227f9a5d722fa4a98cd55183cbe8b8ba4ebe81d6146c397c8f068bb51287e52f865a804
+EBUILD zoom-5.9.6.2225-r2.ebuild 5164 BLAKE2B 08d55d7c77006a0d3a3552b88fe0705e7dbe0241bb2a517fbdfb58ecc29d4154c5bfc878dd869b94bbdad1fd023d18e41f0d99d153fad05f62a8a299ed769f9f SHA512 cee75567e1a0298cbfd0a90de46da4fdc43fc05d340c104f281c70c9094192cf968fdd5529d858cf12de31604f95fa2e1ab3f90cdd92b763c0f1308518a155ca
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/files/README.gentoo b/net-im/zoom/files/README.gentoo
deleted file mode 100644
index 12e5058b397a..000000000000
--- a/net-im/zoom/files/README.gentoo
+++ /dev/null
@@ -1,8 +0,0 @@
-Some of Zoom's screen share features (e.g., the whiteboard) require
-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.10.0.2450-r3.ebuild b/net-im/zoom/zoom-5.10.4.2845-r2.ebuild
index db4297c45192..ed1876ca6598 100644
--- a/net-im/zoom/zoom-5.10.0.2450-r3.ebuild
+++ b/net-im/zoom/zoom-5.10.4.2845-r2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="!games-engines/zoom
 	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
-	|| ( >=sys-libs/glibc-2.34[-clone3(+)] <sys-libs/glibc-2.34 )
+	sys-libs/glibc
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/libdrm
@@ -104,7 +104,7 @@ src_prepare() {
 src_install() {
 	insinto /opt/zoom
 	exeinto /opt/zoom
-	doins -r cef json ringtone sip timezones translations
+	doins -r cef json ringtone scheduler sip timezones translations
 	doins *.pcm Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher *.sh
 	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
@@ -159,17 +159,29 @@ src_install() {
 			application/x-zoom)"
 	doicon videoconference-zoom.svg
 	doicon -s scalable videoconference-zoom.svg
+
+	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
+		the whiteboard) require display compositing. If you encounter
+		a black window when sharing the screen, then one of the following
+		actions should help:
+		\\n- Enable compositing in your window manager if it is supported
+		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
+	use wayland \
+		&& DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland,
+			edit ~/.config/zoomus.conf and change the value of
+			enableWaylandShare to true."
+	if has_version ">=sys-libs/glibc-2.34[clone3(+)]"; then
+		local w warn=( "If you encounter illegal instruction errors with zoom,"
+			"try disabling the clone3 use flag of sys-libs/glibc." )
+		DOC_CONTENTS+="\\n\\n${warn[*]}"
+		for w in "${warn[@]}"; do ewarn "${w}"; done
+	fi
 	readme.gentoo_create_doc
 }
 
 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
 }
 
diff --git a/net-im/zoom/zoom-5.9.6.2225-r1.ebuild b/net-im/zoom/zoom-5.9.6.2225-r2.ebuild
index 64fb8851e99d..01a338330463 100644
--- a/net-im/zoom/zoom-5.9.6.2225-r1.ebuild
+++ b/net-im/zoom/zoom-5.9.6.2225-r2.ebuild
@@ -68,7 +68,7 @@ src_prepare() {
 	default
 
 	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
 		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
 		|| die "Extraction of icon failed"
 
@@ -136,7 +136,7 @@ src_install() {
 		fi
 	fi
 
-	make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)
+	make_wrapper zoom /opt/zoom{/zoom,,}
 	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
 		"Network;VideoConference;" \
 		"MimeType=$(printf '%s;' \
@@ -145,17 +145,23 @@ src_install() {
 			application/x-zoom)"
 	doicon videoconference-zoom.svg
 	doicon -s scalable videoconference-zoom.svg
+
+	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
+		the whiteboard) require display compositing. If you encounter
+		a black window when sharing the screen, then one of the following
+		actions should help:
+		\\n- Enable compositing in your window manager if it is supported
+		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
+	use wayland \
+		&& DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland,
+			edit ~/.config/zoomus.conf and change the value of
+			enableWaylandShare to true."
 	readme.gentoo_create_doc
 }
 
 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
 }