gentoo resync : 30.05.2020

16 files changed, 54 insertions, 850 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index a1620046923b..7ecc6104f3e9 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index d95f99e4c29f..bbeb734b38d8 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.33.4_amd64.deb 98801978 BLAKE2B d08ba8b74b9cffa7e81c50d225e936a2faf6d0fac9bb12d7841afd794dc136804ad37242a51eb7ec1311e41b35f7cd4c945f8e6169f0f0f2fff9a297e96897e8 SHA512 65789bac0d9748c4c9874b333bc0a05fcd30995f2ae61fb7cee0e3c52ad97ba110f5249559a7285e1bb9d214cc01f2529b89d306f73cfc0befe1d473da3e7210
-EBUILD signal-desktop-bin-1.33.4.ebuild 2400 BLAKE2B 0ef74103fa97c0d7e2d4aa561a0b6e6a50485dfd969de43a2d4667fc283e43fa94becc6363a3cacb76c845edf642e1336637044b818f4349fe9476b76dd89cdf SHA512 68cef676e5d6e1ec1fcddaa787420ce728f660e6eacaadaad3c3a09d4d23e25cbd264bbce2f3aceeab50a4fa9009172ba5dacb4e52dceabcfa81163e95161a60
+DIST signal-desktop_1.34.0_amd64.deb 99598948 BLAKE2B ce0a0bd37c0e6697397101e9fa37864e06dd0ed24af569b6e1084460e467d19b82d77e87c21943747ba4a24c269417183dd5d4bfac45b4c1d3f89d4c155c747f SHA512 56bf02ed593ab532bbbe9720d0466158ab5c33fc4c48b0e606f232159ca6d86386dc0fcc49ba39fee23c85239098d87eb7ff2849785bd56b936b7d1ae548168f
+EBUILD signal-desktop-bin-1.34.0.ebuild 2475 BLAKE2B f706e0174b1e285cefaa50b9304ec05fdabb132ccf0eb09183b8ba70b50c38cf271b322820fc2011a2094426305816ccff5e4385fdbd78760985a6fe7b1f693f SHA512 276ff0398fb65a6aea6d4230e22652c7bb38405adab308f5fc120a16531ba5764711664af1141935c115e4cd19188ffdba8582fa45fc93272a056c8fba102c13
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.33.4.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.34.0.ebuild
index 4f84db2ab7d9..b339b110aafd 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.33.4.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.34.0.ebuild
@@ -36,7 +36,8 @@ QA_PREBUILT="opt/Signal/signal-desktop
 	opt/Signal/libvk_swiftshader.so
 	opt/Signal/swiftshader/libGLESv2.so
 	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*"
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*
+	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so"
 
 RESTRICT="splitdebug"
 
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index d476ba4c08cd..6bd9230b90e1 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,16 +1,7 @@
 AUX 2.1.0-kde-dir.patch 2118 BLAKE2B 92ec09b35f474cdab0677a394dcef193249f6db8b4ac980a63e054fe841876133e81a9420c52d3d9c91066725a9a0049ae9bc1e80d46c22e4ca8dd9b18cfc328 SHA512 da144cd13f42cac06aa1932945fccf7367f37edca7fb4781e8fa38fe8af1cb52b3b6062396a9a5d2e243966bdbb093e541042446e237d88c59bc855ea347c4e3
-DIST tdesktop-2.0.1-full.tar.gz 26106949 BLAKE2B 3975e7d42af8b323a86408e2301b292d94b308413bb92d135673fb12851cd6672156dcf9b631482fa9b8dc9361d9593dc1104c8c335e0c610706b308414db01b SHA512 99cd7c5ca1e9dd75ecd98d272522b0e4aab2d46525e3d0c306503b7a00c9d25c1646e9d7462182682a58947c7435864af805a3b6f85906d8b21e5675cc8383cb
+AUX telegram-desktop-qt5.15.patch 975 BLAKE2B faf7fa6505d760299b05a02684817993162a5d3105581fd425bf4af179543170eb4d4b4c670907b88cbfead9bc288641216edb86f47fe370f0d691918426b4a1 SHA512 6bbe0583103d575a1413141799985c7c7b590d8a9856c727320ce322679a3d38343a144c314eee54fa9776c8f3a084627a333e6860d1b8cb8f496b1702070ac0
 DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d
