gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-im
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
74 files changed, 1027 insertions, 1753 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index e599247de56f..1c057827172a 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 14561e9b9784..753ffa7b2e42 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -9,6 +9,6 @@ AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3
 DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
 EBUILD bitlbee-3.5.1.ebuild 3716 BLAKE2B f465235f3dd0d458a491812e1a8c7804ec640a6341950f8608c75e1275770efc464d22d15f3529de0d1c93d4d1a1ffee7d33960b5a3a265913aca36a34605495 SHA512 4f7eeaa54b88178ca786e1f6114aa01efabd7eb86b47775a0da04890b7892d06e9747c6e1ea70dde7876a63afc75939947f24fb0ad0ad4d3b9ca4669dc993a70
-EBUILD bitlbee-3.6-r1.ebuild 3337 BLAKE2B 72097da010251cf1f7c389b11eb8342b91d7b6e05da5139b09d8fa998a1515d4e0cd0d41a1a33ba4a4d628670cacb89481d22d3851fb2efe0d4a42e72ccb3515 SHA512 8f00c53c65bb2832e2df1322b0de6739a0b31de48be53e0b91b53e6df178c42e697d12521b50bf029b519a2b8a1382a7937b08af2883028245a215ec7b905d18
+EBUILD bitlbee-3.6-r1.ebuild 3335 BLAKE2B 4a14dcc62688fff75ea04b31ac78b31165a5707da2a98550d9e5c1e2197ec7b567f615b95fbf54f11a6cd93974c6532546a0a918caf9a016fef6e4bc147b4199 SHA512 129910dc9f06a9eb3801b07665de7dfe623365bb6fbc08a126b8960a908a114343f1325dde27902ab23c6188c56aadc891503b48a2e20e31c509dade9624af9e
 EBUILD bitlbee-9999.ebuild 3257 BLAKE2B 9761b738113d5eb9761954e48982eb718a122c7bf908ee108e90d7c910a84fc4fb4a31fd40411262bb28aa93f4fa18dde1dd86b155df9829e7d197a2a24daa98 SHA512 19ef30fd8a7a96ab527eb9c42e8649ebdfa2ea50d4b5bcd5fed06a4186e3c8a64fffcf827ccf1b126d9e77d9a15bd44214eddc2216fe3041992c222d7075bf86
 MISC metadata.xml 1138 BLAKE2B ec881562587832981f817dc9601f094e987ee3e1a5d92f310f4bac1fbdac70b434e8c5d06b59be149e5c955e4027865c6bf72de1903b584d638440f51c7cca0c SHA512 01da5fed1649b6d59837e8dd89ee65c1f9bc3763303a66c0959f0b5d14941f38fc1dcfb3bf22d5041d7a4d99f2e9b8a38983154f3f5d7e0c7a7308ad8a3a3f95
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 28e2ef6bf5e2..72ae3bbaf198 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest
index b2d1440c7341..abf27f6a0ceb 100644
--- a/net-im/coturn/Manifest
+++ b/net-im/coturn/Manifest
@@ -2,7 +2,7 @@ AUX coturn.conf 46 BLAKE2B 8ae3300f7a0a6e09fde5259b660ec69c7b15cd08d2edcd7a5f77d
 AUX coturn.service 470 BLAKE2B 21b1cc005b5b91a8cb80b05a45afc16d73ad88e5b0a851294a6fab79d01a3bebbd048dc0bdd2423b62c2b56fe16dece95613846ad45bc9d5c3642a79fa726eff SHA512 f4228af88e51a38b06b0f91e1494d4e61a9a9f18cbab9fe85c323267e28045ebaae2832bae114da6e326cf22bf8efbd2bd5677cbcdde8fe994eca60802a6dc66
 AUX logrotate.coturn 345 BLAKE2B 26edd2ad44d947bf943757fb3e3255cafea64fac5d495402bbc3a7088ed6ffd822cc8f07010669f9faf856eb8a893d9ba9ab48d4b417f8c3fd27772ffb71cae0 SHA512 ebfadc7e6435061b7120baffce76a65c224768ab85e59e3b8cd140e394fa6e4eaa258eccce76f3152fd6a1adab0c84e39feb51663c76359401e04df4d8db2c1d
 AUX turnserver.init 633 BLAKE2B 78da89afc2be30bac969bb2a393d454d32ba77e199f2ccb5e34557ce34cf3a242402210afe6e30400b4a47ef9dc7880cded44a1932f7769f21f4143261a3569e SHA512 3b86b2186499c96ec0cfd3a124ea058a622c21cc870e079414f6055f7ba85830a5b85c424c809c010144f9270fcada80ef20bcab4cbc9c7fe0949b24fef02b59
-DIST coturn-4.5.1.2.tar.gz 436487 BLAKE2B c59a3ba0554111c6f70db04438e08b4d78bacc312bc5e5c2435e92f697222c8a3ab1c4f3e25de15174c3c359acda4760f855d88e37e68d333568c0882f4139a5 SHA512 6dd223fee866d97a3e55d87250fcb5d6ecc56f14b30029685406237aedd3d3cd6c09b685ef13ed2d1ebed3a4a3a80a88151c6498f312e53e3f5848d4af489478
-EBUILD coturn-4.5.1.2.ebuild 2308 BLAKE2B 608fc648807afad194dddc72901211fd4c08fbb238679db8a87e2cb9088ec50e7c5f728a4f4fb030d63b35f1f69c6ed2a388bd755738d6ac3ad2d97c0d09a5e9 SHA512 f31ff6ae202aad02e3ecd2908e34e322c4464497d595041387da1d38c0d180f6e16f808069765b4714475fb1a3a400c815cb9bc927ef023457c2abf9c75aa588
+DIST coturn-4.5.1.3.tar.gz 437084 BLAKE2B 6652400cea6e11e83a3319a5058c334b99dfcd3f5524e03b97d0aa11df1fbf7297c182af1c9f0085271279a0704ca728297b4618e384f61335ab928772f9f9a8 SHA512 f86cd953cc967bd8474df110ac45ae315e1a5fca48b17a5395a7159384e4a99ecf01787e096a88ec8ec64e1f7545e754579c8ba2ac43cc072d93bf0e180e4133
+EBUILD coturn-4.5.1.3.ebuild 2308 BLAKE2B 608fc648807afad194dddc72901211fd4c08fbb238679db8a87e2cb9088ec50e7c5f728a4f4fb030d63b35f1f69c6ed2a388bd755738d6ac3ad2d97c0d09a5e9 SHA512 f31ff6ae202aad02e3ecd2908e34e322c4464497d595041387da1d38c0d180f6e16f808069765b4714475fb1a3a400c815cb9bc927ef023457c2abf9c75aa588
 EBUILD coturn-9999.ebuild 2308 BLAKE2B 608fc648807afad194dddc72901211fd4c08fbb238679db8a87e2cb9088ec50e7c5f728a4f4fb030d63b35f1f69c6ed2a388bd755738d6ac3ad2d97c0d09a5e9 SHA512 f31ff6ae202aad02e3ecd2908e34e322c4464497d595041387da1d38c0d180f6e16f808069765b4714475fb1a3a400c815cb9bc927ef023457c2abf9c75aa588
 MISC metadata.xml 497 BLAKE2B 522928095883e077064a9971e45e4e644461ce6d7a07720920a7bc96afc326b6ab337aa64704518a866f0df276f5bc284660e81561874631ff84c395035051dd SHA512 62689abd67427c6dd3de86c139b2cb94f7dc3ba8c8f9d3fced5b91b6de36cd30caa1a7805c0dc3aa64fa35e154e4509a607ef7eae62fe6894084383b2226b8bb
diff --git a/net-im/coturn/coturn-4.5.1.2.ebuild b/net-im/coturn/coturn-4.5.1.3.ebuild
index f3a72b581544..f3a72b581544 100644
--- a/net-im/coturn/coturn-4.5.1.2.ebuild
+++ b/net-im/coturn/coturn-4.5.1.3.ebuild
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 1c9b01c9c8fc..861e2d1630cc 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,4 +1,4 @@
 DIST dino-0.1.0.tar.gz 441638 BLAKE2B 08f332d38af866eed1049fae7d0e207da5a3486fdaf07eb5327e7abf614ac4adc130fd8f2d9465d6cb248ecfe4b809e022a69c72df5879d98719d24635771b33 SHA512 b63bf87dbf7f728f038f22d0dba34770a06d7eb1be2ec249293ff876e16c151165add895ff3cb20a3216c3581d20e10634d454ee8b024b895012efb34f9d7de8
-EBUILD dino-0.1.0.ebuild 1590 BLAKE2B 0003707109eb71f153aac80a907c2ea58a06c2fbc3705490bf42d8ecf896a9778e64a2b1a1be419ab30fa35d818fd3b6f589f8eaae585ac8b36d1ec178bdea31 SHA512 ffb0f930ff05ec08d46fcf715e8e9d18fbfacab71cd3f01f39accd78aa475719f094fe830a36e0f0496f4af2907b7b86052a394b5bf8caf4cf0f2447aaeaba96
+EBUILD dino-0.1.0.ebuild 1597 BLAKE2B ddcce77114ef37406b2c31eec69eb8d38a7cd476c150f0c9305aabcb9afd2e5c6f46d6310a78a8811d0c04f98b154638982cc354eb03d1667d136bbb7bc782c9 SHA512 c67877d9465cd93175f6d591fde849cc6667c84ba0000848f5a40a1233583c1d59afbb90f82584d478e85a2b2a30788898062af77cd6dbaa3b5ff960b08120c5
 EBUILD dino-9999.ebuild 1583 BLAKE2B 864709c4e4a9b34c6b444e1ae40a07b4697f3417be7641f229096bc7309c5e422953aca09d688afb410c4c921bd19457b6366c039f30d22d3357df17578e4686 SHA512 37c77529cae35d8e6ce438cb14fd970734c0cd900e4c0e55013c8996f4e759cdefb7d89890d28cbebf586307e1c1947561ed3ad543d835b504321d4473b46ffe
 MISC metadata.xml 573 BLAKE2B cf7a2731750afde53919e6a41541c0829df4ffa6da202c179092de0640a8ac044445b258350704822d02f302c601738f38f05fc2ab938d6f0ea55bead77b0eae SHA512 7023554fe0c67fd41d9134315500a7206653f34a192673db9bd741af22e05f0a00e431fa96c109c94bab6dbdb31334729bc272a07773dd7b905dd0422ce8532f
diff --git a/net-im/dino/dino-0.1.0.ebuild b/net-im/dino/dino-0.1.0.ebuild
index 107f28ed4d27..51136f838055 100644
--- a/net-im/dino/dino-0.1.0.ebuild
+++ b/net-im/dino/dino-0.1.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="${MY_REPO_URI}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 981868c01407..1de291084007 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.10.deb 68310032 BLAKE2B d7b192e78ab0f7ec1ca9c2d2358d5a4a32e543507b3a7553de618af322feaf180228569489d8e14e8316234067dcbd4aaff0cb32adb60b43bbd51a321ab0b7ec SHA512 f9b901b0a8ee2b0fb70e6671231ea8fcc41b60d7499e03d29026896a96f5c2d2e3ec992b5d0db7f9ee44fefccc2c5457a76c64a643a7d51a4c9d4f994b9c5d8d
-EBUILD discord-bin-0.0.10.ebuild 1839 BLAKE2B 56ccc90249e0bb27d14b13f9a09ea059859223b0b0f43f7d9a1d0f1690b57ebe4b07279240f8ce1cba92a4d8e029418ee4393c5d5c44c69441dd46e1d44c8c3a SHA512 7fab8a5ab00d511c4ab8322de40ada6957b0d6228decdd29ca8395f6fdd5957ffc4d0cc2e0d6cb1d9a4f3e9b9c134caab17fcbc6900fd1470bc28a737faf1f50
+DIST discord-0.0.11.deb 68328574 BLAKE2B 5a4bba82168056fffee2a2e495be7f5c8d8a02b890fd45645eb800a17c976db4a35719082ae469615f13ce45cadeb73ab7937ad8aac4850264275a479a8eb2c4 SHA512 26f408c3332e9083c448b3b8914fed80918a7d3ab3dd9c2a02b2cea7225ac53dea743fa899bdeeb2f210cda90493b7f35b8075a967e70d1fd6dffb1de1e8b102
+EBUILD discord-bin-0.0.11.ebuild 2001 BLAKE2B 28f81eb0fad820d2a97e81ef259ae4e09b3717009161be632f9ddef1dc8abcd204ea659691a16e7001cc49086bd0d981510033f220ecab857b69359749b8e3c5 SHA512 b3cb62ee6246f35c6c91e006682675f9bcd4adc9d26590e8c673d038aef7f24595c1d8f08c3255267ba2b2cffe7fb39392a5c3b7848b31ac30636355dd24ec53
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/net-im/discord-bin/discord-bin-0.0.10.ebuild b/net-im/discord-bin/discord-bin-0.0.11.ebuild
index 8299f57aaacf..4ceb97f74dc0 100644
--- a/net-im/discord-bin/discord-bin-0.0.10.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.11.ebuild
@@ -18,6 +18,8 @@ KEYWORDS="~amd64"
 RESTRICT="mirror bindist"
 
 RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
 	dev-libs/atk
 	dev-libs/expat
 	dev-libs/glib:2
@@ -28,6 +30,7 @@ RDEPEND="
 	media-libs/freetype:2
 	net-print/cups
 	sys-apps/dbus
+	sys-apps/util-linux
 	sys-libs/libcxx
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
@@ -51,10 +54,12 @@ S=${WORKDIR}
 
 QA_PREBUILT="
 	opt/discord/${MY_BIN}
+	opt/discord/chrome-sandbox
 	opt/discord/libEGL.so
 	opt/discord/libGLESv2.so
 	opt/discord/swiftshader/libEGL.so
 	opt/discord/swiftshader/libGLESv2.so
+	opt/discord/swiftshader/libvk_swiftshader.so
 	opt/discord/libVkICD_mock_icd.so
 	opt/discord/libffmpeg.so
 "
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 76bfff31be3f..485584d46e27 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,16 +1,10 @@
-AUX ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch 1642 BLAKE2B ffba29eb4f46e35cf957d2fa023ae28d56148bdd20a0d7a4f594a745ab46e9dfa371796fd58105e30acfdc6b0834eec993ce266723ffd359b7953f2ccad6ea76 SHA512 ab2b3fe4f3cca579a174cd77876f6c485fd806454b07d7e8d2a13c710b3f9115aa901f22dd71dfd3ab60a78f819e0c8dfdbcca38ca9c87d65fe5b5a0f105cad6
 AUX ejabberd-17.04-0002-Dont-overwrite-service-file.patch 470 BLAKE2B 0dd597eaa63ccedafbb5c2903f948cc078c4951c551f76827f66198b4a25ac71f81dfaa36a0e0f443a8567c5d4309d00bc7ed59732a945dd0696d08edea5189f SHA512 a6b38ae82a0fe5d5d643eb2a122921aff3a9701381f6162213cee11b4950bdb9f16add78465a01eb6df5824dfa4ba2adae6dc0451749f76eefd224f5f97b8b01
-AUX ejabberd-17.04-ejabberdctl.patch 2154 BLAKE2B b5050f77bfaf84a4ec5f366d6ca3241d39eab3603b54d3a19c17d3581d37fe5e55b348d3a523ea6004468817d580a066fda2a2b1578e321b3ee06f3bff5935ae SHA512 8f715dee3570dc5ea44499bde94d6a137ef2a7c28d0535173b88cef0ceeadd94950e42b29d23f689b1de7be7670dd307694524b75102c668ad88f10250ae6166
 AUX ejabberd-19.08-ejabberdctl.patch 1238 BLAKE2B 04b4317661afb77525b3d09fc2b1499faeb8ba49f32971f5302e64849808d7da21530d351aa728790e00cef076b8d679d1ca2ebb39e72d999ba3e628637ba00f SHA512 34e3aaecae83b8c00998dec3c8f26389a00af4aebf59592dcc0fa0afb917fbe33b057e83b38d3f5c24dad9e877d0a02c6b14a6d3396a6549e98e372fc293e9be
 AUX ejabberd.confd 161 BLAKE2B f08ab6310c950d3d248fbaf5e6e35bca2e31289ae476b2379a779ebc38926e091cf04883cce94cedff1e4dcf6ec3224079e7828502b97451a8a96fd278a4d102 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb
 AUX ejabberd.initd 1071 BLAKE2B 226a0d4593df3504e30fbf40e9daffed6d903cf797b4ce0ce19b23ed29059d52a4e43d9f94354f6a1724966413cff7dcf0c13a4ede7dd2fff0da405c59bf8f39 SHA512 64839da9c369bf570389e95b0b1b67e1c4b339927c2f1fd4ca113a18410deb3fbe1ecdd41bb46df3d3b52b38149218dfe26b798ff43398151f08799566515352
 AUX ejabberd.logrotate 203 BLAKE2B f523a30cf927d403523f618a6ab28fe4281a95ce6a1e639b4075b0ce98a8a985deec5446655c41288258a286a1ceb46cb64422be554d1de754fd97fc86e67555 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2
 AUX ejabberd.tmpfiles.conf 78 BLAKE2B d516116f500baf9972b4bdee069ab9930bcc8aa309de4d25a38c93bfa82ac216211341d047078eed1346a39f327d856e8e9021e87d4c63ea9b26c0d581a0e2a0 SHA512 21953448f1695cf6b45d2eccf2eca7611d45c8407759fcc62b347afd22a4f25b79514275e18c473debc8070345b25bb49e1457e10bc37766f0590cb70f7f0230
 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449
-DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B 2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066 SHA512 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
-DIST ejabberd-20.03.tar.gz 2006603 BLAKE2B 67fa7d86e6802f24e783e91a8cb498375ca615bf22422ebe8bf630eb721e50574f468cfe25271172ebdfdca0c1df24dc6dd7f96a289153a017c32eb82af06d82 SHA512 f3ab666d9ffa596386ef121161dc7eeedca85cb7f5d290ad0882cd9557ea4166467bce9c082bdb423f932b44999c8e887d6a386d53564febf360f306feda3952
 DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
