7 files changed, 202 insertions, 106 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 0fafece8b633..3dcecc0fb6d4 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 47a1fabe8cf7..13e956e391d9 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,7 +1,5 @@
 AUX README.gentoo 469 BLAKE2B e7176c3fa41c859f13f93f2805bf317817de1c736b56a55a1cd21340b2195f1192a96c56ae973c347430f3553715e829420ef6e0d91b26835cf06d06b744b9ec SHA512 a800f5ae1f02a1574602c1595f005eeffbd2db6c100bb59f7a4cf9dbb0bea79bb3d1a17cf9559a09f318f4d8189ecfce964e594829228ab16f861b3c966c3f41
-DIST dino-0.2.1.tar.gz 514504 BLAKE2B 42fae18bb7cda276c1eadeefdea130069f9929dfde62855f00ab6b88912fe9db3374315f40ff8f53350cf38e45fe61b0fd6256ef390cdbed6a65a3f2d79ac80a SHA512 b71497ec115945eadf7d33bb973f68465a20284aa75f37f1ae25fc30c1c423ce28cb10f7e9123c47f82e77e97170b8fa72c75389dacc3a2aa3d487a9c9610d49
 DIST dino-0.3.0.tar.gz 804810 BLAKE2B cb6365f6fad051d0308909c6d5d2c59d7f57cb94f9f691516e27b7bb3aba214fdffa95066d8203d8ac5bd770bec1580e81baad313beef7fe5c058e1e94a37556 SHA512 e3d885208451b00b0416a1401780a94a169fb1179b2f609f7965e3445873d6b72ded84cb471d534616892ec89b5edcd6701fc97c36f19d690f4b894399000515
-EBUILD dino-0.2.1-r1.ebuild 1648 BLAKE2B 150bac4ae70f62ebba4fc17c74e7f400c195bad7205daebe72bf2ae695659e919ce37b10545aeec1e9359406d73e58f6a2d3806dddd09741fb261da9841c1b13 SHA512 c3a105eec2b2913c297d3c908048eb7ce5b0e81f413ac5b5e95f115695af2dcf8a0d3763d57bfab8203ce8a43cc42db43a8752e2ecd741c5e1c31bb8a58c5e46
-EBUILD dino-0.3.0.ebuild 1892 BLAKE2B 5424bd785ec797c34092dd3b4d69639b8a32f2669c68781e341a9e198535fb7cd4fcb08bd1cc0798609278f9b8d5b965fe78302a5429231b600485c8c7a8829d SHA512 4b15623e992fc58140017bd059791eaeab69e2cebc022c45f1e84cdd7dd41415df60dd50bdf9add989edaa52886872ec113602455f1dd0a8c3374b52a2bb3c33
-EBUILD dino-9999.ebuild 1893 BLAKE2B 33d8b7c7aab50b175857a8cd6b91c8dc7e7f65ba5fc6400a0aa3e12893a53fd3b48ba41fa5f5693645077cd777eb62e9b9b5008724657fb11d3576a7f7f97a71 SHA512 19777fe692826943cbc08f6e30f6db9991853fccb85ea3f9e6f370654be8beb477de4c816658946214af067fa8bf399b5a7ca989485c10b6b37c9946bf387305
+EBUILD dino-0.3.0-r1.ebuild 1799 BLAKE2B d2c0e7bb9ecd9185f580c0f622c66332644eeff4d15dbfc62435191ba767863466a0aeedbf5f7887e9671fa897510e261ba8fdbd75dba24050ae92f91081b67f SHA512 abdc7777a6fcf0cc2c6402e97e435ecb74000f23549157fea776fd8dfa3e1677331687a262983d18a08e4f74117e83ec3684892c26d48833b54d54271cb4bca5
+EBUILD dino-9999.ebuild 1801 BLAKE2B 414a8038427ba106c0d8a8ca9d1f598c938b7d6fc5b60e0734c30311a64899024cefc3acb211380d3456334ad447a46cdcae07ff9d937e1302448259b9518bd2 SHA512 f7b222216252293487861dbeb4532b2905e715439367fb7f150d98703b754025827dced08f8a6ddd7666f237e5d94fbe22e13f14309845c3b76839d6d737899f
 MISC metadata.xml 558 BLAKE2B 1919999f5db1e35767a65c41292d7ea6526b5fba2d82f31bce41be63bafe8f879362fccde247f88c23d1a2366c28ffd424243141a7d6b0b8b388621a807d1772 SHA512 2981c0cec70476a8add6c4ef5bbe0e0a0c327383b81b3e208894020d4526bee6166395dc9c1ff5244fef337e90f2456c20a35df972a8814edbd045a82e0eced8
