gentoo resync : 29.12.2022

4 files changed, 211 insertions, 16 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 678b8b6d1eb8..fa1e493ae031 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,5 +1,7 @@
-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.4.2845-r2.ebuild 5735 BLAKE2B c036cdd9727db8da6ce14ba85e59e757be3343d409bf2e5a51c74bd94cdde345969e4c47807297fbe8a76b2654eeb0409b06f76337a5b2cdbe2bb614f1bec38e SHA512 6965dfeb4e66dab5feca573b29c48533d355b23b133fba63a52f8f14b227f9a5d722fa4a98cd55183cbe8b8ba4ebe81d6146c397c8f068bb51287e52f865a804
-EBUILD zoom-5.9.6.2225-r2.ebuild 5164 BLAKE2B 08d55d7c77006a0d3a3552b88fe0705e7dbe0241bb2a517fbdfb58ecc29d4154c5bfc878dd869b94bbdad1fd023d18e41f0d99d153fad05f62a8a299ed769f9f SHA512 cee75567e1a0298cbfd0a90de46da4fdc43fc05d340c104f281c70c9094192cf968fdd5529d858cf12de31604f95fa2e1ab3f90cdd92b763c0f1308518a155ca
+DIST zoom-5.10.7.3311_x86_64.tar.xz 130117904 BLAKE2B d3ad7501ec6fc495c62bb783c79690f5424c7e07b0cad1a3e71e20633e9df088c918a0b9a4cc5a956b016e6144da4998567ebb3ef393452caf8814d4e300c186 SHA512 acf31bc5e983500f534ccfcfe0b935a735e4a259bcfb37d99109bed41d0f3f561a664c5cbf728f907feb8ec5e79a13a27dc39c01948ee2e9f1bab2288e450231
+DIST zoom-5.11.0.3540_x86_64.tar.xz 131577872 BLAKE2B 11d40635b83469672bd9da1aea3312b735ff924d85faf515f435dba1e11c2b957c76d56a05490b2d55d4f3db3fc84b46a96a3cdd23ab2e137e4f4e9d8c87d109 SHA512 6b58e1978710f1293438164edb02ab0920e479851f7fee137bdbdc13b9d70d168a253ec140f68c6922d523e183808a31bb3527fea893bf480e1a34f7e703b5f6
+DIST zoom-5.11.1.3595_x86_64.tar.xz 131583416 BLAKE2B 9848b198bc8c523287e68d85ec42bbb5c1fc6448210c4104273bf6680f4fa2f460a5f880f07d6d5d65aa83cd58c82b071be83205e505c097c205370cd1304c35 SHA512 9e02dcbd33369334521cc51f8a64db1f677fe887773fa73e4ade10f01a0e0ac48cce3ff6ce962d52208935ecf19f82c22c9d81702e9839c30f0cdaa3fd9fde4e
+EBUILD zoom-5.10.7.3311.ebuild 5458 BLAKE2B cdc8359fd0a0850fbba3199ce9d0bcf6e1cebe45e97a502a762dcf0ea479c080cd496ddc5e0e39db15adc8f4f5fa27bfb65938e4f8f11182d15df645aa9af04f SHA512 376c2c1a1f59314001cf52fb9dcc65b19fdd300ddf73593f5c1dd16cb62ea19a3b0bbc4cc467756c533a2b880794737b157b2cf40bb5c7a2a574b049d7a23b00
+EBUILD zoom-5.11.0.3540.ebuild 5458 BLAKE2B cdc8359fd0a0850fbba3199ce9d0bcf6e1cebe45e97a502a762dcf0ea479c080cd496ddc5e0e39db15adc8f4f5fa27bfb65938e4f8f11182d15df645aa9af04f SHA512 376c2c1a1f59314001cf52fb9dcc65b19fdd300ddf73593f5c1dd16cb62ea19a3b0bbc4cc467756c533a2b880794737b157b2cf40bb5c7a2a574b049d7a23b00
+EBUILD zoom-5.11.1.3595.ebuild 5458 BLAKE2B cdc8359fd0a0850fbba3199ce9d0bcf6e1cebe45e97a502a762dcf0ea479c080cd496ddc5e0e39db15adc8f4f5fa27bfb65938e4f8f11182d15df645aa9af04f SHA512 376c2c1a1f59314001cf52fb9dcc65b19fdd300ddf73593f5c1dd16cb62ea19a3b0bbc4cc467756c533a2b880794737b157b2cf40bb5c7a2a574b049d7a23b00
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.10.4.2845-r2.ebuild b/net-im/zoom/zoom-5.10.7.3311.ebuild
index ed1876ca6598..de370171be34 100644
--- a/net-im/zoom/zoom-5.10.4.2845-r2.ebuild
+++ b/net-im/zoom/zoom-5.10.7.3311.ebuild
@@ -170,12 +170,6 @@ src_install() {
 		&& 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
 }
 
