gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /net-im
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
43 files changed, 420 insertions, 661 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index b14f2a542f52..077493437158 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee-facebook/Manifest b/net-im/bitlbee-facebook/Manifest
index 3c486de8eb01..6e301d82c07d 100644
--- a/net-im/bitlbee-facebook/Manifest
+++ b/net-im/bitlbee-facebook/Manifest
@@ -1,6 +1,6 @@
 DIST bitlbee-facebook-1.2.0.tar.gz 71718 BLAKE2B 967e2f4250e92c88a74e32b1ddda8d96327a6e190e4b17e416f20e27e7a07083ae8ff2e2006de6ab114a98d7f81deccf515aec9206a7f0a2470ae67f5c787662 SHA512 b815dcaceb9ee12a68cfe7401da503139ba92cb0396e8d52e5491fed04431d2c6e4cf667bcc6f457bc51b916c8dc1dc43dc277ff0a683a1c0d72a65e819fe5b4
-DIST bitlbee-facebook-1.2.1.tar.gz 71957 BLAKE2B 4694d5ea3df0a52b8dd7506d270f8257ec6950c35b90ed659fe65fa4a82128b3608733227fd1a1bc36c200879067ed3df5fd937efa1fb5932ad660b50cab5122 SHA512 6424931a93695c41816304177f13d3c02c1e7e352f8548a18a1245cc90b151123d31d354147851d56f6b42946c30c43eaefb6d2f296a8078067eb5c65c0da1d5
+DIST bitlbee-facebook-1.2.2.tar.gz 71918 BLAKE2B 674cb8565f88faff695d5b14010036f6d3c65bcdab9a6fba84c5f0d775a59d02abfd863be5af4ddc7c3361a49c6345d0ef57bbd8b02202b7e24e62b31c2c6844 SHA512 534e7e704e7ddd296c810819171b9c4770747dde109a9bbdfb41fc05602b1d9ad9bfd2ec6c7a62ffb0c85ec61252b1597217cdee7ccffd191da897a7d40085cc
 EBUILD bitlbee-facebook-1.2.0.ebuild 751 BLAKE2B f6e26cabe57d09ba3cf2764c9252d745b80297c59e62068b81ac16ac63bf4500004671d533111a28ca870058089f4a4753af7d3894d6433d8aa6d75a825a6e33 SHA512 5ffad5d5a76fceeb5f9264d0649cc39c6df296b1941a25a043ba5b975a9a6a1b8c2aa343deafd5ea0b822e5fdc6b88bf992a65530633fda60696282b022a363d
-EBUILD bitlbee-facebook-1.2.1.ebuild 753 BLAKE2B d02f8b416dd17f4346f3022df61931b8966273e5b067219e4abed63344f8468a06dd7422e586c103e8e53945f3f811b7de8c6943306e95eddf782259415711ab SHA512 c75e557dafcc05f8b1e8f4c7b64a6cc42f4cf89b4a8f4ba2d653992d0a83e8793c25ba16995670669206b198c0760367aa9fc92783f86b3da4726653ab31847e
+EBUILD bitlbee-facebook-1.2.2.ebuild 753 BLAKE2B e667e05da0c55343ad13a1148121038154d30e549f9f58bf1b3207649ec83293fda89d7661c3a9e21c9adcfd6c601a193fe09b3c7239b409bff28f40b31d244b SHA512 781e7cadaee1b83b8b1da3812d512fcc4ee074d8757e023741ec458e8759c772e60523fdf1c0c3c67e19307a3263cb35168b1a2dc7c76577aff802c550530b28
 EBUILD bitlbee-facebook-9999.ebuild 753 BLAKE2B 27a143ad5011f02145a6f15341da55b954272fea34a001c48bc2690255928bb81f636de9cb4310b9b54ea4c4d3637b3be818736e20cdc606deb17b94367e39fc SHA512 21302c339cbf958640919e11ea0e5417c581592bc5273e26fd7e2e3886234263f0e4e1942bcce913f478b5df153b6676846c03a730d128dcfd357c82042890ef
 MISC metadata.xml 635 BLAKE2B 81b252965440d5101d24114b1e971510c7f0322ef53d8a6ce65f79864eedcf8211e378eb224dbc5a83903c7ce263faf96787cc7e9340cd8d1bb8fa788564b72b SHA512 45a602ed7b8cc33f7e1165f2d22baed143cf38de06fc3f1064b847e47aff991a1102eda241f8350b4d95f355d41227d1335083f0433ec7c68c47337fe273c354
diff --git a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild
index 9e788483c50f..d28c1fce5d93 100644
--- a/net-im/bitlbee-facebook/bitlbee-facebook-1.2.1.ebuild
+++ b/net-im/bitlbee-facebook/bitlbee-facebook-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest
index 1c01c5e739a8..cd5240555332 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.3.tar.gz 437084 BLAKE2B 6652400cea6e11e83a3319a5058c334b99dfcd3f5524e03b97d0aa11df1fbf7297c182af1c9f0085271279a0704ca728297b4618e384f61335ab928772f9f9a8 SHA512 f86cd953cc967bd8474df110ac45ae315e1a5fca48b17a5395a7159384e4a99ecf01787e096a88ec8ec64e1f7545e754579c8ba2ac43cc072d93bf0e180e4133
-EBUILD coturn-4.5.1.3.ebuild 2295 BLAKE2B a480ab5de3dcb98a736138d44eecb3a5ea63e6e88186f7f87b989b40d603ec32ec454ce0aa7a65045ec760c74229932250ef7fab6574ad8643d42ebd5848af9c SHA512 970bece37537ce4be4d751dfcbeab04a7a508ef7f5fee84229f18585425eacd69599b634710a6f0213f796404d75dc1cc09993a35d9bbfced90105cf93941f55
+DIST coturn-4.5.2.tar.gz 442745 BLAKE2B c18d5f5cfedd600875c0bfa08b874ef6316a5aa9af34c27e2901825da412b794d437e08f0706f9651bdf6d3d19e151486af39a42f2326c7ab6bb802d33fd0ba4 SHA512 00e86a3a273a8e4e69deaefd338bdd6c44739a807f21a72a2d68efc089053e16efd1d5b34b0c6dea7a0fa2b66f70821d8c3e1107561e1f08dfac2c93933a6121
+EBUILD coturn-4.5.2.ebuild 2295 BLAKE2B a480ab5de3dcb98a736138d44eecb3a5ea63e6e88186f7f87b989b40d603ec32ec454ce0aa7a65045ec760c74229932250ef7fab6574ad8643d42ebd5848af9c SHA512 970bece37537ce4be4d751dfcbeab04a7a508ef7f5fee84229f18585425eacd69599b634710a6f0213f796404d75dc1cc09993a35d9bbfced90105cf93941f55
 EBUILD coturn-9999.ebuild 2295 BLAKE2B a480ab5de3dcb98a736138d44eecb3a5ea63e6e88186f7f87b989b40d603ec32ec454ce0aa7a65045ec760c74229932250ef7fab6574ad8643d42ebd5848af9c SHA512 970bece37537ce4be4d751dfcbeab04a7a508ef7f5fee84229f18585425eacd69599b634710a6f0213f796404d75dc1cc09993a35d9bbfced90105cf93941f55
 MISC metadata.xml 497 BLAKE2B 522928095883e077064a9971e45e4e644461ce6d7a07720920a7bc96afc326b6ab337aa64704518a866f0df276f5bc284660e81561874631ff84c395035051dd SHA512 62689abd67427c6dd3de86c139b2cb94f7dc3ba8c8f9d3fced5b91b6de36cd30caa1a7805c0dc3aa64fa35e154e4509a607ef7eae62fe6894084383b2226b8bb
diff --git a/net-im/coturn/coturn-4.5.1.3.ebuild b/net-im/coturn/coturn-4.5.2.ebuild
index 7f1a4140a40c..7f1a4140a40c 100644
--- a/net-im/coturn/coturn-4.5.1.3.ebuild
+++ b/net-im/coturn/coturn-4.5.2.ebuild
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 487ecbc6c7c8..df96034f4526 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -2,5 +2,5 @@ DIST dino-0.1.0.tar.gz 441638 BLAKE2B 08f332d38af866eed1049fae7d0e207da5a3486fda
 DIST dino-0.2.0.tar.gz 514257 BLAKE2B a4536372a806fa60e157a6492381b0204f33041b113dc26dfd4d494c86c96e5b94e928c400fde3198e481aecbfc79d0358979d4a20c550e35f762b3520e2f7c0 SHA512 296576f91d45a4dd8c548a7ca5b47bcaf847f6ff0f8e5dbafaa4eb49a2d4f1ed7e2bbfac94f1b32e22f5ec61b23748ac76b12bb4ceb710889aff166953ca7a2e
 EBUILD dino-0.1.0.ebuild 1597 BLAKE2B ddcce77114ef37406b2c31eec69eb8d38a7cd476c150f0c9305aabcb9afd2e5c6f46d6310a78a8811d0c04f98b154638982cc354eb03d1667d136bbb7bc782c9 SHA512 c67877d9465cd93175f6d591fde849cc6667c84ba0000848f5a40a1233583c1d59afbb90f82584d478e85a2b2a30788898062af77cd6dbaa3b5ff960b08120c5
 EBUILD dino-0.2.0.ebuild 1815 BLAKE2B 2bac790b5fa98c59ef5f51a9929fcb4f61a45dbfeb944a41285577746fbe451343e085def64d1337ece3d629cb57b735688ed57b73ecc65ca3feff11dc2bd0b8 SHA512 4d6a1211c7c5c4118ca536cddf736e6682bb8001769added6f434a0d4c1cb5255369e0fab7c070c440c694fc8d41ded3842a664b1cc6471a47e87d1a26c50d21
