gentoo Easter resync : 12.04.2020

8 files changed, 122 insertions, 229 deletions

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 5f413f9ca13e..62d3698fe9c0 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,11 +1,8 @@
-AUX 0002-PPC-big-endian.patch 791 BLAKE2B f24d1f799eb23f4aa0ed3324996027014c790ef3ed249ef1b48748529b7e7af622d7db34fbe0cae06539913b5e20512f490e7a609b952273aa990baef20de374 SHA512 26aab35d254bdeb89aff05fa5ec84c405e2c939f300f923c0e7adb452e50442d140104fe74f6bd39ab533493314118de3bfed7f3a931c2c5442da6fccdb6e390
-AUX 1.9.19-crash.patch 1997 BLAKE2B 2ab31df9a8b9069844bd97c5178faf61556851027f92b8d895a2ad24d919922cbda597ac11e0337d092c527752de4343b3362ec8588eafcf42065ab8680c05fb SHA512 32590c5cdb99ed05cdb2e3664fe9ae1470bb4b2fcc7fd776d0739492629dbed76d28284face1d8b04add9a05f0cc3f512aff4a3b549eb94caaa7d49cfaeb1d41
+AUX 1.9.21-icon.patch 3731 BLAKE2B feeaaaad379748ca6b39530809155611f4e9fee484d9f893f990cb52ef3c120df8179e1130cd8b3e597d02a932acd349f9d80cab3bcb7b2c7048fe5e6def8f04 SHA512 56861764177ab73c0589875000129b979434f0a940274700089c6940a89b28d20ad5e5f838b54ad6147e411276c5dd6e392cf6da62d43f7b779025882c9d95eb
 DIST tdesktop-1.9.14-full.tar.gz 25324084 BLAKE2B 45c071aa573541b6e483d2ae712b7f3b672c1294e8e7e624d9292f7176482f4d68069c35541019dc27fdb1c66134c29fb4d3667f1197e7085e4f8a80c8ca603c SHA512 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056
