gentoo resync : 14.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
commit: deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree: 9a48f42594e1a9e6b2020d5535a784314434d7a7 /net-im
parent: 38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
60 files changed, 2483 insertions, 1014 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index ae207cacab3c..a1620046923b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index c54fdd1c9a98..14561e9b9784 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,3 +1,5 @@
+AUX bitlbee-3.5-libcheck.patch 17203 BLAKE2B 14cb1ba02178e89ed098518a8fb48b6f3124c197422acf3332c1fe579fb34ffd63e2fc377a6eea93cbe14a91129d22884eae7760fb6e8090afa8245c9f958f2a SHA512 25ea4be83cce5d2ccc1a5e6655e468678a26b570a3efb7b19429ee379987efce54d32864508ed36644bbcf351cc1b5e4b750a2824b7a0b7e7df711262bbf5e2c
+AUX bitlbee-3.5-libevent.patch 1942 BLAKE2B a6233d97f17d2695efe13a6bd395ba77e72e7c5c3177ae8aaf3223ac3f0979b9650cefcbb000d5e4ccc9ecb8fdab97173ad59022453c5b13c8486fb095b4ff14 SHA512 b8937c542eda36aa5dcdd3213513f6dd5a928166f1017ef370a78765dbc511552072fe46d8322dea27ee716126fd859245e6c2fa713f6b255fb6e7a4ce2c1328
 AUX bitlbee-3.5-systemd-user.patch 188 BLAKE2B 9cdb3713aaf213b741a8dbef0a790a35458b955515bb720987471c519848ec6b9a232fe136ca554a3fe1eb0c184d96b8774cee4a41c0cd3d822a33598ac50e79 SHA512 1775b5dce7bdd4fbe52a46e361d8a9b0127be2dc32a3e8b438fca8fce9139903feb91c968847f002e099553eb8d4a110914cfb19121ae79a3f6c9eb100846edd
 AUX bitlbee-3.5-verbose-build.patch 5790 BLAKE2B d5ad371938cb7b8a2f9e0925633602ebc6a9a774dc0dfae6ba30350597840c4472411a1eced122b9f33afc3d36b221b8d9176c0d39e375bcbb100a7ae211dcde SHA512 0bb4d1e4d954ca4812f1968a3c83ae6d7ea1d812066e963b00471aa516b1ac0ca041c8574bfb4a1e91236b2e1ad3c9edf3041b7467a84bf22cc120b4e7e69faa
 AUX bitlbee.confd-r1 291 BLAKE2B bf576c629a6554127a8ae54a54d9ac03cc68accdf226376620727f0f77eab60610ad096b084e7b1568366376b8c7aacd180f2dbd276369af4389c8cd4791cbb1 SHA512 e5dcb6bdfd382b28011c5fc93273d45bfd9af0c652e4f8db1c0d11615b38c5dbb7042d9b33fa5bdce844593e85a5776f2b19f75e9a67a2c46dc88b90f260e11e
@@ -6,7 +8,7 @@ AUX bitlbee.initd-r1 675 BLAKE2B fb9c803301bb73b1bb6a92d059ca85fbee119849cd27d92
 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
 DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.5.1.ebuild 3905 BLAKE2B 71381fb2a582c6731362220b919d7866744c898a6b84e748d914d44e8fd523235b74bf66a0f239cf59e2a07b6059687258e8c94baa7d966571c510c700f51a22 SHA512 02c28935d45810448ed53d3b891a6558a1768e96c49e702283a202d1bab58ca9e0dcda7711efc14d0dd9b335283cad691f33fbf43a194c953626486443711e00
-EBUILD bitlbee-3.6.ebuild 3359 BLAKE2B b1e4245e437b361d430bae8b82f12d59ad04316b7ff3ff75658f351af8131df4b4b5e0b0e8f63e012530b45145a3a6b818a8c1f0a2561594dfaadc8fbe1535ed SHA512 49a5d4f2b1d8c9b52424e3d6e4b8af9f719ccc2ff4116ab7040b7adda40d88cc82968bf97f3b4d56ebaa1dd5added10b977ab284fefad0fd8f24813b54822997
-EBUILD bitlbee-9999.ebuild 3359 BLAKE2B b1e4245e437b361d430bae8b82f12d59ad04316b7ff3ff75658f351af8131df4b4b5e0b0e8f63e012530b45145a3a6b818a8c1f0a2561594dfaadc8fbe1535ed SHA512 49a5d4f2b1d8c9b52424e3d6e4b8af9f719ccc2ff4116ab7040b7adda40d88cc82968bf97f3b4d56ebaa1dd5added10b977ab284fefad0fd8f24813b54822997
-MISC metadata.xml 943 BLAKE2B 8179e8e43b5f536b475f2a38f2b661d5f018d8c5380b38f2fab7789859144550f559fd35ffa13663022fc2438d61e4557a21401496244de9477b49d97bbf1d6d SHA512 f46b782777e076ca783dff0e4c9ba7494339711063f878c02fdc9fb1ad3a1f9bfb051b08c0242edd1845946b7dfcd64aea129d2e0966d1a011db35e4cb6dc4bd
+EBUILD bitlbee-3.5.1.ebuild 3716 BLAKE2B f465235f3dd0d458a491812e1a8c7804ec640a6341950f8608c75e1275770efc464d22d15f3529de0d1c93d4d1a1ffee7d33960b5a3a265913aca36a34605495 SHA512 4f7eeaa54b88178ca786e1f6114aa01efabd7eb86b47775a0da04890b7892d06e9747c6e1ea70dde7876a63afc75939947f24fb0ad0ad4d3b9ca4669dc993a70
+EBUILD bitlbee-3.6-r1.ebuild 3337 BLAKE2B 72097da010251cf1f7c389b11eb8342b91d7b6e05da5139b09d8fa998a1515d4e0cd0d41a1a33ba4a4d628670cacb89481d22d3851fb2efe0d4a42e72ccb3515 SHA512 8f00c53c65bb2832e2df1322b0de6739a0b31de48be53e0b91b53e6df178c42e697d12521b50bf029b519a2b8a1382a7937b08af2883028245a215ec7b905d18
+EBUILD bitlbee-9999.ebuild 3257 BLAKE2B 9761b738113d5eb9761954e48982eb718a122c7bf908ee108e90d7c910a84fc4fb4a31fd40411262bb28aa93f4fa18dde1dd86b155df9829e7d197a2a24daa98 SHA512 19ef30fd8a7a96ab527eb9c42e8649ebdfa2ea50d4b5bcd5fed06a4186e3c8a64fffcf827ccf1b126d9e77d9a15bd44214eddc2216fe3041992c222d7075bf86
+MISC metadata.xml 1138 BLAKE2B ec881562587832981f817dc9601f094e987ee3e1a5d92f310f4bac1fbdac70b434e8c5d06b59be149e5c955e4027865c6bf72de1903b584d638440f51c7cca0c SHA512 01da5fed1649b6d59837e8dd89ee65c1f9bc3763303a66c0959f0b5d14941f38fc1dcfb3bf22d5041d7a4d99f2e9b8a38983154f3f5d7e0c7a7308ad8a3a3f95
diff --git a/net-im/bitlbee/bitlbee-3.5.1.ebuild b/net-im/bitlbee/bitlbee-3.5.1.ebuild
index 3ce9cca1ef23..5bae1f674e26 100644
--- a/net-im/bitlbee/bitlbee-3.5.1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit user systemd toolchain-funcs
+inherit systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
@@ -30,6 +30,8 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
+	acct-group/bitlbee
+	acct-user/bitlbee
 	>=dev-libs/glib-2.16
 	purple? ( net-im/pidgin )
 	libevent? ( dev-libs/libevent:= )
@@ -52,20 +54,12 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/logger
 	xinetd? ( sys-apps/xinetd )"
 