-DIST tdesktop-2.1.1-full.tar.gz 26178569 BLAKE2B 377820af9d2ceeab18fa1ca0458803770b9e1cf211ba9bac7f21ae75fcb8e59269ad742c9fc0acd1b6d484d36057c872146cfdba0653bd2461f3a585222cf0b0 SHA512 aa542c029ead2d1b6c398ecca949b86fae8f37094ceb462ace4628f8e53882faf35b3c2e4fe03dd2e4e17b07412896f7b05d6748b13c99a3bac117b7449d69a8
-DIST tdesktop-2.1.2-full.tar.gz 35603888 BLAKE2B 40ca92e5d7bcc291ce8b8ad4404dd27399dc5dd710e869759800c694c36721db892f1da9273c718672e2cea7d918059035f0af3e8cfd9a7b42f3f24b7d34b5a7 SHA512 c23d9a961132cd2592ce8f728ed7592091a8c2a1d94797facd93516ab0c9194bd5b90ba7a7d4e8aa778940bc4a23d4ac69507a9f150c3bf4e743c6659e545ccf
-DIST tdesktop-2.1.3-full.tar.gz 36121092 BLAKE2B 667f73ef9ea41e06b9cd536eacc1d84229376f78662f8e82916bbefde035145454c0c9a62b7fbe613dd1e502ae522ab88d23db8bfbc6e3cb7abe1e319cbd92b0 SHA512 ec5743a15fcc051cfea9379ecd5811a9300b46b29108a813a67575e2b2a99839c83943c5513f17a1119869f722519628884aa9af63cbf4b65640944c16ff27e9
-DIST tdesktop-2.1.4-full.tar.gz 36377172 BLAKE2B 115f98879539ad66d57cba1b725f65558804536318d72532a6c93e17626341199f3fc9ea446f11b6a31b5e526cb102faec1db94e54800dc96dfbb038bc42670a SHA512 5b27633cdcb4edb61af983c1e4867bac3d7d0864e100855ea3f00c1eb1037e6a9f43414c09211282b5b677603ddfaedbcf4cbf482502ca4e33152e417068c959
-DIST tdesktop-2.1.5-full.tar.gz 36478922 BLAKE2B 6a1c0a8086f5bcdc82a71cbfc77acc20a764dd89635a62aa91f4bb98242f27a6951c8107c0846322ef76796e5850a4d886771cf38420e06148b27a690f58bc90 SHA512 393ee98d511a8bcf1343b3599fddf8782682bddc3e158e641c73990146cb717b04e69d6d171f2bc7011a5a5d775b0f00e883b54184944d8f114f149a8a879a39
-EBUILD telegram-desktop-2.0.1-r1.ebuild 3634 BLAKE2B 63b7ac611fa44df6daf9d03229455c9fb478c6de5f6218304b3a697ae67d54d358079b01dddcb108cd56e72d279f3b1b390e910e046a0a8ef30e0c5d7f387db8 SHA512 600f025c5ef8580f05049789a26b289c69065b6a934bed14594121e79eba92b043150959eac2c0f61fb380c7ba5663e55ce006a866960d54a67506dd60bf1a3a
-EBUILD telegram-desktop-2.1.0.ebuild 3682 BLAKE2B 95425eff2648434f75cf3ee02a8fa5a44c748599ab73d3def605eb19f2324eed8e18b40e448996194d5134971090b8e0f0aa1da928bb05dda1b2ebd52ab5953e SHA512 3951aaac37407b23850dc3e7d69e53c1652fbb3eb61e0bdfc9780544ead08cbaf6dc5c4108530d32058d524d5ddee4bf3bcfee391deec7dcc0449fd5191aec4a
-EBUILD telegram-desktop-2.1.1.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
-EBUILD telegram-desktop-2.1.2.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
-EBUILD telegram-desktop-2.1.3.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
-EBUILD telegram-desktop-2.1.4.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
-EBUILD telegram-desktop-2.1.5.ebuild 3963 BLAKE2B fac016b41b7de244c6c9835e14d59e4e96dd90f0bfa4bf6fdb99a42b0e08754386b69511b3a0b3e84ace10d325720005d90d793876bcdfb37a32d19532262357 SHA512 7de0ee03d16798a54ae48648c2bdeda7b7e437cef97642191bcafce527ced845dfa0d5787b0554a90b92e36be3fb988aab5febc20a59badca1552f2f2856b3df
+DIST tdesktop-2.1.7-full.tar.gz 36509059 BLAKE2B 4a1bf5879e71e64f34024165f9db39f69d1d8e87b0387704bdb74415d60d6a1efd22ab1fec994116a72a6982a55f13cee0edb667060bbe9336cba4ce12e7472c SHA512 f942ce93d9671f3bb95a8fbba107fc851bfe3f28871c9651f6f2d97d711602f8a671f7b74750894b2175d33a67c25017562cd4ee455da7aa9b86755d1c3f1cfb
+EBUILD telegram-desktop-2.1.0.ebuild 3717 BLAKE2B 5e0a8f4f73140a8f793ff0afe983db06cfaac151cab82aebb4a2900832e5ebf303bae0071d1067108c374b8e5dc2a6467388342512b34d3d77881c24aaadb0ac SHA512 9ff80da4041cafa2b626f5a2f625aa0b47b80d8cdc2f3c443588d08bf689922360a43efda1637921f81e6a94d93f3f2e713bd2326a7f2f434594cb9929ee1d07
+EBUILD telegram-desktop-2.1.7.ebuild 4010 BLAKE2B 61279753bfbde2ce025953489dbed3f0c629a01d344db8146346110cfdeee27d3b2369f948862bf97bf2fbbd5c265117f3a92bd80dfe99d789a17f6ea3de79e0 SHA512 ad6b101bf0a6f60dd65c73d6fe5bb6e8933181716c337180215cbe2d29ff8b27b09411cf640569e3dd66d4c558f95d30b040a044d45cf9f4ba88b7e2a271724f
 MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
