gentoo auto-resync : 21:11:2024 - 03:03:00

4 files changed, 5 insertions, 188 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 4e9b56eb6bf5..f3cb39a31ddf 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index c28dcb6a941d..eb8a014ce6c5 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,7 +1,5 @@
-DIST zoom-6.0.12.5501_x86_64.tar.xz 202090468 BLAKE2B 4f8320897028f346d270fa2bc0ab390bec8bcfca01d9cb741788a76d3f0e458c469162e908064cec51ab693c2e57014ad60b7f8c85d9f09c2f3d6375f9ca83f7 SHA512 b2dbc31e2c96e8012f1e644b783c5cc36a96b0b7aea68947139b0f6017b7ba821d0c190254ee6559e2c472a4f7c6a18e06c8177c7b226a9187683f09e64bd368
-DIST zoom-6.2.3.2056_x86_64.tar.xz 208218464 BLAKE2B a270defbe8a0b485f2e4b69971740f9c0fc784bf7b1a9204b9c4fa4fdd30ca12c2db439f562419d856bdb5dd156b345d0043172067497fefbc81d999b8fac959 SHA512 51923f101454d64d70e5927cc2557eab483518f7f76d2d9578f4d8f9beae71ffc821b7d0d3ef0e38ff7c213b10dd63acd931935d10c9d1a47690afe34bfc9023
+DIST zoom-6.2.10.4983_x86_64.tar.xz 210613920 BLAKE2B 2828ffe9205720490175054496d104b7146287a2aff13f81f37185e2943f514d228d4c11e9fc3c63f1e705f8698b15100db073e58ba5721eeafa34f1d9d9e8e2 SHA512 545770cfc4634d953ef778f60738ad8d0ed19a79d2422948d81288216762fe336edb0b77123c1dadf6b495bb64b8c097760446c0ce266c80a568a2efd3516088
 DIST zoom-6.2.6.2503_x86_64.tar.xz 208744168 BLAKE2B 73e5b6a6e2b26396ff56d2318541d6a09e7c7101d5ce87a821ed07d1f760a7bf5a92dd52460b453cc841cd76f106228df3acd7559e0ed09a7bb0da7a8f15013e SHA512 9aa1ed215d6f94889fc7d164135186fe8efb065b0727a3eb863cffb5a47e67790aa11de9d0035b805ec36529d376810120eaa821329dbba36af16610885b68c5
-EBUILD zoom-6.0.12.5501.ebuild 5394 BLAKE2B 82c04ebc50168d9f4033e418e5f6b801fb7c1bdcef741e168e7e1fc8e38dabba46484059aa6f3b46770e2a41b8acda16578ed5456042f19954c118c015b9f828 SHA512 a858ab735edfcc2639fc2be564abe7e264e098e4798626e8e8a72403e47bb04849f80fe91dece659c22d514f0727597d8517c5aa22fd291fb71815da5e713c1a
-EBUILD zoom-6.2.3.2056.ebuild 5431 BLAKE2B a0dc08f43c924248ee1cc3eeeb46d60654349ab2bb8959c15051d7c04842b7887f9af9039bc33c545c2f3474f2fc72312eaf85388297f29008b0abdea16d12fd SHA512 acc45890129684226ce8c7c1e42389f82bcda688d056db721802f733e1318591a4b550c3df1221192a0a649d02c05d72785619c16db88ffd2af7c6def05b0882
+EBUILD zoom-6.2.10.4983.ebuild 5530 BLAKE2B dc0a90558fb8d006b6c28df5cfbec90e84ec5f73b6468d8bc32f0cb232a0ed7cdc824cb8388b59e5ed4194befeb29eba2efa2b00081fc65401197d25523c28c4 SHA512 79b60faed28a03ebb8155fe07a03794b96dc4afe08cab89d9030902c30262bafb492fddb888b8e208e3e446c29808b73753fe0669f33cae8ff79939775124739
 EBUILD zoom-6.2.6.2503.ebuild 5431 BLAKE2B a0dc08f43c924248ee1cc3eeeb46d60654349ab2bb8959c15051d7c04842b7887f9af9039bc33c545c2f3474f2fc72312eaf85388297f29008b0abdea16d12fd SHA512 acc45890129684226ce8c7c1e42389f82bcda688d056db721802f733e1318591a4b550c3df1221192a0a649d02c05d72785619c16db88ffd2af7c6def05b0882
 MISC metadata.xml 683 BLAKE2B c37e3d7281369e6bf59d71e5dedb33336773e7ee44ce004810723c61333fe602b264c66b79d59bbd666bfd6c617ccaf2a89ec1a77650b5ea5b01e1dcca6f2ae1 SHA512 47c602644b02a8b30f9a3617bff5a77073ef000b52088688d52d4809119a923f87c30a2904da3a276cb4429cecba8b9efcdeb71cebc7aae2bf0a4103d2cc9f62
