gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-im
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
72 files changed, 1220 insertions, 807 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 139586e0d8e2..04654904838a 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 951cc90651fd..c54fdd1c9a98 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -3,7 +3,7 @@ AUX bitlbee-3.5-verbose-build.patch 5790 BLAKE2B d5ad371938cb7b8a2f9e0925633602e
 AUX bitlbee.confd-r1 291 BLAKE2B bf576c629a6554127a8ae54a54d9ac03cc68accdf226376620727f0f77eab60610ad096b084e7b1568366376b8c7aacd180f2dbd276369af4389c8cd4791cbb1 SHA512 e5dcb6bdfd382b28011c5fc93273d45bfd9af0c652e4f8db1c0d11615b38c5dbb7042d9b33fa5bdce844593e85a5776f2b19f75e9a67a2c46dc88b90f260e11e
 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4
 AUX bitlbee.initd-r1 675 BLAKE2B fb9c803301bb73b1bb6a92d059ca85fbee119849cd27d92c9bf995e6e4dddffbc73960784b4102dea0c0f7b92990364426163c3c0291097303727fd47cf7acfd SHA512 5c65b85e72a2013454becceaab0d08e5e69bb9072c6081f1c4cd3cef87104b2413bcc432a1db0a761e91e42cf72df2344101fb0f886b88fe60882e26d597f921
-AUX bitlbee.initd-r2 247 BLAKE2B 066c26d4029571237904fbb7be455b9e1e7d930aedd6a28375fa000ae4146e8e3d7e933213f59ff2bc38958f9c34da8d7da463a7a0cc491e262bbac0491aa30f SHA512 7b9154229c9c5acf8fb480788d665fe8eec6c2038e56a9a24c54ca5ffcff3acaf55614d2ea2d9348f764b8b03b826db9171fe04771affc2636aadd31ac75da38
+AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
 DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
 EBUILD bitlbee-3.5.1.ebuild 3905 BLAKE2B 71381fb2a582c6731362220b919d7866744c898a6b84e748d914d44e8fd523235b74bf66a0f239cf59e2a07b6059687258e8c94baa7d966571c510c700f51a22 SHA512 02c28935d45810448ed53d3b891a6558a1768e96c49e702283a202d1bab58ca9e0dcda7711efc14d0dd9b335283cad691f33fbf43a194c953626486443711e00
diff --git a/net-im/bitlbee/files/bitlbee.initd-r2 b/net-im/bitlbee/files/bitlbee.initd-r2
index 0b3b1a4911bc..0107909aed6c 100644
--- a/net-im/bitlbee/files/bitlbee.initd-r2
+++ b/net-im/bitlbee/files/bitlbee.initd-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/sbin/bitlbee"
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index acc45bfbf89e..0097871d3639 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,6 +1,3 @@
-AUX choqok-1.6.0_p20190726-missing-header.patch 2633 BLAKE2B 337a69d5addaf10e55cda74d40f0ebf7e768be12cf9b9315a29b622fddb5e2ae0ade9107907b8be495ab285f8cc94bb556c1103191b884620e4469f9ec43c390 SHA512 31b87f27d697afabbc41516715e35b5c28a884db454275c22cc5014af965bcd8ba5faac7ef029754a9c706052972fac39df6e4320f346e450bb808a2f409932c
-DIST choqok-1.6.0_p20190726.tar.xz 1184148 BLAKE2B c0c0459de362aa58337ab2d0c4ea03ff516de87bded48f73c47aa48ed791cfeb82c4085c4d333bff4ac1489a27e038da29d5419569aacb17366dc119e776dd67 SHA512 6471d9b37cc78fd3a14cc970512db3a8d44b21d49efb503917a57332f229c34ed735edfea6a74d6c25d8ab8d153331226effd677405d447c4a2faea3e396decf
 DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
-EBUILD choqok-1.6.0_p20190726.ebuild 1983 BLAKE2B 9d5a949f3c6016c414b490ab99f44c27e5b3e4f1c0cf3beee786e652c0c20e0b249ccb7b96069bd3514e6beee748d0df322c1b1fdd8bf6ca33fb72ffe15c20ad SHA512 502c690d6408f2c5eca575f2dab37c7537248e536b686fead44c3b0b2ec5f7e625436e87b673e530728bcd58b44ea8edc974de9874993fa3966888d83cb95a48
-EBUILD choqok-1.7.0.ebuild 2211 BLAKE2B 67536efba6f6d9b50e702a8ba67a9529355b823710865c7cde5559425d0a86d51aec3fab4810f6f8d53998ccfef3eea8929cf6f9af36ec020dd909fe1738aa6f SHA512 f91ed01d97b3bb62da2ea93a2fd068d6d34c1ff6c04cdf8906d3b416fe5faa46830d95b74f686d483ae36dda44da227c1b94b1f85032c3d8db7002f515645f9a
+EBUILD choqok-1.7.0.ebuild 2209 BLAKE2B 69bb8ba8cdc7f0404cdd141a2f4165bba705ad72365cfca447028214b5e330b7c1296ec63521f58055498a83a66b1730792e93d1563ed8ca47cd1b899e085489 SHA512 dbcca756a8293db4d7fd4ea12c56c2e4dfe1c0b5e062e494eb28c0e9ef75f48670740d68d2a5b61c200098be4a30e2ae91e80521e7bdb208b9f8bb30e2295126
 MISC metadata.xml 634 BLAKE2B 30e3ee2973d1de819dba64ce8f5029627248786d73d13a6203d24c9714cd160481b7170c04a4d7e78c2e1d9a2061b4b952938be2df31b3883fabe2323a2a9154 SHA512 fae64251578632ac8f3f74f2a75b30b2e470aaab9103a5a92978681f8194ecd65f8d2162800ede82b7f2574bb1a5142de8bd68db2e383342ec1ac958e39dd599
