gentoo christmass resync : 25.12.2020

19 files changed, 256 insertions, 256 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index e60f22ded410..cda40f58e0ad 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index 30a0e9d3aff2..1550a9d5699f 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,3 +1,3 @@
 DIST centerim5-5.0.1.tar.gz 764152 BLAKE2B 658db040b539a93d4d45e6e05ae57d209c26008ff2061fa3cae0aa4dfd87ca2f4ee78ca0004cd42e14c9f57b124c885f685028332dcb5b2f4e3bf52cab99f796 SHA512 8d9e7cbb1abc3ed8cd91761ebe9a2355c2e39b59cab23de0ad4bfbbf35f4bce062fee5d01b8239d839fc5cef0c74b31187ab1a85a39c46ef679bfc86e628281f
-EBUILD centerim-5.0.1.ebuild 828 BLAKE2B 443f747c2662d93b3e6ebfb9ebaf6f822a24d01ccb5bfe5be1a4b53940fd26555c30f9d339ef45ed0fcaa3d0232a13f891600a390d4b3583b24ab40293e956c5 SHA512 4c37d96b602909a1f4d53e13b6c0afbb2cb9d4c5af9674406e9e0e47bdd0236ef8859cf8c84b5b836b3db0f97b7a71508b40febcdd5e2c2b9a60364a1874d49c
+EBUILD centerim-5.0.1.ebuild 825 BLAKE2B 05e533ce2706af15c1dcf0046da0330d56a6364af0e5e1146217658e2a8944056de5fc2f9b5f62a5b26788159fa269e929355ff2e370c21232891f520ea15ecc SHA512 d621e2c6830aaf60a3894185d9b7fd037b36230c01fee4789ff3824a122f86c5d143a81ec6c052dca552219129033cac3e349fb7840a196328ca2b4b058f13e1
 MISC metadata.xml 216 BLAKE2B ae57b2cbb77ea0f339def04d78473e893d23e5405111b157ba634b09170615c5695970633e0db7f9378eacde7f138a0126da1f278fa634f752d7affcf7a7cfed SHA512 7900b095d94bac2c3c6ed7015ef8c2b695a91762c4800cd2cb6577ff5e2654a107d6b3eed464c16fe1685e23d79071c798d7505cb2789390cd9ca75996330f1f
diff --git a/net-im/centerim/centerim-5.0.1.ebuild b/net-im/centerim/centerim-5.0.1.ebuild
index e0696b895232..1237f60626bb 100644
--- a/net-im/centerim/centerim-5.0.1.ebuild
+++ b/net-im/centerim/centerim-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index d82db600d504..2e73ea0792ab 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -2,8 +2,12 @@ DIST mattermost-desktop-4.5.1-linux-ia32.tar.gz 104826424 BLAKE2B c2d29b5ba463d7
 DIST mattermost-desktop-4.5.1-linux-x64.tar.gz 103238742 BLAKE2B dc7e9e2358cb9d82a080fca3082abff38a7850b5cb66cd47d8c111963e2980445f6767ee1f1cdcfedb8b8ff399bf20467de898ff7cc1e7b415e9d999d835e362 SHA512 7b1504c957ee30b2f3faa091556c30ac2e5a8cfd7595282e51bc616a74b2da76a6b363ebc56809c6bfdb931d08ae75360ef85bf6a6abe00c40ccccc14754e0bd
 DIST mattermost-desktop-4.5.2-linux-ia32.tar.gz 104826222 BLAKE2B f0552069099e548b4eff29a8dee8b830ebdba7aeab708748a242776a5d758be2253e8e2bbfe8f0b4eda5d0c25cad46fa7e7728233007f76102ef7b271a0280a5 SHA512 21943587b00585ab103213726de16bd010a013be2d780a9b1bad1ffb2bbcc23bff0cab76699bebb324e950b7d321df1d657cdbb8f889d670bfb7d8ca961ee652
 DIST mattermost-desktop-4.5.2-linux-x64.tar.gz 103238897 BLAKE2B 46e56c55409db645ba0962a816f584610decea4696c182e66544d2085d5b420019aed7d2680c5a90b7bdd293f9549be81508d24f79d409446918f862bfeca474 SHA512 f22938b629840dd6e8fbdec5e6ae6fdadaa0eae0fb727a063ef1539a3a0a625d61dd8468ea8cf45732a8f3b2c6da002dceed2b287aa75b14d09a03268f967eb4
