gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-im
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
64 files changed, 1083 insertions, 926 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 01548c504586..26fd2d3e0fa5 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest
index 876d57647af3..894ec9227d89 100644
--- a/net-im/bitlbee-facebook/Manifest
+++ b/net-im/bitlbee-facebook/Manifest
@@ -1,6 +1,4 @@
-DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4
 DIST bitlbee-facebook-1.2.2.tar.gz 71918 BLAKE2B 674cb8565f88faff695d5b14010036f6d3c65bcdab9a6fba84c5f0d775a59d02abfd863be5af4ddc7c3361a49c6345d0ef57bbd8b02202b7e24e62b31c2c6844 SHA512 534e7e704e7ddd296c810819171b9c4770747dde109a9bbdfb41fc05602b1d9ad9bfd2ec6c7a62ffb0c85ec61252b1597217cdee7ccffd191da897a7d40085cc
-EBUILD bitlbee-facebook-1.2.0.ebuild 751 BLAKE2B f6e26cabe57d09ba3cf2764c9252d745b80297c59e62068b81ac16ac63bf4500004671d533111a28ca870058089f4a4753af7d3894d6433d8aa6d75a825a6e33 SHA512 5ffad5d5a76fceeb5f9264d0649cc39c6df296b1941a25a043ba5b975a9a6a1b8c2aa343deafd5ea0b822e5fdc6b88bf992a65530633fda60696282b022a363d
-EBUILD bitlbee-facebook-1.2.2.ebuild 752 BLAKE2B d600aefb7d74124083419442706bd469e876fcbd3442f5027d00bd8e081fc12d98d9d7f56cc03576166e03773f3bd51e05b9d7d7a3dba32f2d3b4507764e5d18 SHA512 d45f5b9c6392330cd7008ce520816df992c398f69ff573753574afb23d909232e0200e895350080eeecbc1c112c4afe15de7598aea59bdfbb34e03b3c46568c2
+EBUILD bitlbee-facebook-1.2.2.ebuild 751 BLAKE2B 8807a4c4233572d7ac4ec79c6e0c6fbe5d39178a59aa5a603c3c81c896d076e4a1a1293cbfd5731ec4114ec9d7178ad53b451cf244a7603c1439808f20aefde8 SHA512 c4d15b3464192673f919ca9213ee9b7f02d09094296be7a75fe0ec7e51e94eaf476ee85bc87bfb95e166187d45432594f81c4190dc80f385c6d19476f99c9cf9
 EBUILD bitlbee-facebook-9999.ebuild 753 BLAKE2B 27a143ad5011f02145a6f15341da55b954272fea34a001c48bc2690255928bb81f636de9cb4310b9b54ea4c4d3637b3be818736e20cdc606deb17b94367e39fc SHA512 21302c339cbf958640919e11ea0e5417c581592bc5273e26fd7e2e3886234263f0e4e1942bcce913f478b5df153b6676846c03a730d128dcfd357c82042890ef
 MISC metadata.xml 665 BLAKE2B 611317a544ce455d13575f66f00c8aefb8b90ca520d24cb3e817ac70b538b5a8ce8463bc9ca1776385bf210adc911c62fc9b06fde33b13c8605f51824367152c SHA512 bd6161cf34216635c2a5e54bae4f5c300bb3144fc3ffa6acd7cf526143cb80d1ec5750ca8507da02433766c69d87c1096bc5ae8e0bdb0337bfe1d0d757436f55
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild
deleted file mode 100644
index 79bb0580ebe6..000000000000
--- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Facebook protocol plugin for BitlBee"
-HOMEPAGE="https://github.com/bitlbee/bitlbee-facebook"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit	git-r3
-	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook"
-else
-	SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	>=net-im/bitlbee-3[plugins]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild
index 05889a8ea3c0..f220232e1764 100644
--- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild
+++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-facebook"
 else
 	SRC_URI="https://github.com/bitlbee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 RDEPEND="
diff --git a/net-im/bitlbee-steam/Manifest b/net-im/bitlbee-steam/Manifest
index afb7eb1cf28b..698c0a52e0c2 100644
--- a/net-im/bitlbee-steam/Manifest
+++ b/net-im/bitlbee-steam/Manifest
@@ -1,4 +1,4 @@
 DIST bitlbee-steam-1.4.2.tar.gz 43003 BLAKE2B e1c24c59d1d18a839760274b4f812757b1d5d36be489b49dc3dd3370fe8eea6483b089f506c5127c3b01f4529c83817b53aec6751150eaca87204b30cbb791e1 SHA512 c8acf584052246112b76c433e26805ade204802173147b9f1b73778f1300557df41ab97562a1cfbc20ad1bb0288718d62c03f90b7d11a9faf4d647938009ee48
-EBUILD bitlbee-steam-1.4.2.ebuild 724 BLAKE2B 066a757102e0cff1894e3492b0d4a1cc3e90d270aaef97eb77ab39d560507b84ff2a271af04ba359d74c9387b2ee7c15732c0dcb0ffb190d0f6470f469bf161e SHA512 f3be5373d7341d3f91f3ef95ae7584bbf9ed0cea266c54d8f2fefab9ecc9de629835d6e8172ad1e0a35e800ade338a1e9506c9482515ab519f0c9d03f14905f2
-EBUILD bitlbee-steam-9999.ebuild 724 BLAKE2B 066a757102e0cff1894e3492b0d4a1cc3e90d270aaef97eb77ab39d560507b84ff2a271af04ba359d74c9387b2ee7c15732c0dcb0ffb190d0f6470f469bf161e SHA512 f3be5373d7341d3f91f3ef95ae7584bbf9ed0cea266c54d8f2fefab9ecc9de629835d6e8172ad1e0a35e800ade338a1e9506c9482515ab519f0c9d03f14905f2
+EBUILD bitlbee-steam-1.4.2.ebuild 725 BLAKE2B cbf311258135d430fc2f6ae552e6a0a20bd5fb0cee5b3d4f6d0c7e40874c9249736a1ad6d4acbd4d952f6131683f48afd8cf6d733b2bfebb4670cee96bcb3137 SHA512 c3ecfd9a728957eda4671914bd94d1f5e7246cfe6f5bcd03d85e218a1d12efbb7f37747e815891237f93e7260a0f641ca9bc8ebad7756b8305b1b88f55d8ac67
+EBUILD bitlbee-steam-9999.ebuild 725 BLAKE2B cbf311258135d430fc2f6ae552e6a0a20bd5fb0cee5b3d4f6d0c7e40874c9249736a1ad6d4acbd4d952f6131683f48afd8cf6d733b2bfebb4670cee96bcb3137 SHA512 c3ecfd9a728957eda4671914bd94d1f5e7246cfe6f5bcd03d85e218a1d12efbb7f37747e815891237f93e7260a0f641ca9bc8ebad7756b8305b1b88f55d8ac67
 MISC metadata.xml 713 BLAKE2B 8b8342c05230287c99ccf5cfd3e1b70e5d1cf3ec3b9355ca039bb8225b31d34e1243482ff614f66e28ce2c0b54ffba1e75a6a6a919af103b7556a3f3e9a9bab5 SHA512 d71529cbf289d2e88c558f2285d7b2872c050e8d7374e802ef24994128be7a92a4ce2e67ee83024db082c86d9202a509cd695898e7eb36137f2d18198ef12067
diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild
index c0ec7c0ca9c8..485f9d30d9b9 100644
--- a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild
+++ b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit ltprune autotools
+inherit autotools
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-steam.git"
@@ -33,5 +33,6 @@ src_prepare() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild b/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild
index c0ec7c0ca9c8..485f9d30d9b9 100644
--- a/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild
+++ b/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit ltprune autotools
+inherit autotools
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee-steam.git"
@@ -33,5 +33,6 @@ src_prepare() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index c13bf8b4285f..87086629e7b2 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,9 +1,10 @@
 AUX bitlbee-3.5-libcheck.patch 17203 BLAKE2B 14cb1ba02178e89ed098518a8fb48b6f3124c197422acf3332c1fe579fb34ffd63e2fc377a6eea93cbe14a91129d22884eae7760fb6e8090afa8245c9f958f2a SHA512 25ea4be83cce5d2ccc1a5e6655e468678a26b570a3efb7b19429ee379987efce54d32864508ed36644bbcf351cc1b5e4b750a2824b7a0b7e7df711262bbf5e2c
 AUX bitlbee-3.5-libevent.patch 1942 BLAKE2B a6233d97f17d2695efe13a6bd395ba77e72e7c5c3177ae8aaf3223ac3f0979b9650cefcbb000d5e4ccc9ecb8fdab97173ad59022453c5b13c8486fb095b4ff14 SHA512 b8937c542eda36aa5dcdd3213513f6dd5a928166f1017ef370a78765dbc511552072fe46d8322dea27ee716126fd859245e6c2fa713f6b255fb6e7a4ce2c1328
 AUX bitlbee-3.5-systemd-user.patch 188 BLAKE2B 9cdb3713aaf213b741a8dbef0a790a35458b955515bb720987471c519848ec6b9a232fe136ca554a3fe1eb0c184d96b8774cee4a41c0cd3d822a33598ac50e79 SHA512 1775b5dce7bdd4fbe52a46e361d8a9b0127be2dc32a3e8b438fca8fce9139903feb91c968847f002e099553eb8d4a110914cfb19121ae79a3f6c9eb100846edd
+AUX bitlbee-3.6-disabled-plugins-use.patch 1695 BLAKE2B 5c5ab3f330921a471da5fcc39c2156322eb040683ad0ee6894a4c9d189868e9af126c6530ff46879d48878771007c76c1e77b266ea3bcfdba5fc2fe7121ac7ac SHA512 9e7f2a25c70a0d2eca9b6731f568fc3b639b057bebf8131aa9f4089f0ce28761cd03035320cd88ba58c622ec342d08946f31fdec20e45d3b25fb316ac4fe0dfc
 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4
 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.6-r1.ebuild 3334 BLAKE2B 74b9f18f647d3f45d5a2e9eabe95fdecbb1d40cd458f7293fdc34cb918087ac64c711829a12c7f27c0f692c54f2ba85dd6e99d515ad1f4d87155f4bfca4bcb1b SHA512 164c1274d5b942cf86e84b8c2d14d4ea9ea2e6832e83a91f163469a35a246e930af752675a3be921e98ef31b5a373b035310895e4f695a5fea880e9ff1b93b7c
-EBUILD bitlbee-9999.ebuild 3257 BLAKE2B 3c171f48cc946d80c83861c51b906b13844bebcff744c869cd7650254b503f19b8be71f0607b40df877612793e5d5b853290ba7e8ace3c8022f4c6e8396b8c88 SHA512 0720afc3a251ca06127a9cb8ab322d8a6e0a63dad53d60549ffb24f96492639165b98d17b40a8d7d3c5d8cad16552d95099fd109e1a0829c31b8d06c491521a8
+EBUILD bitlbee-3.6-r1.ebuild 3402 BLAKE2B 06b1190172f199cad20186d00398277590023e23e9845a4b3c5a0f50237cb38932dabb04c24a761a2888ac459c362e6ec5aebec60bedcff25540cd05dd51bec6 SHA512 500bc7cd6535c0df95d2e744134362777cb274f048b5c93acf92b4e29077d8f8ce81fbdaa6c4775d5d9249b279f03c4c5a58ba8e4b93a9c92301720ef7d6b979
+EBUILD bitlbee-9999.ebuild 3278 BLAKE2B fe852f341161c46bb6e09f8160866928cc494cbb6cf0ddacd8544a8ec65cd4932c4a30bacd14b2b2be5106c4a5f587015515bda870b95e312c54b55b82e243d9 SHA512 3bd79912676d08ee353eecb7d8e84275da68910e9fb98c491a896d408099bb1267b955cf650281968d7443ab25e104d3ed4a210d56b009cabcc770db31bac7c3
 MISC metadata.xml 1168 BLAKE2B ad0a883cef4404c3a6ddec5951a009330b02396072691968834d3de0d2fdb1aa05ccaa3e819c2c9d3b89cbd0266782902f5fbc8c2fa97a49049b49d8e6f8913e SHA512 0093ff572bae101bcb8cf375f5b95609d0550f77150ec98cbc4a5d62f0006c6439647c528c45309351083b886d4bd95a556957c6ddaf4b2a0a34fa7f87cfa9ea
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 126e7ae66fc7..0411dc061d1b 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -27,8 +27,9 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	|| ( purple xmpp msn oscar )
-	xmpp? ( !nss )
+	purple? ( plugins )
 	test? ( plugins )
+	xmpp? ( !nss )
 "
 
 COMMON_DEPEND="
@@ -64,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-systemd-user.patch
 	"${FILESDIR}"/${PN}-3.5-libcheck.patch
 	"${FILESDIR}"/${PN}-3.5-libevent.patch