-pkg_setup() {
-	enewgroup bitlbee
-	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
-}
-
-src_prepare() {
-	if [[ ${PV} != "9999" ]]; then
-		eapply \
-			"${FILESDIR}"/${PN}-3.5-systemd-user.patch \
-			"${FILESDIR}"/${PN}-3.5-verbose-build.patch
-	fi
-
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-systemd-user.patch
+	"${FILESDIR}"/${PN}-3.5-verbose-build.patch
+	"${FILESDIR}"/${PN}-3.5-libcheck.patch
+	"${FILESDIR}"/${PN}-3.5-libevent.patch
+)
 
 src_configure() {
 	local myconf
@@ -153,10 +147,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
-	[[ -d "${ROOT}"/var/run/bitlbee ]] &&
-		chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
-
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		einfo
 		elog "The bitlbee init script will now attempt to stop all processes owned by the"
diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 9df170295b6b..28e2ef6bf5e2 100644
--- a/net-im/bitlbee/bitlbee-3.6.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit user systemd toolchain-funcs
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit python-any-r1 systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
@@ -30,7 +32,9 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.16
+	acct-group/bitlbee
+	acct-user/bitlbee
+	dev-libs/glib:2
 	purple? ( net-im/pidgin )
 	libevent? ( dev-libs/libevent:= )
 	otr? ( >=net-libs/libotr-4 )
@@ -44,22 +48,23 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	selinux? ( sec-policy/selinux-bitlbee )
-	test? ( dev-libs/check )"
+	test? ( dev-libs/check )
+"
 
 RDEPEND="${COMMON_DEPEND}
-	xinetd? ( sys-apps/xinetd )"
+	xinetd? ( sys-apps/xinetd )
+"
 
-pkg_setup() {
-	enewgroup bitlbee
-	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
-}
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+"
 
-src_prepare() {
-	[[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-systemd-user.patch
+	"${FILESDIR}"/${PN}-3.5-libcheck.patch
+	"${FILESDIR}"/${PN}-3.5-libevent.patch
+)
 
 src_configure() {
 	local myconf
@@ -145,7 +150,3 @@ src_install() {
 	exeinto /usr/share/bitlbee
 	doexe utils/{convert_purple.py,bitlbee-ctl.pl}
 }
-
-pkg_postinst() {
-	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
-}
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index 9df170295b6b..b76660b5f28b 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit user systemd toolchain-funcs
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit python-any-r1 systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
@@ -30,7 +32,9 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.16
+	acct-group/bitlbee
+	acct-user/bitlbee
+	dev-libs/glib:2
 	purple? ( net-im/pidgin )
 	libevent? ( dev-libs/libevent:= )
 	otr? ( >=net-libs/libotr-4 )
@@ -44,22 +48,21 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	selinux? ( sec-policy/selinux-bitlbee )
-	test? ( dev-libs/check )"
+	test? ( dev-libs/check )
+"
 
 RDEPEND="${COMMON_DEPEND}
-	xinetd? ( sys-apps/xinetd )"
+	xinetd? ( sys-apps/xinetd )
+"
 
-pkg_setup() {
-	enewgroup bitlbee
-	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
-}
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+"
 
-src_prepare() {
-	[[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-systemd-user.patch
+)
 
 src_configure() {
 	local myconf
@@ -145,7 +148,3 @@ src_install() {
 	exeinto /usr/share/bitlbee
 	doexe utils/{convert_purple.py,bitlbee-ctl.pl}
 }
-
-pkg_postinst() {
-	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
-}
diff --git a/net-im/bitlbee/files/bitlbee-3.5-libcheck.patch b/net-im/bitlbee/files/bitlbee-3.5-libcheck.patch
new file mode 100644
index 000000000000..474789e5e1c9
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.5-libcheck.patch
@@ -0,0 +1,645 @@
+diff --git a/tests/check_arc.c b/tests/check_arc.c
+index 9fcd4b25..c7e1dfef 100644
+--- a/tests/check_arc.c
++++ b/tests/check_arc.c
+@@ -17,7 +17,7 @@ char *clear_tests[] =
+ 	NULL
+ };
+ 
+-static void check_codec(int l)
++START_TEST(check_codec)
+ {
+ 	int i;
+ 
+@@ -37,6 +37,7 @@ static void check_codec(int l)
+ 		g_free(decrypted);
+ 	}
+ }
++END_TEST
+ 
+ struct {
+ 	unsigned char crypted[30];
+@@ -72,7 +73,7 @@ struct {
+ 	{ "", 0, NULL }
+ };
+ 
+-static void check_decod(int l)
++START_TEST(check_decod)
+ {
+ 	int i;
+ 
+@@ -92,6 +93,7 @@ static void check_decod(int l)
+ 		g_free(decrypted);
+ 	}
+ }
++END_TEST
+ 
+ Suite *arc_suite(void)
+ {
+diff --git a/tests/check_help.c b/tests/check_help.c
+index 92d7c28f..ccf136a4 100644
+--- a/tests/check_help.c
++++ b/tests/check_help.c
+@@ -7,20 +7,24 @@
+ #include "help.h"
+ 
+ START_TEST(test_help_initfree)
+-help_t * h, *r;
+-r = help_init(&h, "/dev/null");
+-fail_if(r == NULL);
+-fail_if(r != h);
++{
++    help_t * h, *r;
++    r = help_init(&h, "/dev/null");
++    fail_if(r == NULL);
++    fail_if(r != h);
+ 
+-help_free(&h);
+-fail_if(h != NULL);
++    help_free(&h);
++    fail_if(h != NULL);
++}
+ END_TEST
+ 
+ START_TEST(test_help_nonexistent)
+-help_t * h, *r;
+-r = help_init(&h, "/dev/null");
+-fail_unless(help_get(&h, "nonexistent") == NULL);
+-fail_if(r == NULL);
++{
++    help_t * h, *r;
++    r = help_init(&h, "/dev/null");
++    fail_unless(help_get(&h, "nonexistent") == NULL);
++    fail_if(r == NULL);
++}
+ END_TEST
+ 
+ Suite *help_suite(void)
+diff --git a/tests/check_irc.c b/tests/check_irc.c
+index 5c940729..e2054106 100644
+--- a/tests/check_irc.c
++++ b/tests/check_irc.c
+@@ -8,49 +8,53 @@
+ #include "testsuite.h"
+ 
+ START_TEST(test_connect)
+-GIOChannel * ch1, *ch2;
+-irc_t *irc;
+-char *raw;
+-fail_unless(g_io_channel_pair(&ch1, &ch2));
++{
++    GIOChannel * ch1, *ch2;
++    irc_t *irc;
++    char *raw;
++    fail_unless(g_io_channel_pair(&ch1, &ch2));
+ 
+-irc = irc_new(g_io_channel_unix_get_fd(ch1));
++    irc = irc_new(g_io_channel_unix_get_fd(ch1));
+ 
+-irc_free(irc);
++    irc_free(irc);
+ 
+-fail_unless(g_io_channel_read_to_end(ch2, &raw, NULL, NULL) == G_IO_STATUS_NORMAL);
++    fail_unless(g_io_channel_read_to_end(ch2, &raw, NULL, NULL) == G_IO_STATUS_NORMAL);
+ 
+-fail_if(strcmp(raw, "") != 0);
++    fail_if(strcmp(raw, "") != 0);
+ 
+-g_free(raw);
++    g_free(raw);
++}
+ END_TEST
+ 
+ START_TEST(test_login)
+-GIOChannel * ch1, *ch2;
+-irc_t *irc;
+-char *raw;
+-fail_unless(g_io_channel_pair(&ch1, &ch2));
++{
++    GIOChannel * ch1, *ch2;
++    irc_t *irc;
++    char *raw;
++    fail_unless(g_io_channel_pair(&ch1, &ch2));
+ 
+-g_io_channel_set_flags(ch1, G_IO_FLAG_NONBLOCK, NULL);
+-g_io_channel_set_flags(ch2, G_IO_FLAG_NONBLOCK, NULL);
++    g_io_channel_set_flags(ch1, G_IO_FLAG_NONBLOCK, NULL);
++    g_io_channel_set_flags(ch2, G_IO_FLAG_NONBLOCK, NULL);
+ 
+-irc = irc_new(g_io_channel_unix_get_fd(ch1));
++    irc = irc_new(g_io_channel_unix_get_fd(ch1));
+ 
+-fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\r\n"
+-                                     "USER a a a a\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
+-fail_unless(g_io_channel_flush(ch2, NULL) == G_IO_STATUS_NORMAL);
++    fail_unless(g_io_channel_write_chars(ch2, "NICK bla\r\r\n"
++                "USER a a a a\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
++    fail_unless(g_io_channel_flush(ch2, NULL) == G_IO_STATUS_NORMAL);
+ 
+-g_main_iteration(FALSE);
+-irc_free(irc);
++    g_main_iteration(FALSE);
++    irc_free(irc);
+ 
+-fail_unless(g_io_channel_read_to_end(ch2, &raw, NULL, NULL) == G_IO_STATUS_NORMAL);
++    fail_unless(g_io_channel_read_to_end(ch2, &raw, NULL, NULL) == G_IO_STATUS_NORMAL);
+ 
+-fail_unless(strstr(raw, "001") != NULL);
+-fail_unless(strstr(raw, "002") != NULL);
+-fail_unless(strstr(raw, "003") != NULL);
+-fail_unless(strstr(raw, "004") != NULL);
+-fail_unless(strstr(raw, "005") != NULL);
++    fail_unless(strstr(raw, "001") != NULL);
++    fail_unless(strstr(raw, "002") != NULL);
++    fail_unless(strstr(raw, "003") != NULL);
++    fail_unless(strstr(raw, "004") != NULL);
++    fail_unless(strstr(raw, "005") != NULL);
+ 
+-g_free(raw);
++    g_free(raw);
++}
+ END_TEST
+ 
+ Suite *irc_suite(void)
+diff --git a/tests/check_jabber_sasl.c b/tests/check_jabber_sasl.c
+index e7ea8a75..b6c34bb8 100644
+--- a/tests/check_jabber_sasl.c
++++ b/tests/check_jabber_sasl.c
+@@ -77,7 +77,7 @@ struct {
+ 	{ NULL, NULL, NULL }
+ };
+ 
+-static void check_get_part(int l)
++START_TEST(check_get_part)
+ {
+ 	int i;
+ 
+@@ -103,6 +103,7 @@ static void check_get_part(int l)
+ 		g_free(res);
+ 	}
+ }
++END_TEST
+ 
+ Suite *jabber_sasl_suite(void)
+ {
+diff --git a/tests/check_jabber_util.c b/tests/check_jabber_util.c
+index e4d4533a..411f58b1 100644
+--- a/tests/check_jabber_util.c
++++ b/tests/check_jabber_util.c
+@@ -8,7 +8,7 @@
+ 
+ static struct im_connection *ic;
+ 
+-static void check_buddy_add(int l)
++START_TEST(check_buddy_add)
+ {
+ 	struct jabber_buddy *budw1, *budw2, *budw3, *budn, *bud;
+ 
+@@ -93,8 +93,9 @@ static void check_buddy_add(int l)
+ 	fail_unless(jabber_buddy_remove(ic, "bugtest@google.com/B"));
+ 	fail_unless(jabber_buddy_remove(ic, "bugtest@google.com/C"));
+ }
++END_TEST
+ 
+-static void check_compareJID(int l)
++START_TEST(check_compareJID)
+ {
+ 	fail_unless(jabber_compare_jid("bugtest@google.com/B", "bugtest@google.com/A"));
+ 	fail_if(jabber_compare_jid("bugtest1@google.com/B", "bugtest@google.com/A"));
+@@ -105,8 +106,9 @@ static void check_compareJID(int l)
+ 	fail_if(jabber_compare_jid(NULL, ""));
+ 	fail_if(jabber_compare_jid("", NULL));
+ }
++END_TEST
+ 
+-static void check_hipchat_slug(int l)
++START_TEST(check_hipchat_slug)
+ {
+ 	int i;
+ 
+@@ -124,6 +126,7 @@ static void check_hipchat_slug(int l)
+ 		g_free(new);
+ 	}
+ }
++END_TEST
+ 
+ Suite *jabber_util_suite(void)
+ {
+diff --git a/tests/check_md5.c b/tests/check_md5.c
+index a68df687..5ca52a5b 100644
+--- a/tests/check_md5.c
++++ b/tests/check_md5.c
+@@ -29,7 +29,7 @@ struct md5_test {
+ 	{ NULL },
+ };
+ 
+-static void check_sums(int l)
++START_TEST(check_sums)
+ {
+ 	int i;
+ 
+@@ -45,6 +45,7 @@ static void check_sums(int l)
+ 		fail_if(memcmp(tests[i].expected, sum, 16) != 0, "%s failed", tests[i].str);
+ 	}
+ }
++END_TEST
+ 
+ Suite *md5_suite(void)
+ {
+diff --git a/tests/check_set.c b/tests/check_set.c
+index 6f8b39b5..cf9429e6 100644
+--- a/tests/check_set.c
++++ b/tests/check_set.c
+@@ -7,97 +7,123 @@
+ #include "testsuite.h"
+ 
+ START_TEST(test_set_add)
+-void *data = "data";
+-set_t *s = NULL, *t;
+-t = set_add(&s, "name", "default", NULL, data);
+-fail_unless(s == t);
+-fail_unless(t->data == data);
+-fail_unless(strcmp(t->def, "default") == 0);
++{
++    void *data = "data";
++    set_t *s = NULL, *t;
++    t = set_add(&s, "name", "default", NULL, data);
++    fail_unless(s == t);
++    fail_unless(t->data == data);
++    fail_unless(strcmp(t->def, "default") == 0);
++}
+ END_TEST
+ 
+ START_TEST(test_set_add_existing)
+-void *data = "data";
+-set_t *s = NULL, *t;
+-t = set_add(&s, "name", "default", NULL, data);
+-t = set_add(&s, "name", "newdefault", NULL, data);
+-fail_unless(s == t);
+-fail_unless(strcmp(t->def, "newdefault") == 0);
++{
++    void *data = "data";
++    set_t *s = NULL, *t;
++    t = set_add(&s, "name", "default", NULL, data);
++    t = set_add(&s, "name", "newdefault", NULL, data);
++    fail_unless(s == t);
++    fail_unless(strcmp(t->def, "newdefault") == 0);
++}
+ END_TEST
+ 
+ START_TEST(test_set_find_unknown)
+-set_t * s = NULL;
+-fail_unless(set_find(&s, "foo") == NULL);
++{
++    set_t * s = NULL;
++    fail_unless(set_find(&s, "foo") == NULL);
++}
+ END_TEST
+ 
+ START_TEST(test_set_find)
+-void *data = "data";
+-set_t *s = NULL, *t;
+-t = set_add(&s, "name", "default", NULL, data);
+-fail_unless(s == t);
+-fail_unless(set_find(&s, "name") == t);
++{
++    void *data = "data";
++    set_t *s = NULL, *t;
++    t = set_add(&s, "name", "default", NULL, data);
++    fail_unless(s == t);
++    fail_unless(set_find(&s, "name") == t);
++}
+ END_TEST
+ 
+ START_TEST(test_set_get_str_default)
+-void *data = "data";
+-set_t *s = NULL, *t;
+-t = set_add(&s, "name", "default", NULL, data);
+-fail_unless(s == t);
+-fail_unless(strcmp(set_getstr(&s, "name"), "default") == 0);
++{
++    void *data = "data";
++    set_t *s = NULL, *t;
++    t = set_add(&s, "name", "default", NULL, data);
++    fail_unless(s == t);
++    fail_unless(strcmp(set_getstr(&s, "name"), "default") == 0);
++}
+ END_TEST
+ 
+ START_TEST(test_set_get_bool_default)
+-void *data = "data";
+-set_t *s = NULL, *t;
+-t = set_add(&s, "name", "true", NULL, data);
+-fail_unless(s == t);
+-fail_unless(set_getbool(&s, "name"));
++{
++    void *data = "data";
++    set_t *s = NULL, *t;
++    t = set_add(&s, "name", "true", NULL, data);
++    fail_unless(s == t);
++    fail_unless(set_getbool(&s, "name"));
++}
+ END_TEST
+ 
+ START_TEST(test_set_get_bool_integer)
+-void *data = "data";
+-set_t *s = NULL, *t;
+-t = set_add(&s, "name", "3", NULL, data);
+-fail_unless(s == t);
+-fail_unless(set_getbool(&s, "name") == 3);
++{
++    void *data = "data";
++    set_t *s = NULL, *t;
++    t = set_add(&s, "name", "3", NULL, data);
++    fail_unless(s == t);
++    fail_unless(set_getbool(&s, "name") == 3);
++}
+ END_TEST
+ 
+ START_TEST(test_set_get_bool_unknown)
+-set_t * s = NULL;
+-fail_unless(set_getbool(&s, "name") == 0);
++{
++    set_t * s = NULL;
++    fail_unless(set_getbool(&s, "name") == 0);
++}
+ END_TEST
+ 
+ START_TEST(test_set_get_str_value)
+-void *data = "data";
+-set_t *s = NULL;
+-set_add(&s, "name", "default", NULL, data);
+-set_setstr(&s, "name", "foo");
+-fail_unless(strcmp(set_getstr(&s, "name"), "foo") == 0);
++{
++    void *data = "data";
++    set_t *s = NULL;
++    set_add(&s, "name", "default", NULL, data);
++    set_setstr(&s, "name", "foo");
++    fail_unless(strcmp(set_getstr(&s, "name"), "foo") == 0);
++}
+ END_TEST
+ 
+ START_TEST(test_set_get_str_unknown)
+-set_t * s = NULL;
+-fail_unless(set_getstr(&s, "name") == NULL);
++{
++    set_t * s = NULL;
++    fail_unless(set_getstr(&s, "name") == NULL);
++}
+ END_TEST
+ 
+ START_TEST(test_setint)
+-void *data = "data";
+-set_t *s = NULL;
+-set_add(&s, "name", "10", NULL, data);
+-set_setint(&s, "name", 3);
+-fail_unless(set_getint(&s, "name") == 3);
++{
++    void *data = "data";
++    set_t *s = NULL;
++    set_add(&s, "name", "10", NULL, data);
++    set_setint(&s, "name", 3);
++    fail_unless(set_getint(&s, "name") == 3);
++}
+ END_TEST
+ 
+ START_TEST(test_setstr)
+-void *data = "data";
+-set_t *s = NULL;
+-set_add(&s, "name", "foo", NULL, data);
+-set_setstr(&s, "name", "bloe");
+-fail_unless(strcmp(set_getstr(&s, "name"), "bloe") == 0);
++{
++    void *data = "data";
++    set_t *s = NULL;
++    set_add(&s, "name", "foo", NULL, data);
++    set_setstr(&s, "name", "bloe");
++    fail_unless(strcmp(set_getstr(&s, "name"), "bloe") == 0);
++}
+ END_TEST
+ 
+ START_TEST(test_set_get_int_unknown)
+-set_t * s = NULL;
+-fail_unless(set_getint(&s, "foo") == 0);
++{
++    set_t * s = NULL;
++    fail_unless(set_getint(&s, "foo") == 0);
++}
+ END_TEST
+ 
+ Suite *set_suite(void)
+diff --git a/tests/check_util.c b/tests/check_util.c
+index 44a223ae..2d79417e 100644
+--- a/tests/check_util.c
++++ b/tests/check_util.c
+@@ -8,7 +8,8 @@
+ #include "misc.h"
+ #include "url.h"
+ 
+-START_TEST(test_strip_linefeed){
++START_TEST(test_strip_linefeed)
++{
+ 	int i;
+ 	const char *get[] = { "Test", "Test\r", "Test\rX\r", NULL };
+ 	const char *expected[] = { "Test", "Test", "TestX", NULL };
+@@ -43,63 +44,73 @@ START_TEST(test_strip_newlines)
+ END_TEST
+ 
+ START_TEST(test_set_url_http)
+-url_t url;
+-
+-fail_if(0 == url_set(&url, "http://host/"));
+-fail_unless(!strcmp(url.host, "host"));
+-fail_unless(!strcmp(url.file, "/"));
+-fail_unless(!strcmp(url.user, ""));
+-fail_unless(!strcmp(url.pass, ""));
+-fail_unless(url.proto == PROTO_HTTP);
+-fail_unless(url.port == 80);
++{
++    url_t url;
++
++    fail_if(0 == url_set(&url, "http://host/"));
++    fail_unless(!strcmp(url.host, "host"));
++    fail_unless(!strcmp(url.file, "/"));
++    fail_unless(!strcmp(url.user, ""));
++    fail_unless(!strcmp(url.pass, ""));
++    fail_unless(url.proto == PROTO_HTTP);
++    fail_unless(url.port == 80);
++}
+ END_TEST
+ 
+ START_TEST(test_set_url_https)
+-url_t url;
+-
+-fail_if(0 == url_set(&url, "https://ahost/AimeeMann"));
+-fail_unless(!strcmp(url.host, "ahost"));
+-fail_unless(!strcmp(url.file, "/AimeeMann"));
+-fail_unless(!strcmp(url.user, ""));
+-fail_unless(!strcmp(url.pass, ""));
+-fail_unless(url.proto == PROTO_HTTPS);
+-fail_unless(url.port == 443);
++{
++    url_t url;
++
++    fail_if(0 == url_set(&url, "https://ahost/AimeeMann"));
++    fail_unless(!strcmp(url.host, "ahost"));
++    fail_unless(!strcmp(url.file, "/AimeeMann"));
++    fail_unless(!strcmp(url.user, ""));
++    fail_unless(!strcmp(url.pass, ""));
++    fail_unless(url.proto == PROTO_HTTPS);
++    fail_unless(url.port == 443);
++}
+ END_TEST
+ 
+ START_TEST(test_set_url_port)
+-url_t url;
+-
+-fail_if(0 == url_set(&url, "https://ahost:200/Lost/In/Space"));
+-fail_unless(!strcmp(url.host, "ahost"));
+-fail_unless(!strcmp(url.file, "/Lost/In/Space"));
+-fail_unless(!strcmp(url.user, ""));
+-fail_unless(!strcmp(url.pass, ""));
+-fail_unless(url.proto == PROTO_HTTPS);
+-fail_unless(url.port == 200);
++{
++    url_t url;
++
++    fail_if(0 == url_set(&url, "https://ahost:200/Lost/In/Space"));
++    fail_unless(!strcmp(url.host, "ahost"));
++    fail_unless(!strcmp(url.file, "/Lost/In/Space"));
++    fail_unless(!strcmp(url.user, ""));
++    fail_unless(!strcmp(url.pass, ""));
++    fail_unless(url.proto == PROTO_HTTPS);
++    fail_unless(url.port == 200);
++}
+ END_TEST
+ 
+ START_TEST(test_set_url_username)
+-url_t url;
+-
+-fail_if(0 == url_set(&url, "socks4://user@ahost/Space"));
+-fail_unless(!strcmp(url.host, "ahost"));
+-fail_unless(!strcmp(url.file, "/Space"));
+-fail_unless(!strcmp(url.user, "user"));
+-fail_unless(!strcmp(url.pass, ""));
+-fail_unless(url.proto == PROTO_SOCKS4);
+-fail_unless(url.port == 1080);
++{
++    url_t url;
++
++    fail_if(0 == url_set(&url, "socks4://user@ahost/Space"));
++    fail_unless(!strcmp(url.host, "ahost"));
++    fail_unless(!strcmp(url.file, "/Space"));
++    fail_unless(!strcmp(url.user, "user"));
++    fail_unless(!strcmp(url.pass, ""));
++    fail_unless(url.proto == PROTO_SOCKS4);
++    fail_unless(url.port == 1080);
++}
+ END_TEST
+ 
+ START_TEST(test_set_url_username_pwd)
+-url_t url;
+-
+-fail_if(0 == url_set(&url, "socks5://user:pass@ahost/"));
+-fail_unless(!strcmp(url.host, "ahost"));
+-fail_unless(!strcmp(url.file, "/"));
+-fail_unless(!strcmp(url.user, "user"));
+-fail_unless(!strcmp(url.pass, "pass"));
+-fail_unless(url.proto == PROTO_SOCKS5);
+-fail_unless(url.port == 1080);
++{
++    url_t url;
++
++    fail_if(0 == url_set(&url, "socks5://user:pass@ahost/"));
++    fail_unless(!strcmp(url.host, "ahost"));
++    fail_unless(!strcmp(url.file, "/"));
++    fail_unless(!strcmp(url.user, "user"));
++    fail_unless(!strcmp(url.pass, "pass"));
++    fail_unless(url.proto == PROTO_SOCKS5);
++    fail_unless(url.port == 1080);
++}
+ END_TEST
+ 
+ struct {
+@@ -148,26 +159,30 @@ struct {
+ };
+ 
+ START_TEST(test_word_wrap)
+-int i;
++{
++    int i;
+ 
+-for (i = 0; word_wrap_tests[i].orig && *word_wrap_tests[i].orig; i++) {
+-	char *wrapped = word_wrap(word_wrap_tests[i].orig, word_wrap_tests[i].line_len);
++    for (i = 0; word_wrap_tests[i].orig && *word_wrap_tests[i].orig; i++) {
++        char *wrapped = word_wrap(word_wrap_tests[i].orig, word_wrap_tests[i].line_len);
+ 
+-	fail_unless(strcmp(word_wrap_tests[i].wrapped, wrapped) == 0,
+-	            "%s (line_len = %d) should wrap to `%s', not to `%s'",
+-	            word_wrap_tests[i].orig, word_wrap_tests[i].line_len,
+-	            word_wrap_tests[i].wrapped, wrapped);
++        fail_unless(strcmp(word_wrap_tests[i].wrapped, wrapped) == 0,
++                "%s (line_len = %d) should wrap to `%s', not to `%s'",
++                word_wrap_tests[i].orig, word_wrap_tests[i].line_len,
++                word_wrap_tests[i].wrapped, wrapped);
+ 
+-	g_free(wrapped);
++        g_free(wrapped);
++    }
+ }
+ END_TEST
+ 
+ START_TEST(test_http_encode)
+-char s[80];
++{
++    char s[80];
+ 
+-strcpy(s, "ee\xc3" "\xab" "ee!!...");
+-http_encode(s);
+-fail_unless(strcmp(s, "ee%C3%ABee%21%21...") == 0);
++    strcpy(s, "ee\xc3" "\xab" "ee!!...");
++    http_encode(s);
++    fail_unless(strcmp(s, "ee%C3%ABee%21%21...") == 0);
++}
+ END_TEST
+ 
+ struct {
+@@ -198,19 +213,21 @@ struct {
+ };
+ 
+ START_TEST(test_split_command_parts)
+-int i;
+-for (i = 0; split_tests[i].command; i++) {
+-	char *cmd = g_strdup(split_tests[i].command);
+-	char **split = split_command_parts(cmd, split_tests[i].limit);
+-	char **expected = split_tests[i].expected;
+-
+-	int j;
+-	for (j = 0; split[j] && expected[j]; j++) {
+-		fail_unless(strcmp(split[j], expected[j]) == 0,
+-		            "(%d) split_command_parts broken: split(\"%s\")[%d] -> %s (expected: %s)",
+-		            i, split_tests[i].command, j, split[j], expected[j]);
+-	}
+-	g_free(cmd);
++{
++    int i;
++    for (i = 0; split_tests[i].command; i++) {
++        char *cmd = g_strdup(split_tests[i].command);
++        char **split = split_command_parts(cmd, split_tests[i].limit);
++        char **expected = split_tests[i].expected;
++
++        int j;
++        for (j = 0; split[j] && expected[j]; j++) {
++            fail_unless(strcmp(split[j], expected[j]) == 0,
++                    "(%d) split_command_parts broken: split(\"%s\")[%d] -> %s (expected: %s)",
++                    i, split_tests[i].command, j, split[j], expected[j]);
++        }
++        g_free(cmd);
++    }
+ }
+ END_TEST
+ 
+-- 
+2.26.2
+
diff --git a/net-im/bitlbee/files/bitlbee-3.5-libevent.patch b/net-im/bitlbee/files/bitlbee-3.5-libevent.patch
new file mode 100644
index 000000000000..5ceea2fc576a
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.5-libevent.patch
@@ -0,0 +1,71 @@
+diff --git a/lib/events.h b/lib/events.h
+index 1b5b41b7..b4b6110e 100644
+--- a/lib/events.h
++++ b/lib/events.h
+@@ -69,6 +69,8 @@ G_MODULE_EXPORT void b_main_init();
+ G_MODULE_EXPORT void b_main_run();
+ G_MODULE_EXPORT void b_main_quit();
+ 
++G_MODULE_EXPORT void b_main_iteration();
++
+ 
+ /* Add event handlers (for I/O or a timeout). The event handler will be called
+    every time the event "happens", until your event handler returns FALSE (or
+diff --git a/lib/events_glib.c b/lib/events_glib.c
+index dca704e1..da73f3ae 100644
+--- a/lib/events_glib.c
++++ b/lib/events_glib.c
+@@ -64,6 +64,12 @@ void b_main_quit()
+ 	g_main_quit(loop);
+ }
+ 
++void b_main_iteration()
++{
++	g_main_iteration(FALSE);
++	event_debug("b_main_iteration()\n");
++}
++
+ static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
+ {
+ 	GaimIOClosure *closure = data;
+diff --git a/lib/events_libevent.c b/lib/events_libevent.c
+index 854af010..05391afa 100644
+--- a/lib/events_libevent.c
++++ b/lib/events_libevent.c
+@@ -113,6 +113,12 @@ void b_main_quit()
+ 	b_main_restart();
+ }
+ 
++void b_main_iteration()
++{
++	event_base_loop(leh, EVLOOP_NONBLOCK);
++	event_debug("b_main_iteration()\n");
++}
++
+ static void b_event_passthrough(int fd, short event, void *data)
+ {
+ 	struct b_event_data *b_ev = data;
+diff --git a/tests/check_irc.c b/tests/check_irc.c
+index e2054106..db3137f3 100644
+--- a/tests/check_irc.c
++++ b/tests/check_irc.c
+@@ -5,6 +5,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include "irc.h"
++#include "events.h"
+ #include "testsuite.h"
+ 
+ START_TEST(test_connect)
+@@ -42,7 +43,7 @@ START_TEST(test_login)
+                 "USER a a a a\n", -1, NULL, NULL) == G_IO_STATUS_NORMAL);
+     fail_unless(g_io_channel_flush(ch2, NULL) == G_IO_STATUS_NORMAL);
+ 
+-    g_main_iteration(FALSE);
++    b_main_iteration();
+     irc_free(irc);
+ 
+     fail_unless(g_io_channel_read_to_end(ch2, &raw, NULL, NULL) == G_IO_STATUS_NORMAL);
+-- 
+2.26.2
+
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
index 9cb8be28fedd..6ecb78d56885 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="libevent">Use libevent for event handling</flag>
 		<flag name="msn">Enable MSN Messenger IM protocol support.</flag>
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
index d11e1f38f2be..7a822f319833 100644
--- a/net-im/corebird/Manifest
+++ b/net-im/corebird/Manifest
@@ -1,3 +1,3 @@
 DIST corebird-1.7.4.tar.gz 555650 BLAKE2B 1c9ef4d81084a291726876a76b700fe556c0c8c803921c2df215db7e0c268029fcefa95ea6aabd8f4934ecbf70e70ee57988b6c7aefebfd0851d3cb73d16b3fc SHA512 7e88f73ef1fc36379172d30251065e7ee3df54eabfaf954015ed4e739c5ad2b1821b43a07e66bb9363b7daa59b5e981d459a4aef87be8a3dd80a7ed41e37e582
-EBUILD corebird-1.7.4.ebuild 1431 BLAKE2B da7b0f1dac3304ad1092e337613f9dcc02363cd65f86032a9c918d5cc657ad607ab966951359b7548600edeb74290cc2ed046faa0f1e81a08c840daa40cd0b3c SHA512 ece171bf3070123eed8b0d128cab187a5ae9651996c2551ff675427d73cc85910b5da9cab0ad9ecab15076a5a8b56ab6b0ec17905a1d1754b1706cbd6681d1cc
+EBUILD corebird-1.7.4-r1.ebuild 1427 BLAKE2B aec7ee71ae0a4fca30ec06e46ed84d2c2113581382fdabba2c1dc3c64499a65e63dfc17cf2bec02d60041891291615023a5c68559d01890220a59b4409952583 SHA512 78d2e6a28aebc92701fcc8847656733fe20e798c2e6a3084cf1a496f2353adcf85bfbedf6a6a231764cbc3b35d2b1d9a6e604eaac9582967a49a83167048dbb3
 MISC metadata.xml 319 BLAKE2B 0e8d477021ae12bd93042fda28e00ee702d1daed631c8d7aceddccc6c4fb2f890b60d66022e91987ceb9d26686a490079e5c61d623210f97e68c61d58de43fc1 SHA512 e3fc939151c6d67f2ebfa21d82d6c896d99d3036211f26b37704df06197aabf65fd488893335b5432a2f8835053f8beb60d0aa00940e2f06ffde9bcd93fdb297
diff --git a/net-im/corebird/corebird-1.7.4.ebuild b/net-im/corebird/corebird-1.7.4-r1.ebuild
index 42563406a5fe..ff61481ab0a2 100644
--- a/net-im/corebird/corebird-1.7.4.ebuild
+++ b/net-im/corebird/corebird-1.7.4-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="debug gstreamer spellcheck"
 RDEPEND="dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/json-glib
-	gstreamer? ( media-libs/gst-plugins-bad:1.0[X,gtk]
+	gstreamer? ( media-plugins/gst-plugins-gtk:1.0
 		media-libs/gst-plugins-base:1.0[X]
 		media-libs/gst-plugins-good:1.0
 		media-plugins/gst-plugins-hls:1.0
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 1526f66c8412..1c9b01c9c8fc 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,4 +1,4 @@
 DIST dino-0.1.0.tar.gz 441638 BLAKE2B 08f332d38af866eed1049fae7d0e207da5a3486fdaf07eb5327e7abf614ac4adc130fd8f2d9465d6cb248ecfe4b809e022a69c72df5879d98719d24635771b33 SHA512 b63bf87dbf7f728f038f22d0dba34770a06d7eb1be2ec249293ff876e16c151165add895ff3cb20a3216c3581d20e10634d454ee8b024b895012efb34f9d7de8
-EBUILD dino-0.1.0.ebuild 1583 BLAKE2B 864709c4e4a9b34c6b444e1ae40a07b4697f3417be7641f229096bc7309c5e422953aca09d688afb410c4c921bd19457b6366c039f30d22d3357df17578e4686 SHA512 37c77529cae35d8e6ce438cb14fd970734c0cd900e4c0e55013c8996f4e759cdefb7d89890d28cbebf586307e1c1947561ed3ad543d835b504321d4473b46ffe
+EBUILD dino-0.1.0.ebuild 1590 BLAKE2B 0003707109eb71f153aac80a907c2ea58a06c2fbc3705490bf42d8ecf896a9778e64a2b1a1be419ab30fa35d818fd3b6f589f8eaae585ac8b36d1ec178bdea31 SHA512 ffb0f930ff05ec08d46fcf715e8e9d18fbfacab71cd3f01f39accd78aa475719f094fe830a36e0f0496f4af2907b7b86052a394b5bf8caf4cf0f2447aaeaba96
 EBUILD dino-9999.ebuild 1583 BLAKE2B 864709c4e4a9b34c6b444e1ae40a07b4697f3417be7641f229096bc7309c5e422953aca09d688afb410c4c921bd19457b6366c039f30d22d3357df17578e4686 SHA512 37c77529cae35d8e6ce438cb14fd970734c0cd900e4c0e55013c8996f4e759cdefb7d89890d28cbebf586307e1c1947561ed3ad543d835b504321d4473b46ffe
 MISC metadata.xml 573 BLAKE2B cf7a2731750afde53919e6a41541c0829df4ffa6da202c179092de0640a8ac044445b258350704822d02f302c601738f38f05fc2ab938d6f0ea55bead77b0eae SHA512 7023554fe0c67fd41d9134315500a7206653f34a192673db9bd741af22e05f0a00e431fa96c109c94bab6dbdb31334729bc272a07773dd7b905dd0422ce8532f
diff --git a/net-im/dino/dino-0.1.0.ebuild b/net-im/dino/dino-0.1.0.ebuild
index 937678aeb91c..107f28ed4d27 100644
--- a/net-im/dino/dino-0.1.0.ebuild
+++ b/net-im/dino/dino-0.1.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-libs/icu
 	dev-libs/libgee:0.8
 	net-libs/glib-networking
-	net-libs/libsignal-protocol-c
+	~net-libs/libsignal-protocol-c-2.3.2
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index b9a082e71814..76bfff31be3f 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,11 +1,16 @@
 AUX ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch 1642 BLAKE2B ffba29eb4f46e35cf957d2fa023ae28d56148bdd20a0d7a4f594a745ab46e9dfa371796fd58105e30acfdc6b0834eec993ce266723ffd359b7953f2ccad6ea76 SHA512 ab2b3fe4f3cca579a174cd77876f6c485fd806454b07d7e8d2a13c710b3f9115aa901f22dd71dfd3ab60a78f819e0c8dfdbcca38ca9c87d65fe5b5a0f105cad6
 AUX ejabberd-17.04-0002-Dont-overwrite-service-file.patch 470 BLAKE2B 0dd597eaa63ccedafbb5c2903f948cc078c4951c551f76827f66198b4a25ac71f81dfaa36a0e0f443a8567c5d4309d00bc7ed59732a945dd0696d08edea5189f SHA512 a6b38ae82a0fe5d5d643eb2a122921aff3a9701381f6162213cee11b4950bdb9f16add78465a01eb6df5824dfa4ba2adae6dc0451749f76eefd224f5f97b8b01
 AUX ejabberd-17.04-ejabberdctl.patch 2154 BLAKE2B b5050f77bfaf84a4ec5f366d6ca3241d39eab3603b54d3a19c17d3581d37fe5e55b348d3a523ea6004468817d580a066fda2a2b1578e321b3ee06f3bff5935ae SHA512 8f715dee3570dc5ea44499bde94d6a137ef2a7c28d0535173b88cef0ceeadd94950e42b29d23f689b1de7be7670dd307694524b75102c668ad88f10250ae6166
+AUX ejabberd-19.08-ejabberdctl.patch 1238 BLAKE2B 04b4317661afb77525b3d09fc2b1499faeb8ba49f32971f5302e64849808d7da21530d351aa728790e00cef076b8d679d1ca2ebb39e72d999ba3e628637ba00f SHA512 34e3aaecae83b8c00998dec3c8f26389a00af4aebf59592dcc0fa0afb917fbe33b057e83b38d3f5c24dad9e877d0a02c6b14a6d3396a6549e98e372fc293e9be
 AUX ejabberd.confd 161 BLAKE2B f08ab6310c950d3d248fbaf5e6e35bca2e31289ae476b2379a779ebc38926e091cf04883cce94cedff1e4dcf6ec3224079e7828502b97451a8a96fd278a4d102 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb
 AUX ejabberd.initd 1071 BLAKE2B 226a0d4593df3504e30fbf40e9daffed6d903cf797b4ce0ce19b23ed29059d52a4e43d9f94354f6a1724966413cff7dcf0c13a4ede7dd2fff0da405c59bf8f39 SHA512 64839da9c369bf570389e95b0b1b67e1c4b339927c2f1fd4ca113a18410deb3fbe1ecdd41bb46df3d3b52b38149218dfe26b798ff43398151f08799566515352
 AUX ejabberd.logrotate 203 BLAKE2B f523a30cf927d403523f618a6ab28fe4281a95ce6a1e639b4075b0ce98a8a985deec5446655c41288258a286a1ceb46cb64422be554d1de754fd97fc86e67555 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2
 AUX ejabberd.tmpfiles.conf 78 BLAKE2B d516116f500baf9972b4bdee069ab9930bcc8aa309de4d25a38c93bfa82ac216211341d047078eed1346a39f327d856e8e9021e87d4c63ea9b26c0d581a0e2a0 SHA512 21953448f1695cf6b45d2eccf2eca7611d45c8407759fcc62b347afd22a4f25b79514275e18c473debc8070345b25bb49e1457e10bc37766f0590cb70f7f0230
 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449
 DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B 2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066 SHA512 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
+DIST ejabberd-20.03.tar.gz 2006603 BLAKE2B 67fa7d86e6802f24e783e91a8cb498375ca615bf22422ebe8bf630eb721e50574f468cfe25271172ebdfdca0c1df24dc6dd7f96a289153a017c32eb82af06d82 SHA512 f3ab666d9ffa596386ef121161dc7eeedca85cb7f5d290ad0882cd9557ea4166467bce9c082bdb423f932b44999c8e887d6a386d53564febf360f306feda3952
+DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
 EBUILD ejabberd-17.04-r2.ebuild 10910 BLAKE2B 8a5d34ca8fd943b604d07b9e6ca9aa092a40064b67a03ed58fc1fd4a74b626e3073cbb22d3ed4effb9e594f2e3c1a36ac63078dfe8b9b066bd7b7d9a5d1c7b2d SHA512 0b6d08ef700f1d721d436858f24505e8304733346a49dbe84252f4b69fe359aa505f2f888d4538c035c15704c477fe884904c64ef414648f18811f3e2de8dfc1
-MISC metadata.xml 1607 BLAKE2B d1a626950ca409cb0e4f099e469640abfc6c17506a15bdc5bfd3bad5c29040b14e271852db9df4b372f0291a9ea99c853295bbaf7c5bb39ef8e8f3eaae5166f1 SHA512 748c17470c1b6192734110511c426f097cddc123b9bcdc11dde1e2814e4a903c304260ad4eacc8be41dc312cc59a143ac27541ba7bd0b90282f62a0be8d15d3e
+EBUILD ejabberd-20.03.ebuild 9020 BLAKE2B 7963c866bb5215c62990a05d4a1088fcd803b8bd01ee228614691309617320ebe5c7fb0808683f77ee799353cbdbe9a5b1c0c6bf5345bebede3eef9a20665d7d SHA512 b31b5a4404f9df47f347f96cf803ef924b8b6f667412eb7d11065fa1fd959d2d6421df7b43794d142258cf4e933eb224bb81f406fab65e755fa0e8c4ec7d4b77
+EBUILD ejabberd-20.04.ebuild 9021 BLAKE2B 8c7cfdba1600945b13ff401bda8dc0ab2d94f1bb2e6537921fa5aa3cfcd713febfe6b769b84d24f6f995e5e635a8cedec8860e46b391b223bbbc6630b3dbe97b SHA512 d987ca546924ab60b7ab34d53dd8748eae7061b11f83a0d063a41cb4a223ad0c362ad3e5484d2bc34c2a0d03a0b8ec8040a301c366da8acd28bd18039a889140
+MISC metadata.xml 1681 BLAKE2B f8a55f8a55d979278382c8ca7e2664af897125c27c50df22a6cbea094836b5dbff6d78dddc36ba151243a2055fd5459b38421e8542d7e611d67a8bdf08938ab2 SHA512 9f8d23f14a43c26c30efd11c90d7e0d30659548e07e8cdca0e7f7b8dc4cb517d671646f57994b0ece33b25a46a8cc1dcca26edf27b4d5499d39c779320fdf2b9
diff --git a/net-im/ejabberd/ejabberd-20.03.ebuild b/net-im/ejabberd/ejabberd-20.03.ebuild
new file mode 100644
index 000000000000..7ed076748bb0
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-20.03.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
+	roster-gw sip sqlite stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:		>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl]
+	>=dev-erlang/cache_tab-1.0.22
+	>=dev-erlang/eimp-1.0.14
+	>=dev-erlang/fast_tls-1.1.4
+	>=dev-erlang/fast_xml-1.1.39
+	>=dev-erlang/fast_yaml-1.0.24
+	>=dev-erlang/yconf-1.0.4
+	>=dev-erlang/jiffy-1.0.1
+	>=dev-erlang/jose-1.9.0
+	>=dev-erlang/lager-3.6.10
+	>=dev-erlang/p1_oauth2-0.6.6
+	>=dev-erlang/p1_utils-1.0.18
+	>=dev-erlang/stringprep-1.0.19
+	>=dev-erlang/xmpp-1.4.5
+	>=dev-erlang/pkix-1.0.5
+	>=dev-erlang/mqtree-1.0.7
+	>=dev-erlang/idna-6.0.0
+	>=dev-erlang/p1_acme-1.0.5
+	>=dev-erlang/base64url-1.0
+	>=net-im/jabber-base-0.01
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.14 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.7 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.9 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	sip? ( >=dev-erlang/esip-1.0.32 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.6 )
+	stun? ( >=dev-erlang/stun-1.0.31 )
+	zlib? ( >=dev-erlang/ezlib-1.0.7 )"
+RDEPEND="${DEPEND}
+	captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+	"${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificate.
+adjust_config() {
+	sed -rne "/^#?\s+certfiles:/{p;a\  - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+	sed -re 's/^#\s+(certfiles)/\1/' \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="$1"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Check if we are missing a default certificate.
+ejabberd_cert_missing() {
+	if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then
+		if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then
+			# default certificate is present in config and exists - not installing
+			return 1
+		else
+			# default certificate is present in config
+			# but doesn't exist - need to install one
+			return 0
+		fi
+	fi
+	# no default certificate in config - not installing
+	return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+	install_cert "${EJABBERD_CERT%.*}"
+	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
+		-e 's!^(User|Group)=(.*)!\1=jabber!' \
+		-e 's!^(After)=(.*)!\1=epmd.service network.target!' \
+		-e '/^After=/ a Requires=epmd.service' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set paths in Makefile.in'
+	sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set paths ejabberdctl.template'
+}
+
+# Skip installing docs because it's only COPYING that's installed by Makefile.
+skip_docs() {
+	gawk -i inplace '
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
+	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
+		print $0;
+	} else {
+		next;
+	}
+}
+1
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	set_jabberbase_paths
+	make_ejabberd_service
+	skip_docs
+	adjust_config
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+
+	sed -e "s|\(AC_INIT(ejabberd, \)m4_esyscmd([^)]*)|\1[$PV]|" \
+		-i configure.ac || die "Failed to write correct version to configure"
+	# eautoreconf # required in case of download from github
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-user=jabber \
+		--disable-system-deps \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable hipe) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable sip) \
+		$(use_enable stun) \
+		$(use_enable zlib)
+
+	# more options to support
+	# --enable-elixir requires https://github.com/elixir-lang/elixir
+}
+
+src_compile() {
+	emake REBAR='rebar -v' src
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/lock/ejabberdctl
+	rm -rf "${ED%/}/var/log" || die
+	rm -rf "${ED%/}/var/spool" || die
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_preinst() {
+	if use pam; then
+		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam jabber || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  https://docs.ejabberd.im/"
+		echo
+	fi
+	if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then
+		ewarn If you are updating from an older version like 17.x
+		ewarn you may need to add an access_rules section to your
+		ewarn ejabberd.yml config file.
+		ewarn Otherwise authentication will be broken and users
+		ewarn will not be able to log in.
+		echo
+	fi
+
+	if ejabberd_cert_missing; then
+		ejabberd_cert_install
+	fi
+}
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild b/net-im/ejabberd/ejabberd-20.04.ebuild
new file mode 100644
index 000000000000..d68d2c5ba9ff
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
+	roster-gw sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:		>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl]
+	>=dev-erlang/cache_tab-1.0.22
+	>=dev-erlang/eimp-1.0.14
+	>=dev-erlang/fast_tls-1.1.5
+	>=dev-erlang/fast_xml-1.1.40
+	>=dev-erlang/fast_yaml-1.0.24
+	>=dev-erlang/yconf-1.0.4
+	>=dev-erlang/jiffy-1.0.1
+	>=dev-erlang/jose-1.9.0
+	>=dev-erlang/lager-3.6.10
+	>=dev-erlang/p1_oauth2-0.6.6
+	>=dev-erlang/p1_utils-1.0.18
+	>=dev-erlang/stringprep-1.0.19
+	>=dev-erlang/xmpp-1.4.6
+	>=dev-erlang/pkix-1.0.5
+	>=dev-erlang/mqtree-1.0.7
+	>=dev-erlang/idna-6.0.0
+	>=dev-erlang/p1_acme-1.0.5
+	>=dev-erlang/base64url-1.0
+	>=net-im/jabber-base-0.01
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.14 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.7 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.9 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	sip? ( >=dev-erlang/esip-1.0.32 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.6 )
+	stun? ( >=dev-erlang/stun-1.0.32 )
+	zlib? ( >=dev-erlang/ezlib-1.0.7 )"
+RDEPEND="${DEPEND}
+	captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+	"${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificate.
+adjust_config() {
+	sed -rne "/^#?\s+certfiles:/{p;a\  - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+	sed -re 's/^#\s+(certfiles)/\1/' \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="$1"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Check if we are missing a default certificate.
+ejabberd_cert_missing() {
+	if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then
+		if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then
+			# default certificate is present in config and exists - not installing
+			return 1
+		else
+			# default certificate is present in config
+			# but doesn't exist - need to install one
+			return 0
+		fi
+	fi
+	# no default certificate in config - not installing
+	return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+	install_cert "${EJABBERD_CERT%.*}"
+	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
+		-e 's!^(User|Group)=(.*)!\1=jabber!' \
+		-e 's!^(After)=(.*)!\1=epmd.service network.target!' \
+		-e '/^After=/ a Requires=epmd.service' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set paths in Makefile.in'
+	sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set paths ejabberdctl.template'
+}
+
+# Skip installing docs because it's only COPYING that's installed by Makefile.
+skip_docs() {
+	gawk -i inplace '
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
+	if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
+		print $0;
+	} else {
+		next;
+	}
+}
+1
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	set_jabberbase_paths
+	make_ejabberd_service
+	skip_docs
+	adjust_config
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+
+	sed -e "s|\(AC_INIT(ejabberd, \)m4_esyscmd([^)]*)|\1[$PV]|" \
+		-i configure.ac || die "Failed to write correct version to configure"
+	# eautoreconf # required in case of download from github
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-user=jabber \
+		--disable-system-deps \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable hipe) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable sip) \
+		$(use_enable stun) \
+		$(use_enable zlib)
+
+	# more options to support
+	# --enable-elixir requires https://github.com/elixir-lang/elixir
+}
+
+src_compile() {
+	emake REBAR='rebar -v' src
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/lock/ejabberdctl
+	rm -rf "${ED%/}/var/log" || die
+	rm -rf "${ED%/}/var/spool" || die
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_preinst() {
+	if use pam; then
+		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam jabber || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  https://docs.ejabberd.im/"
+		echo
+	fi
+	if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then
+		ewarn If you are updating from an older version like 17.x
+		ewarn you may need to add an access_rules section to your
+		ewarn ejabberd.yml config file.
+		ewarn Otherwise authentication will be broken and users
+		ewarn will not be able to log in.
+		echo
+	fi
+
+	if ejabberd_cert_missing; then
+		ejabberd_cert_install
+	fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch
new file mode 100644
index 000000000000..0fb1f5ce602e
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch
@@ -0,0 +1,38 @@
+Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
+
+Set SHELL since the generic jabber user used on Gentoo for jabber
+servers doesn't have a valid shell set by default and fix EXEC_CMD
+otherwise it fails with This account is currently not available again
+due to jabber not having a valid shell.
+
+Also, workaround the assumption that jabber's /root is a directory when
+instead it defaults to /dev/null on Gentoo.
+---
+
+diff --git a/ejabberdctl.template b/ejabberdctl.template
+index 571b90b..71336c0 100755
+--- a/ejabberdctl.template
++++ b/ejabberdctl.template
+@@ -82,6 +82,7 @@ fi
+ ERL_LIBS={{libdir}}
+ ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
+ ERL_INETRC="$ETC_DIR"/inetrc
++HOME=$SPOOL_DIR
+ 
+ # define ejabberd parameters
+ EJABBERD_OPTS="$EJABBERD_OPTS\
+@@ -105,12 +106,13 @@ export ERL_MAX_ETS_TABLES
+ export CONTRIB_MODULES_PATH
+ export CONTRIB_MODULES_CONF_DIR
+ export ERL_LIBS
++export HOME
+ 
+ # run command either directly or via su $INSTALLUSER
+ exec_cmd()
+ {
+     case $EXEC_CMD in
+-        as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
++        as_install_user) su -p -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
+         as_current_user) "$@" ;;
+     esac
+ }
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index d9f1e24554e1..ecd307a3a00f 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hanno@gentoo.org</email>
-		<name>Hanno Böck</name>
+	<maintainer type="project">
+		<email>ejabberd@gentoo.org</email>
 	</maintainer>
 	<longdescription>
 		Free and Open Source distributed fault-tolerant Jabber server. It's
@@ -25,6 +24,8 @@
 			data store</flag>
 		<flag name="roster-gw">Turn on workaround for processing gateway subscriptions</flag>
 		<flag name="sqlite">Enable SQLite database support</flag>
+		<flag name="sip">Enable SIP support</flag>
+		<flag name="stun">Enable STUN/TURN support</flag>
 		<flag name="zlib">Enable Stream Compression (XEP-0138) using zlib</flag>
 		<!-- TODO Add later: flag name="tools">Build development tools</flag -->
 	</use>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 53e2bff5cb89..39325c8b5edc 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,4 @@
-DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
 DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
-EBUILD gajim-1.0.3-r2.ebuild 2295 BLAKE2B 6044bfa83763707df79a7d5f2ae0712f5afcf449ccb245e48f918fd2b21b1517c741bf908b06f4d9d929024a4c00a31861085f0e128fe5689bbd8d6e463fc8b8 SHA512 88e1f444ac5696c6b32f32ae25b35ab9a8f1d3c488cc25475e0cab373571cb4ccdcc6d4c06431f153b02a2a1ca9aea2c2ca6c32e6db104dea0744fd0485e1d92
-EBUILD gajim-1.0.3-r3.ebuild 2297 BLAKE2B aac5800bb3a86e3e81eed09346d611b3062f828c5ea41fc32b28e02408014a7964e6a2733bf804d12a50ebcac3dcbb9fce5de4373790903c7e89d47ebbb682db SHA512 4df1bffc5e5ef45fa49fe4b7192559591d97f083e9c4b68820b36527fcb9b31259eb4ce9dfd985625d7cbc7e1a42704013435021aae2ab326fcae02ae24b74c8
-EBUILD gajim-1.1.3-r1.ebuild 2459 BLAKE2B dcd165d198ccafa0efd800c2a70015ce61e4bda11eb20552e914d93c5628945c6f37244aa01c4baeb615f2ef945364b73a4c79dd056102730c2a2fd860f114f6 SHA512 06ac23a42747cd5c02180415c9de61b073fd285ddcfb11bc75e02153f60de439b1154849b78661d5776d39ddbb92d71ec7ac47f7f958f495f7d3f1e453838bf7
-MISC metadata.xml 1061 BLAKE2B d7e37cec9e291addde0d1c18b155afdadee1225270c7f34f8a916f45ad828353f677f87e6de49994ba14af8cc4773689d7f629f991326e94a43ff36fa9c9b981 SHA512 f9eb4f8a033ca5cca7a2de4a43e98346cf446a20a9257ea95b37d9a6be6051224d55b32272167946c2cbef370cd3c1ddc3b27ce6b8794823d1e9ca9b5ebcac44
+EBUILD gajim-1.1.3-r1.ebuild 2457 BLAKE2B ffdea9fa425f2ae97e718ccc58cc13c95a908b0ff8019df5fc9b82b0b4be522d872b83ada56c1070165f81e20cb0a26df5b70abf0ca54c202cb0796f6c9d5986 SHA512 025c1ff713a2e975dd4c2c334d033fac30d0e4de9d778eeff0dc071d70a871777d5798497394963e49277fc9c529fc3c15e3b14a6f946daa39650c9e88d15125
+EBUILD gajim-1.1.3-r2.ebuild 2222 BLAKE2B 62d8baa9c3fb0fbb76b665244d692d10f4be65468cd9c2e5f5ff8abd5a04b72142f4b6bb3f39498c8d7f4685d084208ca1a5a3d84977d8ce1873e0427222bade SHA512 57e2256a177a3238bd4a21634ee30b43559c9b2326905d97740b0408070a950c098fb715d8ae453860279900a5f9ad368af069b9437678d7d96b16153fc1077e
+MISC metadata.xml 985 BLAKE2B ef02d7f96bcdc15c013e15ee79e3bb4dc591dd9697139f7331ca0bc065d2adfb2e6c2808f8c32d16dee433a1b03d4639f371a69e1d0870d498db55443ff3f713 SHA512 de8eba51dc79776b19e4122d6da16073c577c70dbe5b05dcbf7aa32a4c0b109c5b9cf222313aada405227f27ba8014c38baa73acfb0951691fbbcad1503801f5
diff --git a/net-im/gajim/gajim-1.0.3-r2.ebuild b/net-im/gajim/gajim-1.0.3-r2.ebuild
deleted file mode 100644
index a33e0fe9535f..000000000000
--- a/net-im/gajim/gajim-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2-utils distutils-r1 versionator xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_MULTI_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-nbxmpp-0.6.6[${PYTHON_MULTI_USEDEP}]
-		x11-libs/libXScrnSaver
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_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
-		)
-		keyring? (
-			app-crypt/libsecret[crypt,introspection]
-			dev-python/keyring[${PYTHON_MULTI_USEDEP}]
-		)
-		networkmanager? ( net-misc/networkmanager[introspection] )
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-RESTRICT="test"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.0.3-r3.ebuild b/net-im/gajim/gajim-1.0.3-r3.ebuild
deleted file mode 100644
index 31090b16376e..000000000000
--- a/net-im/gajim/gajim-1.0.3-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2-utils distutils-r1 versionator xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_MULTI_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-nbxmpp-0.6.6[${PYTHON_MULTI_USEDEP}]
-		x11-libs/libXScrnSaver
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_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
-		)
-		keyring? (
-			app-crypt/libsecret[crypt,introspection]
-			dev-python/keyring[${PYTHON_MULTI_USEDEP}]
-		)
-		networkmanager? ( net-misc/networkmanager[introspection] )
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-RESTRICT="test"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.1.3-r1.ebuild b/net-im/gajim/gajim-1.1.3-r1.ebuild
index 5d1e9b25f704..5f4b1383a6cb 100644
--- a/net-im/gajim/gajim-1.1.3-r1.ebuild
+++ b/net-im/gajim/gajim-1.1.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 #KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
 	+webp"
 
diff --git a/net-im/gajim/gajim-1.1.3-r2.ebuild b/net-im/gajim/gajim-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..12ae00b4857c
--- /dev/null
+++ b/net-im/gajim/gajim-1.1.3-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+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.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-0.6.9[${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/cssutils-1.0.2[${PYTHON_USEDEP}]
+		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/gajim/metadata.xml b/net-im/gajim/metadata.xml
index b7751e37af04..bd95a0793560 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -11,7 +11,6 @@
     <flag name="crypt">End to end encryption and GPG encryption</flag>
     <flag name="geolocation">Sharing your location</flag>
     <flag name="jingle">Audio and video calls</flag>
-    <flag name="keyring">Saving your password to your system keyring</flag>
     <flag name="networkmanager">Network lose detection using NetworkManager</flag>
     <flag name="remote">Controling Gajim instance from command line with gajim-remote</flag>
     <flag name="rst">Generating XHTML output from RST code</flag>
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index f26273c98675..8a5ce3d3baf0 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -3,10 +3,6 @@ AUX prosody.initd-r2 1067 BLAKE2B 64293637d5afaa5805cdfe3f2083aaa25fcd1611ce6dfe
 AUX prosody.service 275 BLAKE2B f1d889d59f507c990f0dddd8811465e2729fd4d7acde83204a0976affe8471707a64eaaeab31f458e526cebd7860aa470738008682a8e4363f86092f96d60d74 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c
 AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72b9a308fcb2a29e56cfb534d3b147ce4962a5aa62a52873245be622c800f1b1a8b714890f359a625a3 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc
 AUX prosody_cfg-0.11.2-r1.patch 726 BLAKE2B dd9c68bcb49184d01d24530cb6f239b21bb3fe16c8bac4bc18a56e095750911e96257966f74eb07d21327f9a5799dbd7360b9ca54c9b27ed6a0e64d3b575fdf3 SHA512 87ccbe199b72ca8d3d8bb3d60dfc8dab7502cd98fa56fb7cbdbc760a4cd46e9e3ddce8612dbf9927230f1595ca63e31b84f6e3fe185fe2537d42d99c38672dff
-DIST prosody-0.11.2.tar.gz 420689 BLAKE2B 3abdab188f66d4eccb21d0981b57d5015605a1257074bbd67098a8624f40a11960fb65a7f56a7d1421a23bfffdb34635eeac5d013c4b7d7d957c51cdff2276c1 SHA512 22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1
-DIST prosody-0.11.3.tar.gz 424098 BLAKE2B 58196234bced12ad84943763c48cdb6fa88b2bfd6390bf12d6bd0aec4f8905784ca5775d8fb55dc3ffe3bf22767742e2d62e859e3f2f9d08c65c9f8016036df0 SHA512 07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb
 DIST prosody-0.11.5.tar.gz 425122 BLAKE2B d65720a0c9d533a4be70847b690ecf037ae4b2fcbd090c81e2346d515599f3f148061103df2ffe46122a55694a3d35d53ab2b379fb5fb317e3b84a0ff5e82c29 SHA512 43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff
-EBUILD prosody-0.11.2-r1.ebuild 2760 BLAKE2B 04f7dd33b93b8d479b21b702a778c16fa102699de8fb76251be77d389b0ae9a0f6fb8c50b459394da3f468a44e011aa026f750de0ca92bbfcf29881271854ab8 SHA512 56e6080f603f3202055c64600f7cb431dc41e5d842a2688fb8cb368b180f68750a9c7462f46a7185958c4afd1195a02f81e007e853eb9c1223ab4d7c054f4416
-EBUILD prosody-0.11.3.ebuild 2086 BLAKE2B de56eb47db2d18939cff9dec07807b6cd8fad209d8f6e5f120092d2da0b779ba671555f778d459b563834f062ddb51ca03c9169b66da4e8269446a5bb2bb4428 SHA512 b0d9ce060c061cf8a5f08b37c9fc5d37a88ab6637f6c8fdecebb566206f471b4635d9ff5addc72e91f2116a609f835ec0ca03e8caf139c447813f62b0c9d5c1d
-EBUILD prosody-0.11.5.ebuild 2086 BLAKE2B de56eb47db2d18939cff9dec07807b6cd8fad209d8f6e5f120092d2da0b779ba671555f778d459b563834f062ddb51ca03c9169b66da4e8269446a5bb2bb4428 SHA512 b0d9ce060c061cf8a5f08b37c9fc5d37a88ab6637f6c8fdecebb566206f471b4635d9ff5addc72e91f2116a609f835ec0ca03e8caf139c447813f62b0c9d5c1d
+EBUILD prosody-0.11.5.ebuild 2083 BLAKE2B 98e9e34bbc9b8a46991f4baf8602b2d9ceda94fbd25122f344f816ad82c1032b1cdd8298ee017726ebb2b142bcf0240ed02fc0157aca9e5e2e5b141780c814b3 SHA512 007c3fc6a4ac1a8aff92cafccb6b3943195d37d10dd7924676827ef78bf5264f4ffec167205292106ae83959208205ffe74226303641ebb1ccd013b2117338aa
 MISC metadata.xml 454 BLAKE2B af4163bc7e18ffbab51ee4373985dea8db37408f8ef0982e7bef772ee4317d64018a1f2342adadf77005e120f17d4a706c7920763a8541dd983335f5d1379bd1 SHA512 8830635b65f87575b79745a8116b069e88f9b4a0de359199d6599acf369a60890b6e8cbf67703046ab751164e0b66a25d6f187aee8d9f75943c416c40dce3c24
diff --git a/net-im/prosody/prosody-0.11.2-r1.ebuild b/net-im/prosody/prosody-0.11.2-r1.ebuild
deleted file mode 100644
index 73982757b601..000000000000
--- a/net-im/prosody/prosody-0.11.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-MY_PV=$(ver_rs 3 '')
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl test"
-RESTRICT="!test? ( test )"
-
-BASE_DEPEND="net-im/jabber-base
-		dev-lua/LuaBitOp
-		!jit? ( >=dev-lang/lua-5.1:0 )
-		jit? ( dev-lang/luajit:2 )
-		>=net-dns/libidn-1.1:=
-		!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
-
-DEPEND="${BASE_DEPEND}
-		test? ( dev-lua/busted )"
-
-RDEPEND="${BASE_DEPEND}
-		>=dev-lua/luaexpat-1.3.0
-		dev-lua/luafilesystem
-		ipv6? ( >=dev-lua/luasocket-3 )
-		!ipv6? ( dev-lua/luasocket )
-		libevent? ( >=dev-lua/luaevent-0.4.3 )
-		mysql? ( dev-lua/luadbi[mysql] )
-		postgres? ( dev-lua/luadbi[postgres] )
-		sqlite? ( dev-lua/luadbi[sqlite] )
-		ssl? ( dev-lua/luasec )
-		zlib? ( dev-lua/lua-zlib )"
-
-S=${WORKDIR}/${MY_P}
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_prepare() {
-	default
-	rm makefile && mv GNUmakefile Makefile || die
-	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
-		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
-		Makefile || die
-	eapply "${FILESDIR}/prosody_cfg-0.11.2-r1.patch"
-}
-
-src_configure() {
-	# the configure script is handcrafted (and yells at unknown options)
-	# hence do not use 'econf'
-	append-cflags -D_GNU_SOURCE
-	./configure \
-		--ostype=linux \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sysconfdir="${EPREFIX}/${JABBER_ETC}" \
-		--datadir="${EPREFIX}/${JABBER_SPOOL}" \
-		--with-lua-include="${EPREFIX}/usr/include" \
-		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \
-		--runwith=lua"$(usev jit)" \
-		--cflags="${CFLAGS} -Wall -fPIC" \
-		--ldflags="${LDFLAGS} -shared" \
-		--c-compiler="$(tc-getCC)" \
-		--linker="$(tc-getCC)" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit "${FILESDIR}/${PN}".service
-	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
-	keepdir "${JABBER_SPOOL}"
-}
-
-pkg_postinst() {
-	elog "If you are using the MySQL backend, you need to update its schema:"
-	elog "https://prosody.im/doc/release/0.11.0#upgrade_notes"
-}
diff --git a/net-im/prosody/prosody-0.11.3.ebuild b/net-im/prosody/prosody-0.11.3.ebuild
deleted file mode 100644
index 44d19c37079e..000000000000
--- a/net-im/prosody/prosody-0.11.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd toolchain-funcs
-
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipv6 jit libevent libressl mysql postgres sqlite ssl test zlib"
-RESTRICT="!test? ( test )"
-
-BASE_DEPEND="net-im/jabber-base
-		dev-lua/LuaBitOp
-		!jit? ( >=dev-lang/lua-5.1:0 )
-		jit? ( dev-lang/luajit:2 )
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl:= )
-		>=net-dns/libidn-1.1:="
-
-DEPEND="${BASE_DEPEND}
-		test? ( dev-lua/busted )"
-
-RDEPEND="${BASE_DEPEND}
-		>=dev-lua/luaexpat-1.3.0
-		dev-lua/luafilesystem
-		!ipv6? ( dev-lua/luasocket )
-		ipv6? ( >=dev-lua/luasocket-3 )
-		libevent? ( >=dev-lua/luaevent-0.4.3 )
-		mysql? ( dev-lua/luadbi[mysql] )
-		postgres? ( dev-lua/luadbi[postgres] )
-		sqlite? ( dev-lua/luadbi[sqlite] )
-		ssl? ( dev-lua/luasec )
-		zlib? ( dev-lua/lua-zlib )"
-
-PATCHES=("${FILESDIR}/prosody_cfg-0.11.2-r1.patch")
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_configure() {
-	# the configure script is handcrafted (and yells at unknown options)
-	# hence do not use 'econf'
-	./configure \
-		--ostype=linux \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sysconfdir="${EPREFIX}${JABBER_ETC}" \
-		--datadir="${EPREFIX}${JABBER_SPOOL}" \
-		--with-lua-include="${EPREFIX}/usr/include" \
-		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \
-		--runwith=lua"$(usev jit)" \
-		--cflags="${CFLAGS} -Wall -fPIC" \
-		--ldflags="${LDFLAGS} -shared" \
-		--c-compiler="$(tc-getCC)" \
-		--linker="$(tc-getCC)" || die "configure failed"
-
-	rm makefile && mv GNUmakefile Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit "${FILESDIR}/${PN}".service
-	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
-	keepdir "${JABBER_SPOOL}"
-}
diff --git a/net-im/prosody/prosody-0.11.5.ebuild b/net-im/prosody/prosody-0.11.5.ebuild
index 44d19c37079e..77ea1552347c 100644
--- a/net-im/prosody/prosody-0.11.5.ebuild
+++ b/net-im/prosody/prosody-0.11.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="ipv6 jit libevent libressl mysql postgres sqlite ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
deleted file mode 100644
index 7bdb64cda20e..000000000000
--- a/net-im/pyicq-t/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX pyicq-t-0.8-initd-r1 606 BLAKE2B f5585a9abb6129e57fa2c30cf4203fad985a351fa3dace7fd9147588e7f10062b2d7e0f3bd1ec2ec08f9826612f9c7364d90a02205c6a4accd35dada6c484785 SHA512 f8563a7ec081ecbef2f40f7c923ceb43b6abe0ff016df57540fedf3feeff1e06f19fa777324ae97937c46c85344db25ffa7097d259c0e2f4c6bad9b7eaf30971
-AUX pyicq-t-0.8.1.5-pillow-imaging.patch 1236 BLAKE2B f394b84f530fc01ddc87ec3e9f2ec13d6f6dd902d2692e0d922a51170f13d8c423ac45198d5b3474c32c6db04b39c23ba13ff4ebc2753a049b22cfae48b98281 SHA512 e7e454493286e02e525cdc6d8b63fbb102eca0f242f046ec30f7541ff1a9579b43bad2250d34a7049d06c9958e4d93304d5f873b84cf2af6fbcaef726a8a5d5b
-AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 BLAKE2B edf98d20ea41bed32b3c4952c24f133a6d02a073402d0032140195fc9772eb85421ed202a72813922f61001d4c56e34fee38cc49701e646e1992961cb8e0f3ed SHA512 8b7cb353ff2c6259525909b62a6d552116339fe8489d747f7310fa9013011b6028c0f0dc165307ff5b9fe9da9517852c3e4158eb6f05a51f987e9cf2a969b949
-AUX pyicq-t.service 223 BLAKE2B 3f323776d36115207e5bd81f16c7c47b438bab74772cbcc3cabb5acb7ab992b0cb8edc6b76def436a9d65685d232754d988cb2c7dcecdc8bc5a2152cfdd0ceb7 SHA512 e1df68340f54bc6568308fefcc723323358c27b143cd3258f451ebf06e5f6ac0a7b66d7567543212e5924144164e0d9a2121fb96fa2721b234399a19127850c6
-DIST pyicqt-0.8.1.5.tar.gz 183865 BLAKE2B 5f0cce6fd9d27cf60f6234870644c95e016bc979a167d48a331df47cb25eefca96ed0082d336c931a6af5f25babaa7fdffc0cafdb0374463c066d5c185b02059 SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde
-EBUILD pyicq-t-0.8.1.5-r7.ebuild 1643 BLAKE2B 412e7f65d05a3eb66181db512a82f457fd51985dda6fe06255e7a226ca7a9d84058c8fa87c5e04dbdbd1f837b28748306849c5e64e37eca529ddb4f47bf98207 SHA512 10498348e90a090e5ee1bb8d6de21e25a0b63be3d223fcdaff9a179b9ecadecf3e2dd09a62a85f7557d8915cfe41634543c47d70c7d507a225df79dfa6061ef1
-MISC metadata.xml 419 BLAKE2B 89f7918635ee4ead843dee7a7b031eefc427b5df2c5edb25a3b891e21046ac346386a1270d69820594cd23957bab8690d0c55246696ffb204d8fe636ae097dfb SHA512 1f30a23054f9f867a94d7e899f5be0780b08cf070c9a2831a34f4fbafe03e19dc9fedb023d3825411104a7322e0d0c8b6928a4f30794511371dd9ec7ea2e339f
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1 b/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1
deleted file mode 100644
index eda03d55077e..000000000000
--- a/net-im/pyicq-t/files/pyicq-t-0.8-initd-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use jabber-server
-}
-
-start() {
-	ebegin "Starting ICQ Jabber Transport"
-	checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
-	start-stop-daemon --start --pidfile /var/run/jabber/pyicq-t.pid -u jabber -g jabber \
-		--exec INSPATH/pyicq-t.py -- \
-		-b -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ICQ Jabber Transport"
-	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyicq-t.pid
-	eend $?
-}
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch
deleted file mode 100644
index 62df75873c08..000000000000
--- a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-pillow-imaging.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur pyicqt-0.8.1.5/src/contact.py pyicqt-0.8.1.5-1/src/contact.py
---- pyicqt-0.8.1.5/src/contact.py	2009-08-24 14:37:59.000000000 +0200
-+++ pyicqt-0.8.1.5-1/src/contact.py	2013-09-11 22:19:01.320467367 +0200
-@@ -13,7 +13,7 @@
- import globals
- import base64
- if not config.disableAvatars:
--	import Image
-+	import PIL.Image as Image
- import StringIO
- 
- 
-diff -Naur pyicqt-0.8.1.5/src/imgmanip.py pyicqt-0.8.1.5-1/src/imgmanip.py
---- pyicqt-0.8.1.5/src/imgmanip.py	2009-08-24 14:37:59.000000000 +0200
-+++ pyicqt-0.8.1.5-1/src/imgmanip.py	2013-09-11 22:19:25.257168117 +0200
-@@ -5,7 +5,7 @@
- 
- if not config.disableAvatars:
- 	try:
--		import Image
-+		import PIL.Image as Image
- 		import StringIO
- 
- 		def convertToPNG(imageData):
-diff -Naur pyicqt-0.8.1.5/tools/infodump.py pyicqt-0.8.1.5-1/tools/infodump.py
---- pyicqt-0.8.1.5/tools/infodump.py	2009-08-24 14:37:59.000000000 +0200
-+++ pyicqt-0.8.1.5-1/tools/infodump.py	2013-09-11 22:18:34.084807860 +0200
-@@ -41,7 +41,7 @@
- 	print "Nevow Version: Unknown or Not Installed"
- 
- try:
--	from Image import VERSION
-+	from PIL.Image import VERSION
- 	print "Python Imaging Library (PIL) Version: " + VERSION
- except:
- 	print "Python Imaging Library (PIL) Version: Unknown or Not Installed"
diff --git a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff b/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff
deleted file mode 100644
index fd8e9e5ab8f0..000000000000
--- a/net-im/pyicq-t/files/pyicq-t-0.8.1.5-python26-warnings.diff
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur pyicqt-0.8.1.5/src/avatar.py p1//src/avatar.py
---- pyicqt-0.8.1.5/src/avatar.py	2010-06-07 12:16:36.000000000 +0200
-+++ p1//src/avatar.py	2010-06-07 12:16:16.000000000 +0200
-@@ -6,7 +6,7 @@
- from twisted.words.xish.domish import Element
- from debug import LogEvent, INFO, WARN, ERROR
- import lang
--import sha
-+from hashlib import sha1
- import base64
- import os
- import os.path
-@@ -46,7 +46,7 @@
- class Avatar:
- 	""" Represents an Avatar. Does not store the image in memory. """
- 	def __init__(self, imageData, avatarCache):
--		self.__imageHash = sha.sha(imageData).hexdigest()
-+		self.__imageHash = sha1(imageData).hexdigest()
- 		self.__avatarCache = avatarCache
- 
- 	def getImageHash(self):
-diff -Naur pyicqt-0.8.1.5/src/contact.py p1//src/contact.py
---- pyicqt-0.8.1.5/src/contact.py	2010-06-07 12:16:43.000000000 +0200
-+++ p1//src/contact.py	2010-06-07 12:16:16.000000000 +0200
-@@ -8,7 +8,6 @@
- import config
- from debug import LogEvent, INFO, WARN, ERROR
- import lang
--import sha
- import legacy
- import globals
- import base64
-diff -Naur pyicqt-0.8.1.5/src/legacy/buddies.py p1//src/legacy/buddies.py
---- pyicqt-0.8.1.5/src/legacy/buddies.py	2009-08-24 14:37:59.000000000 +0200
-+++ p1//src/legacy/buddies.py	2010-06-07 12:07:37.000000000 +0200
-@@ -12,7 +12,7 @@
- import os.path
- import binascii
- import os.path
--import md5
-+from hashlib import md5
- 
- X = os.path.sep
- 
-@@ -188,7 +188,7 @@
- 				avatarData = avatar.AvatarCache().setAvatar(imgmanip.convertToPNG(iconData))
- 				c.updateAvatar(avatarData, push=True)
- 				if not md5Hash:
--					m = md5.new()
-+					m = md5()
- 					m.update(iconData)
- 					md5Hash = m.digest()
- 				if not numHash:
-diff -Naur pyicqt-0.8.1.5/src/legacy/glue.py p1//src/legacy/glue.py
---- pyicqt-0.8.1.5/src/legacy/glue.py	2009-08-24 14:37:59.000000000 +0200
-+++ p1//src/legacy/glue.py	2010-06-07 12:07:37.000000000 +0200
-@@ -18,7 +18,7 @@
- import time
- import binascii
- import avatar
--import md5
-+from hashlib import md5
- import random
- 
- from twisted.python import log
-@@ -398,7 +398,7 @@
- 			try:
- 				self.myavatar = imgmanip.convertToJPG(imageData)
- 				self.myavatarlen = len(self.myavatar)
--				m=md5.new()
-+				m=md5()
- 				m.update(self.myavatar)
- 				self.myavatarsum = m.digest()
- 				self.myavatarstamp = time.time()
-diff -Naur pyicqt-0.8.1.5/src/legacy/icqt.py p1//src/legacy/icqt.py
---- pyicqt-0.8.1.5/src/legacy/icqt.py	2009-08-24 14:37:59.000000000 +0200
-+++ p1//src/legacy/icqt.py	2010-06-07 12:07:37.000000000 +0200
-@@ -14,7 +14,6 @@
- import time
- import datetime
- import binascii
--import md5
- import locale
- import struct
- 
-diff -Naur pyicqt-0.8.1.5/src/tlib/oscar.py p1//src/tlib/oscar.py
---- pyicqt-0.8.1.5/src/tlib/oscar.py	2009-08-24 14:37:59.000000000 +0200
-+++ p1//src/tlib/oscar.py	2010-06-07 12:07:37.000000000 +0200
-@@ -21,7 +21,7 @@
- from scheduler import Scheduler
- 
- import struct
--import md5
-+from hashlib import md5
- import string
- import socket
- import random
-@@ -120,9 +120,9 @@
-     return dict,data
- 
- def encryptPasswordMD5(password,key):
--    m=md5.new()
-+    m=md5()
-     m.update(key)
--    m.update(md5.new(password).digest())
-+    m.update(md5(password).digest())
-     m.update("AOL Instant Messenger (SM)")
-     return m.digest()
- 
-@@ -534,7 +534,7 @@
-         self.iconSum = tlvs.get(0xd5,"")
- 
-     def updateIcon(self, iconData):
--        m=md5.new()
-+        m=md5()
-         m.update(iconData)
-         self.iconSum = m.digest()
-         log.msg("icon sum is %s" % binascii.hexlify(self.iconSum))
diff --git a/net-im/pyicq-t/files/pyicq-t.service b/net-im/pyicq-t/files/pyicq-t.service
deleted file mode 100644
index 852ec13315af..000000000000
--- a/net-im/pyicq-t/files/pyicq-t.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=PyICQt is an ICQ transport for Jabber/XMPP
-
-[Service]
-ExecStart=INSPATH/pyicq-t.py -c /etc/jabber/pyicq-t.xml -l /var/log/jabber/pyicq-t.log
-User=jabber
-Group=jabber
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-im/pyicq-t/metadata.xml b/net-im/pyicq-t/metadata.xml
deleted file mode 100644
index 1e72bf501ea4..000000000000
--- a/net-im/pyicq-t/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>Python based jabber transport for ICQ</longdescription>
-	<use>
-		<flag name="webinterface">Install dependencies needed for the web
-		interface</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">pyicqt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild
deleted file mode 100644
index 4fee72e75470..000000000000
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 systemd
-
-MY_P="${P/pyicq-t/pyicqt}"
-
-DESCRIPTION="Python based jabber transport for ICQ"
-HOMEPAGE="https://code.google.com/p/pyicqt/"
-SRC_URI="https://pyicqt.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="webinterface"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	net-im/jabber-base"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-		webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_MULTI_USEDEP}] )
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-	')"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}/${P}-python26-warnings.diff"
-	"${FILESDIR}/${P}-pillow-imaging.patch"
-)
-
-src_install() {
-	python_moduleinto ${PN}
-	cp PyICQt.py ${PN}.py || die
-	python_domodule ${PN}.py data tools src
-
-	insinto /etc/jabber
-	newins config_example.xml ${PN}.xml
-	fperms 600 /etc/jabber/${PN}.xml
-	fowners jabber:jabber /etc/jabber/${PN}.xml
-	chmod 755 "${D}$(python_get_sitedir)/${PN}/${PN}.py" || die
-	sed -i \
-		-e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
-		-e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
-		"${ED}/etc/jabber/${PN}.xml" || die
-
-	newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" \
-		"${ED}/etc/init.d/${PN}" "${D%/}/$(systemd_get_systemunitdir)/${PN}.service" || die
-
-	python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
-}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index daae1fdc18ce..d95f99e4c29f 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.33.1_amd64.deb 98736548 BLAKE2B 3be5214eb4588a9a90cf2e48afe1ef51cce93f470cff78e6334536fff6aee082caa3d175c3f44314fc6581534ecf85637b090eeb08f4691f9f81d78a00d4b507 SHA512 af9ac50fe1c9605f32adf9cb96c6696bf5f18a7e43105c523bda7c689c2cc4504c4717fdf51dd0c8cc1dd0f72f7b3732a3ad240d04fb98e555a81a92b931b1f6
-EBUILD signal-desktop-bin-1.33.1.ebuild 2400 BLAKE2B 0ef74103fa97c0d7e2d4aa561a0b6e6a50485dfd969de43a2d4667fc283e43fa94becc6363a3cacb76c845edf642e1336637044b818f4349fe9476b76dd89cdf SHA512 68cef676e5d6e1ec1fcddaa787420ce728f660e6eacaadaad3c3a09d4d23e25cbd264bbce2f3aceeab50a4fa9009172ba5dacb4e52dceabcfa81163e95161a60
+DIST signal-desktop_1.33.4_amd64.deb 98801978 BLAKE2B d08ba8b74b9cffa7e81c50d225e936a2faf6d0fac9bb12d7841afd794dc136804ad37242a51eb7ec1311e41b35f7cd4c945f8e6169f0f0f2fff9a297e96897e8 SHA512 65789bac0d9748c4c9874b333bc0a05fcd30995f2ae61fb7cee0e3c52ad97ba110f5249559a7285e1bb9d214cc01f2529b89d306f73cfc0befe1d473da3e7210
+EBUILD signal-desktop-bin-1.33.4.ebuild 2400 BLAKE2B 0ef74103fa97c0d7e2d4aa561a0b6e6a50485dfd969de43a2d4667fc283e43fa94becc6363a3cacb76c845edf642e1336637044b818f4349fe9476b76dd89cdf SHA512 68cef676e5d6e1ec1fcddaa787420ce728f660e6eacaadaad3c3a09d4d23e25cbd264bbce2f3aceeab50a4fa9009172ba5dacb4e52dceabcfa81163e95161a60
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.33.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.33.4.ebuild
index 4f84db2ab7d9..4f84db2ab7d9 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.33.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.33.4.ebuild
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index ae76a3bd0b2a..a56e70f31c68 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,7 +1,3 @@
-DIST skypeforlinux_8.57.0.116-1.x86_64.rpm 107397354 BLAKE2B 22d1b41201087b3067e89e583734f0b195103dff52f2023e5cc812a977338f2af7eafe5e82bd3f34e263740a1c2791035ee6b75dc077865fa14f1dcc1189b9a6 SHA512 79b5019be9c4cdb28c3dd166aa76128385631e1bc4e31f0b0bfdb0c7af54494987faf4ab3ed05dc9f810b05e07de916d997d5fe4c722aff089e00789394ef3d3
-DIST skypeforlinux_8.58.0.93-1.x86_64.rpm 108966411 BLAKE2B b74dfe1758fbec9e000be7134d1b575a28077967c95b18955c6b90ac9b3bba1b69b19f91553185939f0e39a1ff80fa26020a383a42940c729d6256df01cf74cc SHA512 907159ac1fead3248114a9bf67a764df9f3ec7deb1b9008b6228d55deacbc6ee150e8496674a484c5be14a59ab33c163493b704c364c822177827fcacfba0452
 DIST skypeforlinux_8.59.0.77-1.x86_64.rpm 108914465 BLAKE2B 9d8300b9d315b95528e7e453a4b2175a22cc598634f0b517e6e0b45dfd7c04d6cee92d46d455486ee00ea1953617132e6c97576d5cc344988912aa3df03609e8 SHA512 4faa158605c13ee66bf49aad8e1b06f0429772c676088559fb28f6012cf263c1425f830678edd9605cfd69a4a0fb75f051fd96acd0a8a4fb636bb3a5beceb211
-EBUILD skypeforlinux-8.57.0.116-r1.ebuild 3116 BLAKE2B b58a55dde3626b2bdb8b72a808e169cf784076fd4c2efa3e7ef5b2c856d117993eb3d045479c2b2a94602fb265c4391f883865b673a2c2a8423a07583121e7ea SHA512 e0c45e1ba64707ded404af3b4dbca7cec82033efbe31c39ea08f5a088b1e9bb713023a4e603bc2ef04b12ae6a70d1d67946c9a742cc2ee97522b337ad8769d62
-EBUILD skypeforlinux-8.58.0.93.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 EBUILD skypeforlinux-8.59.0.77.ebuild 3117 BLAKE2B 48471cba3133ede445212d7bf290e0abb92d825a7057988242b9f8e23b9a1488c5f3098d9b6af60b5d7deb5d89084ff0bf09d6b2469ae6b2b83199cc398c2f63 SHA512 052d8e790e22a9e5117c35c1992a32f3dd2a58dab77185a3807d0222e2cef0f357ae75e9c48ed74834e489edba551327f2465954e5424bdb3020bbc14574c2b0
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.57.0.116-r1.ebuild b/net-im/skypeforlinux/skypeforlinux-8.57.0.116-r1.ebuild
deleted file mode 100644
index 6b1d41e5d34b..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.57.0.116-r1.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 "${D}"/opt || die
-
-	# remove chrome-sandbox binary, users should use kernel namespaces
-	# https://bugs.gentoo.org/692692#c18
-	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
-
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	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.58.0.93.ebuild b/net-im/skypeforlinux/skypeforlinux-8.58.0.93.ebuild
deleted file mode 100644
index c2755ee5b06c..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.58.0.93.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/slack/Manifest b/net-im/slack/Manifest
index cae6e5b31e84..d451e0a178f9 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,6 +1,5 @@
-DIST slack-desktop-4.1.1-amd64.deb 57986912 BLAKE2B eb90dff156eb826f8f15c3ab7c7c7127a321cd73011a11c6e24bc75721f4fa981980ad5b65e4accdce2fb893ac5ad8ddba42133de8285d8a9e10ac08bdb3ed70 SHA512 57b3e7a5a81406047bb9f8f8bb8ac322d3c801fe21919a388ac1457ccc68e50dab961c86a0e36ba9bb308e1832dc2ad00a038cddbad8ea9cc70ac186b37fec7c
 DIST slack-desktop-4.3.2-amd64.deb 54914760 BLAKE2B 218d4ba6cc2057bb92b84bd8bbbf94e70022a9e65363c256190584f0a92e1615642583647af2813e02ec2eb243a3428016b1bff3bfbbc6a98f227aa63a94a967 SHA512 36536be0825e1803704304346ea9db2d1d03baddec954dea0c4560bec2b1800cf3e6d431796d1fcd3b9178e3eb070e9ae6da64e4d3949eff649050cab21d5cb2
-EBUILD slack-4.1.1.ebuild 2903 BLAKE2B eaa5a84332d6058d935458f232cefc64914186b9d0f2e14bee3690a2a051e3bd76144791c25ae2ed93e08900b58a407632a13b23422edc4fc7467a7a139712fd SHA512 89ba52348d649b249f2b05373e39be261e4231a4b8194f0bd0f85e34501cf8571e65dca4034e43a4a38774b439ed5cbd078de6346036b0998a0f84f82da30f0b
-EBUILD slack-4.3.2-r1.ebuild 3003 BLAKE2B 8b78fcee36ad160cb340b0c91847e761e04a0a2c76628be8d2e6b3a02f4aedddec33ac22fd4b33bab90a3363d58ec0ef2a5000ba453b43be7c1d8df5539946b3 SHA512 bbe5691b308af8219b12edab3d667e6f894c09f0fca368c20ed7d316aca0c18bca845cd2309e571e8ba4e68a9cbc0c3351493cb6d2d1107d8a2bf5e6a3e5dee4
-EBUILD slack-4.3.2-r2.ebuild 3063 BLAKE2B 34fdbf0b9c974611882119657609be3d8de3d699ce51131d48432f4957c14776844d2e43b179aa0124425ea6cee8f73ccc108e945ae54817a5acfb64e58edc18 SHA512 ddd3ee45b640580427f29afacab7e7afa4169a578a49f2743a7ea8d4d364336aa3600bfe7b6a831d6e588a515c95ed28c83f93872d4a37f941ede782be0ecb72
+DIST slack-desktop-4.4.2-amd64.deb 54818266 BLAKE2B 12ce6cd423081b64919c511562c0508126d4e10f13168630b00d507c0c4b33f1291d158198ad9050008d43bd69755dd79dfa004443f83495aed7728560f318a6 SHA512 7680116ac8e438cea614484c814ed2903aab5432f8901799fdc2772471ca385a5a93d2dff43abe441ca4d4be0cae5d56c54119fb456483cfbb12c5621955f988
+EBUILD slack-4.3.2-r2.ebuild 3078 BLAKE2B 3180be30b3d979712bb69b0829449697839815ed47d471d156876850fa5718ccde0f9cc30498d407411d99cc22d5741c26b01046e47169fedf8cf3f1b0a7e886 SHA512 5ed2867def96a8d79336ca06b14e617aac5c5d1fd03aec749f8881f55c444660e16f2655180f4fe2c7c111c2f518a841ec22b3f816be05ea4159aca28a43bec7
+EBUILD slack-4.4.2.ebuild 3468 BLAKE2B 120bb01738b51095f90c997df248e0fa8cf91dee4dac0087e1bdecefff4155e57ddeef3f789dc6ca95f45a1e2aa475e84846a7ace08bff561fd853dced4117a1 SHA512 97578b2331e5345609c95ea35c64d1e143abd464d0f04617c4a39ea48c2ec6cb2e366d43b3cebfac573519ff878314869e01b6f41abead3334607a1a4f0565f0
 MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack/slack-4.1.1.ebuild b/net-im/slack/slack-4.1.1.ebuild
deleted file mode 100644
index 126d156dca1c..000000000000
--- a/net-im/slack/slack-4.1.1.ebuild
+++ /dev/null
@@ -1,100 +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 pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="ayatana gnome-keyring"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
-	dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/mesa:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	sys-apps/util-linux:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="/opt/slack/chrome-sandbox
-	opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libffmpeg.so
-	opt/slack/libEGL.so
-	opt/slack/libGLESv2.so
-	opt/slack/swiftshader/libEGL.so
-	opt/slack/swiftshader/libGLESv2.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# remove hardcoded path (wrt 694058)
-	sed -i '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
-		usr/share/applications/slack.desktop \
-		|| die "sed failed in Icon for slack.desktop"
-
-	if use ayatana ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt/slack
-	doins -r usr/lib/slack/.
-	fperms +x /opt/slack/slack
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	pax-mark -m "${ED}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	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/slack/slack-4.3.2-r2.ebuild b/net-im/slack/slack-4.3.2-r2.ebuild
index 3b995394ed53..01c6e59c2cfb 100644
--- a/net-im/slack/slack-4.3.2-r2.ebuild
+++ b/net-im/slack/slack-4.3.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="ayatana"
+IUSE="appindicator"
 RESTRICT="bindist mirror"
 
 RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
@@ -46,7 +46,7 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
 	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
 	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
 	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
+	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
 
 QA_PREBUILT="/opt/slack/chrome-sandbox
 	opt/slack/slack
@@ -69,7 +69,7 @@ src_prepare() {
 		usr/share/applications/slack.desktop \
 		|| die "sed failed in Icon for slack.desktop"
 
-	if use ayatana ; then
+	if use appindicator ; then
 		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
 			usr/share/applications/slack.desktop \
 			|| die "sed failed for slack.desktop"
diff --git a/net-im/slack/slack-4.3.2-r1.ebuild b/net-im/slack/slack-4.4.2.ebuild
index 354b565faab8..48b3a778dd01 100644
--- a/net-im/slack/slack-4.3.2-r1.ebuild
+++ b/net-im/slack/slack-4.4.2.ebuild
@@ -8,13 +8,13 @@ MULTILIB_COMPAT=( abi_x86_64 )
 inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
 
 DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://www.slack.com/"
+HOMEPAGE="https://www.slack.com"
 SRC_URI="https://downloads.slack-edge.com/linux_releases/${PN}-desktop-${PV}-amd64.deb"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="ayatana"
+IUSE="appindicator suid"
 RESTRICT="bindist mirror"
 
 RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
@@ -46,29 +46,31 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
 	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
 	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
 	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
+	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
 
 QA_PREBUILT="/opt/slack/chrome-sandbox
-	opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libffmpeg.so
-	opt/slack/libEGL.so
-	opt/slack/libGLESv2.so
-	opt/slack/swiftshader/libEGL.so
-	opt/slack/swiftshader/libGLESv2.so
-	opt/slack/swiftshader/libvk_swiftshader.so"
+	/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 (wrt 694058)
-	sed -i '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
+	# remove hardcoded path, logging noise (wrt 694058, 711494)
+	sed -i  -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
+		-e '/Exec/s|slack|slack -s|' \
 		usr/share/applications/slack.desktop \
 		|| die "sed failed in Icon for slack.desktop"
 
-	if use ayatana ; then
+	if use appindicator ; then
 		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
 			usr/share/applications/slack.desktop \
 			|| die "sed failed for slack.desktop"
@@ -82,7 +84,18 @@ src_install() {
 
 	insinto /opt/slack
 	doins -r usr/lib/slack/.
-	fperms +x /opt/slack/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
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 3f9ad045de4e..169edb810065 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,6 +1,8 @@
+AUX spectrum2-2.0.12-boost-173-compatibility.patch 652 BLAKE2B 496e0fb33f3e88775f91c028e6e89f74c3d7d72b09cd1818712b2da5a54b315fdbf00ab9a7525cca744070061d79f32fe3764f2700d695b37a8b308de08b8f88 SHA512 999e9330c4f0fbd1883df28d7fbe15fd40b1a492e6b925900734df2f493fa4241f2a234a1fd3db2b7dc77ddfef66026ab1a656806c17ae7f1fd8f75f9cdf0199
+AUX spectrum2-2.0.12-gcc-10-compatibility.patch 1731 BLAKE2B 5c0c828ee2bfc51affbb44e06b6a53414c608173be799e92c5ecc76a7411cd6cba5a818b7a4df80b209c64c8c0d543fa10077fe8e45f2014f84b614231b20c58 SHA512 228ccf52a17a88e18e5fe97da1ef39c207142286abc5b018fab08c2f3bc96f13fac89147406a23fbd986b35ad23da9b34239497a830396ae2864708f82925505
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36
-EBUILD spectrum2-2.0.12-r2.ebuild 2632 BLAKE2B ba13a6558905ef07680dee10fc76761cddae36e286730a86ddf430aef0953afe3fd80fe971a5714bf4b5db158a83a91f3973c793a5bcec5fe774a41fc204190e SHA512 2cd0a1bc261e7e821e4d7118cd6fe3c556837a7289ff619a686e5bb041f25a6f2493bc3aba41451a6ed2baa614706e06befab02c1db0d269cb183e31801ae25a
+EBUILD spectrum2-2.0.12-r2.ebuild 2742 BLAKE2B 6a75b45f4ebf98deb7f8061fe99d0c8b15f09d34c5991eaaf2119e6bfe312c702f698a15b7dcd09dbdd931c0d67ce5437f02a2000cdc8bac357fdb1da1902413 SHA512 3301190f242f2aa412a0ff1b22ff3e640e472cc701c8e541ab953d82ade39e6f571aa1dcd61cff5736666a09f956b13f0f301ed8b302ecc5d088249eb3a64efb
 MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
new file mode 100644
index 000000000000..b9a8adeee5a8
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch
@@ -0,0 +1,21 @@
+From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <kostecki@his.de>
+Date: Thu, 14 May 2020 10:34:43 +0200
+Subject: [PATCH] Fix compilation with boost-1.73
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ include/transport/ThreadPool.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h
+index 5902f965..ffd07c8e 100644
+--- a/include/transport/ThreadPool.h
++++ b/include/transport/ThreadPool.h
+@@ -1,5 +1,6 @@
+ #pragma once 
+ 
++#include <boost/bind.hpp>
+ #include <boost/thread.hpp>
+ #include <boost/thread/mutex.hpp>
+ #include <queue>
diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
new file mode 100644
index 000000000000..ad13208b3e13
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch
@@ -0,0 +1,54 @@
+From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <kostecki@his.de>
+Date: Wed, 13 May 2020 14:22:27 +0200
+Subject: [PATCH] Fix dfrotz compilation with GCC >= 10
+
+Since GCC enables by default -fno-common,
+the compilation of dfrotz due multiple definitions will fail.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ backends/frotz/dfrotz/dumb/dumb_init.c   | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_input.c  | 2 +-
+ backends/frotz/dfrotz/dumb/dumb_output.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c
+index 4b9c6704..35295b74 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_init.c
++++ b/backends/frotz/dfrotz/dumb/dumb_init.c
+@@ -7,7 +7,7 @@
+ 
+ #include "dumb_frotz.h"
+ 
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ 
+ #define INFORMATION "\
+ An interpreter for all Infocom and other Z-Machine games.\n\
+diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c
+index 4149b2b0..88fc8ae5 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_input.c
++++ b/backends/frotz/dfrotz/dumb/dumb_input.c
+@@ -5,7 +5,7 @@
+  */
+ 
+ #include "dumb_frotz.h"
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ 
+ static char runtime_usage[] =
+   "DUMB-FROTZ runtime help:\n"
+diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c
+index 9e505167..6dc7db82 100644
+--- a/backends/frotz/dfrotz/dumb/dumb_output.c
++++ b/backends/frotz/dfrotz/dumb/dumb_output.c
+@@ -7,7 +7,7 @@
+ 
+ #include "dumb_frotz.h"
+ 
+-f_setup_t f_setup;
++extern f_setup_t f_setup;
+ 
+ static bool show_line_numbers = FALSE;
+ static bool show_line_types = -1;
diff --git a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
index 0bc829465f94..e2a557eb7113 100644
--- a/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.12-r2.ebuild
@@ -64,6 +64,11 @@ DEPEND="
 # Tests are currently restricted, as they do completly fail
 RESTRICT="test"
 
+PATCHES="
+	"${FILESDIR}/${P}-boost-173-compatibility.patch"
+	"${FILESDIR}/${P}-gcc-10-compatibility.patch"
+"
+
 python_check_deps() {
 	has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]"
 }
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 880c576e6599..f74016015a0e 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,10 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-1.9.21.tar.gz 13712474 BLAKE2B be8b031a959505da62348a4d259ae3689d0953b37386fed4d0117fccf0284a7e4d2aabfda6a50354f624f026388331eb2ae8e282f08250381e938e4e06d90f73 SHA512 f6dafcbad6ef5d74d3faae575c63f4088a1f0462a8a0d22c972158c02c11a1618fba088c99275590333e1efc70fc7ccc057d6041b3b8679c9e3b441a3cc94221
-DIST tdesktop-2.0.1.tar.gz 13966764 BLAKE2B 43cc5d27c514ab7fa5517da1e6dbb1fd88655d8d3ba4a7b58d4f81be6d418fe3580e6944a90a70c6da198e09d86e84af09cfcfc2d0b6aacff0ad6f4fc3256bef SHA512 dcb7d93e3ae0e87bef342bbba6f95d50e8886f286bd606874155ea6f059aae2e656f0cf9e81732369c3dd21a6831587bcae59d39052c5f7d90fbfd4016e6a0ff
-DIST tsetup.1.9.21.tar.xz 34714240 BLAKE2B bf4e902006a08a678848fcdaf2a45a0f1d30c60005a922bb9d5c0e7c95ba01b3f8e55882f5ed65630f1d730166cd523e3713209e2a99d7cea7c490d738fa3b83 SHA512 0bba5d04f20fbe48b8672cb6b24acd6e5e8df700813f3f49074d06bc38d62ef8cf7b4358ec6d98afe05cef385cbbfa156fc21bc80a522ccdcf0acb6b05cdeeed
-DIST tsetup.2.0.1.tar.xz 35029188 BLAKE2B 6e528c42af1bb4a86068fa0eed7a3755efd49246dffd08c85492f40531624d37a76aa7f3e604abcb30b13b43ea8a458bf9d3c9669db4df5bdcba496701b3b9d4 SHA512 eb19b48ddb2de5443871e2d4c838f4f78046cab2f6037a2aff7f164f61905c5b5510688a968fc1ed51d1a1f2695bbca3a0b0f839c208513b14984737899ccfd0
-DIST tsetup32.1.9.21.tar.xz 37595672 BLAKE2B ee142f3893051cebbc1a507932e3a64ba446f7740a9e9761dbc8b97c6af29441d94e6e5a1319ef9bde1a21ffe1337913b4fdbf824b9da40a8e31c097944b0e1d SHA512 6262a611abd56a3ab91b64c9e80d8d64dac47fa9eb4b9f8c5c55a29aaf130bce94673386685fe829aa0ded5f5bd452e511a05c1d4704b7b3d0fe307aaedd3af4
-DIST tsetup32.2.0.1.tar.xz 37979332 BLAKE2B 3cefeaec2f269c509aaf06952ca2ee8226a4dcbc1bc80ae26f10bc11babb153ef7937b49647f4233fee6f4c664f902cb667701d4c7c917507cf461cad46c6dec SHA512 a461f284f68f7c59842ae71a628d1a3623d96cb1a07bdb23e5cd6a60690e431ffb35e47cbbcd55653a82019564fdf90edefd8585c4612135c094e13a1f3a0401
-EBUILD telegram-desktop-bin-1.9.21.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
-EBUILD telegram-desktop-bin-2.0.1.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
+DIST tdesktop-2.1.1.tar.gz 14020023 BLAKE2B 5fe70c6c224da0f7a890cf33ec01e39b692799515251d99a46a578e5025ad66f677a800feffb71710466dec34a0fbc887c1be6d851f34d6644511f756e3dd04b SHA512 02051c85b092a2a38762ec2e00b556901651204c29e1a9da46af474dfd6300b1eed7c4023450302e75e86e28e4bf0acc9ba99bf44ff225cf105920f01e9e89d8
+DIST tdesktop-2.1.3.tar.gz 14432478 BLAKE2B 4b51896205ad0f88f0e6f21bd3a51e5bb8d8303ac27a16cd16590035c6b884621206005e64c844d283290c61badbe8f0d7c4613c8b604618c2f50c27ea4a94e6 SHA512 b320fc023bfa612fd7a7d221d160b10f63bcbfb341f9e2cc300d428c6a8a23cec59298460599bb6f1db94b115c00e89741dd537778abc75aa4ad3831574c0e71
+DIST tsetup.2.1.1.tar.xz 35162344 BLAKE2B 82a78901b6ce33d1cc73e6cc5eb487549e75e93ecb986adc7b9b7d4cdfd86d7849666c29fe7a9fad4279970ad6eb49555e5e4076e61ae1bbb525dbd33cd16258 SHA512 ee1c0eb8a71383fefbeaebcfbca8492098a0215c45b0954df5b3ffb138535a070b6478883e5c0625940a6467ccdf9dfce5aebcfc5fbb5bdd4e3c5b7d9b672127
+DIST tsetup.2.1.3.tar.xz 35657980 BLAKE2B c32890b307ef8fa8b377a76bcb97b91ebc98c4d639a58f83407beabfb245e51a62cddf2fe4a932e698c3418be502c1fb013fb040a458a0460b8f2dcea27f8131 SHA512 392468fa889168ecfdbe5b6f631b297344f81e6a4ad1fe28d560708d97f1ad147b0c0313fb8ca2780b4b394116d35e5cf65838f06ee818664df20fed255bd30e
+DIST tsetup32.2.1.1.tar.xz 38129352 BLAKE2B 5f9d6440526ac7ee79cfdd4d8417b1420874422e97754bb83d9534464f23eae4974f4ed4a23ef640e822ff5dd332170271998b33b3959355af34794af34391db SHA512 aff5eefc244c670757a55789a940c4496352b66df47238cd98ad6a44c2e9ff9740bfb2b85767d700c8faaf594b612b951e684436d40db710f8c95590e683b55f
+DIST tsetup32.2.1.3.tar.xz 38630432 BLAKE2B de6ccecba96c4d2b9d9da50f135d2207ea6d1c67a4b700fedc609c45f429d2e443724bfc1fe97de63d8ce8022bea8d96e549ea3145b3c6e8f153884ed3d133bb SHA512 6d2ca6a119a82f53a56485ae06bae80b593b24bc5822b91545e3572581bbdb4f69c979b462e935ce6b3d5dcca409802b650e879400e47ea77339388debbc63b0
+EBUILD telegram-desktop-bin-2.1.1.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
+EBUILD telegram-desktop-bin-2.1.3.ebuild 1252 BLAKE2B 08e198c00a9b1b9d35ba4736973da5aebfec08e213d3473846942adda2bdc73d32e2f9249512d7a174475294d24e2edccf42871855256f0aa05a98c694bd1079 SHA512 ef7807360bf5c9affb8364d1b8eefeabe86e6f9a2f32fc8c8c620927a832efc420194e8f1193c7b667efb135266bde92bdee2c0f426d4879b797f10767809e63
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.21.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.1.ebuild
index c0971f7fc9b5..c0971f7fc9b5 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.9.21.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.1.ebuild
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.0.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.3.ebuild
index c0971f7fc9b5..c0971f7fc9b5 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.0.1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.1.3.ebuild
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 6c36570d5f74..d476ba4c08cd 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,6 +1,16 @@
 AUX 2.1.0-kde-dir.patch 2118 BLAKE2B 92ec09b35f474cdab0677a394dcef193249f6db8b4ac980a63e054fe841876133e81a9420c52d3d9c91066725a9a0049ae9bc1e80d46c22e4ca8dd9b18cfc328 SHA512 da144cd13f42cac06aa1932945fccf7367f37edca7fb4781e8fa38fe8af1cb52b3b6062396a9a5d2e243966bdbb093e541042446e237d88c59bc855ea347c4e3
 DIST tdesktop-2.0.1-full.tar.gz 26106949 BLAKE2B 3975e7d42af8b323a86408e2301b292d94b308413bb92d135673fb12851cd6672156dcf9b631482fa9b8dc9361d9593dc1104c8c335e0c610706b308414db01b SHA512 99cd7c5ca1e9dd75ecd98d272522b0e4aab2d46525e3d0c306503b7a00c9d25c1646e9d7462182682a58947c7435864af805a3b6f85906d8b21e5675cc8383cb
 DIST tdesktop-2.1.0-full.tar.gz 26133964 BLAKE2B c5eb476ea3ed02c2618e5b770bdce365bcf0d6124f75558570189e07e9dcd9f6f3282d53fec621be736cbd1269a9dd820629d4d9a36167d8f71109bfcd5a52e2 SHA512 46f5453c64d1dbd4cf8adde73fcc48e6b6f795972ab0f6516cb55112f47d5af990a049da356bedb81e6d3f7103c14a7be45369ff9a5a1812c07a1bfcda70646d
+DIST tdesktop-2.1.1-full.tar.gz 26178569 BLAKE2B 377820af9d2ceeab18fa1ca0458803770b9e1cf211ba9bac7f21ae75fcb8e59269ad742c9fc0acd1b6d484d36057c872146cfdba0653bd2461f3a585222cf0b0 SHA512 aa542c029ead2d1b6c398ecca949b86fae8f37094ceb462ace4628f8e53882faf35b3c2e4fe03dd2e4e17b07412896f7b05d6748b13c99a3bac117b7449d69a8
+DIST tdesktop-2.1.2-full.tar.gz 35603888 BLAKE2B 40ca92e5d7bcc291ce8b8ad4404dd27399dc5dd710e869759800c694c36721db892f1da9273c718672e2cea7d918059035f0af3e8cfd9a7b42f3f24b7d34b5a7 SHA512 c23d9a961132cd2592ce8f728ed7592091a8c2a1d94797facd93516ab0c9194bd5b90ba7a7d4e8aa778940bc4a23d4ac69507a9f150c3bf4e743c6659e545ccf
+DIST tdesktop-2.1.3-full.tar.gz 36121092 BLAKE2B 667f73ef9ea41e06b9cd536eacc1d84229376f78662f8e82916bbefde035145454c0c9a62b7fbe613dd1e502ae522ab88d23db8bfbc6e3cb7abe1e319cbd92b0 SHA512 ec5743a15fcc051cfea9379ecd5811a9300b46b29108a813a67575e2b2a99839c83943c5513f17a1119869f722519628884aa9af63cbf4b65640944c16ff27e9
+DIST tdesktop-2.1.4-full.tar.gz 36377172 BLAKE2B 115f98879539ad66d57cba1b725f65558804536318d72532a6c93e17626341199f3fc9ea446f11b6a31b5e526cb102faec1db94e54800dc96dfbb038bc42670a SHA512 5b27633cdcb4edb61af983c1e4867bac3d7d0864e100855ea3f00c1eb1037e6a9f43414c09211282b5b677603ddfaedbcf4cbf482502ca4e33152e417068c959
+DIST tdesktop-2.1.5-full.tar.gz 36478922 BLAKE2B 6a1c0a8086f5bcdc82a71cbfc77acc20a764dd89635a62aa91f4bb98242f27a6951c8107c0846322ef76796e5850a4d886771cf38420e06148b27a690f58bc90 SHA512 393ee98d511a8bcf1343b3599fddf8782682bddc3e158e641c73990146cb717b04e69d6d171f2bc7011a5a5d775b0f00e883b54184944d8f114f149a8a879a39
 EBUILD telegram-desktop-2.0.1-r1.ebuild 3634 BLAKE2B 63b7ac611fa44df6daf9d03229455c9fb478c6de5f6218304b3a697ae67d54d358079b01dddcb108cd56e72d279f3b1b390e910e046a0a8ef30e0c5d7f387db8 SHA512 600f025c5ef8580f05049789a26b289c69065b6a934bed14594121e79eba92b043150959eac2c0f61fb380c7ba5663e55ce006a866960d54a67506dd60bf1a3a
 EBUILD telegram-desktop-2.1.0.ebuild 3682 BLAKE2B 95425eff2648434f75cf3ee02a8fa5a44c748599ab73d3def605eb19f2324eed8e18b40e448996194d5134971090b8e0f0aa1da928bb05dda1b2ebd52ab5953e SHA512 3951aaac37407b23850dc3e7d69e53c1652fbb3eb61e0bdfc9780544ead08cbaf6dc5c4108530d32058d524d5ddee4bf3bcfee391deec7dcc0449fd5191aec4a
+EBUILD telegram-desktop-2.1.1.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
+EBUILD telegram-desktop-2.1.2.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
+EBUILD telegram-desktop-2.1.3.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
+EBUILD telegram-desktop-2.1.4.ebuild 3963 BLAKE2B 89f0888644ac5d319868f3c8c5ed2705072708d681e214432edbdd6cf6eef86e911d14dc5dfe2cbcaf71915a8dfdb9e66c5656c4fd1b2fa1d1b97ace1736f28f SHA512 ab6877e776d861f146b8432e448af442e805dff55345a18a586da99255bcfa1afad4e3148972d22e0956c7000740c90c9a8fa051eecebeb8a537c89194b24328
+EBUILD telegram-desktop-2.1.5.ebuild 3963 BLAKE2B fac016b41b7de244c6c9835e14d59e4e96dd90f0bfa4bf6fdb99a42b0e08754386b69511b3a0b3e84ace10d325720005d90d793876bcdfb37a32d19532262357 SHA512 7de0ee03d16798a54ae48648c2bdeda7b7e437cef97642191bcafce527ced845dfa0d5787b0554a90b92e36be3fb988aab5febc20a59badca1552f2f2856b3df
 MISC metadata.xml 429 BLAKE2B fd7c38c1636548f8fbd5b20f3c64681fd2e379dd6c1b9f25f159b15d4a287fd8cefaf11aa655784176990130f39ec7fcc6eb246a89c06c48e9480a1232c195a8 SHA512 b2ef15fa658070bca96cd00cb2dfb7d43befe9f1c06c0a6f2a3d29e85e8a90e626e782235379e500332ca9ca81cccc761793140c8d34791c57b2942aa0c76a88
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.1.ebuild
new file mode 100644
index 000000000000..9dad2e7e8a3a
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-cpp/range-v3
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png,X(-)?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	media-libs/opus:=
+	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/libiconv
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+	|| ( X wayland )
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
+	local mycmakeargs=(
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.2.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.2.ebuild
new file mode 100644
index 000000000000..9dad2e7e8a3a
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-cpp/range-v3
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png,X(-)?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	media-libs/opus:=
+	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/libiconv
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+	|| ( X wayland )
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
+	local mycmakeargs=(
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.3.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.3.ebuild
new file mode 100644
index 000000000000..9dad2e7e8a3a
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-cpp/range-v3
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png,X(-)?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	media-libs/opus:=
+	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/libiconv
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+	|| ( X wayland )
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
+	local mycmakeargs=(
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.4.ebuild
new file mode 100644
index 000000000000..9dad2e7e8a3a
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-cpp/range-v3
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png,X(-)?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	>=media-libs/libtgvoip-2.4.4_p20200301[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	media-libs/opus:=
+	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/libiconv
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+	|| ( X wayland )
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
+	local mycmakeargs=(
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.5.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.5.ebuild
new file mode 100644
index 000000000000..3206772347bb
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-2.1.5.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+alsa +dbus enchant +hunspell libressl pulseaudio +spell wayland +X"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-cpp/range-v3
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg,png,wayland?,X(-)?]
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5[png,X(-)?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	>=media-libs/libtgvoip-2.4.4_p20200430[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	media-libs/opus:=
+	media-video/ffmpeg:=[alsa?,opus,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/libiconv
+	dbus? (
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+	|| ( X wayland )
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	# TODO: unbundle GSL, version 3.0.1 required and has nasty googletest dep
+	local mycmakeargs=(
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_GSL=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index acb76182fb31..ecf67718bdfc 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,13 @@
+AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 AUX zoom-videocam.svg 284 BLAKE2B fa118d489cafa1c14841c27ab4962c41d52987ee49b8ad0fb3e4c33d7cf376920e16a8f7358807d0809231fbf7ef8cafd4752ac90e85cc7395a56fbe07f6340d SHA512 a60345de0c86003dc49484fd5d3d22e3228b8b1c107796690289a7779769436809dd22b02b4951df2fc1e3a98c541dec4b0788ab7d112b2b9c8c29a46493a98d
 AUX zoom-videocam.xpm 806 BLAKE2B dcb9d7e2a90f564ed6b7f0b733efb72867ecf2418177b25ecd5a00e204ab9f0f89c2b1f3b3078b3cf326c8c523480f183170a82d896b73848e7596b32a351a9b SHA512 a49e7cce25e6b3a1492b2ed834f7fe8f533b5374b0c4eea4089003459ac011ef264175c5c2322cceb77f8fb67e939e90e9abddeef415d2f570add8301cd10a48
-DIST zoom-3.5.385850.0413_i686.tar.xz 48715128 BLAKE2B 470bb0ca4479ab81e658a4e1820c4a857b34a929e677ff5fc6b10dcdd12017586d9ea2141d55fe0346fc71ad9cffe5c10eb013dc48c89a3bbf5560143a435f67 SHA512 8aaba240a72101868627dbb64c1027ca6da3c014481b5b7900557c99671baa44af22747408296bee128164b2de5c5b516ae0fb3ffab5ab555ed072056cfb3a99
-DIST zoom-3.5.385850.0413_x86_64.tar.xz 72960852 BLAKE2B d843254eae3aa5047516dcd3d865b77c61e052dac40cf6bfbe1bac7e6c0ce65a9bd6be1f647c5de49bdcb279300577f78358c4ffdedb8e77543fee89a13cc076 SHA512 42e6a2a302c917ac6908827f3ea32cd488633580b68cf04a08e7c43a56f31cbb50427d1835dbec609d2bc5aa10b0ad9ab973febf82bc1a04e61a4fbb1c6f8f8a
 DIST zoom-3.5.392530.0421_i686.tar.xz 48727688 BLAKE2B bbbc589ed1ad0fa5b38dbfab03e68c9d102cb7ac8220287a477261def77dd349e12ff351e7581aa59dc184813b923b1026a57ca1d4111ba42171b36cfb4f09c1 SHA512 e7501f02a31cd0a58df362cb3c3f43bbcb58ce15d0a55b440747b0e096d367cbb877aab9b4b21579016307376c0ca3831a09d1639bd67321fa3c6ceec3daf414
 DIST zoom-3.5.392530.0421_x86_64.tar.xz 72984788 BLAKE2B 90823dc29bb679b9d75e80764bae8b13da77fb7fce2c5f873118037e420ff67f9c1f8de63b90ae84a8de56feb571033d3803fb9cf6676f3f5380012a71b708e0 SHA512 1af24a10eff6d70c00d72fe5432340ada3b486778e9c06d2d11cf802ea0bc02792469db7f172fafd9329bddba9face6b0d28e3892c3657959500c1be34dc31af
-EBUILD zoom-3.5.385850.0413.ebuild 2880 BLAKE2B 929e1aeac09009c1d5c2a8429568ba516ae80a6416bd8110b50a0a6ac885acb5169d61ceee63e6fdbb659d7625af129b3caa535e00fa34dbbb4bca3d350136f4 SHA512 ee4d1a8a680bc946972b7bf5bc11e4eef5890196624ce9e05c7c71926953f8655e7253a5f812898a6e4477be17a7ef2c34cb28243ac6d200d7886ddde2559210
+DIST zoom-5.0.399860.0429_i686.tar.xz 38589772 BLAKE2B 900702db7dd5bd7aea4aae60e0fa5925afa1df081cb9004dae3e86d3bdbcaec151f03325d7de0cce5e7f11d745bc70d73dde2a93c0918da6ea5a1911cf416143 SHA512 42792ba934418fdc0def31bb16071bcfefd7a5a10075e0de220b9b107a3a5d7ca5f3d4fc71b2e9ab8702acec6b7532da75d6ccfa55a40280d59518644de1c9a1
+DIST zoom-5.0.399860.0429_x86_64.tar.xz 41470716 BLAKE2B f3d26a2d2ec95209ed0126be29ba5658c68a2769dab58457da021e2d8b555a8475d18e168236b52559582ac088f0163b2ed32d803e08e3f0c6249fe7df5c7b41 SHA512 1a9c9cbcfcd0e58c330780f78779ecb08265fdb87813f54be89d20f26aeaf4c89176055cc8210559eaa24f995e544198b7099cc328388794cbb6f6b0a9dac2d9
+DIST zoom-5.0.403652.0509_i686.tar.xz 38658880 BLAKE2B 60d93987f627ecaeb149570e225d9c0e74ddb3e21a9565e7465ff2aab0dee3ff3d304ec58f35a9ed783e4fbb8ca7d4c24706a7aa76c194f94e40ab77f75073f9 SHA512 3f49c76b28dc0c14272df6632cb0cdafcd67500bf14a5a7e4e0a7f6e685a0d7e3adef522a1c5ba3f8a31ef8c5d880ed686dcf1dae1934b1f86dc8e3871894b64
+DIST zoom-5.0.403652.0509_x86_64.tar.xz 41506968 BLAKE2B 51fff1a2915fad97c4f5cfde370c1dd1c4849d01b9ea7eaa77580d31d46acbdcc4a19bed7e105e8323f02c7bc344d4ff42ed2a434729b880eedb66f1a3f1f0b4 SHA512 5a6c2070b71324ef89040377b759c5ba0f4ab21662c9cf714e57af5bc0a3f28d029f03fd80883479f7a62561b2f136ad480d2efd3dce83398aab814e2a21f8fe
 EBUILD zoom-3.5.392530.0421.ebuild 2880 BLAKE2B 929e1aeac09009c1d5c2a8429568ba516ae80a6416bd8110b50a0a6ac885acb5169d61ceee63e6fdbb659d7625af129b3caa535e00fa34dbbb4bca3d350136f4 SHA512 ee4d1a8a680bc946972b7bf5bc11e4eef5890196624ce9e05c7c71926953f8655e7253a5f812898a6e4477be17a7ef2c34cb28243ac6d200d7886ddde2559210
+EBUILD zoom-5.0.399860.0429.ebuild 2747 BLAKE2B 0862946b94563a7b3e93dc05e25abe201373fe364fadba5ce876c3ff9ac9ed07ca7236908b2ccf4fd13f254e6cc68849f550d51d99400db10b2ff1177cd74fe8 SHA512 4cabb003258c8f8e4f742b8fe4b5765eb225dbc0fe1eb2cc9845f1205b9c8df871d11577a32a128a881d44db677fcd1d429f0d88e967c27e777c6ac2e211aeac
+EBUILD zoom-5.0.403652.0509.ebuild 2943 BLAKE2B 9b10620159da25e02039ebb9c23c5c18156deaee26dba141ba493a81c6d1726fbb0af5183ef3000077357b5d825e183c1ee6b24e559bef50d96c9a4209b0b779 SHA512 0005570d9996facff7712df8bf2d55adc418e24417017b7f819c36ad72ae10f69c40f4a1f800fba55fed139ce18e6e2425d2502ca03a931f7a29ab514b281a6e
 MISC metadata.xml 523 BLAKE2B f258ebdf8e4a2e067f202ede6324203b640c6a7fce843cc4b42cf4eef6efd97620e50c22c80f885d09254e403f016758d7dd3ba1deeef0c26692487a2ca9ba35 SHA512 9746752364f19f9e17516315231c8efef278f4d77ddcbfde213b5a65b012d6e320a20536e44ac5a111b2370a21cb59eb7a88c5c3fd2a1dd44064702d5e7bca38
diff --git a/net-im/zoom/files/README.gentoo b/net-im/zoom/files/README.gentoo
new file mode 100644
index 000000000000..06f1f9b3dce0
--- /dev/null
+++ b/net-im/zoom/files/README.gentoo
@@ -0,0 +1,5 @@
+Some of Zoom's screen share features (e.g., the whiteboard) require
+display compositing. If you encounter a black window when sharing
+the screen, then one of the following actions should help:
+- Enable compositing in your window manager if it is supported
+- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)
diff --git a/net-im/zoom/zoom-3.5.385850.0413.ebuild b/net-im/zoom/zoom-5.0.399860.0429.ebuild
index 3dccb750177a..f2a3aea4c103 100644
--- a/net-im/zoom/zoom-3.5.385850.0413.ebuild
+++ b/net-im/zoom/zoom-5.0.399860.0429.ebuild
@@ -22,6 +22,8 @@ RDEPEND="!games-engines/zoom
 	dev-libs/icu
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
+	amd64? ( dev-qt/qtdeclarative:5[widgets] )
+	x86? ( dev-qt/qtdeclarative:5 )
 	dev-qt/qtdiag:5
 	dev-qt/qtgraphicaleffects:5
 	dev-qt/qtgui:5
@@ -41,17 +43,6 @@ RDEPEND="!games-engines/zoom
 	x11-libs/libXtst
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-keysyms
-	amd64? (
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtpositioning:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwebchannel:5
-		dev-qt/qtwebengine:5[widgets]
-	)
-	x86? (
-		dev-qt/qtdeclarative:5
-		dev-qt/qtwebkit:5
-	)
 	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
 	pulseaudio? ( media-sound/pulseaudio )
 	!pulseaudio? ( media-libs/alsa-lib )"
diff --git a/net-im/zoom/zoom-5.0.403652.0509.ebuild b/net-im/zoom/zoom-5.0.403652.0509.ebuild
new file mode 100644
index 000000000000..314ddbedc6b4
--- /dev/null
+++ b/net-im/zoom/zoom-5.0.403652.0509.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
+	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libjpeg-turbo pulseaudio"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="!games-engines/zoom
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	amd64? ( dev-qt/qtdeclarative:5[widgets] )
+	x86? ( dev-qt/qtdeclarative:5 )
+	dev-qt/qtdiag:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-sound/mpg123
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-libs/alsa-lib )"
+
+BDEPEND="!pulseaudio? ( dev-util/bbe )"
+
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	doins -r json sip timezones translations
+	doins *.pcm *.pem *.sh Embedded.properties version.txt
+	use amd64 && doins icudtl.dat
+	doexe zoom{,.sh,linux} zopen ZoomLauncher
+	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so.0.1.0
+		dosym libturbojpeg.so.0.1.0 /opt/zoom/libturbojpeg.so
+	else
+		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
+	fi
+
+	make_wrapper zoom ./zoom /opt/zoom
+	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
+		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+	# The tarball doesn't contain an icon, so take a generic camera icon
+	# from https://github.com/google/material-design-icons, modified to be
+	# white on a blue background
+	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
+	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	local FORCE_PRINT_ELOG v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
commit	deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree	9a48f42594e1a9e6b2020d5535a784314434d7a7 /net-im
parent	38423c67c8a23f6a1bc42038193182e2da3116eb (diff)