gentoo resync : 28.11.2020

13 files changed, 16 insertions, 292 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index ae2fcca0da9a..e72591100ffa 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
deleted file mode 100644
index 83296ae87067..000000000000
--- a/net-im/kadu/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX kadu-4.3-compilation.patch 1149 BLAKE2B d5dd28cb8413f5880c839dda594ca650680e5665fae5ce75930a02cca4cd6aa6fc710f29a424db5781301d59b14e86aa049441fe85d97655c06bbce17772fb97 SHA512 d844930c008ec12a2ebd1e746b4167da7bb6417720aa9c5742edd3209400bfc595f03e0f4e9a772c66e80ed8ad4238c7fce000d6f1d0ccb4cd6912f71d1a5a2f
-AUX kadu-4.3-do-not-force-ccache.patch 635 BLAKE2B c1b29e41186a05ee7c34b7f2c349095c9e1a12584defd393a0952a6b6c5015ae401cd0a7b8d4579eabe05e4d771aabaa51fba3ccef49d05cf7c0ff702739f893 SHA512 d17b7a20d78c8446d845bdb80c4a110adb164d0dfaff52f5a67730a3e1d861f65ccb84d67d04cc7088169b6d3d56376c8c43b3c432795a273a0da5517eabd86b
-AUX kadu-4.3-find-x11-with-newer-cmake-modules.patch 2155 BLAKE2B 0709979d6c2e30a40f5e6de7f83c7ae1e991e639d85b30c0b012a736f6c4bf30b0b5f6e6f4f5ffdbf380bbff109709a8b2671a8f0237634c9809856d206e9a87 SHA512 861a5718990df106ec7edc408b29215b2bca0597bf1505fac49cddd3059da6228df82e98da752ce436e174f702d8996d5454ecf4a67fc1e05b6b284d4f341369
-AUX kadu-4.3-fix-plugins-rpath.patch 473 BLAKE2B 8b7c16e7acecb59798a52c514e9f472c13eeda3c005ae84026d13737362435d7381f302a48d87ec15853067bb1e46699803cdc3ba4de54aa1f67f0f4d3d84023 SHA512 af94cb0127abd7ffe6ebd9fea20d17efb835773a6e8194caddd07b736e84e2ee40da51b820ec38e8eb07de6755941b53ded07f9b8aa9a7acd28b612c3259f952
-AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8119b80f03d21f8d25def87a32380cb5291d31c3695d706e431fc3fc95c4a35bb8fda9c2c5a0324d257df SHA512 04911ccf7d414a4449634e164ab1c093baa8b05b189a252b8a61bf0f4ad9857e08780620c946524a2d0d4696a6785c0789cbe2ad6f87b2330a093d351df4f982
-DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9
-EBUILD kadu-4.3-r2.ebuild 2743 BLAKE2B 596bf99004d8435affddb5051f4f2c1536daf9bac35a4e052e1410b5cbf1581a8ee617614fc9c34eff8ba8bebeea0781af9b2edcecb0f00e4b8b9662054c6b2b SHA512 b167fc71bfc8777a8ed88f194f587de7bfacaa66041911e3de9f869ede3bdbe01bb803b2b21393eeeb781c039c56b6e43473763d6c807400641d47ae8aada11d
-MISC metadata.xml 578 BLAKE2B c6454fd583cf3ee9d55963cc482349eb236a46420d956ed7fe199721c81177e4f32c133279a49c71f5a5f64541efdb3ff8933753b3de868562b74a48eb7093c7 SHA512 23b011af6a0bcc235ca6685aeb1ec01cd9ef1e529fb5970860aab059fc1063d39d36446e3b86542ce303becc991e6250d58ec599aeddef6343382956c55a6c89
diff --git a/net-im/kadu/files/kadu-4.3-compilation.patch b/net-im/kadu/files/kadu-4.3-compilation.patch
deleted file mode 100644
index b9cd0c582889..000000000000
--- a/net-im/kadu/files/kadu-4.3-compilation.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp kadu-my/kadu-core/gui/widgets/avatar-painter.cpp
---- kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp	2017-01-24 22:36:21.000000000 +0100
-+++ kadu-my/kadu-core/gui/widgets/avatar-painter.cpp	2020-10-22 23:57:41.486490926 +0200
-@@ -22,6 +22,7 @@
- 
- #include <QtCore/QModelIndex>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmap>
- #include <QtGui/QPixmapCache>
- #include <QtWidgets/QStyleOptionViewItem>
-diff -ruN kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp kadu-my/kadu-core/plugin/state/plugin-state.test.cpp
---- kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp	2017-01-24 22:36:21.000000000 +0100
-+++ kadu-my/kadu-core/plugin/state/plugin-state.test.cpp	2020-10-23 00:06:51.167189202 +0200
-@@ -34,7 +34,7 @@
- 
- void PluginStateTest::newTest()
- {
--	QCOMPARE(pluginStateToString(PluginState::New), {});
-+	QCOMPARE(pluginStateToString(PluginState::New), QString{});
- 	QCOMPARE(stringToPluginState(""), PluginState::New);
- 	QCOMPARE(stringToPluginState("New"), PluginState::New);
- 	QCOMPARE(stringToPluginState("Invalid"), PluginState::New);
diff --git a/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch b/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
deleted file mode 100644
index 2511f3c42b99..000000000000
--- a/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ruN kadu-4.3/CMakeLists.txt my/CMakeLists.txt
---- kadu-4.3/CMakeLists.txt	2017-01-24 22:36:21.000000000 +0100
-+++ my/CMakeLists.txt	2017-11-03 03:00:07.005162047 +0100
-@@ -75,13 +75,6 @@
- 	endif ()
- endif ()
- 
--## CCache is cool stuff to improve compilation time
--find_program (CCACHE_FOUND ccache)
--if (CCACHE_FOUND)
--	set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
--	set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
--endif (CCACHE_FOUND)
--
- # Look above, DEBUG_ENABLED is always enabled in Debug configuration.
- # Enable it in all configurations when ENABLE_DEVELOPER_BUILD is on.
- if (ENABLE_DEVELOPER_BUILD)
diff --git a/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch b/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch
deleted file mode 100644
index ec44a0be7f55..000000000000
--- a/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN kadu-4.3/kadu-core/CMakeLists.txt my/kadu-core/CMakeLists.txt
---- kadu-4.3/kadu-core/CMakeLists.txt	2017-01-24 22:36:21.000000000 +0100
-+++ my/kadu-core/CMakeLists.txt	2019-11-22 02:05:51.381540018 +0100
-@@ -111,7 +111,7 @@
- list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES})
- 
- if (UNIX AND NOT APPLE)
--	find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes)
-+	find_package (X11 REQUIRED COMPONENTS Xutil Xfixes)
- 	if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND)
- 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xfixes_LIB}")
- 	else ()
-diff -ruN kadu-4.3/plugins/idle/CMakeLists.txt my/plugins/idle/CMakeLists.txt
---- kadu-4.3/plugins/idle/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
-+++ my/plugins/idle/CMakeLists.txt	2019-11-22 02:06:57.503381610 +0100
-@@ -15,7 +15,7 @@
- )
- 
- if (UNIX AND NOT APPLE)
--	find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver)
-+	find_package (X11 REQUIRED COMPONENTS Xutil Xscreensaver)
- 	if (X11_Xscreensaver_FOUND)
- 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xscreensaver_LIB}")
- 	else ()
-diff -ruN kadu-4.3/plugins/pcspeaker/CMakeLists.txt my/plugins/pcspeaker/CMakeLists.txt
---- kadu-4.3/plugins/pcspeaker/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
-+++ my/plugins/pcspeaker/CMakeLists.txt	2019-11-22 02:07:45.315719788 +0100
-@@ -15,7 +15,7 @@
- set (LIBRARIES "")
- 
- if (UNIX AND NOT APPLE)
--	find_package (X11 REQUIRED COMPONENTS X11)
-+	find_package (X11 REQUIRED)
- 	if (NOT X11_FOUND)
- 		message (SEND_ERROR "Could NOT find X11")
- 	endif ()
-diff -ruN kadu-4.3/plugins/screenshot/CMakeLists.txt my/plugins/screenshot/CMakeLists.txt
---- kadu-4.3/plugins/screenshot/CMakeLists.txt	2017-01-24 22:36:22.000000000 +0100
-+++ my/plugins/screenshot/CMakeLists.txt	2019-11-22 02:07:54.323972436 +0100
-@@ -30,7 +30,7 @@
- 
- if (UNIX AND NOT APPLE)
- 	set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras)
--	find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape)
-+	find_package (X11 REQUIRED COMPONENTS Xext Xshape)
- 	if (X11_Xshape_FOUND)
- 		message (STATUS "Found required X11 libraries: ${X11_X11_LIB};${X11_Xext_LIB}")
- 	else ()
diff --git a/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch b/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
deleted file mode 100644
index bb171af5f41b..000000000000
--- a/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN kadu-4.3/cmake/KaduMacros.cmake my/cmake/KaduMacros.cmake
---- kadu-4.3/cmake/KaduMacros.cmake	2017-01-24 22:36:21.000000000 +0100
-+++ my/cmake/KaduMacros.cmake	2017-11-03 03:24:17.827054622 +0100
-@@ -221,7 +221,7 @@
- 
- 	if (NOT WIN32)
- 		set_target_properties (${KADU_PLUGIN_NAME} PROPERTIES
--			INSTALL_RPATH "${KADU_INSTALL_LIB_DIR}/kadu"
-+			INSTALL_RPATH "${KADU_INSTALL_PREFIX}/${KADU_INSTALL_LIB_DIR}/kadu"
- 			BUILD_WITH_INSTALL_RPATH TRUE
- 		)
- 	endif ()
diff --git a/net-im/kadu/files/kadu-4.3-gcc7.patch b/net-im/kadu/files/kadu-4.3-gcc7.patch
deleted file mode 100644
index 097157f98c77..000000000000
--- a/net-im/kadu/files/kadu-4.3-gcc7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-+++ b/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
-@@ -20,6 +20,7 @@
- #pragma once
- 
- #include <QtCore/QObject>
-+#include <functional>
- #include <map>
- #include <set>
- 
diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild
deleted file mode 100644
index d2e585826dd9..000000000000
--- a/net-im/kadu/kadu-4.3-r2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils flag-o-matic gnome2-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client"
-HOMEPAGE="http://www.kadu.net"
-SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="+gadu mpd otr sdk speech spell xmpp"
-REQUIRED_USE="
-	|| (
-		gadu
-		xmpp
-	)
-"
-COMMON_DEPEND="
-	>=app-arch/libarchive-2.6[lzma]
-	>=dev-libs/injeqt-1.1.0
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXext
-	x11-libs/libXScrnSaver
-	gadu? ( >=net-libs/libgadu-1.12.2[threads] )
-	mpd? ( media-libs/libmpdclient )
-	otr? (
-		>=dev-libs/libgcrypt-1.2.2:0
-		>=net-libs/libotr-4.1.0
-	)
-	spell? ( app-text/enchant:0 )
-	xmpp? (
-		net-dns/libidn:*
-		>=net-libs/qxmpp-0.9.3-r1
-		sys-libs/zlib
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	speech? ( app-accessibility/powiedz )
-"
-
-PLUGINS='
-antistring
-auto_hide
-autoaway
-autoresponder
-autostatus
-cenzor
-chat_notify
-config_wizard
-docking
-docking_notify
-emoticons
-exec_notify
-ext_sound
-filedesc
-firewall
-freedesktop_notify
-hints
-history
-idle
-imagelink
-last_seen
-mediaplayer
-mprisplayer_mediaplayer
-pcspeaker
-screenshot
-simpleview
-single_window
-sms
-sound
-sql_history
-tabs
-word_fix
-'
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
-	"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
-	"${FILESDIR}/${PN}-4.3-gcc7.patch"
-	"${FILESDIR}/${PN}-4.3-find-x11-with-newer-cmake-modules.patch"
-	"${FILESDIR}/${PN}-4.3-compilation.patch"
-)
-
-src_configure() {
-	# Filter out dangerous flags
-	filter-flags -fno-rtti
-	strip-unsupported-flags
-
-	# Ensure -DQT_NO_DEBUG is added
-	append-cppflags -DQT_NO_DEBUG
-
-	# Plugin selection
-	use gadu && PLUGINS+=' gadu_protocol'
-	use mpd && PLUGINS+=' mpd_mediaplayer'
-	use otr && PLUGINS+=' encryption_otr'
-	use speech && PLUGINS+=' speech'
-	use spell && PLUGINS+=' spellchecker'
-	use xmpp && PLUGINS+=' jabber_protocol'
-
-	# Configure package
-	local mycmakeargs=(
-		-DCOMPILE_PLUGINS="${PLUGINS}"
-		-DENABLE_TESTS=OFF
-		-DNETWORK_IMPLEMENTATION="Qt"
-		-DINSTALL_SDK=$(usex sdk)
-		-DWITH_ENCHANT=$(usex spell)
-	)
-	unset PLUGINS
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml
deleted file mode 100644
index 6bf7f3370862..000000000000
--- a/net-im/kadu/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<use>
-		<flag name="gadu">Enables Gadu communication protocol</flag>
-		<flag name="mpd">Enables Music Player Daemon support</flag>
-		<flag name="otr">Enable char encryption via OTR library</flag>
-		<flag name="sdk">Install Kadu SDK (cmake module, API headers)</flag>
-		<flag name="speech">Enables speech module</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index f584250e93e6..cabbbe079bdc 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -10,5 +10,5 @@ AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3
 DIST prosody-0.11.5.tar.gz 425122 BLAKE2B d65720a0c9d533a4be70847b690ecf037ae4b2fcbd090c81e2346d515599f3f148061103df2ffe46122a55694a3d35d53ab2b379fb5fb317e3b84a0ff5e82c29 SHA512 43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff
 DIST prosody-0.11.7.tar.gz 429369 BLAKE2B 8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6 SHA512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20
 EBUILD prosody-0.11.5-r1.ebuild 2085 BLAKE2B 635d42bd9df55770be24797e63666c07e6c16f240be5a641164f29de52bbb3dd8e070f9cf708a947482267d592c27adc92f2dc64903d8cdbff7fc90be504420b SHA512 6b0fdfc3901f2227007408108e7f647218dbe5ea06aae3ffeb197b92837cdded1841f39a1bb990235149c7c7ae9784002e60b5fca1bc540f8ce27886a4514761
-EBUILD prosody-0.11.7-r2.ebuild 2255 BLAKE2B 3cf800b91388298466fab32cbfc1b641057e4c2ae1f70881c798eac63e6b14587503568ddfec8126281427a1685eb7c69125a63f3c4e1fd95942975b1360b747 SHA512 1c16147d722315050c6077e4886a7394eac85bf21ac51aa43a97de1818376356cd0e9d0b48cafe387dd8bdc3204b4e564c89545da045665e8af7edd288537ef4
+EBUILD prosody-0.11.7-r2.ebuild 2253 BLAKE2B db53ec761881b88b2ae04fbefcc9c926ed0618a9bfa92c84e17009e3cb2a0eb973da2b33a18346de57097950a951206ebde49e9dd4f99148e165415a055a5a86 SHA512 7bbfdf089dc78e1a16e94e1a3c0e4705ddbc0570e969a362ca338741c17ad14484857bc6bb01d6877bee7aeeab79172972bb855b09270094f9d0e03c77722186
 MISC metadata.xml 729 BLAKE2B e5e7c82e24858e3eb11b087a17c3e5d7ceebb7fbbdfa9d69346f26f341e422e0a109416ac062eeed750b0c29f93fd60608cdf41283cd7a1a90519217e9230bf3 SHA512 ecfdb898917fcc56b041ce93331e96708129172c7ff447cb7ead1636f83c4abee655fb8a166a81c9e97cc189363e1cea5e1ba08bf54a491f5e5c5a60c5b3cbe4
diff --git a/net-im/prosody/prosody-0.11.7-r2.ebuild b/net-im/prosody/prosody-0.11.7-r2.ebuild
index 9453002bf47b..fc250a5ce95b 100644
--- a/net-im/prosody/prosody-0.11.7-r2.ebuild
+++ b/net-im/prosody/prosody-0.11.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 arm arm64 x86"
 IUSE="+libevent libressl luajit mysql postgres +sqlite +ssl test +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 0248d4387df8..0922a379b6ec 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -8,5 +8,5 @@ DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971
 DIST zoom-5.4.54779.1115_x86_64.tar.xz 45216096 BLAKE2B a65c7db96ac0ea5a99b6edba0145d766395ebd67402f28ee276e1a2ed87ca9c9c01bedef12eb4d99a6525f0ec0698de1471c3ca620e32ec29ada5b8edd55416c SHA512 e859060592dc110ccb42760fff54f632b079124ff2b8988e55dfd27d70b132b035d6b0ef8eec83b7d90ddf56a6e675dac4d04c29bec9faab377db4926fb2462d
 EBUILD zoom-5.3.472687.1012.ebuild 2877 BLAKE2B e477df27c26d6b7db8026f8120437bf2db5388acfc0074c497e3a7777de258c25a0d2415f9af04dfc7d49b5b183e70d25b6c53885cd0b45d5d57f86e02105c29 SHA512 fcf0c2c6d8864c30746ecd724fde4147639a62df59d5681f0b5b69cb1552a8df8971e9ed69ee064e1313cc1db6f029fd598675c37982ea66d52a607d3e368933
 EBUILD zoom-5.4.53391.1108.ebuild 2907 BLAKE2B 2ffd91cf8d742abf204d28736f2a63d3de3c370f465bdae217abb3a105fc7119d48e885f00c60bfc3303d4a4b3f678f2d406638c9dcd6b97db11840b5ec3b5e0 SHA512 5342ac23469035178db2ff8bb889f056ea7274929951c54c5e3700e8da8b1c8de96e7f6ea5478ebdfd57ee6134ea799c270c453165ee71c3d83903dcdc86bf53
-EBUILD zoom-5.4.54779.1115-r1.ebuild 3900 BLAKE2B 33906c5a537a6ddb3c0e63f6870a3ea50bb044bc3f733f87c435d76d9c12f2637016bcfe2bbcff52fdbd7ef89e6450dbd27666b1cae9a8eb4f330cd2c9532c5b SHA512 624e27abc2ef8f2a3237216a7b8d5cc89f6f7dbc99b0265d3fd74b4f45afa0bdc8a250c0d9942c3a02943917cccaa25e4dcc3291c12b9528064cc3cdace67b98
+EBUILD zoom-5.4.54779.1115-r3.ebuild 4223 BLAKE2B e94321407cbb564771a8e739dd9fb80c6cb4cf206573ba2f4dff4280b659ad5996b21299490491c637ded79d2096242110ba429845c67b8f35e18bb3597e2a40 SHA512 1d4778df513c9be49862013123d7ac7fde014d7517ad40ab843c5c5692c7090a61261ab526e2ee3808fad655b371e8dd7b1898fcf54461337f85d67384c45807
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/zoom-5.4.54779.1115-r1.ebuild b/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild
index 388dc20478b1..70da5021389e 100644
--- a/net-im/zoom/zoom-5.4.54779.1115-r1.ebuild
+++ b/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eapi8-dosym readme.gentoo-r1 xdg-utils
+inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -19,6 +19,8 @@ RESTRICT="mirror bindist strip"
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
 	dev-libs/quazip
+	media-libs/fontconfig
+	media-libs/freetype
 	media-sound/mpg123
 	sys-apps/dbus
 	sys-apps/util-linux
@@ -27,6 +29,8 @@ RDEPEND="!games-engines/zoom
 	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
@@ -85,22 +89,25 @@ src_install() {
 		doexe libicu*.so.56 libQt5*.so.5
 		doins qt.conf
 
-		local dirs="Qt* audio generic iconengines imageformats platform* \
-			wayland* xcbglintegrations"
+		local dirs="Qt* 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/Scene{2D,3D} \
-				platforms/libqeglfs.so || die
+			rm -r Qt/labs/calendar Qt/labs/location QtQml/RemoteObjects \
+				QtQuick/Controls.2 QtQuick/LocalStorage QtQuick/Particles.2 \
+				QtQuick/Scene2D QtQuick/Scene3D QtQuick/Shapes \
+				QtQuick/Templates.2 QtQuick/XmlListModel \
+				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
 			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
 				platforms/libqwayland*.so || die
 		)
 	fi
 
-	dosym8 -r /opt/zoom/ZoomLauncher /usr/bin/zoom
+	make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "")
 	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
 		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
 	# The tarball doesn't contain an icon, so take a generic camera icon