diff --git a/net-im/zoom/zoom-5.9.6.2225-r2.ebuild b/net-im/zoom/zoom-5.11.0.3540.ebuild
index 01a338330463..de370171be34 100644
--- a/net-im/zoom/zoom-5.9.6.2225-r2.ebuild
+++ b/net-im/zoom/zoom-5.11.0.3540.ebuild
@@ -17,28 +17,43 @@ IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
 RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
 	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
 	>=dev-libs/quazip-1.0:0=
+	media-libs/alsa-lib
 	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
+	media-libs/mesa[gbm(+)]
 	media-sound/mpg123
+	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
 	sys-libs/glibc
 	virtual/opengl
+	x11-libs/cairo
+	x11-libs/libdrm
 	x11-libs/libX11
 	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
 	x11-libs/libXrender
+	x11-libs/libxshmfence
 	x11-libs/libXtst
+	x11-libs/pango
 	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 )
 	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
 	!bundled-qt? (
@@ -89,7 +104,7 @@ src_prepare() {
 src_install() {
 	insinto /opt/zoom
 	exeinto /opt/zoom
-	doins -r 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
@@ -119,9 +134,8 @@ src_install() {
 
 		(	# Remove libs and plugins with unresolved soname dependencies
 			cd "${ED}"/opt/zoom || die
-			rm -r Qt/labs/location QtQml/RemoteObjects \
-				QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \
-				QtQuick/Scene3D QtQuick/XmlListModel \
+			rm -r Qt/labs/location QtQuick/LocalStorage QtQuick/Particles.2 \
+				QtQuick/Scene2D QtQuick/Scene3D QtQuick/XmlListModel \
 				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
 			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
 				platforms/libqwayland*.so || die
@@ -136,7 +150,7 @@ src_install() {
 		fi
 	fi
 
-	make_wrapper zoom /opt/zoom{/zoom,,}
+	make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef
 	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
 		"Network;VideoConference;" \
 		"MimeType=$(printf '%s;' \
diff --git a/net-im/zoom/zoom-5.11.1.3595.ebuild b/net-im/zoom/zoom-5.11.1.3595.ebuild
new file mode 100644
index 000000000000..de370171be34
--- /dev/null
+++ b/net-im/zoom/zoom-5.11.1.3595.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="!games-engines/zoom
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/quazip-1.0:0=
+	media-libs/alsa-lib
+	media-libs/fdk-aac:0/2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa[gbm(+)]
+	media-sound/mpg123
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxshmfence
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	opencl? ( virtual/opencl )
+	pulseaudio? ( media-sound/pulseaudio )
+	wayland? ( dev-libs/wayland )
+	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
+	!bundled-qt? (
+		dev-libs/icu
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtdiag:5
+		dev-qt/qtgraphicaleffects:5
+		dev-qt/qtgui:5
+		dev-qt/qtlocation:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols:5[widgets]
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		wayland? ( dev-qt/qtwayland )
+	)"
+
+BDEPEND="dev-util/bbe
+	bundled-libjpeg-turbo? ( dev-util/patchelf )"
+
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+
+	# The tarball doesn't contain an icon, so extract it from the binary
+	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"
+
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+
+	if use bundled-libjpeg-turbo; then
+		# Remove insecure RPATH from bundled lib
+		patchelf --remove-rpath libturbojpeg.so || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	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
+	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
+
+	if use opencl; then
+		doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
+	fi
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so
+	else
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
+	fi
+
+	if use bundled-qt; then
+		doexe libicu*.so.56 libQt5*.so.5
+		doins qt.conf
+
+		local dirs="Qt* bearer generic iconengines imageformats \
+			platforminputcontexts platforms wayland* xcbglintegrations"
+		doins -r ${dirs}
+		find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
+
+		(	# Remove libs and plugins with unresolved soname dependencies
+			cd "${ED}"/opt/zoom || die
+			rm -r Qt/labs/location QtQuick/LocalStorage QtQuick/Particles.2 \
+				QtQuick/Scene2D QtQuick/Scene3D QtQuick/XmlListModel \
+				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
+			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,} /opt/zoom:/opt/zoom/cef
+	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
+		"Network;VideoConference;" \
+		"MimeType=$(printf '%s;' \
+			x-scheme-handler/zoommtg \
+			x-scheme-handler/zoomus \
+			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
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}