diff --git a/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch b/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch
new file mode 100644
index 000000000000..80c02b10db2b
--- /dev/null
+++ b/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch
@@ -0,0 +1,23 @@
+diff -ru tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/animation_value.h tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/animation_value.h
+--- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/animation_value.h	2020-05-24 09:44:41.000000000 +0200
++++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/animation_value.h	2020-05-26 20:31:34.381796057 +0200
+@@ -10,6 +10,8 @@
+ 
+ #include "ui/style/style_core.h"
+ 
++#include <QPainterPath>
++
+ namespace anim {
+ 
+ enum class type {
+diff -ru tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/cross_animation.cpp tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/cross_animation.cpp
+--- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/cross_animation.cpp	2020-05-24 09:44:41.000000000 +0200
++++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/cross_animation.cpp	2020-05-26 20:32:16.340015129 +0200
+@@ -10,6 +10,7 @@
+ #include "ui/painter.h"
+ 
+ #include <QtCore/QtMath>
++#include <QPainterPath>
+ 
+ namespace Ui {
+ namespace {
diff --git a/net-im/telegram-desktop/telegram-desktop-2.0.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.0.1-r1.ebuild
deleted file mode 100644
index 8760bb8f5936..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-cpp/ms-gsl-2.1.0
-	dev-cpp/range-v3
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-	|| ( X wayland )
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-	)
-
-	append-cxxflags "${mycxxflags[@]}"
-
-	# TODO: unbundle header-only libs, ofc telegram uses git versions...
-	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
-	# EXPECTED VARIANT
-	local mycmakeargs=(
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
index 6c7b00706da8..dd038756cdd2 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 
 LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
 
 RDEPEND="
@@ -70,7 +70,10 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PV}-kde-dir.patch" )
+PATCHES=( 
+	"${FILESDIR}/${PV}-kde-dir.patch"
+	"${FILESDIR}/${PN}-qt5.15.patch"
+)
 
 src_configure() {
 	local mycxxflags=(
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.1.ebuild
deleted file mode 100644
index 9dad2e7e8a3a..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.1.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-cpp/range-v3
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-	|| ( X wayland )
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-	)
-
-	append-cxxflags "${mycxxflags[@]}"
-
-	# TODO: unbundle header-only libs, ofc telegram uses git versions...
-	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
-	# EXPECTED VARIANT
-	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
-	local mycmakeargs=(
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.2.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.2.ebuild
deleted file mode 100644
index 9dad2e7e8a3a..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.1.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-cpp/range-v3
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-	|| ( X wayland )
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-	)
-
-	append-cxxflags "${mycxxflags[@]}"
-
-	# TODO: unbundle header-only libs, ofc telegram uses git versions...
-	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
-	# EXPECTED VARIANT
-	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
-	local mycmakeargs=(
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.3.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.3.ebuild
deleted file mode 100644
index 9dad2e7e8a3a..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.1.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-cpp/range-v3
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-	|| ( X wayland )
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-	)
-
-	append-cxxflags "${mycxxflags[@]}"
-
-	# TODO: unbundle header-only libs, ofc telegram uses git versions...
-	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
-	# EXPECTED VARIANT
-	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
-	local mycmakeargs=(
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.4.ebuild
deleted file mode 100644
index 9dad2e7e8a3a..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.1.4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-cpp/range-v3
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-	|| ( X wayland )
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-	)
-
-	append-cxxflags "${mycxxflags[@]}"
-
-	# TODO: unbundle header-only libs, ofc telegram uses git versions...
-	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
-	# EXPECTED VARIANT
-	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
-	local mycmakeargs=(
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.5.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild
index 3206772347bb..e031bf3e1e77 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.1.5.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild
@@ -69,6 +69,10 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-qt5.15.patch"
+)
+
 pkg_pretend() {
 	if has ccache ${FEATURES}; then
 		ewarn
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index ecf67718bdfc..c0c5836fa5cd 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,13 +1,10 @@
 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-3.5.392530.0421_i686.tar.xz 48727688 BLAKE2B bbbc589ed1ad0fa5b38dbfab03e68c9d102cb7ac8220287a477261def77dd349e12ff351e7581aa59dc184813b923b1026a57ca1d4111ba42171b36cfb4f09c1 SHA512 e7501f02a31cd0a58df362cb3c3f43bbcb58ce15d0a55b440747b0e096d367cbb877aab9b4b21579016307376c0ca3831a09d1639bd67321fa3c6ceec3daf414
-DIST zoom-3.5.392530.0421_x86_64.tar.xz 72984788 BLAKE2B 90823dc29bb679b9d75e80764bae8b13da77fb7fce2c5f873118037e420ff67f9c1f8de63b90ae84a8de56feb571033d3803fb9cf6676f3f5380012a71b708e0 SHA512 1af24a10eff6d70c00d72fe5432340ada3b486778e9c06d2d11cf802ea0bc02792469db7f172fafd9329bddba9face6b0d28e3892c3657959500c1be34dc31af
-DIST zoom-5.0.399860.0429_i686.tar.xz 38589772 BLAKE2B 900702db7dd5bd7aea4aae60e0fa5925afa1df081cb9004dae3e86d3bdbcaec151f03325d7de0cce5e7f11d745bc70d73dde2a93c0918da6ea5a1911cf416143 SHA512 42792ba934418fdc0def31bb16071bcfefd7a5a10075e0de220b9b107a3a5d7ca5f3d4fc71b2e9ab8702acec6b7532da75d6ccfa55a40280d59518644de1c9a1
-DIST zoom-5.0.399860.0429_x86_64.tar.xz 41470716 BLAKE2B f3d26a2d2ec95209ed0126be29ba5658c68a2769dab58457da021e2d8b555a8475d18e168236b52559582ac088f0163b2ed32d803e08e3f0c6249fe7df5c7b41 SHA512 1a9c9cbcfcd0e58c330780f78779ecb08265fdb87813f54be89d20f26aeaf4c89176055cc8210559eaa24f995e544198b7099cc328388794cbb6f6b0a9dac2d9
-DIST zoom-5.0.403652.0509_i686.tar.xz 38658880 BLAKE2B 60d93987f627ecaeb149570e225d9c0e74ddb3e21a9565e7465ff2aab0dee3ff3d304ec58f35a9ed783e4fbb8ca7d4c24706a7aa76c194f94e40ab77f75073f9 SHA512 3f49c76b28dc0c14272df6632cb0cdafcd67500bf14a5a7e4e0a7f6e685a0d7e3adef522a1c5ba3f8a31ef8c5d880ed686dcf1dae1934b1f86dc8e3871894b64
-DIST zoom-5.0.403652.0509_x86_64.tar.xz 41506968 BLAKE2B 51fff1a2915fad97c4f5cfde370c1dd1c4849d01b9ea7eaa77580d31d46acbdcc4a19bed7e105e8323f02c7bc344d4ff42ed2a434729b880eedb66f1a3f1f0b4 SHA512 5a6c2070b71324ef89040377b759c5ba0f4ab21662c9cf714e57af5bc0a3f28d029f03fd80883479f7a62561b2f136ad480d2efd3dce83398aab814e2a21f8fe
-EBUILD zoom-3.5.392530.0421.ebuild 2880 BLAKE2B 929e1aeac09009c1d5c2a8429568ba516ae80a6416bd8110b50a0a6ac885acb5169d61ceee63e6fdbb659d7625af129b3caa535e00fa34dbbb4bca3d350136f4 SHA512 ee4d1a8a680bc946972b7bf5bc11e4eef5890196624ce9e05c7c71926953f8655e7253a5f812898a6e4477be17a7ef2c34cb28243ac6d200d7886ddde2559210
-EBUILD zoom-5.0.399860.0429.ebuild 2747 BLAKE2B 0862946b94563a7b3e93dc05e25abe201373fe364fadba5ce876c3ff9ac9ed07ca7236908b2ccf4fd13f254e6cc68849f550d51d99400db10b2ff1177cd74fe8 SHA512 4cabb003258c8f8e4f742b8fe4b5765eb225dbc0fe1eb2cc9845f1205b9c8df871d11577a32a128a881d44db677fcd1d429f0d88e967c27e777c6ac2e211aeac
-EBUILD zoom-5.0.403652.0509.ebuild 2943 BLAKE2B 9b10620159da25e02039ebb9c23c5c18156deaee26dba141ba493a81c6d1726fbb0af5183ef3000077357b5d825e183c1ee6b24e559bef50d96c9a4209b0b779 SHA512 0005570d9996facff7712df8bf2d55adc418e24417017b7f819c36ad72ae10f69c40f4a1f800fba55fed139ce18e6e2425d2502ca03a931f7a29ab514b281a6e
+DIST zoom-5.0.408598.0517_i686.tar.xz 38668604 BLAKE2B a503019946689f796a96a29d930ba4a997d233d6f0ff7ad6c100ab25b581b58fd09e811ae444ee0dd94e60c3ddc8b52bcdbd45f2c1daaa201fc71406bf11b764 SHA512 3f38df83c26d2a2be6af7cd8f2e4043edbdaf4262becd8ac0eea07e4822743fdb348bc9fbdd1111a9d378aed7c0ab540755fb0218abd0c1eef32a72bb57eed27
+DIST zoom-5.0.408598.0517_x86_64.tar.xz 41559224 BLAKE2B 56ef7e0b9f7277a7391d92bb8b0259ea98b2931b216bcace8dff43981f0b148846c5bfe0b1c476692712fd342e6652f4cae8d536e7f645168a84fb113e3c97ee SHA512 46762cf46974e4239bc716d1ccba8ec74ba1040bb7f917625535edc2422dcd07df22a448360d35a3e82ef1ab905d7f280401005e9398b5229e515d120d848222
+DIST zoom-5.0.413237.0524_i686.tar.xz 38703768 BLAKE2B d50ee81d58fd987580d09e6d672d85eed51607f242b600a4bce71c4729829a6b0ca9b2b3a572ca4a29a86c7fabc388582c4d6b7a4c4c88255297b3e4e92af5f4 SHA512 11806bc656b87760604d19eb7432050f0f10f12c6233b687fec319a221964ffc4f4294f45028c5b7bf148a33998254acb37c6597745299be32ba78774dc082a4
+DIST zoom-5.0.413237.0524_x86_64.tar.xz 41591272 BLAKE2B 21a7b53aba636721823ea414b361ca3768b3ddcbb9cf2d5fbb6a10f60bff79cb425bbd2b7b8da6f13c4a0544c6fb917172c414455b79f7b36766903768f72a9c SHA512 55736fcd43241c2abd090c1943b970741944bfe7061e61cb0fc5839706920025123089c26a3a20730ef253b338546a833a958dc29c5b00234a76a1483ec7669c
+EBUILD zoom-5.0.408598.0517.ebuild 2943 BLAKE2B 9b10620159da25e02039ebb9c23c5c18156deaee26dba141ba493a81c6d1726fbb0af5183ef3000077357b5d825e183c1ee6b24e559bef50d96c9a4209b0b779 SHA512 0005570d9996facff7712df8bf2d55adc418e24417017b7f819c36ad72ae10f69c40f4a1f800fba55fed139ce18e6e2425d2502ca03a931f7a29ab514b281a6e
+EBUILD zoom-5.0.413237.0524.ebuild 2943 BLAKE2B 9b10620159da25e02039ebb9c23c5c18156deaee26dba141ba493a81c6d1726fbb0af5183ef3000077357b5d825e183c1ee6b24e559bef50d96c9a4209b0b779 SHA512 0005570d9996facff7712df8bf2d55adc418e24417017b7f819c36ad72ae10f69c40f4a1f800fba55fed139ce18e6e2425d2502ca03a931f7a29ab514b281a6e
 MISC metadata.xml 523 BLAKE2B f258ebdf8e4a2e067f202ede6324203b640c6a7fce843cc4b42cf4eef6efd97620e50c22c80f885d09254e403f016758d7dd3ba1deeef0c26692487a2ca9ba35 SHA512 9746752364f19f9e17516315231c8efef278f4d77ddcbfde213b5a65b012d6e320a20536e44ac5a111b2370a21cb59eb7a88c5c3fd2a1dd44064702d5e7bca38
diff --git a/net-im/zoom/zoom-3.5.392530.0421.ebuild b/net-im/zoom/zoom-3.5.392530.0421.ebuild
deleted file mode 100644
index 3dccb750177a..000000000000
--- a/net-im/zoom/zoom-3.5.392530.0421.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
-	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
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libjpeg-turbo pulseaudio"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdiag:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	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/libXtst
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	amd64? (
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtpositioning:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwebchannel:5
-		dev-qt/qtwebengine:5[widgets]
-	)
-	x86? (
-		dev-qt/qtdeclarative:5
-		dev-qt/qtwebkit:5
-	)
-	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-libs/alsa-lib )"
-
-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 sip timezones translations
-	doins *.pcm *.pem *.sh Embedded.properties version.txt
-	use amd64 && doins icudtl.dat
-	doexe zoom{,.sh,linux} zopen ZoomLauncher
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so.0.1.0
-		dosym libturbojpeg.so.0.1.0 /opt/zoom/libturbojpeg.so
-	else
-		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
-	fi
-
-	make_wrapper zoom ./zoom /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
-}
-
-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/zoom-5.0.403652.0509.ebuild b/net-im/zoom/zoom-5.0.408598.0517.ebuild
index 314ddbedc6b4..314ddbedc6b4 100644
--- a/net-im/zoom/zoom-5.0.403652.0509.ebuild
+++ b/net-im/zoom/zoom-5.0.408598.0517.ebuild
diff --git a/net-im/zoom/zoom-5.0.399860.0429.ebuild b/net-im/zoom/zoom-5.0.413237.0524.ebuild
index f2a3aea4c103..314ddbedc6b4 100644
--- a/net-im/zoom/zoom-5.0.399860.0429.ebuild
+++ b/net-im/zoom/zoom-5.0.413237.0524.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils xdg-utils
+inherit desktop eutils readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -86,11 +86,18 @@ src_install() {
 	# 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
 }
 
 pkg_postrm() {