+	"${FILESDIR}"/${P}-disabled-plugins-use.patch
 )
 
 src_configure() {
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index 220b6904f2d3..b1eb2f2c62c0 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -27,8 +27,9 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	|| ( purple xmpp msn oscar )
-	xmpp? ( !nss )
+	purple? ( plugins )
 	test? ( plugins )
+	xmpp? ( !nss )
 "
 
 COMMON_DEPEND="
diff --git a/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch
new file mode 100644
index 000000000000..0973bd4bd5fa
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch
@@ -0,0 +1,55 @@
+This patch is taken from upstrem https://github.com/bitlbee/bitlbee/pull/156
+where it was already merged.
+
+From a8196d6f72b44be9c315b9ad7dc45276d2aaca0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Tue, 23 Mar 2021 13:07:18 +0100
+Subject: [PATCH] root_commands: prevent linker error when plugins are disabled
+
+This commit fixes compilation issue with disabled plugin support
+(./configure --plugins=0), where get_plugins function is unavailable.
+The problem has been introduced with addition of new 'plugins info'
+subcommand, where get_plugins is used in cmd_plugins_info function,
+which should be conditionally available only if WITH_PLUGINS is defined.
+
+Bug: https://bugs.gentoo.org/739510
+Bug: https://bugs.gentoo.org/617604
+Fixes: 6908ab747d1e ("Add 'plugins info' subcommand, only show plugin details there")
+Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
+---
+ root_commands.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/root_commands.c b/root_commands.c
+index 8358c030..a4e72f83 100644
+--- a/root_commands.c
++++ b/root_commands.c
+@@ -1168,6 +1168,7 @@ static void prplstr(GList *prpls, GString *gstr)
+ 	g_list_free(prpls);
+ }
+ 
++#ifdef WITH_PLUGINS
+ static void cmd_plugins_info(irc_t *irc, char **cmd)
+ {
+ 	GList *l;
+@@ -1201,6 +1202,7 @@ static void cmd_plugins_info(irc_t *irc, char **cmd)
+ 		irc_rootmsg(irc, "  URL: %s", info->url);
+ 	}
+ }
++#endif
+ 
+ static void cmd_plugins(irc_t *irc, char **cmd)
+ {
+@@ -1208,7 +1210,9 @@ static void cmd_plugins(irc_t *irc, char **cmd)
+ 	GString *gstr;
+ 
+ 	if (cmd[1] && g_strcasecmp(cmd[1], "info") == 0) {
++#ifdef WITH_PLUGINS
+ 		cmd_plugins_info(irc, cmd);
++#endif
+ 		return;
+ 	}
+ 
+-- 
+2.26.3
+
diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest
index cd5240555332..aaaf3e71e0b8 100644
--- a/net-im/coturn/Manifest
+++ b/net-im/coturn/Manifest
@@ -3,6 +3,6 @@ AUX coturn.service 470 BLAKE2B 21b1cc005b5b91a8cb80b05a45afc16d73ad88e5b0a851294
 AUX logrotate.coturn 345 BLAKE2B 26edd2ad44d947bf943757fb3e3255cafea64fac5d495402bbc3a7088ed6ffd822cc8f07010669f9faf856eb8a893d9ba9ab48d4b417f8c3fd27772ffb71cae0 SHA512 ebfadc7e6435061b7120baffce76a65c224768ab85e59e3b8cd140e394fa6e4eaa258eccce76f3152fd6a1adab0c84e39feb51663c76359401e04df4d8db2c1d
 AUX turnserver.init 633 BLAKE2B 78da89afc2be30bac969bb2a393d454d32ba77e199f2ccb5e34557ce34cf3a242402210afe6e30400b4a47ef9dc7880cded44a1932f7769f21f4143261a3569e SHA512 3b86b2186499c96ec0cfd3a124ea058a622c21cc870e079414f6055f7ba85830a5b85c424c809c010144f9270fcada80ef20bcab4cbc9c7fe0949b24fef02b59
 DIST coturn-4.5.2.tar.gz 442745 BLAKE2B c18d5f5cfedd600875c0bfa08b874ef6316a5aa9af34c27e2901825da412b794d437e08f0706f9651bdf6d3d19e151486af39a42f2326c7ab6bb802d33fd0ba4 SHA512 00e86a3a273a8e4e69deaefd338bdd6c44739a807f21a72a2d68efc089053e16efd1d5b34b0c6dea7a0fa2b66f70821d8c3e1107561e1f08dfac2c93933a6121
-EBUILD coturn-4.5.2.ebuild 2295 BLAKE2B a480ab5de3dcb98a736138d44eecb3a5ea63e6e88186f7f87b989b40d603ec32ec454ce0aa7a65045ec760c74229932250ef7fab6574ad8643d42ebd5848af9c SHA512 970bece37537ce4be4d751dfcbeab04a7a508ef7f5fee84229f18585425eacd69599b634710a6f0213f796404d75dc1cc09993a35d9bbfced90105cf93941f55
-EBUILD coturn-9999.ebuild 2295 BLAKE2B a480ab5de3dcb98a736138d44eecb3a5ea63e6e88186f7f87b989b40d603ec32ec454ce0aa7a65045ec760c74229932250ef7fab6574ad8643d42ebd5848af9c SHA512 970bece37537ce4be4d751dfcbeab04a7a508ef7f5fee84229f18585425eacd69599b634710a6f0213f796404d75dc1cc09993a35d9bbfced90105cf93941f55
+EBUILD coturn-4.5.2.ebuild 2288 BLAKE2B 81bbaea6afc2a61ccf64f0bc8554ec3ccfff2c30178379d8a02a448adf65e447f3c28e4045774465a462d922026f69d26438548e4dd3de5a0e9bf45214db8d42 SHA512 ee11cd201f9fb4b1c6788b60cbad1a5f7ca24ba40e97d9adf3298750db6755ec964af8579723631568836443f8c55b37039a5286f7e62a7e0e3b75e0957644fa
+EBUILD coturn-9999.ebuild 2288 BLAKE2B 81bbaea6afc2a61ccf64f0bc8554ec3ccfff2c30178379d8a02a448adf65e447f3c28e4045774465a462d922026f69d26438548e4dd3de5a0e9bf45214db8d42 SHA512 ee11cd201f9fb4b1c6788b60cbad1a5f7ca24ba40e97d9adf3298750db6755ec964af8579723631568836443f8c55b37039a5286f7e62a7e0e3b75e0957644fa
 MISC metadata.xml 497 BLAKE2B 522928095883e077064a9971e45e4e644461ce6d7a07720920a7bc96afc326b6ab337aa64704518a866f0df276f5bc284660e81561874631ff84c395035051dd SHA512 62689abd67427c6dd3de86c139b2cb94f7dc3ba8c8f9d3fced5b91b6de36cd30caa1a7805c0dc3aa64fa35e154e4509a607ef7eae62fe6894084383b2226b8bb
diff --git a/net-im/coturn/coturn-4.5.2.ebuild b/net-im/coturn/coturn-4.5.2.ebuild
index 7f1a4140a40c..d8ac519acbc0 100644
--- a/net-im/coturn/coturn-4.5.2.ebuild
+++ b/net-im/coturn/coturn-4.5.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils systemd tmpfiles
+inherit systemd tmpfiles
 DESCRIPTION="coturn TURN server project"
 HOMEPAGE="https://github.com/coturn/coturn"
 
diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild
index 7f1a4140a40c..d8ac519acbc0 100644
--- a/net-im/coturn/coturn-9999.ebuild
+++ b/net-im/coturn/coturn-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils systemd tmpfiles
+inherit systemd tmpfiles
 DESCRIPTION="coturn TURN server project"
 HOMEPAGE="https://github.com/coturn/coturn"
 
diff --git a/net-im/cpop/Manifest b/net-im/cpop/Manifest
index 32bd294965d3..f04888f5dfea 100644
--- a/net-im/cpop/Manifest
+++ b/net-im/cpop/Manifest
@@ -1,4 +1,4 @@
-AUX cpop-0.0.4-implicit-exit_memset_strlen.patch 1211 BLAKE2B 48ce5dbb80921969e4b1984045bda73e6e6fd6a24cc1c9b56a709a5106092709e22047cf886d400a32b938fb1f5766adcefe35b5760fd4bc948c2757e86639dd SHA512 a6b1d15f2e65528489f0bfa38e0f50af268912490fe853ea29eb786e5682d19b224b6a16fcaa3ce56421a9c3a2206beb689e5830914bcabbc1692476cef96f8d
+AUX cpop-0.0.4-implicit-exit_memset_strlen.patch 1223 BLAKE2B f7cfc23d7adaa39ee1d0be5dc90562bcd9e427ea97f02ee217f8752195d030aaea441384dcc8fc2007531c5a36fa548b7f868ba7f49a4bec61dc37d609979ba7 SHA512 e8b9c2a6943b788c494495f0603672f4088cc38543637e77bb0b60036c905d2f80aeafba56fd49b27a980a509337352cdc18e113c131e2726218a1e2f947f529
 DIST cpop-0.0.4.tar.gz 68544 BLAKE2B 243c5e38c798e741cdf6afc6ebf955f98d659b09d37039a471f662ce8fd672d75985235e59cd0b169d32c8250a0230527349dbbcbfac26ae19012b80895480c8 SHA512 c7f4dbff7f8702a8a32447c09457fa6f0810768a41450c43ae71aa67c6fb2d40af634713d1a703dd7f1a9a97ac534f2dab11f8f3f88a79c549224e8b375d721a
-EBUILD cpop-0.0.4-r1.ebuild 585 BLAKE2B 27f7f2d813ff1cc47c48a77e788a099f9a00cf716f11854aa7c00340a55c07ef4a49ccba7704fdb1197514fd0bdccee00a756a904b1ec73da3754e47250b7004 SHA512 d349c62543e5133f5ba38dc1d08ef3d3e479768a4edfac8da54a9663986cd36e948e1cfb74f64807ea008c5f4f0ed8c846b5dee9ed392acb51655c7ce5304de8
+EBUILD cpop-0.0.4-r1.ebuild 546 BLAKE2B a80f6aecdbf8ff1fbecbde51a629aa4bc544a49d930b7c32fc49034a2011695ce970d8ba7dbc2436db15c8b20367732a1fe280a046cee21c9e533bfbf66e99fa SHA512 b0f563ba2eda00b4040015860ea1301a1234619a3b5e94276509c45f00b477da6c035ad8a613cb36f03042312114d7756b733227d8cc3554ab8848466bafb0d0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-im/cpop/cpop-0.0.4-r1.ebuild b/net-im/cpop/cpop-0.0.4-r1.ebuild
index b86f14d8e51d..9315a2381ea0 100644
--- a/net-im/cpop/cpop-0.0.4-r1.ebuild
+++ b/net-im/cpop/cpop-0.0.4-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="GTK+ network popup message client. Compatible with the jpop protocol"
 HOMEPAGE="http://www.draxil.uklinux.net/hip/index.pl?page=cpop"
@@ -11,15 +10,14 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch
+)
 
 src_install() {
 	emake DESTDIR="${D}" install
diff --git a/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
index 3ce224c2910a..d47bfcde9d84 100644
--- a/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
+++ b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
@@ -5,8 +5,8 @@ pop_gui_client.c:58:4: warning: incompatible implicit declaration of built-in fu
 pop_gui_client.c:72:27: warning: incompatible implicit declaration of built-in function ‘strlen’
 pop_gui_client.c:128:3: warning: incompatible implicit declaration of built-in function ‘exit’
 
---- pop_client.c
-+++ pop_client.c
+--- a/pop_client.c
++++ b/pop_client.c
 @@ -1,11 +1,11 @@
  #include <stdio.h>
 +#include <stdlib.h>
@@ -20,16 +20,16 @@ pop_gui_client.c:128:3: warning: incompatible implicit declaration of built-in f
  #include <netdb.h>
  #include "pop_common.h"
  #include "pop_client.h"
---- pop_common.c
-+++ pop_common.c
+--- a/pop_common.c
++++ b/pop_common.c
 @@ -1,4 +1,5 @@
  #include <stdio.h>
 +#include <stdlib.h>
  void errquit(char *message)
  {
    perror(message);
---- pop_gui_client.c
-+++ pop_gui_client.c
+--- a/pop_gui_client.c
++++ b/pop_gui_client.c
 @@ -1,3 +1,5 @@
 +#include <stdlib.h>
 +#include <string.h>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 3fe42b204cb9..67ed4e8f5197 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,9 +1,11 @@
 DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
 DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326fbf5b652ae15710bb46798ac8a1514dc2e1361e89bef4a80f43d5f64cf09879f3faffa927aa4407fe696b564 SHA512 297afa2b0ac44aad59b203907b1479fb8f004e2dc2a00681fa8034d76e4fb89ee3dcb4fb96011028382659bcb978cf214c396073d29b3dd0a7a711454915057b
 DIST gajim-1.3.0.tar.gz 9886259 BLAKE2B c9d0912f4d2cb76668978ca48fb1bc2db203cae7ea8dba7fd03c40d1cfee3da84131e2cd82ed6b27ed4c9a70a37328c57551fe1190e29bbd0c9a3cd6f9fa4a66 SHA512 4b68b97f6e4edcc2aa4b009a0131e4781c4ca52340ce98369154c602f7ee71e974e0840af0ae6ab28fc9e2fd34433ec0f304e10847e6cc257de3cde60b90b349
+DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642
 DIST gajim-1.3.1.tar.gz 9885129 BLAKE2B ee1fac7f1354576879c5ef14d167d4f7248e497f5b7c468d4bdeb9bf93b749482e221e4ad7a965c86799baa959020303b1b3e49ca99ce1607fc721d0722cbffd SHA512 840b9424c4f93281fe32569331917ba3bdd0afc51428d778ec357b1b0dfc9aecdf77a48c44fa4b66259d82633ca277ccab6b4d6ead47e7eb66d22f078e8ebb84
 EBUILD gajim-1.2.1.ebuild 2354 BLAKE2B 6f3ce6c6363e69d6be10a0fdbb20195b68a2ded9f037c9e40948e8897e4a0234f4c111fdb408684d50ea3f3bdbd886318263fe712a04e5317506436273c8b614 SHA512 da1f7e0e70fb08e81ac7ff9fed60f694af7002a77047c3c89f352aa30bf090929defc1a032fb3b410f4fa3c16c651060ccac1d2474525d4059d47e76c368405f
 EBUILD gajim-1.2.2.ebuild 2356 BLAKE2B 2b8063e45e51d32f0d2399f802c658f256a54be2f2e92d5127627ded7c367391a1899aeeb1b6fe456ea6a9acb722f2ac78c4aab4ffb335a69d1d9f8c53193721 SHA512 7902589bc9b94037bf8d4867b4ba9777900ba0b9ff8e75a5409efb63b7eb4953fd6cbfa228a77a01ef26f601203ef63ba61f565a4bf936b5acaadccaafb1587d
 EBUILD gajim-1.3.0.ebuild 2377 BLAKE2B 45da45a8eb0c7548af69ae436a732148c96d900523f408625d4db037ec3363ff6be23c0ebcfbd3c76244fd178ff5a0ef76702b632292181900dbe3a216ad072a SHA512 ea8e95ec72c246013699c595c174450d34959757c31dda003abf53a3f5ed965fdd70ec8307898610ea42d6751605e1bedde5de809cc06503554ac91af6980215
-EBUILD gajim-1.3.1.ebuild 2377 BLAKE2B 45da45a8eb0c7548af69ae436a732148c96d900523f408625d4db037ec3363ff6be23c0ebcfbd3c76244fd178ff5a0ef76702b632292181900dbe3a216ad072a SHA512 ea8e95ec72c246013699c595c174450d34959757c31dda003abf53a3f5ed965fdd70ec8307898610ea42d6751605e1bedde5de809cc06503554ac91af6980215
+EBUILD gajim-1.3.1.ebuild 2375 BLAKE2B 79eb66fd1c81029f25b9a65205ec6eb9d97933ca6df45879e8f4d01b80d08ad52bb304839502c2ceeb3accd18fe20e119b007edaff95330169dce44b4a7484cf SHA512 a772430a49f87279ebcb2b9dfaf1b4694ce9570b74bde0e1525ff5838e7340b16a448cc5c8cc0a9debf224fe94c8f457ff0418f59a3a3f19bf8b3286b504d3ee
+EBUILD gajim-1.3.1_p2.ebuild 2393 BLAKE2B 29e9137608241890d52a59ce27beec4f38f9789e66627c7d03d8646614149adeaaa1ea728a59b6ee62f3fe3b6b9eacc63f186b779abd29d6dc1687dedf373837 SHA512 809c01bfb5cd847ebdfa087877695be7d644ace122e546df1e47c1b2b848a02029dd42fd2735ec00b575f4822d4c8a755836afabfd0e8109e88854dd4b72c747
 MISC metadata.xml 787 BLAKE2B addb4c1ccffe612899495903543df528872a87ab0128459e34fdca346fa7c8c3fe45f27cba541baae9971eba00d282d77f88d964de5ebde47181a8d417d0ef60 SHA512 5425930f8c15ba0a4f9fb13eab27f11b6874453732b1fec601cf1811a796431ee7feaff62c7967f3ac1dfa4009b9acd5de1d0f42ef28543444e7cb887088be09
diff --git a/net-im/gajim/gajim-1.3.1.ebuild b/net-im/gajim/gajim-1.3.1.ebuild
index 3e2cb3f1105e..192769880a80 100644
--- a/net-im/gajim/gajim-1.3.1.ebuild
+++ b/net-im/gajim/gajim-1.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/net-im/gajim/gajim-1.3.1_p2.ebuild b/net-im/gajim/gajim-1.3.1_p2.ebuild
new file mode 100644
index 000000000000..01fcfbf62a29
--- /dev/null
+++ b/net-im/gajim/gajim-1.3.1_p2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${PN}-${PV/_p/-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
+S="${WORKDIR}/${PN}-${PV/_p2/}"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup[introspection]
+		media-libs/gsound[introspection]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+		)
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	')"
+
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/kouchat/Manifest b/net-im/kouchat/Manifest
index c60b942c24b5..e03626aea161 100644
--- a/net-im/kouchat/Manifest
+++ b/net-im/kouchat/Manifest
@@ -1,4 +1,4 @@
 DIST kouchat-1.1.0-buildfiles.tar.gz 2793 BLAKE2B 0b852a4cc65ef16993b01205f81cb2a3f7a4238425d62b499672529396cf6cc2506a50a9bbfc87c56fd4e6780064f6a8cb84920a00d2f0200520369bb02849d9 SHA512 daae5a4f3374ab588214321793725f4b9add063f4c7b98f64f6db0ab71cc2d07f2ae9f27fb0ed12c7704604fd97781b0cfa9bdb0a188782c4f5bd0172e167c89
 DIST kouchat-1.1.0-src.tar.gz 363491 BLAKE2B 3b4c72678a10892cd4b145c496b5d1042f8b6820806326f985f3313d5b764ee0beb85b0594cc532370f459ac630045a71f9a994d21dfe87c6ad744ecc163c0be SHA512 838d2afac858d698a543ad9ca6e249fa6439cd6f31bf67d20bc44961c9dcbed843fefb51430202666c74c02ec71b8bd30edbd5dcfe5a15d2c364426e99350c27
-EBUILD kouchat-1.1.0.ebuild 848 BLAKE2B a72faf0c496afd9ecdeec2bb2015eba6471c1642def2952e2c85e91681913889fab67a79df567ee6d4726a0ebdbff39d83cd5ebe2ea5ff635393346e797d690e SHA512 e3133bb7e25c3d78cd1f33ec4786d174e2163f6c5e09979407ec2c713326d90d137214deb43d5c9cf10fcb9b18cacb9e36309e6e5f2b946eb55c39aadbfca788
+EBUILD kouchat-1.1.0.ebuild 846 BLAKE2B 7b66192382e4141a8c2312ebd1505634acdd8e8c4fda3fbcefe79112fad053a778b5a345f0e6c4e90de47174c5cca8c0f5cbffad05d9257bd0a88d513cd53b0d SHA512 f99457f26122995b0ca1df1515a2326d62ed3dd4a08ab25f4f5532a0e88d0d468006a43e9b398f09f202a1a75ab08c0b01e73d7e043cd421473fdd18afe0cdb2
 MISC metadata.xml 313 BLAKE2B 5493c3461bbe3109090e7cdfb5e966c44614dc63163a8ad6a54693f30f9fd26e598c50a5c8439d6aa83fa57be8fa070f6bd5039660962aa3e456e629a3a52d3a SHA512 3325871357331a70e429b6c5166d5604eed1effe2c0365f0eab0368e031005fee9fa99ebc3f37851a3b12039ae3751ba00a3727d9da4f7b50b24ae15a3745fe3
diff --git a/net-im/kouchat/kouchat-1.1.0.ebuild b/net-im/kouchat/kouchat-1.1.0.ebuild
index 3c7522dc9b9c..b719616ecc03 100644
--- a/net-im/kouchat/kouchat-1.1.0.ebuild
+++ b/net-im/kouchat/kouchat-1.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 JAVA_PKG_IUSE=""
 
-inherit eutils java-pkg-2 java-ant-2
+inherit desktop java-pkg-2 java-ant-2
 
 DESCRIPTION="KouChat is a simple serverless chat client for local area networks"
 HOMEPAGE="https://kouchat.googlecode.com/"
diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest
index c91332e454dc..550c5c5b7888 100644
--- a/net-im/minbif/Manifest
+++ b/net-im/minbif/Manifest
@@ -3,5 +3,5 @@ AUX minbif-1.0.5-glib-single-includes.patch 754 BLAKE2B f353f751d4ebd60ab525b6e4
 AUX minbif-1.0.5-rename-imlib-load-error.patch 469 BLAKE2B 9e2937261de7ab8ea2838e0f4b33c0cddfd0fc1da4035c24a6b2df376f24b46039cb9186c855541a5636581aa3fb28dd7fa0271113f6780c807e9cf75cad4a1c SHA512 5cfa90fe70a4f2f45967b928d1062ab10d45aa6f7dcd4dd1575abb66047984977482ec8943481cc3344cc172292ea81b33f639baefb771aa181b10ea5f740344
 AUX minbif.initd 457 BLAKE2B e10c892d4002b1570a298282134cf6a25a65fdb0ea7689affa5a1f9ab92ea76428bbf4bd1de65fb40baa2f26df7bd7bec3f1a0a7f9e710189d846d2cdbf4c63e SHA512 f845120e70b96fc307e5ba5e2fc439713da0040b87fa1cdfd2ea38707c47260381004f5d98ddc08b738a1c928335c0b807ecc09b4d3a3e0dec240cab3e6ff7b7
 DIST minbif-1.0.5.tar.gz 176039 BLAKE2B 195af3dbb45f0c2b6499fd440c4ffc637d7e4e723879282a4914538d562c2833f30ae562098ebc5c47ac694b37f558984e599cb3701d6b1af6256db32ad91152 SHA512 e84c6f38ad35a660f9c319b702ae5743cece167c8e116976a9ca0caf527ad23ea17ea8f518f9bd76536e87283362d2087201a5307128740fc7f05dccabacfbcd
-EBUILD minbif-1.0.5-r2.ebuild 1812 BLAKE2B aa09822e9afd5d27b99b50c5f5e1758d96aeb0f308471072d29d1b6680d7631ba5e919df1baff7f487bd3f06ea82426c1d0074d780e73f0bebe8198a6824dcc8 SHA512 1f1ece8646fa67206f721f92db959d442b3a6839c261268e20cf60a5da2cdf740b6523ffdd10a03618d7ad54d5c5638e987a74437eb4b2e2aa9d5b0d78c79751
+EBUILD minbif-1.0.5-r3.ebuild 1638 BLAKE2B 6f2a9df463cf7d1893fb2605c32c443add879669ed3e50472ddb0d5f711b7eba6d964cf457e4447efea06fcba52a7821f15b22557cd5e453c9a41f0d293f8570 SHA512 098b6e0ae1f4196cdd2ddf65d841900704b1cdb1062ee0f246283897c82973a5eff0580009cfc764f710d0fa17f53c0dd81e0beff46367f751379e2eef2b72d1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-im/minbif/minbif-1.0.5-r2.ebuild b/net-im/minbif/minbif-1.0.5-r3.ebuild
index 1f05cc67faa1..d438c5b97a63 100644
--- a/net-im/minbif/minbif-1.0.5-r2.ebuild
+++ b/net-im/minbif/minbif-1.0.5-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils user
+inherit cmake
 
 DESCRIPTION="IRC gateway to IM networks"
 HOMEPAGE="https://symlink.me/projects/minbif/wiki/"
@@ -13,12 +13,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="gnutls +imlib +libcaca pam xinetd"
-REQUIRED_USE="
-	libcaca? ( imlib )
-"
+REQUIRED_USE="libcaca? ( imlib )"
 
 DEPEND="
-	>=net-im/pidgin-2.6
+	acct-group/minbif
+	acct-user/minbif
+	net-im/pidgin
 	gnutls? ( net-libs/gnutls )
 	imlib? ( media-libs/imlib2 )
 	libcaca? (
@@ -27,7 +27,8 @@ DEPEND="
 	)
 	pam? ( sys-libs/pam )
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	virtual/logger
 	xinetd? ( sys-apps/xinetd )
 "
@@ -38,28 +39,20 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.0.5-rename-imlib-load-error.patch"
 )
 
-pkg_setup() {
-	enewgroup minbif
-	enewuser minbif -1 -1 /var/lib/minbif minbif
-}
-
 src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i "s/-Werror//g" CMakeLists.txt || die "sed failed"
+	cmake_src_prepare
 
-	sed -i "s#share/doc/minbif#share/doc/${P}#" \
-		CMakeLists.txt || die "sed failed"
+	sed "s/-Werror//g" -i CMakeLists.txt || die
 
 	if use xinetd; then
-		sed -i "s/type\s=\s[0-9]/type = 0/" \
-			minbif.conf || die "sed failed"
+		sed "s/type\s=\s[0-9]/type = 0/" -i minbif.conf || die
 	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DCONF_PREFIX="${EPREFIX}"/etc/minbif
+		-DDOC_PREFIX="${EPREFIX}"/usr/share/doc/"${PF}"
 		-DENABLE_VIDEO=OFF
 		-DENABLE_TLS=$(usex gnutls)
 		-DENABLE_IMLIB=$(usex imlib)
@@ -67,11 +60,11 @@ src_configure() {
 		-DENABLE_PAM=$(usex pam)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	keepdir /var/lib/minbif
 	fperms 700 /var/lib/minbif
 	fowners minbif:minbif /var/lib/minbif
@@ -85,7 +78,6 @@ src_install() {
 
 	newinitd "${FILESDIR}"/minbif.initd minbif
 
-	dodir /usr/share/minbif
 	insinto /usr/share/minbif
 	doins -r scripts
 }
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index 29b38102bca1..ae44d2001715 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,5 +1,3 @@
-DIST neochat-1.0.1.tar.xz 173204 BLAKE2B 6a52000cea4224f7ca192aa63bae6702dd8f406aeb1bd7c69ccac937314fc32488f4936ba6fe89332c4b2e339a3cb61402b616bb09df56784496f4cdcd98f618 SHA512 8a6c3544f878ce6b8883afa4ac384a70a1b0155e592071ba5affbbf63f1e7f89ccd362f11b1e4686737617339e8be24f0b6465f9a85d36357034b10c8a184756
 DIST neochat-1.1.1.tar.xz 195780 BLAKE2B b9eae0344d4e99c3b5ef9d7be0d633216fa989064c8499cd24b7fc65371bffc34551875a84edfabd2f359b091b588b04720309bb84b8fcfb1123f759bacd4dbd SHA512 ee50dfb7ba2aae8c6b03728e1326b03b0bc21df459397f137547b4684596fd07c42ae494037af894b2b37b53ade010463ee2f067ccede559ca868a723c83e17b
-EBUILD neochat-1.0.1-r1.ebuild 1204 BLAKE2B d6e845456e3193f843b418cc6eb4e62ac8845184df4531317f5c4c10eb6fd2064eacaf6d3f496036705c674f4d416a76c94925f1abbf81d680e08c7c348c2ec3 SHA512 3e7cda8f323446511b8f8a92152849c8fc3836086347cb809203b143dba3c24b3141ef14d94b3f66f6d54a494c21a8c1d22419b91d0b22283ff59b48e8fdb086
 EBUILD neochat-1.1.1.ebuild 1173 BLAKE2B 27f4c104ce792b84bf08e90c4f40f3033af954f798b84f1dbf73863cfe9ac1f0b95fb0b741cc7fdd260020b2294b2be38d8f0e27e980a7b0b05735e9dd0b7299 SHA512 ca788723c47b8e1fa59d9b2da5984b5eae8d96e60814bc12c16d67300d1ef42f3c98d6df02a87dd9ee1c3a9614494a49a4e1a338579358bf8d8b9120fb2e7d53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-im/neochat/neochat-1.0.1-r1.ebuild b/net-im/neochat/neochat-1.0.1-r1.ebuild
deleted file mode 100644
index 670895ca6743..000000000000
--- a/net-im/neochat/neochat-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.77.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Client for Matrix, the decentralized communication protocol"
-HOMEPAGE="https://apps.kde.org/en/neochat"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	app-text/cmark:=
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	media-libs/kquickimageeditor:5
-	net-libs/libquotient
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index 495b495fe881..63c5dfa2705f 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,6 +1,4 @@
 AUX openmittsu-0.9.13.32-fix-tests.patch 695 BLAKE2B 69dafe6d75ed2ef79f3c208f2566091ce51f8ed32deb85d617b5a74e230c45735e16368e3bfb44f0bf440e8bc503e5295b3cb5f58b9b31e3a7e3e143d883dd4d SHA512 69387e7da115949fe661fd62e3418eab0ad77f2f41f07a767fadbfc96e1561d078c8811ee69e49501b9c410de968e6b8cbc2966446d2c326c601c2d82178467b
-DIST openmittsu-0.9.13.46.tar.xz 2183136 BLAKE2B 3935a00fae8aa937fdc2f629a7dbf2a06cf518fb3758e7c1e191247004fa4077f60dbe2a0e3fba9750405ec069c33b6336cc26f990947ecbb1dabfe3b7b586f6 SHA512 bd58189e7c714f74ec6271a94251f4222dcd4fdb8015d6d01ef57e860804ebfa97aab632f3db94da386bb58bbb674bb4db6b659d2c9ccdeedf8ddd9b026a99c4
 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
+EBUILD openmittsu-0.9.15.0.ebuild 1624 BLAKE2B 0d4be051a1c4e67b7590eef6b55212bf34f3acd376cb1d18a83f4a04c5411991f886833f6656f48147e39a3a24ece2a9d10d5346d3e3f5a168c80d0823e06890 SHA512 5318542347e7f8199520255fb067aac227c266ede9cf968300e249005ce9a40039ea7e86c3ef7f9bb4816e758e954181b816d29f2cd1f41fec347ac0caeb8d3d
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/net-im/openmittsu/openmittsu-0.9.13.46.ebuild b/net-im/openmittsu/openmittsu-0.9.13.46.ebuild
deleted file mode 100644
index 3689bcc19f9e..000000000000
--- a/net-im/openmittsu/openmittsu-0.9.13.46.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop
-
-DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks"
-HOMEPAGE="https://www.openmittsu.de/"
-# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/qt5-sqlcipher
-	>=dev-libs/libsodium-1.0.11:=
-	>=dev-qt/qtcore-5.7.1:5=
-	>=dev-qt/qtgui-5.7.1:5=
-	>=dev-qt/qtmultimedia-5.7.1:5=[widgets]
-	>=dev-qt/qtnetwork-5.7.1:5=[ssl]
-	>=dev-qt/qtsql-5.7.1:5=[sqlite]
-	>=dev-qt/qtwidgets-5.7.1:5=
-	>=media-gfx/qrencode-3.4.4-r1:="
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.13.32-fix-tests.patch
-)
-
-DOCS=(
-	README.md
-	Example-client-configuration-file.ini
-	Example-contacts-file.txt
-)
-
-src_configure() {
-	local mycmakeargs=(
-		# set version manually, since autodetection works only with git
-		"-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
-		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
-		"-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	./openMittsuTests || die
-}
-
-src_install() {
-	local my_pn="openMittsu"
-	cmake-utils_src_install
-	newicon resources/icon.png ${my_pn}.png
-	make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
-	rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
-	rm -f "${ED}"/usr/bin/${my_pn}Tests || die
-}
diff --git a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild b/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
index 00915580a10f..945996c436ae 100644
--- a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.15.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils desktop
+inherit cmake desktop
 
-DESCRIPTION="An open source chat client for Threema-style end-to-end encrypted chat networks"
+DESCRIPTION="Open source chat client for Threema-style end-to-end encrypted chat networks"
 HOMEPAGE="https://www.openmittsu.de/"
 # git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
@@ -45,7 +45,7 @@ src_configure() {
 		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
 		"-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -55,7 +55,7 @@ src_test() {
 
 src_install() {
 	local my_pn="openMittsu"
-	cmake-utils_src_install
+	cmake_src_install
 	newicon resources/icon.png ${my_pn}.png
 	make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
 	rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index a539863c66e0..28bab1d55b2d 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,11 +1,16 @@
-AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 BLAKE2B 5f83a3a9f36810c446bdc0079930bee84d87e4a0252ae750f996542d9407fe44bfdb8e820451c88c0dfd6a1d9a3e75d457de32e6c6e5c69ba77a8d7571834a83 SHA512 d6d0a925803484311fcb78aecc383f4f572886551edc326c7e34cf1376ee80e1f65a4c564c3473d64233120c20d8143b0d63c4af065a15bfde02d830c83ab2f0
+AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 940 BLAKE2B 6eea4774395ad9da80f087e55f82165268f44aa153113af0c589cad0f2dacc8eb0a49625d6378937e676f8e22cc190c345f451c585dacf69ccb3452ccfd56b8b SHA512 2b1cc0dca724510462ae24df93bc5563734372daf7ed353ae0c90cf44380354615a1afa04c1d73ba1e9191bf7eefa9aa0bccf8517d9050203a1d34aa04d9dd55
 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.10.9-fix-gtkmedia.patch 195 BLAKE2B 4f2d56c74e9a4ba017de44836a249be361118eaf32c752a7b07f4dd5b1b73a470607755de7ef2966fea0db5628dfab19f5ac87a63b467fe1ca2885376b977ade SHA512 3bf944695a9128e7894ddef8ad38f3da3511670273ef8abb8f51a4ef3dc435b78aa0f8ee7a7acd2ea74f50152a083d09a067ca84826d58c1765676b223cb7a18
 AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993
 AUX pidgin-2.13.0-metainfo.patch 345 BLAKE2B 7f0a56f0de53860c3963bd88c1646570ca0687eec5c3022b007a3519ff7974bb18d7f3aa17abddfa516e1a546282e33b56714a2c2e6d64c2f2e15e696c05144a SHA512 6276d11f408dd26f6749f8ee11a1842eb0d60b8f79f01ba7054f4521e26f2e330ded50e8177368491b76d02a12a2694db3b7c6760193b7da4c52a36df55343ce
 AUX pidgin-2.14.0-gold.patch 284 BLAKE2B 3d658d69f4d226adf238cd6e624067741ea9d80e3d56ac235b766f8fdb7a926bd97769f4723871cb32672123ae84d04cee4c9936e39cff9430d087de9601362c SHA512 f754357cceb88053af2ee074e5926e0fb11613ba42a375a38aaec1b11172f55f9b1b99fca651a3f4af2c16326c5ae0f871b70df28b08f384917a97acc312579e
+AUX pidgin-2.14.3-remove_oscar_tests.patch 396 BLAKE2B 139f898c82283b896a50edb8d2e6825513b8549dee63f51d0d90b4e71a55685a2e5886a4fe84cf361ef1fb5f607876469d0501c7711afacd9b722b3401e19bf8 SHA512 cf6fe751035d4756f13843141d0ead9ad25275702143c2b2b30f8e3160545c3c72e9bb0e67ea258a622f950b4c3431c28943b9d63cf185c73bed2cb559e93508
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 DIST pidgin-2.14.1.tar.bz2 8849275 BLAKE2B 27cd58a79f36c0176147c2e5bac7c4c18ec74c446c556e2326465c3607a95c3a58c1bdbbf9b4fb9741783ae982a6ce8fe0556ccff5b1608c9bba98626560412c SHA512 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
+DIST pidgin-2.14.2.tar.bz2 8933924 BLAKE2B 8ca40cb9398f9f2e55b3dbb6aff12a55bfc27974c959476af8a7c779fa46df616e91474512b632658b280bf520eb43c9ddf62270b1553e17566b5c6a173bc88f SHA512 f1048644f39c37e210560f876412c0c63039c6045ba8e9477a00f05841078f6c9f6f97806e0c7824a8e60d2477dc835670920f5df58c5b434be76e6603e0005c
+DIST pidgin-2.14.3.tar.bz2 8688849 BLAKE2B 5d1f28ca5c452b13d2a6d6ab0c9101f14da3b5a291a838dab4b7cda99c76b3e411414b186ae493f08bd9764c65eab4b41eb9a45d340fe885f8bf9bf092911d43 SHA512 70f426900ce76afcdad76bcd06ebc320f562fe4089ec87c639d8d0d90823077f5e815932b62c3ff3da6270b3acfde3c8222d9b8c5cbb211421239c9dcc69b909
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.14.1.ebuild 7878 BLAKE2B 7a3633ee3caaa7c620942ee356c35132ba745b154832c416d9fd62422d51afc82fb998f1e860694322e8ccc80c950dc8e80e88b11aebfad4d2cb9754102af287 SHA512 a249d9298c2efa30c3436441a36368e5ae23c8d16c81a4612fa9bfbc82e316c62c99fd77135a36937401b62b1ef81bc68d8076d71da66fd32b63415584ffc583
+EBUILD pidgin-2.14.1.ebuild 7878 BLAKE2B 59062608078edceed4583384f9567c2fc6cd6da05ff9d70d99022fe8728c5ee7b083ca800a3f4d2ae0d572b3f637cbc1e3cadf91da16a213f1bcfca175d143e4 SHA512 edb48e42c5a84a00f29ce989fa3a130e8daf69156835fd857ef352a248edaab29ea11426d911ed917e28e0f21b20d81b16d616a9070998f7a5821eaebda19569
+EBUILD pidgin-2.14.2.ebuild 7856 BLAKE2B b3b1dbadf65170c4d6263450985d10ff402964a15c4116d970e82d0b892987ecc08fda22fe3f2b1ca860da6ade5df501f89653e0932c3e5145f63afc1d3c51ab SHA512 646f6e489dadc7da7df6173abd392f0015b3f8632f27841ecdb28d912f582e8e2c8d4a26615a4ad7610952129d29a1c42779937bd81bfe61f0974e0a115984a7
+EBUILD pidgin-2.14.3-r1.ebuild 7903 BLAKE2B eccbdb693a9b1c85d872c0e66b71bd66fdc657d5bcf9145ce0a156447375f9a56922a1f18947b87ea7213523ca34e34a68f13e25999d110b6e87b20a7d30cea7 SHA512 d499f7ff66a06397f24549a61f2a8963174d560bd461d534ecbb2dada570f6881f1bb98ed7e0a347a1b07a933600f62201bda1c4a3bad55981bb1f0528b233ae
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch b/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
index 555ef8c1ab16..dc60b147e8e8 100644
--- a/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
+++ b/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch
@@ -1,6 +1,5 @@
-diff -urN pidgin-2.10.10.orig/configure.ac pidgin-2.10.10/configure.ac
---- pidgin-2.10.10.orig/configure.ac	2014-10-17 04:19:33.000000000 +0400
-+++ pidgin-2.10.10/configure.ac	2014-10-28 15:56:27.853702740 +0300
+--- pidgin-2.10.10/configure.ac
++++ pidgin-2.10.10/configure.ac
 @@ -569,18 +569,10 @@
  	dnl # Check for stuff needed by the Evolution integration plugin.
  	dnl #######################################################################
diff --git a/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch b/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
index 4cec32663808..74b30021d485 100644
--- a/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
+++ b/net-im/pidgin/files/pidgin-2.10.9-fix-gtkmedia.patch
@@ -1,5 +1,5 @@
---- a/pidgin/Makefile.am	2014-02-02 22:29:20.000000000 +0100
-+++ b/pidgin/Makefile.am	2014-02-14 19:35:24.347547795 +0100
+--- a/pidgin/Makefile.am
++++ b/pidgin/Makefile.am
 @@ -154,6 +154,7 @@
  	$(GSTREAMER_LIBS) \
  	$(XSS_LIBS) \
diff --git a/net-im/pidgin/files/pidgin-2.14.3-remove_oscar_tests.patch b/net-im/pidgin/files/pidgin-2.14.3-remove_oscar_tests.patch
new file mode 100644
index 000000000000..c20b1a00e87c
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.14.3-remove_oscar_tests.patch
@@ -0,0 +1,10 @@
+--- pidgin-2.14.3/libpurple/tests/check_libpurple.c
++++ pidgin-2.14.3/libpurple/tests/check_libpurple.c
+@@ -91,7 +91,6 @@
+ 	srunner_add_suite(sr, jabber_digest_md5_suite());
+ 	srunner_add_suite(sr, jabber_jutil_suite());
+ 	srunner_add_suite(sr, jabber_scram_suite());
+-	srunner_add_suite(sr, oscar_util_suite());
+ 	srunner_add_suite(sr, util_suite());
+ 	srunner_add_suite(sr, xmlnode_suite());
+ 
diff --git a/net-im/pidgin/pidgin-2.14.1.ebuild b/net-im/pidgin/pidgin-2.14.1.ebuild
index 41fc4c911c96..f90cd8e94cd7 100644
--- a/net-im/pidgin/pidgin-2.14.1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.1.ebuild
@@ -247,7 +247,7 @@ src_install() {
 
 	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
+		# implementations that are not compliant 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
diff --git a/net-im/pidgin/pidgin-2.14.2.ebuild b/net-im/pidgin/pidgin-2.14.2.ebuild
new file mode 100644
index 000000000000..4f3358fca714
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.2.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+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? (
+		>=dev-libs/libgnt-$(ver_cut 1-2)
+		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 )
+	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:= )
+"
+
+# 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.14.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-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
+		--disable-static
+		--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-python3=${PYTHON} )
+	else
+		myconf+=( --without-python3 )
+	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 compliant with new hicolor theme yet, #323355
+		local d f 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}" -type f -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/pidgin/pidgin-2.14.3-r1.ebuild b/net-im/pidgin/pidgin-2.14.3-r1.ebuild
new file mode 100644
index 000000000000..30f6ab348b4f
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.3-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{7..9} )
+
+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"
+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? (
+		>=dev-libs/libgnt-$(ver_cut 1-2)
+		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 )
+	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:= )
+"
+
+# 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,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.14.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-metainfo.patch"
+	"${FILESDIR}/${PN}-2.14.3-remove_oscar_tests.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
+		--disable-static
+		--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-python3=${PYTHON} )
+	else
+		myconf+=( --without-python3 )
+	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 compliant with new hicolor theme yet, #323355
+		local d f 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}" -type f -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/qtox/Manifest b/net-im/qtox/Manifest
index cb838aaf560c..be6be5d0b4c1 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,5 +1,7 @@
 AUX qtox-1.16.3-qt-5.13.patch 672 BLAKE2B 49bde1355f9042dcb60dde2863435bf32110d87d4954191425a50e67ff3ae2ea4b226a16639137a31267d5a97568b45249d1fbb22d2c2d21c5d5db64059322e9 SHA512 eb716cbd6b33c9a07f197a11dce31d875d32a1dfeb499bf2445e77b508cfb3a658a3e9ad1e6724b942e730a67d3784fe250682e151c87d93b83aa4ae0320cda1
 DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c