-EBUILD ejabberd-17.04-r2.ebuild 10910 BLAKE2B 8a5d34ca8fd943b604d07b9e6ca9aa092a40064b67a03ed58fc1fd4a74b626e3073cbb22d3ed4effb9e594f2e3c1a36ac63078dfe8b9b066bd7b7d9a5d1c7b2d SHA512 0b6d08ef700f1d721d436858f24505e8304733346a49dbe84252f4b69fe359aa505f2f888d4538c035c15704c477fe884904c64ef414648f18811f3e2de8dfc1
-EBUILD ejabberd-20.03.ebuild 9020 BLAKE2B 7963c866bb5215c62990a05d4a1088fcd803b8bd01ee228614691309617320ebe5c7fb0808683f77ee799353cbdbe9a5b1c0c6bf5345bebede3eef9a20665d7d SHA512 b31b5a4404f9df47f347f96cf803ef924b8b6f667412eb7d11065fa1fd959d2d6421df7b43794d142258cf4e933eb224bb81f406fab65e755fa0e8c4ec7d4b77
-EBUILD ejabberd-20.04.ebuild 9021 BLAKE2B 8c7cfdba1600945b13ff401bda8dc0ab2d94f1bb2e6537921fa5aa3cfcd713febfe6b769b84d24f6f995e5e635a8cedec8860e46b391b223bbbc6630b3dbe97b SHA512 d987ca546924ab60b7ab34d53dd8748eae7061b11f83a0d063a41cb4a223ad0c362ad3e5484d2bc34c2a0d03a0b8ec8040a301c366da8acd28bd18039a889140
-MISC metadata.xml 1681 BLAKE2B f8a55f8a55d979278382c8ca7e2664af897125c27c50df22a6cbea094836b5dbff6d78dddc36ba151243a2055fd5459b38421e8542d7e611d67a8bdf08938ab2 SHA512 9f8d23f14a43c26c30efd11c90d7e0d30659548e07e8cdca0e7f7b8dc4cb517d671646f57994b0ece33b25a46a8cc1dcca26edf27b4d5499d39c779320fdf2b9
+EBUILD ejabberd-20.04.ebuild 9042 BLAKE2B fd60d71520f2290636b148fadc2887d684a1d3e9b2da49bfb266c4324218b4dc97c3bf4ac9c8e813f8245179990931c1d33cfba5a7dbf7d84bb7e2b4fe0f7746 SHA512 ab06eaf9afbb94c8da956fa892e649cd094c108cc1c96df708543a3558671226d871b1d766196f783e4519e3d1b80212b2dd1193837b0e66d96475448e892534
+MISC metadata.xml 1516 BLAKE2B e156fd8588db78fd863ed478db344d54ed4b401426c602b63b3652a2bdf0db426eac2f46797f40443225abc9fd4f45060701030e7002a31b5162a61712cc8c9b SHA512 091f443f98785ac57d5c9a8c5dfa258029cf5f2b3f6ca90ec4330881b7331c7490cd885f1a477574bc8d6af6a75ec3ea9c8a6d1051194f3cb0636c5672d63671
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
deleted file mode 100644
index 6a2041af6c58..000000000000
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit autotools eutils pam rebar ssl-cert systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
-	riak roster-gw sqlite zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO: 	>=dev-erlang/meck-0.8.4
-# TODO: 	>=dev-erlang/moka-1.0.5b
-# TODO: )
-CDEPEND="
-	>=dev-erlang/cache_tab-1.0.7
-	>=dev-erlang/esip-1.0.11
-	>=dev-erlang/fast_tls-1.0.11
-	>=dev-erlang/fast_xml-1.1.21
-	>=dev-erlang/fast_yaml-1.0.9
-	>=dev-erlang/jiffy-0.14.8
-	>=dev-erlang/lager-3.2.1
-	>=dev-erlang/luerl-0.2
-	>=dev-erlang/p1_oauth2-0.6.1
-	>=dev-erlang/p1_utils-1.0.8
-	>=dev-erlang/stringprep-1.0.8
-	>=dev-erlang/stun-1.0.10
-	>=dev-erlang/xmpp-1.1.9
-	<dev-erlang/xmpp-1.2.0
-	>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
-	>=net-im/jabber-base-0.01
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
-	nls? ( >=dev-erlang/iconv-1.0.4 )
-	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/epam-1.0.2 )
-	postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
-	redis? ( >=dev-erlang/eredis-1.0.8 )
-	riak? (
-		>=dev-erlang/hamcrest-0.1.0_p20150103
-		>=dev-erlang/riakc-2.4.1
-	)
-	sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
-	zlib? ( >=dev-erlang/ezlib-1.0.2 )"
-DEPEND="${CDEPEND}
-	>=sys-apps/gawk-4.1"
-RDEPEND="${CDEPEND}
-	captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
-	"${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch"
-	"${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" )
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificates.
-# - Correct PAM service name.
-adjust_config() {
-	sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
-		-e "s|\"pamservicename\"|\"xmpp\"|" \
-		-i "${S}/ejabberd.yml.example" \
-		|| die 'failed to adjust example config'
-}
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
-	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
-		-i "${S}/Makefile.in" \
-		|| die 'failed to set ejabberd path in Makefile.in'
-	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set ejabberd path in ejabberdctl.template'
-	sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \
-		-i "${S}/ejabberd.yml.example" \
-		|| die 'failed to correct path to captcha.sh in example config'
-}
-
-# Get epam-wrapper from 'files' directory and correct path to lib directory in
-# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
-# file exists there already.
-customize_epam_wrapper() {
-	local epam_wrapper_src="$1"
-	local epam_wrapper_dst="${S}/epam-wrapper"
-
-	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
-	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
-		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
-		|| die 'failed to install epam-wrapper'
-}
-
-# Disable mod_irc in example configuration file.
-disable_mod_irc() {
-	local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
-	sed -r \
-		-e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
-		-i "${S}/ejabberd.yml.example" \
-		|| die 'failed to modify example config'
-}
-
-# Check if there already exists a certificate.
-ejabberd_cert_exists() {
-	local cert
-
-	for cert in $(gawk -- \
-			'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \
-			"${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do
-		[[ -f ${cert} ]] && return 0
-	done
-
-	return 1
-}
-
-# Generate and install sample ejabberd certificate. It's installed into
-# EJABBERD_CERT path.
-ejabberd_cert_install() {
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
-	install_cert "${EJABBERD_CERT%.*}"
-	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
-	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
-}
-
-# Get path to ejabberd lib directory.
-#
-# This is the path ./configure script Base for this path is path set in
-# ./configure script which is /usr/lib by default. If libdir is explicitely set
-# to something else than this should be adjusted here as well.
-get_ejabberd_path() {
-	echo "/usr/$(get_libdir)/${P}"
-}
-
-# Check whether mod_irc is enabled in ejabberd configuration on target system.
-is_mod_irc_enabled() {
-	egrep '^(\s*)(mod_irc\s*:.*$)' \
-		"${EROOT%/}${JABBER_ETC}/ejabberd.yml"
-}
-
-# Make ejabberd.service for systemd from upstream provided template.
-make_ejabberd_service() {
-	sed -r \
-		-e 's!@ctlscriptpath@!/usr/sbin!g' \
-		-e 's!(User|Group)=(.*)!\1=jabber!' \
-		"${PN}.service.template" >"${PN}.service" \
-		|| die 'failed to make ejabberd.service'
-}
-
-# Set paths to defined by net-im/jabber-base.
-set_jabberbase_paths() {
-	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
-		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
-		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
-		-i "${S}/Makefile.in" \
-		|| die 'failed to set paths in Makefile.in'
-	sed -e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \
-		-e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \
-		-e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set paths ejabberdctl.template'
-}
-
-# Skip installing docs because it's only COPYING that's installed by Makefile.
-skip_docs() {
-	gawk -i inplace '
-/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
-	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
-		print $0;
-	} else {
-		next;
-	}
-}
-1
-' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
-}
-
-pkg_setup() {
-	if use pam; then
-		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
-			"authentication"
-		# See
-		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
-		# epam binary is installed by dev-erlang/epam package, therefore SUID
-		# is set by that package. Instead of jabber group it uses epam group,
-		# therefore we need to add jabber user to epam group.
-		usermod -a -G epam jabber || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	rebar_remove_deps
-	correct_ejabberd_paths
-	set_jabberbase_paths
-	make_ejabberd_service
-	skip_docs
-	adjust_config
-	use nls || disable_mod_irc
-	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
-
-	rebar_fix_include_path fast_xml
-	rebar_fix_include_path p1_utils
-	rebar_fix_include_path xmpp
-
-	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
-	# rather than its parent which is default. That way ejabberd directory
-	# takes precedence is module lookup.
-	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
-	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
-
-	# https://github.com/processone/ejabberd/commit/58110e4bc152100078dbc0cb66d4a5257ae645e0,
-	# bug #651932, drop in next version
-	sed -i -e 's/REQUIRE_ERLANG_MAX="9.0.0 (No Max)"/REQUIRE_ERLANG_MAX="100.0.0 (No Max)"/' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-user=jabber \
-		$(use_enable debug) \
-		$(use_enable full-xml) \
-		$(use_enable hipe) \
-		$(use_enable mssql) \
-		$(use_enable mysql) \
-		$(use_enable nls iconv) \
-		$(use_enable odbc) \
-		$(use_enable pam) \
-		$(use_enable postgres pgsql) \
-		$(use_enable redis) \
-		$(use_enable riak) \
-		$(use_enable roster-gw roster-gateway-workaround) \
-		$(use_enable sqlite) \
-		$(use_enable zlib)
-}
-
-src_compile() {
-	emake REBAR='rebar -v' src
-}
-
-src_install() {
-	default
-
-	if use pam; then
-		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
-
-		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
-		into "$(get_ejabberd_path)/priv"
-		newbin epam-wrapper epam
-	fi
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	systemd_dounit "${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "For configuration instructions, please see"
-		elog "  https://docs.ejabberd.im/"
-		echo
-		if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
-			ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after"
-			ewarn "migration to ${PV}. pubsub data may not be migrated automatically and"
-			ewarn "you may need to run migration script manually, see:"
-			ewarn
-			ewarn "  https://github.com/processone/ejabberd/issues/479#issuecomment-124497456"
-			ewarn
-			ewarn "In case you don't care about all stored moods, activities, geoinfo and you"
-			ewarn "know you don't store in pubsub anything important, you can just remove"
-			ewarn "pubsub tables:"
-			ewarn
-			ewarn "  rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*"
-			ewarn
-			ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244"
-			echo
-		fi
-	elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then
-		elog "Ejabberd now defaults to using a YAML format for its config file."
-		elog "The old ejabberd.cfg file can be converted using the following instructions:"
-		echo
-		elog "1. Make sure all processes related to the previous version of ejabberd aren't"
-		elog "   running. Usually this just means the ejabberd and epmd daemons and possibly"
-		elog "   the pam-related process (epam) if pam support is enabled."
-		elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can"
-		elog "   fail to start ejabberd properly for various reasons. Check ejabberd's main"
-		elog "   log file at /var/log/jabber/ejabberd.log to confirm it started successfully."
-		elog "3. Run"
-		elog "     \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`"
-		elog "   with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to"
-		elog "   /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config"
-		elog "   file."
-		echo
-	fi
-
-	if ! ejabberd_cert_exists; then
-		ejabberd_cert_install
-	fi
-
-	if ! use nls && is_mod_irc_enabled; then
-		ewarn "nls support (dev-erlang/iconv) is required by mod_irc. Either rebuild ejabberd"
-		ewarn "with nls enabled or disable mod_irc in ${EROOT%/}${JABBER_ETC}/ejabberd.yml."
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-20.03.ebuild b/net-im/ejabberd/ejabberd-20.03.ebuild
deleted file mode 100644
index 7ed076748bb0..000000000000
--- a/net-im/ejabberd/ejabberd-20.03.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
-	roster-gw sip sqlite stun zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:		>=dev-erlang/luerl-0.3
-# TODO: )
-DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl]
-	>=dev-erlang/cache_tab-1.0.22
-	>=dev-erlang/eimp-1.0.14
-	>=dev-erlang/fast_tls-1.1.4
-	>=dev-erlang/fast_xml-1.1.39
-	>=dev-erlang/fast_yaml-1.0.24
-	>=dev-erlang/yconf-1.0.4
-	>=dev-erlang/jiffy-1.0.1
-	>=dev-erlang/jose-1.9.0
-	>=dev-erlang/lager-3.6.10
-	>=dev-erlang/p1_oauth2-0.6.6
-	>=dev-erlang/p1_utils-1.0.18
-	>=dev-erlang/stringprep-1.0.19
-	>=dev-erlang/xmpp-1.4.5
-	>=dev-erlang/pkix-1.0.5
-	>=dev-erlang/mqtree-1.0.7
-	>=dev-erlang/idna-6.0.0
-	>=dev-erlang/p1_acme-1.0.5
-	>=dev-erlang/base64url-1.0
-	>=net-im/jabber-base-0.01
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( >=dev-erlang/p1_mysql-1.0.14 )
-	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/epam-1.0.7 )
-	postgres? ( >=dev-erlang/p1_pgsql-1.1.9 )
-	redis? ( >=dev-erlang/eredis-1.0.8 )
-	sip? ( >=dev-erlang/esip-1.0.32 )
-	sqlite? ( >=dev-erlang/sqlite3-1.1.6 )
-	stun? ( >=dev-erlang/stun-1.0.31 )
-	zlib? ( >=dev-erlang/ezlib-1.0.7 )"
-RDEPEND="${DEPEND}
-	captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
-	"${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificate.
-adjust_config() {
-	sed -rne "/^#?\s+certfiles:/{p;a\  - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \
-		-i "${S}/ejabberd.yml.example" \
-		|| die 'failed to adjust example config'
-	sed -re 's/^#\s+(certfiles)/\1/' \
-		-i "${S}/ejabberd.yml.example" \
-		|| die 'failed to adjust example config'
-}
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
-	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
-		-i "${S}/Makefile.in" \
-		|| die 'failed to set ejabberd path in Makefile.in'
-	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set ejabberd path in ejabberdctl.template'
-}
-
-# Get epam-wrapper from 'files' directory and correct path to lib directory in
-# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
-# file exists there already.
-customize_epam_wrapper() {
-	local epam_wrapper_src="$1"
-	local epam_wrapper_dst="${S}/epam-wrapper"
-
-	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
-	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
-		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
-		|| die 'failed to install epam-wrapper'
-}
-
-# Check if we are missing a default certificate.
-ejabberd_cert_missing() {
-	if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then
-		if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then
-			# default certificate is present in config and exists - not installing
-			return 1
-		else
-			# default certificate is present in config
-			# but doesn't exist - need to install one
-			return 0
-		fi
-	fi
-	# no default certificate in config - not installing
-	return 1
-}
-
-# Generate and install sample ejabberd certificate. It's installed into
-# EJABBERD_CERT path.
-ejabberd_cert_install() {
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
-	install_cert "${EJABBERD_CERT%.*}"
-	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
-	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
-}
-
-# Get path to ejabberd lib directory.
-#
-# This is the path ./configure script Base for this path is path set in
-# ./configure script which is /usr/lib by default. If libdir is explicitely set
-# to something else than this should be adjusted here as well.
-get_ejabberd_path() {
-	echo "/usr/$(get_libdir)/${P}"
-}
-
-# Make ejabberd.service for systemd from upstream provided template.
-make_ejabberd_service() {
-	sed -r \
-		-e 's!@ctlscriptpath@!/usr/sbin!g' \
-		-e 's!^(User|Group)=(.*)!\1=jabber!' \
-		-e 's!^(After)=(.*)!\1=epmd.service network.target!' \
-		-e '/^After=/ a Requires=epmd.service' \
-		"${PN}.service.template" >"${PN}.service" \
-		|| die 'failed to make ejabberd.service'
-}
-
-# Set paths to defined by net-im/jabber-base.
-set_jabberbase_paths() {
-	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
-		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
-		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
-		-i "${S}/Makefile.in" \
-		|| die 'failed to set paths in Makefile.in'
-	sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \
-		-e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \
-		-e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set paths ejabberdctl.template'
-}
-
-# Skip installing docs because it's only COPYING that's installed by Makefile.
-skip_docs() {
-	gawk -i inplace '
-/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
-	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
-		print $0;
-	} else {
-		next;
-	}
-}
-1
-' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
-}
-
-src_prepare() {
-	default
-
-	rebar_remove_deps
-	correct_ejabberd_paths
-	set_jabberbase_paths
-	make_ejabberd_service
-	skip_docs
-	adjust_config
-	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
-
-	rebar_fix_include_path fast_xml
-	rebar_fix_include_path p1_utils
-	rebar_fix_include_path xmpp
-
-	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
-	# rather than its parent which is default. That way ejabberd directory
-	# takes precedence is module lookup.
-	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
-	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
-
-	sed -e "s|\(AC_INIT(ejabberd, \)m4_esyscmd([^)]*)|\1[$PV]|" \
-		-i configure.ac || die "Failed to write correct version to configure"
-	# eautoreconf # required in case of download from github
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-user=jabber \
-		--disable-system-deps \
-		$(use_enable debug) \
-		$(use_enable full-xml) \
-		$(use_enable hipe) \
-		$(use_enable mssql) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable pam) \
-		$(use_enable postgres pgsql) \
-		$(use_enable redis) \
-		$(use_enable roster-gw roster-gateway-workaround) \
-		$(use_enable sqlite) \
-		$(use_enable sip) \
-		$(use_enable stun) \
-		$(use_enable zlib)
-
-	# more options to support
-	# --enable-elixir requires https://github.com/elixir-lang/elixir
-}
-
-src_compile() {
-	emake REBAR='rebar -v' src
-}
-
-src_install() {
-	default
-
-	keepdir /var/lib/lock/ejabberdctl
-	rm -rf "${ED%/}/var/log" || die
-	rm -rf "${ED%/}/var/spool" || die
-
-	if use pam; then
-		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
-
-		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
-		into "$(get_ejabberd_path)/priv"
-		newbin epam-wrapper epam
-	fi
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	systemd_dounit "${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-}
-
-pkg_preinst() {
-	if use pam; then
-		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
-			"authentication"
-		# See
-		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
-		# epam binary is installed by dev-erlang/epam package, therefore SUID
-		# is set by that package. Instead of jabber group it uses epam group,
-		# therefore we need to add jabber user to epam group.
-		usermod -a -G epam jabber || die
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "For configuration instructions, please see"
-		elog "  https://docs.ejabberd.im/"
-		echo
-	fi
-	if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then
-		ewarn If you are updating from an older version like 17.x
-		ewarn you may need to add an access_rules section to your
-		ewarn ejabberd.yml config file.
-		ewarn Otherwise authentication will be broken and users
-		ewarn will not be able to log in.
-		echo
-	fi
-
-	if ejabberd_cert_missing; then
-		ejabberd_cert_install
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild b/net-im/ejabberd/ejabberd-20.04.ebuild
index d68d2c5ba9ff..453de12094bc 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm ~ia64 ~sparc x86"
 REQUIRED_USE="mssql? ( odbc )"
 # TODO: Add 'tools' flag.
 IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
diff --git a/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
deleted file mode 100644
index 0a42f549b58c..000000000000
--- a/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 4086249e78cde107df84e6ad022e9d9821cecc40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 28 May 2017 14:22:08 +0100
-Subject: [PATCH] Don't configure or compile deps
-
----
- rebar.config.script | 23 -----------------------
- 1 file changed, 23 deletions(-)
-
-diff --git a/rebar.config.script b/rebar.config.script
-index 19142b9e..04f8b310 100644
---- a/rebar.config.script
-+++ b/rebar.config.script
-@@ -242,27 +242,6 @@ CtParams = fun(CompileOpts) ->
- 		    TestConfig]
- 	   end,
- 
--GenDepConfigureLine =
--fun(DepPath, Flags) ->
--	["sh -c 'if test ! -f ",DepPath,"config.status -o ",
--	 "config.status -nt ",DepPath,"config.status; ",
--	 "then (cd ", DepPath, " && ",
--	 "CFLAGS=\"", CFlags,"\" ",
--	 "CPPFLAGS=\"", CPPFlags, "\" "
--	 "LDFLAGS=\"", LDFlags, "\"",
--	 " ./configure ", string:join(Flags, " "),
--	 "); fi'"]
--end,
--
--GenDepsConfigure =
--fun(Hooks) ->
--	lists:map(fun({Pkg, Flags}) ->
--			  DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"),
--			  {'compile',
--			   lists:flatten(GenDepConfigureLine(DepPath, Flags))}
--		  end, Hooks)
--end,
--
- ProcessErlOpt = fun(Vals) ->
- 			lists:map(
- 			  fun({i, Path}) ->
-@@ -315,8 +294,6 @@ Rules = [
- 	  AppendList([{coveralls, ".*", {git, "https://github.com/markusn/coveralls-erl.git", "master"}}]), []},
- 	 {[post_hooks], [cover_enabled], os:getenv("TRAVIS") == "true",
- 	  AppendList2(TravisPostHooks), [], false},
--	 {[pre_hooks], [post_hook_configure], true,
--	  AppendList2(GenDepsConfigure), [], []},
- 	 {[ct_extra_params], [eunit_compile_opts], true,
- 	  AppendStr2(CtParams), "", []},
- 	 {[erl_opts], true,
--- 
-2.12.2
-
diff --git a/net-im/ejabberd/files/ejabberd-17.04-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-17.04-ejabberdctl.patch
deleted file mode 100644
index 6001c651f5d6..000000000000
--- a/net-im/ejabberd/files/ejabberd-17.04-ejabberdctl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Mon, 29 Aug 2016 22:29:41 +0100
-Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
-
-Set SHELL since the generic jabber user used on Gentoo for jabber
-servers doesn't have a valid shell set by default and fix EXEC_CMD
-otherwise it fails with "This account is currently not available" again
-due to jabber not having a valid shell.
-
-Also, workaround the assumption that jabber's $HOME is a directory when
-instead it defaults to /dev/null on Gentoo.
----
- ejabberdctl.template | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/ejabberdctl.template b/ejabberdctl.template
-index 5b34ebe..3c080fd 100755
---- a/ejabberdctl.template
-+++ b/ejabberdctl.template
-@@ -16,6 +16,7 @@ IEX={{bindir}}/iex
- EPMD={{epmd}}
- INSTALLUSER={{installuser}}
- ERL_LIBS={{libdir}}
-+SHELL=/bin/sh
- 
- # check the proper system user is used if defined
- if [ "$INSTALLUSER" != "" ] ; then
-@@ -23,11 +24,11 @@ if [ "$INSTALLUSER" != "" ] ; then
-     for GID in `id -G`; do
-         if [ $GID -eq 0 ] ; then
-             INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
--            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
-+            if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then
-                 mkdir -p "$INSTALLUSER_HOME"
-                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
-             fi
--            EXEC_CMD="su $INSTALLUSER -c"
-+            EXEC_CMD="su $INSTALLUSER -p -c"
-         fi
-     done
-     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
-@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
- DATETIME=`date "+%Y%m%d-%H%M%S"`
- ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
- ERL_INETRC=$ETC_DIR/inetrc
-+HOME=$SPOOL_DIR
- 
- # define mnesia options
- MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
-@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES
- export CONTRIB_MODULES_PATH
- export CONTRIB_MODULES_CONF_DIR
- export ERL_LIBS
-+export HOME
-+export SHELL
- 
- shell_escape_str()
- {
--- 
-2.9.2
-
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index ecd307a3a00f..b81bfc19a41d 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -16,12 +16,9 @@
 		<flag name="mssql">Enable Microsoft SQL Server support (via ODBC) for
 			data storage</flag>
 		<flag name="mysql">Enable MySQL support for data storage</flag>
-		<flag name="nls">Enable character set conversion for mod_irc</flag>
 		<flag name="odbc">Enable ODBC support to access data storage</flag>
 		<flag name="postgres">Enable PostgreSQL support for data storage</flag>
 		<flag name="redis">Enable Redis support for transient data</flag>
-		<flag name="riak">Enable support for Riak - distributed NoSQL key-value
-			data store</flag>
 		<flag name="roster-gw">Turn on workaround for processing gateway subscriptions</flag>
 		<flag name="sqlite">Enable SQLite database support</flag>
 		<flag name="sip">Enable SIP support</flag>
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
new file mode 100644
index 000000000000..0055bfaff21d
--- /dev/null
+++ b/net-im/element-desktop-bin/Manifest
@@ -0,0 +1,3 @@
+DIST element-desktop_1.7.4_amd64.deb 65882876 BLAKE2B 8e850a6552074107307e7dea6d3200ff8213c8ea6b00c67363a2fb33aa88fc651491b1e6c05d7f9cfde9f297b3238d74dbc00800cbbf49386fea1edb21854c90 SHA512 ca9e468bfa80280bba34f119bd03a42287bddef2a8f4732db9e750a03385d9b4bd685ea45bd410182d909bd343cd7f221c734e0968e17d97e739d036ae276aed
+EBUILD element-desktop-bin-1.7.4.ebuild 1715 BLAKE2B f20abec762fcaf961702f24e8f20ed3345af3c1a5a04d87d603df356ba8c2f91d705ff7a76bf94168aa8a32b29f461ed540154b425acdd0f0398dab10f101e4f SHA512 6b57e351a46f82756215ccd32b012380e1e994c9cd850533f492bdb90ba39cfa62186cb0490554de8ce45c5c5c4da4085c80188877a2797e9ca3c8a00ecd7ef3
+MISC metadata.xml 349 BLAKE2B 28ef90d142ba536df4df0e57bc4b9dd3ea565b038bebefe71c2a2d9325761625922f928707a99833e3edb4cd2bb8083757b02ad81abc620571d4eb3620df72c1 SHA512 20596473ae86afc73bf80be067fdc7104ba8fcea6aa319e5fcc26397612dad2a724876a5748babff0f13f020d2bd246ae24f9805c8db9da70e86ae52ea3dc61e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.4.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.4.ebuild
new file mode 100644
index 000000000000..1322035d30ac
--- /dev/null
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.7.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker xdg
+
+MY_PN="element-desktop"
+
+DESCRIPTION="A glossy Matrix collaboration client for desktop (binary package)"
+HOMEPAGE="https://element.io"
+SRC_URI="https://packages.riot.im/debian/pool/main/e/element-desktop/${MY_PN}_${PV}_amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+emoji"
+
+RDEPEND="app-accessibility/at-spi2-atk:2
+	app-crypt/libsecret
+	dev-db/sqlcipher
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libX11
+	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/libXScrnSaver
+	x11-libs/pango
+	emoji? ( media-fonts/noto-emoji )"
+DEPEND="${RDEPEND}"
+
+QA_PREBUILT="
+	/opt/Element/chrome-sandbox
+	/opt/Element/element-desktop
+	/opt/Element/libEGL.so
+	/opt/Element/libGLESv2.so
+	/opt/Element/libffmpeg.so
+	/opt/Element/libvk_swiftshader.so
+	/opt/Element/libvulkan.so
+	/opt/Element/swiftshader/libEGL.so
+	/opt/Element/swiftshader/libGLESv2.so"
+
+src_prepare() {
+	default
+	rm opt/Element/{LICENSE.electron.txt,LICENSES.chromium.html} || die
+}
+
+src_install() {
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	insinto /
+	doins -r usr
+	doins -r opt
+	local f
+	for f in ${QA_PREBUILT}; do
+		fperms +x "${f}"
+	done
+	dosym ../../opt/Element/${MY_PN} /usr/bin/${MY_PN}
+	dosym ${MY_PN} /usr/bin/riot-desktop
+}
diff --git a/net-im/element-desktop-bin/metadata.xml b/net-im/element-desktop-bin/metadata.xml
new file mode 100644
index 000000000000..96ca38826cec
--- /dev/null
+++ b/net-im/element-desktop-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+	<use>
+		<flag name="emoji">Use <pkg>media-fonts/noto-emoji</pkg> for displaying emoji</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 7b258ab4fecf..7427892e2cad 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,3 @@
 DIST empathy-3.12.14.tar.xz 5017776 BLAKE2B 15f4c71a4f40988afd51d0665ee24164fb7e1d14994e577c23fa29a995503e78f8b784d26edd90503f9825c64dc814f07860aa6792eec6948c566dc3ff669dad SHA512 f467277278a9e8d330e4ab656b3edb2acac6efec211baa146a5ea0a6d0da299e68cdb83ceb1a27a1aa4744c2ce1a441fa287001003c523036ada517029a40123
-EBUILD empathy-3.12.14.ebuild 3002 BLAKE2B df71e8cea4cf184ba1fe9d8e2f5efe82628602e5969ba7038fcb3fb941537158d2e7548743487cf83a63fbcfa56160be22e07dec5342ef328d802eae088ca540 SHA512 7e61bd850b95c43386ab55ee336d06399b428376ebdffc198e07c818e3c9e18f460aba551ac4c5aad090a41f8f1043a0b5e42ec24d01c8d69402c0ac21fe508f
+EBUILD empathy-3.12.14.ebuild 2995 BLAKE2B 0d49c1646d07d7ae3d7d3fffedc93ee344bff6d4c5c65eee749acaa952c62ef204c4b266f3544ec01651f0ee9fc49327a64e274db81cc3717b612e897212d8d2 SHA512 e3ce6eb082d2b4c595e4ffb157d3ae99583b2c9102bc3faa769c9cb5657bb70c395fb01296bd17e84b2fcaa7aff6b4d6439426a74d9fb803a8d6906df7400850
 MISC metadata.xml 946 BLAKE2B b31b1cd6a21a89f6b9250cbe68465ddb9abdc524ffa16d232813b4bca917edf03c2b4690dcfdedc5ea281738ceb638a3f975064527d53e3fe87a7ca190bf43bc SHA512 98f60d8d61b6fe772c334bd4a0890aefb105231b1ee6adb8dccc20962334fbf95c229aafba68a8ff500cf067bae20b7049fbe2c0023c4abdabcafeb86b130d83
diff --git a/net-im/empathy/empathy-3.12.14.ebuild b/net-im/empathy/empathy-3.12.14.ebuild
index fd7af5a01fb5..743242a7eff3 100644
--- a/net-im/empathy/empathy-3.12.14.ebuild
+++ b/net-im/empathy/empathy-3.12.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit gnome2 python-any-r1 virtualx
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1"
 SLOT="0"
 IUSE="debug +geolocation gnome gnome-online-accounts +map spell test +v4l"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~x86-linux"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index c577cc5f5dca..06e8491f0eee 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,5 +1,6 @@
+AUX err-6.1.4-slixmpp.patch 8036 BLAKE2B 1217bc47c7e8dfb6496aff8f4bbb0e3c328d9491f5920a05ec0bebd9995392700499ef2d566778afd667b9ccce6d459afc59a79811d70689debf454d1663554a SHA512 dce31ad8ccc3e0df7cf3e8b228dacb276601e5dd2c087329c5d9bbfa5c491103a886f66fd558c2612851ec8f8be8eb4f064bd4b7397a7f8e60ca71440254e82f
 AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b50070c770f9dccdcf30b40b214492d92a4239c5ec253c630b35c218e315df57e92d700a758af SHA512 0e8f6b86cfe3e57dbae2ecf7a035d084ac753c338871fe51462d522465777f5c8886a9a2fa7d69030ed53797b6ece89a3e3453162d5a9af76a5e1a2ac23db30f
 AUX errd.initd.2 512 BLAKE2B 48eed9e9e2bd5c1f23c63bbae10750c8e638c4f6ce286dc7e56799a45f986dbdcd359ee9f6c06e9bc33bd249c41ea08f0e6692f47b17229b9e7eb51e52d0f6e5 SHA512 caa47f7252c3ff04c47ed6c3174e4121dd600d1f4601f8a08275d1bc072e25f3b6125ba73d6c9c90af67dcc72da3ffbe875c83f756d75208af916a5d7ef672fb
-DIST errbot-5.2.0.tar.gz 189305 BLAKE2B 96e275ee2a70fcab217f4a91c855192d8536cc177e0cafe08c8f55e17a09c06913c07e50473f87ea29e4537cd6389907615eba86d44756962ed59a87498be398 SHA512 d879e9da6647d697ead0a5f72fe83cf33614201863a9a62bc62c90d7ac0478e1e0902438c6f053d2ea56c940d68b136bbfa497175fb11647913bd7f139220aec
-EBUILD err-5.2.0-r1.ebuild 2247 BLAKE2B 3e05f17de459ce69ffa21c3e48c6aafb912495cc9a908139089f3b51a7ebafe585c6920503c73a9b145260cf83996191b82eb09558a1ceb9a56340a4ae18dbc4 SHA512 b8222d6be7edd44e27f51fac4129b8521f602a756b610a25f711d689cb4ad295c21bc4f1c56607d2d6bef9fda540c492e3c0e150882bdb5608ba43999eedbc1d
-MISC metadata.xml 565 BLAKE2B 0f8c06a4387ace540e55b6c2411b11729246cdbf13b5a0cd2a3d6db52390953e41d4e3c44755b231069cea099acb7c0c54db110d596a0bc00fd148e49bad5b19 SHA512 b7181c500317c3b91a747e707dff966f42744a85b97f7b51b8aad30814b5464e092405bc3868900968cca1670637150ea259281463fa769cb1c3e39783d87285
+DIST errbot-6.1.4.tar.gz 207370 BLAKE2B 187e87cc36393f85c1405a29d332d703cdd2ac9d9c6b50178ff7382bc5feb620b69a77dc21ce8144fc24045f11067865c7273118fc25ec1ad9afb93d6ccc635e SHA512 60cc8f070e2420e4ef5f0124eb6d03b3cf01c44e148ebb8b92f5b504eb6968c754fd82771da9528daab62c9e9f4d6ef97ab1063f1093163208521b26e36b2f2d
+EBUILD err-6.1.4.ebuild 2398 BLAKE2B 7473ede2525b2d21818eb4eb30b172f301f54ed72b744ea046ba9f3f60172dfbdf125d98a2650bd2001d4d86ba1b5b09279f47f405719bb359863ac600f69401 SHA512 1eca01501945beb4d87dec19657f64266335846da4d5fb8a8db63a76ec018b631fe91d462994397540ef5a8abe6b4bed44669fd47e83d44d939d8203eb334707
+MISC metadata.xml 460 BLAKE2B 8c1deeb593953a71ed352b3491fc87e138550a6f943e4892a1482175241f6050f137797ce65f4f84d7241db57c0280eb83f264bb9958f3d3f0ae5aaf72f7e9af SHA512 bf07d6c10087bd3f64d028f35874f6f3a4a0d09dbaa97a8750d577914fde1e95c583e4b22d34e7d96a75a4fa6ef98acf3983f9fb81c0d11b10fa2d40a1a5012c
diff --git a/net-im/err/err-5.2.0-r1.ebuild b/net-im/err/err-6.1.4.ebuild
index 282cefd5b968..65c20b5d54fb 100644
--- a/net-im/err/err-5.2.0-r1.ebuild
+++ b/net-im/err/err-6.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_7 )
 
 MY_PN="errbot"
 MY_P="${MY_PN}-${PV}"
@@ -11,10 +11,10 @@ MY_P="${MY_PN}-${PV}"
 inherit distutils-r1 user
 
 DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
-HOMEPAGE="http://errbot.io/"
+HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="irc +xmpp"
@@ -27,8 +27,10 @@ RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/daemonize[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.19.16[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
+	<dev-python/markdown-3.0[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
@@ -40,10 +42,12 @@ RDEPEND="
 	xmpp? (
 		dev-python/pyasn1[${PYTHON_USEDEP}]
 		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/sleekxmpp[${PYTHON_USEDEP}]
+		dev-python/slixmpp[${PYTHON_USEDEP}]
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-slixmpp.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 # NOTES:
diff --git a/net-im/err/files/err-6.1.4-slixmpp.patch b/net-im/err/files/err-6.1.4-slixmpp.patch
new file mode 100644
index 000000000000..ccccc171f238
--- /dev/null
+++ b/net-im/err/files/err-6.1.4-slixmpp.patch
@@ -0,0 +1,190 @@
+From e68c539c727c7275665a198fc7a217a3c1ad3be2 Mon Sep 17 00:00:00 2001
+From: Birger Schacht <1143280+bisco2@users.noreply.github.com>
+Date: Sat, 11 Jul 2020 11:20:53 +0000
+Subject: [PATCH] Replace sleekxmpp with slixmpp (#1430)
+
+* Start moving to slixmpp
+
+* Pass a default value for ssl_version to the XMPPConnection
+---
+ .../plugin_development/backend_specifics.rst  |  6 +--
+ errbot/backends/xmpp.py                       | 49 +++++++++----------
+ setup.py                                      |  4 +-
+
+diff --git a/errbot/backends/xmpp.py b/errbot/backends/xmpp.py
+index 08f49340..e27c2893 100644
+--- a/errbot/backends/xmpp.py
++++ b/errbot/backends/xmpp.py
+@@ -2,7 +2,6 @@
+ import sys
+ from functools import lru_cache
+ 
+-from threading import Thread
+ from time import sleep
+ 
+ from errbot.backends.base import Message, Room, Presence, RoomNotJoinedError, Identifier, RoomOccupant, Person
+@@ -13,10 +12,10 @@
+ log = logging.getLogger(__name__)
+ 
+ try:
+-    from sleekxmpp import ClientXMPP
+-    from sleekxmpp.xmlstream import resolver, cert
+-    from sleekxmpp import JID
+-    from sleekxmpp.exceptions import IqError
++    from slixmpp import ClientXMPP
++    from slixmpp.xmlstream import resolver, cert
++    from slixmpp import JID
++    from slixmpp.exceptions import IqError
+ 
+ except ImportError:
+     log.exception("Could not start the XMPP backend")
+@@ -114,15 +113,10 @@ def join(self, username=None, password=None):
+         :meth:`create` on it first.
+         """
+         room = str(self)
+-        self.xep0045.joinMUC(room, username, password=password, wait=True)
++        self.xep0045.join_muc(room, username, password=password, wait=True)
+         self._bot.conn.add_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat)
+         self._bot.conn.add_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat)
+-        # Room configuration can only be done once a MUC presence stanza
+-        # has been received from the server. This HAS to take place in a
+-        # separate thread because of how SleekXMPP processes these stanzas.
+-        t = Thread(target=self.configure)
+-        t.setDaemon(True)
+-        t.start()
++        self.configure()
+         self._bot.callback_room_joined(self)
+         log.info('Joined room %s.', room)
+ 
+@@ -137,7 +131,7 @@ def leave(self, reason=None):
+             reason = ""
+         room = str(self)
+         try:
+-            self.xep0045.leaveMUC(room=room, nick=self.xep0045.ourNicks[room], msg=reason)
++            self.xep0045.leave_muc(room=room, nick=self.xep0045.ourNicks[room], msg=reason)
+ 
+             self._bot.conn.del_event_handler(f'muc::{room}::got_online', self._bot.user_joined_chat)
+             self._bot.conn.del_event_handler(f'muc::{room}::got_offline', self._bot.user_left_chat)
+@@ -148,7 +142,7 @@ def leave(self, reason=None):
+ 
+     def create(self):
+         """
+-        Not supported on this back-end (SleekXMPP doesn't support it).
++        Not supported on this back-end (Slixmpp doesn't support it).
+         Will join the room to ensure it exists, instead.
+         """
+         logging.warning(
+@@ -186,7 +180,7 @@ def joined(self):
+         :getter:
+             Returns `True` if the room has been joined, `False` otherwise.
+         """
+-        return str(self) in self.xep0045.getJoinedRooms()
++        return str(self) in self.xep0045.get_joined_rooms()
+ 
+     @property
+     def topic(self):
+@@ -214,7 +208,7 @@ def topic(self, topic):
+         :param topic:
+             The topic to set.
+         """
+-        # Not supported by SleekXMPP at the moment :(
++        # Not supported by Slixmpp at the moment :(
+         raise NotImplementedError("Setting the topic is not supported on this back-end.")
+ 
+     @property
+@@ -261,16 +255,16 @@ def configure(self):
+         affiliation = None
+         while affiliation is None:
+             sleep(0.5)
+-            affiliation = self.xep0045.getJidProperty(
++            affiliation = self.xep0045.get_jid_property(
+                 room=room,
+-                nick=self.xep0045.ourNicks[room],
+-                jidProperty='affiliation'
++                nick=self.xep0045.our_nicks[room],
++                jid_property='affiliation'
+             )
+ 
+         if affiliation == "owner":
+             log.debug('Configuring room %s: we have owner affiliation.', room)
+-            form = self.xep0045.getRoomConfig(room)
+-            self.xep0045.configureRoom(room, form)
++            form = yield from self.xep0045.get_room_config(room)
++            self.xep0045.configure_room(room, form)
+         else:
+             log.debug("Not configuring room %s: we don't have owner affiliation (affiliation=%s)", room, affiliation)
+ 
+@@ -291,7 +285,7 @@ def real_jid(self):
+         Will only work if the errbot is moderator in the MUC or it is not anonymous.
+         """
+         room_jid = self._node + '@' + self._domain
+-        jid = JID(self._room.xep0045.getJidProperty(room_jid, self.resource, 'jid'))
++        jid = JID(self._room.xep0045.get_jid_property(room_jid, self.resource, 'jid'))
+         return jid.bare
+ 
+     @property
+@@ -303,7 +297,8 @@ def room(self):
+ 
+ class XMPPConnection(object):
+     def __init__(self, jid, password, feature=None, keepalive=None,
+-                 ca_cert=None, server=None, use_ipv6=None, bot=None):
++                 ca_cert=None, server=None, use_ipv6=None, bot=None,
++                 ssl_version=None):
+         if feature is None:
+             feature = {}
+         self._bot = bot
+@@ -317,7 +312,7 @@ def __init__(self, jid, password, feature=None, keepalive=None,
+         self.client.register_plugin('xep_0249')  # XMPP direct MUC invites
+ 
+         if keepalive is not None:
+-            self.client.whitespace_keepalive = True  # Just in case SleekXMPP's default changes to False in the future
++            self.client.whitespace_keepalive = True  # Just in case Slixmpp's default changes to False in the future
+             self.client.whitespace_keepalive_interval = keepalive
+ 
+         if use_ipv6 is not None:
+@@ -348,7 +343,7 @@ def disconnect(self):
+         self.connected = False
+ 
+     def serve_forever(self):
+-        self.client.process(block=True)
++        self.client.process()
+ 
+     def add_event_handler(self, name, cb):
+         self.client.add_event_handler(name, cb)
+@@ -447,7 +442,7 @@ def incoming_message(self, xmppmsg):
+             msg.to = self._build_person(xmppmsg['to'].full)
+ 
+         msg.nick = xmppmsg['mucnick']
+-        msg.delayed = bool(xmppmsg['delay']._get_attr('stamp'))  # this is a bug in sleekxmpp it should be ['from']
++        msg.delayed = bool(xmppmsg['delay']._get_attr('stamp'))  # this is a bug in slixmpp it should be ['from']
+         self.callback_message(msg)
+ 
+     def _idd_from_event(self, event):
+@@ -582,7 +577,7 @@ def rooms(self):
+             A list of :class:`~errbot.backends.base.XMPPMUCRoom` instances.
+         """
+         xep0045 = self.conn.client.plugin['xep_0045']
+-        return [XMPPRoom(room, self) for room in xep0045.getJoinedRooms()]
++        return [XMPPRoom(room, self) for room in xep0045.get_joined_rooms()]
+ 
+     def query_room(self, room):
+         """
+diff --git a/setup.py b/setup.py
+index 3d0c09f8..4a3c1ea1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -105,12 +105,12 @@ def read(fname, encoding='ascii'):
+         },
+         extras_require={
+             'graphic': ['PySide', ],
+-            'hipchat': ['hypchat', 'sleekxmpp', 'pyasn1', 'pyasn1-modules'],
++            'hipchat': ['hypchat', 'slixmpp', 'pyasn1', 'pyasn1-modules'],
+             'IRC': ['irc', ],
+             'slack': ['slackclient>=1.0.5,<2.0', ],
+             'slack-rtm': ['slackclient>=2.0', ],
+             'telegram': ['python-telegram-bot', ],
+-            'XMPP': ['sleekxmpp', 'pyasn1', 'pyasn1-modules'],
++            'XMPP': ['slixmpp', 'pyasn1', 'pyasn1-modules'],
+             ':python_version<"3.7"': ['dataclasses'],  # backward compatibility for 3.3->3.6 for dataclasses
+             ':sys_platform!="win32"': ['daemonize'],
+         },
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index 21914ed5cfe5..f1f4f68229d0 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -9,11 +9,7 @@
 		<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">gbin/err</remote-id>
-		<maintainer status="active">
-			<email>gbin@gootz.net</email>
-			<name>Guillaume BINET</name>
-		</maintainer>
+		<remote-id type="github">errbotio/errbot</remote-id>
 		<remote-id type="pypi">err</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 5afbb582b8a1..d1d24cb612f3 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,8 @@
 DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
 DIST gajim-1.2.0.tar.gz 9605006 BLAKE2B b68e801fedf89d14e8831a52f952fa3937b8f8ed0423a0289d5c665b50244db8db9d91dd24203e446d691e26843dd75dbf0de2b1b183cc0a8fb178bc7632c500 SHA512 e73802dd1172c1fa38be10e6fb5d605109dacf0491516b15111ccd05389309af217e8af68440a1333b8a636c9ff425dec6d4461296ba47f1bb6dbb3000b02fd0
+DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
 EBUILD gajim-1.1.3-r1.ebuild 2457 BLAKE2B ffdea9fa425f2ae97e718ccc58cc13c95a908b0ff8019df5fc9b82b0b4be522d872b83ada56c1070165f81e20cb0a26df5b70abf0ca54c202cb0796f6c9d5986 SHA512 025c1ff713a2e975dd4c2c334d033fac30d0e4de9d778eeff0dc071d70a871777d5798497394963e49277fc9c529fc3c15e3b14a6f946daa39650c9e88d15125
 EBUILD gajim-1.1.3-r2.ebuild 2222 BLAKE2B 62d8baa9c3fb0fbb76b665244d692d10f4be65468cd9c2e5f5ff8abd5a04b72142f4b6bb3f39498c8d7f4685d084208ca1a5a3d84977d8ce1873e0427222bade SHA512 57e2256a177a3238bd4a21634ee30b43559c9b2326905d97740b0408070a950c098fb715d8ae453860279900a5f9ad368af069b9437678d7d96b16153fc1077e
 EBUILD gajim-1.2.0.ebuild 2289 BLAKE2B 697f393348f18c9a48155a0fe42ee87bc19cf4c8277c8c0c3652765329f9f3cee8846afd6f4252d5e52db5bc21e710284bd18140bc9d3c50ecd6cd7467dc9f9f SHA512 50d2408e1af48557666e5f0389e55376c7fe9ff91aba795727f4e6934b47eee1ef37d72280fa21b36b86a0494d769dd8002d2581d99b2a252d30692724e7a00a
+EBUILD gajim-1.2.1.ebuild 2356 BLAKE2B 6f3ffb655c1945e7c00b95579acb87075e98e9122a01294a94d917d3318756fec5536ce77250bd972d3e63b075d8e298a57769535a214713fc46571b7501c686 SHA512 3d449b3f14fe84981afce8d310ac64afd9fe642e7619d29768ba63f982b41e1a5097d10f7564e355e3bf62b40c155090be17f874fa619800405c1ed8022b2a07
 MISC metadata.xml 985 BLAKE2B ef02d7f96bcdc15c013e15ee79e3bb4dc591dd9697139f7331ca0bc065d2adfb2e6c2808f8c32d16dee433a1b03d4639f371a69e1d0870d498db55443ff3f713 SHA512 de8eba51dc79776b19e4122d6da16073c577c70dbe5b05dcbf7aa32a4c0b109c5b9cf222313aada405227f27ba8014c38baa73acfb0951691fbbcad1503801f5
diff --git a/net-im/gajim/gajim-1.2.1.ebuild b/net-im/gajim/gajim-1.2.1.ebuild
new file mode 100644
index 000000000000..8f0970fa9cdd
--- /dev/null
+++ b/net-im/gajim/gajim-1.2.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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)/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
+
+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-0.14[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-1.0.1[${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/libcommuni/Manifest b/net-im/libcommuni/Manifest
index a19bd5fc42c1..328c4d4eb908 100644
--- a/net-im/libcommuni/Manifest
+++ b/net-im/libcommuni/Manifest
@@ -1,3 +1,3 @@
-DIST libcommuni-3.5.0_p20190110.tar.gz 471278 BLAKE2B 2836a5ae01b08aac624c899a40712a9c452fc5b8f242906063936e48bd59306758cc70ea07beaf8488d228d6029c8128e343bbd59b1bfeff9bb2dccda0153b59 SHA512 9da065ef6b0589f7406d8c66b46f9f8d3d16325b59b7281153233b1a8d2bf98cdd35ee4e416237ac760dfc07531578aa7432226932976b9bbf36209bed5db72c
-EBUILD libcommuni-3.5.0_p20190110-r1.ebuild 2424 BLAKE2B bd1f0bb388ed95c2325a6807579e0f464bd99ea90a12bb9ba16bf993060661707fed38ebccf9ac75b40645d576b3b6749bc9e191a69b2b330069138804c2f92d SHA512 a6a2894a67018d029b6e46212bf8dd479b68a65730423ef9caf2ebccf45520f834ea9cf50a306ee71b054aad0227a75537cdd23c985a1ca3b32e2b8dab8d0c4b
+DIST libcommuni-3.5.0_p20200711.tar.gz 471839 BLAKE2B 37a02c473496a0fe9394a8b019678afa96b07b9272556fd538d42d9ec296b34ad4c76b3110ff96732bccbed59f2faeedf80bd7782e7a6e395252c6430cb88fa7 SHA512 578e2f70bdfa0e62eb3acac4e8deb2f6f0c1cd5f0a5e559dae79d2a808b27d3cf63ede146a65026e156d988097a5b7903793acadcd7e9ac567f65c59e6738ed3
+EBUILD libcommuni-3.5.0_p20200711.ebuild 2172 BLAKE2B d1a3f1511e296fb7d16374b83acf3126e46bf58afc939f29809445b098d72b42e27f608fed49d323402cd4f23c33bbb90ce386f44e54503284d69afc131ebd94 SHA512 291f0e0486da2b005962a24650982951016c7326a19a8bf04d655f650f735833ab0e8ead5a4e247148d1d501904738aaab7fad3fe50edf9eae5b7a6743c2e49e
 MISC metadata.xml 678 BLAKE2B febd32dfdcd5f0513d47d2ada5600344bde61be84b436910a984d6bffe83b76e211bb1e58412a93e54a1e3ca63e226991a8ea89a68b9c0ff0902c416c9193159 SHA512 20b149d2d59a8b8b119d8144f80d28b5d02797b3b3bb6ab09412085b7aafffe9bb6fb46bd79d0951ab5c7fca8987dc3b6fd973e57179c3cac162da9601eb631b
diff --git a/net-im/libcommuni/libcommuni-3.5.0_p20190110-r1.ebuild b/net-im/libcommuni/libcommuni-3.5.0_p20200711.ebuild
index 0e061171fd07..a631f6b8c423 100644
--- a/net-im/libcommuni/libcommuni-3.5.0_p20190110-r1.ebuild
+++ b/net-im/libcommuni/libcommuni-3.5.0_p20200711.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-EGIT_COMMIT="88bb0fcdaab5bdd1176a3b6b485a6415a137ec27"
+EGIT_COMMIT="85fc0d9d8659269b00499975d184d75e67f63a9f"
 
 inherit qmake-utils
 
@@ -35,14 +35,6 @@ DEPEND="
 
 S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
-src_prepare() {
-	default
-
-	# Currently the test tst_IrcLagTimer fails, so disabling
-	# See: https://github.com/communi/libcommuni/issues/63
-	sed -e '/irclagtimer/d' -i tests/auto/auto.pro || die
-}
-
 src_configure() {
 	local myqmakeargs=( libcommuni.pro
 		# Disables compile run-time benchmarks, as they don't make any sense
@@ -54,8 +46,7 @@ src_configure() {
 		# Don't silence all compile messages
 		-config verbose
 		-config $(usex examples '' 'no_')examples
-		-config $(usex qml '' 'no_')install_imports
-		-config $(usex qml '' 'no_')install_qml
+		-config $(usex qml '' 'no_')qml
 		-config $(usex test '' 'no_')tests
 		-config $(usex uchardet 'no_' '')icu
 		-config $(usex uchardet '' 'no_')uchardet )
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 56eac34dbfca..d82db600d504 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,9 +1,9 @@
-DIST mattermost-desktop-4.4.0-linux-ia32.tar.gz 95565337 BLAKE2B f81d381656d812274b1d54740d8bd1e1aacc47762c279a4edd1fb2ad9fdd595b2575a92825a37c1b12ab4a0a98423905ba605040cac8f7ababefe946a6bacd1e SHA512 412ebe5c110528372ad462d24c395125c46fe0930515a09ff705693cdd905a71037bd3672c2fe3ccc263addca4ecf497787f7dc70b45e782fbba1413a871eb7f
-DIST mattermost-desktop-4.4.0-linux-x64.tar.gz 94614879 BLAKE2B c83d449e45bfbde229316885210d6bd6eb5cfc6f6791c863fc02d4b1cb6ab9a89d5268e1fe4beb3273ee3b09a408fc5fa4c6949e05da8c19e7d92a13940be232 SHA512 eae1a08cf73199bab1d2b35d68134193211d71fae532486ff328534707c652e8a33cdfd984de79b663f4b40d1f29923c3a9afb8bf6be7bbe9fac3c381dc7f50e
-DIST mattermost-desktop-4.5.0-linux-ia32.tar.gz 104812036 BLAKE2B 340c208bf6b58c06e0ba5b51a5a1e8618273d785b63ac452f71e6ee5197b4818bd593566df813cfac7194c33b597129a3a10d551a6ebcbe9a1b5be99778fb5b6 SHA512 01f93fdce44177d1729a3a984089b9ee3a825cddfc3b034619a34695175d912e2246f46123d5ff1384e90fa782a2c1fe3948ada35e83ea09293d658de33c9c5f
-DIST mattermost-desktop-4.5.0-linux-x64.tar.gz 103227052 BLAKE2B 38a3fcfb2df79c9a25c7d8efd43f97e2a531ccb084479637b07c28e77f23dd09c8090550a665c07745d32a46446b3b1d920bc0afc43610fd42a70a55f969e4de SHA512 389c862902a7c82e5c5c3f5622c48a85fc1fdf5b07361fddde7a94cd005e4a85f829cd2ff0034652bcb857ba918b59487675974eb19a181b4eb55886aede49fd
-DIST mattermost-desktop-bin-4.4.0.tar.gz 1295527 BLAKE2B 89fd256e96c732e2e808ffef71e4d615e54d17af24c7392ddc699a18d9df1c5184d9d9263b01172a78b096e8941567abf6ca98789966407dfc2b360e41d1d50c SHA512 7f4d72fe1b90fe17796c1e9eb2c5ff9bf3d3c7ff855585f9f20c1997317eb805b917f3b2a58e6add67668e60a542cb5e3be6202a30af4ce495184335e2b94b3e
-DIST mattermost-desktop-bin-4.5.0.tar.gz 1653847 BLAKE2B 07947a59c2fb3d818859847ed26199eba3255543f33bef212fa2e6d52fe931a00c69a77e5febb67d9572cb52727136bc309189a2fbb038b27c7f1cc92907132d SHA512 4d05da854f8fb1655255d20799b742a021483e96291ef96f4bc6b735215e29c679393e38699b204573248a2900e3b5c35babc22f7e7e825b487d3cc97ca96f8c
-EBUILD mattermost-desktop-bin-4.4.0.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
-EBUILD mattermost-desktop-bin-4.5.0.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
+DIST mattermost-desktop-4.5.1-linux-ia32.tar.gz 104826424 BLAKE2B c2d29b5ba463d7e6c586c725dc3628ff6a2f04edf033632d35a753d00416ff2d4337e6847e7280b2e74e600697d59a0b177e62b215a359757f7ddf256d41bcae SHA512 9358d8979b022207e5679b3b65a853a5c1d3a1f822c9dbb856253e19bcef29efacc75ab00a713b987e5d91265fab15cc5721413f828c98e4ef2e035c48f655bf
+DIST mattermost-desktop-4.5.1-linux-x64.tar.gz 103238742 BLAKE2B dc7e9e2358cb9d82a080fca3082abff38a7850b5cb66cd47d8c111963e2980445f6767ee1f1cdcfedb8b8ff399bf20467de898ff7cc1e7b415e9d999d835e362 SHA512 7b1504c957ee30b2f3faa091556c30ac2e5a8cfd7595282e51bc616a74b2da76a6b363ebc56809c6bfdb931d08ae75360ef85bf6a6abe00c40ccccc14754e0bd
+DIST mattermost-desktop-4.5.2-linux-ia32.tar.gz 104826222 BLAKE2B f0552069099e548b4eff29a8dee8b830ebdba7aeab708748a242776a5d758be2253e8e2bbfe8f0b4eda5d0c25cad46fa7e7728233007f76102ef7b271a0280a5 SHA512 21943587b00585ab103213726de16bd010a013be2d780a9b1bad1ffb2bbcc23bff0cab76699bebb324e950b7d321df1d657cdbb8f889d670bfb7d8ca961ee652
+DIST mattermost-desktop-4.5.2-linux-x64.tar.gz 103238897 BLAKE2B 46e56c55409db645ba0962a816f584610decea4696c182e66544d2085d5b420019aed7d2680c5a90b7bdd293f9549be81508d24f79d409446918f862bfeca474 SHA512 f22938b629840dd6e8fbdec5e6ae6fdadaa0eae0fb727a063ef1539a3a0a625d61dd8468ea8cf45732a8f3b2c6da002dceed2b287aa75b14d09a03268f967eb4
+DIST mattermost-desktop-bin-4.5.1.tar.gz 1653861 BLAKE2B 2ad02df830cd2b62a730e8c6b385a739cfa7be30765ee4245f92e7a3db194ea03863490b337d03d47357f0d18ec31dd34fcde4576b93c80702e716ae9fd772a7 SHA512 6e2269de681ec416be2354ff8ee37d219ede4b10361e6a3669cc4e93e9ab06cd6a198dece05411756fdea271e55cafb94ad29161801cc55b5dae02b99b24ccab
+DIST mattermost-desktop-bin-4.5.2.tar.gz 1653801 BLAKE2B fac573ce27cd693489a173d3b90480476e569a7d0c435a53e44b075fc96a56720558e1e555c5a587f0fb7bed06b7f5e53c11728280804e812ee2090adc6d96d3 SHA512 69148aa9de18f6dac78450dc0b79630e9ea1552027ed46f6d03aca02ae57342b251a236f4c3ed6b9145e050be38d7748820bc4dd9f36f300c59940b7c2db7827
+EBUILD mattermost-desktop-bin-4.5.1.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
+EBUILD mattermost-desktop-bin-4.5.2.ebuild 2025 BLAKE2B c9499a828e19aea2c827a209c9d14ee27920b40f2fb57fab1468c3bbd17862745f2c5b88d02961cea5a43f8886323b81062e2309ce9bf304242cffc4203a7a76 SHA512 e6e084861a423eb5fce6d5fc9c095ac464a8a3937ebaaff9f5e8920c2bc8f875ec1f363e311ddb156c5296a1e4475bf8ee0582bb27acade2252fe542c3c61816
 MISC metadata.xml 250 BLAKE2B 8611f4d73e35bd0d1118f324a7f3e5a50277fe6e0eafa82c39438dc4ae44bc64dc85a28e85286987c724d4cfa528063109cb78984eaf10f08bcc60962750a9ba SHA512 b24a6971fcb3eb7c99a0229fcf084abb689b21b48f29d3634aac103977460011b0a58fc298d1432671520e94a94ef19570f7831fd181b5ea51a0155d47222d0b
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.4.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.1.ebuild
index 0f1c0d6f81df..0f1c0d6f81df 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.4.0.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.1.ebuild
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.2.ebuild
index 0f1c0d6f81df..0f1c0d6f81df 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.0.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.5.2.ebuild
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index b33f677583b4..08e97d7806fd 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -14,5 +14,5 @@ DIST pidgin-2.14.1.tar.bz2 8849275 BLAKE2B 27cd58a79f36c0176147c2e5bac7c4c18ec74
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
 EBUILD pidgin-2.13.0-r7.ebuild 7863 BLAKE2B c3a5835561479c42c0b870de3b2996d3b05eaeb564df4133f7f24c2ed3e559bba7ae510f049233c25c54b5662b27b17abed953310566048a990e420f83df08b4 SHA512 daa3adc3cba97abb26047c46ffcb7ec2e3771948c9b6722061c74a50926ed81b4a95392649b69e796ea54e415858dc3f59501f48e214c172e3f4c61419162d35
 EBUILD pidgin-2.13.0-r8.ebuild 8096 BLAKE2B cadd7ac7dabdf8f0a4039c4a201b58b1c455d8a9eb5d45da14c3e8ef44b3dcfa97590e7d9789ef880e92e9e17b9cc857403f48d7afacbc1b664aac52c64893cd SHA512 e346b3c5bd2682bb4c1d9ea31a9dc9eca995983d98b80c3d3a7749e9ff19aefe4541bcdeefcb0fb8de45d8b17a603877be633790bd0c4a1b30300e92166f0d22
-EBUILD pidgin-2.14.1.ebuild 7953 BLAKE2B 9829a0292c4cac8b9bb5d90ea850212d3472624c9b90c3feda6a2d5da9120d2c3662d68d23bc11510b9e3f4ec5a4943a2c9c3a2c33932cf29067650897bab437 SHA512 abf109c8147e10ec2c73f8a43f29d862901ce21742a35fb705b51422d9878bd8fcae163027ccf5a621ec04a0a93a2256d054565e77653a97334dc3c594821e9e
+EBUILD pidgin-2.14.1.ebuild 7950 BLAKE2B 31b48d10457040683cde4227f2679f8a52426a836e00954dc69ef3458d36ad4728c0b185879255a877d3c266b0d34300947c24301e2b9cfda05dd303caba63e1 SHA512 29aa52ed5f5f72f002a37d4910077c17ae491a262d11760fec4d8ef3043138636a30c601152a9bc1c3086e3c89dcfa96a1b506ef8ba4840c6ef6f01a6fdee09a
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.14.1.ebuild b/net-im/pidgin/pidgin-2.14.1.ebuild
index 6c9c09eeaabf..76649ab2c25c 100644
--- a/net-im/pidgin/pidgin-2.14.1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
 
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 tk +xscreensaver zephyr zeroconf"
diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest
index d2797a948dd2..51a2abac8983 100644
--- a/net-im/ricochet/Manifest
+++ b/net-im/ricochet/Manifest
@@ -1,4 +1,4 @@
 DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1
-EBUILD ricochet-1.1.4.ebuild 1190 BLAKE2B e8b9b1dc7bfb57d74fad09bad7a7e6f97927bf52b7025bba8b9e487f7a08853fe5d60a699cc7cc7213e0d3bb877a2628c3462d38ec3f15d12de71943cee0c24a SHA512 e6fffbdaae86941cfbe89bb9ad70790a558d9a3df6dd7f2f6749013a4a4457626112a0052c790f78ca7f4d621a739ef54b29c306298eec196ab89c6605699325
-EBUILD ricochet-9999.ebuild 1391 BLAKE2B d8242a52a85a56c9bc78c6d4eb98e9a58d78f4b564d362e048c780a515c86e75b18a88a69c841c1448781a24e6cb4b44dba4779210677c598aebb574b21f17ff SHA512 1fe3d74db80e54efbf1847ee5e9697c96474c229a9ac47a2513820b2d895c64ada324c5cb98d83dfdfad922c92251ebbbd5a44a95c8c62e87a082df85cc6f77b
+EBUILD ricochet-1.1.4.ebuild 1189 BLAKE2B 3fb8f5b0ebc1f430685ddcbebc45fb147aebe5a6d700c7235081c1751ce3d7c1bee9ed470b12ea841b816e9ebf880003db4d6c7a6ede2e045996bf49e445ba69 SHA512 3f29132f06e5bf9585edf41b8223530fb924719c4329c1ac7978cfe69c759e65ebda4e98d3d198e5d0f8a0bf490aad650ad7708bf9133fa59d9dec53be80443f
+EBUILD ricochet-9999.ebuild 1386 BLAKE2B de9f48d1c8f32a1e6da667c1c6ec1ec8d8de17358fa0b8f808bdf6d6c9983e9c2ad17bd3ab2f512c242bad1d415ffb125702455f4336f3b6bb99f852df5a9165 SHA512 07d4cb78a76185e183f0aab83f39d01f0bab8b47f3845816c3ba31ce6cfa5f0c876da95386a9d98f9e42808ed58be8d1a34f965221aff14852a9c9feb2e5d553
 MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
diff --git a/net-im/ricochet/ricochet-1.1.4.ebuild b/net-im/ricochet/ricochet-1.1.4.ebuild
index b26be1ac4f28..44bcd7daf218 100644
--- a/net-im/ricochet/ricochet-1.1.4.ebuild
+++ b/net-im/ricochet/ricochet-1.1.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils qmake-utils
+inherit qmake-utils xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ricochet-im/ricochet"
 else
@@ -31,7 +31,8 @@ RDEPEND="
 	dev-qt/qtquickcontrols:5
 	dev-qt/qtwidgets:5
 	net-vpn/tor"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
@@ -48,9 +49,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/net-im/ricochet/ricochet-9999.ebuild b/net-im/ricochet/ricochet-9999.ebuild
index b770332effdf..2caa9d50609c 100644
--- a/net-im/ricochet/ricochet-9999.ebuild
+++ b/net-im/ricochet/ricochet-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils qmake-utils
+inherit qmake-utils xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ricochet-im/ricochet"
 else
@@ -31,12 +31,13 @@ RDEPEND="
 	dev-qt/qtquickcontrols:5
 	dev-qt/qtwidgets:5
 	net-vpn/tor"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 src_prepare() {
-	eapply_user
+	default
 
 	# workaround bug https://github.com/ricochet-im/ricochet/issues/582
 	cp contrib/usr.bin.ricochet-apparmor contrib/usr.bin.ricochet
@@ -56,9 +57,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 4378e162826e..78ce29dc6450 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.34.3_amd64.deb 99601582 BLAKE2B 36ff459be13182780adcad52990341bb708de84ced00bcb6fc45e0fdd7bba0fb176b3a7000fe1ef436c1a0ac0cf47a184114356a5f944513086c4d90464aea50 SHA512 9dcdbc50d4a8ed08ec1011667d50396f221cb8e8eb34cab6bc432b8a1da2b5efb42839182ef3091f2bb865d45088eb6b81ae8e9ed375822098096b095970c545
-EBUILD signal-desktop-bin-1.34.3.ebuild 2503 BLAKE2B 62eabbecb707d8c6799c301ab63e81392bb4f44a769207f9b89b38b66b2019e40f2366ecfa1cba25fd67f556675cb0ddbead6e8aecd9a2010bee1432cb269001 SHA512 236e2827b25c49f73dd348d52b131a961c05e487d906c787d988255ecfa9d97cf047fb184ae5a65561531c320923596298a45e6cb5221a725058123f93155e53
+DIST signal-desktop_1.34.5_amd64.deb 99729074 BLAKE2B b81bcea84d6473ea638bd3b5e11f00ddf7aff2d51ee41e68534fe3d49b156d74c0d06ecc998d92573cf37f666ac94ba544776744093c2dfc99ca9b5ac94b8941 SHA512 5fd7a6366a246caf704fae15f031772678c935921af5b6b9add2b55c2fb4e146185970a3e223648989ad1089db5992601ef8e224b1ab648299911bccfd65eb07
+EBUILD signal-desktop-bin-1.34.5.ebuild 2914 BLAKE2B 253d9b06f73a403e1aaf082845b73c93d3a9af800a081ecf8035a19db87bb7c3b9206bed5c6167780ff3652fdb072574abf5d20777facd644bae4bdd2a1f91d8 SHA512 5ff7282b2c930fc612bb9dfd0ce211ab165edb2709ff7000a6efac3d5ff776e005dde9fbbe7ae2810db26a1ee89065d09f9b4acbf64feea69e7a172bd5c57e28
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.34.3.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.34.5.ebuild
index 137ae5436432..97dd2fe513f0 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.34.3.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.34.5.ebuild
@@ -19,12 +19,34 @@ IUSE=""
 
 BDEPEND="app-admin/chrpath"
 RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
 	dev-libs/nss
+	media-libs/alsa-lib
 	media-libs/mesa[X(+)]
 	net-print/cups
+	sys-apps/dbus[X]
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
 	x11-libs/libXScrnSaver
-	x11-libs/libXtst"
+	x11-libs/libXtst
+	x11-libs/pango
+"
 
 QA_PREBUILT="opt/Signal/signal-desktop
 	opt/Signal/chrome-sandbox
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 49a8762e731f..4621d637c48d 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,9 +1,5 @@
-DIST skypeforlinux_8.59.0.77-1.x86_64.rpm 108914465 BLAKE2B 9d8300b9d315b95528e7e453a4b2175a22cc598634f0b517e6e0b45dfd7c04d6cee92d46d455486ee00ea1953617132e6c97576d5cc344988912aa3df03609e8 SHA512 4faa158605c13ee66bf49aad8e1b06f0429772c676088559fb28f6012cf263c1425f830678edd9605cfd69a4a0fb75f051fd96acd0a8a4fb636bb3a5beceb211
-DIST skypeforlinux_8.60.0.76-1.x86_64.rpm 108325497 BLAKE2B 84304111a215d0e0ddb7cdad218913feb961b490ab5bdee3ca506c1666b1a37dfdb8360fa84fb36c56cd47458012c92d6eea2f437e2b9787b7b232dc797adf76 SHA512 a7a1e3ae3c13d235c951c5aad006df668287e82914aa333ad5429ba1a2ac0ebb84cd703f4c5e620385469c91db437105dafac93dcde7af7bb774f48dbe2370d4
-DIST skypeforlinux_8.61.0.77-1.x86_64.rpm 113617464 BLAKE2B 4e3b16cd0119e6bf1900aaa8b9a81bfc87d6ae20a109656001fd63220064c9418dac1ce8114db385ba08f7c7d915f94b9bc368a51f1c2b91d778942d1519abf0 SHA512 81b7797f2e77382358033db80b11870202aeeec4dac771161ec18c2f589b7110b6813bf5a0432e4db0926854da181641fbbeffda8ab644656af45afafa49b3a5
-DIST skypeforlinux_8.61.0.95-1.x86_64.rpm 113617440 BLAKE2B d09468c0bcca8551f8381f1af2d8b609bab40917582d184921ba054e60ab30cc58626fd3e0ccff8a93c5fbf6132091a461fa846bfedecda724b38dab47c9babd SHA512 f9b844675fc30208be04d317aaad4c82543789806766045e564cf9d71105c1c5122507b6719cdf4879d656e2423dbc43b98cc2aad8a242d9def95a5f797b46de
-EBUILD skypeforlinux-8.59.0.77.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
-EBUILD skypeforlinux-8.60.0.76.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
-EBUILD skypeforlinux-8.61.0.77.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
-EBUILD skypeforlinux-8.61.0.95.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+DIST skypeforlinux_8.62.0.85-1.x86_64.rpm 112166071 BLAKE2B a5647e8e0c332787293438721a71f088ba0441f31a94a68d5fa079bd32687ac31c223ba2fded4448e6ed3a95a7b5660215e3137f272e620b3d4205bd11122068 SHA512 30283e7c31d692988cd6ccb350dfcdf3dfdc22d8ac40aa2910a612dc72e08aa0742b53e6876ebde4b7c3727c283ea78e87332f121d1260b8ea65615e378cbc24
+DIST skypeforlinux_8.63.0.76-1.x86_64.rpm 112410264 BLAKE2B 63d6c3c00003bf571cd94257002126c686028617a8de3cec832eb6a08f52db44672186309d39cd83c3d9a5eca05cecc7ce2afd4ab0b23d0101c6c0f00a0b9d9e SHA512 5dbed64ed3dbc3fc281e2a7366203452f15f92af55a415494d893042f2b85164e236e47b7ce20815af30a11ff98e949f4be57d9f1e9caa8160c6ea22397c2284
+EBUILD skypeforlinux-8.62.0.85.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
+EBUILD skypeforlinux-8.63.0.76.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.61.0.77.ebuild b/net-im/skypeforlinux/skypeforlinux-8.61.0.77.ebuild
deleted file mode 100644
index c2755ee5b06c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.61.0.77.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 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/skypeforlinux/skypeforlinux-8.61.0.95.ebuild b/net-im/skypeforlinux/skypeforlinux-8.61.0.95.ebuild
deleted file mode 100644
index c2755ee5b06c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.61.0.95.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 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/skypeforlinux/skypeforlinux-8.59.0.77.ebuild b/net-im/skypeforlinux/skypeforlinux-8.62.0.85.ebuild
index c2755ee5b06c..c2755ee5b06c 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.59.0.77.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.62.0.85.ebuild
diff --git a/net-im/skypeforlinux/skypeforlinux-8.60.0.76.ebuild b/net-im/skypeforlinux/skypeforlinux-8.63.0.76.ebuild
index c2755ee5b06c..c2755ee5b06c 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.60.0.76.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.63.0.76.ebuild
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 31e2482ed7d2..f50e2382e8b6 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,8 +1,11 @@
 AUX spectrum2-2.0.12-boost-173-compatibility.patch 652 BLAKE2B 496e0fb33f3e88775f91c028e6e89f74c3d7d72b09cd1818712b2da5a54b315fdbf00ab9a7525cca744070061d79f32fe3764f2700d695b37a8b308de08b8f88 SHA512 999e9330c4f0fbd1883df28d7fbe15fd40b1a492e6b925900734df2f493fa4241f2a234a1fd3db2b7dc77ddfef66026ab1a656806c17ae7f1fd8f75f9cdf0199
 AUX spectrum2-2.0.12-gcc-10-compatibility.patch 1731 BLAKE2B 5c0c828ee2bfc51affbb44e06b6a53414c608173be799e92c5ecc76a7411cd6cba5a818b7a4df80b209c64c8c0d543fa10077fe8e45f2014f84b614231b20c58 SHA512 228ccf52a17a88e18e5fe97da1ef39c207142286abc5b018fab08c2f3bc96f13fac89147406a23fbd986b35ad23da9b34239497a830396ae2864708f82925505
+AUX spectrum2-2.0.13-libpqxx-7-compatibility.patch 3455 BLAKE2B d67edbcc8454b4f193684464cfccb418e63c8dbe2ac8ee304bc9a40b9eae5e7764f0b7b48bbe737ae3f6f119100463c65c525b4b272991ae6fb3ed4f10e31fe5 SHA512 a0b407f5611493e690a4f024f53672547dcf240d131e0c2ce5ec217f6270cf370846a69b6869a399c963c3dff735b3dfdac5265e6e8bfc78bbad16d84f555acf
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
-EBUILD spectrum2-2.0.12-r2.ebuild 2741 BLAKE2B 9bfe9cc0834e3cdd564017462ebbeb65737c30c1d8f5df9ad35a4d943158457c5de1c4979d1f6df43742478d926166f726edba2f74035e2d9dd883d51637fcee SHA512 b66a5d6ebfc181061b780d75879f53eb944fa4e713bc5848ef8ea12230fdcc434c47ce33a5bce66d3689b6c9fdac1dd81a57d7e6036afb0f8d3ae3aa0922e8a1
+DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
+EBUILD spectrum2-2.0.12-r4.ebuild 2483 BLAKE2B e7d265e538a07d226d98037bec15ea87304e7a7502f054272bea5516c89360bfd31952cc0b93a0acf5e8ee212ec2a0b36b7b1a0ced78f7ee2822d510d50e0e02 SHA512 94270a478627485b7a3e09c3bab6508a4e2de4b056a16db2065c041bd8ed5688acc0e90c4c58bd25e7be212e8b27f623d155776a76044e45dd5f0cb548e8dbfe
+EBUILD spectrum2-2.0.13-r2.ebuild 2378 BLAKE2B 7ce60447d37da501500af92eb1b16cb5a4bebec31666a8b8092d1fe9818f947ff78b406f4d2e7fb5a641cdc178b05cee3446e275d580bf1097b46db1d87816bf SHA512 ef6cc6afaf96fde99693cd79483646764eceb251c3fa69c72c9ae68f40c3ca8693503e51bb73151ae2e7062ecf5403175dcbde7e20ba376d871f71df223137d3
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
new file mode 100644
index 000000000000..48a1f0a333a0
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch
@@ -0,0 +1,79 @@
+diff --git a/cmake_modules/Findpqxx.cmake b/cmake_modules/Findpqxx.cmake
+index 9c53550..691ec0e 100644
+--- a/cmake_modules/Findpqxx.cmake
++++ b/cmake_modules/Findpqxx.cmake
+@@ -1,16 +1,33 @@
+-FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
+-MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
++if (NOT WIN32)
++	find_package(PkgConfig)
++	if (PKG_CONFIG_FOUND)
++		pkg_check_modules(PQXX libpqxx)
++		if (PQXX_FOUND)
++			if (PQXX_VERSION STRGREATER "7")
++				message(STATUS "libpqxx version ${PQXX_VERSION}, requesting c++17")
++				set (CMAKE_CXX_STANDARD 17)
++			endif()
++		endif()
++	endif()
++else()
+ 
+-FIND_LIBRARY(PQXX_LIBRARY pqxx )
+-MARK_AS_ADVANCED(PQXX_LIBRARY)
++	FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS)
++	MARK_AS_ADVANCED(PQXX_INCLUDE_DIR)
+ 
+-FIND_LIBRARY(PQ_LIBRARY pq )
+-MARK_AS_ADVANCED(PQ_LIBRARY)
++	FIND_LIBRARY(PQXX_LIBRARIES pqxx )
++	MARK_AS_ADVANCED(PQXX_LIBRARIES)
+ 
+-if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
+-	set( PQXX_FOUND 1 )
+-	message( STATUS "Found pqxx: ${PQXX_LIBRARY}, ${PQ_LIBRARY}, ${PQXX_INCLUDE_DIR}")
+-else()
+-	message(STATUS "Could NOT find pqxx and pq library")
+-endif()
++	FIND_LIBRARY(PQ_LIBRARY pq )
++	MARK_AS_ADVANCED(PQ_LIBRARY)
+ 
++	if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR)
++		set( PQXX_FOUND 1 )
++		message( STATUS "Found pqxx: ${PQXX_LIBRARIES}, ${PQ_LIBRARY}, ${PQXX_INCLUDE_DIR}")
++		if (PQXX_VERSION STRGREATER "7")
++			message(STATUS "libpqxx version ${PQXX_VERSION}, requesting c++17")
++			set (CMAKE_CXX_STANDARD 17)
++		endif()
++	else()
++		message(STATUS "Could NOT find pqxx and pq library")
++	endif()
++endif()
+diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt
+index 8892241..2b5a0f9 100644
+--- a/libtransport/CMakeLists.txt
++++ b/libtransport/CMakeLists.txt
+@@ -48,9 +48,9 @@ find_package(CURL)
+ 
+ if(WIN32)
+ 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
+-	target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib)
++	target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib)
+ else()
+-	target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY})
++	target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY})
+ endif()
+ 
+ set_target_properties(transport PROPERTIES
+diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp
+index 31cce95..f5305aa 100644
+--- a/libtransport/NetworkPluginServer.cpp
++++ b/libtransport/NetworkPluginServer.cpp
+@@ -1904,7 +1904,7 @@ NetworkPluginServer::wrapIncomingMedia(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swif
+     //Doesn't handle: unquoted src, escaped "'>s, quotes in quotes ("quote: 'text' end quote")
+     static boost::regex image_expr("<img\\s+[^>]*src\\s*=\\s*[\"']([^\"']+)[\"'][^>]*>");
+ 
+-    bool matchCount = 0;
++    int matchCount = 0;
+     std::string firstUrl;
+ 
+     std::string::const_iterator xhtml_pos = xhtml.begin();
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
index 52118de297e5..4f12c3c285e9 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1 systemd
+inherit cmake systemd
 
 DESCRIPTION="An open source instant messaging transport"
 HOMEPAGE="https://www.spectrum.im"
@@ -15,7 +13,11 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( irc )
+"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-group/spectrum
@@ -29,7 +31,7 @@ RDEPEND="
 	dev-libs/popt
 	dev-libs/protobuf:=
 	net-dns/libidn:0=
-	net-im/swift:=
+	>=net-im/swift-4.0.2-r2:=
 	net-misc/curl
 	sys-libs/zlib:=
 	frotz? ( !games-engines/frotz )
@@ -40,7 +42,7 @@ RDEPEND="
 			dev-db/mysql-connector-c
 		)
 	)
-	postgres? ( >=dev-libs/libpqxx-6.4.5:= )
+	postgres? ( dev-libs/libpqxx:= )
 	purple? (
 		dev-libs/glib
 		net-im/pidgin:=
@@ -53,35 +55,20 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]')
-		dev-util/cppunit
-		net-irc/ngircd
-	)
+	test? (	dev-util/cppunit )
 "
 
-# Tests are currently restricted, as they do completly fail
-RESTRICT="test"
-
-PATCHES="
+PATCHES=(
 	"${FILESDIR}/${P}-boost-173-compatibility.patch"
 	"${FILESDIR}/${P}-gcc-10-compatibility.patch"
-"
-
-python_check_deps() {
-	has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
+	"${FILESDIR}/${PN}-2.0.13-libpqxx-7-compatibility.patch"
+)
 
 src_prepare() {
 	# Respect users LDFLAGS
 	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -101,15 +88,16 @@ src_configure() {
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	cd tests/libtransport && "${EPYTHON}" ../start.py || die
+	cd "${BUILD_DIR}/tests/libtransport" || die
+	./libtransport_test || die
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	diropts -o spectrum -g spectrum
 	keepdir /var/log/spectrum2 /var/lib/spectrum2
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
new file mode 100644
index 000000000000..1c7985cbc6c4
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/spectrum
+	acct-user/spectrum
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/libev:=
+	dev-libs/log4cxx
+	dev-libs/jsoncpp:=
+	dev-libs/openssl:0=
+	dev-libs/popt
+	dev-libs/protobuf:=
+	net-dns/libidn:0=
+	>=net-im/swift-4.0.2-r2:=
+	net-misc/curl
+	sys-libs/zlib:=
+	frotz? ( !games-engines/frotz )
+	irc? ( net-im/libcommuni )
+	mysql? (
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	postgres? ( dev-libs/libpqxx:= )
+	purple? (
+		dev-libs/glib
+		net-im/pidgin:=
+	)
+	sms? ( app-mobilephone/smstools )
+	sqlite? ( dev-db/sqlite:3 )
+	twitter? ( net-misc/curl )
+	whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=( "${FILESDIR}/${P}-libpqxx-7-compatibility.patch" )
+
+src_prepare() {
+	# Respect users LDFLAGS
+	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_FROTZ="$(usex frotz)"
+		-DENABLE_IRC="$(usex irc)"
+		-DENABLE_MYSQL="$(usex mysql)"
+		-DENABLE_PQXX="$(usex postgres)"
+		-DENABLE_PURPLE="$(usex purple)"
+		$(usex irc '-DENABLE_QT4=OFF' '')
+		-DENABLE_SMSTOOLS3="$(usex sms)"
+		-DENABLE_SQLITE3="$(usex sqlite)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_TWITTER="$(usex twitter)"
+		-DENABLE_XMPP="$(usex xmpp)"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/tests/libtransport" || die
+	./libtransport_test || die
+}
+
+src_install() {
+	cmake_src_install
+
+	diropts -o spectrum -g spectrum
+	keepdir /var/log/spectrum2 /var/lib/spectrum2
+	diropts
+
+	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+	einstalldocs
+}
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index d4020c2b64a9..260b6f9abe13 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -1,6 +1,8 @@
 AUX swift-4.0.2-boost-1.69-compatibility.patch 2986 BLAKE2B e81cdaadaa7fe4972df1f65f234f4630cade22e64325734500b24ddbba07a663d75fe6ef570b0dbc1463f6d03bc3db3d272d38c2d17945af923383ce65843eb6 SHA512 5218e5ce0d07826c4ebbcf3ea3d7e2685a3d3a9875301d0656929c19b83c4042a538e308b427d4666c5e6ba39adb9049795a886cf50daa9632cf96648421884a
 AUX swift-4.0.2-make-generated-files-handle-unicode-characters.patch 1517 BLAKE2B 78abb2fb27a796d2b0ba1c4d9ee2a5662a3a166b404f16ca67cb0b884db65d36a95b95a82827a7d2cfcf1b65204ebe23b11791b94fa4a88b85a72c1f1b12cf10 SHA512 57cb292b32365d7041a3d9b17488288e07eba5402bdc0db5ec3ff447a5ad7b3dfe7d13275d8783ddf6d338831a9bee93d481b74342d8d57a62486b3b7ca7689e
 AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8e71911ee87dc754f8d7dfe15f7fa3ff9d788f3d698a63cd90f6ff9b2cc4b013a14c92bd704ef0248ea71204645ea4ff90d828881 SHA512 a91d516f682b47573de8949ff5e364505b39d67e6a93441f66000519f8c6d910f7efb67ee510f709d03592446a4fbee0b1f17b0e1b7548ecaa2e3781e8406880
+DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
-EBUILD swift-4.0.2-r1.ebuild 4372 BLAKE2B f31ffc57dcfc165d2c05c0bcf4ed93585383384736836d9d51e8dca73f0a97453e96bc96d36ae71b4762783946527bc10b611373dafabb6ae99cd81433086a74 SHA512 26176d2006c1b93040bce59831696c28e9e1a6b5b51cf9644aa498614cb1b39079f16eb21b5e4acd3c5d367eba310e3de98d88cd8b375d8f0b2d6f35aace23a9
+EBUILD swift-4.0.2-r2.ebuild 4510 BLAKE2B 8381768b09d39dd0ab0cad3403cde517ca22f93b269e1c84dd75e0572f3212bbe0268a0bab54f6683e9e4adb789f1a306b76883fe1eb516fff709c04377bd44d SHA512 d461335e7ae83ca5dea5df543c636b6ceb40bb62b1f556e4df5a048358871cd623a182c3965e03438288c908d36737b01a53e6c7d3a5b0f94ecd144b87577e0d
+EBUILD swift-4.0.2-r3.ebuild 4619 BLAKE2B a68578009b3204783a5572c18dfd99566a4d243e2982be8d237f25dbf2e5c504ef1cbdb403705c301b54324ecbd8261e86a0b50e4482d77f3b1e9763e2707d75 SHA512 743b8654d57761b0d89c34b9f9d071580f784788bda2d212bc264444f4478b6d991383bb8a5218433630219aab54c93b10745ebc48e67b98545102ac19f9caba
 MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/swift-4.0.2-r1.ebuild b/net-im/swift/swift-4.0.2-r2.ebuild
index 40f92b5a1ab6..b24e201e6521 100644
--- a/net-im/swift/swift-4.0.2-r1.ebuild
+++ b/net-im/swift/swift-4.0.2-r2.ebuild
@@ -72,6 +72,9 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# Don't include '/usr/lib*' in the link command line for `swiften-config`
+	sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
+
 	# Hack for finding Qt system libs
 	mkdir "${T}"/qt || die
 	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
diff --git a/net-im/swift/swift-4.0.2-r3.ebuild b/net-im/swift/swift-4.0.2-r3.ebuild
new file mode 100644
index 000000000000..efae168146b6
--- /dev/null
+++ b/net-im/swift/swift-4.0.2-r3.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit gnome2-utils python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
+HOMEPAGE="https://www.swift.im/"
+SRC_URI="
+	https://swift.im/downloads/releases/${P}/${P}.tar.gz
+	https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz"
+
+LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
+SLOT="4/0"
+KEYWORDS="~amd64"
+IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
+REQUIRED_USE="
+	|| ( icu idn )
+	gconf? ( client )
+	spell? ( client )
+"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	net-libs/libnatpmp
+	net-libs/miniupnpc:=
+	sys-libs/zlib
+	client? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtx11extras:5
+		net-dns/avahi
+	)
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	gconf? ( gnome-base/gconf:2 )
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	lua? ( dev-lang/lua:= )
+	spell? ( app-text/hunspell:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/scons-3.0.1-r3
+	client? ( dev-qt/linguist-tools:5 )
+	test? ( net-dns/avahi )
+"
+
+# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
+RESTRICT="test"
+
+DOCS=(
+	"DEVELOPMENT.md"
+	"README.md"
+	"Swiften/ChangeLog.md"
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.69-compatibility.patch
+	"${WORKDIR}"/${P}-python3-compatibility.patch
+	"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
+)
+
+src_prepare() {
+	default
+
+	# Don't include '/usr/lib*' in the link command line for `swiften-config`
+	sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
+
+	# Hack for finding Qt system libs
+	mkdir "${T}"/qt || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
+	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
+
+	# Remove parts of Swift, which a user don't want to compile
+	if ! use client; then rm -fr Swift Slimber || die; fi
+	if ! use lua; then rm -fr Sluift || die; fi
+	if ! use zeroconf; then
+		rm -fr Limber || die
+		if use client; then rm -fr Slimber || die; fi
+	fi
+
+	# Remove '3rdParty', as the system libs should be used
+	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
+	local my3rdparty=(
+		Boost
+		Breakpad
+		DocBook
+		Expat
+		LCov
+		Ldns
+		LibIDN
+		LibMiniUPnPc
+		LibNATPMP
+		Lua
+		OpenSSL
+		SCons
+		SQLite
+		Unbound
+		ZLib
+	)
+
+	if use test; then
+		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
+	else
+		rm -fr 3rdParty || die
+	fi
+}
+
+src_configure() {
+	MYSCONS=(
+		ar="$(tc-getAR)"
+		allow_warnings="yes"
+		assertions="no"
+		build_examples="yes"
+		boost_bundled_enable="false"
+		boost_force_bundled="false"
+		cc="$(tc-getCC)"
+		ccache="no"
+		ccflags="${CFLAGS}"
+		coverage="no"
+		cxx="$(tc-getCXX)"
+		cxxflags="${CXXFLAGS}"
+		debug="no"
+		distcc="no"
+		experimental="no"
+		experimental_ft="yes"
+		hunspell_enable="$(usex spell)"
+		icu="$(usex icu)"
+		install_git_hooks="no"
+		libidn_bundled_enable="false"
+		libminiupnpc_force_bundled="false"
+		libnatpmp_force_bundled="false"
+		link="$(tc-getCXX)"
+		linkflags="${LDFLAGS}"
+		max_jobs="no"
+		optimize="no"
+		qt="${T}/qt"
+		qt5="$(usex client)"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="$(usex client)"
+		try_expat="$(usex expat)"
+		try_gconf="$(usex gconf)"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex client Swift '')
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+		$(usex zeroconf "$(usex client Slimber '')" '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED}/usr"
+		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
+		$(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
+		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
+	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use client && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use client && gnome2_icon_cache_update
+}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index 2beee60383b5..69d23738a4e7 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,5 +1,7 @@
+DIST teams_1.3.00.16851_amd64.deb 70105596 BLAKE2B cbadd17aac8722248eb01a51ee709ea51aad4a88a5e1b4e13ba86608af41b409f556d010dfcb03deb63a672730d96b92cb835d533183525e7a7b87f273cac175 SHA512 be2f9f37e1eb283c6f2c57fede83482eb5f2bbe0f5107ab2fb9054135375de6fcf43cf128fe3b43a21353d0105f092e5b5755ff708c0874d40c7eb4153a3b3a4
 DIST teams_1.3.00.5153_amd64.deb 68143908 BLAKE2B fc540de9c70c825b58a6bbc30a8d15882dc80af3b725224617c32a988fa58498e9efafe3b3fcfebab3c5d98c7629cc00fd8e5b5f7a1b3df305449c6a0644b8d3 SHA512 bac34d936e9c34a9d3b31ed800a32c187154dbcf787da350e75e3c63103cbe41872cd98551204e922198ce1d86a06a9fa8b6020b7682b9aea15ff583e446dfca
 DIST teams_1.3.00.958_amd64.deb 65064414 BLAKE2B 4f8788f7a9d3a2cc032e873453469dd3f2a5bd9dd43c60de4b8719e7fafcf903bf266b35b2da16c593005fa1a4dc275bc65cc6164654b0df909a564ddc4cc00e SHA512 ee698784a0c91346306466a1b794c4d1b4ff01ede2869cc7c4731e62ebf16e6f18b65aa0b03452c1011ddd5c654808f1725f62a62a43814cacb9d7a2934fb7c3
+EBUILD teams-1.3.00.16851.ebuild 2764 BLAKE2B 7b85ba3edb7dde83b06a3e3680138b773d17f0284f556ce5f768bfa7969c46a51f2d1f9caa37131f86fc918ffb9d0ec516bc594344ac1c3ff1143608c43e22b4 SHA512 119bde21b42d0369e4144ff4d085f9979b3ee394842336c6d3e7b635b311697b0fbab861440b196c8a190cd34dd0fe17ca2deac11fdf44e5f77e8fb5e6615517
 EBUILD teams-1.3.00.5153.ebuild 2759 BLAKE2B 4632904d295c314769bf449be3d50f7b3aff7ec2a78d7e4cd97615bcc65771c3cf9c15900e501236b87ccdda0c78d0c7f13f6a3bb6266394d9d064e2104ebbca SHA512 68834a6dfbcd86d7a40b3832e4afd36b52546376c5b0b28d99d4da58c71452d0d1b0794510cb9aace7479a937934f767262b9886271c3f9ff944c87f47edc6e7
 EBUILD teams-1.3.00.958.ebuild 1950 BLAKE2B 975cfdd03e7e92b6ca060f24d518092837ab9e106b44531189f1b8f647045ebd979ea72c53e4438508f7e3ae5972f5c40f8ed3e335ffe21fac449009a101c46c SHA512 22988beea775a43604231ade4ab9bfcf23e61ea83972345eb9f75633a4bd0f61d3e48297c6f75bad434913ecae28e0214b1e3ca5f0745a5376560a86d7385f72
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/net-im/teams/teams-1.3.00.16851.ebuild b/net-im/teams/teams-1.3.00.16851.ebuild
new file mode 100644
index 000000000000..66e5820e6c66
--- /dev/null
+++ b/net-im/teams/teams-1.3.00.16851.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker xdg-utils
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror splitdebug test"
+IUSE=""
+
+QA_PREBUILT="*"
+
+# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
+# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
+# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
+# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
+# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/libgnome-keyring
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/mesa
+	<media-video/ffmpeg-4.3[chromium]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	x11-libs/pango
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	rm _gpgorigin || die
+	doins -r .
+
+	fperms +x /usr/bin/teams
+	fperms +x /usr/share/teams/teams
+
+	# use system ffmpeg
+	rm -f "${D}"/usr/share/teams/libffmpeg.so || die
+
+	cat > 99teams <<-EOF
+		LDPATH=${EROOT}/usr/$(get_libdir)/chromium
+	EOF
+	doenvd 99teams
+
+	# use system mesa
+	rm -f "${D}"/usr/share/teams/libEGL.so || die
+	rm -f "${D}"/usr/share/teams/libGLESv2.so || die
+	rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
+	rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
+
+	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
+	domenu usr/share/applications/teams.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index f74016015a0e..78f7aa8cf492 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,6 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-2.1.1.tar.gz 14020023 BLAKE2B 5fe70c6c224da0f7a890cf33ec01e39b692799515251d99a46a578e5025ad66f677a800feffb71710466dec34a0fbc887c1be6d851f34d6644511f756e3dd04b SHA512 02051c85b092a2a38762ec2e00b556901651204c29e1a9da46af474dfd6300b1eed7c4023450302e75e86e28e4bf0acc9ba99bf44ff225cf105920f01e9e89d8
-DIST tdesktop-2.1.3.tar.gz 14432478 BLAKE2B 4b51896205ad0f88f0e6f21bd3a51e5bb8d8303ac27a16cd16590035c6b884621206005e64c844d283290c61badbe8f0d7c4613c8b604618c2f50c27ea4a94e6 SHA512 b320fc023bfa612fd7a7d221d160b10f63bcbfb341f9e2cc300d428c6a8a23cec59298460599bb6f1db94b115c00e89741dd537778abc75aa4ad3831574c0e71
-DIST tsetup.2.1.1.tar.xz 35162344 BLAKE2B 82a78901b6ce33d1cc73e6cc5eb487549e75e93ecb986adc7b9b7d4cdfd86d7849666c29fe7a9fad4279970ad6eb49555e5e4076e61ae1bbb525dbd33cd16258 SHA512 ee1c0eb8a71383fefbeaebcfbca8492098a0215c45b0954df5b3ffb138535a070b6478883e5c0625940a6467ccdf9dfce5aebcfc5fbb5bdd4e3c5b7d9b672127
-DIST tsetup.2.1.3.tar.xz 35657980 BLAKE2B c32890b307ef8fa8b377a76bcb97b91ebc98c4d639a58f83407beabfb245e51a62cddf2fe4a932e698c3418be502c1fb013fb040a458a0460b8f2dcea27f8131 SHA512 392468fa889168ecfdbe5b6f631b297344f81e6a4ad1fe28d560708d97f1ad147b0c0313fb8ca2780b4b394116d35e5cf65838f06ee818664df20fed255bd30e
-DIST tsetup32.2.1.1.tar.xz 38129352 BLAKE2B 5f9d6440526ac7ee79cfdd4d8417b1420874422e97754bb83d9534464f23eae4974f4ed4a23ef640e822ff5dd332170271998b33b3959355af34794af34391db SHA512 aff5eefc244c670757a55789a940c4496352b66df47238cd98ad6a44c2e9ff9740bfb2b85767d700c8faaf594b612b951e684436d40db710f8c95590e683b55f
-DIST tsetup32.2.1.3.tar.xz 38630432 BLAKE2B de6ccecba96c4d2b9d9da50f135d2207ea6d1c67a4b700fedc609c45f429d2e443724bfc1fe97de63d8ce8022bea8d96e549ea3145b3c6e8f153884ed3d133bb SHA512 6d2ca6a119a82f53a56485ae06bae80b593b24bc5822b91545e3572581bbdb4f69c979b462e935ce6b3d5dcca409802b650e879400e47ea77339388debbc63b0
-EBUILD telegram-desktop-bin-2.1.1.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
-EBUILD telegram-desktop-bin-2.1.3.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
+DIST tdesktop-2.1.13.tar.gz 14448009 BLAKE2B 3e9b067aefb72e688d12ceead86453285bcd4ed3345ff601220e282291fb92eb346072695bd1dbf97ce82a81ad97d33000cf7b52edc9ea2cd0aacd566fc17f39 SHA512 1166ec37043f4042130fcb1bb5464dc4fae69f6ac27dc877cd481400fed3be6d4ccbe8998619782786065ea308e774f7efd5a89a06e2f9059d3f2effc2b850c4
+DIST tsetup.2.1.13.tar.xz 35692368 BLAKE2B b41023b8ad7178ab48c62657eefbf3962c956ecb42d0e448fb14fab147334c35f38eac98bc7038328c02f4c98d506217eddb27603127312663d056fd34635303 SHA512 028722700be37c04fb900ba7186990bdc35bcbed2320dd510f08694f39c81804a529b133134146e1c474c9aca398f870d901d6f4eb6d1bc207b21aa0eab688cd
+DIST tsetup32.2.1.13.tar.xz 38700276 BLAKE2B cf52737c1b7af3e3c07bcc78136c6cfb1169fc9727caa800c7eff0daed8680fcf9a82266311417d8ce6e88ca2d6ce6aafa805140facf2290eacd9c94504e50b0 SHA512 a5f9ff41e31ea0ab9b8873e78a94251a2c1e7fb61240b22bd613fa45d99079e3306c4147e58b64f9940fb90d587aa53e20d2ccb839fa03534d47b864736ccc8c
+EBUILD telegram-desktop-bin-2.1.13-r1.ebuild 1382 BLAKE2B 9da7b61ab660bda412f68172b8fa131e646b909d81e21dbbf3f00244d73c58b1ae67b9b24ab50d81aec5e654645a9715bbc4685392d6c412b1120961979e407c SHA512 e7677293c7d7cb1be7127ce7972b2a43806796ea62dc1d5cb8089ae819ded04002a5fd3b428b0c5ec7235fd390af2ae858f50747f53cd3ab87178a36d4b0ff13
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.13-r1.ebuild
index c0971f7fc9b5..1da038a5f934 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.13-r1.ebuild
@@ -23,7 +23,14 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/gobject-introspection
 	>=media-libs/fontconfig-2.13
-	>=sys-apps/dbus-1.4.20
+	media-libs/freetype:2
+	media-libs/libglvnd[X]
+	>=sys-apps/dbus-1.4.2[X]
+	sys-libs/zlib
+	x11-libs/libSM
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
 	x11-libs/libX11
 	>=x11-libs/libxcb-1.10[xkb]
 "
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.3.ebuild
deleted file mode 100644
index c0971f7fc9b5..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils xdg
-
-DESCRIPTION="Official desktop client for Telegram (binary package)"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="
-	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
-	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
-	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
-"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-QA_PREBUILT="usr/lib/${PN}/Telegram"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	>=media-libs/fontconfig-2.13
-	>=sys-apps/dbus-1.4.20
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.10[xkb]
-"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-	exeinto /usr/lib/${PN}
-	doexe "Telegram"
-	newbin "${FILESDIR}"/${PN} "telegram-desktop"
-
-	local icon_size
-	for icon_size in 16 32 48 64 128 256 512; do
-		newicon -s "${icon_size}" \
-			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
-			telegram.png
-	done
-
-	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "spell checker support" app-text/enchant
-}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 5353da704666..93faf6a570c9 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,13 +1,5 @@
-AUX 2.1.0-kde-dir.patch 2118 BLAKE2B 92ec09b35f474cdab0677a394dcef193249f6db8b4ac980a63e054fe841876133e81a9420c52d3d9c91066725a9a0049ae9bc1e80d46c22e4ca8dd9b18cfc328 SHA512 da144cd13f42cac06aa1932945fccf7367f37edca7fb4781e8fa38fe8af1cb52b3b6062396a9a5d2e243966bdbb093e541042446e237d88c59bc855ea347c4e3
-AUX telegram-desktop-qt5.15.patch 975 BLAKE2B faf7fa6505d760299b05a02684817993162a5d3105581fd425bf4af179543170eb4d4b4c670907b88cbfead9bc288641216edb86f47fe370f0d691918426b4a1 SHA512 6bbe0583103d575a1413141799985c7c7b590d8a9856c727320ce322679a3d38343a144c314eee54fa9776c8f3a084627a333e6860d1b8cb8f496b1702070ac0
-DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d
-DIST tdesktop-2.1.11-full.tar.gz 36548657 BLAKE2B 969ee0b680cb225c86bbab25e792b9fa21182227d73f062700ac56f08de83b249cca41d661c711e1a7dbcbeeeda70ddb13535403bee6f001ea10c4864b995c67 SHA512 9f2fba2814a5ab64f946913e32fce66dbc842d9607cbaee00994689ef6a661a04c2a8de5e075fc532e7d8926b51432c06c2b1510b019d729eef40da373d91d42
-DIST tdesktop-2.1.12-full.tar.gz 36549678 BLAKE2B 0a973f8f560ccd30a35f172d4a63af9b4d16601af47f2ed71f37f6c3845e328501a79062f2917f37842248646b60ff3d88f8444d75df8bbae967969907cd3a83 SHA512 961f7e4900f782d58d5d1b1045590a7029777c3daa8d26f47a61663de9ab0c3c3cdfa7507c0710af2fb231e480ffe67de0bcbd61b72acb751ae8133b73d86cff
 DIST tdesktop-2.1.13-full.tar.gz 36549505 BLAKE2B 48514be8add4ad4491c8e81a868f140228787ee489de7cd90faf31dbee959b0fb87cf2c844bf98c5b62fd6de8e32f504a6d19b071c56e6a4c0cd489d7b283818 SHA512 f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8
-DIST tdesktop-2.1.17-full.tar.gz 36583423 BLAKE2B d86490b13a43033e383426f4e47baeaa04f3c26823b206fbc9ddb53245d77d50aaf2b93c6d401c603a628655789048da604afa7000c593703ab223cabd2985ef SHA512 8bea14ff32e74c21c6c080b5acf9e3fe11cee51c1e42c196ceb44222c85f39824049a6fc4386798f4b1770693e3f40fe4f56a4ea11d385fd337c99be5f1746cb
-EBUILD telegram-desktop-2.1.0-r1.ebuild 3715 BLAKE2B 78d184427e162ee5fa54f8f3e1fc495d279ffef5e80db51097fb8e144253e3c8abca6da1c5f31f313ccd8883421c1144defd8a4dc9792977b1cd2347eb7e059e SHA512 a22d939a8a8c939e8205a6aa3f537f627370d3f929b817e0ec77e5d95a24a12b8ca5fa6ef87a1b36782204127d13ae5cdbb46a8f26eab9b0bd13d24c77119040
-EBUILD telegram-desktop-2.1.11-r1.ebuild 3871 BLAKE2B 8fb5f786d077016fa3e487eb3e3d895b8ea9224c92a257fb2ea613c225f69e9f441160f0d329ab9fdcc9500784e6e29ad5b1298cd77a6c2c9bc19b68143425d7 SHA512 32e27091413618701d1eec5f30f4a2182be39b358f773c272aedd5ede4da9cee0d589ee9db123a502c4a4b9b954044edf1ad007fd1cb6822a5cad7ad5d94b886
-EBUILD telegram-desktop-2.1.12.ebuild 3888 BLAKE2B fd9413f9899f8dc6c3d03693a60151c5f2323102f157c65108ab2b6418d6c005c59321deeb66a1b0d4c2e644904f382014332e3e370d90e0ae65a91a1a85b4e6 SHA512 91e37a46a7ce9d85393fe5580f5df100a0508a783a750e13b839e9e497c9dadfab28715d07e02f14dbb67d193efdabe55cf7c6a7d9f41127d0689e9ab97a7e1c
-EBUILD telegram-desktop-2.1.13.ebuild 3888 BLAKE2B fd9413f9899f8dc6c3d03693a60151c5f2323102f157c65108ab2b6418d6c005c59321deeb66a1b0d4c2e644904f382014332e3e370d90e0ae65a91a1a85b4e6 SHA512 91e37a46a7ce9d85393fe5580f5df100a0508a783a750e13b839e9e497c9dadfab28715d07e02f14dbb67d193efdabe55cf7c6a7d9f41127d0689e9ab97a7e1c
-EBUILD telegram-desktop-2.1.17.ebuild 4227 BLAKE2B 3047f6e3ec1484ec2663cb355108aca3fc14226f02a5d74cc31cd4d0b3efa4ef841114adfe8ce88e1b0f7aed0dc61b4bc04fa9f66dd8d1a2d48d0c1e6b93d60f SHA512 692c2f9729adf4309c002506bf7f079a74787d32385dd446c97f7b0a4151b8b6daa775007815b00d495959d964f4dc95952d92f2106aedde8e903fdd9043f678
+DIST tdesktop-2.2.0-full.tar.gz 36612169 BLAKE2B dcc9d81da5d99552bea3139d595c7f1aca75464a19be34c880a93d27ddd8a58a01510efe8fde31104b13d50e34e944b05406e21bc96995e85cb95283ff8de08a SHA512 2aeca83be7bc385bd7537d56ecf66996facedd0af588e743fedbb08c3158fc76436d6cf3b1fb5dd7c8d37b4471f739872ca54ba300aa1d0e0202e87c005703fd
+EBUILD telegram-desktop-2.1.13.ebuild 3887 BLAKE2B e69436b8a7bd74f12886266745d9caf82e6a826812c10017aac43c0093a01c87177e159bd134a611e8625c935d36a89b0208b5f95febcf4c5ab15366438b805f SHA512 86789ea69657cb77596bb183bc6a2cfcf032bba02ae3c286966d56c4a9caeff37a8d37057bbdbce541d5c7d641a503cefdd05a264aa3e32778be48a05ca19944
+EBUILD telegram-desktop-2.2.0-r1.ebuild 4210 BLAKE2B 87b1389b88a0692c1b571f9faa73ccc727d5d6ae3cf749a841bfc060f25903158ffde32c554cc2f982c64eaf1822f1b5ba045d60e67e3642cdc6de83f18abf75 SHA512 a69630212397dfdaa7dfe404b3e49a827e78b71417893f366af798b72ecfccb62961cd0dafb03d5e58d025130e3651a64b056c231e1652161bab1cd774ce0ef9
 MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
diff --git a/net-im/telegram-desktop/files/2.1.0-kde-dir.patch b/net-im/telegram-desktop/files/2.1.0-kde-dir.patch
deleted file mode 100644
index b936275e3613..000000000000
--- a/net-im/telegram-desktop/files/2.1.0-kde-dir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 7bc86cc9af28ba3d04a5cb69f6f7c16bfe7f8719 Mon Sep 17 00:00:00 2001
-From: Ilya Fedin <fedin-ilja2010@ya.ru>
-Date: Tue, 21 Apr 2020 23:05:17 +0400
-Subject: [PATCH] Fix directory opening with portal and use them by default
- with KDE
-
----
- .../SourceFiles/platform/linux/file_utilities_linux.cpp     | 6 +++---
- Telegram/SourceFiles/platform/linux/specific_linux.cpp      | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
-index 47dd56a411..88f8a69a91 100644
---- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
-+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
-@@ -83,11 +83,11 @@ constexpr auto kPreviewHeight = 512;
- using Type = ::FileDialog::internal::Type;
- 
- #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
--bool NativeSupported() {
-+bool NativeSupported(Type type = Type::ReadFile) {
- #ifndef TDESKTOP_FORCE_GTK_FILE_DIALOG
- 	return false;
- #endif // TDESKTOP_FORCE_GTK_FILE_DIALOG
--	return !Platform::UseXDGDesktopPortal()
-+	return (!Platform::UseXDGDesktopPortal() || type == Type::ReadFolder)
- 		&& Platform::internal::GdkHelperLoaded()
- 		&& (Libs::gtk_widget_hide_on_delete != nullptr)
- 		&& (Libs::gtk_clipboard_store != nullptr)
-@@ -192,7 +192,7 @@ bool Get(
- 		parent = parent->window();
- 	}
- #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
--	if (NativeSupported()) {
-+	if (NativeSupported(type)) {
- 		return GetNative(
- 			parent,
- 			files,
-diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-index 0bb3963420..c12e5a0780 100644
---- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-@@ -266,7 +266,7 @@ bool UseXDGDesktopPortal() {
- 		const auto envVar = qEnvironmentVariableIsSet("TDESKTOP_USE_PORTAL");
- 		const auto portalPresent = IsXDGDesktopPortalPresent();
- 
--		return envVar && portalPresent;
-+		return (DesktopEnvironment::IsKDE() || envVar) && portalPresent;
- 	}();
- 
- 	return UsePortal;
diff --git a/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch b/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch
deleted file mode 100644
index 80c02b10db2b..000000000000
--- a/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/animation_value.h tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/animation_value.h
---- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/animation_value.h	2020-05-24 09:44:41.000000000 +0200
-+++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/animation_value.h	2020-05-26 20:31:34.381796057 +0200
-@@ -10,6 +10,8 @@
- 
- #include "ui/style/style_core.h"
- 
-+#include <QPainterPath>
-+
- namespace anim {
- 
- enum class type {
-diff -ru tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/cross_animation.cpp tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/cross_animation.cpp
---- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/cross_animation.cpp	2020-05-24 09:44:41.000000000 +0200
-+++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/cross_animation.cpp	2020-05-26 20:32:16.340015129 +0200
-@@ -10,6 +10,7 @@
- #include "ui/painter.h"
- 
- #include <QtCore/QtMath>
-+#include <QPainterPath>
- 
- namespace Ui {
- namespace {
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.0-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.0-r1.ebuild
deleted file mode 100644
index 11e09aa8bed7..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-	~dev-cpp/ms-gsl-2.1.0
-	dev-cpp/range-v3
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-	|| ( X wayland )
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-kde-dir.patch"
-	"${FILESDIR}/${PN}-qt5.15.patch"
-)
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-	)
-
-	append-cxxflags "${mycxxflags[@]}"
-
-	# TODO: unbundle header-only libs, ofc telegram uses git versions...
-	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
-	# EXPECTED VARIANT
-	local mycmakeargs=(
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.11-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.11-r1.ebuild
deleted file mode 100644
index c22c68053cc4..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200525[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-	|| ( X wayland )
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-	)
-
-	append-cxxflags "${mycxxflags[@]}"
-
-	# TODO: unbundle header-only libs, ofc telegram uses git versions...
-	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
-	# EXPECTED VARIANT
-	local mycmakeargs=(
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.12.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.12.ebuild
deleted file mode 100644
index 339746697842..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-2.1.12.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
-
-MY_P="tdesktop-${PV}-full"
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	app-arch/xz-utils
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	>=media-libs/libtgvoip-2.4.4_p20200525[alsa?,pulseaudio?]
-	media-libs/openal[alsa?,pulseaudio?]
-	media-libs/opus:=
-	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
-	sys-libs/zlib[minizip]
-	virtual/libiconv
-	x11-libs/gtk+:3
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-
-BDEPEND="
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	|| ( alsa pulseaudio )
-	|| ( X wayland )
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycxxflags=(
-		-Wno-deprecated-declarations
-		-Wno-error=deprecated-declarations
-		-Wno-switch
-	)
-
-	append-cxxflags "${mycxxflags[@]}"
-
-	# TODO: unbundle header-only libs, ofc telegram uses git versions...
-	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
-	# EXPECTED VARIANT
-	local mycmakeargs=(
-		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
-		-DDESKTOP_APP_USE_PACKAGED=ON
-		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
-		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
-		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
-		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild
index 339746697842..fdbdccb40dcb 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 
 LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
 
 RDEPEND="
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.17.ebuild b/net-im/telegram-desktop/telegram-desktop-2.2.0-r1.ebuild
index 6ddaac567726..2db700903fcd 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.1.17.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.2.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
-IUSE="+alsa +dbus enchant +gtk +hunspell libressl pulseaudio +spell wayland +X"
+IUSE="+alsa +dbus enchant +gtk +hunspell libressl pulseaudio +spell +X"
 
 RDEPEND="
 	!net-im/telegram-desktop-bin
@@ -26,19 +26,20 @@ RDEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	dev-libs/xxhash
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?]
+	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/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20200701[alsa?,pulseaudio?]
+	~media-libs/libtgvoip-2.4.4_p20200704[alsa?,pulseaudio?]
 	media-libs/openal[alsa?,pulseaudio?]
 	media-libs/opus:=
 	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
 	sys-libs/zlib[minizip]
 	virtual/libiconv
+	x11-libs/libxcb:=
 	dbus? (
 		dev-qt/qtdbus:5
 		dev-libs/libdbusmenu-qt[qt5(+)]
@@ -47,7 +48,7 @@ RDEPEND="
 	gtk? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2[jpeg,X?]
-		x11-libs/gtk+:3[X?,wayland?]
+		x11-libs/gtk+:3[X?]
 		x11-libs/libX11
 	)
 	hunspell? ( >=app-text/hunspell-1.7:= )
@@ -68,7 +69,6 @@ BDEPEND="
 
 REQUIRED_USE="
 	|| ( alsa pulseaudio )
-	|| ( X wayland )
 	spell? (
 		^^ ( enchant hunspell )
 	)
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 6b86a21d9c03..00beea3a39b6 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -2,5 +2,5 @@ DIST toxic-0.8.2.tar.gz 1146526 BLAKE2B 0a1c80313963287e88aa489ecf4614365a3d94c7
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
 DIST toxic_patches-0.8.2.tar.gz 3859 BLAKE2B 4a19226cea6c7ce60f599fbd4f74171f26b3812259f0f8997997526bde7beb6fe64b922f25fe77e0ac8f9b185db116d2e626cb889631a1508786b92f9bbc8927 SHA512 737cc53e814567e10ad8b7431be63ab8f99b76bb150490c31e03309c4e51ee34a798d141cbde446cbbc4b5c0145ca468f3456a2af4b966c80792cdccc6562b46
 EBUILD toxic-0.8.2.ebuild 2236 BLAKE2B 61874558ca08f229ab672be1df0915299865582e2f0e33a1f83da50bdc06ebe936b2adc04d75dce2c01449d502755e39e4f134ac7e8790afb6d1071a5dbd5d0d SHA512 d7de32e733f23b76b576e8d0e2327a179d0d4fb2deb06a696c7ef1e47bde1f0cc5148667567eb86231614810ca6bfa9f8c6aae3c2fcb1ba67b0e13ace08e476d
-EBUILD toxic-0.8.3-r1.ebuild 1821 BLAKE2B a0949d1d569e036cce682702a3effbe92f2f06f2980dee32cecf5348c296ed3401eaa6146d68dbfa6d8694513ec5875a714f43b5f5698f050523249d54ca8f00 SHA512 af68531036ee165bb476a4da1113f229029a1ee5fcaf8bc8a68198f8bd13ada2a9dc8ce1a6ca1600d946877d488d2fd696c5aa63fce95cd70135f73c01e46782
+EBUILD toxic-0.8.3-r1.ebuild 1819 BLAKE2B bcbb717c80f30e71a97698ab3cfcfd1eb74ba5405ae2c1d058025d61a4e42ab0f2fa9f0f04918a7ea76d3e9502a43bbc3e8e0737bb66cf94f4826e5bd4f79739 SHA512 0fd97f88c87bcaf7d50efbc009ba8490248d008a20082174cf1b1c2b288cd7ef5364567cc394a88ae85c34876d7a9a33119a8cd9ede9b36698bcc94a9e2bd409
 MISC metadata.xml 984 BLAKE2B e990138cd52d9a9933635ac1a093a22305dd02896082e38b5fbbe7044fc77a1cf134db1a5923985566e89b360f2e98b7cb948e273580857a10ef5856f33c48e0 SHA512 3211f2bb29f8755718fb0cd45e37c3331271500a6d6dd0c47acee7b8e6f0d550fb9e8910d5d0769cd7ea217e7abeb1998886246c4ede1fe24b23d722a0341865
diff --git a/net-im/toxic/toxic-0.8.3-r1.ebuild b/net-im/toxic/toxic-0.8.3-r1.ebuild
index fcdcabb71fd7..30f2e2860bcb 100644
--- a/net-im/toxic/toxic-0.8.3-r1.ebuild
+++ b/net-im/toxic/toxic-0.8.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="notification python qrcode +sound +video +X"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-im/transwhat/Manifest b/net-im/transwhat/Manifest
index 1bfcef7e2b7f..f9ca124bc087 100644
--- a/net-im/transwhat/Manifest
+++ b/net-im/transwhat/Manifest
@@ -1,3 +1,3 @@
 DIST transwhat-0.2.2_p20190426.tar.gz 38373 BLAKE2B 3addf2ae66d042eaf4a5f6b54015b9592fea68b69f4c542c5ec0d97040c0eb473d15b893af35f6d6cf83671417ed718c9c91b6268242e667fa34397fc230d2d5 SHA512 7079d1015bf5dfcd97e729219306320055ef86ac3203bb727bebb1e96abb60a26787882a12f9a8f4cce2ef45652bebfbd824a98d37d97ed72ebe0269004c1a71
-EBUILD transwhat-0.2.2_p20190426.ebuild 984 BLAKE2B 66e6dbb92f1d72f70e80f662bb1d68187f83e9db5aecee0e25fb4d55e209e295f3ff53c2d116508e574847f51f7051a70ad387be0f49339603e532de1f5a00ba SHA512 afc9da6416788e1e1956739436efdfa8206946134c22b3fe61b33926bfb6d4dbc35cab3fe3a2fb3cf40b1bba52200b9eb81afa9e040e8385af0ac61a599892af
+EBUILD transwhat-0.2.2_p20190426.ebuild 983 BLAKE2B 7acf2fcf62aa9f9a98d060a15b6ab9fbee7c73df66508c8eac7a77fd92aaf374f67c3630637143f7763a4231f9dc43965e6fb117a5c7c5bc9d4049f60b1b5046 SHA512 c9059e7d3849185798cb516357a3fb0a60a42fc0756999883e36383e17d32750c7b51f4cc7381ab7e94cfd1bfb51cbac9bf3c504029b3a0889581882a05a6a7c
 MISC metadata.xml 587 BLAKE2B d9197ca259917c92a60ae23461425d3d750ceaa73ec0c69da54c9d23c72be3c48794e802ecca60522553178d23725833e17dd95c469a3bd344e09acbb05c47f3 SHA512 6a691a5f296d75e5423dbd761b546f616555d32164e5a4fe536fb01d2f844d8b11700f15c0fb38e7f37b55cf01cfb968582b79103695ead516388dd5689149c5
diff --git a/net-im/transwhat/transwhat-0.2.2_p20190426.ebuild b/net-im/transwhat/transwhat-0.2.2_p20190426.ebuild
index 0ca8ec67f7a8..52606932153e 100644
--- a/net-im/transwhat/transwhat-0.2.2_p20190426.ebuild
+++ b/net-im/transwhat/transwhat-0.2.2_p20190426.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 EGIT_COMMIT="d022243f6c7b23674d3c87a09819f00b10df1165"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index c9e98f0bfaf9..75eabd88305c 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1,4 +1,4 @@
 AUX yowsup-3.2.3_p20190905-fix-install-path.patch 819 BLAKE2B c1b30327dc0e56eb2516d4c397779a129d04ff1727b9c0b2a41f971a0ca27d855c59a58abf5d05c3a832756c951b281bda4c50bcec7bc75a44fe02a618a651b4 SHA512 2ee5d15f48d891f05c567e4bdf3b2b249963241dfdb825fab7c9dbce9d71007ed4f947a57a9565f6a4b49a79a4edf5043f9b651b6ba194a8761bc5a4d973c02d
 DIST yowsup-3.2.3_p20190905.tar.gz 150149 BLAKE2B 149c49df1a3b4df9163abcb1625b7e15e41d81f6a1a649c08d8cca88cce6cf10488778301fc96af3b2fe9e668e855023e56da6e6e8b3b9038994273f19404b78 SHA512 4b59a30bf73797750b92aecf45bf2e551fcbb249688efac631400bf532e21b739e9a6628ed01da4d520ed9296657ae8c5463c3560b165c5d696fd18f1e700be7
-EBUILD yowsup-3.2.3_p20190905.ebuild 1511 BLAKE2B 9fce1ab7b2467905d51e49527fee604caf84ace73f7dd3e8874063d9008a5a31f695ba7b3b46c415c67bcafa75a9588a91192c0b1b67d8c9c4e75c6345b8c0ce SHA512 085cd3cf8e04f00400b659a1732a9632d46d53da34408e63563d4865d7dae2a9823496dbffa41fa62e8e154509fa100d51ad33f1d92448c9a8e3ac29bd227e1f
+EBUILD yowsup-3.2.3_p20190905.ebuild 1510 BLAKE2B 1c4c32a244cb1fc82e2fa2bd80de91d60dd64190bc6143de688f3cec39b9eb4d3615a31ebb1df8a0e8afda06a7be1cd80547b47628ffc7a2b14549e81735b817 SHA512 a9063bcfd1bd6ac6dda891a39a80ef82164b02dcb42f8cf8723cc42b5a415a3eae89bef8fb0e6b877aabc81cf303bd56d2b8dc47a274240c198e175146f210ad
 MISC metadata.xml 755 BLAKE2B 6583234aee84087b1b620f1cb672cc04ca09a02e4869a27e383087d619ee0811cfbd6cd1e98d10a24c3874780d2294a439528cf519cce002cba24611b74e213d SHA512 4bb77977272cfd03c7270c9cd78d5470fc53d3324878e38a8ad0febfd6741531f1b5680c8548c6e71202c54c5c7a4a68cb319e1469f381657a06a3985c80d7db
diff --git a/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild b/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
index ddf34d927d5d..d765add241cc 100644
--- a/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
+++ b/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 EGIT_COMMIT="2adc067f306d9e7d8b634f66e96c52d80a42e1ff"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="readline"
 
 inherit distutils-r1
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index ab6f2e2a5d24..f237bc72b183 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,13 +1,10 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 AUX zoom-videocam.svg 284 BLAKE2B fa118d489cafa1c14841c27ab4962c41d52987ee49b8ad0fb3e4c33d7cf376920e16a8f7358807d0809231fbf7ef8cafd4752ac90e85cc7395a56fbe07f6340d SHA512 a60345de0c86003dc49484fd5d3d22e3228b8b1c107796690289a7779769436809dd22b02b4951df2fc1e3a98c541dec4b0788ab7d112b2b9c8c29a46493a98d
 AUX zoom-videocam.xpm 806 BLAKE2B dcb9d7e2a90f564ed6b7f0b733efb72867ecf2418177b25ecd5a00e204ab9f0f89c2b1f3b3078b3cf326c8c523480f183170a82d896b73848e7596b32a351a9b SHA512 a49e7cce25e6b3a1492b2ed834f7fe8f533b5374b0c4eea4089003459ac011ef264175c5c2322cceb77f8fb67e939e90e9abddeef415d2f570add8301cd10a48
-DIST zoom-5.0.418682.0603_i686.tar.xz 38701696 BLAKE2B 0f7ca49317946efc5eb4260013d81475d928315538a1cb9b31bfc3dd608c506cf9d794e746e47355ce1fb294445d510d14fe216d754846fc3b23c9fd0c8543f3 SHA512 e73d57c2c13136ab15864e302a127f77f9d771cb280185b3b557819f52bcc7291995a44315436798febad9d557501306f70521f52197ebc9dd683be4ad488d19
-DIST zoom-5.0.418682.0603_x86_64.tar.xz 41610180 BLAKE2B f256c364c37b3ec4f5eae069d8e187343ae2e871140b2f297d414680c53d774dee9f6ed6002e25d4c014ce1ae75996ae8f3bf1ad4d34b38b5097e961eb53d558 SHA512 14ddc9e30a23eabef7391933dae953cdb3db07033b27210063f30e510c76c840cd13c94554ce182942346a8c419c474ba202bc311e0c4e9dfb773553f4726308
-DIST zoom-5.1.412382.0614_i686.tar.xz 38983088 BLAKE2B 253218aafb833735f036175f6c8dcd6ede6c0321ed1c3c3974ba9de2258d16a9a41d1f903e90fa03a4020ce8c6622dcd0d192aa8d02e4856b4c319f85d1fac10 SHA512 4823b9d2f0521f804130cf0f260c3d909d97f16521bcba18fb5dcf8dc79aea86871115f4f525248c7f59309b3edd8f0933f01d8224ed8e9c463660491fb4e89f
-DIST zoom-5.1.412382.0614_x86_64.tar.xz 41824264 BLAKE2B 74b8a3c3db2783702d0355824ed80694983d4f2265b4533add96188704b632d949f6490e8892912ce3a96b62f18b50ba7ca3421359325653011b0c98e0c3f1e9 SHA512 a6dbcf2cab992811eb346a2eeff5b1714ff289f0d1b8a3e9544064f6166750ee0d604db5b941ce7fa846b554a37cdb87c812a88de72c1ed773d7301e411b427c
-DIST zoom-5.1.418436.0628_i686.tar.xz 39038972 BLAKE2B 534cbddc1f45a1148f9c4deb66c74f0591b12c501fb8c1ad3c17a9459100aa633b19fa94dfd6adda487fbda5dd10d6519113fb293108c79247ac5f8da2843ac6 SHA512 d2a61ab2a8cc60c14c50603ecd795500acbcc8b35d651503a56b63f9b3284f10adff089b26dd1e466df8a71bdea786bc3b8d72431ba7435e4a23aad2ea3faf52
-DIST zoom-5.1.418436.0628_x86_64.tar.xz 41884984 BLAKE2B a1beb64bf590391423c992627448d001f8f5e6cb01f5b95bbfdd634a9e33c22efcf393a95db29324d7baa21fc6d7cd61fce4f1dcfaf9fd7ba3e9b765a531b3b7 SHA512 0c844b688bfc57f252c5acb0224df242c7467cb0d7172c7b430781576cd066a71e100d0206a4b12f4f8e4fe960f824596034964b3be5612293cfc88bdf998d2e
-EBUILD zoom-5.0.418682.0603.ebuild 2943 BLAKE2B 9b10620159da25e02039ebb9c23c5c18156deaee26dba141ba493a81c6d1726fbb0af5183ef3000077357b5d825e183c1ee6b24e559bef50d96c9a4209b0b779 SHA512 0005570d9996facff7712df8bf2d55adc418e24417017b7f819c36ad72ae10f69c40f4a1f800fba55fed139ce18e6e2425d2502ca03a931f7a29ab514b281a6e
-EBUILD zoom-5.1.412382.0614-r1.ebuild 2939 BLAKE2B a8223b3ee77ba5532194c9a2310ab170a3aa11ea432487238a7e8d9222fc87ac19cdd7526a5f51cac765b29fa1cdb5209bf9d22cc4020fdd6418051e41f43d5d SHA512 67fc6c1c05e44385d81960f216d48a683877703bec25ff5ec27c0378bf68c84f4f2f4f1628d10cc8783a0a27f8c6c28d1d02d028883196ee8995e91b05643ba9
-EBUILD zoom-5.1.418436.0628.ebuild 2939 BLAKE2B a8223b3ee77ba5532194c9a2310ab170a3aa11ea432487238a7e8d9222fc87ac19cdd7526a5f51cac765b29fa1cdb5209bf9d22cc4020fdd6418051e41f43d5d SHA512 67fc6c1c05e44385d81960f216d48a683877703bec25ff5ec27c0378bf68c84f4f2f4f1628d10cc8783a0a27f8c6c28d1d02d028883196ee8995e91b05643ba9
+DIST zoom-5.2.440215.0803_i686.tar.xz 39618100 BLAKE2B d0d99d846466614294573f28db1fa2d9643b278cfcfce5f66158411ed6d077309dc987ef5b2fb8a5d84cc8351a16deaa1bb59d024b5b4f480bbce0138c9314fd SHA512 afe53edadd5c3d44f299c14e677b7f12ac42933187cb9c076f47d7155a6be7505baf1165ed942de32295b7f2e1c1d8518847a9923234bd8b8b2c3bc607aa0d91
+DIST zoom-5.2.440215.0803_x86_64.tar.xz 42437020 BLAKE2B 32c6c47c84311a4a3173a26a00a0911894eeb2abbf537da9777405d59c61e1288ebd9d2f22e766579b72f3e5ef8acce79bb2a1ed4f3ffe122a1d0b06bfa25790 SHA512 b553d7f9d89a27a1845ae9e32d47e1ccec36c2d1093b3db2eb87e59a6b42436103ee651e13a5d5943df6545cdc6a19c994e8686e5bbe8df93503f5c69ae876b6
+DIST zoom-5.2.446620.0816_i686.tar.xz 39601408 BLAKE2B 0ee84298b705e7f066aec8825e6331785760ed521e992e66c18c74cfe7792a69c05f554eeed05a56ca5e8a891301df4d8f59b35bdb8920c87c748d016bf1bbf9 SHA512 1cbb60fed632ed3a71376f8dfa94ed21493c55e2eeb1c8341eaa5b91971d3eeb709baa6aaa4440bdbb6b381850835a72fc4282146b7711035a3ab1c057e4b647
+DIST zoom-5.2.446620.0816_x86_64.tar.xz 42281096 BLAKE2B e9a38668fef05ff49a7d78cbae94870175b167efd10d9969aec83ef1a3dda206a893a40326d013ed0bb334e7f38f212b5b0a348e1aef861a3e58d018e64812b0 SHA512 a31bf488670ac2d6af0cb75e5aa2ef4be02f18198e95b3fcbc58e0fc6dda20fc83ce4bbe6fc42a5d433c01625f9386424d2d7cde25d6615c679827355c068a83
+EBUILD zoom-5.2.440215.0803.ebuild 2939 BLAKE2B a8223b3ee77ba5532194c9a2310ab170a3aa11ea432487238a7e8d9222fc87ac19cdd7526a5f51cac765b29fa1cdb5209bf9d22cc4020fdd6418051e41f43d5d SHA512 67fc6c1c05e44385d81960f216d48a683877703bec25ff5ec27c0378bf68c84f4f2f4f1628d10cc8783a0a27f8c6c28d1d02d028883196ee8995e91b05643ba9
+EBUILD zoom-5.2.446620.0816.ebuild 2939 BLAKE2B a8223b3ee77ba5532194c9a2310ab170a3aa11ea432487238a7e8d9222fc87ac19cdd7526a5f51cac765b29fa1cdb5209bf9d22cc4020fdd6418051e41f43d5d SHA512 67fc6c1c05e44385d81960f216d48a683877703bec25ff5ec27c0378bf68c84f4f2f4f1628d10cc8783a0a27f8c6c28d1d02d028883196ee8995e91b05643ba9
 MISC metadata.xml 523 BLAKE2B f258ebdf8e4a2e067f202ede6324203b640c6a7fce843cc4b42cf4eef6efd97620e50c22c80f885d09254e403f016758d7dd3ba1deeef0c26692487a2ca9ba35 SHA512 9746752364f19f9e17516315231c8efef278f4d77ddcbfde213b5a65b012d6e320a20536e44ac5a111b2370a21cb59eb7a88c5c3fd2a1dd44064702d5e7bca38
diff --git a/net-im/zoom/zoom-5.0.418682.0603.ebuild b/net-im/zoom/zoom-5.0.418682.0603.ebuild
deleted file mode 100644
index 314ddbedc6b4..000000000000
--- a/net-im/zoom/zoom-5.0.418682.0603.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
-	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libjpeg-turbo pulseaudio"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	amd64? ( dev-qt/qtdeclarative:5[widgets] )
-	x86? ( dev-qt/qtdeclarative:5 )
-	dev-qt/qtdiag:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-sound/mpg123
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-libs/alsa-lib )"
-
-BDEPEND="!pulseaudio? ( dev-util/bbe )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r json sip timezones translations
-	doins *.pcm *.pem *.sh Embedded.properties version.txt
-	use amd64 && doins icudtl.dat
-	doexe zoom{,.sh,linux} zopen ZoomLauncher
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so.0.1.0
-		dosym libturbojpeg.so.0.1.0 /opt/zoom/libturbojpeg.so
-	else
-		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
-	fi
-
-	make_wrapper zoom ./zoom /opt/zoom
-	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
-		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	# The tarball doesn't contain an icon, so take a generic camera icon
-	# from https://github.com/google/material-design-icons, modified to be
-	# white on a blue background
-	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
-	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	local FORCE_PRINT_ELOG v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-5.1.412382.0614-r1.ebuild b/net-im/zoom/zoom-5.2.440215.0803.ebuild
index a795b31a6ece..a795b31a6ece 100644
--- a/net-im/zoom/zoom-5.1.412382.0614-r1.ebuild
+++ b/net-im/zoom/zoom-5.2.440215.0803.ebuild
diff --git a/net-im/zoom/zoom-5.1.418436.0628.ebuild b/net-im/zoom/zoom-5.2.446620.0816.ebuild
index a795b31a6ece..a795b31a6ece 100644
--- a/net-im/zoom/zoom-5.1.418436.0628.ebuild
+++ b/net-im/zoom/zoom-5.2.446620.0816.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-im
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)