-DIST tdesktop-1.9.15-full.tar.gz 25327647 BLAKE2B 5d689f656a66d55b3e62d52d48106270fc16675a01ff8a2b865c122191c7ee4781c2e698d0652c765a10985148ade0ce5dd47f4938538f24348cd5b42fe0160c SHA512 457b568226e34cc23e379d34a9ad21d0d6c26fb69647cd17bf74aef48ad9ce35eae6697795af8c349f43e376b44bcab49e1939733b1cc20ec16ddf1c29a32c4e
-DIST tdesktop-1.9.16-full.tar.gz 25328085 BLAKE2B 1d429964e67641a1cfa0f826820ed54eb7e37d9946fdd3292d5d67276609d736dcfb2b4c422f6b64364705eb68e78f6ac6bfa52096ca39d948a9e01bc152404b SHA512 89cdf12456d9bcaa4e332286d2d5c4da6cf715bd0e798e51e458adb7bf5c89044899beb9ac7b11a808b81e37958473a473e3774519420baf7a6bc34eb7938733
-DIST tdesktop-1.9.19-full.tar.gz 25840478 BLAKE2B 1a730e74df71af0c8fcc579fb1b2546fe279d64dd60786a32e015dbc0046a5d4a933bfdc128f7bb2b624705e6788ec6d597ceeb328f91dc173d1c5a0e739a29c SHA512 29070c6e1d813943d5062dc1703f383a18323b5698fbc4e6f2c89b33366da9da5d1ec84dc29950288e7e7d112024de2924244ec9c800d59d4b210e6288c7291d
-EBUILD telegram-desktop-1.9.14.ebuild 3535 BLAKE2B 1cbaf77fe520be3d0bfc3624a725d9a09b4b92c771ba298e1d9c2fe7f7f1ae92b19381146a897f933964fa5ae08d00c9420402fc88067924597332bade4d344d SHA512 37902c4892ad492a3ca31979a32658cb9ada5e1a3be26e30846969cca11c5c6f38865cbe7a211e8f7a1c2c91679c96bee2f9b43c92a13d74660e80285bd4d95e
-EBUILD telegram-desktop-1.9.15.ebuild 3500 BLAKE2B 0360ce198161fb1d96aedd01439422c2417953457c78dc3c849136c1a859c696ab7e196fd983a8814e01c81eff8369f48d8af36c5c8928a0d9b7cb80fc6ae58b SHA512 f5de4da17c3b2f32f8da6ecd0a2f4052c8ad79dee05109d2bae495141e3efa1a9e8a033c6e856eb83691e06991aaebd6a217cb26949dce845392eb8eb6d7c7be
-EBUILD telegram-desktop-1.9.16.ebuild 3500 BLAKE2B 0360ce198161fb1d96aedd01439422c2417953457c78dc3c849136c1a859c696ab7e196fd983a8814e01c81eff8369f48d8af36c5c8928a0d9b7cb80fc6ae58b SHA512 f5de4da17c3b2f32f8da6ecd0a2f4052c8ad79dee05109d2bae495141e3efa1a9e8a033c6e856eb83691e06991aaebd6a217cb26949dce845392eb8eb6d7c7be
-EBUILD telegram-desktop-1.9.19.ebuild 3778 BLAKE2B 230296103a44d51af90e99dbf4bd37d370b8f4a1967454791159b623fcc0e1b41fed0d134c9a5ab25f036d8908e4f2202a45c5a9b5b00947a7855b7aa2f210ee SHA512 ec2b8e0ad38ecddd96e7952ba06549a2ddc9f83782d3cf47f8e467e246b7b9a6833f400c901f86668375fc3601bbb2aba123c46793ad42febb25127dde4f67ab
+DIST tdesktop-1.9.21-full.tar.gz 25848026 BLAKE2B 503e22bcc83a64721aa4c4c6e8bca89c4c976703c338b1615c5ab1599098e98cbd220a94cffdbe24d9c305b44ffef7719ad1c2d2ad81f4ec6edc8377e1afa4ef SHA512 ea02fc69e88ed6244ed420516bb7a93827cb85efaa0a7e9af7562aa1bc29184c5a2102caca8693c976b25d374832e0deb2ccbf00144d5340b5ffacbdc9dcebf1
+DIST tdesktop-2.0.1-full.tar.gz 26106949 BLAKE2B 3975e7d42af8b323a86408e2301b292d94b308413bb92d135673fb12851cd6672156dcf9b631482fa9b8dc9361d9593dc1104c8c335e0c610706b308414db01b SHA512 99cd7c5ca1e9dd75ecd98d272522b0e4aab2d46525e3d0c306503b7a00c9d25c1646e9d7462182682a58947c7435864af805a3b6f85906d8b21e5675cc8383cb
+EBUILD telegram-desktop-1.9.14.ebuild 3481 BLAKE2B 1d9fc3583c52e84975032f25518339492e7f4f98f9a3adbbee7977ccfa960dcf7c146ff53e1528968ddd94de401e2a8e3a96d6da2ebfbcd8e3f716c00ec5b5c5 SHA512 211cf718d8ee8ea213e434dcfbc279a51e6e45139b85296d6033424fccca1d80d4b3805d8eaec14dafdac1aa332fbdb802c39db737925f3b1a8b154ed6798e88
+EBUILD telegram-desktop-1.9.21.ebuild 3711 BLAKE2B 26ae27079d14859da028f2131aa5bff51bcd04cf5dafdf6aa6fb0915b4164d582b57718284263368b7b3e92049cdcccba76eeaf40c145b00a03b8c583fc3e65e SHA512 a057a442482af41a024f0e6365b781921697caaf11de966b86decc3f45dcc029cb08bc72992671895e9fc5a26b44b2c7ba4b7a96c920dffe424f9b1c37958116
+EBUILD telegram-desktop-2.0.1.ebuild 3698 BLAKE2B 7dde21d1b0fb1e326bf0b1dfce41d12738c65ce83456b2d961045bf36ea9f295885622c71b905b0fa273f2237203460aa75228c61c18391320ea2e56e081281c SHA512 fd15bea99296a73e87b8d6e5c165d9ee6d7275b1d7795b5891acaba7fc03503a8b3cea79a0b959395c96df1bbd2ba8f16b3ce4fb408046c600b4adff74591be0
 MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