+DIST qTox-1.17.3.tar.gz 4765213 BLAKE2B 3bffa351da01b436edc9c80c481845f6c6399c930ac1601e1676b7dec22ccfbf37c082c3a30ab71e2295c96bb427b36a718f960ffc75e700d5c29605f7bf0ac0 SHA512 e7534e40aed06aaeba57a201b7315ae2bd361f80971969b95b00fea0a6cbe106c2ea337485c47b350c07a9e3b74947c8b2feb206899292c29621e057b630ca56
 EBUILD qtox-1.16.3-r1.ebuild 1564 BLAKE2B 03facbc9f537853e2d2d9c265835630ae74a83574c7e76acfeed51ba9d22ce16edfbfc4cb5c1b5ed9d70a14401e78b5e0104341c4bd46a5c2583151cc90d6227 SHA512 5f6d88631c0d46c0c2484512b5ec768e15d41f804e260e524b58b40a85f195f2d26970cb25afc5c95d41c00152d1816b059a90101402b008c7cad080b8faa5bf
+EBUILD qtox-1.17.3.ebuild 1679 BLAKE2B ebc3f96bb6f843021474883d35d9b54d53626be4f2b4684f6bd999d6ef510d31cd7e63adf96246c1d46fa1096bb46627dfd42f4cadbaa2720112a9833f7dfab9 SHA512 873d7b7bb11ce46ad83d2565b5a4c52cc305e372587c525b8dad859b48025b397ef421325071ecacb43caa3a67812097463b61de129f400bd95486e78a25b3d8
 EBUILD qtox-9999.ebuild 1403 BLAKE2B 9042194f22e893186a212b47be588ffcde8cd1925126a6fd81f4906e3ff576162f5fbe9400013d781e51295d04139a1f513f2243b3c679c3bdf5ff7bfa66efe6 SHA512 5f7efa140c41dc4a4e8431361744e54820e290b17ba38037c3635824dd0f59b36718e8ad070f95da3fe6a96fe037d54824b9f06f5a84254da845060ee7c339cd
