8 files changed, 6 insertions, 525 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 61225c81481d..464894c07de0 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index 7e33a3fed55e..f094aedf4b2b 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1,5 +1,3 @@
-DIST discord-0.0.26.tar.gz 93012747 BLAKE2B 9759a1319835d48e5bc5a72b9c96308ac2cc8251de66b82b55abff0cb2ea199a94f7fa25488a95ed577176ce12fe6eb8455f25fa111b6306778f195b15dc6468 SHA512 65477c2c033f30850a699706a6502ff4f4af8838185716d968d641fdab3033555139b04bf91a111a847aca14113e33ba6248d49ba317fd43cbacb099e974117b
 DIST discord-0.0.27.tar.gz 92317071 BLAKE2B 5328abd5f6aba87c73ee26cc6387dd9af7745c003e67b70e168153a959f5f582d118d38ce0b45ff4a9165ff1423708b05d468824c880e4685755df41ceadd5e1 SHA512 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f
-EBUILD discord-0.0.26-r1.ebuild 3250 BLAKE2B 37ff53dcd821c1f9cb669bec81388632891027e0d0d60c74bc67c47d4eb28e660672ae6263bf1b64ed2b4bd88776eee0a37d02e12633ad55d09563b82c92006b SHA512 586d23a2b9d1decbf644d89d94829c935ed6e7de90fd0be31182f1d2c04e2dd9f50b0ce7c5164fa82ec83df56e84ea6b08a7b8e79d43b9bd0d0316ee02251331
-EBUILD discord-0.0.27.ebuild 3414 BLAKE2B f06f04833524cbf310e59cc508f3bcc80c36c34a6f9feb8ab3b83a296a9dca30159d69040dc4a33633ef423471159e75016c0782adfb49e25bf259dbae5d51e1 SHA512 707b77bef4162d16b98736d8f046ce7548c044726c29e2f10311ca36aed760b6ef6e26f784e66bac99dce56c798fcc9b67ac5f20c2d1aa0347c325a28232307b
+EBUILD discord-0.0.27.ebuild 3413 BLAKE2B 80cd994612cfb1da73c9f6eefb9ba254eca549da180e704e7477946b0aa05b7f7daa1aff60501712c0c830ca5fa335e0f1d567d1a16b0bef4ca930dc7f9ad3d4 SHA512 ae44d8dd768191a3097b0e5882b85b6a4e72868cbb648bfdd911d5c5e1b56974e752dcc4a322948e55b246c3b94a48b26e185535b203b8f758accd11fb4f56c5
 MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665