diff --git a/net-im/dino/dino-0.2.1-r1.ebuild b/net-im/dino/dino-0.2.1-r1.ebuild
deleted file mode 100644
index 4a660b77b34b..000000000000
--- a/net-im/dino/dino-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-VALA_MIN_API_VERSION="0.34"
-inherit cmake vala xdg
-
-DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
-HOMEPAGE="https://dino.im"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+gpg +http +omemo +notification-sound test"
-RESTRICT="!test? ( test )"
-
-MY_REPO_URI="https://github.com/dino/dino"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="${MY_REPO_URI}.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm64"
-	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-RDEPEND="
-	app-text/gspell[vala]
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/libgee:0.8
-	net-libs/glib-networking
-	net-libs/libsignal-protocol-c
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango
-	gpg? ( app-crypt/gpgme:= )
-	http? ( net-libs/libsoup:2.4 )
-	omemo? (
-		dev-libs/libgcrypt:0
-		media-gfx/qrencode
-	)
-	notification-sound? ( media-libs/libcanberra:0[sound] )
-"
-DEPEND="
-	$(vala_depend)
-	${RDEPEND}
-	sys-devel/gettext
-"
-
-src_prepare() {
-	cmake_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local disabled_plugins=(
-		$(usex gpg "" "openpgp")
-		$(usex omemo "" "omemo")
-		$(usex http  "" "http-files")
-	)
-	local enabled_plugins=(
-		$(usex notification-sound "notification-sound" "")
-	)
-	local mycmakeargs+=(
-		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
-		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
-		"-DVALA_EXECUTABLE=${VALAC}"
-		"-DBUILD_TESTS=$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}"/xmpp-vala-test || die
-}
diff --git a/net-im/dino/dino-0.3.0.ebuild b/net-im/dino/dino-0.3.0-r1.ebuild
index 096c50a08a58..3dbdd954e2be 100644
--- a/net-im/dino/dino-0.3.0.ebuild
+++ b/net-im/dino/dino-0.3.0-r1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR="ninja"
-VALA_MIN_API_VERSION="0.34"
 inherit cmake vala xdg readme.gentoo-r1
 
 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
@@ -20,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="${MY_REPO_URI}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 arm64"
+	KEYWORDS="amd64 arm64"
 	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
 fi
 
@@ -47,19 +45,18 @@ RDEPEND="
 	notification-sound? ( media-libs/libcanberra:0[sound] )
 "
 DEPEND="
-	$(vala_depend)
 	${RDEPEND}
 	media-libs/gst-plugins-base
 	media-libs/gstreamer
+"
+BDEPEND="
 	sys-devel/gettext
+	$(vala_depend)
 "
 
-src_prepare() {
-	cmake_src_prepare
-	vala_src_prepare
-}
-
 src_configure() {
+	vala_setup
+
 	local disabled_plugins=(
 		$(usex gpg "" "openpgp")
 		$(usex omemo "" "omemo")
@@ -87,7 +84,7 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
-src_postinst() {
+pkg_postinst() {
 	xdg_pkg_postinst
 	readme.gentoo_print_elog
 }
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index dcefefcd1c83..5362d42a0864 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR="ninja"
-VALA_MIN_API_VERSION="0.34"
 inherit cmake vala xdg readme.gentoo-r1
 
 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
@@ -47,19 +45,18 @@ RDEPEND="
 	notification-sound? ( media-libs/libcanberra:0[sound] )
 "
 DEPEND="
-	$(vala_depend)
 	${RDEPEND}
 	media-libs/gst-plugins-base
 	media-libs/gstreamer
+"
+BDEPEND="
 	sys-devel/gettext
+	$(vala_depend)
 "
 
-src_prepare() {
-	cmake_src_prepare
-	vala_src_prepare
-}
-
 src_configure() {
+	vala_setup
+
 	local disabled_plugins=(
 		$(usex gpg "" "openpgp")
 		$(usex omemo "" "omemo")
@@ -87,7 +84,7 @@ src_install() {
 	readme.gentoo_create_doc
 }
 
-src_postinst() {
+pkg_postinst() {
 	xdg_pkg_postinst
 	readme.gentoo_print_elog
 }
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 5859724cc52e..8d25c6b18bf2 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,5 +1,7 @@
 DIST zoom-5.12.9.367_x86_64.tar.xz 142836028 BLAKE2B ef38a72239e615031878812774981ea8812ec7306b71d6c43530dfa6fde0a72dc25b2f844836bdc8de7f426627b8e986f59df45888730f06b24d1371130a0664 SHA512 76becf360fe954219917703cdf16017fdf9ffbf58329fd26b1541f03d1f288b079e08c1c40d4efcf6f2f43a41f4d3343d93943c48a006606fb26c8da06982f21
 DIST zoom-5.13.0.599_x86_64.tar.xz 147717988 BLAKE2B bd677b7ca17e1b5225b05ac54b1787fc87aa0b75137369f4787cdcde422bff83f927289801c84908a6c82094e49498b308157adc8969710229ee29831d9f7f73 SHA512 db3955c2c9e7accc38c3fbacedcad95c2be304fae39316db447d570d228c25251bbd4d1c64972671f7b71997fa10ea8f312a3c70a98e98c41abb6f1cbf2c1663
+DIST zoom-5.13.3.651_x86_64.tar.xz 147702176 BLAKE2B d8e78f455151f0406aa39d9485e9e966fec31e28683685697cb623aad933371f4d4525ab855c9ddb2c3014def1b131a75794db354a6ffd893e5fc352df16b83e SHA512 01177a16b3cff7d6e66f55e30f7dd1b0f612dfab14b7b27239d6c1362d37d12d3641aae57a123450e3b8ec7e126582cd99f90b35f51349db1190fc79e5e6528e
 EBUILD zoom-5.12.9.367.ebuild 5336 BLAKE2B abf15f91b886ad1cf02a6d3222026e8dc1afaee7fe03cffcac5313741ae958742793974dacaf1972eacf604842a608c85f7b0b3d3147b1cb7b0900901a6ac6bc SHA512 54662cdd9a68ea573b66c9cf578019af3615f0efb73e74e4ff7df919309f5c1f70187db156fb076a7acd6009b156234bb62e7f867bab4af7e893b8690cdbec41
 EBUILD zoom-5.13.0.599.ebuild 5355 BLAKE2B 8e4b08488f92056e1ccbb3cedc164372afb150fc68fe1fb515f4c3ee5728195d00b3849e03358886aa957ccda6a5046445f8a2ccbca6e1d876af08500e62c788 SHA512 b282c350b35437063be2f40522c88a08bca352e8154e7aa38613c1b23fadc2ad8c97585c6bb1b2a99e8adb7774f057850efe6cc92835412c8fc3e6768f47ce36
+EBUILD zoom-5.13.3.651.ebuild 5355 BLAKE2B 868c0231b7a269811c63c4ca1ddceb91e2ecbbd76f77f6665ab08364e7472f3aac49a0d7e56289f363e54cac111f509d63f333beb62b5d719ea0d14d1ca73f81 SHA512 671b28752d67846c968a58b731b25bd4c6d5fea0fc1c2fb52f0947f50cddfec50b5813c3160788680547f4a260b2c4edc3267f31cd6e09ef7ea96cdd01d2c761
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.13.3.651.ebuild b/net-im/zoom/zoom-5.13.3.651.ebuild
new file mode 100644
index 000000000000..357c8dd347f5
--- /dev/null
+++ b/net-im/zoom/zoom-5.13.3.651.ebuild
@@ -0,0 +1,181 @@
+# 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
+	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
+	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
+	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
+		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)"
+	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
+}