diff --git a/net-im/zoom/zoom-6.0.12.5501.ebuild b/net-im/zoom/zoom-6.0.12.5501.ebuild
deleted file mode 100644
index 141c19a15836..000000000000
--- a/net-im/zoom/zoom-6.0.12.5501.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop linux-info readme.gentoo-r1 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-qt opencl pulseaudio wayland +zoom-symlink"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="zoom-symlink? ( !games-engines/zoom )
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/mit-krb5
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	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
-	sys-libs/zlib
-	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
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-	opencl? ( virtual/opencl )
-	pulseaudio? ( media-libs/libpulse )
-	wayland? ( dev-libs/wayland )
-	!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
-		dev-qt/qtxml:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-BDEPEND="dev-util/bbe"
-
-CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
-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
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r calendar cef chatapp email json ringtone scheduler sip \
-		timezones translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher *.sh \
-		aomhost libaomagent.so libdvf.so libmkldnn.so \
-		libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
-	fperms a+x /opt/zoom/cef/chrome-sandbox
-	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 libclDNN64.so
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
-	fi
-
-	if ! use wayland; then
-		# Soname dependency on libwayland-client.so.0
-		rm "${ED}"/opt/zoom/cef/libGLESv2.so || die
-	fi
-
-	if use bundled-qt; then
-		doins -r Qt
-		find Qt -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.
-			# Why does the upstream package contain such garbage? :-(
-			cd "${ED}"/opt/zoom/Qt || die
-			rm -r plugins/audio plugins/egldeviceintegrations \
-				plugins/platforms/libqeglfs.so \
-				plugins/platforms/libqlinuxfb.so \
-				plugins/platformthemes/libqgtk3.so \
-				qml/QtQml/RemoteObjects \
-				qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \
-				qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
-				qml/QtQuick/XmlListModel || die
-			use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
-				plugins/platforms/libqwayland*.so qml/QtWayland || die
-		)
-	else
-		local qtzoom="5.15" 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
-
-	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
-
-	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)"
-	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
-}
diff --git a/net-im/zoom/zoom-6.2.3.2056.ebuild b/net-im/zoom/zoom-6.2.10.4983.ebuild
index 1df6e759f958..d2041ad48ed9 100644
--- a/net-im/zoom/zoom-6.2.3.2056.ebuild
+++ b/net-im/zoom/zoom-6.2.10.4983.ebuild
@@ -152,12 +152,13 @@ src_install() {
 
 	use zoom-symlink && dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
 
-	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
-		"Network;VideoConference;" \
+	make_desktop_entry "${EPREFIX}/opt/zoom/ZoomLauncher %U" Zoom \
+		videoconference-zoom "Network;VideoConference;" \
 		"MimeType=$(printf '%s;' \
 			x-scheme-handler/zoommtg \
 			x-scheme-handler/zoomus \
 			application/x-zoom)"
+	mv "${ED}"/usr/share/applications/{ZoomLauncher-,}zoom.desktop || die
 	doicon videoconference-zoom.svg
 	doicon -s scalable videoconference-zoom.svg