diff --git a/net-im/choqok/choqok-1.6.0_p20190726.ebuild b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
deleted file mode 100644
index c6bfef43b416..000000000000
--- a/net-im/choqok/choqok-1.6.0_p20190726.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Free/Open Source micro-blogging client by KDE"
-HOMEPAGE="https://choqok.kde.org/
-https://kde.org/applications/internet/org.kde.choqok"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="attica konqueror telepathy"
-
-DEPEND="
-	app-crypt/qca[qt5(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
-	konqueror? (
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-		>=kde-frameworks/kdewebkit-${KFMIN}:5
-		>=kde-frameworks/kparts-${KFMIN}:5
-	)
-	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package attica KF5Attica)
-		$(cmake_use_find_package konqueror KF5Parts)
-		$(cmake_use_find_package konqueror KF5WebKit)
-		$(cmake_use_find_package telepathy TelepathyQt5)
-	)
-
-	ecm_src_configure
-}
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
diff --git a/net-im/choqok/choqok-1.7.0.ebuild b/net-im/choqok/choqok-1.7.0.ebuild
index a6a4bf140c46..dc005d25d769 100644
--- a/net-im/choqok/choqok-1.7.0.ebuild
+++ b/net-im/choqok/choqok-1.7.0.ebuild
@@ -14,7 +14,7 @@ https://kde.org/applications/internet/org.kde.choqok"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch b/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
deleted file mode 100644
index d8b58183e2bf..000000000000
--- a/net-im/choqok/files/choqok-1.6.0_p20190726-missing-header.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 08fb06b63a78888e6703de6ac1a4fd6a0e2791eb Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 28 Jul 2019 00:14:30 +0200
-Subject: Fix compile on CI
-
-plugins/uploaders/flickr/flickr.h:50:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
-plugins/uploaders/imageshack/imageshack.h:48:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl>
----
- plugins/uploaders/flickr/flickr.h         | 2 ++
- plugins/uploaders/imageshack/imageshack.h | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/plugins/uploaders/flickr/flickr.h b/plugins/uploaders/flickr/flickr.h
-index 890219a..7b26609 100644
---- a/plugins/uploaders/flickr/flickr.h
-+++ b/plugins/uploaders/flickr/flickr.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- /**
- @author Andrey Esin \<gmlastik@gmail.com\>
- */
-diff --git a/plugins/uploaders/imageshack/imageshack.h b/plugins/uploaders/imageshack/imageshack.h
-index d9ddc88..63d0e3f 100644
---- a/plugins/uploaders/imageshack/imageshack.h
-+++ b/plugins/uploaders/imageshack/imageshack.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- /**
- @author Mehrdad Momeny \<mehrdad.momeny@gmail.com\>
- */
--- 
-cgit v1.1
-
-From bef6784596bf0b41287ebad81f138e1c8c2a6be2 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 28 Jul 2019 00:20:34 +0200
-Subject: Fix build on CI
-
-Even more missing QMap includes
----
- plugins/uploaders/mobypicture/mobypicture.h | 2 ++
- plugins/uploaders/posterous/posterous.h     | 2 ++
- plugins/uploaders/twitgoo/twitgoo.h         | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/plugins/uploaders/mobypicture/mobypicture.h b/plugins/uploaders/mobypicture/mobypicture.h
-index 098f411..86f61fd 100644
---- a/plugins/uploaders/mobypicture/mobypicture.h
-+++ b/plugins/uploaders/mobypicture/mobypicture.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- class KJob;
- 
- class Mobypicture : public Choqok::Uploader
-diff --git a/plugins/uploaders/posterous/posterous.h b/plugins/uploaders/posterous/posterous.h
-index c7f6fe1..5c9442d 100644
---- a/plugins/uploaders/posterous/posterous.h
-+++ b/plugins/uploaders/posterous/posterous.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- class KJob;
- 
- class Posterous : public Choqok::Uploader
-diff --git a/plugins/uploaders/twitgoo/twitgoo.h b/plugins/uploaders/twitgoo/twitgoo.h
-index ee3f496..020080e 100644
---- a/plugins/uploaders/twitgoo/twitgoo.h
-+++ b/plugins/uploaders/twitgoo/twitgoo.h
-@@ -26,6 +26,8 @@
- 
- #include "uploader.h"
- 
-+#include <QMap>
-+
- class KJob;
- 
- class Twitgoo : public Choqok::Uploader
--- 
-cgit v1.1
diff --git a/net-im/coccinella/Manifest b/net-im/coccinella/Manifest
deleted file mode 100644
index 9d10bd0901de..000000000000
--- a/net-im/coccinella/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Coccinella-0.96.20Src.tar.gz 9297799 BLAKE2B 1a69107e68f7cdf2bcc5b69cca99832c60132eff999b87e4f9e1a5b4b12a6d5a61eed00ce29a29f5f29b099d190a87db3ec00dc1a9ce27081972d37a20016005 SHA512 d19530a6293c3e6cdcda5c6f659acb051d8e6db88b3722deb81e3e418976929cbe415b625ee6b5c356b3a8b0bc2bf2c89e2e0140efeeb002b798e4eb2809b4fc
-EBUILD coccinella-0.96.20.ebuild 1725 BLAKE2B 4a5f58de84283e757f3f89343508ef0397e9365677f72330830e99f050d51fc067885071690cb3350099faecf33cd41d7f700348001b97dec812ac4bba0b6069 SHA512 11ecefafc97df27a30238bd79e45ff10e3082ed90541892c8072f373725df0826181a3da6b09d85c68f79fb413508941adbaef5ebe016a3d89b68908ae5d6027
-MISC metadata.xml 717 BLAKE2B ec64cb7030826b5f688d5518a10a7be5303ed8eefc26aac627b9e235af9eace4cd921d7c844dd6e5323dc03a2b2cfd1d51f63e03ad900054020602dc6c5804ae SHA512 5210b2a405d756c27c8b594fcb86ffd255b2400610c425256b4d9af14797f0bdb537dd5f8be46a672ee09c1b0e1ffbab86865be85e84e0fde5ae534455c1e1b8
diff --git a/net-im/coccinella/coccinella-0.96.20.ebuild b/net-im/coccinella/coccinella-0.96.20.ebuild
deleted file mode 100644
index 1ff0984560c2..000000000000
--- a/net-im/coccinella/coccinella-0.96.20.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils fdo-mime
-
-NAME=Coccinella
-DESCRIPTION="Jabber Client With a Built-in Whiteboard and VoIP (jingle)"
-HOMEPAGE="http://www.thecoccinella.org/"
-SRC_URI="mirror://sourceforge/coccinella/${NAME}-${PV}Src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND=">=dev-lang/tk-8.5
-	>=dev-tcltk/tkpng-0.9
-	>=dev-tcltk/tktreectrl-2.2.9
-	>=dev-tcltk/tktray-1.1
-	>=dev-tcltk/snack-2.2
-	ssl? ( >=dev-tcltk/tls-1.4 )
-	>=dev-tcltk/tkimg-1.3"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${NAME}-${PV}Src"
-
-#src_compile() {
-#	einfo "Nothing to compile for ${P}."
-#}
-
-src_install() {
-	rm -R "${S}"/bin/unix/Linux/i686/ || die
-	rm -R "${S}"/bin/macosx || die
-	rm -R "${S}"/bin/windows || die
-	rm -R "${S}"/bin/unix/NetBSD || die
-
-	dodir /opt/coccinella
-	cp -R "${S}"/* "${D}"/opt/coccinella/
-	fperms 0755 /opt/coccinella/Coccinella.tcl
-	dosym /opt/coccinella/Coccinella.tcl /opt/bin/coccinella
-	dodoc README.txt READMEs/*
-
-	for x in 128 64 32 16 ; do
-		src=/opt/coccinella/themes/Oxygen/icons/${x}x${x}/coccinella.png
-		src2=/opt/coccinella/themes/Oxygen/icons/${x}x${x}/coccinella.png
-		src2shadow=/opt/coccinella/themes/Oxygen/icons/${x}x${x}/coccinella2-shadow.png
-		dir=/usr/share/icons/hicolor/${x}x${x}/apps
-		dodir ${dir}
-		dosym ${src} ${dir}/coccinella.png
-		dosym ${src2} ${dir}/coccinella2.png
-		dosym ${src2shadow} ${dir}/coccinella2-shadow.png
-		unset src
-		unset src2
-		unset src2shadow
-		unset dir
-	done
-
-	make_desktop_entry "coccinella" "Coccinella IM Client" "coccinella2-shadow"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/net-im/coccinella/metadata.xml b/net-im/coccinella/metadata.xml
deleted file mode 100644
index bfbb296357fe..000000000000
--- a/net-im/coccinella/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-Coccinella is a Jabber client with a whiteboard. The whiteboard is a shared
-desktop which supports text, drawings, images, and multimedia in a number of
-formats, such as MP3 and video. It runs in two main modes, a peer-to-peer
-configuration and a mode compatible with the Jabber Instant Messaging system. A
-flexible plugin architecture may be used to support additional formats. It
-should run on any machine that runs Tcl/Tk.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">coccinella</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index dd9f0bebd211..53e2bff5cb89 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,6 @@
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
 DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
-EBUILD gajim-1.0.3-r2.ebuild 2292 BLAKE2B 83dcdcbb109d40b63725336cd82607b05afa912e95b4a0a785022857b655aa61da11bdc77d4370c24c69601777183b791202a8b0fd6e72ea26c470dae1f385ac SHA512 223a08ff376af581392009b3df406250421a7d8d9e68cbf1a6f7cab6cea812e8d733df17e7c827bf5a4d1fd4780db7f60a74e08f0c352cb36aefc22b8bbbe4eb
-EBUILD gajim-1.0.3-r3.ebuild 2294 BLAKE2B 529ddf84890ccce47b78052242d1e5dc16c4ce7c4981b989a2b1616d88a3f14204864a36459b0def235601d6fdac1dc631c7accaf87f3e7247b3dc4a224124bc SHA512 c1006d95779082fcd88f0466a423fc9bd67897e3f2bf08cac610848e0993cc61ff297d263a5ba866a3f82d1af35ab68f3d911260c6617318cf636206288f461a
-EBUILD gajim-1.1.3-r1.ebuild 2456 BLAKE2B 969f60dd05c79e216452a23086268d37f190aabd854d50853633848f4623e27562b080e68e46a6c0955d5859347ad9ddf37ad812e50ba1a59b10efe25c08bbec SHA512 c744cce5c772f2fd144ced05be7dffeaf33b7a3c7a4a4e719335f5efeb1ab8c38a2dddfdaeb2bbea6cb0e8fa2e37476939b8a39cd14b0f0ac5cc04155d0eea25
+EBUILD gajim-1.0.3-r2.ebuild 2295 BLAKE2B 6044bfa83763707df79a7d5f2ae0712f5afcf449ccb245e48f918fd2b21b1517c741bf908b06f4d9d929024a4c00a31861085f0e128fe5689bbd8d6e463fc8b8 SHA512 88e1f444ac5696c6b32f32ae25b35ab9a8f1d3c488cc25475e0cab373571cb4ccdcc6d4c06431f153b02a2a1ca9aea2c2ca6c32e6db104dea0744fd0485e1d92
+EBUILD gajim-1.0.3-r3.ebuild 2297 BLAKE2B aac5800bb3a86e3e81eed09346d611b3062f828c5ea41fc32b28e02408014a7964e6a2733bf804d12a50ebcac3dcbb9fce5de4373790903c7e89d47ebbb682db SHA512 4df1bffc5e5ef45fa49fe4b7192559591d97f083e9c4b68820b36527fcb9b31259eb4ce9dfd985625d7cbc7e1a42704013435021aae2ab326fcae02ae24b74c8
+EBUILD gajim-1.1.3-r1.ebuild 2459 BLAKE2B dcd165d198ccafa0efd800c2a70015ce61e4bda11eb20552e914d93c5628945c6f37244aa01c4baeb615f2ef945364b73a4c79dd056102730c2a2fd860f114f6 SHA512 06ac23a42747cd5c02180415c9de61b073fd285ddcfb11bc75e02153f60de439b1154849b78661d5776d39ddbb92d71ec7ac47f7f958f495f7d3f1e453838bf7
 MISC metadata.xml 1061 BLAKE2B d7e37cec9e291addde0d1c18b155afdadee1225270c7f34f8a916f45ad828353f677f87e6de49994ba14af8cc4773689d7f629f991326e94a43ff36fa9c9b981 SHA512 f9eb4f8a033ca5cca7a2de4a43e98346cf446a20a9257ea95b37d9a6be6051224d55b32272167946c2cbef370cd3c1ddc3b27ce6b8794823d1e9ca9b5ebcac44
diff --git a/net-im/gajim/gajim-1.0.3-r2.ebuild b/net-im/gajim/gajim-1.0.3-r2.ebuild
index 5fc452242c2e..a33e0fe9535f 100644
--- a/net-im/gajim/gajim-1.0.3-r2.ebuild
+++ b/net-im/gajim/gajim-1.0.3-r2.ebuild
@@ -21,7 +21,7 @@ IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
 	+webp"
 
 COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo]
+	dev-libs/gobject-introspection[cairo(+)]
 	>=x11-libs/gtk+-3.22:3[introspection]"
 DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
diff --git a/net-im/gajim/gajim-1.0.3-r3.ebuild b/net-im/gajim/gajim-1.0.3-r3.ebuild
index 619619a80874..31090b16376e 100644
--- a/net-im/gajim/gajim-1.0.3-r3.ebuild
+++ b/net-im/gajim/gajim-1.0.3-r3.ebuild
@@ -21,7 +21,7 @@ IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
 	+webp"
 
 COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo]
+	dev-libs/gobject-introspection[cairo(+)]
 	>=x11-libs/gtk+-3.22:3[introspection]"
 DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
diff --git a/net-im/gajim/gajim-1.1.3-r1.ebuild b/net-im/gajim/gajim-1.1.3-r1.ebuild
index 60aa6556145d..5d1e9b25f704 100644
--- a/net-im/gajim/gajim-1.1.3-r1.ebuild
+++ b/net-im/gajim/gajim-1.1.3-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
 	+webp"
 
 COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo]
+	dev-libs/gobject-introspection[cairo(+)]
 	>=x11-libs/gtk+-3.22:3[introspection]"
 DEPEND="${COMMON_DEPEND}
 	app-arch/unzip
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index fd3eef553151..8198dcc107da 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,5 +1,5 @@
 DIST mattermost-desktop-4.4.0-linux-ia32.tar.gz 95565337 BLAKE2B f81d381656d812274b1d54740d8bd1e1aacc47762c279a4edd1fb2ad9fdd595b2575a92825a37c1b12ab4a0a98423905ba605040cac8f7ababefe946a6bacd1e SHA512 412ebe5c110528372ad462d24c395125c46fe0930515a09ff705693cdd905a71037bd3672c2fe3ccc263addca4ecf497787f7dc70b45e782fbba1413a871eb7f
 DIST mattermost-desktop-4.4.0-linux-x64.tar.gz 94614879 BLAKE2B c83d449e45bfbde229316885210d6bd6eb5cfc6f6791c863fc02d4b1cb6ab9a89d5268e1fe4beb3273ee3b09a408fc5fa4c6949e05da8c19e7d92a13940be232 SHA512 eae1a08cf73199bab1d2b35d68134193211d71fae532486ff328534707c652e8a33cdfd984de79b663f4b40d1f29923c3a9afb8bf6be7bbe9fac3c381dc7f50e
 DIST mattermost-desktop-bin-4.4.0.tar.gz 1295527 BLAKE2B 89fd256e96c732e2e808ffef71e4d615e54d17af24c7392ddc699a18d9df1c5184d9d9263b01172a78b096e8941567abf6ca98789966407dfc2b360e41d1d50c SHA512 7f4d72fe1b90fe17796c1e9eb2c5ff9bf3d3c7ff855585f9f20c1997317eb805b917f3b2a58e6add67668e60a542cb5e3be6202a30af4ce495184335e2b94b3e
-EBUILD mattermost-desktop-bin-4.4.0.ebuild 2019 BLAKE2B 7a4ba61355af783665d75004ab1069bf8b2a523faf89bb9185dfd06ffdef21e7d2ff1f7a0d015b9ecd9f5a641e70f03c7914f64473888c8d79defdc17a4b92c1 SHA512 83e7ac2d829ed8d89fc21239c0fa09464748e8aff1ea8efac796cd02fc1a81054439cacdfc80fc6ca18568aa161aa2039153acd43f0d92590109d3ec78e2030e
+EBUILD mattermost-desktop-bin-4.4.0.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.4.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.4.0.ebuild
index 0f750c99d43a..0f1c0d6f81df 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.4.0.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.4.0.ebuild
@@ -84,7 +84,7 @@ src_install() {
 	exeinto "/opt/${MY_PN}"
 	doexe *.so "${MY_PN}"
 
-	dosym "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${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}"
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index c4086ae6ecd7..495b495fe881 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,6 +1,6 @@
 AUX openmittsu-0.9.13.32-fix-tests.patch 695 BLAKE2B 69dafe6d75ed2ef79f3c208f2566091ce51f8ed32deb85d617b5a74e230c45735e16368e3bfb44f0bf440e8bc503e5295b3cb5f58b9b31e3a7e3e143d883dd4d SHA512 69387e7da115949fe661fd62e3418eab0ad77f2f41f07a767fadbfc96e1561d078c8811ee69e49501b9c410de968e6b8cbc2966446d2c326c601c2d82178467b
-DIST openmittsu-0.9.13.32.tar.xz 2078892 BLAKE2B 4960d3046dfe45568f56ddc4ad77677992ac4dc4d618a926a15b35431955c8f30aa20ad236cc3143bc1a24f64a4635fdc072a1c9f921238f1283b81b3d6befb7 SHA512 671ce8ed1a6f9aa8d15ee0d72ce78e2b5aef556243efacec4b0b434eaf5b0bd1b34aa6a0391e42ead9007011cca88e7ba2649f16456a2bf74d22355d1f308a0f
 DIST openmittsu-0.9.13.46.tar.xz 2183136 BLAKE2B 3935a00fae8aa937fdc2f629a7dbf2a06cf518fb3758e7c1e191247004fa4077f60dbe2a0e3fba9750405ec069c33b6336cc26f990947ecbb1dabfe3b7b586f6 SHA512 bd58189e7c714f74ec6271a94251f4222dcd4fdb8015d6d01ef57e860804ebfa97aab632f3db94da386bb58bbb674bb4db6b659d2c9ccdeedf8ddd9b026a99c4
-EBUILD openmittsu-0.9.13.32.ebuild 1634 BLAKE2B 2e247ba5ad540015e9ee026db9eed21690f785f6f884ae2c0f00948c0024a3f6caa2dc98eca6c64eaca32c4e220e3feced122aec7dffcf44f6cb6f5d3ef44b14 SHA512 df5ffa86c09642afc480951677b1925a5649cd01038c9e08cf2de83d4df7aaef436335f73e055c28b6c419c077d6486ea29cf9010fe5196117db85ee179bc4c9
+DIST openmittsu-0.9.15.0.tar.xz 2302908 BLAKE2B 2800004968a1965d0c91197402618ae4ebaeb7a7d977e79654f296d7d2ca1466d26b86d99810e0502e9eced27e5a664dbb4b0113ec344367fb7b85557ebc0381 SHA512 9e00828053506cf233a4cede49c501da903cc36d49379b891e4186cf10cacfbd596b4d2b7ac551e2e6340a878bfa1155f8696e179ed9dd1c2ecbff61430ed7f9
 EBUILD openmittsu-0.9.13.46.ebuild 1645 BLAKE2B ad9c3d84d905524b88af8a16921ccbc8815afddd9bcb86e9073a8d7fdd19bfecf1aebdf054787faa0426e29b14b5727f28c9b5649c4f8d7a352f5f708c95d311 SHA512 9a12d885e497b4d66fe40684a6ab143e92817c693682c5596374eeca3ace811a6ee5c7a2afcb9b64fe91022e20390925dcd0d4b54bc641e0fa8f3c5504a8f567
+EBUILD openmittsu-0.9.15.0.ebuild 1645 BLAKE2B 258e4a5f65cbee5811619e79aab691794e08ae61e2a976e96730e52da56fe4faec4c0dd7456805679423075a5ba687026befb6915019d90a9189288513cf3bc4 SHA512 a8e92c610fa856f79128244dbaf7d8f55702b9273de8f00f993027c9c6ada3b508f31e9171189165e67966e0b10b06a45a5fc1e4f4c134b79944e8605eef8a58
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/net-im/openmittsu/openmittsu-0.9.13.32.ebuild b/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
index cd5a0bb92916..00915580a10f 100644
--- a/net-im/openmittsu/openmittsu-0.9.13.32.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-cpp/gtest-1.8.0 )"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-tests.patch
+	"${FILESDIR}"/${PN}-0.9.13.32-fix-tests.patch
 )
 
 DOCS=(
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 3a28248c32f8..6fd3e9fb89b1 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -3,10 +3,13 @@ AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 BLAKE2B 5f83a3a9f36810c446bdc
 AUX pidgin-2.10.11-tinfo.patch 892 BLAKE2B 50e16a86ed29510c8632a8d6d2021236ba125a4f8fc4cd5c0408b2c0fcfe8187a4d72df512a2e224fbf801df88cb8f39c2d63487ba0f04934be09315d1306ac1 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db
 AUX pidgin-2.10.9-fix-gtkmedia.patch 267 BLAKE2B 71718c2d469c2418ee4abba9ca1ebdd672094e43773681fca25aeb940a442b56fca7b4342b4e983e4bd75835c80bdbba4171b0c4781c1f4425908e8a3a1f6fcd SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd
 AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993
+AUX pidgin-2.13.0-fix-build-against-nm-1.0.patch 1772 BLAKE2B 2d6c23ca93375bc7b495866f0a0dfb72ac900203358241307abf97bdb9a9bd564cd1f7813209b28c548d729f6d67f35f92da4ec461f307dbf1999ecc58276553 SHA512 8df00a481022b51047fd94b0b8dfced7ce79a5622a31fceeb2ed3c04e6debf13abb7fe7bb4e95d6542d40b7bbabbaf0e8994d35b658c60b4caf1bbdc5aa194dd
 AUX pidgin-2.13.0-gnutls_sni_support.patch 1298 BLAKE2B 1bf2be33e4328d5e52256ced4ee53a4ba7b4a294e7a8f47833950019dfae654c37f1b7dc63d6fe4b1d3f7b4e35fe3a1fc8d527a72660f43b9f16f2f218d491ee SHA512 ebdc088aeec3064e98e5f033f67eefa6c5a38cd074aa04d1bbd1db2738e932326a2abcddb27bd4b4a92bfde84811fec3517d4965cb215bd035762c4f1d006d8a
+AUX pidgin-2.13.0-metainfo.patch 345 BLAKE2B 7f0a56f0de53860c3963bd88c1646570ca0687eec5c3022b007a3519ff7974bb18d7f3aa17abddfa516e1a546282e33b56714a2c2e6d64c2f2e15e696c05144a SHA512 6276d11f408dd26f6749f8ee11a1842eb0d60b8f79f01ba7054f4521e26f2e330ded50e8177368491b76d02a12a2694db3b7c6760193b7da4c52a36df55343ce
 AUX pidgin-2.13.0-python3_support.patch 1156 BLAKE2B be31ac0d0ab07588d2ae635f0662823888a7f844fc1f6f7b498755c447ee78cffc9bbafb7f7c531710d3045795517825257f2786f0c999829656d469bd835adb SHA512 3ae82355321c59b0c4afa916e5c27ff0d2df95951ba363c67fada5634bf5673c2ded01515a3b927f1c6020c5f56d19279e6a7e9715ce766013ad763c4e61652b
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.13.0-r6.ebuild 7862 BLAKE2B 105e3f6c3cda1bf56e25b9eebedd47cbb765b1a73f17d94ce7751c0f1527d4ad62ad09d78328d378c66a3734a2c82c0f1877878e17e4070f38de4b88d3d32434 SHA512 b83b2ea8323a526afc623f16b3bd1a47c5533dd18111331b161d5bfe999c2ca9c19deabfc814acdb9f27f61bd7cd9e4d5e3c81ef0a743e4b3b832d889fbd9340
+EBUILD pidgin-2.13.0-r7.ebuild 7863 BLAKE2B c3a5835561479c42c0b870de3b2996d3b05eaeb564df4133f7f24c2ed3e559bba7ae510f049233c25c54b5662b27b17abed953310566048a990e420f83df08b4 SHA512 daa3adc3cba97abb26047c46ffcb7ec2e3771948c9b6722061c74a50926ed81b4a95392649b69e796ea54e415858dc3f59501f48e214c172e3f4c61419162d35
+EBUILD pidgin-2.13.0-r8.ebuild 8096 BLAKE2B cadd7ac7dabdf8f0a4039c4a201b58b1c455d8a9eb5d45da14c3e8ef44b3dcfa97590e7d9789ef880e92e9e17b9cc857403f48d7afacbc1b664aac52c64893cd SHA512 e346b3c5bd2682bb4c1d9ea31a9dc9eca995983d98b80c3d3a7749e9ff19aefe4541bcdeefcb0fb8de45d8b17a603877be633790bd0c4a1b30300e92166f0d22
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch b/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch
new file mode 100644
index 000000000000..d9d27930439c
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch
@@ -0,0 +1,54 @@
+https://src.fedoraproject.org/rpms/pidgin/raw/master/f/pidgin-2.13.0-fix-build-against-nm-1.0.patch
+
+diff --git a/configure.ac b/configure.ac
+index 04836fa..0a2d451 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1423,18 +1423,24 @@ fi
+ dnl Check for NetworkManager.h; if we don't have it, oh well
+ if test "x$enable_dbus" = "xyes" ; then
+ 	if test "x$enable_nm" = "xyes" ; then
+-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++		PKG_CHECK_MODULES(NETWORKMANAGER, [libnm], [
+ 			AC_SUBST(NETWORKMANAGER_CFLAGS)
+ 			AC_SUBST(NETWORKMANAGER_LIBS)
+ 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
+ 		], [
+-			enable_nm=no
+-			if test "x$force_deps" = "xyes" ; then
+-				AC_MSG_ERROR([
++			PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
++				AC_SUBST(NETWORKMANAGER_CFLAGS)
++				AC_SUBST(NETWORKMANAGER_LIBS)
++				AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
++			], [
++				enable_nm=no
++				if test "x$force_deps" = "xyes" ; then
++					AC_MSG_ERROR([
+ NetworkManager development headers not found.
+ Use --disable-nm if you do not need NetworkManager support.
+ ])
+-			fi])
++				fi])
++		])
+ 	fi
+ else
+ 	enable_nm=no
+diff --git a/libpurple/network.c b/libpurple/network.c
+index c43e3c7..b17e439 100644
+--- a/libpurple/network.c
++++ b/libpurple/network.c
+@@ -939,8 +939,13 @@ nm_update_state(NMState state)
+ #if NM_CHECK_VERSION(0,8,992)
+ 		case NM_STATE_DISCONNECTING:
+ #endif
++#if NM_CHECK_VERSION(1,0,0)
++			if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN)
++				break;
++#else
+ 			if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
+ 				break;
++#endif
+ 			if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+ 				ui_ops->network_disconnected();
+ 			break;
diff --git a/net-im/pidgin/files/pidgin-2.13.0-metainfo.patch b/net-im/pidgin/files/pidgin-2.13.0-metainfo.patch
new file mode 100644
index 000000000000..34d1dc160445
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.13.0-metainfo.patch
@@ -0,0 +1,11 @@
+--- pidgin-2.13.0/pidgin/Makefile.am
++++ pidgin-2.13.0/pidgin/Makefile.am
+@@ -191,7 +191,7 @@
+ apps_DATA = $(apps_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+ appdata_in_files = data/pidgin.appdata.xml.in
+ 
diff --git a/net-im/pidgin/pidgin-2.13.0-r6.ebuild b/net-im/pidgin/pidgin-2.13.0-r7.ebuild
index aee1ccb0a4bf..4875939166f5 100644
--- a/net-im/pidgin/pidgin-2.13.0-r6.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0-r7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 tk +xscreensaver zephyr zeroconf" # mono
@@ -72,7 +72,7 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
 	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
+	networkmanager? ( <net-misc/networkmanager-1.19 )
 	idn? ( net-dns/libidn:= )
 	!<x11-plugins/pidgin-facebookchat-1.69-r1"
 	# Mono support crashes pidgin
diff --git a/net-im/pidgin/pidgin-2.13.0-r8.ebuild b/net-im/pidgin/pidgin-2.13.0-r8.ebuild
new file mode 100644
index 000000000000..f3f3b6b1f4e3
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.13.0-r8.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="https://pidgin.im/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
+	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+LICENSE="GPL-2"
+SLOT="0/2" # libpurple version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
+meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
+tk +xscreensaver zephyr zeroconf"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.10:2[aqua=]
+		x11-libs/libSM
+		>=x11-libs/pango-1.4.0
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2:2 )
+		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+		prediction? ( >=dev-db/sqlite-3.3:3 )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+	dbus? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	perl? ( >=dev-lang/perl-5.16:= )
+	gadu? ( || (
+		>=net-libs/libgadu-1.11.0[ssl,gnutls(+)]
+		>=net-libs/libgadu-1.11.0[-ssl]
+	) )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	meanwhile? ( net-libs/meanwhile )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	networkmanager? ( net-misc/networkmanager )
+	idn? ( net-dns/libidn:= )
+	!<x11-plugins/pidgin-facebookchat-1.69-r1
+"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	gtk? (
+		x11-base/xorg-proto
+		${NLS_DEPEND}
+	)
+	dbus? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )
+"
+
+DOCS=( AUTHORS HACKING NEWS README ChangeLog )
+
+REQUIRED_USE="
+	dbus? ( ${PYTHON_REQUIRED_USE} )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,simple"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgin-latex
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10.0-gold.patch"
+	"${WORKDIR}/${PN}-eds-3.6.patch"
+	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
+	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
+	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
+	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
+	"${FILESDIR}/${PN}-2.13.0-python3_support.patch" #459996
+	"${FILESDIR}/${PN}-2.13.0-gnutls_sni_support.patch" #708226
+	"${FILESDIR}/${PN}-2.13.0-fix-build-against-nm-1.0.patch"
+	"${FILESDIR}/${PN}-2.13.0-metainfo.patch"
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls ; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python ; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+pkg_setup() {
+	if use python || use dbus ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	use gadu 	&& DYNAMIC_PRPLS+=",gg"
+	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
+	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
+	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
+	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
+
+	local myconf=(
+		--disable-mono
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable ncurses consoleui)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable xscreensaver screensaver)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable spell gtkspell)
+		$(use_enable perl)
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable debug)
+		$(use_enable dbus)
+		$(use_enable meanwhile)
+		$(use_enable gstreamer)
+		$(use_with gstreamer gstreamer 1.0)
+		$(use_enable gstreamer farstream)
+		$(use_enable gstreamer vv)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable doc doxygen)
+		$(use_enable networkmanager nm)
+		$(use_enable zeroconf avahi)
+		$(use_enable idn)
+	)
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=(
+			--enable-nss=no
+			--enable-gnutls=yes
+			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
+			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=(
+			--enable-gnutls=no
+			--enable-nss=yes
+		)
+	fi
+
+	if use dbus || { use ncurses && use python ; } ; then
+		myconf+=( --with-python=${PYTHON} )
+	else
+		myconf+=( --without-python )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	# setting this here because gnome2.eclass is not EAPI-7 ready
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	default
+
+	if use gtk ; then
+		# Fix tray paths for e16 (x11-wm/enlightenment) and other
+		# implementations that are not complient with new hicolor theme yet, #323355
+		local pixmapdir
+		for d in 16 22 32 48; do
+			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null || die
+		done
+	fi
+	use perl && perl_delete_localpod
+
+	if use python && use dbus ; then
+		python_fix_shebang "${ED}"
+		python_optimize
+	fi
+
+	dodoc ${DOCS[@]} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+src_test() {
+	# make default build logs slightly more useful
+	emake check VERBOSE=1
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 8ab480819599..8468ccacdb54 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -9,4 +9,4 @@ DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf0
 EBUILD prosody-0.11.2-r1.ebuild 2760 BLAKE2B 04f7dd33b93b8d479b21b702a778c16fa102699de8fb76251be77d389b0ae9a0f6fb8c50b459394da3f468a44e011aa026f750de0ca92bbfcf29881271854ab8 SHA512 56e6080f603f3202055c64600f7cb431dc41e5d842a2688fb8cb368b180f68750a9c7462f46a7185958c4afd1195a02f81e007e853eb9c1223ab4d7c054f4416
 EBUILD prosody-0.11.3.ebuild 2086 BLAKE2B de56eb47db2d18939cff9dec07807b6cd8fad209d8f6e5f120092d2da0b779ba671555f778d459b563834f062ddb51ca03c9169b66da4e8269446a5bb2bb4428 SHA512 b0d9ce060c061cf8a5f08b37c9fc5d37a88ab6637f6c8fdecebb566206f471b4635d9ff5addc72e91f2116a609f835ec0ca03e8caf139c447813f62b0c9d5c1d
 EBUILD prosody-0.9.14.ebuild 2500 BLAKE2B a85ca7b8b7b23a9cbd5be474cefbd37a633fea25ca5998071a4351c130457e54784dd711f84799fbf65fd9a07a34dc279e1cb112864e2ffadf0f8462225e74c9 SHA512 cec746dc01d58dd74e6a223cdfddf4ab5f50234f5f3262919caafa145264b0b2f1d309f78ebbe504e7dc560185c7ee2f8ad5faa1b4ec3b3a463ac6ca80bf6741
-MISC metadata.xml 535 BLAKE2B 166615e4aa204ca67571e6993630b29953bfa52365db9b47f2d9e2e4a0d2556dedf0b0ec75f373573851a5ce6057af5b52e9151bee468c9a7a21950b238852b7 SHA512 e64eae5144249cf8e4d3e3f7122c30ba8373ebcf68613984edd443c184bff716ed7534f7230c34592af388e9ab1a52b8a4102253a2ffbddb0d0bac16c3ac8062
+MISC metadata.xml 454 BLAKE2B af4163bc7e18ffbab51ee4373985dea8db37408f8ef0982e7bef772ee4317d64018a1f2342adadf77005e120f17d4a706c7920763a8541dd983335f5d1379bd1 SHA512 8830635b65f87575b79745a8116b069e88f9b4a0de359199d6599acf369a60890b6e8cbf67703046ab751164e0b66a25d6f187aee8d9f75943c416c40dce3c24
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index 81c99ed9f72f..93caf7b71d75 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/metadata.xml
@@ -4,9 +4,6 @@
   <maintainer type="person">
     <email>klausman@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
-    <email>zx2c4@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="libevent">Use libevent for event handling</flag>
     <flag name="zlib">Support for compressing XMPP streams with mod_compression</flag>
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index e61c761cdd88..2a07ca9fbf6e 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,5 @@
 DIST psi-1.4.tar.xz 2119840 BLAKE2B 28298f526f23a4bcbb5452ca593163efd50c990a6bc9a2ed54d2136e0b34cf34ad2f1d4a81bd529a013b8aa351e8531f4bf9ea7faf3958085869dd75817828f8 SHA512 9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
 DIST psi-l10n-1.4.tar.gz 3037957 BLAKE2B 2f61c60ee5bc323323ae98ab2eee7d2afec9462850f038fe72816810ef572e4a71a3647f83e09bf948485f56dfbc8dd3bea0a24f6258b13f08867319ca65deea SHA512 ef87a12dd992adcfe5fdc4e88c1d33d6fcd77b2554963e1563cee7ba650d096c3b074795a1a9e650945b1dc46a4936f9520ecd864559b1531cb31763399c258d
 EBUILD psi-1.4.ebuild 3044 BLAKE2B 8806290884b2fba05e96e1a62871ce5725ac3d98fab8911f1ca8cff417782e7e0d1ec17ce526057ae7e531960235a6f6e720f627b0d3b5e86ccd96b63fe242a6 SHA512 e2074aa6e9f7add4eb7c4114cb48d987c2ae8e54e258a84ee08c2db15faf9189bafb099a3d3c4648294fdca8b7f35e3ba91830d34d6756a3910f9b9ef8f34f95
-EBUILD psi-9999.ebuild 5175 BLAKE2B 83a9037c5cfed1b974b30f05844b8c5e10c7a069fc1bdc6b69ae11f14cc38d662853d4f2f0a34857044213cb8dea1fcab58a9c4a0aced35a84f32e1e1a352541 SHA512 c9f50f83972dfbc450f56435919067a828dc7124e02a49b004feb64a1910a5178db8e2bc0d6574bb1e17e51296a566df39486ccb120d8f10a3f26b314e146780
-MISC metadata.xml 1295 BLAKE2B ea05ae35834f7b2dc0660e725671303d1494342dbe68ee7be23a689f60974f4f750cb3569827e5fd86c2f4c4aa809555c90567a32fd6a6e0398b90fc139f35eb SHA512 525be581ea253bbdb97945612871338dfdbb39acb6b2eeeb4aef4d38d3b5e95899f05f6516bcbd23dc2b900d6403e8727b60050899a922a54e939f410c564820
+EBUILD psi-9999.ebuild 4107 BLAKE2B fc7ec67e8cea56c0d46c8ae7daf46fde53bb47b0de8ab493594fc74d4780623dd710cb85defa66701eeb5b625004f8a09d55facea00ae171d253da2dc1037289 SHA512 96f1c6fa0c51ec73669353cab19ec1ec81847e67fd77bf71a8faa80f660efd4686051dcc84a46b60086e76754be080318a59d9d02511c72b58eec9e71d160300
+MISC metadata.xml 1590 BLAKE2B 62e74a8df75bc595d981c86b88e40344d76bddb46aff04aeb02f22207c8061e7b8c19d3794b6019e61790ea0aeaebed8c5dcd09a7070a7c6269f406eebaddea1 SHA512 4cac19074bd1080d9af4105adf61abfd25a7f07cc4d1581683a716bf2546450eda90347e9da0e11d012b148cec2ff35b32906a469000960e1465cb9c167855b8
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 96ff15122396..d1fdaf8e1f54 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,17 +9,20 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>Psi is a very good XMPP client that uses Qt</longdescription>
+	<longdescription>
+		Psi is a multi-platform XMPP client based on Qt and supports a wide range of XMPP extensions. It is extremely configurable and extendable with plugins.
+	</longdescription>
 	<use>
-		<flag name='aspell'>Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
-		<flag name='enchant'>Enable spellchecking using <pkg>app-text/enchant</pkg></flag>
-		<flag name='extras'>Enable Psi+ patcheset</flag>
-		<flag name='hunspell'>Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
-		<flag name='iconsets'>Install additional iconsets, some of them has not clear licensing</flag>
-		<flag name='sql'>Enable psi-new-history extras patch</flag>
-		<flag name='webengine'>Use <pkg>dev-qt/qtwebengine</pkg> instead of <pkg>dev-qt/qtwebkit</pkg></flag>
-		<flag name='webkit'>Enable themed, html-based chatlogs</flag>
-		<flag name='whiteboarding'>Enable experimental interactive SVG drawing</flag>
+		<flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
+		<flag name="enchant">Enable spellchecking using <pkg>app-text/enchant</pkg></flag>
+		<flag name="extras">Enable Psi+ patchset</flag>
+		<flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
+		<flag name="iconsets">Install additional iconsets, some of them have no clear licensing</flag>
+		<flag name="keyring">Enable storing password in system keyring manager</flag>
+		<flag name="webengine">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebengine</pkg></flag>
+		<flag name="webkit">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebkit</pkg></flag>
+		<flag name="whiteboarding">Enable experimental interactive SVG drawing</flag>
+		<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">psi-im/psi</remote-id>
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index e1a2ea1f5729..6e6329011f16 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALES="be bg ca cs de el en eo es et fa fi fr he hu it ja kk mk nl pl pt_BR pt ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n git-r3 qmake-utils xdg
+inherit git-r3 cmake l10n qmake-utils xdg
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="https://psi-im.org"
@@ -20,13 +20,11 @@ EGIT_MIN_CLONE_TYPE="single"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql webengine webkit whiteboarding xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine webkit xscreensaver"
 
 REQUIRED_USE="
 	?? ( aspell enchant hunspell )
 	iconsets? ( extras )
-	sql? ( extras )
-	webengine? ( !webkit )
 "
 
 BDEPEND="
@@ -43,28 +41,30 @@ DEPEND="
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	net-dns/libidn:0
+	net-libs/http-parser:=
 	sys-libs/zlib[minizip]
 	x11-libs/libX11
 	x11-libs/libxcb
 	aspell? ( app-text/aspell )
 	dbus? ( dev-qt/qtdbus:5 )
-	enchant? ( >=app-text/enchant-1.3.0:0 )
+	enchant? ( app-text/enchant:2 )
 	hunspell? ( app-text/hunspell:= )
+	keyring? ( dev-libs/qtkeychain:= )
 	webengine? (
 		dev-qt/qtwebchannel:5
 		dev-qt/qtwebengine:5[widgets]
 		net-libs/http-parser
 	)
 	webkit? ( dev-qt/qtwebkit:5 )
-	whiteboarding? ( dev-qt/qtsvg:5 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
 "
 RDEPEND="${DEPEND}
 	dev-qt/qtimageformats
+	crypt? ( app-crypt/qca[gpg] )
 "
 
 RESTRICT="test iconsets? ( bindist )"
@@ -83,6 +83,8 @@ pkg_setup() {
 			ewarn "and has not clear licensing."
 			ewarn "Possibly this build is not redistributable in some countries."
 		fi
+
+		EGIT_REPO_URI="${PSI_PLUS_URI}/${MY_PN}-snapshots.git"
 	fi
 }
 
@@ -95,75 +97,47 @@ src_unpack() {
 	EGIT_CHECKOUT_DIR="${WORKDIR}/psi-l10n"
 	git-r3_src_unpack
 
-	if use extras; then
+	if use iconsets; then
 		unset EGIT_BRANCH EGIT_COMMIT
-		EGIT_CHECKOUT_DIR="${WORKDIR}/psi-plus" \
-		EGIT_REPO_URI="${PSI_PLUS_URI}/main.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \
+		EGIT_REPO_URI="${PSI_URI}/resources.git" \
 		git-r3_src_unpack
-
-		if use iconsets; then
-			unset EGIT_BRANCH EGIT_COMMIT
-			EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \
-			EGIT_REPO_URI="${PSI_PLUS_URI}/resources.git" \
-			git-r3_src_unpack
-		fi
 	fi
 }
 
 src_prepare() {
-	default
-	if use extras; then
-		cp -a "${WORKDIR}/psi-plus/iconsets" "${S}" || die "failed to copy iconsets"
-		if use iconsets; then
-			cp -a "${WORKDIR}/resources/iconsets" "${S}" || die "failed to copy additional iconsets"
-		fi
-
-		eapply "${WORKDIR}/psi-plus/patches"/*.diff
-		use sql && eapply "${WORKDIR}/psi-plus/patches/dev/psi-new-history.patch"
-
-		vergen="${WORKDIR}/psi-plus/admin/psi-plus-nightly-version"
-		features="$(use webkit && echo '--webkit') $(use webengine && echo '--webengine') $(use sql && echo '--sql')"
-		NIGHTLY_VER=$("${vergen}" ./ $features)
-		elog "Prepared version: ${NIGHTLY_VER}"
-		echo "${NIGHTLY_VER}" > version || die "Failed to write version file"
-
-		qconf || die "Failed to create ./configure."
+	cmake_src_prepare
+	if use iconsets; then
+		cp -a "${WORKDIR}/resources/iconsets" "${S}" || die "failed to copy additional iconsets"
 	fi
 }
 
 src_configure() {
-	CONF=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--no-separate-debug-info
-		--qtdir="$(qt5_get_bindir)/.."
-		$(use_enable aspell)
-		$(use_enable dbus qdbus)
-		$(use_enable enchant)
-		$(use_enable hunspell)
-		$(use_enable xscreensaver xss)
-		$(use_enable whiteboarding)
+	local chattype=basic
+	use webengine && chattype=webengine
+	use webkit && chattype=webkit
+
+	local mycmakeargs=(
+		-DUSE_ASPELL=$(usex aspell)
+		-DUSE_ENCHANT=$(usex enchant)
+		-DUSE_HUNSPELL=$(usex hunspell)
+		-DUSE_DBUS=$(usex dbus)
+		-DINSTALL_PLUGINS_SDK=1
+		-DUSE_KEYCHAIN=$(usex keyring)
+		-DCHAT_TYPE=$chattype
+		-DUSE_XSS=$(usex xscreensaver)
+		-DPSI_PLUS=$(usex extras)
 	)
-
-	use debug && CONF+=("--debug")
-	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
-	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
-
-	# This may generate warnings if passed option already matches with default.
-	# Just ignore them. It's how qconf-based configure works and will be fixed in
-	# future qconf versions.
-	./configure "${CONF[@]}" || die "configure failed"
-
-	eqmake5 psi.pro
+	cmake_src_configure
 }
 
 src_compile() {
-	emake
+	cmake_src_compile
 	use doc && emake -C doc api_public
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install
+	cmake_src_install
 
 	# this way the docs will be installed in the standard gentoo dir
 	rm "${ED}"/usr/share/${MY_PN}/{COPYING,README.html} || die "doc files set seems to have changed"
diff --git a/net-im/psimedia/Manifest b/net-im/psimedia/Manifest
new file mode 100644
index 000000000000..f1c6d8efb3c6
--- /dev/null
+++ b/net-im/psimedia/Manifest
@@ -0,0 +1,2 @@
+EBUILD psimedia-9999.ebuild 795 BLAKE2B ebcf7bfcdfd2a96c10aa5d7f47885902a5a5e239050c8db05049d11d96c84712e1662d571c921b695e285de97dd5f8966d986c2a7e8bbfc04068cc11e076ae2a SHA512 ceb439f43d8754eee42d04060353d34fab846ea97d42fe586a474339c99fe56765e16a20659a4370f06a78ec18edbcd4740a2eb53980894e7ec0b235882a3095
+MISC metadata.xml 536 BLAKE2B 8cb63086e33799f89c336aa6ec57e8967f18dbaa23151d363baf6a632506bf03aa9aa2c926c83404bb0e1c7e197e687f446da63fa9f26d8ad58b7906dcdedb25 SHA512 5132d0d082aa3576591320423f79beddd7a97e95a3cb29fd3c0bedcfe91294327ee3210c5ec20f21c7213190ec31aca76c32b4bb27d7cf088b775427292eda84
diff --git a/net-im/psimedia/metadata.xml b/net-im/psimedia/metadata.xml
new file mode 100644
index 000000000000..1cbe5d29cb70
--- /dev/null
+++ b/net-im/psimedia/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rion4ik@gmail.com</email>
+		<name>Sergey Ilinykh</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="extras">Enable Psi+ mode (required when built for Psi+)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">psi-im/psimedia</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-im/psimedia/psimedia-9999.ebuild b/net-im/psimedia/psimedia-9999.ebuild
new file mode 100644
index 000000000000..1dc21a73f501
--- /dev/null
+++ b/net-im/psimedia/psimedia-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3
+
+DESCRIPTION="Psi/Psi+ plugin for voice/video calls"
+HOMEPAGE="https://psi-im.org/"
+
+EGIT_REPO_URI="https://github.com/psi-im/psimedia.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="extras"
+
+BDEPEND="sys-devel/qconf"
+DEPEND="
+	dev-libs/glib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-jpeg:1.0
+	media-plugins/gst-plugins-opus:1.0
+	media-plugins/gst-plugins-v4l2:1.0
+	~net-im/psi-${PV}[extras?]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_PSI=$(usex extras 0 1)
+		-DBUILD_DEMO=0
+	)
+	cmake_src_configure
+}
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
index 4610d322e2b4..7bdb64cda20e 100644
--- a/net-im/pyicq-t/Manifest
+++ b/net-im/pyicq-t/Manifest
@@ -3,5 +3,5 @@ AUX pyicq-t-0.8.1.5-pillow-imaging.patch 1236 BLAKE2B f394b84f530fc01ddc87ec3e9f
 AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 BLAKE2B edf98d20ea41bed32b3c4952c24f133a6d02a073402d0032140195fc9772eb85421ed202a72813922f61001d4c56e34fee38cc49701e646e1992961cb8e0f3ed SHA512 8b7cb353ff2c6259525909b62a6d552116339fe8489d747f7310fa9013011b6028c0f0dc165307ff5b9fe9da9517852c3e4158eb6f05a51f987e9cf2a969b949
 AUX pyicq-t.service 223 BLAKE2B 3f323776d36115207e5bd81f16c7c47b438bab74772cbcc3cabb5acb7ab992b0cb8edc6b76def436a9d65685d232754d988cb2c7dcecdc8bc5a2152cfdd0ceb7 SHA512 e1df68340f54bc6568308fefcc723323358c27b143cd3258f451ebf06e5f6ac0a7b66d7567543212e5924144164e0d9a2121fb96fa2721b234399a19127850c6
 DIST pyicqt-0.8.1.5.tar.gz 183865 BLAKE2B 5f0cce6fd9d27cf60f6234870644c95e016bc979a167d48a331df47cb25eefca96ed0082d336c931a6af5f25babaa7fdffc0cafdb0374463c066d5c185b02059 SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde
-EBUILD pyicq-t-0.8.1.5-r7.ebuild 1821 BLAKE2B 994bc77aa62b5fd280b8218433b4350bc21447cf811953d985a63a5b606776130e62a463fcaabed1c92be4fb15335ff872f8dff8c3a3a7583a2796465eb0b89f SHA512 0bd681973b32c55b99bf1c6babedfd35eee11b72f4134cc6846da3ff54da76717ac805a3bd411cb963f614d73f821321121f861eca0b38500eb1eded2a49d84b
+EBUILD pyicq-t-0.8.1.5-r7.ebuild 1643 BLAKE2B 412e7f65d05a3eb66181db512a82f457fd51985dda6fe06255e7a226ca7a9d84058c8fa87c5e04dbdbd1f837b28748306849c5e64e37eca529ddb4f47bf98207 SHA512 10498348e90a090e5ee1bb8d6de21e25a0b63be3d223fcdaff9a179b9ecadecf3e2dd09a62a85f7557d8915cfe41634543c47d70c7d507a225df79dfa6061ef1
 MISC metadata.xml 419 BLAKE2B 89f7918635ee4ead843dee7a7b031eefc427b5df2c5edb25a3b891e21046ac346386a1270d69820594cd23957bab8690d0c55246696ffb204d8fe636ae097dfb SHA512 1f30a23054f9f867a94d7e899f5be0780b08cf070c9a2831a34f4fbafe03e19dc9fedb023d3825411104a7322e0d0c8b6928a4f30794511371dd9ec7ea2e339f
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild
index 12ace01e92dd..4fee72e75470 100644
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild
@@ -23,14 +23,7 @@ DEPEND="${PYTHON_DEPS}
 	net-im/jabber-base"
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		|| (
-			(
-				dev-python/twisted-core[${PYTHON_MULTI_USEDEP}]
-				dev-python/twisted-words[${PYTHON_MULTI_USEDEP}]
-				dev-python/twisted-web[${PYTHON_MULTI_USEDEP}]
-			)
-			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-		)
+		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
 		webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_MULTI_USEDEP}] )
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
 	')"
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 38239c49b5af..6af893be0fb6 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.31.0_amd64.deb 92405482 BLAKE2B dbbdfbe47556fabe8713ecfaa76f79d09584fb62b08c885865bb4df5e7bad245fcf9ce735ea9c03eb687343501eed9f9b27aa82b30c8ae0d434b923ff62907ee SHA512 07eef132837285a2348f3c3b253a6964f7446254a93a98b3270393acf54bf59244558fba22cf15ced23f27cc5eb833aecd8bb9c161f366bd6d661d96f9c5e8e3
-EBUILD signal-desktop-bin-1.31.0.ebuild 2205 BLAKE2B 4f94f20041b90ad383d58d8271266a3025fdafba781b9f8ba0033631dfbfa6ebac3d4c443f28fc69b39656d7ce8ee99e6dbb56265657000809ca85250de7a85c SHA512 dd33c5e6828b64ffce8cf65f88d3fa9cda0c858f3f48e7995bb32ca16b704524ca47426e246c159841c167b33646c2e0ebe1b734b04b6bc8e603dbeb0b455f8c
+DIST signal-desktop_1.33.0_amd64.deb 98713708 BLAKE2B 287413498caf2783b4aeaf88199b9b92e7d46214554365aa06e062c61b23267ef695f233d25bedef5410a1ce9e811a84c06281bce3491a0fb57ac310d75f8911 SHA512 ba9c3de12c640d81810f9fb0365a2a9aa5ac8b262c0199a8f83b6d71e29c9bb0abac6c68313dbf67b167e4ce6d317cbe8d676cb056ceacb4720c33d27070bf47
+EBUILD signal-desktop-bin-1.33.0.ebuild 2400 BLAKE2B 0ef74103fa97c0d7e2d4aa561a0b6e6a50485dfd969de43a2d4667fc283e43fa94becc6363a3cacb76c845edf642e1336637044b818f4349fe9476b76dd89cdf SHA512 68cef676e5d6e1ec1fcddaa787420ce728f660e6eacaadaad3c3a09d4d23e25cbd264bbce2f3aceeab50a4fa9009172ba5dacb4e52dceabcfa81163e95161a60
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.31.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.33.0.ebuild
index b056f00e3e55..4f84db2ab7d9 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.31.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.33.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN="${PN/-bin/}"
 
-inherit pax-utils unpacker xdg-utils
+inherit eutils pax-utils unpacker xdg-utils
 
 DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
 HOMEPAGE="https://signal.org/
@@ -28,14 +28,18 @@ RDEPEND="
 
 QA_PREBUILT="opt/Signal/signal-desktop
 	opt/Signal/chrome-sandbox
+	opt/Signal/crashpad_handler
 	opt/Signal/libffmpeg.so
 	opt/Signal/libGLESv2.so
 	opt/Signal/libnode.so
 	opt/Signal/libVkICD_mock_icd.so
+	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/*"
 
+RESTRICT="splitdebug"
+
 S="${WORKDIR}"
 
 src_prepare() {
@@ -67,6 +71,8 @@ src_install() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
+
+	optfeature "using the tray icon in Xfce desktop environments" xfce-extra/xfce4-statusnotifier-plugin
 }
 
 pkg_postrm() {
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index f603439885d1..fbb806391cd6 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,7 +1,5 @@
-DIST skypeforlinux_8.55.0.123-1.x86_64.rpm 107310130 BLAKE2B ec97aeed0159eb91e1e5fa1acf7a9af28e29825e5ec4a422f25115e1daee7e8ad8b5bde11ad65c6b03bd2aecc192f0dfc14fd296ea3a35f077bc4f9e7864c0af SHA512 0bd0ac489f5d1790194146da9299e1e54be289325c0a15f85dfdb4a1a6c8c9a1a21ee36b09603615903d50ac1c389c6d182aa2f3344181503a2e80c2bb76e64c
-DIST skypeforlinux_8.55.0.141-1.x86_64.rpm 107313285 BLAKE2B 31c77745a410805a9e39e8ce708edf6735e1676d2c99451dab8faf012d32ecd5082e848ee24b2e1687f4b3a85422261f98f56c569fc48bb3e68e7853ffa16f6e SHA512 db5244abf4c00c7b05cdc54471e4fd235f9743d1f4493b886b021ebad064522a9157483e29c5bcfc6bf5b84905da4969f3997e9a8785fbcc3bca1bd1f1a0544e
-DIST skypeforlinux_8.56.0.103-1.x86_64.rpm 107196663 BLAKE2B 987d35fe670e0902db0d43bea1071f24e893613ec80db3fd2d41c1080f3ea1178a449687fe85384dad93955990afadf7144af31aec0f188e7da5d0ff85c51aca SHA512 2760cdcc0afbf626b603d6716fba201b726f58d5be4e17a90fff271769c99c5a9802b27d7c88d4307ddbd5844c0d705c5dd6ecb9834b7b754f2c5d987d6cbed0
-EBUILD skypeforlinux-8.55.0.123.ebuild 3385 BLAKE2B 937e32bac771265bbb705468f1a04bcd14b71eba9e51d8e517a91b7d512d3364aac17d05d38fc7a579313e6504467ffa3ef73526c6096189008c8346911dfc9e SHA512 2608b6eb1b8c3034f447dda811c9d9e8fc3a5ab6c4845065f8c95821f06ceb384fa41f68d2250eb3718341d823e0861158077d350a6b98ec83cb85d535ec6cb5
-EBUILD skypeforlinux-8.55.0.141.ebuild 3314 BLAKE2B c88fc1967bf929224e43665aef84eb786f938a51047c5e4fe554afd1daf7056705be84aa449ef881d2ce41b07892cf291607229e4698d51e2c5c968cad71f4b7 SHA512 1d4322b7833cd23737a54f7d9ef58a6cd745505929275b35b6b2089eeb064692e896e2ec253c545e0e7f3c5d3b000b4322aecac477857d59697d68a7b2f916d3
-EBUILD skypeforlinux-8.56.0.103-r2.ebuild 3314 BLAKE2B 05d310eecd9d4cab8f7cf724b8b8ecbbcd1844b39fbfe3fd6d2f48175bad402aa43b14c126528f2417cffd37210376b9b6a7acb67644f30698443a3fa63a1b8f SHA512 2751fc49a06bef341bc178becafa8ee70d9892a5115572f807e0eba8bc56a18bad14699cda8a11a20e0e5cba36c77dc794395583d3a710531d5274c7fa8efd07
-MISC metadata.xml 786 BLAKE2B 3041105c7b5f90dc5f058e92a8542550b1c07fe954a68c0fdad069b309f41a75d1885ef14d62b3bb8defa7b69a4478a3ec37abb09a16153614d498d82877958c SHA512 2332db6f8ec755f6b12c4bef3b7e5819438a38835ad764bbf3466f1560905024f2632fc7035904028fbddc6c368930fcea81bb10f29dec1b9725b658d81208ca
+DIST skypeforlinux_8.57.0.116-1.x86_64.rpm 107397354 BLAKE2B 22d1b41201087b3067e89e583734f0b195103dff52f2023e5cc812a977338f2af7eafe5e82bd3f34e263740a1c2791035ee6b75dc077865fa14f1dcc1189b9a6 SHA512 79b5019be9c4cdb28c3dd166aa76128385631e1bc4e31f0b0bfdb0c7af54494987faf4ab3ed05dc9f810b05e07de916d997d5fe4c722aff089e00789394ef3d3
+DIST skypeforlinux_8.58.0.93-1.x86_64.rpm 108966411 BLAKE2B b74dfe1758fbec9e000be7134d1b575a28077967c95b18955c6b90ac9b3bba1b69b19f91553185939f0e39a1ff80fa26020a383a42940c729d6256df01cf74cc SHA512 907159ac1fead3248114a9bf67a764df9f3ec7deb1b9008b6228d55deacbc6ee150e8496674a484c5be14a59ab33c163493b704c364c822177827fcacfba0452
+EBUILD skypeforlinux-8.57.0.116-r1.ebuild 3116 BLAKE2B b58a55dde3626b2bdb8b72a808e169cf784076fd4c2efa3e7ef5b2c856d117993eb3d045479c2b2a94602fb265c4391f883865b673a2c2a8423a07583121e7ea SHA512 e0c45e1ba64707ded404af3b4dbca7cec82033efbe31c39ea08f5a088b1e9bb713023a4e603bc2ef04b12ae6a70d1d67946c9a742cc2ee97522b337ad8769d62
+EBUILD skypeforlinux-8.58.0.93.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+MISC metadata.xml 583 BLAKE2B 32b774591defdc54f366bca4b0479c4a7589bbfe97b2dc2c1f625a307abcfc26a3818913dd321a6de743ce6a854130478096665b4c924e29510095f742069f39 SHA512 64d055c9d084447e4c3dd25a2ed5954175b7e0f6df19f948d0b604cd450be8f569c763810c8687d91ed050d101330cc488fa61c8930f74dfc03c228e434ff673
diff --git a/net-im/skypeforlinux/metadata.xml b/net-im/skypeforlinux/metadata.xml
index 376761200504..1f095d189f8a 100644
--- a/net-im/skypeforlinux/metadata.xml
+++ b/net-im/skypeforlinux/metadata.xml
@@ -5,16 +5,9 @@
 		<email>onigino@protonmail.com</email>
 		<name>Gino McCarty</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>jano.vesely@gmail.com</email>
-		<name>Jan Vesely</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="pax_kernel">Triggers a paxmarking of the main skype binary</flag>
-	</use>
 	<longdescription>Skype is for doing things together, whenever you're apart. Skype's text, voice and video make it simple to share experiences with the people that matter to you, wherever they are.</longdescription>
 </pkgmetadata>
diff --git a/net-im/skypeforlinux/skypeforlinux-8.55.0.123.ebuild b/net-im/skypeforlinux/skypeforlinux-8.55.0.123.ebuild
deleted file mode 100644
index fc1efd19f67b..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.55.0.123.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit chromium-2 desktop pax-utils rpm multilib-build xdg
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="pax_kernel"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
-	|| (
-		sys-auth/elogind
-		sys-apps/systemd
-		net-im/skype-dbus-mock
-	)
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-		-i usr/bin/skypeforlinux || die
-	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${D}"/opt || die
-
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	dodoc -r usr/share/doc/skypeforlinux/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${PF} usr/share/doc/skypeforlinux
-
-	doicon usr/share/pixmaps/skypeforlinux.png
-
-	local res
-	for res in 16 32 256 512; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
-	done
-
-	domenu usr/share/applications/skypeforlinux.desktop
-
-	if use pax_kernel; then
-		pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.56.0.103-r2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.57.0.116-r1.ebuild
index 941d1e6c04d5..6b1d41e5d34b 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.56.0.103-r2.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.57.0.116-r1.ebuild
@@ -14,7 +14,6 @@ SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
 LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="pax_kernel"
 
 S="${WORKDIR}"
 QA_PREBUILT="*"
@@ -74,6 +73,10 @@ src_install() {
 	dodir /opt
 	cp -a usr/share/skypeforlinux "${D}"/opt || die
 
+	# remove chrome-sandbox binary, users should use kernel namespaces
+	# https://bugs.gentoo.org/692692#c18
+	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
+
 	dobin usr/bin/skypeforlinux
 
 	dodoc usr/share/skypeforlinux/*.html
@@ -90,13 +93,6 @@ src_install() {
 
 	domenu usr/share/applications/skypeforlinux.desktop
 
-	if use pax_kernel; then
-		pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
+	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
 }
diff --git a/net-im/skypeforlinux/skypeforlinux-8.55.0.141.ebuild b/net-im/skypeforlinux/skypeforlinux-8.58.0.93.ebuild
index ef0860964454..c2755ee5b06c 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.55.0.141.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.58.0.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
 LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="pax_kernel"
 
 S="${WORKDIR}"
 QA_PREBUILT="*"
@@ -72,7 +71,11 @@ src_prepare() {
 
 src_install() {
 	dodir /opt
-	cp -a usr/share/skypeforlinux "${D}"/opt || die
+	cp -a usr/share/skypeforlinux "${ED}"/opt || die
+
+	# remove chrome-sandbox binary, users should use kernel namespaces
+	# https://bugs.gentoo.org/692692#c18
+	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
 
 	dobin usr/bin/skypeforlinux
 
@@ -90,13 +93,6 @@ src_install() {
 
 	domenu usr/share/applications/skypeforlinux.desktop
 
-	if use pax_kernel; then
-		pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		ewarn "You have set USE=pax_kernel meaning that you intend to run"
-		ewarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		ewarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		ewarn "you suspect that ${PN} is being broken by this modification,"
-		ewarn "please open a bug."
-	fi
+	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
 }
diff --git a/net-im/slack-bin/Manifest b/net-im/slack/Manifest
index e2a0bcb25d94..cae6e5b31e84 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack/Manifest
@@ -1,5 +1,6 @@
 DIST slack-desktop-4.1.1-amd64.deb 57986912 BLAKE2B eb90dff156eb826f8f15c3ab7c7c7127a321cd73011a11c6e24bc75721f4fa981980ad5b65e4accdce2fb893ac5ad8ddba42133de8285d8a9e10ac08bdb3ed70 SHA512 57b3e7a5a81406047bb9f8f8bb8ac322d3c801fe21919a388ac1457ccc68e50dab961c86a0e36ba9bb308e1832dc2ad00a038cddbad8ea9cc70ac186b37fec7c
 DIST slack-desktop-4.3.2-amd64.deb 54914760 BLAKE2B 218d4ba6cc2057bb92b84bd8bbbf94e70022a9e65363c256190584f0a92e1615642583647af2813e02ec2eb243a3428016b1bff3bfbbc6a98f227aa63a94a967 SHA512 36536be0825e1803704304346ea9db2d1d03baddec954dea0c4560bec2b1800cf3e6d431796d1fcd3b9178e3eb070e9ae6da64e4d3949eff649050cab21d5cb2
-EBUILD slack-bin-4.1.1.ebuild 2926 BLAKE2B 9583fbedc10b84f2d853663aa91c3ed4263a023db470c77fe306798e77421a5b720cd65bb7e320ae1519a10ffdf7cc2ae7fa101bd3422b8b83a218a5c7a7ea91 SHA512 f222ee744f01b9380f28f4b6c9f3730963ba5c572b53e0745cb716047040df6ea66fe6a20643de3e6e378d1acdbf0088f1951ea7ee3abef374272f4bddfc6d95
-EBUILD slack-bin-4.3.2-r1.ebuild 3026 BLAKE2B 226854b9d37a1cce89e4dd7039816ee9c2a5f8f83914bd2698b9ab21eb806c31ebac359a0cad0eb82af730fd172993fc012aefab165631226f3432be221c9a3a SHA512 c7ced833f00d6f6a6a6a16b2e4e579b637043f14c030d9551ce16b5120ff6c0e8cbdc91461e5f5a3779a2ce16a1b2687cf9befe48615033e5e29a18cdeeaeb9c
+EBUILD slack-4.1.1.ebuild 2903 BLAKE2B eaa5a84332d6058d935458f232cefc64914186b9d0f2e14bee3690a2a051e3bd76144791c25ae2ed93e08900b58a407632a13b23422edc4fc7467a7a139712fd SHA512 89ba52348d649b249f2b05373e39be261e4231a4b8194f0bd0f85e34501cf8571e65dca4034e43a4a38774b439ed5cbd078de6346036b0998a0f84f82da30f0b
+EBUILD slack-4.3.2-r1.ebuild 3003 BLAKE2B 8b78fcee36ad160cb340b0c91847e761e04a0a2c76628be8d2e6b3a02f4aedddec33ac22fd4b33bab90a3363d58ec0ef2a5000ba453b43be7c1d8df5539946b3 SHA512 bbe5691b308af8219b12edab3d667e6f894c09f0fca368c20ed7d316aca0c18bca845cd2309e571e8ba4e68a9cbc0c3351493cb6d2d1107d8a2bf5e6a3e5dee4
+EBUILD slack-4.3.2-r2.ebuild 3063 BLAKE2B 34fdbf0b9c974611882119657609be3d8de3d699ce51131d48432f4957c14776844d2e43b179aa0124425ea6cee8f73ccc108e945ae54817a5acfb64e58edc18 SHA512 ddd3ee45b640580427f29afacab7e7afa4169a578a49f2743a7ea8d4d364336aa3600bfe7b6a831d6e588a515c95ed28c83f93872d4a37f941ede782be0ecb72
 MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack-bin/metadata.xml b/net-im/slack/metadata.xml
index 15eca405ed06..15eca405ed06 100644
--- a/net-im/slack-bin/metadata.xml
+++ b/net-im/slack/metadata.xml
diff --git a/net-im/slack-bin/slack-bin-4.1.1.ebuild b/net-im/slack/slack-4.1.1.ebuild
index 010dee24895f..126d156dca1c 100644
--- a/net-im/slack-bin/slack-bin-4.1.1.ebuild
+++ b/net-im/slack/slack-4.1.1.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-MY_PN="${PN/-bin/}"
 MULTILIB_COMPAT=( abi_x86_64 )
 
 inherit desktop multilib-build pax-utils unpacker xdg-utils
 
 DESCRIPTION="Team collaboration tool"
 HOMEPAGE="https://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
diff --git a/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild b/net-im/slack/slack-4.3.2-r1.ebuild
index 701ae359224b..354b565faab8 100644
--- a/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild
+++ b/net-im/slack/slack-4.3.2-r1.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-MY_PN="${PN/-bin/}"
 MULTILIB_COMPAT=( abi_x86_64 )
 
 inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
 
 DESCRIPTION="Team collaboration tool"
 HOMEPAGE="https://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
diff --git a/net-im/slack/slack-4.3.2-r2.ebuild b/net-im/slack/slack-4.3.2-r2.ebuild
new file mode 100644
index 000000000000..3b995394ed53
--- /dev/null
+++ b/net-im/slack/slack-4.3.2-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="https://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="ayatana"
+RESTRICT="bindist mirror"
+
+RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
+	app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
+	dev-libs/atk:0[${MULTILIB_USEDEP}]
+	dev-libs/expat:0[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0[${MULTILIB_USEDEP}]
+	dev-libs/nss:0[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	media-libs/mesa:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
+	sys-apps/dbus:0[${MULTILIB_USEDEP}]
+	sys-apps/util-linux:0[${MULTILIB_USEDEP}]
+	x11-libs/cairo:0[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libX11:0[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+	x11-libs/libXext:0[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+	x11-libs/libXi:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
+	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
+	x11-libs/pango:0[${MULTILIB_USEDEP}]
+	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
+
+QA_PREBUILT="/opt/slack/chrome-sandbox
+	opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libffmpeg.so
+	opt/slack/libEGL.so
+	opt/slack/libGLESv2.so
+	opt/slack/swiftshader/libEGL.so
+	opt/slack/swiftshader/libGLESv2.so
+	opt/slack/swiftshader/libvk_swiftshader.so"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# remove hardcoded path, logging noise (wrt 694058, 711494)
+	sed -i  -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
+		-e '/Exec/s|slack|slack -s|' \
+		usr/share/applications/slack.desktop \
+		|| die "sed failed in Icon for slack.desktop"
+
+	if use ayatana ; then
+		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for slack.desktop"
+	fi
+}
+
+src_install() {
+	doicon usr/share/pixmaps/slack.png
+	doicon -s 512 usr/share/pixmaps/slack.png
+	domenu usr/share/applications/slack.desktop
+
+	insinto /opt/slack
+	doins -r usr/lib/slack/.
+	fperms +x /opt/slack/slack
+	dosym ../../opt/slack/slack usr/bin/slack
+
+	pax-mark -m "${ED}"/opt/slack/slack
+}
+
+pkg_postinst() {
+	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
+
+	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/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 83293ba8cabc..3f9ad045de4e 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -2,5 +2,5 @@ AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
-EBUILD spectrum2-2.0.12-r1.ebuild 2596 BLAKE2B 33d7704a29e5a3c55eb7b694b86986d372dac2a4d0b69c6f323d57f51be2719c9ca87aca51644525d4f9a5a63bb40a16a801c1e23429a6cd8079b94ac5ea781e SHA512 49f9e3671c58c17917f80175b6a83c6d48e223fca04e92fa3027b026dbb8e3c0463e8f12f4622ab97e072bb892cae12d644deb29e7029283951a445aecf80f45
+EBUILD spectrum2-2.0.12-r2.ebuild 2632 BLAKE2B ba13a6558905ef07680dee10fc76761cddae36e286730a86ddf430aef0953afe3fd80fe971a5714bf4b5db158a83a91f3973c793a5bcec5fe774a41fc204190e SHA512 2cd0a1bc261e7e821e4d7118cd6fe3c556837a7289ff619a686e5bb041f25a6f2493bc3aba41451a6ed2baa614706e06befab02c1db0d269cb183e31801ae25a
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r1.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
index 328982615fbe..0bc829465f94 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -87,6 +87,7 @@ src_configure() {
 		-DENABLE_MYSQL="$(usex mysql)"
 		-DENABLE_PQXX="$(usex postgres)"
 		-DENABLE_PURPLE="$(usex purple)"
+		$(usex irc '-DENABLE_QT4=OFF' '')
 		-DENABLE_SMSTOOLS3="$(usex sms)"
 		-DENABLE_SQLITE3="$(usex sqlite)"
 		-DENABLE_TESTS="$(usex test)"
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
new file mode 100644
index 000000000000..c2f875b8f971
--- /dev/null
+++ b/net-im/teams/Manifest
@@ -0,0 +1,5 @@
+DIST teams_1.3.00.5153_amd64.deb 68143908 BLAKE2B fc540de9c70c825b58a6bbc30a8d15882dc80af3b725224617c32a988fa58498e9efafe3b3fcfebab3c5d98c7629cc00fd8e5b5f7a1b3df305449c6a0644b8d3 SHA512 bac34d936e9c34a9d3b31ed800a32c187154dbcf787da350e75e3c63103cbe41872cd98551204e922198ce1d86a06a9fa8b6020b7682b9aea15ff583e446dfca
+DIST teams_1.3.00.958_amd64.deb 65064414 BLAKE2B 4f8788f7a9d3a2cc032e873453469dd3f2a5bd9dd43c60de4b8719e7fafcf903bf266b35b2da16c593005fa1a4dc275bc65cc6164654b0df909a564ddc4cc00e SHA512 ee698784a0c91346306466a1b794c4d1b4ff01ede2869cc7c4731e62ebf16e6f18b65aa0b03452c1011ddd5c654808f1725f62a62a43814cacb9d7a2934fb7c3
+EBUILD teams-1.3.00.5153.ebuild 2761 BLAKE2B 2b4e7292dd91046bfed051b1ced2a22572ce439af91d8e7b948b5f2f1f597f7063f809620cb09656360018fb851711186f1b868ececf043f0f28c36cef9b3ef8 SHA512 980a033171eaadbbf27ef48e04a2f16e6f1b55a1157b3216ed417eaafc34bbdf05fbce0485bfd2a06cd0c96282a85163eaa870d44a275b8ab807c82977fafc49
+EBUILD teams-1.3.00.958.ebuild 1950 BLAKE2B 975cfdd03e7e92b6ca060f24d518092837ab9e106b44531189f1b8f647045ebd979ea72c53e4438508f7e3ae5972f5c40f8ed3e335ffe21fac449009a101c46c SHA512 22988beea775a43604231ade4ab9bfcf23e61ea83972345eb9f75633a4bd0f61d3e48297c6f75bad434913ecae28e0214b1e3ca5f0745a5376560a86d7385f72
+MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/net-im/turses/metadata.xml b/net-im/teams/metadata.xml
index d80086bbb34f..80a71f597854 100644
--- a/net-im/turses/metadata.xml
+++ b/net-im/teams/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">alejandrogomez/turses</remote-id>
-  </upstream>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-im/teams/teams-1.3.00.5153.ebuild b/net-im/teams/teams-1.3.00.5153.ebuild
new file mode 100644
index 000000000000..1993a0370f1c
--- /dev/null
+++ b/net-im/teams/teams-1.3.00.5153.ebuild
@@ -0,0 +1,96 @@
+# 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=""
+
+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
+	gnome-base/libgnome-keyring
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/mesa
+	media-video/ffmpeg[chromium]
+	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
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	rm _gpgorigin || die
+	doins -r .
+
+	fperms +x /usr/bin/teams
+	fperms +x /usr/share/teams/teams
+
+	# use system ffmpeg
+	rm -f "${D}"/usr/share/teams/libffmpeg.so || die
+
+	cat > 99teams <<-EOF
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/chromium
+	EOF
+	doenvd 99teams
+
+	# use system mesa
+	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
+
+	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/teams/teams-1.3.00.958.ebuild b/net-im/teams/teams-1.3.00.958.ebuild
new file mode 100644
index 000000000000..bc3dc51c39a3
--- /dev/null
+++ b/net-im/teams/teams-1.3.00.958.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
+HOMEPAGE="https://teams.microsoft.com/downloads#allDevicesSection"
+SRC_URI="teams_1.3.00.958_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist fetch mirror splitdebug"
+IUSE=""
+
+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="
+	media-libs/alsa-lib
+	app-accessibility/at-spi2-atk
+	dev-libs/atk
+	x11-libs/cairo
+	net-print/cups
+	dev-libs/expat
+	x11-libs/gdk-pixbuf
+	dev-libs/glib
+	x11-libs/gtk+:3
+	dev-libs/nspr
+	dev-libs/nss
+	x11-libs/pango
+	x11-libs/cairo
+	app-crypt/libsecret
+	sys-apps/util-linux
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	media-libs/fontconfig
+	sys-apps/dbus
+	gnome-base/libgnome-keyring
+"
+
+src_unpack() {
+	default
+	mkdir "${S}" || die
+	cd "${S}" || die
+	unpack ../data.tar.xz
+}
+
+src_install() {
+	mv -v "${S}/"* "${ED}/" || die
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 836a2278c08d..880c576e6599 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,10 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-1.9.12.tar.gz 13693698 BLAKE2B 8e68806e4174c5d2f53a7b4a600e6d8ca87085c20391fc5330098e3ebf3da3f0a1dbe0aa69634fd016ba2a66fac4d284e28a7805117ada2b0c9baf28e959686e SHA512 8d77e291bfaca23a4eacef791170794a955b202ae12adf5765c0a462cb7a201e0c8d959ed1c0b2872d50bc546700220b388a981f47adf676a24fad25f979c144
-DIST tdesktop-1.9.14.tar.gz 13693795 BLAKE2B d0901c454144da448354d3da6104bf6e1dcf9253a19d39df2dd53b9061be8e5a93eda09cb47511dd343c4ef567b789939840880cc7bbd87abba6c00ea6bed21e SHA512 9f28ca3eba6d105e2f983560cd20d65e397fb174919ebc8a8d416f9197d64ec4e32806e08dd4a2ee4c343d49338d1efc53ed9b6a95cecd72f6b4f765019337eb
-DIST tsetup.1.9.12.tar.xz 34242788 BLAKE2B d50b160993cfaf66e99ef670d8812a6b642fd48ac91b11ea34a0654787d71c056e4b621f9198ee8dae1fab74c218f5953057b8f234f1f1a2d2681d130a339660 SHA512 d747299cc06474d1cf756b01724d24eaf84fecabb8fb63dba8024ac12b5acfacf5ca80c09bfb7c8008a80ad59f600ef018954ce250678dc26f4658c197467fda
-DIST tsetup.1.9.14.tar.xz 34242348 BLAKE2B 7e3c282759a48391280f2184e168fb7e98f949b4385b47f4847df9ef27ffda2375dcb2027f99e2140a4fa48bf479e402e67d38bc62b780f9f8bdd9cd1fc475a2 SHA512 0519bcba38325c5ec201e44d05e144e7dbd25993065d03e6c6660f23129ee65bbb896a7bcb2a7892b7604b004b3d41905ee8959ea5ab30c438d2c4c110e80a2a
-DIST tsetup32.1.9.12.tar.xz 37032144 BLAKE2B 2ffc74ee1955ee7b1dd9250d4fa2ab29af29432d3a4f6dbb64d8551dc144c5dcbef80712e8941fcc68c03b0e0e48861e664ec8a62500e4c98e0f3ca591c2ca96 SHA512 62550f2a7c091b507eb820663aa2d6711bd366c3670411fb317a8912d467f96d504824c43916a6bcc1ff689868884f10bb5e4a6e7d228ae471b885f94a807800
-DIST tsetup32.1.9.14.tar.xz 37037764 BLAKE2B 460baa504bd90cfe14a3a78ee6a15faeff5d668db5de2c5d82ccd841f5cee170c3d474b064fcaabe249e5931f90d9ddd1fdb90ef1ce7563495dbe22a30407e3d SHA512 ff6d23c312cca8f2aa377d2ec31664d2e30ba6ccea8e3a5c53b4221d471e07127b794ed9bb4de9f57efbce9fb3d87c63f9da8432cb5aaaccf22f92261d0fe9ce
-EBUILD telegram-desktop-bin-1.9.12.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
-EBUILD telegram-desktop-bin-1.9.14.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
+DIST tdesktop-1.9.21.tar.gz 13712474 BLAKE2B be8b031a959505da62348a4d259ae3689d0953b37386fed4d0117fccf0284a7e4d2aabfda6a50354f624f026388331eb2ae8e282f08250381e938e4e06d90f73 SHA512 f6dafcbad6ef5d74d3faae575c63f4088a1f0462a8a0d22c972158c02c11a1618fba088c99275590333e1efc70fc7ccc057d6041b3b8679c9e3b441a3cc94221
+DIST tdesktop-2.0.1.tar.gz 13966764 BLAKE2B 43cc5d27c514ab7fa5517da1e6dbb1fd88655d8d3ba4a7b58d4f81be6d418fe3580e6944a90a70c6da198e09d86e84af09cfcfc2d0b6aacff0ad6f4fc3256bef SHA512 dcb7d93e3ae0e87bef342bbba6f95d50e8886f286bd606874155ea6f059aae2e656f0cf9e81732369c3dd21a6831587bcae59d39052c5f7d90fbfd4016e6a0ff
+DIST tsetup.1.9.21.tar.xz 34714240 BLAKE2B bf4e902006a08a678848fcdaf2a45a0f1d30c60005a922bb9d5c0e7c95ba01b3f8e55882f5ed65630f1d730166cd523e3713209e2a99d7cea7c490d738fa3b83 SHA512 0bba5d04f20fbe48b8672cb6b24acd6e5e8df700813f3f49074d06bc38d62ef8cf7b4358ec6d98afe05cef385cbbfa156fc21bc80a522ccdcf0acb6b05cdeeed
+DIST tsetup.2.0.1.tar.xz 35029188 BLAKE2B 6e528c42af1bb4a86068fa0eed7a3755efd49246dffd08c85492f40531624d37a76aa7f3e604abcb30b13b43ea8a458bf9d3c9669db4df5bdcba496701b3b9d4 SHA512 eb19b48ddb2de5443871e2d4c838f4f78046cab2f6037a2aff7f164f61905c5b5510688a968fc1ed51d1a1f2695bbca3a0b0f839c208513b14984737899ccfd0
+DIST tsetup32.1.9.21.tar.xz 37595672 BLAKE2B ee142f3893051cebbc1a507932e3a64ba446f7740a9e9761dbc8b97c6af29441d94e6e5a1319ef9bde1a21ffe1337913b4fdbf824b9da40a8e31c097944b0e1d SHA512 6262a611abd56a3ab91b64c9e80d8d64dac47fa9eb4b9f8c5c55a29aaf130bce94673386685fe829aa0ded5f5bd452e511a05c1d4704b7b3d0fe307aaedd3af4
+DIST tsetup32.2.0.1.tar.xz 37979332 BLAKE2B 3cefeaec2f269c509aaf06952ca2ee8226a4dcbc1bc80ae26f10bc11babb153ef7937b49647f4233fee6f4c664f902cb667701d4c7c917507cf461cad46c6dec SHA512 a461f284f68f7c59842ae71a628d1a3623d96cb1a07bdb23e5cd6a60690e431ffb35e47cbbcd55653a82019564fdf90edefd8585c4612135c094e13a1f3a0401
+EBUILD telegram-desktop-bin-1.9.21.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
+EBUILD telegram-desktop-bin-2.0.1.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.12.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.21.ebuild
index c0971f7fc9b5..c0971f7fc9b5 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.12.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.21.ebuild
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.14.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.0.1.ebuild
index c0971f7fc9b5..c0971f7fc9b5 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.14.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.0.1.ebuild
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
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index f52bedc2ba93..53dcf2c94909 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1,6 +1,6 @@
 AUX 5.16.5-account-fix-property-name.patch 1053 BLAKE2B 283fde75d8eba3f8c4240e49298233930d270c48ead6b3a4651de7553c35e74fb3b72108f570bf6133acac38f1751e2355b260b28af0d6ef9c8cf5c5102ada80 SHA512 a0161ddf307f9a690b1c741c20aee8fa05f3378da880d1a850f80cde0fc83fe2a95c541d4cb641d1e70995cc6cc75d27b6c5a8c110ec7330ad2a9a75df297012
 DIST telepathy-mission-control-5.16.4.tar.gz 1102177 BLAKE2B 4c7ad46c472b6bc20b559de48602bcee971fda5ed2fb139d4a67793ac0f2871cfff6db5f9775a3626e1f1860fe41f8e4d520f00d05d7230064d30b21cb3397bc SHA512 5ed624df2d041554af074c22a18db2405fa5bd41bec40edc574382eb9d8b9f93ff6f4be3042d27f950694a353f4192670e200f5f8865419701ca520a973959ed
 DIST telepathy-mission-control-5.16.5.tar.gz 1125142 BLAKE2B 1f39336d8221ec9f297ba9eeaed39ffc30d5b2ecde3b02148343cfb9bf4ec15d949a36feb6b92cef17d70f786840b8df9cf159eb8eb00462c64bfb8b41437b57 SHA512 6adeb3033853bef5b732e7b85da49b75bffbdc57d968b1e4313fd1452eaf8db96c3f7f50d41ebb7bfcb084a7f093a9eaccdb28c23d2777e149a90dec6d4ef4e4
-EBUILD telepathy-mission-control-5.16.4.ebuild 1231 BLAKE2B abb26a025a3ca01bb73c0528d3c28ae121ce2ea0e814590f9b332b8dfd061f7e9738190398de844cb026f4146fb3febdcda27999b7a8680043ff0339789d5326 SHA512 1f90275fcc9bd088a7e525688083caff3c71732a1be66f71ecb059c10a3ada9875ac1a6073329d33bd09b0be5e68ccda7a296af68fc2c7d60751fe59b37891b8
+EBUILD telepathy-mission-control-5.16.4.ebuild 1232 BLAKE2B 02dc63e6e3198a5e8bffba57006edbf4997e8c5d3d67701e6037a7955deabc4230a36c01e89b96a2327206cc2209b0dd6f5329849fb1a60ade88166f7ea2946a SHA512 114f406f81181f6a723a20bbfa451870e539474e968719a19d363f0ad6fd9b2ad2a8949a3235c6331eb36a58d17967549e657b4abde2c3d90d33b199f3332596
 EBUILD telepathy-mission-control-5.16.5.ebuild 1311 BLAKE2B 123bedf3af95e0461a1cdd482690021ba02b1f97469b1c9174d4c1a0f2a1a74617392815288d8abecffb0af2d4d11849ad7a72d983e23ba9b3035f6a4cd337cd SHA512 7de43867d1878a5ac91279bc0be97006acec861a458ff0e9eef4fe9de243a1ecff1b5523ccf700408702bca0a3e589b0b695920f7facbe6bb69412df89e57805
 MISC metadata.xml 599 BLAKE2B f96e565e553f14b0ab55f8b53ed520e9253611da9cf26b5f43ba35cceeb808a9be1dfc4968929ab62faf3af116d3c98c4e89b63260fb6779f397cfce4f06dee1 SHA512 fba9a9332501e7fce4d62efbbb643cde3579a393918cf6ecc59cb1aae6bd04adfb62d379d446805d01ebed51f9799ad453fdc7490268616e127ff128142f4868
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild
index 244996b4a729..b9cbec04dfcd 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug networkmanager" # test
 
 RDEPEND="
diff --git a/net-im/turses/Manifest b/net-im/turses/Manifest
deleted file mode 100644
index c2a251bb75c9..000000000000
--- a/net-im/turses/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST turses-0.2.23.tar.gz 2241497 BLAKE2B 22414bb7fa84de36e5532ec458d12462de7ba5024dceb01b780f1a2b66a07d7e4906fa2c486905c1543028f99e2c213a994901971d65338a10d8ec47995205aa SHA512 ef5b880319f4126a99787cd11fa4573b6c6ff626a759f2515ad507006625f1192e4ca1552ca687ca8ecdf2545a17c228fa956019c325d582e7f80bd8a3e6432b
-EBUILD turses-0.2.23.ebuild 1137 BLAKE2B eb41583ad522dcdbedd5e384c5b205964a173d0361ab5e9753b307e5e5a32007e6c51692790d22302b0066499363f70c2e56100c598f67c25d461efe73043017 SHA512 d75061ebaa5e779cab799e1df987fc2bdc5d483185c5389e572a42402200dc66c057364f5f378ac52b060e43775a259decb566ec1effbb2d254ff2bc439696e6
-MISC metadata.xml 258 BLAKE2B 2476550ceefe5fc1e93060e503b807fdad72d1f986218d19d03b9f585b30f8a8bfdf5120c766cd7fb622a6aa9999d27683853d00462e6442a7d890b9efcb5902 SHA512 2cbceb342ddfd9d396111dd47218cad48ac7296fedf4781373439c9cae59ed3caa720a5b25b427f90acdd0a27bbc4355ddf2fec5f7e82f8655bc3a2076d527db
diff --git a/net-im/turses/turses-0.2.23.ebuild b/net-im/turses/turses-0.2.23.ebuild
deleted file mode 100644
index 0bcf36089c13..000000000000
--- a/net-im/turses/turses-0.2.23.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line twitter client"
-HOMEPAGE="https://github.com/alejandrogomez/turses"
-SRC_URI="https://github.com/alejandrogomez/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/oauth2[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	>dev-python/tweepy-2.2[${PYTHON_USEDEP}]
-	<dev-python/tweepy-3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-	emake -C docs man
-}
-
-python_test() {
-	py.test tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman "docs/_build/man/turses.1"
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
new file mode 100644
index 000000000000..c960d410f73c
--- /dev/null
+++ b/net-im/zoom/Manifest
@@ -0,0 +1,9 @@
+AUX zoom-videocam.svg 284 BLAKE2B fa118d489cafa1c14841c27ab4962c41d52987ee49b8ad0fb3e4c33d7cf376920e16a8f7358807d0809231fbf7ef8cafd4752ac90e85cc7395a56fbe07f6340d SHA512 a60345de0c86003dc49484fd5d3d22e3228b8b1c107796690289a7779769436809dd22b02b4951df2fc1e3a98c541dec4b0788ab7d112b2b9c8c29a46493a98d
+AUX zoom-videocam.xpm 806 BLAKE2B dcb9d7e2a90f564ed6b7f0b733efb72867ecf2418177b25ecd5a00e204ab9f0f89c2b1f3b3078b3cf326c8c523480f183170a82d896b73848e7596b32a351a9b SHA512 a49e7cce25e6b3a1492b2ed834f7fe8f533b5374b0c4eea4089003459ac011ef264175c5c2322cceb77f8fb67e939e90e9abddeef415d2f570add8301cd10a48
+DIST zoom-3.5.382995.0407_i686.tar.xz 48494772 BLAKE2B 13d678c36bac7e5705cc0608d0ca49d943e56b492cce802f41ffe6bbb307336fef4e710346f33e596faa84a449b1f69ef944e462b694aff016051a834e1d2a89 SHA512 339abb803cd08e6835404ff2f1140b9ee73294a8820828d833b64e3bfe619fd24eb18c475b78a0f795a63dadc8ffd6593563710d6e8ba606fcbf3ffd7a007c33
+DIST zoom-3.5.382995.0407_x86_64.tar.xz 72616840 BLAKE2B 3a20f9346305ec84c6b14233724dce6ab285810e7c59ed482139e902f088e2cf7f1f48d769fe0f0990128f92aa4221f7fe5f69e9d5859fc5bf6d57378ec25507 SHA512 d0612f83d23e93e84db5dd18c55ebc6b3cba17b9479ff812276e0d1fb21fb9fbe2fe5f38329f5e30cd7acf6c7f88fdf09d6dd31d223e3edec0bc1142b358bb8b
+DIST zoom-3.5.383291.0407_i686.tar.xz 48489396 BLAKE2B cfce6356e1f2cea29f9330e18402b7872f93f5fdf4c136f6b40060a2440536b3656ce7fdb28db9721f92f2f462ff4a99d6efb82d4f08bf58ef1a3425dd015665 SHA512 92b6db2bdf6531a876a93069654448a77fa25e645d669df7144d8a8514d63ef9336cef9bfbd9bbaf7f1ce001b26ca7bdb39b19b7549c2b193ee0292f0522e47c
+DIST zoom-3.5.383291.0407_x86_64.tar.xz 72618832 BLAKE2B e9fa38fae525688f8d9f14a0c2bfe04201edfe2719d075caf9d9de0a2454010b68a6d1df0cd480152641f5763caff7aab1427fee268e3c8239797c792551b709 SHA512 531ce43fdeb4c4df50a85e8a28a90f25d9df7c97b87014fef1e9c94836abbc4d6e76f081b2418c6e538052a2f69e052e0a1ebb9bb0dc33cffffc683bb5b2aef4
+EBUILD zoom-3.5.382995.0407-r1.ebuild 2863 BLAKE2B a3ba4646134409f5bb3dcb4726de9b6164699dfdd301bfbd10efc4a38ce619397311d1022617aa4c7b8012d48cfcb18348808c9d5db36935c8ce63d44f4a2ada SHA512 f10b3d8eacd9eb5f6d0d093cbe9e53c9a2ae76df2dd0b50c58c808e886f598ce56ac7c299e6860cfbbc4d64630d8c5e26b0f5d4ca7fdfa7bf36c949e32e2a089
+EBUILD zoom-3.5.383291.0407.ebuild 2880 BLAKE2B 929e1aeac09009c1d5c2a8429568ba516ae80a6416bd8110b50a0a6ac885acb5169d61ceee63e6fdbb659d7625af129b3caa535e00fa34dbbb4bca3d350136f4 SHA512 ee4d1a8a680bc946972b7bf5bc11e4eef5890196624ce9e05c7c71926953f8655e7253a5f812898a6e4477be17a7ef2c34cb28243ac6d200d7886ddde2559210
+MISC metadata.xml 523 BLAKE2B f258ebdf8e4a2e067f202ede6324203b640c6a7fce843cc4b42cf4eef6efd97620e50c22c80f885d09254e403f016758d7dd3ba1deeef0c26692487a2ca9ba35 SHA512 9746752364f19f9e17516315231c8efef278f4d77ddcbfde213b5a65b012d6e320a20536e44ac5a111b2370a21cb59eb7a88c5c3fd2a1dd44064702d5e7bca38
diff --git a/net-im/zoom/files/zoom-videocam.svg b/net-im/zoom/files/zoom-videocam.svg
new file mode 100644
index 000000000000..33e4ac77b9fb
--- /dev/null
+++ b/net-im/zoom/files/zoom-videocam.svg
@@ -0,0 +1,4 @@
+<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
new file mode 100644
index 000000000000..380e86f2cc27
--- /dev/null
+++ b/net-im/zoom/files/zoom-videocam.xpm
@@ -0,0 +1,32 @@
+/* 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/metadata.xml b/net-im/zoom/metadata.xml
new file mode 100644
index 000000000000..df9fc1aee0d0
--- /dev/null
+++ b/net-im/zoom/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ulm@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>mva@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="bundled-libjpeg-turbo">Use bundled libturbojpeg
+      instead of <pkg>media-libs/libjpeg-turbo</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/net-im/zoom/zoom-3.5.382995.0407-r1.ebuild b/net-im/zoom/zoom-3.5.382995.0407-r1.ebuild
new file mode 100644
index 000000000000..a5ea47ee80d5
--- /dev/null
+++ b/net-im/zoom/zoom-3.5.382995.0407-r1.ebuild
@@ -0,0 +1,107 @@
+# 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/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-3.5.383291.0407.ebuild b/net-im/zoom/zoom-3.5.383291.0407.ebuild
new file mode 100644
index 000000000000..3dccb750177a
--- /dev/null
+++ b/net-im/zoom/zoom-3.5.383291.0407.ebuild
@@ -0,0 +1,108 @@
+# 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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-im
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)