gentoo resync : 25.03.2022

3 files changed, 27 insertions, 172 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 680f72675dac..d38d55f7d5f5 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,8 +1,6 @@
 AUX README.gentoo 446 BLAKE2B e4307a45b86109e63d8057050ad66d1f77a2382ae717f1fad521756a356ff08203fc3aad20e39e437606797351b8c7f453b7d01ac1b299256ce8ed64ece888a8 SHA512 dd4c927bff4b8f66b8e149929e766378ecef0832952898a0070f0c0eb1b303b7c0cda7b8c3ed4031f12490785a593375c3aac8f30f305fa3245096eab36d189c
-DIST zoom-5.8.6.739_x86_64.tar.xz 55756408 BLAKE2B 5a0def3ebc239a55fbcba3aebfcf47d9121d0c7ad7bfb10477a0adce40fba278a15e74253261960c7c8fe452c1b0661c05aa9f48a79cd20e0e33048c247d9aba SHA512 5b2dbc9c914a8ec75978664b1cab19c3c7f8bc4a1e75772e5194b45c35e7ae8a2e5ed6c6fedd4be6ffd8af8736805163581ea5daefca1c9b914eff450f250200
-DIST zoom-5.9.3.1911_x86_64.tar.xz 57314312 BLAKE2B e5f95d0962327e74e51515ba4449936b39e0ea75e7de98f02c85686f4697eb95e3ba0299d19221cbc0ac9eaf4ef5b92bcb404f39bf866fad12696c90d5b18440 SHA512 43adaaab774828b90c9924567680693c3d84fa2ad63f38f24eb2223e3c0c771e36eb7be6ac554e4cea23a0763f312675c863ef32219a7b675029a2dd21af18e6
+DIST zoom-5.10.0.2450_x86_64.tar.xz 128642016 BLAKE2B 917a39c239737c46596b7a7d6c41b3a94ee9932839b4657a9e65f35542420feeb759b48aa346353eef52a90a000feb35addb45d799b5a53ba9acc33b5d5dfec4 SHA512 0cc464ed8db1dc0687c49fbea04aaa5ea63c3d8f0dcc280cc88fc4130be240b3a150e499ad8b0daab5f41ce4030414662656e5d9fe4a86399da83019ade1dae2
 DIST zoom-5.9.6.2225_x86_64.tar.xz 57384044 BLAKE2B a6712499d903fa715170b9a50bf3fd1fadf7f403f4c9a9ff5ed890faf65ffd5564d06f64f26ca596598ef2c5cb53b4a477d8b08f7f7d44282911a890a00900d2 SHA512 f2899377c66cada60bf08326b7cd06a64b659d06fbdc19f0d6f1f0a6458bbfa0a40e59bdfb7ab4fe4877c0bde2f29fd0bfb8e05227b3c7cca66880e713345f10
-EBUILD zoom-5.8.6.739.ebuild 4637 BLAKE2B a0bbffc95c4918a7164e274f80b1d7508eedd41120a87b80f414f704ee6b8681f2cbfd306e99b0f7928ef56dad7e8b94ac42edcd0930927536896c72b4698e9d SHA512 10ec6559a7e0f11e759adfa8a7b7334ca462a69418a295dfa94dadbecf98fd8e8e1edf41e334b200fb13ad5d1614ca2d234df4b3dbea573bd58dd7b826c1a341
-EBUILD zoom-5.9.3.1911.ebuild 4736 BLAKE2B a1f3b1426840aca652dbd712c8681220834c102a4e5d322d95c810b9eeb2a6517af8dbbfc6881c7931f120f1db1752c20027691b8cad08039d927c774056517d SHA512 f8868d67d2b7481f215a40bfaedc9534b9303fb26a88040a69102027f51b33b340cd69ba129c40ba18a4247e38c27b5053c025ff7abb7b1cbad5f0ac1823a244
+EBUILD zoom-5.10.0.2450-r2.ebuild 5058 BLAKE2B b1bacefba3ff0a6e01f2e18e44a66b553079fcff6e820c6ca448942d7e991bade211316907c8b78e4fa0a40e6e448210669a8e656171be878db9677fe782ed7c SHA512 f538207a3832284b656f7a1f60298f8f9ebee77da19be53d507cb1e6479e6be0136fff24f26df0496944bc991e6aff699d8f696ce694cc6847ba64bfed9d5a2e
 EBUILD zoom-5.9.6.2225-r1.ebuild 4790 BLAKE2B dd44f435b9acd3e342d252f11f80661eccbe4b0a05277c729029167208a221f763ef0bf9989bf14e3e0d1ab88b75dc953fba7b542901405256db1bb307e72c10 SHA512 aad93a7fcb53bf6dbcfff9c36737d5a77933d099dcaf96e2f7908305e8469d0ceb68235dd42f91d8b64beba8924dd1943133abec651235630c8a1d98639b2ff1
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.9.3.1911.ebuild b/net-im/zoom/zoom-5.10.0.2450-r2.ebuild
index b30f73c773bf..5ed640701aaf 100644
--- a/net-im/zoom/zoom-5.9.3.1911.ebuild
+++ b/net-im/zoom/zoom-5.10.0.2450-r2.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? (
@@ -68,7 +83,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"
 
@@ -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 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,10 +150,13 @@ src_install() {
 		fi
 	fi
 
-	make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)
+	make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef
 	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
 		"Network;VideoConference;" \
-		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+		"MimeType=$(printf '%s;' \
+			x-scheme-handler/zoommtg \
+			x-scheme-handler/zoomus \
+			application/x-zoom)"
 	doicon videoconference-zoom.svg
 	doicon -s scalable videoconference-zoom.svg
 	readme.gentoo_create_doc
diff --git a/net-im/zoom/zoom-5.8.6.739.ebuild b/net-im/zoom/zoom-5.8.6.739.ebuild
deleted file mode 100644
index 2d83cbfbf221..000000000000
--- a/net-im/zoom/zoom-5.8.6.739.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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
-	dev-libs/glib:2
-	>=dev-libs/quazip-1.0:0=
-	media-libs/fdk-aac:0/2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-sound/mpg123
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrender
-	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 )
-	!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"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>zoom-icon.svg && [[ -s zoom-icon.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 json ringtone 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 QtQml/RemoteObjects \
-				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,} $(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
-	doicon -s scalable zoom-icon.svg
-	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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}