-MISC metadata.xml 342 BLAKE2B 28527d0eeedee612985b7ffb491060390398cb752808154c79074c6be5f3ca88bc33be1c45712d08e926723c9bcc893a63fb19f83468fd1a2308988334813edf SHA512 ff31cb468549defce98375d57354d535c99c02fea5e87d062600dcf7d94b964d6d5d0d19795f852fcecce7fa5d2128080560e56b5b85b73a499ce5accd94f71d
+MISC metadata.xml 396 BLAKE2B 5232a327b1f8f894cbede6900f67a97802e7527a4cd4b3dec7002231bd1b9c262def7b4e7cfd3967ee6b4a356b73a5f1d62432d1238feb3ebebf1c5db3b83b51 SHA512 fcc3442dbb44f9207ea63992650a652698f2b8c524692774abc1d14fe9b4ec2c584d4d58256b494120498b52dbbd35a5cee980cec17724eff190fa640123db67
diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml
index 291481d18572..697f99071d07 100644
--- a/net-im/qtox/metadata.xml
+++ b/net-im/qtox/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="notification">Adds support for GTK Status Notifier tray backends</flag>
+		<flag name="notification">Use snorenotify for desktop notifications</flag>
+		<flag name="spellcheck">Enable spell cheching support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">qTox/qTox</remote-id>
diff --git a/net-im/qtox/qtox-1.17.3.ebuild b/net-im/qtox/qtox-1.17.3.ebuild
new file mode 100644
index 000000000000..c43dea81fae1
--- /dev/null
+++ b/net-im/qtox/qtox-1.17.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="qTox-${PV}"
+inherit cmake xdg
+
+DESCRIPTION="qTox is an instant messaging client using the encrypted p2p Tox protocol"
+HOMEPAGE="https://qtox.github.io/"
+SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="notification spellcheck test X"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/qTox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	|| (
+		dev-qt/qtgui:5[gif,jpeg,png,X(-)]
+		dev-qt/qtgui:5[gif,jpeg,png,xcb(-)]
+	)
+	dev-db/sqlcipher
+	dev-libs/libsodium:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/qrencode:=
+	media-libs/libexif:=
+	media-libs/openal
+	media-video/ffmpeg:=[webp,v4l]
+	net-libs/tox:0/0.2[av]
+	notification? ( x11-libs/snorenotify )
+	spellcheck? ( kde-frameworks/sonnet:5 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# bug 628574
+	if ! use test; then
+		sed -i CMakeLists.txt -e "/include(Testing)/d" || die
+		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE="Release"
+		-DPLATFORM_EXTENSIONS=$(usex X)
+		-DUPDATE_CHECK=OFF
+		-DUSE_CCACHE=ON
+		-DSPELL_CHECK=$(usex spellcheck)
+		-DSVGZ_ICON=ON
+		-DASAN=OFF
+		-DDESKTOP_NOTIFICATIONS=$(usex notification)
+		-DSTRICT_OPTIONS=OFF
+		-DGIT_DESCRIBE="${PV}"
+	)
+
+	cmake_src_configure
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 1c5b28869bdd..a4b9fc4548ac 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.40.1_amd64.deb 109871658 BLAKE2B f2ac08327943112e8bc00f191e9e75392837ad6cf1f3460b9d02f76b589eb23fc9d0448b92d56292982c4b6a4a50e81d7b7f22ec09acde3c5daec57fbc935deb SHA512 dfe2c0e3244e37bdf02df2340d2cadd98f907c027d671fb0eafb8953d676ea28e1b3344e3f84e93e30844cd1d0ce3766b5620059029b313c1b2cfbe6267506d1
-EBUILD signal-desktop-bin-1.40.1.ebuild 3541 BLAKE2B 2ca67dfee2ae825375ce3a0ba6b31c965545c66b38c16b782f8a420a320be5e9df1e861e746663dd552324686cf7faed308f382b9b826ea73bdfb57248f77d08 SHA512 4c7d53251ff79f942da2bd3405f183f8a40b3209dbe0e1bcecfa58e1d1b9ba371abec732c3672fb425efca70ea5307371a42d0bbcecd1cfeb5728dc842aaf62f
+DIST signal-desktop_5.0.0_amd64.deb 106294742 BLAKE2B 4458bdbd52f97c0a0c945d6e918c4f90e4b2ae66c711c957fc915a10449ad9cb34d1c3ec3fd51b0a76370e89e14fae5fe981773e6419654536c51df38d4cb765 SHA512 08a443531e4fe1fba81ee9863a42a5766e74e4b93ffb9c7d6687fe91a62a37892b37222bf0c6dd4bf336315466c8fcf4707c7fddb2c12e027f431262f2fc0e59
+EBUILD signal-desktop-bin-5.0.0.ebuild 3649 BLAKE2B 490d29b12c5953c60381df178bf4937c00d27ac8b880c150bee96c41f1f828d7c78df5d1cd4e97c4e7a0af54ed373eede03546884685d6f5e91ffd2416d89c14 SHA512 6c979c5ac18cc592a819fe8059bd86d5cc40b776041837208d797b8e3ef9affd27a70bde9122f6966bffbb6647851876f5225ae0c2b4f5da9abad221b9b13026
 MISC metadata.xml 396 BLAKE2B 38a79e09275e5b085003b4fd511917b1ada4b25a7f7d8693da9fa35be6f924fd3a8cac88aa689a482391b3ccc89a07ec1946b8d0dc1ec5c45f23b94f65095ade SHA512 e173a6d2920e003012ffa756fc3e0aa15bbea2eb63b37b9387ec016680cdef7d7db0d510f4663e2a941df4b587c367d3af66ef0fa8d0c4b069648b1dbfd0d4ad
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.40.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.0.0.ebuild
index f39a92c2d0ae..b9d805614449 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.40.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.0.0.ebuild
@@ -68,6 +68,7 @@ QA_PREBUILT="opt/Signal/signal-desktop
 	opt/Signal/swiftshader/libGLESv2.so
 	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux_x64.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 390364b61251..a5d818e29a3d 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,3 +1,5 @@
 DIST skypeforlinux_8.69.0.77-1.x86_64.rpm 117875764 BLAKE2B 8f817c595b09f5e9c0e0ca10c2e34d76cc3d56da115950adebe6e43ca7d8715d2a20df862a76fd51fef639cc0664ba3b19976b93406e98da50b8ec07a7323c39 SHA512 a04a2e357192ee9390ebeb00aeeec3a230eb0b7b3cf00f32aab1323dfe61b8ebf980a459db779f1b14266c5b7ff9b1f749ce1bba56025ada06d137ff552db35c