-EBUILD dino-9999.ebuild 1817 BLAKE2B b7ad5c532f0903cf7d10bcd074fd21d03d53e45fc9e6bbc451043b72ac94e1b5bfdfa9673abe2f476ef9ba68ee053f36036d30528ad84178b79a797b18a57122 SHA512 7776ff0776e00efa5a343a324246ab7d734cd99a34656608d56d3091bb6796955a042e489de6182f8d516891e4177d5007b24718d57230f192516f6cb6b852dc
+EBUILD dino-9999.ebuild 1822 BLAKE2B d787f85c4bd3af160c43f0a186acc5f9b1cc7a93de014bed90a8c1fcc0c0153dd147128792216c81e2c77bca6e2a03898cded1a473baf0fe8044ccf65c0d8d3b SHA512 f0f08d5db829cb8caf40942abc7447cf28512e5f6ac4cc95edca91d73afd720a10ef0ef359fdab198b047bee0b5dc15dbc7d2eaa106d007e2859df71a8a79d8e
 MISC metadata.xml 641 BLAKE2B 31f6c748c2bfe6279a574bf88b94caf476e1769159bdefc2fe4c35095d4e46cb30d6ad232f84cc614f83d1d319004398947fe65f0f9d1fc80dbdeef9497942de SHA512 a1b16eca16c3b7df169db8c7f8a2670cf97fab0c2913dad3ece312aa4e90429944148438b9d2bfd01661912ecffd950104b8324e83b691243841f810e6105ad5
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index 87038c75d2fd..b16ee80986da 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 VALA_MIN_API_VERSION="0.34"
-inherit cmake-utils gnome2-utils vala xdg-utils
+inherit cmake gnome2-utils vala xdg-utils
 
 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
 HOMEPAGE="https://dino.im"
@@ -23,6 +23,7 @@ else
 fi
 
 RDEPEND="
+	app-text/gspell[vala]
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/icu
@@ -48,7 +49,7 @@ DEPEND="
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	vala_src_prepare
 }
 
@@ -71,7 +72,7 @@ src_configure() {
 		mycmakeargs+=("-DBUILD_TESTS=yes")
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 008078bef012..bbb6a447465a 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1,6 +1,5 @@
-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-6.1.4.tar.gz 207370 BLAKE2B 187e87cc36393f85c1405a29d332d703cdd2ac9d9c6b50178ff7382bc5feb620b69a77dc21ce8144fc24045f11067865c7273118fc25ec1ad9afb93d6ccc635e SHA512 60cc8f070e2420e4ef5f0124eb6d03b3cf01c44e148ebb8b92f5b504eb6968c754fd82771da9528daab62c9e9f4d6ef97ab1063f1093163208521b26e36b2f2d
-EBUILD err-6.1.4.ebuild 2398 BLAKE2B 7473ede2525b2d21818eb4eb30b172f301f54ed72b744ea046ba9f3f60172dfbdf125d98a2650bd2001d4d86ba1b5b09279f47f405719bb359863ac600f69401 SHA512 1eca01501945beb4d87dec19657f64266335846da4d5fb8a8db63a76ec018b631fe91d462994397540ef5a8abe6b4bed44669fd47e83d44d939d8203eb334707
-MISC metadata.xml 380 BLAKE2B f7ff1d900aeb6780d50175a0305a1d625a7d46419afdf40e51217935efeca4eaf95436a16794d51f7589a0fa7f22a51802051029ffd63db1e74727bab2169d43 SHA512 54aef259890a22f028adf553b29b1b2e96363f6c53b4986b894cbd70511b8c7c372571053f6f6e4b7bdce16b0d8e22ac48d7fd7b8916cfe29ee4e938bc42057a
+DIST err-6.1.7.tar.gz 1359383 BLAKE2B 400bbf4a4180f74993a4414dc55f07a69b34b04277fecd073bd860df9dcd5da4873949df766c0c2f6b7a43b4e87153d0aa77b0abaf95bf9702d76c3c7b290abe SHA512 cd0dadc5ff380c71631bae7711bdba7345046fbe14e369c8efa8eed98752b9ea03f6e4fa3171df257a9d76686c610e28fac5f39f7e8e107348a5746e4354694b
+EBUILD err-6.1.7.ebuild 2301 BLAKE2B db443e087f79581fe8b2923c2ade30fbc2d5f895972407388aece1e8bfa49c8c6c5acd69c45a60286ea3a87c3be5b98fd18bebd9a1a67ac379ec30d6b6e3357a SHA512 a26edde9eb6479a18a216a3538551d1bd5a0c6f69600f55e3abb9e7029b5359ff8c29c3efdeff96119d12e8d97a587fb12b812348969c46aadf87d59da7e91ef
+MISC metadata.xml 404 BLAKE2B 48dcc65233789fccd5fb8e8c578416d5d4af4deb9c3263161ef95417f910d8e856cccebbc0362acd9cb4e8869a73d0a3fb0c9a648cfe23ae582c8ebf98144379 SHA512 dbe913214c697fdd99816bd2f3ccb190d557000cc489130dda73942aeb07e0843d6765e70859c7b7ca5217c3ec8cde26d45d02036f656f0520f1f2c0f2fb1ec5
diff --git a/net-im/err/err-6.1.4.ebuild b/net-im/err/err-6.1.7.ebuild
index 65c20b5d54fb..c5e128e55c30 100644
--- a/net-im/err/err-6.1.4.ebuild
+++ b/net-im/err/err-6.1.7.ebuild
@@ -1,41 +1,43 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
 
 MY_PN="errbot"
 MY_P="${MY_PN}-${PV}"
 
-inherit distutils-r1 user
-
 DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
 HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 KEYWORDS="~amd64"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="irc +xmpp"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
+DEPEND="
+	acct-group/err
+	acct-user/err"
+RDEPEND="${DEPEND}
 	dev-python/ansi[${PYTHON_USEDEP}]
 	dev-python/bottle[${PYTHON_USEDEP}]
 	dev-python/colorlog[${PYTHON_USEDEP}]
 	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/deepmerge[${PYTHON_USEDEP}]
+	dev-python/dulwich[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/webtest[${PYTHON_USEDEP}]
-	dev-python/yapsy[${PYTHON_USEDEP}]
 	irc? (
 		dev-python/irc[${PYTHON_USEDEP}]
 	)
@@ -43,35 +45,29 @@ RDEPEND="
 		dev-python/pyasn1[${PYTHON_USEDEP}]
 		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
 		dev-python/slixmpp[${PYTHON_USEDEP}]
-	)
-"
+	)"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}/${P}-slixmpp.patch" )
+distutils_enable_tests pytest
 