+DIST mattermost-desktop-4.6.1-linux-ia32.tar.gz 116278144 BLAKE2B 737089a5454c8d8bc87cfefc68d4fbe5036287f2b8c4e92d8cdc000b481996641cc22c7aec1915bac0bd21f0fc2c2019e0e6d011070879cda25f566716f0c193 SHA512 8a2b7369fedf4cfb28bb5e54b2fa61bdc22ceda4ae01753a4259581856ba71459d4c2bea238d2e9aba8fe1c11bddfe6e45f1e470e99e7ca642058605c5589453
+DIST mattermost-desktop-4.6.1-linux-x64.tar.gz 114688536 BLAKE2B 68be76641eeb0e073388ce6cbd6987903ff0a4a0e266ac1e27fa977dff7e1354ac226d1f19b43b4f07d0d731ea92ded2585b2744f68263ff57751f059703a0c2 SHA512 ed24ad4e33c88ae55440e8aa5f57e4e83f022b22ccb488146507707a79cf403895066be6b43dcaeb34217ddf0df4e1d02c3a8128bf8568d7b4be94a4e51bdd06
 DIST mattermost-desktop-bin-4.5.1.tar.gz 1653861 BLAKE2B 2ad02df830cd2b62a730e8c6b385a739cfa7be30765ee4245f92e7a3db194ea03863490b337d03d47357f0d18ec31dd34fcde4576b93c80702e716ae9fd772a7 SHA512 6e2269de681ec416be2354ff8ee37d219ede4b10361e6a3669cc4e93e9ab06cd6a198dece05411756fdea271e55cafb94ad29161801cc55b5dae02b99b24ccab
 DIST mattermost-desktop-bin-4.5.2.tar.gz 1653801 BLAKE2B fac573ce27cd693489a173d3b90480476e569a7d0c435a53e44b075fc96a56720558e1e555c5a587f0fb7bed06b7f5e53c11728280804e812ee2090adc6d96d3 SHA512 69148aa9de18f6dac78450dc0b79630e9ea1552027ed46f6d03aca02ae57342b251a236f4c3ed6b9145e050be38d7748820bc4dd9f36f300c59940b7c2db7827
+DIST mattermost-desktop-bin-4.6.1.tar.gz 1702070 BLAKE2B 1c8f0c21add6563f6cca51bea37c25f41ba2e00daed7101b3d937941b12cef2e34cfb958a2c83c9641e08b99dd99d4784196e71cdc98227a66d6f2a31ee35219 SHA512 ee16e27cd836a49c8329397ee70d0d61e72c1295dcc2329e235cd813ac2583394d24e7d0d40c8c6d47dc85c5c900a22d3b96bd3b4f0262224443e5232d2b2102
 EBUILD mattermost-desktop-bin-4.5.1.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
 EBUILD mattermost-desktop-bin-4.5.2.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
