gentoo auto-resync : 26:06:2023 - 13:32:27

3 files changed, 6 insertions, 197 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 8904272dcc01..7b93c1ac9583 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,6 +1,5 @@
 DIST zoom-5.14.10.3738_x86_64.tar.xz 168546944 BLAKE2B b338c65b41c4b3caa277dd64cec42f6fbdd307557204fe4e2dafa9b0d48eeddeba0c5bd64bdda1ac1721de1c6f1e8bde7e65517d6c9be80cb7c3591aac007ac9 SHA512 c4d94adc295743519915a597b1e10dd10e38238857df399432acb9ef26d57dad3b9ea68d84ffcea1c782116e8121f54dac2b25e5740760d2ebea2e119fb33686
-DIST zoom-5.14.7.2928_x86_64.tar.xz 168160068 BLAKE2B f20dd7d87e14c2489517d229f18c395155fe56a51a10f57a35c62a4add54650d1c3831414740392cedb2cb13e2bb65274b7e2d59b52263aa079ff49bb0e4a9af SHA512 4b843533f300556773a31eedbd48dd46062ca5a607cf6241fb2af1d3bbb436333b0d3cabd03b091a61ed1088e40010adb971671b1fc79cd26ff4524bfb9e3b78
+DIST zoom-5.15.0.4063_x86_64.tar.xz 177325116 BLAKE2B d30df710496a5469d9d70fa810dbbf48ee7f664e0a3a7b788b766ec515fdac69f05e233e333310e860cd5249177eaa28784cd63b0a217c02714fe0b16e984b42 SHA512 6958715fafae9e39c6dc138fa17357ba50c7c17b4ec7f1ad5aa6feccfb0034dad66c23ff22c71a349abe456492fa6769fda9148cfe1efcced62e50de5cbfe8a6
 EBUILD zoom-5.14.10.3738-r1.ebuild 5716 BLAKE2B 6c8c518a5427802272b9b0e86263a7811dc877bf63172379e9c651d09a1b7babdc58dbb3f324ad7d32b23035e4f036bd86014403fc02b20410abcaaa4b6aecb6 SHA512 dbbd0764288b1e9c56340047a517120de2c8c26ab6f54349b55bc6d2f0fb8010c49129a3974223d9c925404a364b1a4283bc8bba751c629b7938396299478ab6
-EBUILD zoom-5.14.10.3738.ebuild 5713 BLAKE2B 6baa601259759bfccb6d5da5433f8deb270cd0dce122e104b1e63c8973cf4a8072b599cc4bbef50c79b2741cca609b7e73ba83ccb61b6165d11d2948b0cff052 SHA512 229824e352ccf706ef6bac72a3697ba91f7613dbb328c917b22d068d95ac3754e726711eb79775ea826cc88e8e6d5f43248d4c28dd387f3ff38ed44869f192d0
-EBUILD zoom-5.14.7.2928.ebuild 5713 BLAKE2B 6baa601259759bfccb6d5da5433f8deb270cd0dce122e104b1e63c8973cf4a8072b599cc4bbef50c79b2741cca609b7e73ba83ccb61b6165d11d2948b0cff052 SHA512 229824e352ccf706ef6bac72a3697ba91f7613dbb328c917b22d068d95ac3754e726711eb79775ea826cc88e8e6d5f43248d4c28dd387f3ff38ed44869f192d0
+EBUILD zoom-5.15.0.4063.ebuild 5716 BLAKE2B 6c8c518a5427802272b9b0e86263a7811dc877bf63172379e9c651d09a1b7babdc58dbb3f324ad7d32b23035e4f036bd86014403fc02b20410abcaaa4b6aecb6 SHA512 dbbd0764288b1e9c56340047a517120de2c8c26ab6f54349b55bc6d2f0fb8010c49129a3974223d9c925404a364b1a4283bc8bba751c629b7938396299478ab6
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.14.7.2928.ebuild b/net-im/zoom/zoom-5.14.7.2928.ebuild
deleted file mode 100644
index ca1f4dfb7b31..000000000000
--- a/net-im/zoom/zoom-5.14.7.2928.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2023 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-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!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
-	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-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 )"
-
-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
-
-	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 calendar cef email json ringtone scheduler sip timezones \
-		translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher *.sh
-	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 aomhost libaomagent.so libclDNN64.so libdvf.so libmkldnn.so \
-			libavcodec.so* libavformat.so* libavutil.so* libswresample.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 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/Qt/labs/lottieqt 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.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
-
-	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-5.14.10.3738.ebuild b/net-im/zoom/zoom-5.15.0.4063.ebuild
index ca1f4dfb7b31..d5834012a981 100644
--- a/net-im/zoom/zoom-5.14.10.3738.ebuild
+++ b/net-im/zoom/zoom-5.15.0.4063.ebuild
@@ -109,15 +109,16 @@ src_install() {
 	doins -r calendar cef email json ringtone scheduler sip timezones \
 		translations
 	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher *.sh
+	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 aomhost libaomagent.so libclDNN64.so libdvf.so libmkldnn.so \
-			libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
+		doexe libclDNN64.so
 		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
 	fi