diff --git a/net-im/discord/discord-0.0.26-r1.ebuild b/net-im/discord/discord-0.0.26-r1.ebuild
deleted file mode 100644
index db19d1e80952..000000000000
--- a/net-im/discord/discord-0.0.26-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/-bin/}"
-MY_PV="${PV/-r*/}"
-
-CHROMIUM_VERSION="102"
-CHROMIUM_LANGS="
-	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
-	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
-	sw ta te th tr uk vi zh-CN zh-TW
-"
-
-inherit chromium-2 desktop linux-info optfeature unpacker xdg
-
-DESCRIPTION="All-in-one voice and text chat for gamers"
-HOMEPAGE="https://discordapp.com"
-SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64"
-RESTRICT="bindist mirror strip test"
-IUSE="+seccomp"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-DESTDIR="/opt/${MY_PN}"
-
-QA_PREBUILT="*"
-
-CONFIG_CHECK="~USER_NS"
-
-S="${WORKDIR}/${MY_PN^}"
-
-src_unpack() {
-	unpack ${MY_PN}-${MY_PV}.tar.gz
-}
-
-src_configure() {
-	default
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	default
-	# remove post-install script
-	rm postinst.sh || die "the removal of the unneeded post-install script failed"
-	# cleanup languages
-	pushd "locales/" >/dev/null || die "location change for language cleanup failed"
-	chromium_remove_language_paks
-	popd >/dev/null || die "location reset for language cleanup failed"
-	# fix .desktop exec location
-	sed -i "/Exec/s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" \
-		"${MY_PN}.desktop" ||
-		die "fixing of exec location on .desktop failed"
-	# USE seccomp
-	if ! use seccomp; then
-		sed -i '/Exec/s/Discord/Discord --disable-seccomp-filter-sandbox/' \
-			"${MY_PN}.desktop" ||
-			die "sed failed for seccomp"
-	fi
-}
-
-src_install() {
-	doicon -s 256 "${MY_PN}.png"
-
-	# install .desktop file
-	domenu "${MY_PN}.desktop"
-
-	exeinto "${DESTDIR}"
-
-	doexe "${MY_PN^}" chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so
-
-	insinto "${DESTDIR}"
-	doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin
-	insopts -m0755
-	doins -r locales resources
-
-	# Chrome-sandbox requires the setuid bit to be specifically set.
-	# see https://github.com/electron/electron/issues/17972
-	fowners root "${DESTDIR}/chrome-sandbox"
-	fperms 4711 "${DESTDIR}/chrome-sandbox"
-
-	# Crashpad is included in the package once in a while and when it does, it must be installed.
-	# See #903616 and #890595
-	[[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler
-
-	dosym "${DESTDIR}/${MY_PN^}" "/usr/bin/${MY_PN}"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "sound support" \
-		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
-	optfeature "system tray support" dev-libs/libappindicator
-}
diff --git a/net-im/discord/discord-0.0.27.ebuild b/net-im/discord/discord-0.0.27.ebuild
index 8f127eeca494..0c75ad505e10 100644
--- a/net-im/discord/discord-0.0.27.ebuild
+++ b/net-im/discord/discord-0.0.27.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="bindist mirror strip test"
 IUSE="appindicator +seccomp"
 
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index b9a494da35da..f8f46c92032b 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,8 +1,5 @@
-DIST zoom-5.13.10.1208_x86_64.tar.xz 166970460 BLAKE2B 58d1bda480345a77a1fc466bb1af3429a63d1959ee4aada608f7ea6d55a537afb2840c497951c8030fb78836a3bb671debc6e4cbae82fe870eed9383e111c207 SHA512 dc29e626d6bfe565519822249324510e9e2719beaaf0f9382187f3d3467ce24a7d81e0473d4af22485a28932a6727b368a1d13a3322cb970b69b44155b1d6a30
-DIST zoom-5.14.2.2046_x86_64.tar.xz 167565808 BLAKE2B 1e2ecbac52fa88ed7d068be8edcaa65b33643045e5cbed6d1af31e560df520723541fb1c61133073edb27068cd9a1ed66dfacdd3184b18ab7b26f71513f3855c SHA512 416ffd9bf48b7519302f87847efc6ac2086ae47b9a2083e9cad7b42ee2549e0b91d27edfbd1a0afd06cc02b1d0d0db8443ab294b0e863878c6533a143b4088be
 DIST zoom-5.14.5.2430_x86_64.tar.xz 168119892 BLAKE2B ffbcc3720e863897ef4eb5278118b3e6e6aeb25280b4cb493254909fe1707e454193ba6e63f1c625978b5ade8e0204f59dbb11f96c7af2d38058df9df952f234 SHA512 17f72d8fac95f9fff46db1dec674303e97b3d2060c1f9dd631055a1d5939810251b35bcfc0a13dcdbe80662c2c285dc1f224dd20bc1a7e4dfa928f641e1532ca
-EBUILD zoom-5.13.10.1208.ebuild 5763 BLAKE2B e59d2d9b2fa2729e2e26d00c65aa973fcccff9b33d7aa41f26238d95f94863fbb7faea353a9cbeb8cf3063e7106c9c260c55d59ee0d7c1c839876a32cb45068c SHA512 59b2d574ae3d308b0dc07bf4f3e51f55c94d3472359a13e8698cd78e77a65e9bd7391f6ae7654200a4476af97636949caa00461047b32bd09f96c4f1a815b09c
-EBUILD zoom-5.14.2.2046.ebuild 5763 BLAKE2B e59d2d9b2fa2729e2e26d00c65aa973fcccff9b33d7aa41f26238d95f94863fbb7faea353a9cbeb8cf3063e7106c9c260c55d59ee0d7c1c839876a32cb45068c SHA512 59b2d574ae3d308b0dc07bf4f3e51f55c94d3472359a13e8698cd78e77a65e9bd7391f6ae7654200a4476af97636949caa00461047b32bd09f96c4f1a815b09c
+DIST zoom-5.14.7.2928_x86_64.tar.xz 168160068 BLAKE2B f20dd7d87e14c2489517d229f18c395155fe56a51a10f57a35c62a4add54650d1c3831414740392cedb2cb13e2bb65274b7e2d59b52263aa079ff49bb0e4a9af SHA512 4b843533f300556773a31eedbd48dd46062ca5a607cf6241fb2af1d3bbb436333b0d3cabd03b091a61ed1088e40010adb971671b1fc79cd26ff4524bfb9e3b78
 EBUILD zoom-5.14.5.2430-r1.ebuild 5713 BLAKE2B 6baa601259759bfccb6d5da5433f8deb270cd0dce122e104b1e63c8973cf4a8072b599cc4bbef50c79b2741cca609b7e73ba83ccb61b6165d11d2948b0cff052 SHA512 229824e352ccf706ef6bac72a3697ba91f7613dbb328c917b22d068d95ac3754e726711eb79775ea826cc88e8e6d5f43248d4c28dd387f3ff38ed44869f192d0
-EBUILD zoom-5.14.5.2430.ebuild 5763 BLAKE2B e59d2d9b2fa2729e2e26d00c65aa973fcccff9b33d7aa41f26238d95f94863fbb7faea353a9cbeb8cf3063e7106c9c260c55d59ee0d7c1c839876a32cb45068c SHA512 59b2d574ae3d308b0dc07bf4f3e51f55c94d3472359a13e8698cd78e77a65e9bd7391f6ae7654200a4476af97636949caa00461047b32bd09f96c4f1a815b09c
+EBUILD zoom-5.14.7.2928.ebuild 5713 BLAKE2B 6baa601259759bfccb6d5da5433f8deb270cd0dce122e104b1e63c8973cf4a8072b599cc4bbef50c79b2741cca609b7e73ba83ccb61b6165d11d2948b0cff052 SHA512 229824e352ccf706ef6bac72a3697ba91f7613dbb328c917b22d068d95ac3754e726711eb79775ea826cc88e8e6d5f43248d4c28dd387f3ff38ed44869f192d0
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.14.2.2046.ebuild b/net-im/zoom/zoom-5.14.2.2046.ebuild
deleted file mode 100644
index 6c6cfdba4fb4..000000000000
--- a/net-im/zoom/zoom-5.14.2.2046.ebuild
+++ /dev/null
@@ -1,192 +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 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-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
-
-	make_wrapper zoom /opt/zoom/zoom /opt/zoom \
-		/opt/zoom:/opt/zoom/Qt/lib:/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)"
-	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.5.2430.ebuild b/net-im/zoom/zoom-5.14.5.2430.ebuild
deleted file mode 100644
index 6c6cfdba4fb4..000000000000
--- a/net-im/zoom/zoom-5.14.5.2430.ebuild
+++ /dev/null
@@ -1,192 +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 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-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
-
-	make_wrapper zoom /opt/zoom/zoom /opt/zoom \
-		/opt/zoom:/opt/zoom/Qt/lib:/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)"
-	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.13.10.1208.ebuild b/net-im/zoom/zoom-5.14.7.2928.ebuild
index 6c6cfdba4fb4..ca1f4dfb7b31 100644
--- a/net-im/zoom/zoom-5.13.10.1208.ebuild
+++ b/net-im/zoom/zoom-5.14.7.2928.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop linux-info readme.gentoo-r1 wrapper xdg-utils
+inherit desktop linux-info readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -160,8 +160,7 @@ src_install() {
 		fi
 	fi
 
-	make_wrapper zoom /opt/zoom/zoom /opt/zoom \
-		/opt/zoom:/opt/zoom/Qt/lib:/opt/zoom/cef
+	dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
 	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
 		"Network;VideoConference;" \
 		"MimeType=$(printf '%s;' \