+DIST skypeforlinux_8.71.0.36-1.x86_64.rpm 118012057 BLAKE2B 510df394ef98ea5ca60d68e73624e5ba499126c9a47a2254882aa66ecd8e36e38080eeea1b591c249d1cb2aea6c9b9299a74d56e4d4620de1b4a87e15795a286 SHA512 41f9e8bd76bd8af0aaa2c56d9e354b6ec6c4eb63e7a35bdc75f91b2925a90b8267dc2a3426be4016bf2d89a5cb4bf41b1c53216caa351d5080e1dcd23e465a1f
 EBUILD skypeforlinux-8.69.0.77.ebuild 3117 BLAKE2B f86fd9f5d06faf193363c05a558970bee5204162d426491f2a1ef3690fc5267f7c9d91e0bca1124af40e3c3b84c33da9333847077b00b4a7a9066942c22572b2 SHA512 fba2e33a98ad2f56d6997a814918709f3215793eadb1a7b2d37398d738ab4684e3434724db17ba0ee139b174038436abe15d14c5273f82d5e6e1155b758d132c
+EBUILD skypeforlinux-8.71.0.36.ebuild 3117 BLAKE2B f86fd9f5d06faf193363c05a558970bee5204162d426491f2a1ef3690fc5267f7c9d91e0bca1124af40e3c3b84c33da9333847077b00b4a7a9066942c22572b2 SHA512 fba2e33a98ad2f56d6997a814918709f3215793eadb1a7b2d37398d738ab4684e3434724db17ba0ee139b174038436abe15d14c5273f82d5e6e1155b758d132c
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.71.0.36.ebuild b/net-im/skypeforlinux/skypeforlinux-8.71.0.36.ebuild
new file mode 100644
index 000000000000..01550d2ccb08
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.71.0.36.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 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"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+	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 "${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
+
+	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
+
+	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/teams/Manifest b/net-im/teams/Manifest
index b084a227dcd5..3e5d2f3be05b 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,7 +1,6 @@
 AUX fix-url-opening-1.4.00.4855.patch 439 BLAKE2B 57c5a432cf829c58942ac5b9910fee17fe6e08c7bd200d72e474e3919a46258f169b364c999c9b177236e55c318da20d9527475859e55e7f76d919563b3653d9 SHA512 a06d8e576b8a687e552173cff26071778f75b85a5ce3e36c40ba15b7d21d4c9e8323a07dbac2e6d7a5e834d9cbdc359c31868aaef796e4a17e968771d8aa070e
-DIST teams_1.3.00.30857_amd64.deb 76334658 BLAKE2B 486ee2945f46e7a7c7bfe1d2a6edf29f8cac5a7827c0a8bcf121d25ce95fde2caf31fed520c2f036e27b399c986ac1acc1531aaa1a9caf5a5d6848b10ac0d204 SHA512 5a8be75bfe752347bd36bf2abc2de74ad069cbf4a6430bfcad9ca7396d5b5bf8196a74798a0595908a33ebcb2fcdbedc403c7ff31eec76d07246a3d1c46eeab4
 DIST teams_1.4.00.4855_amd64.deb 76579552 BLAKE2B 3b03451d5a333a0e3736fd48d21252498a0b08041104a97b33a6166263ee8a5d2149f138e5598356bb42aa0c8d7a0619c6b1cd954d2ac5793b063c9bdbb3b929 SHA512 5596db57e8019068e8dac94cc6da8df2b1b6c813e8b67b4a61717fb7775f28973b09b49d77d001ab2dfd65ffe99ef2aaeaba8bc722f1348a474677b3d7a84df8
-EBUILD teams-1.3.00.30857-r1.ebuild 3212 BLAKE2B 1f2ef2fe7193200b0ff0eabddc7ad0766b9dddb974c6fd48428a1f2dea3ace7cc0a13a32131e26b193ffd81a4a3e3d1ed67d0a5976745e2c459ac2ad4100dd24 SHA512 26a97d7d21c5834497917e9d4e70d39e690997c4dd647b6b0940c4a3eec40fef28a1ae5b7c6ec9d1a1644bf64a45312d57d5e6416083c2484db7d6a2a63d20cf
-EBUILD teams-1.4.00.4855-r1.ebuild 3274 BLAKE2B f2b4ffcb749f47df42549691f5f734a29f01424ed717a3ee51c37d3187a694df60aea52a594f5b9fabe06b4daeed3767f528af5be7559e473d486b914b16bc8e SHA512 ecffc012b0898e711b1b5846f3838f9773e7826fbf0951fd5bff24e4ae4a9df483449bcae6632c7e03bfa7765e5f0709a132deff1793c4cda453cbcfb9e09c6d
-EBUILD teams-1.4.00.4855.ebuild 3212 BLAKE2B 1f2ef2fe7193200b0ff0eabddc7ad0766b9dddb974c6fd48428a1f2dea3ace7cc0a13a32131e26b193ffd81a4a3e3d1ed67d0a5976745e2c459ac2ad4100dd24 SHA512 26a97d7d21c5834497917e9d4e70d39e690997c4dd647b6b0940c4a3eec40fef28a1ae5b7c6ec9d1a1644bf64a45312d57d5e6416083c2484db7d6a2a63d20cf
+DIST teams_1.4.00.7556_amd64.deb 77232550 BLAKE2B f663a79a9edb29aecb240722f46cb29aa6f4e2cca6dbe1a29801aee2e9c408b1ad00ab0d2b8fac3c7c4c227429b0382a06b46114921d2f435fbe1c80415ea9d4 SHA512 0afe2714e290e8b2d30039e27a2af4d22cbd03bc4bfe90d6979714ae1cc75bc5226af8932dc38528a5dc5bd6b4820c4b9d9444abcb558a76438c62cff285ffac
+EBUILD teams-1.4.00.4855-r1.ebuild 3278 BLAKE2B eb3309642ec7d762ed86415f95e4eedea20b36eaf6f188714c399f7896eb4a54aef1c8daffbcc96ab680b5882456f086fc5a0fc5a9d382a85162c59a1f6872f6 SHA512 4df12fb0bce9bd38bd6094e3c8269a5d59291b57a63a35412b30f5e7bf9a1cfe0fe1955033864780431ecff44dbfef8af5c3e8dc7fdfa83f4afda79565e93475
+EBUILD teams-1.4.00.7556.ebuild 3222 BLAKE2B 9f3cf836f60bd9560525b2551a41db63fffcbc0918f7dbb383f08c4c6a30a0f3558fb135c008eb4bbb0ef92bf27ab70eaa1f6a52a7f04125562ce44b4d61d08f SHA512 7d92835f11d66c694a291ae8c89187304c86c5db314b66e5c7ecd0e6f7d8358e80580497dc415db7e8b9198250224c812e48235c40b135a7b99053bc191d2906
 MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
diff --git a/net-im/teams/teams-1.4.00.4855-r1.ebuild b/net-im/teams/teams-1.4.00.4855-r1.ebuild
index 574fa6e8d2b1..12ce91e2eb97 100644
--- a/net-im/teams/teams-1.4.00.4855-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.4855-r1.ebuild
@@ -83,7 +83,7 @@ src_install() {
 		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
 
 		cat > 99teams <<-EOF
-		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/chromium"
 		EOF
 		doenvd 99teams
 		elog "Using system ffmpeg. This is experimental and may lead to crashes."
diff --git a/net-im/teams/teams-1.4.00.4855.ebuild b/net-im/teams/teams-1.4.00.4855.ebuild
deleted file mode 100644
index 93fe30a5e8b7..000000000000
--- a/net-im/teams/teams-1.4.00.4855.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker xdg-utils chromium-2
-
-DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
-HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
-SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
-
-LICENSE="ms-teams-pre"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror splitdebug test"
-IUSE="system-ffmpeg system-mesa"
-
-QA_PREBUILT="*"
-
-# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
-# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
-# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
-# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
-# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
-RDEPEND="
-	app-accessibility/at-spi2-atk
-	app-crypt/libsecret
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	x11-libs/pango
-	system-mesa? ( media-libs/mesa )
-	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
-"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_configure() {
-	chromium_suid_sandbox_check_kernel_config
-	default
-}
-
-src_install() {
-	rm _gpgorigin || die
-	doins -r .
-
-	fperms +x /usr/bin/teams
-	fperms +x /usr/share/teams/teams
-
-	if use system-ffmpeg ; then
-		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
-
-		cat > 99teams <<-EOF
-		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
-		EOF
-		doenvd 99teams
-		elog "Using system ffmpeg. This is experimental and may lead to crashes."
-	fi
-
-	if use system-mesa ; then
-		rm -f "${D}"/usr/share/teams/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
-		elog "Using system mesa. This is experimental and may lead to crashes."
-	fi
-
-	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
-
-	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
-	domenu usr/share/applications/teams.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/teams/teams-1.3.00.30857-r1.ebuild b/net-im/teams/teams-1.4.00.7556.ebuild
index 93fe30a5e8b7..dcee637a6d44 100644
--- a/net-im/teams/teams-1.3.00.30857-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.7556.ebuild
@@ -76,24 +76,24 @@ src_install() {
 	fperms +x /usr/share/teams/teams
 
 	if use system-ffmpeg ; then
-		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
+		rm -f "${ED}"/usr/share/teams/libffmpeg.so || die
 
 		cat > 99teams <<-EOF
-		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/chromium"
 		EOF
 		doenvd 99teams
 		elog "Using system ffmpeg. This is experimental and may lead to crashes."
 	fi
 
 	if use system-mesa ; then
-		rm -f "${D}"/usr/share/teams/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
+		rm -f "${ED}"/usr/share/teams/libEGL.so || die
+		rm -f "${ED}"/usr/share/teams/libGLESv2.so || die
+		rm -f "${ED}"/usr/share/teams/swiftshader/libEGL.so || die
+		rm -f "${ED}"/usr/share/teams/swiftshader/libGLESv2.so || die
 		elog "Using system mesa. This is experimental and may lead to crashes."
 	fi
 
-	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
+	rm -rf "${ED}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
 
 	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
 	domenu usr/share/applications/teams.desktop
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 51d0214072f3..385024ba75dc 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,9 +1,5 @@
 AUX fix-tgcalls-gcc10.patch 949 BLAKE2B 7a065fcbf5b8e7b49b6b866d199c67315484312ca527a517a09f890f09d39fa0c97787c586990ba92c0ce2ee83e7c2387eef100f630a74f003ddc06adb93c379 SHA512 dbc61a8520f3698fdeec6c9849cfd8241b8b778589f89277f82d6c748d8ed7a81db90daa0a69dedc3ab2b81bba848ee68e1df79a9cb3fb055f99bd7d19f46e5d
-AUX no-webrtc-build.patch 3656 BLAKE2B b8a8da9e4e6762b2901c2e3307a0289eb32447bc8439c4a6e0aac8c11a4636f7b3de5d14aa98ea806003d6856058f4aefb7bbeae67d5235437b3f0918ae4de4c SHA512 26893ffa97538dfd060373dd052637513c6805c1e6b149a63f1c329a0da4f541f7457832d54397f19d5a3d54e1fbe39628697648f170801ed459fa4d84cb75f4
-DIST tdesktop-2.4.11-full.tar.gz 36405312 BLAKE2B 7c4239d4a2193c910aeb918f40d4c196702bffb4236f7702a5573840b8d4a1a9183e3c91fd97c5d9e4ab5950d96e99b427746ffb18ed5bbef16b240dfc873e2e SHA512 b6452c39ea1b1b794c61ec2fc700356c9ee314250d73b895d297ad66602a93676d3cf74d695ac53965719ddb54da9e290f4f638bbf2e0fb21fec8995b6788a1c
-DIST tdesktop-2.4.7-full.tar.gz 36355613 BLAKE2B 5b60bddd81d5472aaa303817be280604d5dcb4a5f7260c6b6fbd7ca075a46972adb4439e58e2f5b7877c10b3cb6420a7bc95ffe36ab0b3cf531a46758046f7c1 SHA512 712ab6896f89f7df0c7ac297039ee3b3532c159e17f66e4539b701a35d04d4709b558755d592d3cd91df541a2d2ca9f0485cf073c32f0b69a18848ab2ccd1993
+AUX tdesktop-2.7.1-fix-disable-dbus-integration.patch 632 BLAKE2B 92aa9006febe4cb52e4273233f8592827e5d74afebc9d996c41cfc33588c0040b3b573a3730d0541ba8e0641e6733c491861c1bb60a5dc0f26f53b7941bf4572 SHA512 74557a9ac798f47d76cc9a0a514d3891c1a9f3c0667d5938be11d53d44704390dbf97d1e7be3c304cce2c9b8e3110ee04e6759ed28bf5f39d1cfee9f5c77f703
 DIST tdesktop-2.7.1-full.tar.gz 36770178 BLAKE2B 21379cc970da07725e7a46d18a4f0bc459b1da1b730587595448b8f78133ce701e374e7faefc649a973342c203eee510872b5a4ed2ff6be92daec25157e400a4 SHA512 dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b
-EBUILD telegram-desktop-2.4.11.ebuild 4962 BLAKE2B de08c0f5aa2c05e8da4d69383d1a9505d1450dab747a8180b6972f6c911749424aadea83c3c03d6b2dbf180c6db68504b019d330cbbb3d19ddc09c413ca29bd6 SHA512 2cd0787ea12c93115e51daef50b67cd9e4cd419ef59b908c3a960e218301269eef26f57239964cdf043b309d4e2a33bf6f4a69929b047cd14bce0a72f565c04a
-EBUILD telegram-desktop-2.4.7-r1.ebuild 4879 BLAKE2B 424614c2d79701c27eaa4c4d384511467567a5540bc5bbe46155f9eef2ef8003f5b8436e6dd2bab7b66ea3baa9993675caf1d1b551436bcd4a76f6ea66ba95bc SHA512 8b2d9207c431c98aef31703a2f20364249a8d274e2240255463a72238ab78ba0de4a9b33b0edfadb3477d65118b1997445e63c0f8e1f20d9bb3789ce76b0a2e0
-EBUILD telegram-desktop-2.7.1-r1.ebuild 3874 BLAKE2B fca84e42647038f6f98d091b0f2f20095bbd8e1a1b4fb6e4ede57fd6792968c1f907f7cf7d89507b13763d1f5f6a43972ecaf2a889dfef81aee7765440e6d6fd SHA512 9fbd445d56b8771a42e9528c444711d1a09b40607100da5a9e5c0431ec13fa49c3e0ef77b94b9a929171a7b29ee629183a0210859138b906806c861cf0c2d1a8
-MISC metadata.xml 759 BLAKE2B b01ed885c14db59c7a87e43dbe333237dc26639588d87a6b3e55ea26370d0d398cd18dbae153785dec857b6335b5c545506ed4f00f80cef22ef6760f0d79e44c SHA512 1a39987adab83f036869008a8aba7769a0f2080fd0337b7a068c17a345038dc4c63086f84629b0da17e6bc858a8fc81e1942a6035ed16eca2ec28126ef4dbac3
+EBUILD telegram-desktop-2.7.1-r2.ebuild 3964 BLAKE2B 17cc8bf8075b3cbe21f7c8bfd75b8bc5c20cf1598f7c511457c42886ffc154d2478a58b9dcb670eaf81ca7f900f154fe126a8d0d4a201c355bffb2f193287878 SHA512 71c7b9e3ab2892991e3fa01bf68d41041d11e61fe6ee8de829ff0ba4aa3ba5b2dbe905f0bfe7b4c116f3a7f0e36ca40ffaf374a552c4467a593042451d1f22c8
+MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f
diff --git a/net-im/telegram-desktop/files/no-webrtc-build.patch b/net-im/telegram-desktop/files/no-webrtc-build.patch
deleted file mode 100644
index 8ae4113f4406..000000000000
--- a/net-im/telegram-desktop/files/no-webrtc-build.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
-index e99958109..bb7678d3c 100644
---- a/Telegram/SourceFiles/calls/calls_instance.cpp
-+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
-@@ -350,8 +350,11 @@ std::shared_ptr<tgcalls::VideoCaptureInterface> Instance::getVideoCapture() {
- 		return result;
- 	}
- 	auto result = std::shared_ptr<tgcalls::VideoCaptureInterface>(
-+		#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION
- 		tgcalls::VideoCaptureInterface::Create(
--			Core::App().settings().callVideoInputDeviceId().toStdString()));
-+			Core::App().settings().callVideoInputDeviceId().toStdString())
-+		#endif
-+		);
- 	_videoCapture = result;
- 	return result;
- }
-diff --git Telegram/lib_webrtc/CMakeLists.txt b/CMakeLists.txt
-index 47796f1..1f54c21 100644
---- a/Telegram/lib_webrtc/CMakeLists.txt
-+++ b/Telegram/lib_webrtc/CMakeLists.txt
-@@ -14,8 +14,10 @@ target_precompile_headers(lib_webrtc PRIVATE ${src_loc}/webrtc/webrtc_pch.h)
- nice_target_sources(lib_webrtc ${src_loc}
- PRIVATE
-     webrtc/webrtc_audio_input_tester.cpp
-+    webrtc/webrtc_audio_input_tester_dummy.cpp
-     webrtc/webrtc_audio_input_tester.h
-     webrtc/webrtc_media_devices.cpp
-+    webrtc/webrtc_media_devices_dummy.cpp
-     webrtc/webrtc_media_devices.h
-     webrtc/webrtc_video_track.cpp
-     webrtc/webrtc_video_track.h
-@@ -40,10 +42,14 @@ PUBLIC
- if (DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION)
-     remove_target_sources(lib_webrtc ${src_loc}
-         webrtc/webrtc_video_track.cpp
-+	webrtc/webrtc_media_devices.cpp
-+	webrtc/webrtc_audio_input_tester.cpp
-     )
- else()
-     remove_target_sources(lib_webrtc ${src_loc}
-         webrtc/webrtc_video_track_dummy.cpp
-+	webrtc/webrtc_media_devices_dummy.cpp
-+	webrtc/webrtc_audio_input_tester_dummy.cpp
-     )
-     target_link_libraries(lib_webrtc
-     PRIVATE
-diff --git Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h b/webrtc/webrtc_audio_input_tester.h
-index 1ae8d30..008df7e 100644
---- a/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h
-+++ b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester.h
-@@ -20,11 +20,13 @@ public:
- 	[[nodiscard]] float getAndResetLevel();
- 
- private:
-+#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION
- 	class Impl;
--
-+#endif
- 	std::shared_ptr<std::atomic<int>> _maxSample;
-+#ifndef DESKTOP_APP_DISABLE_WEBRTC_INTEGRATION
- 	crl::object_on_thread<Impl> _impl;
--
-+#endif
- };
- 
- } // namespace Webrtc
-diff --git Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester_dummy.cpp b/webrtc/webrtc_audio_input_tester_dummy.cpp
-new file mode 100644
-index 0000000..4e47eaa
---- a//dev/null
-+++ b/Telegram/lib_webrtc/webrtc/webrtc_audio_input_tester_dummy.cpp
-@@ -0,0 +1,11 @@
-+#include "webrtc/webrtc_audio_input_tester.h"
-+
-+namespace Webrtc {
-+AudioInputTester::AudioInputTester(const QString &deviceId)
-+: _maxSample(std::make_shared<std::atomic<int>>(0)) {}
-+AudioInputTester::~AudioInputTester() {}
-+void AudioInputTester::setDeviceId(const QString &deviceId) {};
-+float AudioInputTester::getAndResetLevel() {
-+	return _maxSample->exchange(0) / float(INT16_MAX);\
-+}
-+}
-diff --git Telegram/lib_webrtc/webrtc/webrtc_media_devices_dummy.cpp b/webrtc/webrtc_media_devices_dummy.cpp
-new file mode 100644
-index 0000000..8d5d245
---- a/dev/null
-+++ b/Telegram/lib_webrtc/webrtc/webrtc_media_devices_dummy.cpp
-@@ -0,0 +1,6 @@
-+#include "webrtc/webrtc_media_devices.h"
-+namespace Webrtc {
-+std::vector<VideoInput> GetVideoInputList() { return std::vector<VideoInput>(); };
-+std::vector<AudioInput> GetAudioInputList() { return std::vector<AudioInput>(); };
-+std::vector<AudioOutput> GetAudioOutputList() { return std::vector<AudioOutput>(); };
-+}
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
new file mode 100644
index 000000000000..5351a808ec4c
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
@@ -0,0 +1,17 @@
+Index: tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+===================================================================
+--- tdesktop-2.7.1-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp
++++ tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+@@ -754,10 +754,12 @@ void InstallLauncher(bool force) {
+ 
+ void RegisterCustomScheme(bool force) {
+ 	try {
++#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+ 		if (InSnap()) {
+ 			SnapDefaultHandler(qsl("tg"));
+ 			return;
+ 		}
++#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+ 
+ 		if (cExeName().isEmpty()) {
+ 			return;
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index 81134efc2a6b..bb15e2ab9e52 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -12,7 +12,5 @@
 	<use>
 		<flag name="enchant">Enable the app-text/aspell spell-checking backend</flag>
 		<flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
-		<flag name="lto">Enable Link Time Optimization (LTO / IPO)</flag>
-		<flag name="webrtc">WebRTC based audio/video call support ( via <pkg>media-libs/tg_owt</pkg> )</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild
deleted file mode 100644
index c0423ed32f19..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.4.11.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake desktop flag-o-matic ninja-utils 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="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell libressl lto pulseaudio +spell wayland +webrtc +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/alsa-lib
-	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20201030[pulseaudio=]
-	media-libs/openal[alsa]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa,opus]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	x11-libs/libxcb:=
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2[jpeg]
-		x11-libs/gtk+:3[X?]
-		x11-libs/libX11
-	)
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	!pulseaudio? ( media-sound/apulse[sdk] )
-	pulseaudio? ( media-sound/pulseaudio )
-	webrtc? (
-		media-libs/libjpeg-turbo:=
-		~media-libs/tg_owt-0_pre20201112[pulseaudio=]
-	)
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-	amd64? ( dev-lang/yasm )
-"
-
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-	webrtc? ( !libressl )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# conditional patching is bad, but we want vanilla telegram with webrtc.
-	use webrtc || local PATCHES=( "${FILESDIR}/no-webrtc-build.patch" )
-
-	# no explicit toggle #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-		-Wno-unknown-warning-option
-	)
-
-	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
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings.
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_FONTS=ON
-		-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk OFF ON)"
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION="$(usex wayland OFF ON)"
-		-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION="$(usex webrtc OFF ON)"
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-		$(usex lto "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=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
-	use gtk || einfo "enable 'gtk' useflag if you have image copy-paste problems"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.7-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.7-r1.ebuild
deleted file mode 100644
index 57c34aa583f0..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.4.7-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake desktop flag-o-matic ninja-utils 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="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell libressl lto pulseaudio +spell +webrtc +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[dbus?,jpeg,png,wayland,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/alsa-lib
-	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20201030[pulseaudio=]
-	media-libs/openal[alsa]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa,opus]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	x11-libs/libxcb:=
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2[jpeg]
-		x11-libs/gtk+:3[X?]
-		x11-libs/libX11
-	)
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	!pulseaudio? ( media-sound/apulse[sdk] )
-	pulseaudio? ( media-sound/pulseaudio )
-	webrtc? (
-		media-libs/libjpeg-turbo:=
-		~media-libs/tg_owt-0_pre20201105[pulseaudio=]
-	)
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-	amd64? ( dev-lang/yasm )
-"
-
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-	webrtc? ( !libressl )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# conditional patching is bad, but we want vanilla telegram with webrtc.
-	use webrtc || local PATCHES=( "${FILESDIR}/no-webrtc-build.patch" )
-
-	# no explicit toggle #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-		-Wno-unknown-warning-option
-	)
-
-	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
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings.
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_FONTS=ON
-		-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk OFF ON)"
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION="$(usex webrtc OFF ON)"
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-		$(usex lto "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=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
-	use gtk || einfo "enable 'gtk' useflag if you have image copy-paste problems"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild
index ce5a70e6844a..ee4a0e5a5bfb 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.7.1-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+dbus enchant +gtk +hunspell libressl pulseaudio +spell wayland +X"
 
 RDEPEND="
@@ -65,6 +65,10 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/tdesktop-2.7.1-fix-disable-dbus-integration.patch"
+)
+
 pkg_pretend() {
 	if has ccache ${FEATURES}; then
 		ewarn
@@ -76,10 +80,10 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	cd "$S/Telegram/ThirdParty/tgcalls" || die
-	eapply "$FILESDIR/fix-tgcalls-gcc10.patch"
+	cd "${S}/Telegram/ThirdParty/tgcalls" || die
+	eapply "${FILESDIR}/fix-tgcalls-gcc10.patch"
 
-	cd "$S"
+	cd "${S}" || die
 	# no explicit toggle, doesn't build with the system one #752417
 	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
 		cmake/external/rlottie/CMakeLists.txt || die
diff --git a/net-im/telepathy-logger/Manifest b/net-im/telepathy-logger/Manifest
index b60e0a6d8545..e6d8cee343d8 100644
--- a/net-im/telepathy-logger/Manifest
+++ b/net-im/telepathy-logger/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-logger-0.8.2-py3.patch 15181 BLAKE2B bebd153a519ee6cd4d7e3e04b4516e6fb53b6efea1d0693133ca5807686e115d08998e9e3ad0d6308d01945a0ac1b66010c3e312346dd238c43be1418574e11e SHA512 98cd5f9af7d4781be30b15c58ca6cd3a131b52dbc5cc38eae3423fc3377a02451782838d9f32575a71dd8d6ce7f46657e17f3dee29059a728bb8988d05c716ea
 DIST telepathy-logger-0.8.2.tar.bz2 562670 BLAKE2B 357d717136fe099ee3788bcd004d3eb14e83520c39a8412f4586181e0a1c98ac21be26931759b8f0439ab6f2f9b32aaf6cbf586619ab0fe40ef0f9581b301a29 SHA512 f3eda26133a4c38eeb79b01cbe3b7801a5eb773e8b4e6ce621c47d3ca701025364c6b2b890caea00104f01ba85ae891a6fad82d7a9dc487fd7a980221cede451
-EBUILD telepathy-logger-0.8.2-r1.ebuild 1444 BLAKE2B a35fb15448f4e84d38a433e8202d054d4cc96a1c4c270ac8b5a1a06791798751d8b871789cfc59c5be9fa7c2d0ba4d848c0452a09a6ca978c4115ed0cc158bf4 SHA512 657326bb1dfed8f93845e47076ce642c95da55c2614e82265e4e1853aa4f44d780e459076d0e0a8ac3a0f2c18044609b3ad7dffe7b8f8a0062d99b345d7d3ca7
+EBUILD telepathy-logger-0.8.2-r1.ebuild 1395 BLAKE2B ad1b4a6fcebda05ded9fa8ef01b9db3398f7579da9deac4482c44ec6a505f557b01dcee7ee41f37576ac5865e214a1f83206973e56091696844fcc55cf557760 SHA512 330707cf2953b140251131bef6a855468611aa8882a24638b13629d9d783ae71bae4df1f14d4567ef22c786e4ab6fffe6dc5ad9ac059f70dad499cc1a45abb55
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
index 74495d807ead..e565d8475d7e 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=7
 
-inherit epatch gnome2 python-any-r1 virtualx
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome2 python-any-r1 virtualx
 
 DESCRIPTION="Daemon that centralizes the communication logging within the Telepathy framework"
 HOMEPAGE="https://telepathy.freedesktop.org/wiki/Logger"
@@ -28,7 +27,8 @@ RDEPEND="
 	dev-db/sqlite:3
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.10
@@ -36,10 +36,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-py3.patch
-	gnome2_src_prepare
-}
+PATCHES=( "${DISTDIR}"/${P}-py3.patch )
 
 src_configure() {
 	# --enable-debug needed due to https://bugs.freedesktop.org/show_bug.cgi?id=83390
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index de4339d15e71..6380b7b42783 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1,6 +1,3 @@
-AUX 5.16.5-account-fix-property-name.patch 1053 BLAKE2B 283fde75d8eba3f8c4240e49298233930d270c48ead6b3a4651de7553c35e74fb3b72108f570bf6133acac38f1751e2355b260b28af0d6ef9c8cf5c5102ada80 SHA512 a0161ddf307f9a690b1c741c20aee8fa05f3378da880d1a850f80cde0fc83fe2a95c541d4cb641d1e70995cc6cc75d27b6c5a8c110ec7330ad2a9a75df297012
-DIST telepathy-mission-control-5.16.5.tar.gz 1125142 BLAKE2B 1f39336d8221ec9f297ba9eeaed39ffc30d5b2ecde3b02148343cfb9bf4ec15d949a36feb6b92cef17d70f786840b8df9cf159eb8eb00462c64bfb8b41437b57 SHA512 6adeb3033853bef5b732e7b85da49b75bffbdc57d968b1e4313fd1452eaf8db96c3f7f50d41ebb7bfcb084a7f093a9eaccdb28c23d2777e149a90dec6d4ef4e4
 DIST telepathy-mission-control-5.16.6.tar.gz 1127785 BLAKE2B 82055a86d102292dec44ddeadd99458b1cf083f5d74be09326cfae41d627f1792468a180b5cb9f5bb5712989198cc46116f39e41343ca35b3bac101e3db6003a SHA512 56d62bc7270d2d62a490361f3ef3bc39384fde05ee5d69cb7e20db4f41665bd99d05b4cd2b5992b84dbfee5400684503e44c5b8c63cfa101e0cfe6a85b005e5e
-EBUILD telepathy-mission-control-5.16.5.ebuild 1302 BLAKE2B c4b7b4c989e0224148f387a72cd769085716ef8d48dd808f4cdca28d80f662427c3e0ebad8662978a6f3e23e5d3364f78c98e061c60b9fae8ae07f4507d308e3 SHA512 b1a1e7ef97053c9982357c58b647861a56d971410f5379b6827d43cf1bab1c96f344668f2f263a7ec2332c50b784b3af87a5a0457e0412f2c7bd6503e7479c47
-EBUILD telepathy-mission-control-5.16.6.ebuild 1022 BLAKE2B e21830c8db5967a69fc70950430e39981afe119803b5b8c181de5a793b30361e8569d9a40b375ceb888226d26dfc89ec5dbff52913bf105956c4c34ab2744552 SHA512 9c6f35f7216bbeede47dc75ab846d732293247d38b36d6077851b8893f51ca4ec6833b29fffc71c3df13fc19208e30789ba3611424355dcbc25926dca6a96286
+EBUILD telepathy-mission-control-5.16.6.ebuild 1015 BLAKE2B a06add6a0c4a29191dcb168cd6d90b5d662e07061ca1e6bb40b029907eba5c1949f79b5edf25f0b945082d9a4e8ac0576d196b2a2ecfd88c703306d8fab6f497 SHA512 9ec563d2d2377a560d1e601930c99e626b6fb7d6693d86b860725c72d6284a8612314ac8d56753f8d0b1bae8aee38d6bbff284e659f6213a6448473bed2cf6c1
 MISC metadata.xml 599 BLAKE2B f96e565e553f14b0ab55f8b53ed520e9253611da9cf26b5f43ba35cceeb808a9be1dfc4968929ab62faf3af116d3c98c4e89b63260fb6779f397cfce4f06dee1 SHA512 fba9a9332501e7fce4d62efbbb643cde3579a393918cf6ecc59cb1aae6bd04adfb62d379d446805d01ebed51f9799ad453fdc7490268616e127ff128142f4868
diff --git a/net-im/telepathy-mission-control/files/5.16.5-account-fix-property-name.patch b/net-im/telepathy-mission-control/files/5.16.5-account-fix-property-name.patch
deleted file mode 100644
index 17eb7f1f0415..000000000000
--- a/net-im/telepathy-mission-control/files/5.16.5-account-fix-property-name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 19 Dec 2019 13:37:49 +0100
-Subject: [PATCH] account: Fix property name
-
-Spaces are not valid characters in property names, and never were.
-Until recently GLib silently fixed up the name by replacing the
-space with '-', but now tightened up the validation.
----
- src/mcd-account.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mcd-account.c b/src/mcd-account.c
-index 8009110e..de5c61cf 100644
---- a/src/mcd-account.c
-+++ b/src/mcd-account.c
-@@ -3442,7 +3442,7 @@ mcd_account_class_init (McdAccountClass * klass)
- 
-     g_object_class_install_property
-         (object_class, PROP_CONNECTIVITY_MONITOR,
--         g_param_spec_object ("connectivity monitor",
-+         g_param_spec_object ("connectivity-monitor",
-                               "Connectivity monitor",
-                               "Connectivity monitor",
-                               MCD_TYPE_CONNECTIVITY_MONITOR,
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.5.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.5.ebuild
deleted file mode 100644
index 272e4608ed3d..000000000000
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-# Needed for tests and build #489466
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit gnome2 python-any-r1
-
-DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework"
-HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-mission-control/"
-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"
-IUSE="debug networkmanager" # test
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.82
-	>=dev-libs/glib-2.46:2
-	>=sys-apps/dbus-0.95
-	>=net-libs/telepathy-glib-0.20
-	networkmanager? ( >=net-misc/networkmanager-1:= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.17
-	virtual/pkgconfig
-"
-#	test? ( dev-python/twisted-words )"
-
-# Tests are broken, see upstream bug #29334 and #64212
-# upstream doesn't want it enabled everywhere (#29334#c12)
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/5.16.5-account-fix-property-name.patch" )
-
-src_configure() {
-	# creds is not available
-	gnome2_src_configure \
-		--disable-static \
-		--disable-upower \
-		$(use_enable debug) \
-		$(use_with networkmanager connectivity nm)
-}
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
index a6b12cd81002..fdf7162dfdf0 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
@@ -12,7 +12,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"
 
 RDEPEND="
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 264976bd07c2..1e655026891b 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,9 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
 DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.5.7938.0228_x86_64.tar.xz 50938368 BLAKE2B e8a45c95db2080092674441f16d4bdeeadbe8999483f3ac7ba2da3afb1b340fb3f03cb879a97dd93512159f5a6ff57996782d7b4137547aa78c652c3c40b2641 SHA512 76d3d1dc3c8772636db59f8b641241c4910a54c0e71d33e3f51960d85fd5957536d0e5bbd20870fb7fc1af1457344a3567d7f46bcdfe99774bb87280b14e812c
-DIST zoom-5.6.13558.0321_x86_64.tar.xz 51216956 BLAKE2B c8643ceed50a1714f56565ce49174a6b7297467948dffd6f6d395e8b363510c017a9fd6a9496b6b61b2443b27433bf038c195feb9780cef3170db7dde07c4a50 SHA512 e6ca64e6c5b1e4fdf033d475f53a8c0b598d162c8cbea2688b3626105118bf7cc7c58664519587a0d01c644c812d6c0a58fbd14e45ea52de0cdd2774750fa6c0
-EBUILD zoom-5.4.53391.1108-r2.ebuild 3187 BLAKE2B 385ea0a7a8240baa252674309baad0aa136b2be42e84cca006f9e4fa28bb24efc264ecbab691337e0e14e8f64b2ce3bdd188670056ebb14b1026c9940f9cb7bd SHA512 2cd9bca7e4187d5578f858c4c7325888f4e6868b585b5561fa6dfd474a75ca32750ed64fbc79e61eda576f0a6522c6656866c17773d3b6d5490803e47222d475
-EBUILD zoom-5.5.7938.0228.ebuild 4222 BLAKE2B 739b4585895a1d568255dda626c06f97cf01a1540700497eab31cc1740a52f0a4ff6db6efa300d163b7c0766098a6d53542b10773566bee1e60b97e3fbe0b1d8 SHA512 1c6cc6abb2e67a404c93734ecf6f0491303549c7fcd1238cb0f745473a780108014aced2473835e43a96ae54f406adab5c102f53929d7e578aba5fa513ba7d0b
-EBUILD zoom-5.6.13558.0321.ebuild 4222 BLAKE2B 739b4585895a1d568255dda626c06f97cf01a1540700497eab31cc1740a52f0a4ff6db6efa300d163b7c0766098a6d53542b10773566bee1e60b97e3fbe0b1d8 SHA512 1c6cc6abb2e67a404c93734ecf6f0491303549c7fcd1238cb0f745473a780108014aced2473835e43a96ae54f406adab5c102f53929d7e578aba5fa513ba7d0b
+DIST zoom-5.6.16775.0418_x86_64.tar.xz 51545928 BLAKE2B ce06c408691e81649ed3f8873e7cc47fbc9f6df112d699d69412c71298b7156bb64af23b934f4875084341e9865468578d3e87eb9443fb342e870f192700c7d4 SHA512 61a4f66e99838a410c826a2e6b83338bc903bb119671447572520296edf88369989edd6c56b6157da8886f96daee899ea4ac2ef883efab830cf27d08b85bbe50
+DIST zoom-5.6.16888.0424_x86_64.tar.xz 51534688 BLAKE2B 324655d6a2ddc840f3b518f0e743f33d29122cd9d9ad8b858745319b86108f2b81adfc756668a1cf750fd8eea1dc34692a00bdd068a00f5e5361eab9e347595a SHA512 cf035c6622ea1f0b3870cf8dc2337f3ba919482980aac1b4fce62b28d6f375f70f63f59ae4702cb0ccc915b824a5fe016d4ebc885338dd365080f5f2ab771538
+EBUILD zoom-5.4.53391.1108-r3.ebuild 3167 BLAKE2B 9aba2dc82ebd4c97f7dc97b6718141e35416316f51111ce145b9844bf1172fea80c3080a1d8ff34964e42742e243d1fc157906e2c55450b39170f01cb36a55b4 SHA512 52fc56dcfadaa4b9822475525a7958d8bbe5351038ee209426e1440af613598bed0f75dabdd79450206b6c9a36564f3ecf43dd3a98182368789744c99a589cbf
+EBUILD zoom-5.6.16775.0418.ebuild 4194 BLAKE2B 8d18adc760fce0811107e6d095eba5ced1848643c7a379ccd6a6071c8f6a94e690f084b405b26dd0c003e2f1d68919a18db6ac09f29aea9d89a2a8d706b0d46f SHA512 198cc8d29de4d6ee2a0ff66cd690bd7e60c94095d0d7bfd05a96700467e702fcc159a3b0f672801a337e923b6f85cdab67af51071650826b526ae10889216bf5
+EBUILD zoom-5.6.16888.0424.ebuild 4194 BLAKE2B 8d18adc760fce0811107e6d095eba5ced1848643c7a379ccd6a6071c8f6a94e690f084b405b26dd0c003e2f1d68919a18db6ac09f29aea9d89a2a8d706b0d46f SHA512 198cc8d29de4d6ee2a0ff66cd690bd7e60c94095d0d7bfd05a96700467e702fcc159a3b0f672801a337e923b6f85cdab67af51071650826b526ae10889216bf5
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/zoom-5.4.53391.1108-r2.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r3.ebuild
index cc5c6c145238..6b437d523e63 100644
--- a/net-im/zoom/zoom-5.4.53391.1108-r2.ebuild
+++ b/net-im/zoom/zoom-5.4.53391.1108-r3.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 
 	# The tarball doesn't contain an icon, so extract it from the binary
 	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>zoom-videocam.svg && [[ -s zoom-videocam.svg ]] \
+		>zoom-icon.svg && [[ -s zoom-icon.svg ]] \
 		|| die "Extraction of icon failed"
 
 	if ! use pulseaudio; then
@@ -96,10 +96,10 @@ src_install() {
 	fi
 
 	make_wrapper zoom /opt/zoom{/zoom,}
-	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
+	make_desktop_entry "zoom %U" Zoom zoom-icon "" \
 		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	doicon zoom-videocam.svg
-	doicon -s scalable zoom-videocam.svg
+	doicon zoom-icon.svg
+	doicon -s scalable zoom-icon.svg
 	readme.gentoo_create_doc
 }
 
diff --git a/net-im/zoom/zoom-5.5.7938.0228.ebuild b/net-im/zoom/zoom-5.6.16775.0418.ebuild
index 7ae87da3f7bd..49ebda48755d 100644
--- a/net-im/zoom/zoom-5.5.7938.0228.ebuild
+++ b/net-im/zoom/zoom-5.6.16775.0418.ebuild
@@ -67,7 +67,7 @@ src_prepare() {
 
 	# The tarball doesn't contain an icon, so extract it from the binary
 	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>zoom-videocam.svg && [[ -s zoom-videocam.svg ]] \
+		>zoom-icon.svg && [[ -s zoom-icon.svg ]] \
 		|| die "Extraction of icon failed"
 
 	if ! use pulseaudio; then
@@ -109,7 +109,7 @@ src_install() {
 		doexe libicu*.so.56 libQt5*.so.5
 		doins qt.conf
 
-		local dirs="Qt* generic iconengines imageformats \
+		local dirs="Qt* bearer generic iconengines imageformats \
 			platforminputcontexts platforms wayland* xcbglintegrations"
 		doins -r ${dirs}
 		find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
@@ -119,7 +119,7 @@ src_install() {
 			cd "${ED}"/opt/zoom || die
 			rm -r Qt/labs/location QtQml/RemoteObjects \
 				QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \
-				QtQuick/Scene3D QtQuick/Shapes QtQuick/XmlListModel \
+				QtQuick/Scene3D QtQuick/XmlListModel \
 				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
 			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
 				platforms/libqwayland*.so || die
@@ -127,10 +127,10 @@ src_install() {
 	fi
 
 	make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "")
-	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
+	make_desktop_entry "zoom %U" Zoom zoom-icon "" \
 		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	doicon zoom-videocam.svg
-	doicon -s scalable zoom-videocam.svg
+	doicon zoom-icon.svg
+	doicon -s scalable zoom-icon.svg
 	readme.gentoo_create_doc
 }
 
diff --git a/net-im/zoom/zoom-5.6.13558.0321.ebuild b/net-im/zoom/zoom-5.6.16888.0424.ebuild
index 7ae87da3f7bd..49ebda48755d 100644
--- a/net-im/zoom/zoom-5.6.13558.0321.ebuild
+++ b/net-im/zoom/zoom-5.6.16888.0424.ebuild
@@ -67,7 +67,7 @@ src_prepare() {
 
 	# The tarball doesn't contain an icon, so extract it from the binary
 	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>zoom-videocam.svg && [[ -s zoom-videocam.svg ]] \
+		>zoom-icon.svg && [[ -s zoom-icon.svg ]] \
 		|| die "Extraction of icon failed"
 
 	if ! use pulseaudio; then
@@ -109,7 +109,7 @@ src_install() {
 		doexe libicu*.so.56 libQt5*.so.5
 		doins qt.conf
 
-		local dirs="Qt* generic iconengines imageformats \
+		local dirs="Qt* bearer generic iconengines imageformats \
 			platforminputcontexts platforms wayland* xcbglintegrations"
 		doins -r ${dirs}
 		find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
@@ -119,7 +119,7 @@ src_install() {
 			cd "${ED}"/opt/zoom || die
 			rm -r Qt/labs/location QtQml/RemoteObjects \
 				QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \
-				QtQuick/Scene3D QtQuick/Shapes QtQuick/XmlListModel \
+				QtQuick/Scene3D QtQuick/XmlListModel \
 				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
 			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
 				platforms/libqwayland*.so || die
@@ -127,10 +127,10 @@ src_install() {
 	fi
 
 	make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "")
-	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
+	make_desktop_entry "zoom %U" Zoom zoom-icon "" \
 		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	doicon zoom-videocam.svg
-	doicon -s scalable zoom-videocam.svg
+	doicon zoom-icon.svg
+	doicon -s scalable zoom-icon.svg
 	readme.gentoo_create_doc
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /net-im
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)