+EBUILD mattermost-desktop-bin-4.6.1.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
 MISC metadata.xml 250 BLAKE2B 8611f4d73e35bd0d1118f324a7f3e5a50277fe6e0eafa82c39438dc4ae44bc64dc85a28e85286987c724d4cfa528063109cb78984eaf10f08bcc60962750a9ba SHA512 b24a6971fcb3eb7c99a0229fcf084abb689b21b48f29d3634aac103977460011b0a58fc298d1432671520e94a94ef19570f7831fd181b5ea51a0155d47222d0b
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.ebuild
new file mode 100644
index 000000000000..0f1c0d6f81df
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%-*}"
+
+inherit desktop eutils
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+	https://github.com/mattermost/desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	gnome-base/gconf:2
+	dev-libs/atk:0
+	dev-libs/expat:0
+	dev-libs/glib:2
+	dev-libs/nspr:0
+	dev-libs/nss:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib:0
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-print/cups:0
+	sys-apps/dbus:0
+	sys-devel/gcc
+	sys-libs/glibc:2.2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11:0
+	x11-libs/libxcb:0/1.12
+	x11-libs/libXcomposite:0
+	x11-libs/libXcursor:0
+	x11-libs/libXdamage:0
+	x11-libs/libXext:0
+	x11-libs/libXfixes:0
+	x11-libs/libXi:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXtst:0
+	x11-libs/pango:0"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+"
+
+DOCS=(
+	NOTICE.txt
+	LICENSES.chromium.html
+	LICENSE.txt
+	LICENSE.electron.txt
+	README.md
+)
+
+src_unpack() {
+	unpack ${A}
+	use amd64 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" "${S}"
+	use x86 && mv "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" "${S}"
+}
+
+src_install() {
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins resources/*.asar
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+	exeinto "/opt/${MY_PN}"
+	doexe *.so "${MY_PN}"
+
+	dosym "../..//opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	newicon "${S}/icon.svg" "${MY_PN}.svg"
+	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+	einstalldocs
+}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 51197747e424..7868c05f46a9 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -10,6 +10,6 @@ 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 2077 BLAKE2B 9a9d47dfac9398016f1dc4eeb2ff6b2d7add27b473780ea24c5a0b2f16b8fd7dbcbdce2c99080a0b4ffed755851963aa83d4f4dd3dc63e39fc94e8d53ccf9274 SHA512 17fc6249e43a5ea35e3819a40e6816fb1677efc5b2a6818a12ae04f7686a8583bb11338e0bb584a97a3ace1340186e2fa79ff6e5d416b989ed810e617f40250b
-EBUILD prosody-0.11.7-r100.ebuild 2961 BLAKE2B 05c2b8d6ccc33c81be35dfd7468b0797419d2d1ded35de5c8e92965011a9dd70b35c1f4f998362151bc482dea04ae263bf0197a8334a1d7e48a47b9116881099 SHA512 1007f0a5fce4690965309ba36adec6b4cf1dc332fcba41f11855e9ddaa93ec734c0a72137ce11bc0310644194e9274c5f8cdd96a615cad258f5db0d728bb0144
+EBUILD prosody-0.11.7-r100.ebuild 2909 BLAKE2B 4184d057091d5700914ea7a62d8261e763c35bf52dbc5b6e7cd76f5ab86c7de9826a191c3517e6625dc4558deff2612c2cf5ffa032adc4041b39714584fcd2cc SHA512 8f21e646a7e8d09bdef52363f08ad8fbcac10575cb67eab4bf90c0b2455e25af87414bee88bab025102099edcbefb3489720020a91dc26b94aef29e968b7feb7
 EBUILD prosody-0.11.7-r2.ebuild 2270 BLAKE2B 4436848267a4244a1b596d25381974510d654e06e9c011ddd12ccacf801ee1746165f30835e0edfe80c20a2df8ae76dc0daa0d443c0ae92c0ec6a88a78bbbeda SHA512 688bb5480ce3ecbc23e41bce8242fb713ac9ebe924a6d51fa16f40cc7be88088b9e653581b45653a3ac072ad23167eec895a9e8be944c1c21876ee1f498b115d
 MISC metadata.xml 729 BLAKE2B e5e7c82e24858e3eb11b087a17c3e5d7ceebb7fbbdfa9d69346f26f341e422e0a109416ac062eeed750b0c29f93fd60608cdf41283cd7a1a90519217e9230bf3 SHA512 ecfdb898917fcc56b041ce93331e96708129172c7ff447cb7ead1636f83c4abee655fb8a166a81c9e97cc189363e1cea5e1ba08bf54a491f5e5c5a60c5b3cbe4
diff --git a/net-im/prosody/prosody-0.11.7-r100.ebuild b/net-im/prosody/prosody-0.11.7-r100.ebuild
index 1afc7fa76fc2..293afb94e60b 100644
--- a/net-im/prosody/prosody-0.11.7-r100.ebuild
+++ b/net-im/prosody/prosody-0.11.7-r100.ebuild
@@ -70,7 +70,6 @@ src_configure() {
 		--libdir="${EPREFIX}/usr/$(get_libdir)"
 		--linker="$(tc-getCC)"
 		--lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
-		--lua-version="$(ver_cut 1-2 $(lua_get_version))"
 		--no-example-certs
 		--ostype="linux"
 		--prefix="${EPREFIX}/usr"
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index eb39926a8fdc..5c8fdc42422d 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,5 @@
-DIST skypeforlinux_8.66.0.74-1.x86_64.rpm 115074997 BLAKE2B 84b1ff85d3be0279879bd0d53eec4ead09170806f726c1dd81c91a9348d9d4c72486f50b3917b263814c0215411f9a9ee1fd3eb356a930e29d1ee550d811eb24 SHA512 db10e658f977b6293150252cd0018baaf17ed1d64978f3b7b171309921928de0cef275cec15819e38a9c3be47101067070695311ef63fa5fa47cf9ba95e9af45
 DIST skypeforlinux_8.67.0.87-1.x86_64.rpm 113618026 BLAKE2B e6b69afba83848b25f1e3d9588f6b9950e28a21ec5d99aa3f6ee2438b66f03e80bf106424d5f970a273276e7d588e8e55adf1012e3839076ffcbf834c5649b03 SHA512 936ba0b3d8811ce1d308bb63708a63ccdea3c5765c0631248d32cd4bfffe8ee7cc98744aaffb3ed13bdb7433d7a81cfe8e2f769c60dd232a5924681a17c5bf94
-EBUILD skypeforlinux-8.66.0.74.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+DIST skypeforlinux_8.67.0.96-1.x86_64.rpm 113616838 BLAKE2B aecf6d8f24836d2d6ef23b80b79796cbe5e309af862eac5e8caa0436e6cc8f10de5fd6337901c70a4b5b5c6cc3d7d15f6b0225b86187db800c8374762adf0313 SHA512 8d1c35026bbe90a2492f3ac88cc8fb2f098258050cf263121a06b9c9e048bda18774582d669d9a9177d8cfcaaa66a615b206587e74b371ef80b089dfecbb9a2e
 EBUILD skypeforlinux-8.67.0.87.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+EBUILD skypeforlinux-8.67.0.96.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.66.0.74.ebuild b/net-im/skypeforlinux/skypeforlinux-8.67.0.96.ebuild
index c2755ee5b06c..c2755ee5b06c 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.66.0.74.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.67.0.96.ebuild
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 8915ca7a2424..28aaeee8d6b3 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -3,6 +3,6 @@ AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8
 AUX swift-4.0.2-qt-5.15-compatibility.patch 245 BLAKE2B 77facc560f6cea3dedd7c3095b6e5d7a91ff956b80022dc8a27c93edac72884bfd7f484fc84052a47bccb184f4225eb90fcc3d30f925ee15e18d5c97037a0b16 SHA512 9e8adaec0e7b1e727a2f91a675eaea4f62b7f8a53fdbaaf2adf9e13d57a1df15e921f1aa1b876561c7eecd1a4602763a52b3e875cecebe139d6e338df1001b12
 DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
-EBUILD swift-4.0.2-r100.ebuild 5049 BLAKE2B b07dd02728d4fb65737389776fae9baa58b794d99321743c7a297c75ecd4948939434ced0936b33f83c44d7910b42957d1ef26f2551a2de900d5d8c6aba901ef SHA512 2408c703ec8fee9af7da03a67e7420bce2f3de7548858d5031393b27e1d43e6ce4ba25864f32fc523d956169273e188891eb2ee0477d7808d809cd34671d076c
+EBUILD swift-4.0.2-r101.ebuild 4209 BLAKE2B 1ea12e41d23960c801c7cc1cb1c40756e96d6d390fdba842722b980f108ffde9983ddd19c42d90e2a33fc9d9b6400281ca4fd07b1e67ff6afdb5358bc6e92494 SHA512 ed7171dd6dd363e0fa96a1a222902737e5c86af6db6fe27dd8d9bd2c99ef8c245dccd8aeef17e6ff6d37fc6407e9fab66551d7d52c028c280910db37a33e71ae
 EBUILD swift-4.0.2-r4.ebuild 4658 BLAKE2B 468c37828f1d27097846b64fe22107b77e9f90ce169fc6faf6ece26d66c6792a84b264e086f4f9730e7f39a4e14438f37a295e1a42803507200e809251976370 SHA512 681f9e8d9dcff75952128dd7eca37a15b6936f2c2b0961a465134a0e0a62fe0e8c9a1feac205c9d044ea60bc6177c3cb49870be6f6f3dc4017b4d95d8965704d
 MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/swift-4.0.2-r100.ebuild b/net-im/swift/swift-4.0.2-r101.ebuild
index c41fea304bf0..ec9222bf927d 100644
--- a/net-im/swift/swift-4.0.2-r100.ebuild
+++ b/net-im/swift/swift-4.0.2-r101.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..2} luajit )
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit lua-single python-any-r1 scons-utils toolchain-funcs xdg-utils
+inherit lua-single python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
 HOMEPAGE="https://www.swift.im/"
@@ -17,12 +17,10 @@ SRC_URI="
 LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
 SLOT="4/0"
 KEYWORDS="~amd64"
-IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
+IUSE="expat +icu +idn lua test zeroconf"
 REQUIRED_USE="
 	|| ( icu idn )
-	gconf? ( client )
 	lua? ( ${LUA_REQUIRED_USE} )
-	spell? ( client )
 "
 
 RDEPEND="
@@ -32,31 +30,16 @@ RDEPEND="
 	net-libs/libnatpmp
 	net-libs/miniupnpc:=
 	sys-libs/zlib
-	client? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		net-dns/avahi
-	)
 	expat? ( dev-libs/expat )
 	!expat? ( dev-libs/libxml2:2 )
-	gconf? ( gnome-base/gconf:2 )
 	icu? ( dev-libs/icu:= )
 	idn? ( net-dns/libidn:= )
 	lua? ( ${LUA_DEPS} )
-	spell? ( app-text/hunspell:= )
 "
 
 DEPEND="
 	${RDEPEND}
 	>=dev-util/scons-3.0.1-r3
-	client? ( dev-qt/linguist-tools:5 )
 	test? ( net-dns/avahi )
 "
 
@@ -77,8 +60,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+	lua-single_pkg_setup
 	python-any-r1_pkg_setup
-	use lua && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -97,12 +80,9 @@ src_prepare() {
 	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
 
 	# Remove parts of Swift, which a user don't want to compile
-	if ! use client; then rm -fr Swift Slimber || die; fi
+	rm -fr Swift Slimber || die
 	if ! use lua; then rm -fr Sluift || die; fi
-	if ! use zeroconf; then
-		rm -fr Limber || die
-		if use client; then rm -fr Slimber || die; fi
-	fi
+	if ! use zeroconf; then rm -fr Limber || die; fi
 
 	# Remove '3rdParty', as the system libs should be used
 	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
@@ -149,7 +129,7 @@ src_configure() {
 		distcc="no"
 		experimental="no"
 		experimental_ft="yes"
-		hunspell_enable="$(usex spell)"
+		hunspell_enable="no"
 		icu="$(usex icu)"
 		install_git_hooks="no"
 		libidn_bundled_enable="false"
@@ -157,20 +137,20 @@ src_configure() {
 		libnatpmp_force_bundled="false"
 		link="$(tc-getCXX)"
 		linkflags="${LDFLAGS}"
-		lua_includedir="$(lua_get_include_dir)"
-		lua_libdir="${EPREFIX}/usr/$(get_libdir)"
-		lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
+		$(usex lua "lua_includedir=$(lua_get_include_dir)" '')
+		$(usex lua "lua_libdir=${EPREFIX}/usr/$(get_libdir)" '')
+		$(usex lua "lua_libname=$(basename -s '.so' $(lua_get_shared_lib))" '')
 		max_jobs="no"
 		optimize="no"
 		qt="${T}/qt"
-		qt5="$(usex client)"
+		qt5="no"
 		swiften_dll="true"
 		swift_mobile="no"
 		target="native"
 		test="none"
-		try_avahi="$(usex client)"
+		try_avahi="no"
 		try_expat="$(usex expat)"
-		try_gconf="$(usex gconf)"
+		try_gconf="no"
 		try_libidn="$(usex idn)"
 		try_libxml="$(usex !expat)"
 		tls_backend="openssl"
@@ -184,10 +164,8 @@ src_configure() {
 src_compile() {
 	local myesconsinstall=(
 		Swiften
-		$(usex client Swift '')
 		$(usex lua Sluift '')
 		$(usex zeroconf Limber '')
-		$(usex zeroconf "$(usex client Slimber '')" '')
 	)
 
 	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
@@ -205,7 +183,6 @@ src_install() {
 	local myesconsinstall=(
 		SWIFTEN_INSTALLDIR="${ED}/usr"
 		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
-		$(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
 		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
 		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
 		"${ED}"
@@ -214,16 +191,6 @@ src_install() {
 	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
 
 	use zeroconf && dobin Limber/limber
-	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
-	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	use client && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use client && xdg_icon_cache_update
-}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index 664c6f29d586..b595ba760514 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,3 +1,5 @@
 DIST teams_1.3.00.25560_amd64.deb 71805276 BLAKE2B b39d8f62653d303451e306290bdf0ea492b59b84fc87abefc8c9cbdf5462a917247d7dd9eda8c9c51e70e5ce3bc2db6ebd1eeda1c6b16c372cf154a8d81166aa SHA512 91f90f321118faef0d1a619feb213f0d8af9380a75fffa01b3fcc62570c5a2984cbfc415595e5fabc4f683250517a88064b038897e476410709b35de770c8043
+DIST teams_1.3.00.30857_amd64.deb 76334658 BLAKE2B 486ee2945f46e7a7c7bfe1d2a6edf29f8cac5a7827c0a8bcf121d25ce95fde2caf31fed520c2f036e27b399c986ac1acc1531aaa1a9caf5a5d6848b10ac0d204 SHA512 5a8be75bfe752347bd36bf2abc2de74ad069cbf4a6430bfcad9ca7396d5b5bf8196a74798a0595908a33ebcb2fcdbedc403c7ff31eec76d07246a3d1c46eeab4
 EBUILD teams-1.3.00.25560.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
+EBUILD teams-1.3.00.30857.ebuild 3066 BLAKE2B ef03a90372ff5656324941c85a914e88b34afe53559e23a72e1a9c7a7a0c575328fccc07d91ff05a5598bce3fcea8a2a7b429c2e8088b6fd3761c00bc666b1c4 SHA512 296f01c8cccc3b2336be234f91339b44016c41c8eb21e0d988e4b027f6ca53b429c97a4add3fd83fe67a1474c37e1b8b6d8134b3ea45c6de2b76cda0c938ed76
 MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
diff --git a/net-im/teams/teams-1.3.00.30857.ebuild b/net-im/teams/teams-1.3.00.30857.ebuild
new file mode 100644
index 000000000000..6f18946cc3f1
--- /dev/null
+++ b/net-im/teams/teams-1.3.00.30857.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker xdg-utils
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror splitdebug test"
+IUSE="system-ffmpeg system-mesa"
+
+QA_PREBUILT="*"
+
+# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
+# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
+# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
+# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
+# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	x11-libs/pango
+	system-mesa? ( media-libs/mesa )
+	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	rm _gpgorigin || die
+	doins -r .
+
+	fperms +x /usr/bin/teams
+	fperms +x /usr/share/teams/teams
+
+	if use system-ffmpeg ; then
+		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
+
+		cat > 99teams <<-EOF
+		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
+		EOF
+		doenvd 99teams
+		elog "Using system ffmpeg. This is experimental and may lead to crashes."
+	fi
+
+	if use system-mesa ; then
+		rm -f "${D}"/usr/share/teams/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
+		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
+		elog "Using system mesa. This is experimental and may lead to crashes."
+	fi
+
+	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
+
+	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
+	domenu usr/share/applications/teams.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 03785ecf9889..e8c3c1fa4a83 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,12 +1,9 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
-AUX zoom-videocam.svg 284 BLAKE2B fa118d489cafa1c14841c27ab4962c41d52987ee49b8ad0fb3e4c33d7cf376920e16a8f7358807d0809231fbf7ef8cafd4752ac90e85cc7395a56fbe07f6340d SHA512 a60345de0c86003dc49484fd5d3d22e3228b8b1c107796690289a7779769436809dd22b02b4951df2fc1e3a98c541dec4b0788ab7d112b2b9c8c29a46493a98d
-AUX zoom-videocam.xpm 806 BLAKE2B dcb9d7e2a90f564ed6b7f0b733efb72867ecf2418177b25ecd5a00e204ab9f0f89c2b1f3b3078b3cf326c8c523480f183170a82d896b73848e7596b32a351a9b SHA512 a49e7cce25e6b3a1492b2ed834f7fe8f533b5374b0c4eea4089003459ac011ef264175c5c2322cceb77f8fb67e939e90e9abddeef415d2f570add8301cd10a48
 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
 DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.4.54779.1115_x86_64.tar.xz 45216096 BLAKE2B a65c7db96ac0ea5a99b6edba0145d766395ebd67402f28ee276e1a2ed87ca9c9c01bedef12eb4d99a6525f0ec0698de1471c3ca620e32ec29ada5b8edd55416c SHA512 e859060592dc110ccb42760fff54f632b079124ff2b8988e55dfd27d70b132b035d6b0ef8eec83b7d90ddf56a6e675dac4d04c29bec9faab377db4926fb2462d
 DIST zoom-5.4.56259.1207_x86_64.tar.xz 46333580 BLAKE2B e3603db12af4ecc88eee88715976d6944cf566f6c1afa35a36840ceba49da85d21cdf4c04216b76d30b700b07a098aea48b7f61c48ee3836168323adede5789f SHA512 b7567f8e01486dfe31118da9c6168be70ea0b6dc21ea07972d39a3ced360068ff2e7423663e74fb65387be18fa2a1bca7ebd2599c49b3c064872ae9d82266192
-EBUILD zoom-5.4.53391.1108.ebuild 2907 BLAKE2B 2ffd91cf8d742abf204d28736f2a63d3de3c370f465bdae217abb3a105fc7119d48e885f00c60bfc3303d4a4b3f678f2d406638c9dcd6b97db11840b5ec3b5e0 SHA512 5342ac23469035178db2ff8bb889f056ea7274929951c54c5e3700e8da8b1c8de96e7f6ea5478ebdfd57ee6134ea799c270c453165ee71c3d83903dcdc86bf53
-EBUILD zoom-5.4.54779.1115-r3.ebuild 4223 BLAKE2B e94321407cbb564771a8e739dd9fb80c6cb4cf206573ba2f4dff4280b659ad5996b21299490491c637ded79d2096242110ba429845c67b8f35e18bb3597e2a40 SHA512 1d4778df513c9be49862013123d7ac7fde014d7517ad40ab843c5c5692c7090a61261ab526e2ee3808fad655b371e8dd7b1898fcf54461337f85d67384c45807
+DIST zoom-5.4.57450.1220_x86_64.tar.xz 45788732 BLAKE2B 932187da18c52baeaba90114b7d7115bb973787fe690f94482d53527fbd4ded327eecee6d3097831a5e3c164c79b46dcb32ee3a28223f8b1543e166ea282d44f SHA512 cf8581f175518fdc83c6780bd6a1154d58db1c012bcaf14228e32d839532e741d8eaae4883f7905d181b7d2f0c1e2efe125377dd85eb5ebb742cc5252bbc4b54
+EBUILD zoom-5.4.53391.1108-r1.ebuild 3277 BLAKE2B 87dc8b01f6e9a1fa22800213151a90d05b0363d2bd1e8b50fc824d155646f4ef20c06b9ae74e128e35b9aebdce56e3a39d59096eda2867d4ce3df8b528c32ce2 SHA512 31bc281c49f9b5c6c9f8cfb03033fb759a5819240846c748386d66fa38c15b460ece32dab65992717bfaa979be661b8d799634dbebc855b0ae75524b82a655ca
 EBUILD zoom-5.4.56259.1207-r2.ebuild 4224 BLAKE2B 03e5a160745625da2ffc3afd9db10de7609ebbdce30c1854506d3e0c28f9db4b7100691d3cbdb5ea6e3bd1aa94efa7ddca6c11c4e57301babb1c584ea3ae16d1 SHA512 b1a937c3aaee6ad41cda81b7420882c365d2e0d9eeff18f28ea0ad60969d70b7836bab2e9e26b209c6fd7162b0c65b989f792ea4074acaace87ff7ea39a9d8b3
-EBUILD zoom-5.4.56259.1207.ebuild 4189 BLAKE2B f8cb9b6ec524189be00e26255ee2f0eaee57789a6a57793cedc102eaa6f60eaca4050166c9a6e29be35f724e2e3e073f2fb1e0f6554f34605e0d1d6d388191cd SHA512 bf3860669388a4abd3df240b06b1411312243f0ea34a8d657c89cfcefb22588dfccf128e839f8802fc622e569a452e977f6eb85aaac6a1fbe5d80f51ccd13c47
+EBUILD zoom-5.4.57450.1220.ebuild 4216 BLAKE2B 5686d389e8001afb71e2ba8768d6b30be62663c7eb231dea7e782e40294d6e7205a93af23dc2427a5646c9312ffacd41a63063c44263e9aa6bf1f13ab001db75 SHA512 f48332855183836ff75dd0a14eb6b8468e1130131048c0f26392453d86615246e2cc313fc2ea4a3dea4d1692095e66351f90804ccd628f56bebdea06766d3127
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/files/zoom-videocam.svg b/net-im/zoom/files/zoom-videocam.svg
deleted file mode 100644
index 33e4ac77b9fb..000000000000
--- a/net-im/zoom/files/zoom-videocam.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <rect width="24" height="24" rx="6" ry="6" fill="#2d8cff"/>
-  <path d="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z" fill="#ffffff"/>
-</svg>
diff --git a/net-im/zoom/files/zoom-videocam.xpm b/net-im/zoom/files/zoom-videocam.xpm
deleted file mode 100644
index 380e86f2cc27..000000000000
--- a/net-im/zoom/files/zoom-videocam.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * zoom_videocam_xpm[] = {
-"24 24 5 1",
-" 	c None",
-".	c #2D8CFF",
-"+	c #469AFF",
-"@	c #E3F0FF",
-"#	c #FFFFFF",
-"    ................    ",
-"  ....................  ",
-" ...................... ",
-" ...................... ",
-"........................",
-"........................",
-"...##############...+...",
-"...##############..+@...",
-"...##############.+@#...",
-"...##############+@##...",
-"...##############@###...",
-"...##################...",
-"...##################...",
-"...##############@###...",
-"...##############+@##...",
-"...##############.+@#...",
-"...##############..+@...",
-"...##############...+...",
-"........................",
-"........................",
-" ...................... ",
-" ...................... ",
-"  ....................  ",
-"    ................    "};
diff --git a/net-im/zoom/zoom-5.4.53391.1108.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild
index b6642189422d..3d3b63c3854b 100644
--- a/net-im/zoom/zoom-5.4.53391.1108.ebuild
+++ b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils 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/"
@@ -11,7 +11,7 @@ SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_6
 	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
 S="${WORKDIR}/${PN}"
 
-LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libjpeg-turbo pulseaudio"
@@ -48,12 +48,18 @@ RDEPEND="!games-engines/zoom
 	pulseaudio? ( media-sound/pulseaudio )
 	!pulseaudio? ( media-libs/alsa-lib )"
 
-BDEPEND="!pulseaudio? ( dev-util/bbe )"
+BDEPEND="dev-util/bbe"
 
 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"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+		>zoom-videocam.svg && [[ -s zoom-videocam.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]
@@ -69,23 +75,20 @@ src_install() {
 	doins -r json ringtone sip timezones translations
 	doins *.pcm *.pem *.sh Embedded.properties version.txt
 	doexe zoom zoom.sh zopen ZoomLauncher
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libquazip.so
+	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
 	else
-		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
+		dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
 	fi
 
-	make_wrapper zoom ./zoom /opt/zoom
+	make_wrapper zoom /opt/zoom{/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
-	# from https://github.com/google/material-design-icons, modified to be
-	# white on a blue background
-	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
-	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
+	doicon zoom-videocam.svg
+	doicon -s scalable zoom-videocam.svg
 	readme.gentoo_create_doc
 }
 
@@ -98,6 +101,14 @@ pkg_postinst() {
 		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
 	done
 	readme.gentoo_print_elog
+
+	if use bundled-libjpeg-turbo; then
+		ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a"
+		ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library"
+		ewarn "bundled with the upstream package. Please report this problem"
+		ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it."
+		ewarn "See https://bugs.gentoo.org/715106 for further details."
+	fi
 }
 
 pkg_postrm() {
diff --git a/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild b/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild
deleted file mode 100644
index 70da5021389e..000000000000
--- a/net-im/zoom/zoom-5.4.54779.1115-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eapi8-dosym 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 Apache-2.0" # Apache-2.0 for icon
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland"
-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
-	virtual/opengl
-	x11-libs/libX11
-	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
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-libs/alsa-lib )
-	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/qtscript:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-BDEPEND="!pulseaudio? ( dev-util/bbe )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-	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 json ringtone sip timezones translations
-	doins *.pcm *.sh Embedded.properties version.txt
-	doexe zoom zoom.sh zopen ZoomLauncher
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so
-	else
-		dosym8 -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* 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/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
-
-	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
-	# from https://github.com/google/material-design-icons, modified to be
-	# white on a blue background
-	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
-	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	local FORCE_PRINT_ELOG v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use bundled-libjpeg-turbo; then
-		ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a"
-		ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library"
-		ewarn "bundled with the upstream package. Please report this problem"
-		ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-5.4.56259.1207.ebuild b/net-im/zoom/zoom-5.4.57450.1220.ebuild
index e31ede8492b4..985fec29e240 100644
--- a/net-im/zoom/zoom-5.4.56259.1207.ebuild
+++ b/net-im/zoom/zoom-5.4.57450.1220.ebuild
@@ -10,7 +10,7 @@ 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 Apache-2.0" # Apache-2.0 for icon
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland"
@@ -56,12 +56,18 @@ RDEPEND="!games-engines/zoom
 		wayland? ( dev-qt/qtwayland )
 	)"
 
-BDEPEND="!pulseaudio? ( dev-util/bbe )"
+BDEPEND="dev-util/bbe"
 
 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"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+		>zoom-videocam.svg && [[ -s zoom-videocam.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]
@@ -76,7 +82,7 @@ src_install() {
 	exeinto /opt/zoom
 	doins -r json ringtone sip timezones translations
 	doins *.pcm *.sh Embedded.properties version.txt
-	doexe zoom zoom.sh zopen ZoomLauncher
+	doexe zoom zopen ZoomLauncher
 	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
 	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
 
@@ -110,11 +116,8 @@ src_install() {
 	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
-	# from https://github.com/google/material-design-icons, modified to be
-	# white on a blue background
-	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
-	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
+	doicon zoom-videocam.svg
+	doicon -s scalable zoom-videocam.svg
 	readme.gentoo_create_doc
 }
 
@@ -133,6 +136,7 @@ pkg_postinst() {
 		ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library"
 		ewarn "bundled with the upstream package. Please report this problem"
 		ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it."
+		ewarn "See https://bugs.gentoo.org/715106 for further details."
 	fi
 }