-S="${WORKDIR}/${MY_P}"
+python_prepare_all() {
+	sed -i -e '/pygments-markdown-lexer/d' setup.py || die
 
-# NOTES:
-# 1. Support for BOT_SENTRY option is missing, cause
-#    we do not have apropriate packages in portage yet
-# 2. Currently only XMPP is supported(IRC still untested)
-# 3. Internal web server is temporarily removed (rocket-err from requires.txt)
-# 4. pygments-markdown-lexer dependency(needed only for debugging?) is temporarily removed (pygments-markdown-lexer from requires.txt)
-
-pkg_setup() {
-	ebegin "Creating err group and user"
-	enewgroup 'err'
-	enewuser 'err' -1 -1 -1 'err'
-	eend ${?}
+	# NameError: name 'slack' is not defined
+	rm tests/backend_tests/slack_test.py || die
+
+	distutils-r1_python_prepare_all
 }
 
-python_prepare_all() {
-	sed -i \
-		-e '/rocket-errbot/d' \
-		-e 's/dnspython3/dnspython/' \
-		-e '/pygments-markdown-lexer/d' \
-		setup.py || die
+python_test() {
+	local deselect=(
+		--deselect tests/commands_test.py::test_plugin_cycle
+		--deselect tests/commands_test.py::test_broken_plugin
+		--deselect tests/commands_test.py::test_backup
+		--deselect tests/plugin_management_test.py::test_check_dependencies_requi
+	)
 
-	distutils-r1_python_prepare_all
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/net-im/err/files/err-6.1.4-slixmpp.patch b/net-im/err/files/err-6.1.4-slixmpp.patch
deleted file mode 100644
index ccccc171f238..000000000000
--- a/net-im/err/files/err-6.1.4-slixmpp.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-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 abf56ae3f09c..6c33b0c08be1 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<use>
 		<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
 	</use>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index aebe56c39708..7769f37ad4e3 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,5 +1,7 @@
 DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
 DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326fbf5b652ae15710bb46798ac8a1514dc2e1361e89bef4a80f43d5f64cf09879f3faffa927aa4407fe696b564 SHA512 297afa2b0ac44aad59b203907b1479fb8f004e2dc2a00681fa8034d76e4fb89ee3dcb4fb96011028382659bcb978cf214c396073d29b3dd0a7a711454915057b
+DIST gajim-1.3.0.tar.gz 9886259 BLAKE2B c9d0912f4d2cb76668978ca48fb1bc2db203cae7ea8dba7fd03c40d1cfee3da84131e2cd82ed6b27ed4c9a70a37328c57551fe1190e29bbd0c9a3cd6f9fa4a66 SHA512 4b68b97f6e4edcc2aa4b009a0131e4781c4ca52340ce98369154c602f7ee71e974e0840af0ae6ab28fc9e2fd34433ec0f304e10847e6cc257de3cde60b90b349
 EBUILD gajim-1.2.1.ebuild 2354 BLAKE2B 6f3ce6c6363e69d6be10a0fdbb20195b68a2ded9f037c9e40948e8897e4a0234f4c111fdb408684d50ea3f3bdbd886318263fe712a04e5317506436273c8b614 SHA512 da1f7e0e70fb08e81ac7ff9fed60f694af7002a77047c3c89f352aa30bf090929defc1a032fb3b410f4fa3c16c651060ccac1d2474525d4059d47e76c368405f
 EBUILD gajim-1.2.2.ebuild 2356 BLAKE2B 2b8063e45e51d32f0d2399f802c658f256a54be2f2e92d5127627ded7c367391a1899aeeb1b6fe456ea6a9acb722f2ac78c4aab4ffb335a69d1d9f8c53193721 SHA512 7902589bc9b94037bf8d4867b4ba9777900ba0b9ff8e75a5409efb63b7eb4953fd6cbfa228a77a01ef26f601203ef63ba61f565a4bf936b5acaadccaafb1587d
+EBUILD gajim-1.3.0.ebuild 2377 BLAKE2B 45da45a8eb0c7548af69ae436a732148c96d900523f408625d4db037ec3363ff6be23c0ebcfbd3c76244fd178ff5a0ef76702b632292181900dbe3a216ad072a SHA512 ea8e95ec72c246013699c595c174450d34959757c31dda003abf53a3f5ed965fdd70ec8307898610ea42d6751605e1bedde5de809cc06503554ac91af6980215
 MISC metadata.xml 787 BLAKE2B addb4c1ccffe612899495903543df528872a87ab0128459e34fdca346fa7c8c3fe45f27cba541baae9971eba00d282d77f88d964de5ebde47181a8d417d0ef60 SHA512 5425930f8c15ba0a4f9fb13eab27f11b6874453732b1fec601cf1811a796431ee7feaff62c7967f3ac1dfa4009b9acd5de1d0f42ef28543444e7cb887088be09
diff --git a/net-im/gajim/gajim-1.3.0.ebuild b/net-im/gajim/gajim-1.3.0.ebuild
new file mode 100644
index 000000000000..3e2cb3f1105e
--- /dev/null
+++ b/net-im/gajim/gajim-1.3.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
+S="${WORKDIR}/${PN}-${P}"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup[introspection]
+		media-libs/gsound[introspection]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+		)
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	')"
+
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index 4094670f6ebb..29b38102bca1 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,3 +1,5 @@
 DIST neochat-1.0.1.tar.xz 173204 BLAKE2B 6a52000cea4224f7ca192aa63bae6702dd8f406aeb1bd7c69ccac937314fc32488f4936ba6fe89332c4b2e339a3cb61402b616bb09df56784496f4cdcd98f618 SHA512 8a6c3544f878ce6b8883afa4ac384a70a1b0155e592071ba5affbbf63f1e7f89ccd362f11b1e4686737617339e8be24f0b6465f9a85d36357034b10c8a184756
+DIST neochat-1.1.1.tar.xz 195780 BLAKE2B b9eae0344d4e99c3b5ef9d7be0d633216fa989064c8499cd24b7fc65371bffc34551875a84edfabd2f359b091b588b04720309bb84b8fcfb1123f759bacd4dbd SHA512 ee50dfb7ba2aae8c6b03728e1326b03b0bc21df459397f137547b4684596fd07c42ae494037af894b2b37b53ade010463ee2f067ccede559ca868a723c83e17b
 EBUILD neochat-1.0.1-r1.ebuild 1204 BLAKE2B d6e845456e3193f843b418cc6eb4e62ac8845184df4531317f5c4c10eb6fd2064eacaf6d3f496036705c674f4d416a76c94925f1abbf81d680e08c7c348c2ec3 SHA512 3e7cda8f323446511b8f8a92152849c8fc3836086347cb809203b143dba3c24b3141ef14d94b3f66f6d54a494c21a8c1d22419b91d0b22283ff59b48e8fdb086
+EBUILD neochat-1.1.1.ebuild 1173 BLAKE2B 27f4c104ce792b84bf08e90c4f40f3033af954f798b84f1dbf73863cfe9ac1f0b95fb0b741cc7fdd260020b2294b2be38d8f0e27e980a7b0b05735e9dd0b7299 SHA512 ca788723c47b8e1fa59d9b2da5984b5eae8d96e60814bc12c16d67300d1ef42f3c98d6df02a87dd9ee1c3a9614494a49a4e1a338579358bf8d8b9120fb2e7d53
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-im/neochat/neochat-1.1.1.ebuild b/net-im/neochat/neochat-1.1.1.ebuild
new file mode 100644
index 000000000000..43b61fa9d9f5
--- /dev/null
+++ b/net-im/neochat/neochat-1.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.77.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Client for Matrix, the decentralized communication protocol"
+HOMEPAGE="https://apps.kde.org/en/neochat"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	app-text/cmark:=
+	dev-libs/qtkeychain:=
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	media-libs/kquickimageeditor:5
+	>=net-libs/libquotient-0.6
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+"
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 65b6901bf5f0..f05fca24e450 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,10 +1,7 @@
-AUX prosody-0.11.7-bit32.patch 599 BLAKE2B 880d11d8730f77322372efbfdb80c64a523844a47aae60a0f04b831262dc2e61c141247902b0872ff73fa02497dbfc75e3fc0cdbf9396c124c6c080bbbe181cd SHA512 e1783fceaca93acde37a3fffc5052eb9799faff59ce13e394358a21f24513e193ffa498218766b87718bac55f6425694106494abf05080203c5af01a52c03edb
 AUX prosody-0.11.7-gentoo.patch 1419 BLAKE2B 30a1ef43f6d3b00a07f621dc701e97ba45fb8b6d6ed67f95e5feff7bad32a4d037f0d00301c60bb05e1d5cb85bc1b78451ca0a989d7fda893f8b433ee50cc2f5 SHA512 9f5490ce156ef7d69f8daee7f274edc4d56da93dcbcfaf1a28f33ee8a0b5c6cb6a8f4f6f50cfd0cd3defad1ae90603803e6328ca3e160c4b3fa6aeadbd7104f3
 AUX prosody.initd-r5 987 BLAKE2B 3e381f48cbc9c5361bdc6cb9ab4a13daf055cd35389036b4ed2efb6df4c5ea5bb4ff43947bdb29d09b263a7eb0ed7ffeda8425723f4e0a76387245ae02a2661f SHA512 56e8e5524c6b383355bb1106ffaac614196dd48a8d9fd1f62ece87fbe6278f7d2ea7a683027dd6dcfeb2bc7331d84e95868f8c0501dfc7e11ef77aa08ebdde17
 AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafbf7f691c36910f41d0b81d701bf8f287aea89fa368071c0c94a38f56ff3134055eb01842b578d8b57991 SHA512 0499588d1fd6e970575785b4bdaf631428601bec8a57051558c1d4c82bc74462f17d7568b8d433b14f15c51c94b181f4240d9f4574d51dcfeda291f0a68eb6f1
 AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
-DIST prosody-0.11.7.tar.gz 429369 BLAKE2B 8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6 SHA512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20
 DIST prosody-0.11.8.tar.gz 429762 BLAKE2B e7c945d0f99ed02cd54175f989241ee4731677600db39475365d3a4227afe2fa2b6f2075e3820fa9b7840d65014f43f786fa218a60765f7be319ddd7d30b67d4 SHA512 b0b7e1d3e41f47f0f88ad5b76444e4959b20f4c7a937f3cc605ba6ed5d92e713a3054dcb61ee6629063883a8f9ff1a03952893de4a0d840dcec4e5e42079eb57
-EBUILD prosody-0.11.7-r101.ebuild 2955 BLAKE2B 79b0e89ed3b712a499b5bdb7524e0a4c50bfa3999175687a7bc9b54930889a23ed2c2dba904551559077bf81f9e9237adc1a46f08114b08270657fcf4fe16be3 SHA512 1b583aa0b5dc0b46416777f7a5a1fed9ec15b442bc719b37a095323f8a310deece2133b8ea2fe3387a867e356b7bcb6b08de9232701721c098a399eceec8809b
-EBUILD prosody-0.11.8.ebuild 2918 BLAKE2B fab8bf846c0a74d06a3034104483b34356c06d626de2ce0bc15cdc137c254a8a6066c43da520bc0fa36804f64018ec4c63341be0801d9f22d9c92692b5d6e1c0 SHA512 a4c3c0085304c2682bdd114e5b79a2cd306b9b58e4c9c6df137e96e316320ae8944c3a8d7174af9e2235ff0c5d6fbeb40d77e941bd57f6233a8eadc2e6f2825e
+EBUILD prosody-0.11.8.ebuild 2914 BLAKE2B c1b8845b8644a5216d62e7466c584c48044ed1a67cd4e17f65e6bf2410ef5532cbfee66983a97a0cb8e22a7c9b4a4f0d2190d5f539d6a679e312ce56f555fb94 SHA512 01575c6eb92ff715f31b3a00e92d198ccd74349b1455905a2eb134eca68663d46254ba4c0a70501ff6c20e4d3b448a3f317961ac44510087ea4cc677c170b779
 MISC metadata.xml 669 BLAKE2B e8f1d6b1df790563b92637351fe3f824f48c34b95234ad950b2376fcd010195d1d25d0023d468ab6ca98fc068df3e83db88513eb6c1a12a7b93426302516e71b SHA512 6336b469b3fee51cc6b2b7e23398430294ed7ce0b53525515d22dc1dd5f70b97a0388d654378d34fc809164aa5c9bdcd4a3d2078df75c2bac8a954f0fe549710
diff --git a/net-im/prosody/files/prosody-0.11.7-bit32.patch b/net-im/prosody/files/prosody-0.11.7-bit32.patch
deleted file mode 100644
index fb7b55f6bbef..000000000000
--- a/net-im/prosody/files/prosody-0.11.7-bit32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Kim Alvefur <zash@zash.se>
-# Date 1601928749 -7200
-# Node ID e17b98feb0b7cad6539ee25c5cc7728911349a6d
-# Parent  c3eefb517b7b934dbf4f78244c18f7e91b852846
-util.dependencies: Check for bitop library same way as net.websocket.frames (fixes #1594)
-
-diff -r c3eefb517b7b -r e17b98feb0b7 util/dependencies.lua
---- a/util/dependencies.lua
-+++ b/util/dependencies.lua
-@@ -90,7 +90,7 @@
- 			}, "SSL/TLS support will not be available");
- 	end
- 
--	local bit = _G.bit32 or softreq"bit";
-+	local bit = softreq"bit" or softreq"bit32";
- 
- 	if not bit then
- 		missingdep("lua-bitops", {
-
diff --git a/net-im/prosody/prosody-0.11.7-r101.ebuild b/net-im/prosody/prosody-0.11.7-r101.ebuild
deleted file mode 100644
index aee5c34cf355..000000000000
--- a/net-im/prosody/prosody-0.11.7-r101.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-LUA_REQ_USE="deprecated(+)"
-
-inherit lua-single systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a modern XMPP communication server"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="icu +idn +libevent libressl mysql postgres selinux +sqlite +ssl test +zlib"
-REQUIRED_USE="
-	^^ ( icu idn )
-	${LUA_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
-	$(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
-	$(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
-	net-im/jabber-base
-	icu? ( dev-libs/icu:= )
-	idn? ( net-dns/libidn:= )
-	libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
-	mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
-	postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
-	sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
-	ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
-	zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
-	${LUA_DEPS}
-"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-jabber )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.11.7-bit32.patch"
-	"${FILESDIR}/${PN}-0.11.7-gentoo.patch"
-)
-
-src_prepare() {
-	default
-
-	# Set correct plugin path for optional net-im/prosody-modules package
-	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--add-cflags="${CFLAGS}"
-		--add-ldflags="${LDFLAGS}"
-		--c-compiler="$(tc-getCC)"
-		--datadir="${EPREFIX}/var/spool/jabber"
-		--idn-library="$(usex idn 'idn' 'icu')"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--linker="$(tc-getCC)"
-		--lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
-		--no-example-certs
-		--ostype="linux"
-		--prefix="${EPREFIX}/usr"
-		--runwith="${ELUA}"
-		--sysconfdir="${EPREFIX}/etc/jabber"
-		--with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
-		--with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
-	)
-
-	# Since the configure script is handcrafted,
-	# and yells at unknown options, do not use 'econf'.
-	./configure "${myeconfargs[@]}" || die
-
-	rm makefile || die
-	mv GNUmakefile Makefile || die
-}
-
-src_install() {
-	default
-
-	keepdir /var/spool/jabber
-
-	newinitd "${FILESDIR}"/prosody.initd-r5 prosody
-	systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
-
-	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process prosody.conf
-}
diff --git a/net-im/prosody/prosody-0.11.8.ebuild b/net-im/prosody/prosody-0.11.8.ebuild
index 80d5d1f05938..8c7e3ac8fd5a 100644
--- a/net-im/prosody/prosody-0.11.8.ebuild
+++ b/net-im/prosody/prosody-0.11.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="icu +idn +libevent libressl mysql postgres selinux +sqlite +ssl test +zlib"
 REQUIRED_USE="
 	^^ ( icu idn )
diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 7be188b16dd9..3241f829c78f 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,6 +1,11 @@
 AUX signal-cli-bin-0.7.4-use-working-java-version.patch 1063 BLAKE2B 0564e3013bddf7bf8c8b350d7d0a2100256ba6c2be6752aa36acc1d7969149a5323c6eb1dee0cf3f92daaf391589442dfdf90a67c187542f900d1b23e62b4b15 SHA512 f71d5d0947bf4d5f94ebd77582868d6c9a097ffe63d7343467ae89815e0ee24136e84403c5867fa4f7827627271373c8e669d022e96cc16eb40fd164f8f0056a
+AUX signal-cli-bin-0.8.0-use-working-java-version.patch 1042 BLAKE2B 9ddc7a89f9f1e321c21afdd90af55be996ea9a0c2bb830ba3a14e49dc998e6195a57a648f2d212ea1622e63636eb803637a17a4f79ee6658984556f3af4b8bb1 SHA512 e040160fc989ec8ed9982b3e349de118487bf3380eec40cef89cc925074bfbe8ddfea010dfc0186529aa797191477c073cfaf751f8e3c07e86f7819078ece275
 DIST signal-cli-bin-0.7.4.README.md 4403 BLAKE2B 77b75170e18b302d8808a73297221d524b69ccd4fb66456086c7a9288ec2e023ed78de5baadd154c9ff508ba91c58abcdfa327931f559243d1b6f3efe99426c3 SHA512 7530e4a36ddc9d77e0cb7c8cec23aaaf3b7b7d1488ef86f675d7fb8b3debae1314d49ca23e1a68ff78ecfc58d9e00b28ff09f378fc7e9bc4bfc9e0ef883aa13f
 DIST signal-cli-bin-0.7.4.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2
 DIST signal-cli-bin-0.7.4.tar.gz 16408829 BLAKE2B 169e9e7b5eafb8308c248d976326fbd11f3044f2a73d32af8c62d5f6fd88929ac90ab331a188cf8376818102e59b5d0a11457494f3fca07ba830b5288aaa41cd SHA512 b7e2f1da17c2ebcb1174739cf9c287dd335fa70c1c9417137a07bcaf16cdd121cccfdd9ba345130bccdfe877e16d6dba9bf3ef1cb12d301fd3f674617233fcd5
+DIST signal-cli-bin-0.8.0.README.md 5216 BLAKE2B 18c481074db03bbe3895389f81bc76c2dba63cf728d7595567c2b19a35b5254009b83c1fd3e05be23d4d63990603f01a8270d59afd8397b8135d85f9102d2a6b SHA512 bd8bf9d329c6ec6b844b0a87e0b728352a615beca0e1c64161057911a76dfd942372a7e9b92e193b374e3773eae20331d19e33190547fd6072f79ae4afee9370
+DIST signal-cli-bin-0.8.0.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2
+DIST signal-cli-bin-0.8.0.tar.gz 16852501 BLAKE2B 2792935fa20bf6d31638157febfd771a254c2e962342236891cc0e8bc60a872af0f400852bd4b2cfc449a81e81dbdd34c19437a78df86d07a3648b748086fa85 SHA512 60029ff8b0013667743eb14340cb1367b527ebf2ba74a54fc2d1f70a21721fdb826c9af63a80d26f0dc951670172df7346a9bbea61a9e865e5625df10187c965
 EBUILD signal-cli-bin-0.7.4.ebuild 1659 BLAKE2B 4720e70365000d46662f81af3b0572a32e9bbff4f79cb945a09d0e882446b5822df460703873fd33fa5d70e16edea4e821956170935946c734eb37bcbef06ced SHA512 11b88ee9980735edd8b640959a548813c1f8eeb2eb314c6e0cf5b0444b49cc9a9b9bf6e0abf0cd42457b8a5ac57753b9615b4778441113129308dff7a81b5381
+EBUILD signal-cli-bin-0.8.0.ebuild 1675 BLAKE2B 2b199c6094f562de3e26b4f719bd2b5ca53f757eb61a9bb9153e201b6ff582602872a19ad2f04b8315d86a8c89e5beefdc504246ec97acdf9f245b64835363fb SHA512 72d08d761b0b95b3e354386c1eb15af43e43a7e21404085e7d11990b5d7d59d96ab696d58e19502c9cc6a97686af559ec39100c77941f7e3af884e268d569eda
 MISC metadata.xml 367 BLAKE2B 054ee8cf6ee573867495108fafe6931527427200833256fa96e7d8a7b9aacc9286d49bf12b6ac605862ec49b3b9760a98af1e24bd8441bf87ba549de27016974 SHA512 4d04a934e70460c817900d05ac9809c794cf44b13662eaf0f3b23999d7ba88561fe8ffcf60d5adf3f6c2d8ec06a50e34f92f642b9916fc411182a4f6323e2e4c
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch
new file mode 100644
index 000000000000..5d9bd2909968
--- /dev/null
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch
@@ -0,0 +1,33 @@
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+
+diff -Naur a/bin/signal-cli b/bin/signal-cli
+--- a/bin/signal-cli
++++ b/bin/signal-cli
+@@ -84,13 +84,20 @@
+
+
+ # Determine the Java command to use to start the JVM.
+-if [ -n "$JAVA_HOME" ] ; then
+-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+-        # IBM's JDK on AIX uses strange locations for the executables
+-        JAVACMD="$JAVA_HOME/jre/sh/java"
+-    else
+-        JAVACMD="$JAVA_HOME/bin/java"
+-    fi
++# This package needs Java 11, but Java 11 is currently not part of the gentoo eselect config system
++# so we must search for matching java binaries
++JAVA_DIRS="$JAVA_HOME /opt/openjdk-jre-bin-11 /opt/openjdk-bin-11"
++for I in $JAVA_DIRS ; do
++	J_TRY="$I/bin/java"
++	if [ -x "$J_TRY" ] ; then
++		"$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "11."
++		if [ $? -eq 0 ] ; then
++        		JAVACMD="$J_TRY"
++			break
++		fi
++	fi
++done
++if [ -n "$JAVACMD" ] ; then
+     if [ ! -x "$JAVACMD" ] ; then
+         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild
new file mode 100644
index 000000000000..39268d6e891f
--- /dev/null
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="signal-cli-${PV}"
+DESCRIPTION="Send and receive messages of Signal Messenger over a command line interface"
+HOMEPAGE="https://github.com/AsamK/signal-cli/wiki"
+SRC_URI="
+	https://github.com/AsamK/signal-cli/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz
+	https://github.com/AsamK/signal-cli/raw/v${PV}/README.md -> ${P}.README.md
+	https://github.com/AsamK/signal-cli/raw/v${PV}/man/signal-cli.1.adoc -> ${P}.signal-cli.1.adoc
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# signal-cli-bin depends on Java 11
+#
+# virtual/jre:11 exists but it's masked with this message:
+#   Java 11 is not yet fully supported on Gentoo. Packages cannot depend
+#   on it so these virtuals are not yet required. If you wish to use
+#   Java 11 then install openjdk-(jdk|jre)-bin directly.
+
+DEPEND="
+	|| ( dev-java/openjdk-jre-bin:11 dev-java/openjdk:11 dev-java/openjdk-bin:11 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-text/asciidoc
+"
+
+PATCHES=(
+	"${FILESDIR}/signal-cli-bin-${PV}-use-working-java-version.patch"
+)
+
+src_unpack() {
+	default
+	cp "${DISTDIR}/${P}.signal-cli.1.adoc" signal-cli.1.adoc || die
+}
+
+src_compile() {
+	default
+	a2x --no-xmllint --doctype manpage --format manpage "${WORKDIR}/signal-cli.1.adoc" || die
+}
+
+src_install() {
+	insinto /usr
+	doins -r lib
+	dobin bin/signal-cli
+	newdoc "${DISTDIR}/${P}.README.md" README.md
+	doman "${WORKDIR}/signal-cli.1"
+}
+
+pkg_postinst() {
+	elog "Please read /usr/share/doc/${PF}/README.md.bz2"
+	elog "how to register signal-cli with the signal service and how to send"
+	elog "and receive messages"
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index f78c250ab46a..9816bb3d8a41 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.39.6_amd64.deb 110644720 BLAKE2B be79e5c2145acbd5a8e4ee5e27238ff3f593ca4ac8d5560802ad9cdb4fb945963a693b51871f76245c7ed55157c34c2c805c575cb45b764ac09a34d80f8ed547 SHA512 49fa8745c30d59ba3fc5cb1b0a28117e416d77cf51183f47dce99545b4ee850a92585ef6778c38a8498b1c6dca7f35cacb0babfc4645a8a8b1be4e5ae857e699
-EBUILD signal-desktop-bin-1.39.6.ebuild 3661 BLAKE2B a61fe600f2bfc1cf26eea3eda37a28c88407e1ec2034c5335405a5b10b4efb5bc7fff4f0c6594c0e4c5076e442e604d82da82b7a2f304ddeaff89a3cdfd2a11f SHA512 11294fef5b854d84362364a6122545d533cce8fed9b979e0a74913bef8d859941fcaebecc9f94e4b90c487a1f4db31a18bd5cfbed3f46a2f9e9c6aa72ee941d5
+DIST signal-desktop_1.40.1_amd64.deb 109871658 BLAKE2B f2ac08327943112e8bc00f191e9e75392837ad6cf1f3460b9d02f76b589eb23fc9d0448b92d56292982c4b6a4a50e81d7b7f22ec09acde3c5daec57fbc935deb SHA512 dfe2c0e3244e37bdf02df2340d2cadd98f907c027d671fb0eafb8953d676ea28e1b3344e3f84e93e30844cd1d0ce3766b5620059029b313c1b2cfbe6267506d1
+EBUILD signal-desktop-bin-1.40.1.ebuild 3541 BLAKE2B 2ca67dfee2ae825375ce3a0ba6b31c965545c66b38c16b782f8a420a320be5e9df1e861e746663dd552324686cf7faed308f382b9b826ea73bdfb57248f77d08 SHA512 4c7d53251ff79f942da2bd3405f183f8a40b3209dbe0e1bcecfa58e1d1b9ba371abec732c3672fb425efca70ea5307371a42d0bbcecd1cfeb5728dc842aaf62f
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.39.6.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.40.1.ebuild
index 8c09f422a51b..f39a92c2d0ae 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.39.6.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.40.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN="${PN/-bin/}"
 
-inherit optfeature pax-utils unpacker xdg
+inherit pax-utils unpacker xdg
 
 DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
 HOMEPAGE="https://signal.org/
@@ -17,7 +17,6 @@ SLOT="0"
 KEYWORDS="-* ~amd64"
 IUSE="+sound"
 
-BDEPEND="app-admin/chrpath"
 RDEPEND="
 	app-accessibility/at-spi2-atk
 	app-accessibility/at-spi2-core
@@ -35,6 +34,7 @@ RDEPEND="
 	x11-libs/gtk+:3[X]
 	x11-libs/libX11
 	x11-libs/libxcb
+	x11-libs/libxkbcommon
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
 	x11-libs/libXdamage
@@ -57,20 +57,25 @@ RDEPEND="
 QA_PREBUILT="opt/Signal/signal-desktop
 	opt/Signal/chrome-sandbox
 	opt/Signal/crashpad_handler
+	opt/Signal/libEGL.so
 	opt/Signal/libffmpeg.so
 	opt/Signal/libGLESv2.so
 	opt/Signal/libnode.so
 	opt/Signal/libVkICD_mock_icd.so
 	opt/Signal/libvk_swiftshader.so
+	opt/Signal/libvulkan.so
+	opt/Signal/swiftshader/libEGL.so
 	opt/Signal/swiftshader/libGLESv2.so
 	opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/electron-v8.5-linux-x64/node_sqlite3.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux.node
+	opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node
 	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
-	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/*
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/8.10.5/lib/libvips-cpp.so.42
+	opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/8.10.5/lib/libvips.so.42
 	opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so"
 
 RESTRICT="splitdebug"
@@ -79,13 +84,9 @@ S="${WORKDIR}"
 
 src_prepare() {
 	default
-	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
-		-e 's| --no-sandbox||g' \
+	sed -e 's| --no-sandbox||g' \
 		-i usr/share/applications/signal-desktop.desktop || die
 	unpack usr/share/doc/signal-desktop/changelog.gz
-	# Fix Bug 706352
-	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libjpeg.so.8.2.2 -r '$ORIGIN:/target/lib' || die
-	chrpath opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/lib/libffi.so.6.0.4 -d || die
 }
 
 src_install() {
@@ -95,7 +96,7 @@ src_install() {
 	insinto /usr/share
 
 	if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then
-		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop
+		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die
 	fi
 
 	doins -r usr/share/applications
@@ -105,11 +106,10 @@ src_install() {
 	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
 
 	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-	dosym ../../usr/lib64/libEGL.so opt/Signal/libEGL.so
-	dosym ../../../usr/lib64/libEGL.so opt/Signal/swiftshader/libEGL.so
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	optfeature "using the tray icon in Xfce desktop environments" xfce-extra/xfce4-statusnotifier-plugin
+	elog "For using the tray icon on compatible desktop environments, start Signal with"
+	elog " '--start-in-tray' or '--use-tray-icon'."
 }
diff --git a/net-im/skype-dbus-mock/Manifest b/net-im/skype-dbus-mock/Manifest
index 7c1ac09c81fe..6efd27a00af8 100644
--- a/net-im/skype-dbus-mock/Manifest
+++ b/net-im/skype-dbus-mock/Manifest
@@ -1,3 +1,3 @@
 DIST skype-dbus-mock-0_pre20181011.tar.gz 2851 BLAKE2B fbb2d476d6a0402ea6ac70198d0aac87c24d7c9815fe27b03631625df10f24c71634f7f22eec2256869746cbf9d308ab3275380a755455ebbbb23ad2adcdd5a2 SHA512 d566a91cb279fe07626744e6196e3dcf7b36a5535bb8fe3cd7e6245d874bdf82f7948bd7f476f73c72f972894ee250d89a9eb055fdf55af9cbe97b1b05e39e16
-EBUILD skype-dbus-mock-0_pre20181011.ebuild 966 BLAKE2B 0cf4d2de2a2c742b8b357e78dd33f20b49790d77215b060d76bc2a5c44c57ae3d2425e42b0432302c0a9bdbe79bc5cc408dd8b88259f735acb37fa3a9679049c SHA512 21d605a82bb093949233a247ec58dba649163a2e1912c5a2478904e235b0b97e352e7706f147fe628e54d0c3eb28168b352ac1cea54f78e61cb35ecf69189729
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+EBUILD skype-dbus-mock-0_pre20181011.ebuild 969 BLAKE2B 19f5cd997f4c3c1f45b01e4d018b8b029983fc3229afcab3aec6909b9c541b561265110b7cec7efe03dc2e69d56856572eb9a4d564cb75a960e793edcd2a7a7b SHA512 d1dc5d5540b3807fd7a6ef08ae4259cf1245c2ee76296a336d3320c46816732549a0ca3e001bef4d863678f66ce615fb005923f30f82564ca43a62fb139fe7ef
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-im/skype-dbus-mock/metadata.xml b/net-im/skype-dbus-mock/metadata.xml
index 1b2becffa26c..7a38bb900964 100644
--- a/net-im/skype-dbus-mock/metadata.xml
+++ b/net-im/skype-dbus-mock/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild b/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
index 17ee7b2353b9..10a65d6831c3 100644
--- a/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
+++ b/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild
@@ -1,34 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-r1
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-single-r1
 
 GIT_COMMIT="3a9e2882ac5c0ad6be3c5cb5c7da008b4cfa51da"
 DESCRIPTION="Mocked systemd dbus interface for skype 8.30+"
 HOMEPAGE="https://github.com/maelnor/skype-dbus-mock"
+S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 SRC_URI="https://github.com/maelnor/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]')
 	>=net-im/skypeforlinux-8.30
-	dev-python/dbus-python[${PYTHON_USEDEP}]
 	!sys-apps/systemd
 	!sys-auth/elogind"
 
-S=${WORKDIR}/${PN}-${GIT_COMMIT}
-
 src_install() {
-	newbin skype-dbus-mock.py skype-dbus-mock
+	python_doscript skype-dbus-mock.py
 	insinto /usr/share/dbus-1/system-services
 	doins org.freedesktop.login1.service
 	insinto /usr/share/dbus-1/system.d
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 43856b29cbe4..390364b61251 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,3 @@
-DIST skypeforlinux_8.67.0.96-1.x86_64.rpm 113616838 BLAKE2B aecf6d8f24836d2d6ef23b80b79796cbe5e309af862eac5e8caa0436e6cc8f10de5fd6337901c70a4b5b5c6cc3d7d15f6b0225b86187db800c8374762adf0313 SHA512 8d1c35026bbe90a2492f3ac88cc8fb2f098258050cf263121a06b9c9e048bda18774582d669d9a9177d8cfcaaa66a615b206587e74b371ef80b089dfecbb9a2e
-DIST skypeforlinux_8.68.0.100-1.x86_64.rpm 113061038 BLAKE2B f8d04c1d1727e6e90527d3ca820f411f6358b152f15960f1673d07da9e20cd784c230084a539bc3cf6d96b025c6a34bedc814dc9af94826d51746f13e6a56a64 SHA512 457f2ff3a904776b3b03ea06004e81576d1394aa5adae80bd3fb6c46e319188c5733d7da820b5eead987e5530caba9c75090ce7ca8f108ad19786b76affd3cb8
-EBUILD skypeforlinux-8.67.0.96.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
-EBUILD skypeforlinux-8.68.0.100.ebuild 3117 BLAKE2B f86fd9f5d06faf193363c05a558970bee5204162d426491f2a1ef3690fc5267f7c9d91e0bca1124af40e3c3b84c33da9333847077b00b4a7a9066942c22572b2 SHA512 fba2e33a98ad2f56d6997a814918709f3215793eadb1a7b2d37398d738ab4684e3434724db17ba0ee139b174038436abe15d14c5273f82d5e6e1155b758d132c
+DIST skypeforlinux_8.69.0.77-1.x86_64.rpm 117875764 BLAKE2B 8f817c595b09f5e9c0e0ca10c2e34d76cc3d56da115950adebe6e43ca7d8715d2a20df862a76fd51fef639cc0664ba3b19976b93406e98da50b8ec07a7323c39 SHA512 a04a2e357192ee9390ebeb00aeeec3a230eb0b7b3cf00f32aab1323dfe61b8ebf980a459db779f1b14266c5b7ff9b1f749ce1bba56025ada06d137ff552db35c
+EBUILD skypeforlinux-8.69.0.77.ebuild 3117 BLAKE2B f86fd9f5d06faf193363c05a558970bee5204162d426491f2a1ef3690fc5267f7c9d91e0bca1124af40e3c3b84c33da9333847077b00b4a7a9066942c22572b2 SHA512 fba2e33a98ad2f56d6997a814918709f3215793eadb1a7b2d37398d738ab4684e3434724db17ba0ee139b174038436abe15d14c5273f82d5e6e1155b758d132c
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.67.0.96.ebuild b/net-im/skypeforlinux/skypeforlinux-8.67.0.96.ebuild
deleted file mode 100644
index c2755ee5b06c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.67.0.96.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.68.0.100.ebuild b/net-im/skypeforlinux/skypeforlinux-8.69.0.77.ebuild
index 01550d2ccb08..01550d2ccb08 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.68.0.100.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.69.0.77.ebuild
diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index 02990d7079d3..93bdf288594e 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,9 +1,7 @@
 DIST slack-desktop-4.11.3-amd64.deb 57956414 BLAKE2B 3b1c2d5574fe52e27e2d489c9e4b28e28e36fb6afc2b9b18cb23352a311748be09998893dc02a78f296363fe86c6b4c36375429537c2e1d03c49457d25d4de32 SHA512 67a52a83503f273a5e3eedf8fecc83c21f249076e553537a3bacdc1d410bb435c31189c678aff9011271723918d46ba6caf82f0c2fb0c6f1cf571b11b49e8af1
 DIST slack-desktop-4.12.2-amd64.deb 57734610 BLAKE2B 249565bcb3f5fd9467d2b48e683978f406be6e3fd77f56c8e6ee328a3745800e53504f9bd618ea1764ffe429256ca5610b53996f82442e399d47f46ee5991b78 SHA512 7c0ef6e007f67c9a95c43e6544536af35d9bb55008524dade5b707aa4473db8e0837547bb91f8398728fcdc9e4ec732655cd390b49f1b5f820dc3f0b73ef9f71
-DIST slack-desktop-4.4.2-amd64.deb 54818266 BLAKE2B 12ce6cd423081b64919c511562c0508126d4e10f13168630b00d507c0c4b33f1291d158198ad9050008d43bd69755dd79dfa004443f83495aed7728560f318a6 SHA512 7680116ac8e438cea614484c814ed2903aab5432f8901799fdc2772471ca385a5a93d2dff43abe441ca4d4be0cae5d56c54119fb456483cfbb12c5621955f988
-DIST slack-desktop-4.4.3-amd64.deb 54827638 BLAKE2B 4847b2366b6039c41327884ffa5d74146c9d87e5e11cb6324cd8b13632c1cd94b14d72b09396e3bec321b21ff9756f1a6915b99fa3e89fa9daa544442272e7b8 SHA512 c2b9462738f6cbd8a29e75ebbac497b573676f7d95b69aca181320618a3bd1e34fd22c2b53426972cc425899afae50f4290a5754f0664b669ab6fdc1b28d1330
+DIST slack-desktop-4.13.0-amd64.deb 57716072 BLAKE2B b8f1a793239b1e101bb6eb738a8a75883bf67468886f954226552074b769355b5444bbe9273eed48575b5f245fb47bdc78e264e7329ef052305afbec88f496f4 SHA512 d324637cb96a73f6d93fb36cfee52625d9c3571115ca6a8f0e7891417dd5fa88172dcc001e1a4fc9396392fe4885c5b14d9618d82c6a97b7c688ae14f5cbe8d9
 EBUILD slack-4.11.3.ebuild 3010 BLAKE2B 2924c4d78bee81ee983dd6f712736d2e8221c95c59e76e40afeed0cac46d324dc6bd5247fb489cf578f60b6883937431a862e25ff32746fdd3b8428b3663c526 SHA512 fc49079951bddca82537a47f31253974c6c4f1b5b5269404838bf65327cfbf2dc91228412baf3aec8783e931c6ff1a575b77537d12b9a450852ce1837d975970
 EBUILD slack-4.12.2.ebuild 3010 BLAKE2B 9e164820f8f25e9eb7640608f3652130f9de7f993a71e7154d98f290113c90d0af2d835e5630886c542a68d61cefb6870ced56343285d4da2ec2326273d1bf4c SHA512 24160734c4aea7e319408faf479590df67ca45efe4d1c6c989df5cd5449c6e3698321ca29c5b05da5daf7e2b7dd62964ec58e8cd494164e7fd710397da28be21
-EBUILD slack-4.4.2.ebuild 3472 BLAKE2B 4824a79fd697889e56e232691f2fc30d552e21901259566479becfb80a0f57561ab21814085bdf472169b815e28e93c6afd7918ff98c22b9aa540b5592e157d4 SHA512 ae334d500b5cac4e20d97c3c990719251cb6a2938d4f8daf3af197b014afc4c41a809945e332a99268bda98c87e96a123d34e77aabc22547eb6c866dbc9464b3
-EBUILD slack-4.4.3.ebuild 3336 BLAKE2B 2accc46f29cd9999ba7e9024a90fae234b486cbc622978d66bb20efae3e6a705497bfbdc0a3f7c15f28c9ef9b70a065b5a8e9eb731ea661ca94fdeb000a6f1e3 SHA512 3a3ccea51349d83aa0d6527fa4d18fbc185007db21b32fdda556b88f5a306a3e94ce0a1f201e5f9fd7bc352baad4550cd03deaa50992b0901f42b274a972aea9
+EBUILD slack-4.13.0.ebuild 3170 BLAKE2B 13feb15ddce19b03df8d91327a761c1853f37cc5cd22676adda57b6fd9a62364a78f1c381e37480fd942282e594e29a8a3946cf956886601810c0ea0dd044151 SHA512 daae0fe1ffd7faee3cab0a940987a47a3c7438195df4c34f483b0eb2b1bf33404493134839a12e2912ba5a367f5de030f9cbc6a8e086d41990b3750de492b736
 MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack/slack-4.4.3.ebuild b/net-im/slack/slack-4.13.0.ebuild
index 8aa28b78c115..ddd396fdeba5 100644
--- a/net-im/slack/slack-4.4.3.ebuild
+++ b/net-im/slack/slack-4.13.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_64 )
 
-inherit desktop multilib-build optfeature pax-utils unpacker xdg-utils
+inherit desktop multilib-build optfeature pax-utils unpacker xdg
 
 DESCRIPTION="Team collaboration tool"
 HOMEPAGE="https://www.slack.com"
@@ -28,23 +28,19 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
 	media-libs/mesa:0[${MULTILIB_USEDEP}]
 	net-print/cups:0[${MULTILIB_USEDEP}]
 	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	sys-apps/util-linux:0[${MULTILIB_USEDEP}]
 	x11-libs/cairo:0[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
 	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libdrm:0[${MULTILIB_USEDEP}]
 	x11-libs/libX11:0[${MULTILIB_USEDEP}]
 	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
 	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
 	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
 	x11-libs/libXext:0[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}]
 	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
 	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
 	x11-libs/pango:0[${MULTILIB_USEDEP}]
 	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
 
@@ -52,12 +48,15 @@ QA_PREBUILT="/opt/slack/chrome-sandbox
 	/opt/slack/libEGL.so
 	/opt/slack/libffmpeg.so
 	/opt/slack/libGLESv2.so
+	/opt/slack/libvk_swiftshader.so
+	/opt/slack/libvulkan.so
 	/opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
 	/opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
+	/opt/slack/resources/app.asar.unpacked/node_modules/*/*/bin/linux-x64-85/*.node
+	/opt/slack/resources/app.asar.unpacked/node_modules/*/bin/linux-x64-85/*.node
 	/opt/slack/slack
 	/opt/slack/swiftshader/libEGL.so
-	/opt/slack/swiftshader/libGLESv2.so
-	/opt/slack/swiftshader/libvk_swiftshader.so"
+	/opt/slack/swiftshader/libGLESv2.so"
 
 S="${WORKDIR}"
 
@@ -97,13 +96,5 @@ src_install() {
 pkg_postinst() {
 	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
 
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postinst
 }
diff --git a/net-im/slack/slack-4.4.2.ebuild b/net-im/slack/slack-4.4.2.ebuild
deleted file mode 100644
index 1c126432182f..000000000000
--- a/net-im/slack/slack-4.4.2.ebuild
+++ /dev/null
@@ -1,116 +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 desktop multilib-build optfeature pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://www.slack.com"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="appindicator suid"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
-	app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
-	dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/mesa:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	sys-apps/util-linux:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="/opt/slack/chrome-sandbox
-	/opt/slack/libEGL.so
-	/opt/slack/libffmpeg.so
-	/opt/slack/libGLESv2.so
-	/opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
-	/opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
-	/opt/slack/slack
-	/opt/slack/swiftshader/libEGL.so
-	/opt/slack/swiftshader/libGLESv2.so
-	/opt/slack/swiftshader/libvk_swiftshader.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# remove hardcoded path, logging noise (wrt 694058, 711494)
-	sed -i  -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
-		-e '/Exec/s|slack|slack -s|' \
-		usr/share/applications/slack.desktop \
-		|| die "sed failed in Icon for slack.desktop"
-
-	if use appindicator ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt/slack
-	doins -r usr/lib/slack/.
-
-	# this really should be done a better way than trying to parse
-	# the QA_PREBUILT variable
-	local path
-	for path in ${QA_PREBUILT}; do
-		local -a paths=(${D}/${path})
-		for path in "${paths[@]}"; do
-			fperms +x "${path#${D}/}"
-		done
-	done
-
-	use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	pax-mark -m "${ED}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index dafad4624046..9d80b515580b 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,8 +1,11 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-2.5.1.tar.gz 14954825 BLAKE2B ab43f1aee44bd2827159d6355c31007f05bf4b9e66631bf282bf631bb7dc58dacdcb23631b21040be3ea6dcc635a3b988c27cf7580b2eaeb908a8720d4322daf SHA512 430167f7231697bed69e4eb51488376460cf71de0bcce4d6ebb14c87c55b9461d00a6cc82f7861c4f1e8aa374bf95404385e93a05eb46eda8eec4ce87998735c
-DIST tdesktop-2.5.8.tar.gz 15032225 BLAKE2B f35cba316858c8434b7f206b0f70c0e8767bdfe90803c1d4e56e712cacb593617a30690bfe1cbfb140feb531c6b1336cfbfa95af91c61101a4b89c245b79fb9b SHA512 ceb488e2a25b80b4203eab2ed21c60af83c55aec1754955e19667ea7d1a2403aa8a4ef05c48627de1030e79041bcc1191ac8e79ea8bc5cabcbd6f675ac2b28c6
-DIST tsetup.2.5.1.tar.xz 34642524 BLAKE2B be850b57f2d9daf96dc87825bac4b2ae9934050c26bfc55f959c0a8ab293a0000fb18b50edf7b147ef1c027c6e3871b279df83347240a3c7137ef03bb26a38f5 SHA512 7b830fbc9b0dcf465c76f44361e5d64e2d11878a7b7ef29648244672b3383b389725df6cdf07909b87d0361dca91e524345ac0ddf2868fefec2cdff2aa65bf76
-DIST tsetup.2.5.8.tar.xz 35131968 BLAKE2B 3117af3521a4f52d1aa0431313d554226364f5dbab90a74b574b73a8adc7b95bea153284970e53db2285d08c7774e16a38dbf9b4b295fb3aa5e81b2dec7df8fb SHA512 58c03f55edc51107d20a3dc2b158e39c214d641e931227f7fc78a6bb8d3cb3f597d53a52abb471c006e0b65722bde8f252d67e4be7e3add94545333b69ca7ad8
-EBUILD telegram-desktop-bin-2.5.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
-EBUILD telegram-desktop-bin-2.5.8.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
+DIST tdesktop-2.5.9.tar.gz 15030323 BLAKE2B e31695f4015e6194c08153da074a90ef5110511cfc616134dd8581db876ca5e31ed47d08e0be4a0cd5840e49405b36f60122e101fd50e4da35dc31cf3d2a1b2f SHA512 0f4d691dbf7806634c232d636292ae035fe5a7585279baae04aa504fb9921c8b077033d2401c310314c79aba08e26e0fa5f8c80f35b52249f41eaa9cfe90ce37
+DIST tdesktop-2.6.0.tar.gz 15071641 BLAKE2B 48257e4c9f8a74970a04d928bac43e4a12e21a45ab2c83545d8a8697d684c9b9a2b25e5e9b48da5ed02ea320d28a45b87a06d95362605587b0be35746af34cfb SHA512 641495eda1858021b2bb22e6dd8b7bf30d016b644143f2629324a89988b544f4ebe7a03100c9a228eaa0dd333e73dc145bdf16a5cc6563ebe1f9ad6ccba54073
+DIST tdesktop-2.6.1.tar.gz 15071996 BLAKE2B 927c571e8a35c30cdf0c974895e3a7d2a3257077959e9a6a0b7b5c819833a83cf6d5e7136f0e8909490310cac01863de88bf3ebd2c82fe60c8ed85f988ed3887 SHA512 abd0630c4bd979cdc36b61c7c9b3223f7cdc090805d88f6a3173466b092934a3400313c7af3a170c5b116ec2aefa7577d008cd41085a94aca5e20759a3957995
+DIST tsetup.2.5.9.tar.xz 35175576 BLAKE2B d618739aa05c15ec75632593103588149c819906ecad86c0c984d4fbb6ad994e3d2f2fc9d3552dcf15673f980f707636698c5a706694c6ea6fbd694d2df845ca SHA512 be6a619c5d0818e56e6d23c0a20c90616333fcdd83caadc302339e9edcacb39618d67c5c578eacc5eec251c04412546303c3e7156f29b841fa759ab6b2ebbd2c
+DIST tsetup.2.6.0.tar.xz 35297664 BLAKE2B b8069f1723d62bd6af20d909cd97d8b6bf4519f6755bb00ae0ba92b00539129e16ccf94185c02e686136f6764c865a16f60b3caf206b087e9751696942a1694b SHA512 7731098eaa588b6fddcf90ddf09882d47949a4130aee2a90268878fba25dc0e151c04c19316b1cd249ccb7c78b6a3537a5731c064b7c48cfeab8c99165b82d12
+DIST tsetup.2.6.1.tar.xz 35300412 BLAKE2B cf4e616c4957b8a6ee91b621a79556a588c5d736583457d4fa35c3f0b4266b929f41b488764330c5f5d06314ac57a853613f9fcf70e5d129dceb9ac9e8059c8d SHA512 f8b9f78b4d7f6cf886a9368731733f598749babf6ed50541b5332dfef20ccc24616f399448d17cc523409b6e1dcdd2c137bbe0e5eb13e4e9ade902a6e26cf1ea
+EBUILD telegram-desktop-bin-2.5.9.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
+EBUILD telegram-desktop-bin-2.6.0.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
+EBUILD telegram-desktop-bin-2.6.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.5.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.5.9.ebuild
index 6821536278c0..6821536278c0 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.5.1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.5.9.ebuild
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.5.8.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.0.ebuild
index 6821536278c0..6821536278c0 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.5.8.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.0.ebuild
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.1.ebuild
new file mode 100644
index 000000000000..6821536278c0
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature 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 )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=media-libs/fontconfig-2.13
+	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]
+"
+
+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 4c65e9de7d4f..cc977e4ffb6c 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -3,4 +3,4 @@ DIST tdesktop-2.4.11-full.tar.gz 36405312 BLAKE2B 7c4239d4a2193c910aeb918f40d4c1
 DIST tdesktop-2.4.7-full.tar.gz 36355613 BLAKE2B 5b60bddd81d5472aaa303817be280604d5dcb4a5f7260c6b6fbd7ca075a46972adb4439e58e2f5b7877c10b3cb6420a7bc95ffe36ab0b3cf531a46758046f7c1 SHA512 712ab6896f89f7df0c7ac297039ee3b3532c159e17f66e4539b701a35d04d4709b558755d592d3cd91df541a2d2ca9f0485cf073c32f0b69a18848ab2ccd1993
 EBUILD telegram-desktop-2.4.11.ebuild 4958 BLAKE2B 2c28fe9a6e28f5eaac308e27dbff4a80ccb68419418c2786070e77ca020f11e6a4c6ea9188be4ac68247fcc39f9246f00ff367b55a1f97b791e2af47a98bc22a SHA512 0fd7bd8e2394ad123ca6d67125d6dd44a8ca575fc1109450e4d883ad8c0d777de603c7d3ae606e1d8681afc741b6d31c85446f2e37e600eda009b55f10f0f278
 EBUILD telegram-desktop-2.4.7-r1.ebuild 4879 BLAKE2B 424614c2d79701c27eaa4c4d384511467567a5540bc5bbe46155f9eef2ef8003f5b8436e6dd2bab7b66ea3baa9993675caf1d1b551436bcd4a76f6ea66ba95bc SHA512 8b2d9207c431c98aef31703a2f20364249a8d274e2240255463a72238ab78ba0de4a9b33b0edfadb3477d65118b1997445e63c0f8e1f20d9bb3789ce76b0a2e0
-MISC metadata.xml 601 BLAKE2B 75c42198ceb24840124f7073da7a3bc1a41107fe3a66850213f3015ac6197fcc98a23a2fefb9b7cfa4744ab19a7a3f1e13f0a32e5f0add9967e3018c0938103d SHA512 3df5604a16b0ab69d89e7e3667c603393ee5bfb41f8394072c681f6e4f5599d5d4e88bf2a0b3ea6bfbda7ffb3dd0551baa2ef33a1d3d4637d24fd2bb720d0a5f
+MISC metadata.xml 517 BLAKE2B fdb6cea13b7c5fd9f81da62386e02e2dfc0552a1e1c712a42d48671cce341ab52389d6b3a73172738faaa336d4915468e1b6f94811c2edcb98e42a8b7fb63812 SHA512 6f3f4600e948e6cd59ee91515dc16285f011d847ee758628ba44c1949b3ed0992c207316785000a2ef60a774e8e75dc99a7281a895409207dddb18090d1c78c1
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index a4e65f12defb..e70b218c5a4b 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="enchant">Enable the app-text/aspell spell-checking backend</flag>
 		<flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 6c550e096ea5..1b1e160633d0 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,9 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
 DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.5.6981.0202_x86_64.tar.xz 50898976 BLAKE2B f6029dec4b082bdf9d74e31b04e0c1994b238c5e19482d5b0bdcbc6214c87e8e94ef527ae6a6dff4a96973d4cec3e40f369810b4b1b21abe20d64e0cccd0b15c SHA512 f408a292543028e2262ac1c528be0c38e0fbba61e641c4549bec1ef9e2283f5eb041e68cfd770d87e67e31dc51a27f3ca15c23cc2d82452568518cb0ee97f132
 DIST zoom-5.5.7011.0206_x86_64.tar.xz 50893408 BLAKE2B 1d03f7fd1f0b7477ba2ff023f1b1f5fd26b0a8a3ac2a54170d3ec3e034a707a824e0b52f6bc3c144be414a28b2587f451d3b6990df02f4ce5df10530c00d1b6a SHA512 c427ed744138b5ef2c741970138e1ad91b5384a020c12451d30b411c8b533e3ffdc4ca785e73a8707d47f53bdd7b9af4e5ffe695ef7de75e1959150730aca913
-EBUILD zoom-5.4.53391.1108-r1.ebuild 3058 BLAKE2B 6e007b223d2075ac20f99237b27a9d38c611890c8c53c614ba20ef3ea20ae1335a2cad714fbfa2e120bdd96b21dbc1d4169125cb66988b423c86410d3e4d6f67 SHA512 99f09c38ecb0c26c6daaad5983ca5bedf68a510f69a6c5d4dd7931ef847cb235220abe30de06a68dc3a9274ed78ea22f751864a78bf9ac7aaef43b7a92c3717a
-EBUILD zoom-5.5.6981.0202.ebuild 3997 BLAKE2B 9077fd3a8892144dcb3daeaaffcd792fa897a5f95b62261f51de5b8fe37799838dd32876b94cbf9d2639f548edc71e4d111cf486c731165578377bb6aadaae2a SHA512 d9378b92ac93eee7996f14c58a774e4ebf553c0875736585aa29cefffb553d3037f8f52c1394950de7bb9db7dd5d68691c03ce93eb096e67d61e8696c525b149
-EBUILD zoom-5.5.7011.0206-r1.ebuild 4093 BLAKE2B 351acd4a5ce85d9ddc129f10278c50787464190cd8f52fe3387cb82a1f20c840f3bc6d59ef5fa601a42d8a1482e54cb380d19c77fd793257d28d9c02ba755bf3 SHA512 0ddf2ddf2d21668e5112264e9e1fc60af068cf724138f78e0ab7969b5ef96111a307f58eb7af22bb34aab076f3259ef77893ccacb2eb129fef3b405a188c9f5b
+DIST zoom-5.5.7938.0228_x86_64.tar.xz 50938368 BLAKE2B e8a45c95db2080092674441f16d4bdeeadbe8999483f3ac7ba2da3afb1b340fb3f03cb879a97dd93512159f5a6ff57996782d7b4137547aa78c652c3c40b2641 SHA512 76d3d1dc3c8772636db59f8b641241c4910a54c0e71d33e3f51960d85fd5957536d0e5bbd20870fb7fc1af1457344a3567d7f46bcdfe99774bb87280b14e812c
+EBUILD zoom-5.4.53391.1108-r2.ebuild 3187 BLAKE2B 385ea0a7a8240baa252674309baad0aa136b2be42e84cca006f9e4fa28bb24efc264ecbab691337e0e14e8f64b2ce3bdd188670056ebb14b1026c9940f9cb7bd SHA512 2cd9bca7e4187d5578f858c4c7325888f4e6868b585b5561fa6dfd474a75ca32750ed64fbc79e61eda576f0a6522c6656866c17773d3b6d5490803e47222d475
+EBUILD zoom-5.5.7011.0206-r2.ebuild 4222 BLAKE2B 739b4585895a1d568255dda626c06f97cf01a1540700497eab31cc1740a52f0a4ff6db6efa300d163b7c0766098a6d53542b10773566bee1e60b97e3fbe0b1d8 SHA512 1c6cc6abb2e67a404c93734ecf6f0491303549c7fcd1238cb0f745473a780108014aced2473835e43a96ae54f406adab5c102f53929d7e578aba5fa513ba7d0b
+EBUILD zoom-5.5.7938.0228.ebuild 4222 BLAKE2B 739b4585895a1d568255dda626c06f97cf01a1540700497eab31cc1740a52f0a4ff6db6efa300d163b7c0766098a6d53542b10773566bee1e60b97e3fbe0b1d8 SHA512 1c6cc6abb2e67a404c93734ecf6f0491303549c7fcd1238cb0f745473a780108014aced2473835e43a96ae54f406adab5c102f53929d7e578aba5fa513ba7d0b
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r2.ebuild
index 07911c9877c9..cc5c6c145238 100644
--- a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild
+++ b/net-im/zoom/zoom-5.4.53391.1108-r2.ebuild
@@ -20,7 +20,7 @@ RESTRICT="mirror bindist strip"
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
 	dev-libs/icu
-	dev-libs/quazip
+	dev-libs/quazip:0=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5[widgets]
@@ -82,7 +82,12 @@ src_install() {
 	doins *.pcm *.pem *.sh Embedded.properties version.txt
 	doexe zoom zoom.sh zopen ZoomLauncher
 	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
+
+	local quazip_so="libquazip1-qt5.so"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so"
+	fi
+	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
diff --git a/net-im/zoom/zoom-5.5.7011.0206-r1.ebuild b/net-im/zoom/zoom-5.5.7011.0206-r2.ebuild
index bb88fb87f840..7ae87da3f7bd 100644
--- a/net-im/zoom/zoom-5.5.7011.0206-r1.ebuild
+++ b/net-im/zoom/zoom-5.5.7011.0206-r2.ebuild
@@ -18,7 +18,7 @@ RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
-	dev-libs/quazip
+	dev-libs/quazip:0=
 	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
@@ -91,9 +91,14 @@ src_install() {
 	doins *.pcm *.sh Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher
 	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
 	dosym8 -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
 
+	local quazip_so="libquazip1-qt5.so"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so"
+	fi
+	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
+
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
 	else
diff --git a/net-im/zoom/zoom-5.5.6981.0202.ebuild b/net-im/zoom/zoom-5.5.7938.0228.ebuild
index 6e49d223e0fc..7ae87da3f7bd 100644
--- a/net-im/zoom/zoom-5.5.6981.0202.ebuild
+++ b/net-im/zoom/zoom-5.5.7938.0228.ebuild
@@ -18,7 +18,8 @@ RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
-	dev-libs/quazip
+	dev-libs/quazip:0=
+	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-sound/mpg123
@@ -90,7 +91,13 @@ src_install() {
 	doins *.pcm *.sh Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher
 	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
+	dosym8 -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+
+	local quazip_so="libquazip1-qt5.so"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so"
+	fi
+	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /net-im
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)