diff --git a/net-im/telegram-desktop/files/0002-PPC-big-endian.patch b/net-im/telegram-desktop/files/0002-PPC-big-endian.patch
deleted file mode 100644
index b1af3deb5878..000000000000
--- a/net-im/telegram-desktop/files/0002-PPC-big-endian.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4c11502175e2a7821dbd92e029a90d54498e3e8 Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Thu, 2 Jan 2020 12:57:33 +0100
-Subject: [PATCH] PPC big endian
-
----
- Telegram/SourceFiles/config.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git Telegram/SourceFiles/config.h Telegram/SourceFiles/config.h
-index fb7b54e4d..6a873fbd7 100644
---- a/Telegram/SourceFiles/config.h
-+++ b/Telegram/SourceFiles/config.h
-@@ -177,7 +177,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb";
- #endif // TDESKTOP_API_ID && TDESKTOP_API_HASH
- 
- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
--#error "Only little endian is supported!"
-+#warning "Only little endian is supported!"
- #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN
- 
- #if (TDESKTOP_ALPHA_VERSION != 0)
--- 
-2.24.1
-
diff --git a/net-im/telegram-desktop/files/1.9.19-crash.patch b/net-im/telegram-desktop/files/1.9.19-crash.patch
deleted file mode 100644
index ff88aec74eb6..000000000000
--- a/net-im/telegram-desktop/files/1.9.19-crash.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 844e9b60ddf01712082e7ff87cfe74bb20d97297 Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail@gmail.com>
-Date: Tue, 25 Feb 2020 16:12:04 +0400
-Subject: [PATCH] Fix crash in SearchController.
-
-Data::Histories cancels request in Main::Session::api(), so the
-request must be sent using this global api(), not custom MTP::Sender.
----
- Telegram/SourceFiles/data/data_search_controller.cpp | 5 ++---
- Telegram/SourceFiles/data/data_search_controller.h   | 1 -
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp
-index 08541b13da..90fbd36762 100644
---- a/Telegram/SourceFiles/data/data_search_controller.cpp
-+++ b/Telegram/SourceFiles/data/data_search_controller.cpp
-@@ -194,8 +194,7 @@ SearchController::CacheEntry::CacheEntry(const Query &query)
- }
- 
- SearchController::SearchController(not_null<Main::Session*> session)
--: _session(session)
--, _api(session->api().instance()) {
-+: _session(session) {
- }
- 
- bool SearchController::hasInCache(const Query &query) const {
-@@ -372,7 +371,7 @@ void SearchController::requestMore(
- 	const auto type = ::Data::Histories::RequestType::History;
- 	const auto history = _session->data().history(listData->peer);
- 	auto requestId = histories.sendRequest(history, type, [=](Fn<void()> finish) {
--		return _api.request(
-+		return _session->api().request(
- 			std::move(*prepared)
- 		).done([=](const MTPmessages_Messages &result) {
- 			listData->requests.remove(key);
-diff --git a/Telegram/SourceFiles/data/data_search_controller.h b/Telegram/SourceFiles/data/data_search_controller.h
-index a439bb38ed..f9341ac4d4 100644
---- a/Telegram/SourceFiles/data/data_search_controller.h
-+++ b/Telegram/SourceFiles/data/data_search_controller.h
-@@ -130,7 +130,6 @@ class SearchController final {
- 		Data *listData);
- 
- 	const not_null<Main::Session*> _session;
--	MTP::Sender _api;
- 	Cache _cache;
- 	Cache::iterator _current = _cache.end();
- 
diff --git a/net-im/telegram-desktop/files/1.9.21-icon.patch b/net-im/telegram-desktop/files/1.9.21-icon.patch
new file mode 100644
index 000000000000..689e01af72cb
--- /dev/null
+++ b/net-im/telegram-desktop/files/1.9.21-icon.patch
@@ -0,0 +1,99 @@
+From d2291f5b17e0c169083a34e51053a99546207ec8 Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Tue, 17 Mar 2020 23:13:11 +0400
+Subject: [PATCH] Fix panel icon forcing
+
+---
+ .../platform/linux/main_window_linux.cpp      | 20 +++++++++++--------
+ .../platform/linux/main_window_linux.h        |  2 +-
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+index 347395ab38..3d30ef755c 100644
+--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
++++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+@@ -78,7 +78,8 @@ QString GetTrayIconName(int counter, bool muted) {
+ 	const auto iconName = GetIconName();
+ 	const auto panelIconName = GetPanelIconName(counter, muted);
+ 
+-	if (QIcon::hasThemeIcon(panelIconName)) {
++	if (QIcon::hasThemeIcon(panelIconName)
++		|| qEnvironmentVariableIsSet(kForcePanelIcon.utf8())) {
+ 		return panelIconName;
+ 	} else if (QIcon::hasThemeIcon(iconName)) {
+ 		return iconName;
+@@ -158,7 +159,7 @@ QIcon TrayIconGen(int counter, bool muted) {
+ 			|| iconThemeName != TrayIconThemeName
+ 			|| iconName != TrayIconName) {
+ 			if (!iconName.isEmpty()) {
+-				if(systemIcon.isNull()) {
++				if (systemIcon.isNull()) {
+ 					systemIcon = QIcon::fromTheme(iconName);
+ 				}
+ 
+@@ -467,11 +468,12 @@ void MainWindow::psTrayMenuUpdated() {
+ }
+ 
+ #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
+-void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) {
++void MainWindow::setSNITrayIcon(int counter, bool muted) {
+ 	const auto iconName = GetTrayIconName(counter, muted);
+ 
+ 	if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
+-		&& ((!iconName.isEmpty() && !InSnap())
++		&& !iconName.isEmpty()
++		&& (!InSnap()
+ 			|| qEnvironmentVariableIsSet(kForcePanelIcon.utf8()))) {
+ 		if (_sniTrayIcon->iconName() == iconName) {
+ 			return;
+@@ -480,7 +482,8 @@ void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) {
+ 		_sniTrayIcon->setIconByName(iconName);
+ 		_sniTrayIcon->setToolTipIconByName(iconName);
+ 	} else if (IsIndicatorApplication()) {
+-		if(!IsIconRegenerationNeeded(counter, muted) && !firstShow) {
++		if (!IsIconRegenerationNeeded(counter, muted)
++			&& !_sniTrayIcon->iconName().isEmpty()) {
+ 			return;
+ 		}
+ 
+@@ -492,7 +495,8 @@ void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) {
+ 			_sniTrayIcon->setIconByName(_trayIconFile->fileName());
+ 		}
+ 	} else {
+-		if(!IsIconRegenerationNeeded(counter, muted) && !firstShow) {
++		if (!IsIconRegenerationNeeded(counter, muted)
++			&& !_sniTrayIcon->iconPixmap().isEmpty()) {
+ 			return;
+ 		}
+ 
+@@ -554,7 +558,7 @@ void MainWindow::onSNIOwnerChanged(
+ 
+ 	cSetSupportTray(trayAvailable);
+ 
+-	if(cSupportTray()) {
++	if (cSupportTray()) {
+ 		psSetupTrayIcon();
+ 	} else {
+ 		LOG(("System tray is not available."));
+@@ -575,7 +579,7 @@ void MainWindow::psSetupTrayIcon() {
+ 				this);
+ 
+ 			_sniTrayIcon->setTitle(AppName.utf16());
+-			setSNITrayIcon(counter, muted, true);
++			setSNITrayIcon(counter, muted);
+ 
+ 			attachToSNITrayIcon();
+ 		}
+diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h
+index 8602c53806..43ab722845 100644
+--- a/Telegram/SourceFiles/platform/linux/main_window_linux.h
++++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h
+@@ -123,7 +123,7 @@ public slots:
+ 	QAction *psMonospace = nullptr;
+ 	QAction *psClearFormat = nullptr;
+ 
+-	void setSNITrayIcon(int counter, bool muted, bool firstShow = false);
++	void setSNITrayIcon(int counter, bool muted);
+ 	void attachToSNITrayIcon();
+ #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
+ 
diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild
index 620b15ce23a9..6c917eff946e 100644
--- a/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.14.ebuild
@@ -68,10 +68,6 @@ REQUIRED_USE="|| ( alsa pulseaudio )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/0002-PPC-big-endian.patch"
-)
-
 src_configure() {
 	local mycxxflags=(
 		-Wno-deprecated-declarations
diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.16.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.16.ebuild
deleted file mode 100644
index 3ca08c210812..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-1.9.16.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} )
-
-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 libressl pulseaudio +spell"
-
-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/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200212[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
-	media-libs/opus:=
-	media-video/ffmpeg:=[opus]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	x11-libs/libva:=[X,drm]
-	x11-libs/libX11
-	|| (
-		dev-qt/qtgui:5[jpeg,png,X(-)]
-		dev-qt/qtgui:5[jpeg,png,xcb(-)]
-	)
-	|| (
-		dev-qt/qtwidgets:5[png,X(-)]
-		dev-qt/qtwidgets:5[png,xcb(-)]
-	)
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	spell? ( app-text/enchant:= )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-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_DISABLE_DESKTOP_FILE_GENERATION=ON
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)"
-	)
-
-	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-1.9.19.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.21.ebuild
index a038d5820eca..653b2ea69cff 100644
--- a/net-im/telegram-desktop/telegram-desktop-1.9.19.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.21.ebuild
@@ -31,9 +31,8 @@ RDEPEND="
 	dev-qt/qtimageformats:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
-	dev-qt/qtwayland:5
 	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200212[alsa?,pulseaudio?]
+	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
 	media-libs/openal[alsa?,pulseaudio?]
 	media-libs/opus:=
 	media-video/ffmpeg:=[opus]
@@ -76,7 +75,9 @@ REQUIRED_USE="|| ( alsa pulseaudio )
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PV}-crash.patch" )
+PATCHES=(
+	"${FILESDIR}/1.9.21-icon.patch"
+)
 
 src_configure() {
 	local mycxxflags=(
@@ -97,7 +98,6 @@ src_configure() {
 		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
 		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
 		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
 		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell
diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.15.ebuild b/net-im/telegram-desktop/telegram-desktop-2.0.1.ebuild
index 3ca08c210812..a27721e0b922 100644
--- a/net-im/telegram-desktop/telegram-desktop-1.9.15.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus libressl pulseaudio +spell"
+IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell"
 
 RDEPEND="
 	!net-im/telegram-desktop-bin
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200212[alsa?,pulseaudio?]
+	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
 	media-libs/openal[alsa?,pulseaudio?]
 	media-libs/opus:=
 	media-video/ffmpeg:=[opus]
@@ -52,8 +52,9 @@ RDEPEND="
 		dev-qt/qtdbus:5
 		dev-libs/libdbusmenu-qt[qt5(+)]
 	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
 	pulseaudio? ( media-sound/pulseaudio )
-	spell? ( app-text/enchant:= )
 "
 
 DEPEND="
@@ -66,7 +67,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="|| ( alsa pulseaudio )"
+PDEPEND="media-fonts/open-sans"
+
+REQUIRED_USE="|| ( alsa pulseaudio )
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -89,10 +96,10 @@ src_configure() {
 		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
 		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
 		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell
+		-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