gentoo resync : 20.03.2022

92 files changed, 1781 insertions, 925 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 17deda26e01c..a435f74c290f 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/biboumi/Manifest b/net-im/biboumi/Manifest
index 13726a938684..92eeaed6625a 100644
--- a/net-im/biboumi/Manifest
+++ b/net-im/biboumi/Manifest
@@ -1,5 +1,7 @@
+AUX biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch 12110 BLAKE2B be6b390b6c08786e499e80027ffb3980d241aca93114bcef8b5ba48c312f28c37fe1cefef2c654f53f8bf9f887968fd7d81959ef856a1921a963e242bc69c718 SHA512 ea3f9e1276363144d9af07270ab0297805cdd449c80445fe5c309d5c470d85e603d66c43821ac3e66bdb5ead7535b672e8ca953b9b7c2a1b8050fba4be81697e
+AUX biboumi-9.0-use-system-catch2.patch 6128 BLAKE2B 13c581b2c80b4404296aebe8f8fd3d1f31269a62de97bfd08285fdad27c24bd59ccd93c1da7fa817e2b79bfc0824e131aba7f58e816908cddf671428a6b9578a SHA512 1d5ec4cbe407a7e42097005233601e9f31e0a8289fb3d5a780ae3c366f6d16dc136229b94307fe95947863571a88384e1c4ebadd7b99b5cbcc331db9ee958a3c
 AUX biboumi.initd 520 BLAKE2B bdbc87967462914eee4537cd4a0d11d9aefdb13c2f860159c003c56424f0c1b702670c2baed94c299161b7b292c097a9b8eb5c18475b6ff07fa392d28a50a249 SHA512 e13b30e67ac801b36f16f4dc453e1f41910c2f5828772af66af9e1e0cdd32a8209c907fdcd0e50afd691da0c8e2cad10803a51e681ce6bf86876439c968a0319
 AUX biboumi.logrotate 193 BLAKE2B d44e520d149bbd379cf5636482327bf480401f9810c7103df1ada990e959863f857b97c8f74b1943d23ec61e4f0a1501be82c906ab41ebe49ca84b2279357cf3 SHA512 438c290f2632e4e901e6ec359d8480c67e787d8e89ec19dd2bfe2abae86684532d712b93d382024a2ea5818b03a491ed1d9768f950c57c717db8cd0cacb5f7c8
 DIST biboumi-9.0.tar.xz 161192 BLAKE2B 27c19f5c44e23caae07bd579b01d663e73cd8b432203ac95ae77e651936eea7cc443f389e589acebe5b36c32e96f215fdf0a86c97193726d601b53b709a2d66e SHA512 cfaacd831b56031906922472275c55fd6f1a5307ebe54959d21e3799ad4612499e8beeb34e8736df9eabc9fec1a861d17567250d64f316ace47395fd6c8f3c18
-EBUILD biboumi-9.0-r2.ebuild 2057 BLAKE2B af342a4bd879f07339a6feef779d4efab989e267c4664b426f2aab719e8f01cd5fe85d45a7998a18439bcf5037f61fa2b7eaa300c09142b8d1ddeabc11f1cab5 SHA512 d6c23ddd1c41045b9dadb363ce2dd965fbca1fe1f63ea770fa92317b9363b09b377c1cb03fe78f9560976abdc2adcf11de33a9eb14dc86a6fc8badf4134049fa
+EBUILD biboumi-9.0-r4.ebuild 2334 BLAKE2B 4351a37405d1632fef520f3dcc2978045589ab94c502654a299e32f099589138f8f826a5b8b56728879585a18e659b6470d4ddb48bb14f3613c79f82701a233f SHA512 27079bc9e59b96f9f0862f3bc13d6611392d39ca1bf20215c00b9188f0b5cd208bc1ab23a39116220e9c71d12b499e9f5298904d9d73e6eea154bfbc6730d192
 MISC metadata.xml 732 BLAKE2B 3418ff1a363aea3373d4f68cada39664e6c82b97c08a469bbfb45451e66cb80ad1eb1a31fd9aa5dab5b652a2627b86899e3812249bef2967143e188ed25f251f SHA512 35d9fac63a66783356d0111ada2ca78536ff01ecbf6f0db92d6fc968380f3533004f061ce0c353fb8898a83dddfc31a86d67b773abfaea8fe16d3e35c61f874e
diff --git a/net-im/biboumi/biboumi-9.0-r2.ebuild b/net-im/biboumi/biboumi-9.0-r4.ebuild
index 4f571807cf7e..2c45760b3892 100644
--- a/net-im/biboumi/biboumi-9.0-r2.ebuild
+++ b/net-im/biboumi/biboumi-9.0-r4.ebuild
@@ -14,9 +14,10 @@ SRC_URI="https://git.louiz.org/biboumi/snapshot/biboumi-${MY_PV}.tar.xz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+idn postgres +sqlite +ssl systemd udns"
+IUSE="+idn postgres +sqlite +ssl systemd test udns"
+RESTRICT="!test? ( test )"
 
-DEPEND="
+COMMON_DEPEND="
 	dev-libs/expat
 	virtual/libiconv
 	sys-apps/util-linux
@@ -28,9 +29,13 @@ DEPEND="
 	!ssl? ( dev-libs/libgcrypt )
 	systemd? ( sys-apps/systemd:= )
 "
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-cpp/catch:0 )
+"
 BDEPEND="dev-python/sphinx"
 RDEPEND="
-	${DEPEND}
+	${COMMON_DEPEND}
 	acct-user/biboumi
 "
 
@@ -38,6 +43,11 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 DOCS=( README.rst CHANGELOG.rst doc/user.rst )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0-do-not-use-as-a-namespace-separator-with-expat.patch"
+	"${FILESDIR}/${PN}-9.0-use-system-catch2.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DSERVICE_USER="${PN}"
@@ -90,6 +100,10 @@ src_compile() {
 	cmake_build man
 }
 
+src_test() {
+	cmake_build check
+}
+
 src_install() {
 	cmake_src_install
 
diff --git a/net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch b/net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch
new file mode 100644
index 000000000000..f82cbae81928
--- /dev/null
+++ b/net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch
@@ -0,0 +1,301 @@
+From 0061298dd0945f7f67e7fa340c6649b179c804d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
+Date: Thu, 10 Mar 2022 23:23:47 +0100
+Subject: [PATCH] Do not use ':' as a namespace separator with expat
+
+Instead use \1, and build our own nodes by explicitely separating the
+namespace and the node name.
+---
+ src/xmpp/adhoc_command.cpp          |  6 +++---
+ src/xmpp/adhoc_commands_handler.cpp | 12 ++++++------
+ src/xmpp/biboumi_adhoc_commands.cpp | 28 ++++++++++++++--------------
+ src/xmpp/xmpp_component.cpp         |  2 +-
+ src/xmpp/xmpp_parser.cpp            |  2 +-
+ src/xmpp/xmpp_parser.hpp            |  4 ++--
+ src/xmpp/xmpp_stanza.cpp            | 14 +++++++++++++-
+ src/xmpp/xmpp_stanza.hpp            |  6 ++++++
+ tests/xmpp.cpp                      |  2 ++
+ 9 files changed, 48 insertions(+), 28 deletions(-)
+
+diff --git a/src/xmpp/adhoc_command.cpp b/src/xmpp/adhoc_command.cpp
+index fbf4ce200b82..f8c8e4f146d6 100644
+--- a/src/xmpp/adhoc_command.cpp
++++ b/src/xmpp/adhoc_command.cpp
+@@ -26,7 +26,7 @@ void PingStep1(XmppComponent&, AdhocSession&, XmlNode& command_node)
+ 
+ void HelloStep1(XmppComponent&, AdhocSession&, XmlNode& command_node)
+ {
+-  XmlSubNode x(command_node, "jabber:x:data:x");
++  XmlSubNode x(command_node, "jabber:x:data", "x");
+   x["type"] = "form";
+   XmlSubNode title(x, "title");
+   title.set_inner("Configure your name.");
+@@ -65,9 +65,9 @@ void HelloStep2(XmppComponent&, AdhocSession& session, XmlNode& command_node)
+         }
+     }
+   command_node.delete_all_children();
+-  XmlSubNode error(command_node, ADHOC_NS":error");
++  XmlSubNode error(command_node, ADHOC_NS, "error");
+   error["type"] = "modify";
+-  XmlSubNode condition(error, STANZA_NS":bad-request");
++  XmlSubNode condition(error, STANZA_NS, "bad-request");
+   session.terminate();
+ }
+ 
+diff --git a/src/xmpp/adhoc_commands_handler.cpp b/src/xmpp/adhoc_commands_handler.cpp
+index ff4c1e5506fb..7a84b2e11a45 100644
+--- a/src/xmpp/adhoc_commands_handler.cpp
++++ b/src/xmpp/adhoc_commands_handler.cpp
+@@ -36,16 +36,16 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co
+   auto command_it = this->commands.find(node);
+   if (command_it == this->commands.end())
+     {
+-      XmlSubNode error(command_node, ADHOC_NS":error");
++      XmlSubNode error(command_node, ADHOC_NS, "error");
+       error["type"] = "cancel";
+-      XmlSubNode condition(error, STANZA_NS":item-not-found");
++      XmlSubNode condition(error, STANZA_NS, "item-not-found");
+     }
+   else if (command_it->second.is_admin_only() &&
+            !Config::is_in_list("admin", jid.bare()))
+     {
+-      XmlSubNode error(command_node, ADHOC_NS":error");
++      XmlSubNode error(command_node, ADHOC_NS, "error");
+       error["type"] = "cancel";
+-      XmlSubNode condition(error, STANZA_NS":forbidden");
++      XmlSubNode condition(error, STANZA_NS, "forbidden");
+     }
+   else
+     {
+@@ -94,9 +94,9 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co
+         }
+       else                      // unsupported action
+         {
+-          XmlSubNode error(command_node, ADHOC_NS":error");
++          XmlSubNode error(command_node, ADHOC_NS, "error");
+           error["type"] = "modify";
+-          XmlSubNode condition(error, STANZA_NS":bad-request");
++          XmlSubNode condition(error, STANZA_NS, "bad-request");
+         }
+     }
+   return command_node;
+diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp
+index 792955c37ec7..aea316d64042 100644
+--- a/src/xmpp/biboumi_adhoc_commands.cpp
++++ b/src/xmpp/biboumi_adhoc_commands.cpp
+@@ -34,7 +34,7 @@ void DisconnectUserStep1(XmppComponent& xmpp_component, AdhocSession&, XmlNode&
+ {
+   auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component);
+ 
+-  XmlSubNode x(command_node, "jabber:x:data:x");
++  XmlSubNode x(command_node, "jabber:x:data", "x");
+   x["type"] = "form";
+   XmlSubNode title(x, "title");
+   title.set_inner("Disconnect a user from the gateway");
+@@ -108,9 +108,9 @@ void DisconnectUserStep2(XmppComponent& xmpp_component, AdhocSession& session, X
+           return;
+         }
+     }
+-  XmlSubNode error(command_node, ADHOC_NS":error");
++  XmlSubNode error(command_node, ADHOC_NS, "error");
+   error["type"] = "modify";
+-  XmlSubNode condition(error, STANZA_NS":bad-request");
++  XmlSubNode condition(error, STANZA_NS, "bad-request");
+   session.terminate();
+ }
+ 
+@@ -124,7 +124,7 @@ void ConfigureGlobalStep1(XmppComponent&, AdhocSession& session, XmlNode& comman
+   auto options = Database::get_global_options(owner.bare());
+ 
+   command_node.delete_all_children();
+-  XmlSubNode x(command_node, "jabber:x:data:x");
++  XmlSubNode x(command_node, "jabber:x:data", "x");
+   x["type"] = "form";
+   XmlSubNode title(x, "title");
+   title.set_inner("Configure some global default settings.");
+@@ -220,9 +220,9 @@ void ConfigureGlobalStep2(XmppComponent& xmpp_component, AdhocSession& session,
+       note.set_inner("Configuration successfully applied.");
+       return;
+     }
+-  XmlSubNode error(command_node, ADHOC_NS":error");
++  XmlSubNode error(command_node, ADHOC_NS, "error");
+   error["type"] = "modify";
+-  XmlSubNode condition(error, STANZA_NS":bad-request");
++  XmlSubNode condition(error, STANZA_NS, "bad-request");
+   session.terminate();
+ }
+ 
+@@ -238,7 +238,7 @@ void ConfigureIrcServerStep1(XmppComponent&, AdhocSession& session, XmlNode& com
+   auto commands = Database::get_after_connection_commands(options);
+ 
+   command_node.delete_all_children();
+-  XmlSubNode x(command_node, "jabber:x:data:x");
++  XmlSubNode x(command_node, "jabber:x:data", "x");
+   x["type"] = "form";
+   XmlSubNode title(x, "title");
+   title.set_inner("Configure the IRC server " + server_domain);
+@@ -565,9 +565,9 @@ void ConfigureIrcServerStep2(XmppComponent& xmpp_component, AdhocSession& sessio
+       note.set_inner("Configuration successfully applied.");
+       return;
+     }
+-  XmlSubNode error(command_node, ADHOC_NS":error");
++  XmlSubNode error(command_node, ADHOC_NS, "error");
+   error["type"] = "modify";
+-  XmlSubNode condition(error, STANZA_NS":bad-request");
++  XmlSubNode condition(error, STANZA_NS, "bad-request");
+   session.terminate();
+ }
+ 
+@@ -586,7 +586,7 @@ void insert_irc_channel_configuration_form(XmlNode& node, const Jid& requester,
+   auto options = Database::get_irc_channel_options_with_server_default(requester.local + "@" + requester.domain,
+                                                                        iid.get_server(), iid.get_local());
+   node.delete_all_children();
+-  XmlSubNode x(node, "jabber:x:data:x");
++  XmlSubNode x(node, "jabber:x:data", "x");
+   x["type"] = "form";
+   XmlSubNode title(x, "title");
+   title.set_inner("Configure the IRC channel " + iid.get_local() + " on server " + iid.get_server());
+@@ -671,9 +671,9 @@ void ConfigureIrcChannelStep2(XmppComponent& xmpp_component, AdhocSession& sessi
+     }
+   else
+     {
+-      XmlSubNode error(command_node, ADHOC_NS":error");
++      XmlSubNode error(command_node, ADHOC_NS, "error");
+       error["type"] = "modify";
+-      XmlSubNode condition(error, STANZA_NS":bad-request");
++      XmlSubNode condition(error, STANZA_NS, "bad-request");
+       session.terminate();
+     }
+ }
+@@ -749,7 +749,7 @@ void DisconnectUserFromServerStep1(XmppComponent& xmpp_component, AdhocSession&
+     { // Send a form to select the user to disconnect
+       auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component);
+ 
+-      XmlSubNode x(command_node, "jabber:x:data:x");
++      XmlSubNode x(command_node, "jabber:x:data", "x");
+       x["type"] = "form";
+       XmlSubNode title(x, "title");
+       title.set_inner("Disconnect a user from selected IRC servers");
+@@ -794,7 +794,7 @@ void DisconnectUserFromServerStep2(XmppComponent& xmpp_component, AdhocSession&
+   command_node.delete_all_children();
+   auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component);
+ 
+-  XmlSubNode x(command_node, "jabber:x:data:x");
++  XmlSubNode x(command_node, "jabber:x:data", "x");
+   x["type"] = "form";
+   XmlSubNode title(x, "title");
+   title.set_inner("Disconnect a user from selected IRC servers");
+diff --git a/src/xmpp/xmpp_component.cpp b/src/xmpp/xmpp_component.cpp
+index de9a7a631be6..62a98ce3bb2c 100644
+--- a/src/xmpp/xmpp_component.cpp
++++ b/src/xmpp/xmpp_component.cpp
+@@ -175,7 +175,7 @@ void XmppComponent::on_stanza(const Stanza& stanza)
+ 
+ void XmppComponent::send_stream_error(const std::string& name, const std::string& explanation)
+ {
+-  Stanza node("stream:error");
++  Stanza node("stream", "error");
+   {
+     XmlSubNode error(node, name);
+     error["xmlns"] = STREAM_NS;
+diff --git a/src/xmpp/xmpp_parser.cpp b/src/xmpp/xmpp_parser.cpp
+index 781fe4cd94b0..1f25fa6f982b 100644
+--- a/src/xmpp/xmpp_parser.cpp
++++ b/src/xmpp/xmpp_parser.cpp
+@@ -38,7 +38,7 @@ XmppParser::XmppParser():
+ void XmppParser::init_xml_parser()
+ {
+   // Create the expat parser
+-  this->parser = XML_ParserCreateNS("UTF-8", ':');
++  this->parser = XML_ParserCreateNS("UTF-8", '\1');
+   XML_SetUserData(this->parser, static_cast<void*>(this));
+ 
+   // Install Expat handlers
+diff --git a/src/xmpp/xmpp_parser.hpp b/src/xmpp/xmpp_parser.hpp
+index ec42f9a326e1..1e5e4e55a875 100644
+--- a/src/xmpp/xmpp_parser.hpp
++++ b/src/xmpp/xmpp_parser.hpp
+@@ -18,9 +18,9 @@
+  * stanza is reasonnably short.
+  *
+  * The element names generated by expat contain the namespace of the
+- * element, a colon (':') and then the actual name of the element.  To get
++ * element, a \1 separator and then the actual name of the element.  To get
+  * an element "x" with a namespace of "http://jabber.org/protocol/muc", you
+- * just look for an XmlNode named "http://jabber.org/protocol/muc:x"
++ * just look for an XmlNode named "http://jabber.org/protocol/muc\1x"
+  *
+  * TODO: enforce the size-limit for the stanza (limit the number of childs
+  * it can contain). For example forbid the parser going further than level
+diff --git a/src/xmpp/xmpp_stanza.cpp b/src/xmpp/xmpp_stanza.cpp
+index 435f33313b09..0103dd71a357 100644
+--- a/src/xmpp/xmpp_stanza.cpp
++++ b/src/xmpp/xmpp_stanza.cpp
+@@ -52,7 +52,7 @@ XmlNode::XmlNode(const std::string& name, XmlNode* parent):
+   parent(parent)
+ {
+   // split the namespace and the name
+-  auto n = name.rfind(':');
++  auto n = name.rfind('\1');
+   if (n == std::string::npos)
+     this->name = name;
+   else
+@@ -67,6 +67,18 @@ XmlNode::XmlNode(const std::string& name):
+ {
+ }
+ 
++XmlNode::XmlNode(const std::string& xmlns, const std::string& name, XmlNode* parent):
++    name(name),
++    parent(parent)
++{
++  this->attributes["xmlns"] = xmlns;
++}
++
++XmlNode::XmlNode(const std::string& xmlns, const std::string& name):
++    XmlNode(xmlns, name, nullptr)
++{
++}
++
+ void XmlNode::delete_all_children()
+ {
+   this->children.clear();
+diff --git a/src/xmpp/xmpp_stanza.hpp b/src/xmpp/xmpp_stanza.hpp
+index f4b394814e5b..a706337baca0 100644
+--- a/src/xmpp/xmpp_stanza.hpp
++++ b/src/xmpp/xmpp_stanza.hpp
+@@ -25,6 +25,8 @@ class XmlNode
+ public:
+   explicit XmlNode(const std::string& name, XmlNode* parent);
+   explicit XmlNode(const std::string& name);
++  explicit XmlNode(const std::string& xmlns, const std::string& name, XmlNode* parent);
++  explicit XmlNode(const std::string& xmlns, const std::string& name);
+   /**
+    * The copy constructor does not copy the parent attribute. The children
+    * nodes are all copied recursively.
+@@ -150,6 +152,10 @@ public:
+             XmlNode(name),
+             parent_to_add(parent_ref)
+     {}
++    XmlSubNode(XmlNode& parent_ref, const std::string& xmlns, const std::string& name):
++        XmlNode(xmlns, name),
++        parent_to_add(parent_ref)
++    {}
+ 
+     ~XmlSubNode()
+     {
+diff --git a/tests/xmpp.cpp b/tests/xmpp.cpp
+index 14c51daa460f..c49c2fda94ea 100644
+--- a/tests/xmpp.cpp
++++ b/tests/xmpp.cpp
+@@ -67,6 +67,8 @@ TEST_CASE("substanzas")
+       CHECK(!d.has_children());
+     }
+     CHECK(b.has_children());
++    XmlSubNode e(a, "namespace", "name");
++    CHECK(e.get_tag("xmlns") == "namespace");
+   }
+   CHECK(a.has_children());
+ }
+-- 
+2.34.1
+
diff --git a/net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch b/net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch
new file mode 100644
index 000000000000..edda7a37c50b
--- /dev/null
+++ b/net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch
@@ -0,0 +1,229 @@
+From 414ab9e13fc9e9fa79f7f0a8e1b4a46cd3bd92fd Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sun, 27 Feb 2022 11:06:42 +0100
+Subject: [PATCH] Use the system installation of catch2 if possible
+
+---
+ CMakeLists.txt         | 41 ++++++++++++++++++++++++-----------------
+ tests/colors.cpp       |  2 +-
+ tests/config.cpp       |  2 +-
+ tests/database.cpp     |  2 +-
+ tests/encoding.cpp     |  2 +-
+ tests/iid.cpp          |  2 +-
+ tests/io_tester.cpp    |  2 +-
+ tests/irc.cpp          |  2 +-
+ tests/jid.cpp          |  2 +-
+ tests/logger.cpp       |  2 +-
+ tests/network.cpp      |  2 +-
+ tests/test.cpp         |  2 +-
+ tests/timed_events.cpp |  2 +-
+ tests/utils.cpp        |  2 +-
+ tests/uuid.cpp         |  2 +-
+ tests/xmpp.cpp         |  2 +-
+ 16 files changed, 39 insertions(+), 32 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f07b97feb57b..8175012fe070 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -288,24 +288,31 @@ foreach(file ${source_all})
+ endforeach()
+ 
+ #
+-## Add a rule to download the catch unit test framework
++## Catch unit test framework
+ #
+-include(ExternalProject)
+-ExternalProject_Add(catch
+-  GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git"
+-  PREFIX "external"
+-  UPDATE_COMMAND ""
+-  CONFIGURE_COMMAND ""
+-  BUILD_COMMAND ""
+-  INSTALL_COMMAND ""
+-  )
+-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE)
+-ExternalProject_Get_Property(catch SOURCE_DIR)
+-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp)
+-  target_include_directories(test_suite
+-    PUBLIC "${SOURCE_DIR}/single_include/"
+-    )
+-  add_dependencies(test_suite catch)
++find_package(Catch2 2.2.1)
++if(Catch2_FOUND)
++  target_link_libraries(test_suite Catch2::Catch2)
++else()
++  # No system-wide installation of the catch unit test framework was
++  # found, download it.
++  include(ExternalProject)
++  ExternalProject_Add(catch
++	GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git"
++	PREFIX "external"
++	UPDATE_COMMAND ""
++	CONFIGURE_COMMAND ""
++	BUILD_COMMAND ""
++	INSTALL_COMMAND ""
++	)
++  set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE)
++  ExternalProject_Get_Property(catch SOURCE_DIR)
++  if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp)
++	target_include_directories(test_suite
++      PUBLIC "${SOURCE_DIR}/single_include/"
++      )
++	add_dependencies(test_suite catch)
++  endif()
+ endif()
+ 
+ #
+diff --git a/tests/colors.cpp b/tests/colors.cpp
+index bf529896dce7..a9761dfff648 100644
+--- a/tests/colors.cpp
++++ b/tests/colors.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <bridge/colors.hpp>
+ #include <xmpp/xmpp_stanza.hpp>
+diff --git a/tests/config.cpp b/tests/config.cpp
+index ec9844fbd5f6..76cfe92e3e51 100644
+--- a/tests/config.cpp
++++ b/tests/config.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ #include "io_tester.hpp"
+ 
+ #include <iostream>
+diff --git a/tests/database.cpp b/tests/database.cpp
+index 070a46013997..bf6bc20324cb 100644
+--- a/tests/database.cpp
++++ b/tests/database.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <biboumi.h>
+ 
+diff --git a/tests/encoding.cpp b/tests/encoding.cpp
+index b5192ffbdb8d..8129abc9230e 100644
+--- a/tests/encoding.cpp
++++ b/tests/encoding.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <utils/encoding.hpp>
+ 
+diff --git a/tests/iid.cpp b/tests/iid.cpp
+index 63b2ba38ca55..7e61f35e348b 100644
+--- a/tests/iid.cpp
++++ b/tests/iid.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <irc/iid.hpp>
+ #include <irc/irc_user.hpp>
+diff --git a/tests/io_tester.cpp b/tests/io_tester.cpp
+index 19c97c91aff8..34f89fdac603 100644
+--- a/tests/io_tester.cpp
++++ b/tests/io_tester.cpp
+@@ -1,5 +1,5 @@
+ #include "io_tester.hpp"
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ #include <iostream>
+ 
+ /**
+diff --git a/tests/irc.cpp b/tests/irc.cpp
+index 0f30f15e2fdf..cb53e3f226ff 100644
+--- a/tests/irc.cpp
++++ b/tests/irc.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <irc/irc_message.hpp>
+ 
+diff --git a/tests/jid.cpp b/tests/jid.cpp
+index 592d6f3d0b78..516f961fabbb 100644
+--- a/tests/jid.cpp
++++ b/tests/jid.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <xmpp/jid.hpp>
+ #include <biboumi.h>
+diff --git a/tests/logger.cpp b/tests/logger.cpp
+index 1e3392a4bd43..b4736da3648d 100644
+--- a/tests/logger.cpp
++++ b/tests/logger.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <logger/logger.hpp>
+ #include <config/config.hpp>
+diff --git a/tests/network.cpp b/tests/network.cpp
+index a52eb6acfef8..790190f8d0bf 100644
+--- a/tests/network.cpp
++++ b/tests/network.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ #include <network/tls_policy.hpp>
+ #include <sstream>
+ 
+diff --git a/tests/test.cpp b/tests/test.cpp
+index 0c7c351f437f..62bf7476a189 100644
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -1,2 +1,2 @@
+ #define CATCH_CONFIG_MAIN
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+diff --git a/tests/timed_events.cpp b/tests/timed_events.cpp
+index fece422e99d5..6eaf99b3e1b9 100644
+--- a/tests/timed_events.cpp
++++ b/tests/timed_events.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <utils/timed_events.hpp>
+ 
+diff --git a/tests/utils.cpp b/tests/utils.cpp
+index 6151733e7cf4..22b45cf3113b 100644
+--- a/tests/utils.cpp
++++ b/tests/utils.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <utils/tolower.hpp>
+ #include <utils/revstr.hpp>
+diff --git a/tests/uuid.cpp b/tests/uuid.cpp
+index 12c6c32adbeb..7720e3aaee30 100644
+--- a/tests/uuid.cpp
++++ b/tests/uuid.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <xmpp/xmpp_component.hpp>
+ 
+diff --git a/tests/xmpp.cpp b/tests/xmpp.cpp
+index 14c51daa460f..01508a63481d 100644
+--- a/tests/xmpp.cpp
++++ b/tests/xmpp.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ 
+ #include <xmpp/xmpp_parser.hpp>
+ #include <xmpp/auth.hpp>
+-- 
+2.34.1
+
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index c061b3b4fa03..90fa0280e084 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -5,6 +5,6 @@ AUX bitlbee-3.6-disabled-plugins-use.patch 1695 BLAKE2B 5c5ab3f330921a471da5fcc3
 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4
 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.6-r1.ebuild 3341 BLAKE2B e91afe4ad7be562ea05e9873a0727559da22a8f70caf33b7a3f8b1188713d42490df427d7dfe014a58cdc60d47313214721f4e2de03311cad1be7d377fb37c99 SHA512 2db04f8963adc260b2af110fa74b6b8b149d209b88cf1d249f67ea7da39b47a3d167139920525f4c2d535d4b8ce3924eebb3878c74811c14ff83373b64244be6
-EBUILD bitlbee-9999.ebuild 3217 BLAKE2B ad62dbddc0d6d83a76beea2ee75d94c3837bb3bc1f4a3bc7a176e672520d44b8960411ec7e13981549259273134e04d08e8eadfad033597dad59c190fe19d4ce SHA512 88c03d63ce6b8332b877c6de67a34f01eb33376bdbff33a554ba9667a68201a023e9a20e98fe42ce162e5338e44644bf12b94bd742e71dfd4c4ee4f42cbd7bd5
+EBUILD bitlbee-3.6-r1.ebuild 3342 BLAKE2B 9021e9595a47267eabc7955c6a68b89021c57e082834749db7413f511929a9cb5a192000784f6c48f7cc95cd7f55f6a79621f789c5cdded6b72b322b3ddd491a SHA512 d0feac7423a4830c65453b61e030c77e31719060055974ad24ae9865eb10a9caa808b1a75a7987a4fc6b17c03445dd116fdbe8479f570ecc1c2cfe56bd0a1dff
+EBUILD bitlbee-9999.ebuild 3218 BLAKE2B 8231cd3ec7dcd56b6d3e9dedc16715698fa83825a57696c4b8e10c4293da034d6b99338a8288e4b969cfe4905523e1a5c8d5bb6cfd04a2526884f83be726c241 SHA512 f68f23551d8efe102585e4541903e882a8e623754cdb1d6500b65cf922af8bd6ce56adbc9b4f7ed25b9f57f1963ea25dbc143d973e2575d2d02ff7e65afe6a4d
 MISC metadata.xml 1169 BLAKE2B b384f4ab61b50fdaf1630d410115ec567cf9bceb10df90e1781f4e133d644c146ac9db005c831735acf2f0ff2e167980dd7b07ca30527330777314e1d69756bb SHA512 fce71cd423777ffa60edc7e45805c1e622c2a9590409772c77566f6945f25389aca1d8d9e5424effa2008ded1ae394d3b9636197bb59e0b74c294eaa97419753
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 4a6f1db23842..16e04e799848 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1 systemd toolchain-funcs
 
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index e1f92087579b..075402136f9c 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1 systemd toolchain-funcs
 
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 706ceca6a64e..bd9631c7212a 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,3 +1,4 @@
+DIST choqok-1.7.0-patchset-1.tar.xz 3260 BLAKE2B 48612da4e92c9ed4a877858940f73075df4142d68da3854c42892bcfb13a59ab5dd45b06597c404badfb55ebaeddf7485bc0970e65ae29898a742742353d6caa SHA512 78e31f4d8de9d5294c8439959d8966b5b966bf6bc8f26d1b9cb1ffd12bf182d167269b26deb2dfa7d7dd8cf09bcaa0c77a560418075105f40a74fa50c96d48d0
 DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
-EBUILD choqok-1.7.0.ebuild 1988 BLAKE2B c4c3002d2d3814884fccef828f3f876d846692750cc3ddbbca291e6bf0ca72ab836832e90fad03a015e53c3e7871320b3a9a249a41d7dfcefbde4b6ffd692300 SHA512 4937277f485f2f89302de51e6308f1cf951afbcfc069cf2a3040060daa3431c77a6812c17a68ebce10385d7048baf0cd2a44329746687f6f02fadcafc2cca8fe
+EBUILD choqok-1.7.0-r1.ebuild 2231 BLAKE2B d0d15434881d0158f249ce6de0c4b2e7532b05c47c9a81a078ba396d6487a72c5a146c939c6f463cc5d4af01fef4b7d8014c3dde0c525dcf09a372739d71ea0b SHA512 9e78c285b7ea213a02bfc31fde6a1d49619104cb8052fcb4e5629242e7bec821b79cc32a68aed264fa3c65c74eb2f35b59a57eb1307a63321ada074fff04d925
 MISC metadata.xml 641 BLAKE2B 025e44ef86eda8b0733f1f3a9ddb4c854f8601f32bb840a7b41ca55114c6a3596ca95d3274552a259a948da30d5cf3eafc395200114a5e3d3957b0667d00b031 SHA512 36ec911abe6a1e4e2b916dee27c2fc6484f4b42c6f45462d9117221344ef4aa8fcae15b058945251563d173417c0b34ef402dd2912eb62e0f112061ac367233a
diff --git a/net-im/choqok/choqok-1.7.0.ebuild b/net-im/choqok/choqok-1.7.0-r1.ebuild
index 1adc99525163..347ae3c26c3d 100644
--- a/net-im/choqok/choqok-1.7.0.ebuild
+++ b/net-im/choqok/choqok-1.7.0-r1.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Free/Open Source micro-blogging client by KDE"
 HOMEPAGE="https://choqok.kde.org/ https://apps.kde.org/choqok/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
 	KEYWORDS="amd64 x86"
 fi
 
@@ -21,7 +22,7 @@ SLOT="5"
 IUSE="attica share telepathy"
 
 DEPEND="
-	app-crypt/qca[qt5(+)]
+	>=app-crypt/qca-2.3.0:2
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetworkauth-${QTMIN}:5
@@ -47,17 +48,19 @@ DEPEND="
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
+	telepathy? ( >=net-libs/telepathy-qt-0.9.8 )
 "
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS README changelog )
 
-src_prepare() {
-	ecm_src_prepare
-	# TODO: quick fix for bug #708464
-	sed -e "/find_package.*Purpose)/s/ COMPONENTS //" -i CMakeLists.txt || die
-}
+PATCHES=(
+	"${WORKDIR}/${P}-optional-purpose.patch" # bug 708464, upstream MR #11
+	"${WORKDIR}/${P}-fix-retrieve-twitter.patch" # KDE-bug 417193
+	"${WORKDIR}/${P}-choqokplugin.patch"
+	"${WORKDIR}/${P}-fix-layout-of-tweets.patch" # KDE-bug 424938
+	"${WORKDIR}/${P}-fix-partially-static-signatures.patch" # KDE-bug 417297
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 8dc9ecdd9621..e2385707e94d 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,7 +1,9 @@
 AUX README.gentoo 469 BLAKE2B e7176c3fa41c859f13f93f2805bf317817de1c736b56a55a1cd21340b2195f1192a96c56ae973c347430f3553715e829420ef6e0d91b26835cf06d06b744b9ec SHA512 a800f5ae1f02a1574602c1595f005eeffbd2db6c100bb59f7a4cf9dbb0bea79bb3d1a17cf9559a09f318f4d8189ecfce964e594829228ab16f861b3c966c3f41
 DIST dino-0.2.1.tar.gz 514504 BLAKE2B 42fae18bb7cda276c1eadeefdea130069f9929dfde62855f00ab6b88912fe9db3374315f40ff8f53350cf38e45fe61b0fd6256ef390cdbed6a65a3f2d79ac80a SHA512 b71497ec115945eadf7d33bb973f68465a20284aa75f37f1ae25fc30c1c423ce28cb10f7e9123c47f82e77e97170b8fa72c75389dacc3a2aa3d487a9c9610d49
 DIST dino-0.2.2.tar.gz 514648 BLAKE2B 54110f3767b5d1d3d4bffc82b767d3c92114c55449ad10705ed10b8815ecc9c337016348886acc3df21d5f27be5d93bbe3c203173167146ff9859bd03f0be7a6 SHA512 6c973b0b88e2c8aecbab694b456762973c5f60217bbf6bc81f4d81226fe8124596bddfe7c190f35307ec3ad6376858ce8f686c74aaebec133124377d8a9e4898
-EBUILD dino-0.2.1.ebuild 1648 BLAKE2B a060d33c0d9b8ea88a6fedadb7ce4964bfb0c51f7a79fcce46f8f2bb77b32b48f41eca7113f7ccbe5e58d57bd262cc89930b41c0c597c6e5bd12550bb91747b4 SHA512 6f9ba82b543c598ce897917e7d12126d87d9dd1925748dfe55ac61f891dab216ebb5c1efd6fbdf02741be85d16f210e4f90888972bd75342ff3ac99eda72e8e0
-EBUILD dino-0.2.2.ebuild 1650 BLAKE2B 0062e108a6c191c1049ce076e81d09d0860b743b08f9a33a168936492c2901d15f21862a699693d9cf4fd856cd6540a5611fa07ef48db4af906373bedc27e68c SHA512 62fd08158864ab5e8b624b0ec45c340f7a319ae3cf6952c5411b6b7db9eb37a5cab6e508b137a2e881eadd5f6905458282cc8c8ada3e413aacf6e146cbd96ecb
-EBUILD dino-9999.ebuild 1893 BLAKE2B 6794dee249c9a0a011b7c59774f58effc051bad877d3c3d2a6558b217ab8a57cb42487df28b6c633d0e4084ce1207cd3b5dd33cdcf945840b28c8566df8ba9f7 SHA512 80313d092f8427a9917a42b00ada083a759e21b72f801e5a461b9f0c389e0edca400c9ccb86a3d4b4c2c4b8b6977f3c81af0e66939895131fbc2427f6325db59
+DIST dino-0.3.0.tar.gz 804810 BLAKE2B cb6365f6fad051d0308909c6d5d2c59d7f57cb94f9f691516e27b7bb3aba214fdffa95066d8203d8ac5bd770bec1580e81baad313beef7fe5c058e1e94a37556 SHA512 e3d885208451b00b0416a1401780a94a169fb1179b2f609f7965e3445873d6b72ded84cb471d534616892ec89b5edcd6701fc97c36f19d690f4b894399000515
+EBUILD dino-0.2.1-r1.ebuild 1648 BLAKE2B 150bac4ae70f62ebba4fc17c74e7f400c195bad7205daebe72bf2ae695659e919ce37b10545aeec1e9359406d73e58f6a2d3806dddd09741fb261da9841c1b13 SHA512 c3a105eec2b2913c297d3c908048eb7ce5b0e81f413ac5b5e95f115695af2dcf8a0d3763d57bfab8203ce8a43cc42db43a8752e2ecd741c5e1c31bb8a58c5e46
+EBUILD dino-0.2.2-r1.ebuild 1650 BLAKE2B 705ee0bae37d35ac251297efc7db3c35aef4ad3edc1bcb04626384dc294b1b9c731e4d2cc201bba14a0436419fa5d652e062b5b4210c78ddb19d5dad357ad48c SHA512 f49a83b3e1e6c9ffdbc394f53568e0b36d27bb45f56bed2c13386381b9a86350694ecdde47039acd46feca032c8068af1d9456a495f40aed12f0fb519a5521a7
+EBUILD dino-0.3.0.ebuild 1893 BLAKE2B 33d8b7c7aab50b175857a8cd6b91c8dc7e7f65ba5fc6400a0aa3e12893a53fd3b48ba41fa5f5693645077cd777eb62e9b9b5008724657fb11d3576a7f7f97a71 SHA512 19777fe692826943cbc08f6e30f6db9991853fccb85ea3f9e6f370654be8beb477de4c816658946214af067fa8bf399b5a7ca989485c10b6b37c9946bf387305
+EBUILD dino-9999.ebuild 1893 BLAKE2B 33d8b7c7aab50b175857a8cd6b91c8dc7e7f65ba5fc6400a0aa3e12893a53fd3b48ba41fa5f5693645077cd777eb62e9b9b5008724657fb11d3576a7f7f97a71 SHA512 19777fe692826943cbc08f6e30f6db9991853fccb85ea3f9e6f370654be8beb477de4c816658946214af067fa8bf399b5a7ca989485c10b6b37c9946bf387305
 MISC metadata.xml 642 BLAKE2B 31f8929e6bbcc03672e487d70a37b3796ced84e17cfdfb7d55026aa97c8a001d6f666ec5de4894ff5648c3b8bcbe856866986baffaff5305636cc1fce2c201a1 SHA512 db7adb8b4a47f7129b01783605983e87d93b3bfc6f7add5256bdd72d88090923730c56697ad95a0e19071ed96d85e1f16acf44e3aa6ab5cbbcc19684bf9dc895
diff --git a/net-im/dino/dino-0.2.1.ebuild b/net-im/dino/dino-0.2.1-r1.ebuild
index b9cbc662d434..4a660b77b34b 100644
--- a/net-im/dino/dino-0.2.1.ebuild
+++ b/net-im/dino/dino-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/pango
-	gpg? ( app-crypt/gpgme:1 )
+	gpg? ( app-crypt/gpgme:= )
 	http? ( net-libs/libsoup:2.4 )
 	omemo? (
 		dev-libs/libgcrypt:0
diff --git a/net-im/dino/dino-0.2.2.ebuild b/net-im/dino/dino-0.2.2-r1.ebuild
index 169e9707eef1..28342ac091db 100644
--- a/net-im/dino/dino-0.2.2.ebuild
+++ b/net-im/dino/dino-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/pango
-	gpg? ( app-crypt/gpgme:1 )
+	gpg? ( app-crypt/gpgme:= )
 	http? ( net-libs/libsoup:2.4 )
 	omemo? (
 		dev-libs/libgcrypt:0
diff --git a/net-im/dino/dino-0.3.0.ebuild b/net-im/dino/dino-0.3.0.ebuild
new file mode 100644
index 000000000000..dcefefcd1c83
--- /dev/null
+++ b/net-im/dino/dino-0.3.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+VALA_MIN_API_VERSION="0.34"
+inherit cmake vala xdg readme.gentoo-r1
+
+DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
+HOMEPAGE="https://dino.im"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+gpg +http +omemo +notification-sound test"
+RESTRICT="!test? ( test )"
+
+MY_REPO_URI="https://github.com/dino/dino"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="${MY_REPO_URI}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+RDEPEND="
+	app-text/gspell[vala]
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/libgee:0.8
+	net-libs/glib-networking
+	>=net-libs/libnice-0.1.15
+	net-libs/libsignal-protocol-c
+	net-libs/libsrtp:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	gpg? ( app-crypt/gpgme:= )
+	http? ( net-libs/libsoup:2.4 )
+	omemo? (
+		dev-libs/libgcrypt:0
+		media-gfx/qrencode
+	)
+	notification-sound? ( media-libs/libcanberra:0[sound] )
+"
+DEPEND="
+	$(vala_depend)
+	${RDEPEND}
+	media-libs/gst-plugins-base
+	media-libs/gstreamer
+	sys-devel/gettext
+"
+
+src_prepare() {
+	cmake_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local disabled_plugins=(
+		$(usex gpg "" "openpgp")
+		$(usex omemo "" "omemo")
+		$(usex http  "" "http-files")
+	)
+	local enabled_plugins=(
+		$(usex notification-sound "notification-sound" "")
+	)
+	local mycmakeargs+=(
+		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
+		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
+		"-DVALA_EXECUTABLE=${VALAC}"
+		"-DBUILD_TESTS=$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/xmpp-vala-test || die
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
+
+src_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index 29103bf879ef..dcefefcd1c83 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/pango
-	gpg? ( app-crypt/gpgme:1 )
+	gpg? ( app-crypt/gpgme:= )
 	http? ( net-libs/libsoup:2.4 )
 	omemo? (
 		dev-libs/libgcrypt:0
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 23bcfa28c8d2..98036b008b57 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.16.deb 77079990 BLAKE2B 17cb04baa4eab3494593c54bc556a8e1d01352aa1ba7d1d27da722e53f5445386054b038b57281c5955f46416eccef9fc3521c1b91b3b593c495c29e2537d0c0 SHA512 4ea06420b27cc6dff813798c23d44478bbe4fea2919011796d271f94fcc2e25bae65e7c5c952a6723daa928d3ac99b913198a8500c76a0eef56138dda610c5de
-EBUILD discord-bin-0.0.16-r4.ebuild 2184 BLAKE2B 29eed49ce6930cb57c32758ed18883be68841e0a04f6351348574fab7d7b538f719417a04343d75c913944745f45280babd222ed5fae15441725565dbf7c2e5d SHA512 7ba68d1275d9c4e5073fc2c35d660bb37a0ff87e33aef10b104495974a260bf2e1cb433064fee932a051fcb1bb85108532377fb3d34dbe58afcfa476864a1f65
+DIST discord-0.0.17.deb 77105376 BLAKE2B b11d9d6798beb3dbb36892c9c948535fee453c258a91f48b04a686813fb82dc43f7872fcb4e68d17e6fb366a84825aa0e7b4f1ad45ab4efec403a05fb88c4f2a SHA512 b51d8e019b9c8c365aedbc7c77e53febec95d0c0f1b773e008d4d72e3880303b6f2d3381f363eedc8e08492ee2d2e8ef6d65353e852a8db9d708a70caabbb3cb
+EBUILD discord-bin-0.0.17.ebuild 2048 BLAKE2B 68683bc15f12d875161c75d382b8e4fe4547ad4b1b57566b28a56577b0dc118a92e908c355b55bbf1c5cfa8907a01150a1e9bf01f77a2573a8240db7de387ffb SHA512 7da8315c5467e4f4c83308fdc372843f61663445c9a1d9b62cedf36dec395e4bde2366f7bf5e9b7cd118a526c0ffbeccb0b97ea50632842b1764ac54e90398ce
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-im/discord-bin/discord-bin-0.0.16-r4.ebuild b/net-im/discord-bin/discord-bin-0.0.17.ebuild
index e8d74ae05be7..542c2a913ed1 100644
--- a/net-im/discord-bin/discord-bin-0.0.16-r4.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,8 +19,6 @@ KEYWORDS="amd64"
 RESTRICT="mirror bindist"
 
 # libXScrnSaver is used through dlopen (bug #825370)
-# Need to drop -clone3(+) from glibc once Electron is updated
-# bug #819045, bug #827386
 RDEPEND="
 	app-accessibility/at-spi2-atk:2
 	app-accessibility/at-spi2-core:2
@@ -33,7 +31,7 @@ RDEPEND="
 	media-libs/mesa[gbm(+)]
 	net-print/cups
 	sys-apps/dbus
-	|| ( <sys-libs/glibc-2.34 >=sys-libs/glibc-2.34[-clone3(+)] )
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index f1b4e14a00d9..75512c66f704 100644
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -1,4 +1,4 @@
 DIST ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz 1177484 BLAKE2B 7bf6918a7f75738ac34eeae64ac53d3c90acd72795711c856206b79ca96c94b2ce397132ee31dfa8a9060d91d7b4b9aa23834596fca190dadf476660c6e5cd71 SHA512 ba28b66233290bd6c9b6a9602a5409c0fb2d847993bda638172da2f68430b5b5cf9bc0ff0d327983939fa0fd078bf6030069c60cd8bdd8449c349964b23e1f44
-EBUILD ekg2-0.4_pre20190315-r1.ebuild 2562 BLAKE2B 5f70dfc40838b5b3bc5ad0917a275c7017386e3735196fdd4f25e340baea01ca0236e4d609f7cdb68aab1b401dcaf0da7ee3536dd05d9a8cd5cec726f30169a3 SHA512 a96beb077027f9b79b247867a1c6dfbd3c0cf35dbc3936cdc6eaf6e153dda2d46c98e70d0de6e0fa720fe6c0be5788caff3efda39a4ca00f8376a9dac3253ccd
-EBUILD ekg2-9999.ebuild 2423 BLAKE2B a8e61ca7fffbae8d50a79aad4f0830b7aae190d760466b733fc9e78c3fb3e4d131444e45182ef77739aee7ee6ef0430a9174d4da8290348f50b1eda2272c2b26 SHA512 2c7c091d5039cd29e559875c9f407b8cdce64a98c8f91bdd27c3613b750b251cd5ec378bba0d9c7ac34b101a5499803b748a74ec7e35772c57a4a730fdf2c645
+EBUILD ekg2-0.4_pre20190315-r1.ebuild 2561 BLAKE2B 3019822a4e39c66366cd0337fc18a7588a9c20585aab2e5bf14da91213e222168d86896f4e07262b5c729161e9653af0d4d6be20aae65c6b3ba9dce6a208c199 SHA512 f9626e56edae4ec6ff201348dd7b64665b35a2f15615337675669ac45694fea62296dd13dca1cebd3f77a63d99e850728eb853524eb44838bca7091b2aac45e8
+EBUILD ekg2-9999.ebuild 2422 BLAKE2B 3ea811a69c7705ce46920602f7a7a2acf4890205603fd0d280ab4d6be917cba67e57b54e62479aa2ccd9dfbe48115eed38b2cbc523f3ac40f79f8f494262ba78 SHA512 e7dd6624c848463c60edd852c4344fbcff16159b0676a66e4258077ea41e9bd2f9c24f340c94619bf64053f1ad7d2d85ad51ab557c0d0be649e44c017ac1ff9c
 MISC metadata.xml 711 BLAKE2B 3772d8931d48ab7aef557b47c4a5cb420b483c7920343abc3f687dd0de5359a0ab13a465e75f6ca47775d0867c8c8a09a4cb0672f2fbc89c1bdd9f9494122a44 SHA512 502fb9077cd6e265915cb134b3a963408220ea7f2f838b81d4dd2d4162c88770c9af3816008c005ad40758f27f5f11daeb97cc38bdea234a0686cc034436fa4d
diff --git a/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild b/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
index f1e09d360c6b..3dfe36b6ea6c 100644
--- a/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
+++ b/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
 
 RDEPEND="dev-libs/glib:2
 	gadu? ( <net-libs/libgadu-1.12:0= )
-	gpg? ( app-crypt/gpgme:1= )
+	gpg? ( app-crypt/gpgme:= )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl:0= )
 	openssl? ( dev-libs/openssl:0= )
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index 95e8a266ea8d..3243fa4af2fd 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
 
 RDEPEND="dev-libs/glib:2
 	gadu? ( <net-libs/libgadu-1.12:0= )
-	gpg? ( app-crypt/gpgme:1= )
+	gpg? ( app-crypt/gpgme:= )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl:0= )
 	openssl? ( dev-libs/openssl:0= )
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index b7484c3be409..d75052236f6d 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.9.8_amd64.deb 82015034 BLAKE2B 0dba465f76181ec92154f700959163fde615d1f08d84452810fd9bc4227252b56cf93eada0ab63fa83cf2a263f684df64f0209f125bb2cc492190c0ba02adb71 SHA512 6c696964a7ac6ab312b5c20de0f80d8f55104fcba258df7a9b2cc38d5ff4d9b2ffc32cf900c541ec3eb8a3be9261fe8e4f7a5ee3bc70a0cc9d5878e5a9e1e2e9
-EBUILD element-desktop-bin-1.9.8.ebuild 1775 BLAKE2B fceebd338ba37c6b99e77173d1fc46a72ea0d31a99874cce4d8049d61d6d18a1a5d68f2d30fa76e97d8d6940a4ad00ca346b7fdab08fa9f79a2df4b0a7037a99 SHA512 ea696a699ad1d7b53dd98be0f2eaa91929c56b12f9bb36e534ceb8e2984cd1250ab9a569231221d76336d4f787057b691aa9a2e5297b6f476660573b21468539
+DIST element-desktop_1.10.7_amd64.deb 95797406 BLAKE2B bf189092b2c008d53e7f77aea8cb846c77b20f66110876ac83c7105f3c3a44edd759ffeb2d0a8e027ca4bccbb0ed3b225d3d2ac139a378a462a25a74b1c4dc62 SHA512 72bb749498e95920933156a27d0bd547cfe8ab02b9aa976fdc7574501a7e77d9f6af47e2a951c121251a313d621c32150631ece6aaf3ec0a0856363d482fbd5a
+EBUILD element-desktop-bin-1.10.7.ebuild 1775 BLAKE2B 538cb846a6fbb501186d3c5702d546988283c5debd6c27adf03764055bc3f00358c59e2c6dcfbc5a5391523f405e11194914a271a1d60c7e13ad0d78525da031 SHA512 1163d5a9a56b17b7e2966bb95c3ca1c40c1ba7a06f7a63c88c419050d323fef34d8175d5acf7faa1abd350be61277c75adde37bbe11e9ead85d76f171b2f9991
 MISC metadata.xml 350 BLAKE2B 050eceeb985e81547b5f0c590916c9f8bdb33558e0adfbd4f3a648abafcf12e07e1942be0151b1ac1dd1e637cfb6fd5ba68e549ed1982e044896e07c18522917 SHA512 55e9b181e332a870595c816bea6093007d60642b0271a88e047cc85e820311340d609618070643accd77cfb5df335b90187a01c15c349cb65e9d96b6f188978c
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.9.8.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.10.7.ebuild
index 52197085f09a..2831c3310e31 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.9.8.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index f371187e67ae..26207d10a649 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,10 +1,5 @@
-AUX gajim-1.3.2-fix-historymanager.diff 1315 BLAKE2B b3520b7730f3b408759003498963fe6dd77bb0b4b313a3cf49ce4f77fde99763ee0c8616c839aed6edfe2e47a5aa992b7c71f1e3b9ba5e8bb04599137e6fb90c SHA512 5708f62c7f3903ff8b01808d955e51930281dc1e9d818897681e5368464b191b2c24f76a82ad015711e60b59504c43db21db5f54fa684f6d78b48acfa961e5b6
-DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642
-DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4195633141ad1e9fa96145e61b54acff32891aadbdb93d0a775d69f2491e56f97fc67d2a1b2a76fcaab09f7ef SHA512 92c86d1fa2fab51b402b6ddc0b838f321ab744c9c2add743b3f1820215eef84cafabc50227606088d077bdd9f52998f4ca6f98ad153346b9fb37691b71e9c267
 DIST gajim-1.3.3-2.tar.gz 9578053 BLAKE2B de41eb488480c1e9267a7e64c33dcc225ba68348fad51fe2f114199972a0fc998ae2c6efba1ea48ecb17b819509c1b45745e98e41f99f2e4afd4a4c1daff4865 SHA512 e7a2564710ffdf0b971d005f8b84c60d72c471727be2bd1b75e564f70a25101a4eb44603fc9f98163bc12a5049dc876f50cdaf8eb5b7d596203c986e55de7442
 DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2
-EBUILD gajim-1.3.1_p2.ebuild 2393 BLAKE2B 29e9137608241890d52a59ce27beec4f38f9789e66627c7d03d8646614149adeaaa1ea728a59b6ee62f3fe3b6b9eacc63f186b779abd29d6dc1687dedf373837 SHA512 809c01bfb5cd847ebdfa087877695be7d644ace122e546df1e47c1b2b848a02029dd42fd2735ec00b575f4822d4c8a755836afabfd0e8109e88854dd4b72c747
-EBUILD gajim-1.3.2.ebuild 2680 BLAKE2B 7c42ef6db2251790a159475c9ad6235f2329c700316cee4487b008546467bac85ab1efc206bfe5cfa93ec0fca63bba0b88337905a6c6dc0cb2dca69c78452eb5 SHA512 e5a9fef65f8415d8510888a2d4bac393115cb969d246f23eb0504891979f5e53e305e11d7456121fc89c240d80ae10323eb00595800d4b4708e15c016d8ff78a
 EBUILD gajim-1.3.3-r1.ebuild 2541 BLAKE2B c4d185df1a12b66b1681f3450762e05307617b13806fa3c76c92d80295e380981ec73dbb7ea651ba15a9312774cec47e48efb5000beeef914d68a27f27fbde71 SHA512 29b94079bee802fe34f715cfe2af55b9da830b79319accbbd8128e830e286411e218d62bc1f12e1dcd627f92858f4d157052399d352957891ff3a1b1f2766635
-EBUILD gajim-1.3.3_p2.ebuild 2663 BLAKE2B c163b948091a3d01da10f4425b057f8df80a8a652ba6e6b41ac37dcbb89edcbc6eade8f4fbe37ab5fd04503a0fc87a46ce5553d06eed118f62eecab78494c561 SHA512 3385376818f1c587cea0d717ff4c5b18b76566cc3b74a33c6aa8bd18d46f7679ead8db67409ca69a802e42b8f90f8d4919270c76612e3a7e0de2697ef5dc0814
+EBUILD gajim-1.3.3_p2.ebuild 2661 BLAKE2B e5eeb4021ff5fdcc130d0ea6cf6e8d179ac812b77fa1fa27ba3660678a00dbf186c5ccba2b9c39fcda92f3ee013b7804fbf674c145a786c6ea67c884f91e5946 SHA512 06839c49ae22f50038a7ea57749a25664ffea68d6d652145be40df6549a04dd08c19989a1635863cd44440ac1c88d9ad5385e3066af6f40cbc867264b91b88f7
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff b/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
deleted file mode 100644
index 04428d3acbe5..000000000000
--- a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/gajim/history_manager.py b/gajim/history_manager.py
-index 1598ea46b385951710a9298093f491dd29e5e6f8..3e767840295f5404687ec6bb298fbdc4e369b4ca 100644
---- a/gajim/history_manager.py
-+++ b/gajim/history_manager.py
-@@ -55,7 +55,6 @@
- from gajim.common.const import JIDConstant
- from gajim.common.const import KindConstant
- from gajim.common.const import ShowConstant
--from gajim.common.settings import Settings
- 
- 
- def is_standalone():
-@@ -76,6 +75,8 @@ def init_gtk():
- if is_standalone():
-     init_gtk()
- 
-+    from gajim.common.settings import Settings
-+
-     try:
-         shortargs = 'hvsc:l:p:'
-         longargs = 'help verbose separate config-path= loglevel= profile='
-@@ -100,6 +101,8 @@ def init_gtk():
-     app.settings = Settings()
-     app.settings.init()
-     app.load_css_config()
-+else:
-+    from gajim.common.settings import Settings
- 
- from gajim.common import helpers
- from gajim.gui.dialogs import ErrorDialog
-diff --git a/test/unit/test_gui_interface.py b/test/unit/test_gui_interface.py
-index 41274dfd4447a89b6ea33bdd36538212e4d28d8c..6ad2d734b5bcc093e1d2e8e627cfbd3a0653b53e 100644
---- a/test/unit/test_gui_interface.py
-+++ b/test/unit/test_gui_interface.py
-@@ -3,6 +3,9 @@
- '''
- import unittest
- 
-+import gajim.gui
-+gajim.gui.init('gtk')
-+
- from test import lib
- lib.setup_env()
- 
diff --git a/net-im/gajim/gajim-1.3.1_p2.ebuild b/net-im/gajim/gajim-1.3.1_p2.ebuild
deleted file mode 100644
index 01fcfbf62a29..000000000000
--- a/net-im/gajim/gajim-1.3.1_p2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${PN}-${PV/_p/-}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-S="${WORKDIR}/${PN}-${PV/_p2/}"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup[introspection]
-		media-libs/gsound[introspection]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.3.2.ebuild b/net-im/gajim/gajim-1.3.2.ebuild
deleted file mode 100644
index 3786de899854..000000000000
--- a/net-im/gajim/gajim-1.3.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
-
-# See https://dev.gajim.org/gajim/gajim/-/merge_requests/761
-PATCHES=( "${FILESDIR}/gajim-1.3.2-fix-historymanager.diff" )
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
-S="${WORKDIR}/${P}"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup[introspection]
-		media-libs/gsound[introspection]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-			media-plugins/gst-plugins-gtk
-		)
-		omemo? (
-			dev-python/python-axolotl[${PYTHON_USEDEP}]
-			dev-python/qrcode[${PYTHON_USEDEP}]
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		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/gajim-1.3.3_p2.ebuild b/net-im/gajim/gajim-1.3.3_p2.ebuild
index e58f75e2f5cd..346c1c0f0693 100644
--- a/net-im/gajim/gajim-1.3.3_p2.ebuild
+++ b/net-im/gajim/gajim-1.3.3_p2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
 S="${WORKDIR}/${P%_p2}"
 
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
index 9d37a6aa316b..65b552bf975b 100644
--- a/net-im/jabber-base/Manifest
+++ b/net-im/jabber-base/Manifest
@@ -1,2 +1,2 @@
-EBUILD jabber-base-0.01-r2.ebuild 1244 BLAKE2B eecbd938e95afac047211d66f526324f03ac7accd0ce8e5b37910b6589de020c86b263df2ac44b684fad82898001d057c1f387182bba319b2ab84568b4ced960 SHA512 297eedfc04deddd5427e562b9eaac0afea64daf5cd73dff4a5e401330ba164e13dd969322ba532b953a478b4196637b12e82a51c9f644e729f3df606e39f09dc
+EBUILD jabber-base-0.01-r3.ebuild 1244 BLAKE2B d2395b817577ccb314efe49ae173d3c55b7388e3e1f450c334023f0f426e9510614d166b9f536fa1d42c786924871b228ac6fc7f704664199e3ce9c8809679b0 SHA512 66f7ef9ccfeab3019d2d28929b577dc57ecb583aeb20ba1c8918b328664f74cf770abb7413ad96f84cb5a656d1b8740db3626c5ad2118fe3a89f67d3edcdc38e
 MISC metadata.xml 433 BLAKE2B a4c354f8541c76d06b80b0bb5f5369ddd5febaa60e3e2f14768827ab8ef1bc1276886d585f28c741c56e61e97c167c2f46ba752cc8953eb4fa56ecd2e0f9aa0a SHA512 47904b9cc57064bd3db54de9d49666884e11b83a52a36429a92f16399d65a061ff7ec4cf33eb715c42c57e3ccd266dd9c7de3c268312e7980c82f148aff12249
diff --git a/net-im/jabber-base/jabber-base-0.01-r2.ebuild b/net-im/jabber-base/jabber-base-0.01-r3.ebuild
index e054f2b5b47c..858d3ba2224a 100644
--- a/net-im/jabber-base/jabber-base-0.01-r2.ebuild
+++ b/net-im/jabber-base/jabber-base-0.01-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Base layout package for various jabber services"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/net-im/libcommuni/Manifest b/net-im/libcommuni/Manifest
index b42e606e0b58..3a627305afa2 100644
--- a/net-im/libcommuni/Manifest
+++ b/net-im/libcommuni/Manifest
@@ -1,3 +1,3 @@
-DIST libcommuni-3.6.0.tar.gz 472634 BLAKE2B 0d3d68e27f75cd59ebd61532261e2d3d2c0c2d61d6e08e5b4ed2b21bbf75572f4ce1763fbc4f66c8d5f7c8f9859240ddff5daceeb548d82e2efe936a265031b7 SHA512 cf872d0cdc281a452129a05f5a903eeec3661a4d0d56bdc61bdf95ea969c7b1bcb68534d3d8999fb85ef2b81f17c067b5cd3437351d4635efae3c714567518c0
-EBUILD libcommuni-3.6.0.ebuild 2071 BLAKE2B 943961b77b5549b84b260f6ded32a63429a3ba635911ccf88d32a680048b5639022aaec78cf708173903d833607e3049c918f3328803f86af6db464a0951f4eb SHA512 0d37ddb69b81c017883a0bbff2fce70232d1e8c7659da674c8049493bada32cfbb6b97f12b4e6bef69cfcf836f4ecb83a000287c627f67ebb9b3113735d958e3
+DIST libcommuni-3.7.0.tar.gz 475364 BLAKE2B d5bc6deac50b403c7423ab3f9953f94fa3db522f67740a62095700f45c8ee9c35a84aba35f48ff3104a8ffdadaf904f96b625dd1882fa89f49e31731f97e96c0 SHA512 ed1182256899f6be4b492e20958de2edf557b744362701f031ede279c7464b031a57a50e3d7174ae61e313e43564dbf0b04eb382af6bcda71eb96d3405f168c1
+EBUILD libcommuni-3.7.0.ebuild 2081 BLAKE2B d3199f84bc6e53cb0a783d696705832c053b0d0c6cfbfe62691082c06e22baffef663fffaa64afa1c49fa08aeb8c68c4776fdca18d9cd756a899dc7aea654623 SHA512 136f568c5ab0a4666a720785b4eb602fc695f30e2028ae83493bf7a75a9c39db09a6120587e22e6b9612f8ad5a01d37286b3bf7a26b9a783c92f41229e513190
 MISC metadata.xml 679 BLAKE2B 065cc28bea320a945ae2589e1d3c8a725c80440a84420d65d54b4b3b884eb5c53f9d0aeb8bc6d9aa098ce396b5c703c6b2c9c8ae5b05ea24071ba64e63f07e9c SHA512 ae16b1f877fd65dfdcf8ad11c121aec6aa242f2b7311c27946df72c6bdca037e34e91a549bd021aeea8d43ab8bb82bb440f412803035f148fc3fc6a2d7d140b1
diff --git a/net-im/libcommuni/libcommuni-3.6.0.ebuild b/net-im/libcommuni/libcommuni-3.7.0.ebuild
index ed17ccf543a1..6c0ce18b28d0 100644
--- a/net-im/libcommuni/libcommuni-3.6.0.ebuild
+++ b/net-im/libcommuni/libcommuni-3.7.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils
 
 DESCRIPTION="A cross-platform IRC framework written with Qt"
 HOMEPAGE="https://communi.github.io/"
-SRC_URI="https://github.com/communi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/communi/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 27931ad34be1..772075eceb31 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,4 +1,4 @@
-DIST mattermost-desktop-5.0.2-linux-ia32.tar.gz 86954293 BLAKE2B bcefc68f92358e072da236d51dbc970366674aac68640c77b24375661e027b357baa799bbe52834e7e616206eed2edea9fa8ae2e136a32dd8db027b1691f80e2 SHA512 15a9e71695f7c520c225b94a34e2887ecf9b39e72ecdf95f0c18d58d2c3ba13eeb771c49fcdf5f9fd7a36d11d1cec625965eda71762b19e1e9fff9514c083649
-DIST mattermost-desktop-5.0.2-linux-x64.tar.gz 87312644 BLAKE2B 44a77b62d7aeb978baad20ebad14f75fbad73bd160533287bfadba0148c8c3319f77ccf68ea7625f9fa2dd9d3a6baed6b2e48b9afea21b20ae407389a2161c3b SHA512 e9ad2b24b995ce04c53c4c18661822d40d6ad1ff0d990f9e0dbf00294d80e7884fb5b08302d5b1e8cece4bb95705814ff0ffd0243e4aef290d0a8b79ce622e40
-EBUILD mattermost-desktop-bin-5.0.2.ebuild 1837 BLAKE2B b306cf73988e92ccb7e04de3f985eebaf6d70ea00b3f56db70241b16f9ebc9465667cd27514fa48c409e07da27ea4bbb3f01ab10f9ce679cb2ea746614795c8e SHA512 e84a09c0c2111d02d458f599b13a1159a84a962c22cb9a53383f684e249aaf3e1c89fa92b43e25d2036ab1707316955cbb57be6f19ddc3fa33c209d7cc66f6e6
+DIST mattermost-desktop-5.0.4-linux-ia32.tar.gz 86957532 BLAKE2B d52f2cbabdecaac15ce14fcd3a0d6092eb571fa83fbd529aae664a492c5d1def6dd94b2c6dcac57984ecfcb4809c25cb08396836cc05d31f99e9dd080280a0ec SHA512 0dc778c0db232784108a5c980f67b8306602cd15005a18dce1571e6de6a7a774f8d51c7feb76f94eaae29d62ef6f046e637e37d787530696a4223ed31067d37e
+DIST mattermost-desktop-5.0.4-linux-x64.tar.gz 87315900 BLAKE2B 9d4bd3297a0d6c0eb016902d731608d12e9187e88c3c72fd57a2b47735438ff3a8369553adb7412a0339d729f177649ae0459790257307f6458ca99322ac8d02 SHA512 b95b9559950f7e7333e522fbbaafeae1e0f5c55cfa2acfe569b9987d75b8c4ce85a34997e4448a9e007522070f47a09a53d971ffe567bfbdde2f95f747ace622
+EBUILD mattermost-desktop-bin-5.0.4.ebuild 1853 BLAKE2B bfff05a92b98544df2a2f60d01b804e52a0b83942d9b85e212f5a8a3bf5f65647c9a0d93ef286d2880ada34a8d8367bf81b98f90525de9ddc2e666b283fbd24e SHA512 9377b023d65d9d35fd9725b435c16625897cecac36af84634e2254d7309cb03cf4fe6d3bcd8ab3f0d7f52a974efd98aa6a7b15d82705b1af11f1a51e119609b0
 MISC metadata.xml 486 BLAKE2B b4d9156a6a958b7ce307e104f7491e99534b1e33328c5899db2b7583ecc7d5cca411cabb8e21085a4138a78dd88056032b5412ea9a19fe7445a72b8e4faf6692 SHA512 369f7df04ae2c994c25fcb082a16b0dff78c255ad859c88f2e15b0b3463a25b2241518cf1e2259a8da3fd05c468ac96201a2421285f5b3fc1d499f2b9c9cb67f
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.2.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.4.ebuild
index e767c09c1e07..ccf40a4e5d93 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.2.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,6 +31,7 @@ RDEPEND="
 	media-libs/mesa
 	net-print/cups
 	sys-apps/dbus
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3[X]
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index a0474b3caa95..5f2bafffe664 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 692 BLAKE2B ff09452aa3712dcdcd575bdf12b6bffd32f142e1b75a392c394af9131d029bedb66193dc767b5d0a3fbcc0e14852e7c63951a6189f43a68986e9f6d8f524d07d SHA512 e55fe538eb677f638ce343cb3e54314c50c923b9b0e5077e5a82bbe9d8c68dcfe3ae6975821147fd3322d2d6a74669fa58435a772e55d3b27601a80a964e3e31
 DIST mcabber-1.1.2.tar.bz2 651528 BLAKE2B d2160409d3a6e3c1a579bd1259438b11fae79612919a202a69a13c98c77fb5dbe4bc685939783f2a454ad5796c7d7f93e31d5fc92d96f2c6cc03e4efd4169f74 SHA512 bf53d593e84a4b4b2cf0230a4d94ea75f55008e3c2a839af5839519151209a61cce1685f9db14b65f5c4fa438bfabfeb25eb8e78e666b092c5c66af249788106
-EBUILD mcabber-1.1.2.ebuild 2328 BLAKE2B ac140a7e0aeec7782fd551fb879b06c56ac74d18aa6e29904b4bfcc61f7fe6592bb564a61170ec900d57e051b7e3189296f866186e6e3e80bff864b28ef49b27 SHA512 0f312dfa7996e7f59c5bb2e8e8fdccf2c60217de74237c82192bba58cc333b87b92cdfff421efd8c71d286d0793db32ea427ea25fe0991fe6c9d975babb9d6ae
-EBUILD mcabber-9999.ebuild 2330 BLAKE2B cc46066f8e037e5b34591ab09892db38b5857c2788d58c95be2f39fecf0816f002e0d16fc8900243ede12cb8fa05ccc3a285c1fd1203016ef27c903ae48a029f SHA512 091256c469fc17d782713a96177b7cb4480e5b7b1591c27161afe7ed931a3f5a6446f3bda6033202b907637e22dd4619af0a776c7b278b005ad23454cc94855c
+EBUILD mcabber-1.1.2-r1.ebuild 2322 BLAKE2B 45d7c5584dc633884956c0b910a63ec33e59df170a2a890626ba659c5c3aac8700440994635512eeaf9a243e7e45da79d1a30396c8f6093ab130a8b4357bd03c SHA512 6f9e4700a63fd45f7058c1679fd2c040421c8568a17519c5edd907febf0e3eba169bbc2ac28d29ad2b43361cbae370e901651e531586ca71989b46a10068f9ca
+EBUILD mcabber-9999.ebuild 2324 BLAKE2B a169cdfc5311e0b28f3dd869cf9de9803d9cf492b1d8c570f1a2ac6afbac09626d3f59bbaf4f799a60fc554ed10ef3709bfba70c3540bca6750a1398f657daea SHA512 577e75e2252a5ec11f13045c5457498f3ef803aa71b149b9e358ea0189639c9087be28d7159650d1bcaaaf5677ee21e8995c87f5fad11992a12a94f0d3faed05
 MISC metadata.xml 689 BLAKE2B abaf0494c2728ef44b7eaae872c7e3d9571706888fe9e1a441d840cc9e3744800cd4bf3b5977f2f9409029efaf516354bff0f03f2375210521827bd4abb4c5f8 SHA512 636d0c2c5bbf97d020d767c2af99a79098e59a4c76346f7b6059c95bcf96862e5190fb9f5bb30ec52a1cb9e2afc61cfecb0c9f63b7d47cee44d48ccdb98752df
diff --git a/net-im/mcabber/mcabber-1.1.2.ebuild b/net-im/mcabber/mcabber-1.1.2-r1.ebuild
index 616c5e554f8a..bd5a83f961ef 100644
--- a/net-im/mcabber/mcabber-1.1.2.ebuild
+++ b/net-im/mcabber/mcabber-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ for i in ${LANGS}; do
 	IUSE="${IUSE} l10n_${i}"
 done;
 
-RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+RDEPEND="crypt? ( app-crypt/gpgme:= )
 	otr? ( >=net-libs/libotr-3.1.0 )
 	aspell? ( app-text/aspell )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild
index 9e0a12b1fef1..eb94b6002a7b 100644
--- a/net-im/mcabber/mcabber-9999.ebuild
+++ b/net-im/mcabber/mcabber-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ for i in ${LANGS}; do
 	IUSE="${IUSE} l10n_${i}"
 done;
 
-RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+RDEPEND="crypt? ( app-crypt/gpgme:= )
 	otr? ( >=net-libs/libotr-3.1.0 )
 	aspell? ( app-text/aspell )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
diff --git a/net-im/prosody-modules/Manifest b/net-im/prosody-modules/Manifest
index 9a8b1ae6acc7..204cd2a87c26 100644
--- a/net-im/prosody-modules/Manifest
+++ b/net-im/prosody-modules/Manifest
@@ -1,4 +1,4 @@
-DIST prosody-modules-0_pre20211027.tar.xz 1214428 BLAKE2B a514d5d66475c68d6e7eb3040b648530b1f525fc555e85773f53fa982e2634e10fca3721e463ca6a714a2b058213d5a923e8181f332d509b91bba5b6cc15b3b0 SHA512 0d9fc8f167f7a93ee3d46ea517a7943d1a448a7513776e9e6d0003362cc24be938ed185e8c8ce33570aa91e0b1fd66dc4e0f7cc863d97e108f3213e86085b863
-EBUILD prosody-modules-0_pre20211027.ebuild 1637 BLAKE2B 525c3ccc852a5ac44073cead41ac3a7152549b93b75006b9426084c709a75ef04c9f52e6d5d753812f096f12a38f50a012a022d6ecfa6827eaaaa4da98115bc1 SHA512 f944da6f0267c77e8401f9d8a113aba04dd58187b53e22bd6a249485905103d34f5a7a86fccf3f2a8b011d8db99734975894ae1441cc051101a19973d0732255
+DIST prosody-modules-0_pre20220319.tar.xz 1221828 BLAKE2B bb9482a60b15fd456125b512017ee93223bd139ed5b664236db4313b65985729ad4f5b8adb5d76bb9099ff4de816457fffd1277b7d36c556d00ce789d8ecf15f SHA512 a288d082e3bc2f9450c0b09e4f02816322d0db073134b315b2fa19be4d176037b399d763854c6c9a006eef85153c7bbbabddf5da85225d599082bfc7c0101450
+EBUILD prosody-modules-0_pre20220319.ebuild 1637 BLAKE2B d621e4f6c59a96ebf24c413ee683d7cae3c9eb516e956e9f13447d0b21a6d29c41b6afa81a858b459245d2b8a2e1c5655bc87d516b3b98833587612f87f8a68e SHA512 06b51230f675de6a155e1489cc6b6fa6ab2fd13051df76bcf832ccfc4686b2ac85129ec9bd580af15f9d73ea69d0291bd3408388f81038c73d735d33678939af
 EBUILD prosody-modules-9999.ebuild 1583 BLAKE2B 5c6e8d6fc573f956529324ce9fb85466276a3648677785872e50a39df5879ca9b0e72c270d7e7652973ee007df1933784e6a94a023df10165991cf1ad8cde1ed SHA512 64d7ef5126a6797b6d12f069c46777468bdf1553b4aaa0905eb6782310d27b91cf2f8c195d359b561664ca0b681baba1fee6a7731af4a35309b473d922c3ddb6
 MISC metadata.xml 702 BLAKE2B 1a27a1b550de974f6f28fe5afa1c070c0591efe67b8cddfaeca4307693698592e21e9f8eff2de2776cc37a6d07d9a8944815983928c0dcbd2a7e5ac61c5db6df SHA512 18fc3251c4cc97f6e429fd0ed2e653ba28771a67f7d791154bb22e6532508c528b6a64cdf35a425f978f866fe3abbb803de1d4d3b4ab2083e52a2adb7e6b8827
diff --git a/net-im/prosody-modules/prosody-modules-0_pre20211027.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild
index 31462790da3a..a120ace96588 100644
--- a/net-im/prosody-modules/prosody-modules-0_pre20211027.ebuild
+++ b/net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index cd3642707cec..12cffc0ca87a 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,9 +1,13 @@
 AUX prosody-0.11.7-gentoo.patch 1419 BLAKE2B 30a1ef43f6d3b00a07f621dc701e97ba45fb8b6d6ed67f95e5feff7bad32a4d037f0d00301c60bb05e1d5cb85bc1b78451ca0a989d7fda893f8b433ee50cc2f5 SHA512 9f5490ce156ef7d69f8daee7f274edc4d56da93dcbcfaf1a28f33ee8a0b5c6cb6a8f4f6f50cfd0cd3defad1ae90603803e6328ca3e160c4b3fa6aeadbd7104f3
+AUX prosody-0.12.0-gentoo.patch 1447 BLAKE2B e61e747c393b0b70795db0fc63e24abf684ceb3dbdc10c7567e59774f8cd1fbf8da50f749661ee567dcaa8dca5a04a25ff8b1705164da95bdf675f4d7d9639a2 SHA512 8914cc41b102a5f01f640cbb9188bb9c3e522f21f45ce753efebdfeb5b1313ff856af42731eea9822c62a1f21768d950091371150f5dc7a9dac93331f089e032
 AUX prosody.initd-r5 987 BLAKE2B 3e381f48cbc9c5361bdc6cb9ab4a13daf055cd35389036b4ed2efb6df4c5ea5bb4ff43947bdb29d09b263a7eb0ed7ffeda8425723f4e0a76387245ae02a2661f SHA512 56e8e5524c6b383355bb1106ffaac614196dd48a8d9fd1f62ece87fbe6278f7d2ea7a683027dd6dcfeb2bc7331d84e95868f8c0501dfc7e11ef77aa08ebdde17
+AUX prosody.initd-r6 1114 BLAKE2B a988b584eb49d21261776fa0a651dc01d3943a5a75c9bfeb5462c373bfb38cf0bbb3e48ae36990d9079932c5af7296d1970de928b2d027d01001c630982edfe3 SHA512 b72ebe1fa53a884f2074aae4871c10daccafdaa6bbef2b2400d2954a667c5794c9a9d2568a36c28850b05b1cc2fe97c4beef899a4b26ecacb027c9b90ed6f24f
 AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafbf7f691c36910f41d0b81d701bf8f287aea89fa368071c0c94a38f56ff3134055eb01842b578d8b57991 SHA512 0499588d1fd6e970575785b4bdaf631428601bec8a57051558c1d4c82bc74462f17d7568b8d433b14f15c51c94b181f4240d9f4574d51dcfeda291f0a68eb6f1
+AUX prosody.service-r3 439 BLAKE2B abd128f236f2c28f54542388a38aaa3d0e5030510dddc16240273de90c13ddee62d01d26d7c9e1be0635dc59ad9ca5e93a30f2b5fa42106489a95d26a037314a SHA512 b540e5d4389439cdd2886f9ccaf189d20ffcaf29a982a26e4ed296b0c529df95aade88751d22919cb36b27db94530dade754044d50cee2e5244d37983b933517
 AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
-DIST prosody-0.11.12.tar.gz 439656 BLAKE2B 593bb24d7e84ed337e8d8a11b387ac50abd27ea62be0fd18e8c8441472c09565a6603ccb070250b620b3f50f4d1e33fad579f988e68250c083b8a9aa25a8e03b SHA512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2
+AUX prosody.tmpfilesd-r2 39 BLAKE2B 1e004bf2bf1495d219c12bea1973206fae135fb4a5b453c6692f0143413626ec83889bb84b5086a6e507d3b8af14877b3820f3d9560df17e1ca49e2cbee85e0b SHA512 81b855c6bf496f0e6f20c41b8be5538c4edd1fbc6e4f2ca6e9a2d0a06bd5237223a4d42bcbdb75746cb01e46ff0eb36dac6952d9c076c6a72d1bbd733aca07eb
 DIST prosody-0.11.13.tar.gz 439816 BLAKE2B 8ace9001fe93d6349c744d17c7bccbf18c8704615cea856efcadd2de54430a64241cf7930345163e7bb6067aa4731da15dde4fc7f3ddb868b0680facc5368230 SHA512 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813
-EBUILD prosody-0.11.12.ebuild 2857 BLAKE2B 0d8254cac3b9616f02c374f308efaa073b77ca204952f788db5785409028b6dd8f162c7267f09de11e3327f83b434c23af57cda997594c2b4ec06f62d7cd091a SHA512 2603123885f1e0f696835c26a06e052b11998205d6cb78030222280760201f368facccd573fe767a2754ce0b378223a180fa3b545858a93aec715c7aa3f6d24d
-EBUILD prosody-0.11.13.ebuild 2859 BLAKE2B fc318edc0ee24b64b2a2dde1ee08f46cce57379e68cd9efcd1f9186fb51808bb58ab4d7b83b4ccbbaaf88632d4daca922e6e0136f6391567ea16d672750b20a7 SHA512 b594518da924cebc7d58a72aab64a3b10cc4d64f3056bd4f0ba34ac3087a773e4fc07db392842996beb619de0018aff196fa9f2283af9a9996b9e8cdd89e8a5e
+DIST prosody-0.12.0.tar.gz 610330 BLAKE2B 14694ee95dc6eb6d053278a9d7718fd7487fe7ef862b4e2ee0d57f2b60cdeb22d1c74eac4a4df7447ea3e9ff57fb3734a9c9997f2767ed3aa04682f265b82185 SHA512 b7144a413a5bc72b1e677504d5ced6583c7399c8334b39b4c9157da60f951300832b34a1d47703a0b217caa4f1d3a0f52ab59cef08b27c6b43e876e1dffca3ce
+EBUILD prosody-0.11.13.ebuild 2857 BLAKE2B 0d8254cac3b9616f02c374f308efaa073b77ca204952f788db5785409028b6dd8f162c7267f09de11e3327f83b434c23af57cda997594c2b4ec06f62d7cd091a SHA512 2603123885f1e0f696835c26a06e052b11998205d6cb78030222280760201f368facccd573fe767a2754ce0b378223a180fa3b545858a93aec715c7aa3f6d24d
+EBUILD prosody-0.12.0.ebuild 5131 BLAKE2B 32986fdee941501782c3a6f211401e0b53b404e5823d466bd3b89ec16a475d8b5f5fd874c028167ace137d7856556b3010341f3878b846210b63440c6ba35520 SHA512 52c336be8e9a097c0d3a76b487d63b37cbd4d925107e7cc6b9ee187a05612ca03f53fba9aa6c98044c134d06f303a4e13802e7421c081ec2d7a7fdfbfcdedb9f
 MISC metadata.xml 670 BLAKE2B 448bf5ede2b6f09940c51fdff4642e18be22d9c3dac637271c7c8bcfde1b4af0853e2623c55c00efcd8757ef863ac37fdb895606e572911a62a1c9d5f32cc693 SHA512 6177b8e3d2ed1aeeae2f369dc693283a3f811953f71be0e004eea402aa421d89973dbefe79c8fd198e9f9f82e4b345552dc3a2c3597c05927dc1a518cacbaf1d
diff --git a/net-im/prosody/files/prosody-0.12.0-gentoo.patch b/net-im/prosody/files/prosody-0.12.0-gentoo.patch
new file mode 100644
index 000000000000..3b2ba75b15c8
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.12.0-gentoo.patch
@@ -0,0 +1,29 @@
+--- a/prosody.cfg.lua.dist
++++ b/prosody.cfg.lua.dist
+@@ -17,6 +17,15 @@
+ -- Settings in this section apply to the whole server and are the default settings
+ -- for any virtual hosts
+ 
++-- Prosody will use this user and group for launching the service.
++-- Gentoo uses by default prosody:prosody (uid:gid) for all Jabber related services.
++prosody_user = "prosody"
++prosody_group = "prosody"
++
++-- Prosody will create this pid file after it has been successfully started.
++-- Please don't change that path, as it's being used by the Gentoo init scripts.
++pidfile = "/run/prosody/prosody.pid"
++
+ -- This is a (by default, empty) list of accounts that are admins
+ -- for the server. Note that you must create the accounts separately
+ -- (see https://prosody.im/doc/creating_accounts for info)
+@@ -26,7 +35,9 @@
+ -- This option allows you to specify additional locations where Prosody
+ -- will search first for modules. For additional modules you can install, see
+ -- the community module repository at https://modules.prosody.im/
+---plugin_paths = {}
++-- The default included path is for the optional net-im/prosody-modules package,
++-- which provides additional community maintained modules.
++plugin_paths = { "/usr/GENTOO_LIBDIR/prosody/modules", "/usr/GENTOO_LIBDIR/prosody/community-modules" };
+ 
+ -- This is the list of modules Prosody will load on startup.
+ -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
diff --git a/net-im/prosody/files/prosody.initd-r6 b/net-im/prosody/files/prosody.initd-r6
new file mode 100644
index 000000000000..e4138c597b23
--- /dev/null
+++ b/net-im/prosody/files/prosody.initd-r6
@@ -0,0 +1,46 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+name="Prosody XMPP server"
+prosody_config="/etc/prosody/prosody.cfg.lua"
+prosody_data="/var/lib/prosody"
+prosody_logs="/var/log/prosody"
+prosody_pid="/run/prosody"
+pidfile="${prosody_pid}/prosody.pid"
+
+command="/usr/bin/prosody"
+command_args="--daemonize"
+commandctl="/usr/bin/prosodyctl"
+command_group="prosody"
+command_user="prosody"
+
+checkconfig() {
+	if [ ! -f "${prosody_config}" ]; then
+		eerror "Please create ${prosody_config} before starting Prosody!"
+		return 1
+	fi
+
+	${commandctl} check config
+	return $?
+}
+
+depend() {
+	need net
+	use dns postgresql
+}
+
+reload() {
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${prosody_data}"
+	checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${prosody_logs}"
+	checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${prosody_pid}"
+}
diff --git a/net-im/prosody/files/prosody.service-r3 b/net-im/prosody/files/prosody.service-r3
new file mode 100644
index 000000000000..dec39e4b0b22
--- /dev/null
+++ b/net-im/prosody/files/prosody.service-r3
@@ -0,0 +1,17 @@
+[Unit]
+Description=Prosody XMPP server
+After=network.target
+
+[Service]
+Group=prosody
+PIDFile=/run/prosody/prosody.pid
+ExecStart=/usr/bin/prosody --daemonize
+ExecReload=/bin/kill -HUP $MAINPID
+User=prosody
+ExecStartPre=!/bin/mkdir -p /var/log/prosody
+ExecStartPre=!/bin/mkdir -p /var/lib/prosody
+ExecStartPre=!/bin/chown -R prosody /var/log/prosody
+ExecStartPre=!/bin/chown -R prosody /var/lib/prosody
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.tmpfilesd-r2 b/net-im/prosody/files/prosody.tmpfilesd-r2
new file mode 100644
index 000000000000..78949f3db82c
--- /dev/null
+++ b/net-im/prosody/files/prosody.tmpfilesd-r2
@@ -0,0 +1 @@
+d /run/prosody 750 prosody prosody - -
diff --git a/net-im/prosody/prosody-0.11.12.ebuild b/net-im/prosody/prosody-0.11.12.ebuild
deleted file mode 100644
index 1b9f77dd5703..000000000000
--- a/net-im/prosody/prosody-0.11.12.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-LUA_REQ_USE="deprecated(+)"
-
-inherit lua-single systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a modern XMPP communication server"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="icu +idn +libevent mysql postgres selinux +sqlite +ssl test +zlib"
-REQUIRED_USE="
-	^^ ( icu idn )
-	${LUA_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
-	$(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
-	$(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
-	net-im/jabber-base
-	icu? ( dev-libs/icu:= )
-	idn? ( net-dns/libidn:= )
-	libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
-	dev-libs/openssl:0=
-	lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
-	mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
-	postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
-	sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
-	ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
-	zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
-	${LUA_DEPS}
-"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-jabber )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.11.7-gentoo.patch" )
-
-src_prepare() {
-	default
-
-	# Set correct plugin path for optional net-im/prosody-modules package
-	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--add-cflags="${CFLAGS}"
-		--add-ldflags="${LDFLAGS}"
-		--c-compiler="$(tc-getCC)"
-		--datadir="${EPREFIX}/var/spool/jabber"
-		--idn-library="$(usex idn 'idn' 'icu')"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--linker="$(tc-getCC)"
-		--lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
-		--no-example-certs
-		--ostype="linux"
-		--prefix="${EPREFIX}/usr"
-		--runwith="${ELUA}"
-		--sysconfdir="${EPREFIX}/etc/jabber"
-		--with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
-		--with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
-	)
-
-	# Since the configure script is handcrafted,
-	# and yells at unknown options, do not use 'econf'.
-	./configure "${myeconfargs[@]}" || die
-
-	rm makefile || die
-	mv GNUmakefile Makefile || die
-}
-
-src_install() {
-	default
-
-	keepdir /var/spool/jabber
-
-	newinitd "${FILESDIR}"/prosody.initd-r5 prosody
-	systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
-
-	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process prosody.conf
-}
diff --git a/net-im/prosody/prosody-0.11.13.ebuild b/net-im/prosody/prosody-0.11.13.ebuild
index 9a4dc0782f50..1b9f77dd5703 100644
--- a/net-im/prosody/prosody-0.11.13.ebuild
+++ b/net-im/prosody/prosody-0.11.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="icu +idn +libevent mysql postgres selinux +sqlite +ssl test +zlib"
 REQUIRED_USE="
 	^^ ( icu idn )
diff --git a/net-im/prosody/prosody-0.12.0.ebuild b/net-im/prosody/prosody-0.12.0.ebuild
new file mode 100644
index 000000000000..e9cab9fb7d64
--- /dev/null
+++ b/net-im/prosody/prosody-0.12.0.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+LUA_REQ_USE="deprecated(+)"
+
+inherit lua-single systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Prosody is a modern XMPP communication server"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib"
+REQUIRED_USE="
+	^^ ( icu idn )
+	${LUA_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-group/prosody
+	acct-user/prosody
+	$(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
+	dev-lua/luarocks[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/lua-unbound[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/readline[${LUA_USEDEP}]')
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	ldap? ( $(lua_gen_cond_dep 'dev-lua/lualdap[${LUA_USEDEP}]') )
+	libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
+	dev-libs/openssl:0=
+	lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
+	mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
+	postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
+	sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
+	ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
+	zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
+	${LUA_DEPS}
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-jabber )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.12.0-gentoo.patch" )
+
+src_prepare() {
+	default
+
+	# Set correct plugin path for optional net-im/prosody-modules package
+	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--add-cflags="${CFLAGS}"
+		--add-ldflags="${LDFLAGS}"
+		--c-compiler="$(tc-getCC)"
+		--datadir="${EPREFIX}/var/lib/prosody"
+		--idn-library="$(usex idn 'idn' 'icu')"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--linker="$(tc-getCC)"
+		--lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
+		--no-example-certs
+		--ostype="linux"
+		--prefix="${EPREFIX}/usr"
+		--runwith="${ELUA}"
+		--sysconfdir="${EPREFIX}/etc/prosody"
+		--with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
+		--with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure "${myeconfargs[@]}" || die
+
+	rm makefile || die
+	mv GNUmakefile Makefile || die
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/prosody
+
+	newinitd "${FILESDIR}"/prosody.initd-r6 prosody
+	systemd_newunit "${FILESDIR}"/prosody.service-r3 prosody.service
+
+	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r2 prosody.conf
+}
+
+pkg_postinst() {
+	local migrate_to_prosody_user="false"
+	tmpfiles_process prosody.conf
+
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 0.12.0; then
+				migrate_to_prosody_user="true"
+				break
+			fi
+		done
+	fi
+
+	# Sarting with >=0.12.0, the prosody configuration is now in
+	# /etc/prosody and no longer in /etc/jabber.
+	# See if we need to migrate the configuration. Furthermore,
+	# prosody no longer runs under the, shared via net-im/jabber-base,
+	# 'jabber' use, but under its own user.
+	# This increase isolation and hence robustness and security.
+	if ${migrate_to_prosody_user}; then
+		local -A dirs_to_migrate=(
+			[/etc/jabber]=/etc/prosody
+			[/var/log/jabber]=/var/log/prosody
+			[/var/spool/jabber]=/var/lib/prosody
+		)
+
+		for src_dir in "${!dirs_to_migrate[@]}"; do
+			local eroot_src_dir="${EROOT}/${src_dir}"
+			local eroot_dst_dir="${EROOT}/${dirs_to_migrate[${src_dir}]}"
+
+			cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
+
+			if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
+				rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
+			fi
+
+			if ! use prefix; then
+				chown --recursive prosody:prosody "${eroot_dst_dir}" || die
+			fi
+		done
+
+		# Update configuration file to match new pathes and permissions
+		local mysedargs=(
+			-e "'s#/etc/jabber#/etc/prosody#g'"
+			-e "'s#/run/jabber#/run/prosody#g'"
+			-e "'s#/var/log/jabber#/var/log/prosody#g'"
+			-e "'s/prosody_user.*/prosody_user = \"prosody\";/g'"
+			-e "'s/prosody_group.*/prosody_group = \"prosody\";/g'"
+			-i /etc/prosody/prosody.cfg.lua
+		)
+
+		eval sed "${mysedargs[@]}" || die
+
+		ewarn "Newer versions of the prosody (Gentoo) package use ${EROOT}/etc/prosody"
+		ewarn "(just as upstream) and *not* anymore ${EROOT}/etc/jabber."
+		ewarn "The files from ${EROOT}/etc/jabber where copied to ${EROOT}/etc/prosody."
+		ewarn "Also prosody's spool directory became ${EROOT}/var/lib/prosody (was ${EROOT}/var/spool/jabbber)."
+		ewarn "Please check your configuration."
+	fi
+}
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index e7ca6a0002b8..954c0865a3b7 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,9 +1,8 @@
-AUX qtox-1.16.3-qt-5.13.patch 672 BLAKE2B 49bde1355f9042dcb60dde2863435bf32110d87d4954191425a50e67ff3ae2ea4b226a16639137a31267d5a97568b45249d1fbb22d2c2d21c5d5db64059322e9 SHA512 eb716cbd6b33c9a07f197a11dce31d875d32a1dfeb499bf2445e77b508cfb3a658a3e9ad1e6724b942e730a67d3784fe250682e151c87d93b83aa4ae0320cda1
-DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c
 DIST qTox-1.17.3.tar.gz 4765213 BLAKE2B 3bffa351da01b436edc9c80c481845f6c6399c930ac1601e1676b7dec22ccfbf37c082c3a30ab71e2295c96bb427b36a718f960ffc75e700d5c29605f7bf0ac0 SHA512 e7534e40aed06aaeba57a201b7315ae2bd361f80971969b95b00fea0a6cbe106c2ea337485c47b350c07a9e3b74947c8b2feb206899292c29621e057b630ca56
 DIST qTox-1.17.4.tar.gz 4778657 BLAKE2B 5edcb6b6f997eeb4a332c23477d4c5021085cf8c62be596b0eb4771963f450bc96de6c2dc30ec3cfc98577f20bf618e8fc2478fc34af8a8810fc538a5ccc787b SHA512 00dd2b4492e6dbf90b038bd1e5263ba96c969fb5d879b5680401ad090ffe6aaa70ff487f2e88f93c573f2e1a7e6ca50a75dfe7b51fc56fc4d08cac076bfd75d0
-EBUILD qtox-1.16.3-r1.ebuild 1564 BLAKE2B 03facbc9f537853e2d2d9c265835630ae74a83574c7e76acfeed51ba9d22ce16edfbfc4cb5c1b5ed9d70a14401e78b5e0104341c4bd46a5c2583151cc90d6227 SHA512 5f6d88631c0d46c0c2484512b5ec768e15d41f804e260e524b58b40a85f195f2d26970cb25afc5c95d41c00152d1816b059a90101402b008c7cad080b8faa5bf
+DIST qTox-1.17.6.tar.gz 4777590 BLAKE2B d67ea8c1d5c478a791fd8594866130874c036f22ec9fd991e0f6c81fb7919824bba8e13675b0ffaf613188215a4fce6d07545476ab5565922b3989519aedd91f SHA512 840dfbca2cb1a3db4b5ab27cb408e183b152fcd87c0cb915ee58245e7c311b8682605e73497248072a5a48b239058b101a85235ed169d19606dc7bf61865f208
 EBUILD qtox-1.17.3.ebuild 1777 BLAKE2B 662bf5e9a1b535dcd25f1032bfb2257316cc41e484c0ff92a4f60b2f440bb8488969a5b532f2e529ac36daeb28a729e2be8dc5862a0980ef81e317934a99dbe5 SHA512 456680cca3cf840351814d20a69615a225c0db6592b51290a362ef3a6316e9d5243b66bdec78fafa02564c18057fa57c62ce65e3183cefcbe987f51c2c601ebf
 EBUILD qtox-1.17.4.ebuild 1905 BLAKE2B f9e9b9e89b78a9b5e75030c517216dc713a31fd022f0b9c2bde6f14380c423d8db78ac63495b19fdb536cf52b46c369fb1dbcecee1ab37c0c26c4128653c0dbd SHA512 a8309f88cb917f3cd6f845540a5f3979c11ce6ae018e8d4aad160befdd4fe59207e045594962655efb61f7314873dbbd25352f7349ee195fea7a71d861401904
+EBUILD qtox-1.17.6.ebuild 1905 BLAKE2B f9e9b9e89b78a9b5e75030c517216dc713a31fd022f0b9c2bde6f14380c423d8db78ac63495b19fdb536cf52b46c369fb1dbcecee1ab37c0c26c4128653c0dbd SHA512 a8309f88cb917f3cd6f845540a5f3979c11ce6ae018e8d4aad160befdd4fe59207e045594962655efb61f7314873dbbd25352f7349ee195fea7a71d861401904
 EBUILD qtox-9999.ebuild 1971 BLAKE2B 99e1d6e2c0b950acd10d5dac741a20ef04baa7d739df6e7df230fbbc12d3ac12c75a81ca9730744c3c97a6517d76d079beda0494ce7bbcb4340d876c43246726 SHA512 6b243eb5730f2a678ff5966848840f426d50cf0ecb5fd70e56e43e952d77a4ba3a46311b18c28ef8eb287679710c4f76f33aae8f655f1b1362ecd45cbc1aced2
 MISC metadata.xml 672 BLAKE2B 0f28ef27d2fab6333632a78210eb699d6655041aa04a208c27fb527f9f541038f9ed07fa9250302f55eccc1df0c45774dc358c141f7e8aef3abcba9ae58512ae SHA512 333f2df5182e424dae5de93cfd65a3ad267ef2eec55ab023efc79443390822723d737b392e9cea9a5adffa048a74b225b846df1578010ffc19709040881b0136
diff --git a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch b/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
deleted file mode 100644
index 16805843253a..000000000000
--- a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt	2020-01-15 22:17:59.921502029 +0100
-+++ b/CMakeLists.txt	2020-01-15 22:19:55.834885195 +0100
-@@ -48,7 +48,6 @@
- set(RCC_OPTIONS -compress 9 -threshold 0)
- 
- # Use C++11.
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
- 
-@@ -56,7 +55,6 @@
- set(POSITION_INDEPENDENT_CODE True)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
- 
- if (NOT WIN32)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
diff --git a/net-im/qtox/qtox-1.16.3-r1.ebuild b/net-im/qtox/qtox-1.16.3-r1.ebuild
deleted file mode 100644
index d29e70e3f7b1..000000000000
--- a/net-im/qtox/qtox-1.16.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="qTox-${PV}"
-inherit cmake xdg
-
-DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
-HOMEPAGE="https://github.com/qTox/qTox"
-SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="notification test X"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-db/sqlcipher
-	dev-libs/libsodium:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	|| (
-		dev-qt/qtgui:5[gif,jpeg,png,X(-)]
-		dev-qt/qtgui:5[gif,jpeg,png,xcb(-)]
-	)
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-gfx/qrencode:=
-	media-libs/libexif:=
-	media-libs/openal
-	>=media-video/ffmpeg-2.6.3:=[webp,v4l]
-	net-libs/tox:0/0.2[av]
-	notification? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11
-		x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152
-
-src_prepare() {
-	cmake_src_prepare
-
-	# bug 628574
-	if ! use test; then
-		sed -i CMakeLists.txt -e "/include(Testing)/d" || die
-		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_STATUSNOTIFIER=$(usex notification)
-		-DENABLE_GTK_SYSTRAY=$(usex notification)
-		-DPLATFORM_EXTENSIONS=$(usex X)
-		-DUSE_FILTERAUDIO=OFF
-		-DGIT_DESCRIBE="${PV}"
-	)
-
-	cmake_src_configure
-}
diff --git a/net-im/qtox/qtox-1.17.6.ebuild b/net-im/qtox/qtox-1.17.6.ebuild
new file mode 100644
index 000000000000..825ce6aa14d1
--- /dev/null
+++ b/net-im/qtox/qtox-1.17.6.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qTox/qTox.git"
+else
+	MY_P="qTox-${PV}"
+	SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/qTox"
+fi
+
+DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol"
+HOMEPAGE="https://qtox.github.io/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="notification +spellcheck test X"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-db/sqlcipher
+	dev-libs/libsodium:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[gif,jpeg,png,X(-)]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/qrencode:=
+	media-libs/libexif
+	media-libs/openal
+	media-video/ffmpeg:=[webp,v4l]
+	>=net-libs/tox-0.2.13:=[av]
+	notification? ( x11-libs/snorenotify )
+	spellcheck? ( kde-frameworks/sonnet:5 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+	X? ( x11-base/xorg-proto )
+"
+
+DOCS=( CHANGELOG.md README.md doc/user_manual_en.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# bug 628574
+	if ! use test; then
+		sed -i CMakeLists.txt -e "/include(Testing)/d" || die
+		sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPLATFORM_EXTENSIONS=$(usex X)
+		-DUPDATE_CHECK=OFF
+		-DUSE_CCACHE=OFF
+		-DSPELL_CHECK=$(usex spellcheck)
+		-DSVGZ_ICON=ON
+		-DASAN=OFF
+		-DDESKTOP_NOTIFICATIONS=$(usex notification)
+		-DSTRICT_OPTIONS=OFF
+	)
+
+	[[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} )
+
+	cmake_src_configure
+}
+
+src_test() {
+	# The excluded tests require network access.
+	cmake_src_test -E "test_(bsu|core)"
+}
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index 6de9a77768da..6388f10978f2 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST rocketchat-3.7.6.x86_64.rpm 72058676 BLAKE2B adc5dcf4366c679cda4e55fdcffefa3284f82e4e0616229ee3fbece519da81a9e71f24c3a04a7301d4b754292a09e09c13221c9e3b2ece65d2ba266655da5b43 SHA512 2d29cbdf9fa1e18eec7687edaea1ebe1b8005aa550df68cec91bb04f91f7fa65dd54b08b3de2ff1f5442fcf97d5b12e5d134123bed6c3e9cbaf6069ffc7a1e5f
-EBUILD rocketchat-desktop-bin-3.7.6.ebuild 1089 BLAKE2B f3efa622db8a3e734d3037063d0ddb8343fbc12f180131544be1edf9d98c7ce9c301fba3f1cea4f26244651df6b00682b110344132afb3bfb550ab9087fa060f SHA512 86e38fb3f25fd20db8f8398396e78067805e073b28668c48b36531ceabe95c04888a3fda2f83cf92eaf2f299d56676c4420fcd76af47151a8ce8ba87a3dbd629
+DIST rocketchat-3.7.9.x86_64.rpm 62177412 BLAKE2B 0acb4fb3c36e758073e81cfe41a2a2b184091e22ce9bf92290c9df6ba5c73da8bdd8525829d6b5795ed4c7910eb26aa761c08ec8f9efc84b6ec94182dc0ccd3d SHA512 6e1a65723ed7e419d94d58bb71d35596a0d261d92f1bcb56cc9341b3108714c4d9ff0e09982bfafd26e42e0ba48a6e7a181f4cfdb630f59659e6823c8aa9b39c
+EBUILD rocketchat-desktop-bin-3.7.9.ebuild 1088 BLAKE2B c4b37c17d6ab3950b7838af4133ccf73af81a07e72f3b352bceaa2fdf5363b9e5c7dca6667a573c5464f6d0e083bcc0a9dbd5d0b8e78057a23882cdfddb2d7d2 SHA512 b86078cf202510eb06386832757e14533b78663c2bde803526fa43ae5ee9d6f520365085e2520dbfb870065fa90064124ccfae249e524cbe56d8c93e0fa429be
 MISC metadata.xml 434 BLAKE2B 2253702089149978e030c97d8a21ef29c0870683e6896d105e9000e77d32d3c66c3482c2b0d2ecbbac6bc281a85be9267918f4d5691ea6c5cf6fab3ebc80db96 SHA512 9cba4c7855c123b866f6a24e99320ddb3b6a450fd5f37eadf364bd92e1e58fe7e0c3f4a6892bb26f0142869d983fe12f5b3753b1960763ffe63a0c8d0d54ebe0
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.9.ebuild
index 9953c00c594d..194a95979a80 100644
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.9.ebuild
@@ -8,6 +8,7 @@ inherit rpm xdg
 DESCRIPTION="The Ultimate Open Source Web Chat Platform"
 HOMEPAGE="https://rocket.chat"
 SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}.x86_64.rpm"
+S="${WORKDIR}"
 
 KEYWORDS="-* ~amd64"
 LICENSE="MIT"
@@ -46,8 +47,6 @@ RDEPEND="
 
 QA_PREBUILT="opt/Rocket.Chat/*"
 
-S="${WORKDIR}"
-
 src_install() {
 	# remove files useless for Gentoo
 	rm -r usr/lib || die
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index f54d4daa6036..e2b5671cfd09 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,5 +1,3 @@
-DIST signal-desktop_5.28.0_amd64.deb 125042908 BLAKE2B ddc7e4d04e679320c70ddaaf9544a07d6a9f8e73a339e0689941946c8148d339fe6c5c6933c85256abff5bda6abe3cf35733c5e35ead17391d3e807f450515d0 SHA512 4e50d5c17d29d49144bd0c19da45d8d0e55f319b7c8e7dc24b99a80c7c127ff6386d28490cc0389526ab85854334d4e4ab5a8d6ba38ed2564d5a47c8fb48fab0
-DIST signal-desktop_5.29.1_amd64.deb 125070070 BLAKE2B 86d7e75fd725d8ca740164343dfa7ed76b106620647cfd646c08e4d583368c8cb3bcd630d25d85cccbfa4f06288d40a8ed9e4735e9bd6a2cc8cbdb10ce5d75db SHA512 6036fedfc8e5c7ef2cdcc97e96919b3f9bb74aff8732066a2694100bc25f848a06317b0c54f9125284ee8f47e9498ec09713b6f5f4afadfeb74c2bd95699e343
-EBUILD signal-desktop-bin-5.28.0.ebuild 2427 BLAKE2B a95cd9809345ce6a1220720278dd2e876bee3804377628fcaa81c3e0e6a66c18f40ee0f45512cfe5dc3c0640a69690ce6cd7428b74b6f19dd13b15fdf7698a80 SHA512 ec1fd4c473d491a54a71e715dfa48df453871dc11659a56ab33295a629b21b8d70cebd88c2ce8898978e1de598e1f152eafe85a07bf01b27a4c013b81aee8cdb
-EBUILD signal-desktop-bin-5.29.1.ebuild 2428 BLAKE2B 6bfeb2dadd272d73589a0926ae2cd2e68c6f84d5f5dd399b8cfa32721aeb084a76bbdfb4e8ec8256a1007ceee240db7aacf569db8625022821e92b767c4c2158 SHA512 fa474101f607d0f6db4f858222075e55d409ad015dac8fec417c23837077336453e3add2174417110184be78c17de61d3b4739084808665cfc3ff51bdb11b73e
+DIST signal-desktop_5.35.0_amd64.deb 125267244 BLAKE2B 5834552a82913e9b401812e2d6f8336d28ef14b1800a75f9e1dd4112ac45472a163883e91c2ec7666ad9239d533309334be045a025545572d1b8256577a769f1 SHA512 13a342481698ea3fc6b1dd2d65e3891ee2d4dff9345403307db09efd82aae06ed16425c464a9cb493a0f168a07f7def2d93386847fdd4d0bcfa3709f61a06094
+EBUILD signal-desktop-bin-5.35.0.ebuild 2427 BLAKE2B a95cd9809345ce6a1220720278dd2e876bee3804377628fcaa81c3e0e6a66c18f40ee0f45512cfe5dc3c0640a69690ce6cd7428b74b6f19dd13b15fdf7698a80 SHA512 ec1fd4c473d491a54a71e715dfa48df453871dc11659a56ab33295a629b21b8d70cebd88c2ce8898978e1de598e1f152eafe85a07bf01b27a4c013b81aee8cdb
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.29.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.29.1.ebuild
deleted file mode 100644
index 47f9a77095de..000000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.29.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/-bin/}"
-
-inherit pax-utils unpacker xdg
-
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
-HOMEPAGE="https://signal.org/
-	https://github.com/signalapp/Signal-Desktop"
-SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
-S="${WORKDIR}"
-
-LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+sound"
-RESTRICT="splitdebug"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[X(+)]
-	net-print/cups
-	sys-apps/dbus[X]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/cairo
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/pango
-	sound? (
-		|| (
-			media-sound/pulseaudio
-			media-sound/apulse
-		)
-	)
-"
-
-QA_PREBUILT="
-	opt/Signal/chrome_crashpad_handler
-	opt/Signal/chrome-sandbox
-	opt/Signal/libEGL.so
-	opt/Signal/libGLESv2.so
-	opt/Signal/libffmpeg.so
-	opt/Signal/libvk_swiftshader.so
-	opt/Signal/libvulkan.so.1
-	opt/Signal/resources/app.asar.unpacked/node_modules/*
-	opt/Signal/signal-desktop
-	opt/Signal/swiftshader/libEGL.so
-	opt/Signal/swiftshader/libGLESv2.so"
-
-src_prepare() {
-	default
-	sed -e 's| --no-sandbox||g' \
-		-i usr/share/applications/signal-desktop.desktop || die
-	unpack usr/share/doc/signal-desktop/changelog.gz
-}
-
-src_install() {
-	insinto /
-	dodoc changelog
-	doins -r opt
-	insinto /usr/share
-
-	if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then
-		sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die
-	fi
-
-	doins -r usr/share/applications
-	doins -r usr/share/icons
-	fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
-	fperms u+s /opt/Signal/chrome-sandbox
-	pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
-
-	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "For using the tray icon on compatible desktop environments, start Signal with"
-	elog " '--start-in-tray' or '--use-tray-icon'."
-}
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.28.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.35.0.ebuild
index 75db5c2f8043..75db5c2f8043 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.28.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.35.0.ebuild
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 5735bed02f89..c2337bb1db78 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,9 +1,11 @@
-DIST skypeforlinux_8.77.0.90-1.x86_64.rpm 123643165 BLAKE2B 12c578f99f482012f54d5f9faa2d017358376902aa6879fd35ce6eba1b16e3458d4831450574158c69436b9c6103a8dd00233451b56415542e2b6e81eb9346b8 SHA512 ee1fdae1ad10f1fba91886bea52eef261151463e184746af288150bebb69d4bf0dd87d0ac4030d8d11f86054f7b2cb663b8647ce795b1bf924f23c2b7559574b
-DIST skypeforlinux_8.78.0.161-1.x86_64.rpm 123910012 BLAKE2B 560b9548f99d681c916e55a939659ab925096c7bd135a44cca99f12fa9fe913a1fbdbeaf584414e626215f313d09aec4320bfa2859892029c822b5adfc388f23 SHA512 fca1f839611d1ec46eebeacc0e90141a36fc305da90e02df1eecd529256e2609726d180b4839a2874973eb6f842bc332302f041b0b3be49293f64f2a18e7060f
 DIST skypeforlinux_8.79.0.92-1.x86_64.rpm 117949890 BLAKE2B a7150c362f117096d554c446357789f51595ff403061f81adf8be3e59452b7bf7970ff10e2fe31413f793a0a137f8f0822fd6710932e9aea2197959ef2976cfa SHA512 2094870f227acb7e0a24af4d96d39bc0cf94ea0d3e5fb5907c75ad0ff6704c55882b104a306ad5d1e350c4adf5fd4f0d8444a9ddb07d7a39ef79a8cacd7faf3d
 DIST skypeforlinux_8.79.0.95-1.x86_64.rpm 118002157 BLAKE2B 0e836e3fd0c06bb5bd57d2806b3a51772e307a9555e573fdc366ebf1b82f2f8f1e422d64981f1973962d0ed1fa689c26482a48bf8193eedb65fe009056ff651c SHA512 eda292a1cd624c9a4819362820430769ead67f08113c66e58d6a4db17af4323f5483b6dadec41075b53feb25e7d7ef4c7ab738289246724678d2af9414fe58ad
-EBUILD skypeforlinux-8.77.0.90.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
-EBUILD skypeforlinux-8.78.0.161-r2.ebuild 3299 BLAKE2B c9f1e65dffa9b2ff06d5f78cfa58186488f50119a052bef11576ca5ed2b0189af3299f35a03913afce1a6ded30831d81ea759ac0cb8fa86b7b90a6db9e75e8f8 SHA512 7e2600db2c8c7b823a20257a206962d25c77654d504cae69f654f0b39a61c36fead87b0cac53d38c38d47c6fda58fcd4862ef9b1f7dfed7f60ddf0564a8c25bb
-EBUILD skypeforlinux-8.79.0.92.ebuild 3160 BLAKE2B 6c1166b7c763cdebc043131414e8d78b26f5f75b8aaa7884e06b83672da9f6b020b25a3c13a21f2c9b6359cc55c6b06cbb1914db2f63ba4490f3ff8aae28558f SHA512 7c175e3d0a531e49d5513459597fc82803c55d5ccb0f26a11fef265f7a68f9028a9ebdb79b495511d5fc6ded1fdc32691b0b99aa1cf39f3df069dc19bd4c9c4b
-EBUILD skypeforlinux-8.79.0.95.ebuild 3160 BLAKE2B 6c1166b7c763cdebc043131414e8d78b26f5f75b8aaa7884e06b83672da9f6b020b25a3c13a21f2c9b6359cc55c6b06cbb1914db2f63ba4490f3ff8aae28558f SHA512 7c175e3d0a531e49d5513459597fc82803c55d5ccb0f26a11fef265f7a68f9028a9ebdb79b495511d5fc6ded1fdc32691b0b99aa1cf39f3df069dc19bd4c9c4b
+DIST skypeforlinux_8.80.0.143-1.x86_64.rpm 118601687 BLAKE2B 8686eeb83a9e5df927a366cd05168224ac5869f83a11e59efb68af54f4c734b914e44f0993e3fa93b3b2e9749092063bdba77bb4fc4ce2dfedbddd523dc2617d SHA512 23c2a4db2831775bb20a709576319bdade0bc17d6e29af55a7953c54fdb626ec020066f5c54fbcb0d40aab534596ccb558211b76f2a656a9edc5daf49818e610
+DIST skypeforlinux_8.81.0.268-1.x86_64.rpm 140540850 BLAKE2B 5d6cca460c5ad663ba5ac90d3d22f7c7eab7869b6b34413de7e8a479d7461d8b7aa9112798722a38c6b9ed0bf0321a37300bf410fc123e0bb8c7164cb027b2a7 SHA512 e2b077cca85c9fdbdac7b50cbfe3fa5bb628c7321dc30d5d6eac5d3c8b83d2a365bbe226f33cf35d2e5614a1b48eb9971ada4c87b98dd161c985e99a5008a9c9
+DIST skypeforlinux_8.82.0.403-1.x86_64.rpm 140817695 BLAKE2B 94a1038a534dce77e014e3823e4e5f2a8e6a951d3a644ed1562a5d50dad92f73152910286d797c50b882662f6f85cbf30bc4d80e5fcee7ac956f2c18177c00e1 SHA512 97920148290f9a4e7091f90a9e46f20ba663ad3f07c15a8540947d4b9a4390c217ac4eea5e80a5aad3a83e4110588fb7038b6359f34f4774ca6912f91db76346
+EBUILD skypeforlinux-8.79.0.92.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
+EBUILD skypeforlinux-8.79.0.95.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
+EBUILD skypeforlinux-8.80.0.143.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
+EBUILD skypeforlinux-8.81.0.268.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
+EBUILD skypeforlinux-8.82.0.403.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
 MISC metadata.xml 461 BLAKE2B 9bcbfe1d6892c40ce917a76c600baad338b5b86967e5656f79b9bf29e75c3ba474dc11444d8e347769f37934610a971097f96b22ae171ea46cd3f1aef2e9f3e5 SHA512 81df3ef175eafabad357f3d5792c71534b85ffd2c1bd9280ea7ef9cbea17aceb396bc7ac65abdb09e5fba8c3d98384c0d67c58a8daa2d42a657e1a7b150b52e7
diff --git a/net-im/skypeforlinux/skypeforlinux-8.79.0.92.ebuild b/net-im/skypeforlinux/skypeforlinux-8.79.0.92.ebuild
index 9627b561f6f1..911974eaca88 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.79.0.92.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.79.0.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,6 +33,7 @@ RDEPEND="
 	net-print/cups[${MULTILIB_USEDEP}]
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-devel/gcc[cxx]
+	sys-libs/glibc
 	virtual/ttf-fonts
 	x11-libs/cairo[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild b/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild
index 9627b561f6f1..911974eaca88 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,6 +33,7 @@ RDEPEND="
 	net-print/cups[${MULTILIB_USEDEP}]
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-devel/gcc[cxx]
+	sys-libs/glibc
 	virtual/ttf-fonts
 	x11-libs/cairo[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild b/net-im/skypeforlinux/skypeforlinux-8.80.0.143.ebuild
index a44feb7c8927..911974eaca88 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.80.0.143.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_64 )
 
@@ -10,12 +10,12 @@ 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"
+S="${WORKDIR}"
 
 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
 
@@ -33,6 +33,7 @@ RDEPEND="
 	net-print/cups[${MULTILIB_USEDEP}]
 	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-devel/gcc[cxx]
+	sys-libs/glibc
 	virtual/ttf-fonts
 	x11-libs/cairo[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.78.0.161-r2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild
index 69bae224b928..911974eaca88 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.78.0.161-r2.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_64 )
 
@@ -10,17 +10,15 @@ 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"
+S="${WORKDIR}"
 
 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
 
-# Need to drop -clone3(+) from glibc once Electron is updated
-# bug #823790
 RDEPEND="
 	app-crypt/libsecret[${MULTILIB_USEDEP}]
 	dev-libs/atk[${MULTILIB_USEDEP}]
@@ -34,8 +32,8 @@ RDEPEND="
 	media-libs/libv4l[${MULTILIB_USEDEP}]
 	net-print/cups[${MULTILIB_USEDEP}]
 	sys-apps/dbus[${MULTILIB_USEDEP}]
-	|| ( <sys-libs/glibc-2.34 >=sys-libs/glibc-2.34[-clone3(+)] )
 	sys-devel/gcc[cxx]
+	sys-libs/glibc
 	virtual/ttf-fonts
 	x11-libs/cairo[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild b/net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild
new file mode 100644
index 000000000000..911974eaca88
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+S="${WORKDIR}"
+
+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"
+
+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]
+	sys-libs/glibc
+	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/libxkbcommon[${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 1663732fd062..bbeb7bdc57fa 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,3 +1,5 @@
 DIST slack-desktop-4.22.0-amd64.deb 65772046 BLAKE2B e0178bb0118fa22699c459f7e289ba17fa116ba4f231a5fca6d4a889b737110c8de036651ca753a282500b168bba0fbae83c03a42e1a6df0096d1ca31761adcf SHA512 085122d454c9cf66091c167d16017d051a37dcf3cec07dcc8b4e28f40bc1b77bc98315b63219b1bd56c65305b3b49b9fb4161f8271a03e4bf7d42889b9c282f1
+DIST slack-desktop-4.23.0-amd64.deb 65626830 BLAKE2B a4b49e71b956e74a915ea9f2e26272d8ef15191c92479b1ed2615108569cc4c6cb97de53ff8d4099e4348b81c97447c0edfc1b0fbeacda3833953de9463e877f SHA512 f7885d78f712624ec8c3a26787a1876f4c6a35fedeec824ed4b1d7cc57dd23b9402254a7cfa9f585c3869a920d6fcfc868b9875a477fde1eab9d42a01d43d550
 EBUILD slack-4.22.0.ebuild 2953 BLAKE2B d51f573718553249352c0cbd55d70aee616b1284bd2caf3ef941d24121c007ee11f9cda89b9b6c54e47d61d618a185a51494f377a32f436fb2b988ed6af9e5bb SHA512 fb31eaa886e7622e946068223e583a3b56331e07f8411dd0d162183f605502c4a6f1d64d2972a1b7b9c930b510b161e0001bab0eb78f14a878d429d6a4e9b30c
+EBUILD slack-4.23.0.ebuild 2953 BLAKE2B ddcb25cdc98ee870f8fe10d3f9a4a13a6b6459f38264903e58839bc136f230c356e7c3b7af487f7fca41349a40885fc7d5f9408eb742f89e389795ff0fcb9cde SHA512 04dbbe9ced8d375c0aba75e0b22342cde4ab82f7120472236f7bd82215887be71653cc9e7079fe9b4faf56b7d357360e2351bfe3b43c549017d87cb0ffb3ead0
 MISC metadata.xml 717 BLAKE2B c85da6ab5c26c0bff1b183b1cac406ea8d8ea4d73fbbf91b01f62acfc20f64b13d29d4a6502a4593b06757ea607409bcb0c206fd2d7de612222a0db2382791f4 SHA512 7e924f0a41f8f6889c403d8087afa3ac83852d9571ea35b6bca5ab0f47f898bfbcc5557e5ae8b9e95e692c46d185dc8b18895cb81160422e561abebbababd3ab
diff --git a/net-im/slack/slack-4.23.0.ebuild b/net-im/slack/slack-4.23.0.ebuild
new file mode 100644
index 000000000000..16e9577cda1b
--- /dev/null
+++ b/net-im/slack/slack-4.23.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop multilib-build optfeature pax-utils unpacker xdg
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="https://www.slack.com"
+SRC_URI="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/${PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="appindicator suid"
+RESTRICT="bindist mirror"
+
+RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
+	app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
+	dev-libs/atk:0[${MULTILIB_USEDEP}]
+	dev-libs/expat:0[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0[${MULTILIB_USEDEP}]
+	dev-libs/nss:0[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	media-libs/mesa:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
+	sys-apps/dbus:0[${MULTILIB_USEDEP}]
+	x11-libs/cairo:0[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libdrm:0[${MULTILIB_USEDEP}]
+	x11-libs/libX11:0[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+	x11-libs/libXext:0[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+	x11-libs/pango:0[${MULTILIB_USEDEP}]
+	appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
+
+QA_PREBUILT="opt/slack/chrome-sandbox
+	opt/slack/chrome_crashpad_handler
+	opt/slack/libEGL.so
+	opt/slack/libGLESv2.so
+	opt/slack/libffmpeg.so
+	opt/slack/libvk_swiftshader.so
+	opt/slack/libvulkan.so.1
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/slack
+	opt/slack/swiftshader/libEGL.so
+	opt/slack/swiftshader/libGLESv2.so"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# remove hardcoded path, logging noise (wrt 694058, 711494)
+	sed -i  -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
+		-e '/Exec/s|slack|slack -s|' \
+		usr/share/applications/slack.desktop \
+		|| die "sed failed in Icon for slack.desktop"
+
+	if use appindicator ; then
+		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for slack.desktop"
+	fi
+
+	rm usr/lib/slack/LICENSE{,S-linux.json} \
+		|| die "rm licenses failed"
+}
+
+src_install() {
+	doicon usr/share/pixmaps/slack.png
+	doicon -s 512 usr/share/pixmaps/slack.png
+	domenu usr/share/applications/slack.desktop
+
+	insinto /opt # wrt 720134
+	cp -a usr/lib/slack "${ED}"/opt || die "cp failed"
+
+	use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094
+	dosym ../../opt/slack/slack usr/bin/slack
+
+	pax-mark -m "${ED}"/opt/slack/slack
+}
+
+pkg_postinst() {
+	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
+
+	xdg_pkg_postinst
+}
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 3be10a63b390..e527e82b4fd4 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,6 +1,8 @@
 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.1.0.tar.gz 837296 BLAKE2B 3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45 SHA512 53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321
-EBUILD spectrum2-2.1.0.ebuild 2368 BLAKE2B 5adf456ff9f5bc8218fea023468c87528dca066d369b1fe7aeee936eb750388e141167f14e364391664946f2c9ce61899363959ee45e5752145973bad692f831 SHA512 a4a1b3a4868b6c81c031bbe5a8ce325ff814f299f24a23b3fc440faceaf9d757b90e1871b2b99e1f7366e3148f69234ed672e26e68adda5b122a8ef286ad89d9
+DIST spectrum2-2.1.2.tar.gz 665486 BLAKE2B edd98a296269141bdd104fca9f8e56d63b2f6a8ea9cda855bc17a65f8183be0b295a47453876df981ad5a3acf1df9483ab44c5a6d731ecc51e9ab6d61f005bb0 SHA512 e39caa9bb149c47b4a621f76613bf1f58cad84800851935dcf2722d91e84a5c21ccd50029ebc25c0d34d988dc390ece526ecfb1d3db6054ac8c07f4426be3a83
+DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B 8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77 SHA512 b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8
+EBUILD spectrum2-2.1.2.ebuild 2368 BLAKE2B f0ddcbf331786e39356068c8409affad2ce485762ca5fb77710990bac2cae2821176ded2a2e16ee4cf0107c58d8035a0430948cb531a6905b855469ffdad114a SHA512 0263ff8af189cd78989c10c42185ab59d529dbef303c036b5ebe30dc5de3e8e4ee16430d4de7449011d67eb041178221d4734bb259b8826e90093f708549e6fb
+EBUILD spectrum2-2.1.3.ebuild 2369 BLAKE2B 39f834456b270993134753d9dbf11da6e0cf72a97a484130766ef675cbe2ba3a28003a3435bcc0ad78ec90a641808f80f3f26e8156510c0c7736c03c11215fcd SHA512 ed61a819abedcc117c94fdcc6b4e87d74121e6ba64dc8cce15570250cead861fa9cdae601460b62ae7bcd9a252af64f8ba17ed7243eec553070e52634313ea5c
 MISC metadata.xml 1141 BLAKE2B 8964184caabc03f6c5da13842bc5219b0d563baa5d9a1fc52020d686756953a2321d80ede5c5e9aa8321cad1f9a4ea753847c63230b8fb55c8c52e0b61bded23 SHA512 13c244aba5cf70af7e2555a05ba604e28b042d95f879a9f747702b13da7484d6ca3a941ee16d5ad0db864eceb51b55509d0a0761c9f8f7ab11328d67cbe8886c
diff --git a/net-im/spectrum2/spectrum2-2.1.0.ebuild b/net-im/spectrum2/spectrum2-2.1.2.ebuild
index 4678773061b0..9578b2864a39 100644
--- a/net-im/spectrum2/spectrum2-2.1.0.ebuild
+++ b/net-im/spectrum2/spectrum2-2.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake systemd tmpfiles
 
diff --git a/net-im/spectrum2/spectrum2-2.1.3.ebuild b/net-im/spectrum2/spectrum2-2.1.3.ebuild
new file mode 100644
index 000000000000..546c78a06593
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.1.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/spectrum
+	acct-user/spectrum
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/libev:=
+	dev-libs/log4cxx
+	dev-libs/jsoncpp:=
+	dev-libs/openssl:0=
+	dev-libs/popt
+	dev-libs/protobuf:=
+	net-dns/libidn:0=
+	>=net-im/swift-4.0.2-r2:=
+	net-misc/curl
+	sys-libs/zlib:=
+	frotz? ( !games-engines/frotz )
+	irc? ( net-im/libcommuni )
+	mysql? (
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	postgres? ( dev-libs/libpqxx:= )
+	purple? (
+		dev-libs/glib
+		net-im/pidgin:=
+	)
+	sms? ( app-mobilephone/smstools )
+	sqlite? ( dev-db/sqlite:3 )
+	twitter? ( net-misc/curl )
+	whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	# Respect users LDFLAGS
+	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_FROTZ="$(usex frotz)"
+		-DENABLE_IRC="$(usex irc)"
+		-DENABLE_MYSQL="$(usex mysql)"
+		-DENABLE_PQXX="$(usex postgres)"
+		-DENABLE_PURPLE="$(usex purple)"
+		$(usex irc '-DENABLE_QT4=OFF' '')
+		-DENABLE_SMSTOOLS3="$(usex sms)"
+		-DENABLE_SQLITE3="$(usex sqlite)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_TWITTER="$(usex twitter)"
+		-DENABLE_XMPP="$(usex xmpp)"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/tests/libtransport" || die
+	./libtransport_test || die
+}
+
+src_install() {
+	cmake_src_install
+
+	diropts -o spectrum -g spectrum
+	keepdir /var/log/spectrum2 /var/lib/spectrum2
+	diropts
+
+	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+	newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	tmpfiles_process spectrum2.conf
+}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index fd3af7bb7ee1..f1d30e24313a 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,7 +1,7 @@
 DIST teams_1.4.00.13653_amd64.deb 83232268 BLAKE2B bc59aa1f4b9d5f1740fedc7bfc3c2cec6f8b4c1979a55e5a68742c36ea4399ba0e8c276de2d9e5b8de39363a9359136a5d1be59a6019af8bd5ac9922a5aab2c9 SHA512 d15b6cca0321e5e569e6a1f4ad0801f7a2de1e9312e8f584f07a4bc8bcac8a55626eb060a41baf31b9f4cfcd1cf2757e2f2b946f671f0e4c95c81f9eea0f8e2c
 DIST teams_1.4.00.26453_amd64.deb 84503304 BLAKE2B a9d9fb27d42c53b12747fd229214d4d5db8197c870effd201dc7ba9feea143b18138c7bed15d18e70326781577e8bda8640ea463125abc8f0bef08292ad850d5 SHA512 bdc050e813f1237d7774270a8a5229a975e5bb28706b957f5cb03eb481870ca8e81562096e5041f060414d1c727f5b7d6aff7ef66bce96f2fac86f535aade058
 DIST teams_1.4.00.7556_amd64.deb 77232550 BLAKE2B f663a79a9edb29aecb240722f46cb29aa6f4e2cca6dbe1a29801aee2e9c408b1ad00ab0d2b8fac3c7c4c227429b0382a06b46114921d2f435fbe1c80415ea9d4 SHA512 0afe2714e290e8b2d30039e27a2af4d22cbd03bc4bfe90d6979714ae1cc75bc5226af8932dc38528a5dc5bd6b4820c4b9d9444abcb558a76438c62cff285ffac
-EBUILD teams-1.4.00.13653-r2.ebuild 3464 BLAKE2B 1ff2f11010dc5e54327113e40faef8bd6c367caca46fc9561db91ed1e35b07b40bf07c24d9e325b5e087010b7e390a78585cb29ea80b89721eeb2c1e4acae94e SHA512 cffbaffa8883cc186cd802b0cc79951693a28bd917aa95bf7d28eb726b6003decceb959860ef3545acddf15dbd27079d5808cba245026df04c85b3cb05be46bd
-EBUILD teams-1.4.00.26453-r1.ebuild 3464 BLAKE2B d0df854034814f6e9eabb60765754cd44728ca020b83fe27164e731449469fd84a8846ef14dd4014329a27a863ad2b88811dd281ea6171c0febbbc6144c75c12 SHA512 30f9a1dddcdde0484283cff6d9f326f4390ffb7fcc5074318590331ea54536d62a114d2ebfeeb9f61e9d8ecbce0182ee726c263d9f5a894b03844e8d03b2d75f
-EBUILD teams-1.4.00.7556-r1.ebuild 3222 BLAKE2B 9f3cf836f60bd9560525b2551a41db63fffcbc0918f7dbb383f08c4c6a30a0f3558fb135c008eb4bbb0ef92bf27ab70eaa1f6a52a7f04125562ce44b4d61d08f SHA512 7d92835f11d66c694a291ae8c89187304c86c5db314b66e5c7ecd0e6f7d8358e80580497dc415db7e8b9198250224c812e48235c40b135a7b99053bc191d2906
+EBUILD teams-1.4.00.13653-r2.ebuild 3480 BLAKE2B 1aba7ac49b8fdf837fce243a28d479526e0ef348285ad95ffa236af4f444a2fd473c266e44db982fea46dc3b1e72c8be3752deb279314b414df37f3294aac633 SHA512 0a7ec6f6add9b2f1f3ef5411c5160cc705fe965e3f944ffdd53b8893ac716e7327c6aca9cf07ecd345b8a015cbbc785376acf040eddbce7a79a8b5f72d54dd98
+EBUILD teams-1.4.00.26453-r1.ebuild 3480 BLAKE2B bcb45c78917a3dfd6719fc76e19bcb226a6579fa294c07a9b19bb001ef08b16e22ff8452b8ea84fd52f3404f093e48211501103d0599daee83322a206dedfdf1 SHA512 07073b53134d10fb6bb40815516a4a89e87fa5c60c3d0302db706d1cfe235ce6a6f0a8e5eb51cf1e52de6ad89b9590771576fede5e5b0e9c4ca321bf8b32c54a
+EBUILD teams-1.4.00.7556-r1.ebuild 3238 BLAKE2B 2ac6a0f1f57463de858935fd2eb0bf8a3f3540c7e6fb7ff416fe76aad709887856197a222021ac4dea217a7a10c4155f4440be238a97868060c96ad6f7d008da SHA512 4f368b4951db94aee5a7571c9574a10ba95ef081045ffd7cdb212756aa85a67a0dd8c7f0b88d6afd01bf2f93729d1653c0660bbda325eec30525996e25117079
 MISC metadata.xml 557 BLAKE2B 4818f797eb65e99629fbe0fa90013a7dae58f7ff1187949426fc89ada5c4a4ae7a02c04fc39b31e88d27a38828455f685babb69ae500fdf6e22b6a328dc8e629 SHA512 28fe60ce4baaa0fd8b19f33f8b58f8d9f7afddafed35df341d5c3698ab880fc103dc15b48dc88a9c2b18224d36f8fa7ade973e653f7dbb4c7eb85082ee812644
diff --git a/net-im/teams/teams-1.4.00.13653-r2.ebuild b/net-im/teams/teams-1.4.00.13653-r2.ebuild
index 683f09cd29bc..3dd90b904b90 100644
--- a/net-im/teams/teams-1.4.00.13653-r2.ebuild
+++ b/net-im/teams/teams-1.4.00.13653-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,7 @@ RDEPEND="
 	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/libdrm
 	x11-libs/gdk-pixbuf
diff --git a/net-im/teams/teams-1.4.00.26453-r1.ebuild b/net-im/teams/teams-1.4.00.26453-r1.ebuild
index 1c5e90e606b9..3f93b3cfb662 100644
--- a/net-im/teams/teams-1.4.00.26453-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.26453-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,7 @@ RDEPEND="
 	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/libdrm
 	x11-libs/gdk-pixbuf
diff --git a/net-im/teams/teams-1.4.00.7556-r1.ebuild b/net-im/teams/teams-1.4.00.7556-r1.ebuild
index dcee637a6d44..295d2e9e2bd5 100644
--- a/net-im/teams/teams-1.4.00.7556-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.7556-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,7 @@ RDEPEND="
 	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index f74982478f03..61dd359fc9f7 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,10 @@
-DIST tdesktop-3.3.0.tar.gz 16276886 BLAKE2B c75da01d8cfe440c8cbeb3cc580d49c7cb2494b776b48d9da1005ff7627fcffb0f7f7d6c43887d162cc0c8f261d1b67e3af6544dbf616732c8dbfd785cf9e8e3 SHA512 fd9eee472579edd902e9e31c1442f7a21ada86af3a59f1ab0310ec41134b9a345ddf7972e638b3551c0de1b95a3ffc36e7714e2657b95b25bd3436ebd507a7ef
-DIST tdesktop-3.4.3.tar.gz 16234851 BLAKE2B a94fcdbd5254858b8bb5e51ac8423d3c3e407892782b3773985f3f7f60cb8db0c95ffa2bc1c7bcbf56bcb26948d9c080c86606954284fcbe80ae8dbd1ec0ec9d SHA512 ce40e3c58f5d422de7c26fc105ca9888239069c24f42896ad38d30bb059b91e0e3556f62d0e6aa3b5a817f86409b090ab54ade1763a90cbca2043a4b3f744183
-DIST tdesktop-3.4.8.tar.gz 16258268 BLAKE2B 2f5ebf0f060a81b5768853fcd7db12255150b2f32eae9b29ef059288eef1ac333cea49ddb5e717edd1cf91a9a1db0f4b1d941a0524ad4717a1e124cb62fd4efd SHA512 508c89974cc3d9ca23ea7265a1382b3a5ceef1e5a81daea3744cc6af078cf2689c66bca537d2826bcb692ba4133110e36c7081ed2966075fe8826df76e488632
-DIST tsetup.3.3.0.tar.xz 41132564 BLAKE2B 7d3cc8de1cd56f21b988b7ae15ec96ec66fdba30cedb7f609a9c15d0a45b10cc5e0b94d5d9ed32e36c850e678e34835a44b527f7a62aac68376d2c1d09073f6e SHA512 665662f5a177475d32b49515600789374f989db1c3e7972fc5b9360c936f9d2a197e0bb0599bcb1d7b2707eb85f214e65fe7d6f9809aac3ae5c20a2c6f9dd04c
-DIST tsetup.3.4.3.tar.xz 41258788 BLAKE2B 5c5d5056807a92884a93ec1d27c57da2cc96e131df6856b2d41d1e7db28f93a9c63602a0e294dd0cc48dbc22156203e0d8d19da4916091ef40bb3550e779296e SHA512 92be9f69c7ad0e4f2bead886da636ed58e0ff63b1aeaa1ed0d9ee08b3964df4ff446d53b05de1fa9cbf1769463867158c7faadb0ae9e2c1fc71ebfecca507792
-DIST tsetup.3.4.8.tar.xz 41521720 BLAKE2B 0a632382d4a378b265cf7765990797a3ecfc5eada4ac91d4bbd7c91dd4b5e4081c9f3f57a10666cfa13a857791d29b7b1fec1572bf532358c20efe6482a011b4 SHA512 b1305e5d109f399d084efed59488bc548d6ab78e31d8cdaf9951a900bcbc2218073f65ace69dfc9bfea3dc292150e98d52a0b5d3017d378edf3133f63390ad34
-EBUILD telegram-desktop-bin-3.3.0.ebuild 1202 BLAKE2B 08907be9fbe8435e8976c8dec97fe30c94900a3a493b2a0eed70f1abf3666fb1e12af9df29b7ed946a9d6b5b5328b2ef030343e504cb128eb582e7b87a39c4ae SHA512 bf748ef0559f940d6dd9f688a84421667ea01146008eaf3260d9a6b44f21565dc216c9a67334d47ea97040ed90ce55b022f1b2ca01777a02d0234b0e6a6b3315
-EBUILD telegram-desktop-bin-3.4.3.ebuild 1202 BLAKE2B 50ba9c204ac1d1906913070199971333b83a86a4200398b45d97778d0cc8f230c63cd8afd3f322cff1052b4bf75e5af93a3664ca9864bfb42a3b130ad4e2bbd7 SHA512 e16b970da1f753bd1884132017aa23def2e8e8f237c0fb5c773114d50074064b905d94b9382588d632b6c0286d4422a11317d879a7feccad0aa711dadb325c53
-EBUILD telegram-desktop-bin-3.4.8.ebuild 1401 BLAKE2B 27f7268432831e98d4b47891e1e7b7fa605cb17f908493e3792129a774942a59fbb5df5c0e632b60c4caa43d866f536ce8b7887405a3c4d31a895d7c2a1aba0b SHA512 17370fe43896a1f24b7e400239d127eb0ebff9ee14cd4110dfe04ee4dc7e81d48ed00f612b8440d522b043f62b775fe3b3f90beb75101244c871919e7ee70fec
+DIST tdesktop-3.5.2.tar.gz 16279094 BLAKE2B c7678b471aa7239ab8d86118e99dba3fda05fa1a737eaa02a934a112f86dd59ca8316aa1ef6a9b28674f1dbf9dc3ef1a7aca453ea8332a0e051a8330bce455f7 SHA512 cecbc11f73215bdf4a921e8bf301a8b76e4f2730309d17abc54127fa8cda84d6afb6312de6984355ec0d98ecb60e60bf8b6adb0257eb4c90da7069e70a8a0ad4
+DIST tdesktop-3.6.0.tar.gz 16237112 BLAKE2B f5c15f2b0f94d0ab073a79030e069934f617e5d5e9b3275b8dec5a7ed4734d2c1e8a9b851f28c4db47be258c962a61a5a4d8089fac99c6239f4ddc759398712b SHA512 36ce035eaa953348617f2acfbf3f882e3a0380852c3a3f5d58f531a514814a3569d514580e279b63ef3d8ce72b752ccb192ad1102d92553315459f42e7dd7b8f
+DIST tdesktop-3.6.1.tar.gz 16235717 BLAKE2B 1159dd6e3084945458541758925cc811b75b021f090ef16f935a688c24864fd03424262cbb6f48ac0ee72d8b33279ad17aff459de362b6cec4901fc38c7a5a04 SHA512 ca78e44747db11f2624cbc7bc3565d7a3d4825b6bf55d3e3dc9c8c0b1f22afba4140cac8edb096d44bd60f8af7e5bd2ee67c450e76e2767d1b992aeeaeb17084
+DIST tsetup.3.5.2.tar.xz 41355048 BLAKE2B abf530d237894d8c480cc6be323695b2e7e8ea5a3fd80c46c681587630bdb0a4c145d0bd57726e1b4ea71250f170d7b0779a55b208ac68a2193a1109dc87ab7f SHA512 875b5c964c92e58406990d3604f24285e8654b57caaf7f24b28012e22b450a9fad52373e5afda10bdf7b23aa0cc4ee072b3859ee0c6e861500fd18f1ade3da26
+DIST tsetup.3.6.0.tar.xz 41646020 BLAKE2B 5987682326123b4b2d8ba3e974e5ea4e1ca22f3d54057d0ad78f64fea1e0bff9501b255accf6142f5e6db6f6354f8e0ac09fe020af27696482247cebe0482bd0 SHA512 92e4276c58a0d67cd0b0c190fd949b08054e843c473e0d6f371813173269ed3f448e8f135ea5285e21b31c807fda51cbe475822677f34f0d787cedcaf2293c2f
+DIST tsetup.3.6.1.tar.xz 41663244 BLAKE2B fd6f091ef2033c7c8bf1101011f070afa4917f49eef6151761840cb1c200e9b25e6a3448ca32241089154c735d5a00b4c75ca87c33b1c8056c5b316e8d5dea3d SHA512 af0210cc57493d2080d79889f82f91779cfc12df831ca7d29a722bf06d99cf957ab3da2f49a9ca244ce92b5f985a3d6440944bf2383f47508decb16fe34a0f40
+EBUILD telegram-desktop-bin-3.5.2.ebuild 1417 BLAKE2B 83a97c9171023d4fa603dbcb1dd9f42c84a70dee86a1012c0f939142f0003f877b31a47f75c4bab413d6029c5857bf485c397e6bfa50921f10d0dcd55537b6ed SHA512 fe820fc44b912dc05f5368b83c493e85b5df15e1906bde818ecbb95c0be89ac8082deda2b40a1edb2cd3e9b86090b7c5c74e33203ff6715e203e95b8bfedc756
+EBUILD telegram-desktop-bin-3.6.0.ebuild 1417 BLAKE2B 83a97c9171023d4fa603dbcb1dd9f42c84a70dee86a1012c0f939142f0003f877b31a47f75c4bab413d6029c5857bf485c397e6bfa50921f10d0dcd55537b6ed SHA512 fe820fc44b912dc05f5368b83c493e85b5df15e1906bde818ecbb95c0be89ac8082deda2b40a1edb2cd3e9b86090b7c5c74e33203ff6715e203e95b8bfedc756
+EBUILD telegram-desktop-bin-3.6.1.ebuild 1417 BLAKE2B 83a97c9171023d4fa603dbcb1dd9f42c84a70dee86a1012c0f939142f0003f877b31a47f75c4bab413d6029c5857bf485c397e6bfa50921f10d0dcd55537b6ed SHA512 fe820fc44b912dc05f5368b83c493e85b5df15e1906bde818ecbb95c0be89ac8082deda2b40a1edb2cd3e9b86090b7c5c74e33203ff6715e203e95b8bfedc756
 MISC metadata.xml 617 BLAKE2B 5aed21ce280bfc0d23ba9c4e75dbc8841637ef702cb67686ee91b46dc0830308ab6ff687bed89274d3217f665f989295341735f506182a0461f968d05af187b3 SHA512 ec61f9dec317a9625ffcc0e1aaf2dbf323f218a6705375cd23a14827e1bc30bb496849efdebbe2a8f4fd7a28d37e170e87f0f6d6f49c56d6292220c955a27a0a
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.8.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.5.2.ebuild
index ffa0e5b21490..40ecf6ecfb9d 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.8.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.5.2.ebuild
@@ -22,6 +22,7 @@ QA_PREBUILT="usr/bin/telegram-desktop"
 QA_DESKTOP_FILE="usr/share/applications/telegramdesktop.desktop"
 
 RDEPEND="
+	sys-libs/glibc
 	dev-libs/glib:2
 	>=media-libs/fontconfig-2.13
 	media-libs/freetype:2
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.6.0.ebuild
index e9f44cea6d84..40ecf6ecfb9d 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.3.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.6.0.ebuild
@@ -17,8 +17,12 @@ SLOT="0"
 KEYWORDS="-* ~amd64"
 
 QA_PREBUILT="usr/bin/telegram-desktop"
+# current desktop-file-utils-0.26 does not understand Version=1.5
+# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59
+QA_DESKTOP_FILE="usr/share/applications/telegramdesktop.desktop"
 
 RDEPEND="
+	sys-libs/glibc
 	dev-libs/glib:2
 	>=media-libs/fontconfig-2.13
 	media-libs/freetype:2
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.3.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.6.1.ebuild
index 015193a01c6f..40ecf6ecfb9d 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.3.0.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,8 +17,12 @@ SLOT="0"
 KEYWORDS="-* ~amd64"
 
 QA_PREBUILT="usr/bin/telegram-desktop"
+# current desktop-file-utils-0.26 does not understand Version=1.5
+# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59
+QA_DESKTOP_FILE="usr/share/applications/telegramdesktop.desktop"
 
 RDEPEND="
+	sys-libs/glibc
 	dev-libs/glib:2
 	>=media-libs/fontconfig-2.13
 	media-libs/freetype:2
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index e57dafaa44a7..9fa642f77b48 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,13 +1,14 @@
-AUX tdesktop-3.1.0-fix-openssl3.patch 641 BLAKE2B 0354e0c8931311e5b6561c601cd0e78d436aeda53f14332803484b278fe60c90fa74e761ac005f79d6f44f18053fa870dc9246de1ab6e63986d7bf9b7214e12c SHA512 cfbf1798a290674e1f4589db1f5f43e61a6c691c19d936090ec9b7396e6cb720aa86b86cfdbff197de68a8723c04a20e7bf858f8511b48cc8e7b924a8d6876ec
-AUX tdesktop-3.1.0-jemalloc-only-telegram.patch 1136 BLAKE2B 06811696df84c1648f63843e937d18542ec5185aee6c3fde99dcfabe982aaad49e97387910882e405ec0ec9e8a12bef615f6f920c7f603224bce347bbff3bf22 SHA512 59c3f508c4be10e182fca52e4069e88af8cd26d150625dbe14214e505f9a5461e1492450896b1e9e229444a4f403eff43e4066d7f0c866bc9631c76f2c1f847e
 AUX tdesktop-3.3.0-fix-enchant.patch 819 BLAKE2B f827deca269c32648e438642a916383e6184ef3fbdb045c8950997b3a30c6231336fe54a3b39ae5b2b93e7c6c72d0080f00a535dcf6932bbe3740041ba79abc8 SHA512 2653dd30699633c55e590744ed1fb2104b473d43e6391ece791bf3543cac7de594a75d303dc66dd9c7b75face5e90615da261d10758e50e1c669ad0b4f27923f
 AUX tdesktop-3.4.8-jemalloc-only-telegram.patch 950 BLAKE2B f1dd5f795ad8aa66c9ff00cb1e616789be8b9ef3bcad08f27596d6a7a0364eca4299f02d56179664eb7dbc6552c7cf68ca6ee6f98fcd0171a2ede35f03cf1168 SHA512 c02a1d76378cd18f963ea88b47682237cc4702fda3504ff3ab303a87a60434c38cca866193fdb6e33e5e5afe20bb7ba94f5024b40ad4a42a666713fc079e7c53
-DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
-DIST tdesktop-3.3.0-full.tar.gz 38662573 BLAKE2B f6cba2be02faccde77c510742dc57680a2731cd3b2bc4a2d680f6cda7fd1a634e2fa0406855a491241434daa080e782f561e5e472dcc42a8b8376c16e038b6af SHA512 ff0ac1abe264f19812c2e0b40d4861caddd6c01a3f863ccb68de9c5227282872b2bde878dcf751d7d04d36c6e0e77912619ac7863d54f25f739f3744e9bca53a
-DIST tdesktop-3.4.3-full.tar.gz 40647558 BLAKE2B 220a7b29dbc7a48d53e53fe9609dba804e5fe536feebc1225fd5400a8eec703e64f65decb8b503ed77e843c011c8b5fd12916534d4a1ecbc84724f277dcc301a SHA512 6b27eb14570b55fb14c77f1d557591985a4791712897c2e144196c54c2a98b10c7ece9dac7d039a6bb56f39e3062e4fbfbb60f6822e52b76f927bbf419d88a6b
+AUX tdesktop-3.5.2-jemalloc-only-telegram.patch 1032 BLAKE2B 8220f745febaec55b85f64e25a860f9cfee57bf07496e0bf496857686c5bf7bdfb9c9ede94f9374dea677f1516e8dff39cae5b3a993d1c0fe32d34cf0c91015e SHA512 156a62d5d2145559828466e4c09c23cf8a0cd0cb9d844c27d50945135d854a2e0af45cb3e0dc675e21f74dc2f323574a785e259e86f4120d055aa0e34fd20ea9
+AUX tdesktop-3.5.2-jemalloc-optional.patch 2924 BLAKE2B fa0c124fc38d83434eff5c2e03f815d9e32b3af62782401251905db293d8016618f9c51b333a7a4e86e9d529a1e8747495b982ad9e5d6c19c2d9c63b39391461 SHA512 de836736fdc5bcd2f581cd43223dff9ffe82042440e44f6038d2d0278fa94777054badd2870deb1f7c8285a35a5f01cfeccbd76701aeaf5ca9a573d8fbc9ed31
+AUX tdesktop-3.5.2-musl.patch 890 BLAKE2B e65419eac920eb7c6929559229e50458fca0e9598b9e173f332b98235dc7d84acd01f5ceb23462b0fb53edbbeec8747e6f27e49cab8bc596b0c1ded205e6358c SHA512 57a811629749c285d3f181ad714afa322e0b65758114283f506319a076aa0410f5e9a75f6fad5642fe5611745c418b404d95a616d53ac8360fbff5cf170627ba
+AUX tdesktop-3.6.0-jemalloc-only-telegram.patch 1343 BLAKE2B bc257ee3bc3577b05a73b74c6394592b4636e605eb06c25a6749a38f2742104e1d214234524cbd5191bb397b22a4af4ba28c25c01520973a4f10e08bf3ba3bd2 SHA512 00067d388bd75adfcf7f2f460d99c283dd0110d33be5124585665b2566ef5c2b15100e8f86685bde2216083131609918861d7db845f4813ec303a13d8c423ae7
+AUX tdesktop-3.6.0-support-ffmpeg5.patch 3142 BLAKE2B f05816a8b26c3061c88b8814adc2402981836ab7853be1dad9c4eb74b621e1084a2167ad5ea86d500c98d627317ffd48288bcb4df897f5ca6858516ecf86c8f0 SHA512 811f42f8372102910be20ac92030b98ad98704cb1378a90d17a01b15dc4a9aa8e9b6bb179a9dc4d09687ad7b60030f0f7367f8058674244b080748bf2c913044
 DIST tdesktop-3.4.8-full.tar.gz 41220984 BLAKE2B e75e7d7432a863e7a35b73bb2a378970f8aab74d99a425e631947fd894e51d931ee2390e2f885831d165d73541cf2151840467e2ef02ece175cc6a18f3e2c81c SHA512 cdeb5a83a375a494d805bf4198beee1c4bfc94bd9626535721a0cf04a590c70bfdb20e76baaa2a4c8c6db54c5813f22ce2a8c6291786b6b6db3dcde10b266fe1
-EBUILD telegram-desktop-3.1.8.ebuild 4358 BLAKE2B a305bba1349c0bc884014cd50c06308d831f7fc27e2b4aea0136a303f1eedaeb67631a6b27dc5860614cc6018c1e692833c272ea7ce7d29e00b0768c76dd44f4 SHA512 917c1ecd3c35ef953d3b71f5f1e3adaf74ea8aaa203e550dc775dfc1eb418675f5fc1aae08eebe4e0f5fc62edf64beb9e2ae6bee8fbfd73870cbcf66d5647ef9
-EBUILD telegram-desktop-3.3.0.ebuild 4622 BLAKE2B 20240a1921bcc98a34d685a93a0c66944420a8fc74770dbc5b3484e47ce02d146fa7184a16987184077019ee7ca3cb2c2e47586bbd09b2ce4617ea54fbc63a97 SHA512 6e98b3e166b918875bd73c0cae2eb6af507970d50cc8dd03555471fa35c954a6ece49de310934863f06fa726538241aaba6c3cb307fae7fd74457e884aa024ea
-EBUILD telegram-desktop-3.4.3.ebuild 4752 BLAKE2B 4817101e22311ee0414d2065522ba83cbacc1a877217a9403d6b5e70b096ecc51f25376bb151d5d8c77cc9a9f305c7d3af3dfb4fda7178aedca0194a6cf5f06e SHA512 909d08dd26ed182f1700b98a7675be52d31a3978ef274afefbf310709c8d0b934729f62bb05746833ce0995fb24eb5160715da2d4f013aab0a9eafcf33d7eba2
-EBUILD telegram-desktop-3.4.8.ebuild 4636 BLAKE2B 353cdac4d13a21377223ee6b506bd5956f32bfbb23c8c450997d3fb1a802a770f91719e313e052799b3bf5c46830a0288c20e107d9060a7f1f34e0454d36b1c6 SHA512 a31e12360be13e57a4896ec3bd4ad3d674fd0a64cd34d02b1aae44def1eed440a2a0929585ce8fb80cd866a3730873b5f9252f591d741a8e2c0e5d669890d9f6
+DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B 5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b SHA512 adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e
+DIST tdesktop-3.6.0-full.tar.gz 41227365 BLAKE2B 2d2c66d3110ef83b88d74fc2ca90e444fb34ffb1e96b71d0871b1477598c75b487d8f932f4ba244b99391390317efa90b017bc8a4f562e31461c330d425410e5 SHA512 e5d4278229dc6033e1d40509d54fe52844dd8bad036bfec1fb9683505c9a626e821c15a487db5f1be5951dd5ed0db3ff5a4cbcbba73627f5e527e88cb06925f3
+EBUILD telegram-desktop-3.4.8.ebuild 4642 BLAKE2B aa59d84e4c523b559e1f161fdd9a59eea7c720e6955bf196c5da7a6f504bd912abd4a7c6cecd2b455b5fb0e006f0107883e156f39c1f89591708b726458a6e4e SHA512 fd7f2ec36c03f312a6e5462527872684b5b75dbe2ab4252b6a4051385c8ff13aeda047bb9134da27d07dc16d0899fe0a342279319802bc4028ee7a43d9248471
+EBUILD telegram-desktop-3.5.2-r1.ebuild 4891 BLAKE2B 998aabd95c928ea254c78abfcca8ebdd614e7d68b12ce717c563bb1b4c4e2ba1a495ef08e4210e7b2ff810d3506e9e3f42062a46ebd412e9ed30af333d25b9a7 SHA512 5f7de7682a4ae7796c12560b8a381624ced00c4bd3521bc498ba957838a8eae419efdbb52a38cb1afa13fc04b210a68a4ee1b84b20d7507ec5a91480da90dc3f
+EBUILD telegram-desktop-3.6.0.ebuild 4900 BLAKE2B 6a1441f676fc1bb6f3739a4ff32774c4b08db7090be2b18ed56c0c6213f2a3f85c68d57ba45c9b5321610b565b1cce511ec30c54f60d390091ee089fc978c857 SHA512 e671b6439f2cf249a2c5f737e01f8e199d1fa82bf6b42486f2601eb66c4429a3469cd63622cc0a2fd719dd5997edb86f157d641f10069ebc13514afeda6b5cf5
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch b/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
deleted file mode 100644
index 2b92e8adce4f..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix openssl 3.x compatibility
-
-FIPS_mode_set was merely used to clean up resources. This isn't necessary
-anymore on the newer openssl version.
-
-There's still a lot of functions that are used that were deprecated. I hope
-upstream can fix those, as I'm unsure what to do with them.
-
---- tdesktop-3.1.0-full.orig/Telegram/SourceFiles/core/utils.cpp
-+++ tdesktop-3.1.0-full/Telegram/SourceFiles/core/utils.cpp
-@@ -124,7 +124,7 @@
- 
- 	void finish() {
- 		CRYPTO_cleanup_all_ex_data();
--#ifndef LIBRESSL_VERSION_NUMBER
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x20000000L
- 		FIPS_mode_set(0);
- #endif
- 		ENGINE_cleanup();
diff --git a/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
deleted file mode 100644
index 7ad3e75e49ba..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Only link jemalloc for the Telegram binary
-
-Some combination of factors is making the different codegen tools hang when
-jemalloc is linked for those, and they're ran under portage's sandbox. Since
-this is only used during build-time, and jemalloc is merely necessary to
-improve runtime memory use, it's unnecessary to use it for anything else.
-
---- tdesktop-3.1.0-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.1.0-full/Telegram/CMakeLists.txt
-@@ -1256,6 +1256,11 @@
-         endif()
-     endif()
- else()
-+    target_link_libraries(Telegram
-+    PRIVATE
-+        desktop-app::external_jemalloc
-+    )
-+
-     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-         target_link_libraries(Telegram
-         PRIVATE
---- tdesktop-3.1.0-full.orig/cmake/options_linux.cmake
-+++ tdesktop-3.1.0-full/cmake/options_linux.cmake
-@@ -45,11 +45,6 @@
-     target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
- endif()
- 
--target_link_libraries(common_options
--INTERFACE
--    desktop-app::external_jemalloc
--)
--
- if (DESKTOP_APP_USE_ALLOCATION_TRACER)
-     target_link_options(common_options
-     INTERFACE
diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch
new file mode 100644
index 000000000000..4f5c7017e6ac
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch
@@ -0,0 +1,33 @@
+Only link jemalloc for the Telegram binary
+
+Some combination of factors is making the different codegen tools hang when
+jemalloc is linked for those, and they're ran under portage's sandbox. Since
+this is only used during build-time, and jemalloc is merely necessary to
+improve runtime memory use, it's unnecessary to use it for anything else.
+
+--- tdesktop-3.5.2-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt
+@@ -1357,6 +1357,12 @@
+             desktop-app::external_kwayland
+         )
+     endif()
++
++    target_link_libraries(Telegram
++    PRIVATE
++        desktop-app::linux_jemalloc_helper
++        $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
++    )
+ endif()
+ 
+ if (build_macstore)
+--- tdesktop-3.5.2-full.orig/cmake/options_linux.cmake
++++ tdesktop-3.5.2-full/cmake/options_linux.cmake
+@@ -64,8 +64,6 @@
+ 
+ target_link_libraries(common_options
+ INTERFACE
+-    desktop-app::linux_jemalloc_helper
+-    $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
+     ${CMAKE_DL_LIBS}
+ )
+ 
diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch
new file mode 100644
index 000000000000..bd3595858c20
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch
@@ -0,0 +1,71 @@
+Optionally disable jemalloc
+
+Telegram upstream heavily insists you use the jemalloc allocator. This is due
+to the high memory usage resulting from the glibc allocator. It is unknown why
+this affects telegram the way it does, but upstream solved the issue by using a
+different allocator. Initially they used mallocng, now jemalloc.
+
+However, other libcs don't necessarily need this, and as such this should be
+optional. As mallocng is a fork of musl's allocator, and this was used before
+the switch to jemalloc, the musl allocator should still be OK.
+
+Please warn glibc users about disabling jemalloc, don't report bugs about
+memory usage upstream unless you're using jemalloc.
+
+Related info:
+https://github.com/telegramdesktop/tdesktop/issues/16084
+https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
+
+--- tdesktop-3.5.2-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt
+@@ -1358,11 +1358,13 @@
+         )
+     endif()
+ 
+-    target_link_libraries(Telegram
+-    PRIVATE
+-        desktop-app::linux_jemalloc_helper
+-        $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
+-    )
++    if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
++        target_link_libraries(Telegram
++        PRIVATE
++            desktop-app::linux_jemalloc_helper
++            $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
++        )
++    endif()
+ endif()
+ 
+ if (build_macstore)
+--- tdesktop-3.5.2-full.orig/cmake/CMakeLists.txt
++++ tdesktop-3.5.2-full/cmake/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ # https://github.com/desktop-app/legal/blob/master/LEGAL
+ 
+ add_subdirectory(external)
+-if (LINUX)
++if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
+     add_subdirectory(linux_jemalloc_helper)
+ endif()
+ if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED)
+--- tdesktop-3.5.2-full.orig/cmake/external/CMakeLists.txt
++++ tdesktop-3.5.2-full/cmake/external/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ 	add_checked_subdirectory(hunspell)
+ endif()
+ add_checked_subdirectory(iconv)
+-if (LINUX)
++if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
+     add_checked_subdirectory(jemalloc)
+ endif()
+ add_checked_subdirectory(jpeg)
+--- tdesktop-3.5.2-full.orig/cmake/variables.cmake
++++ tdesktop-3.5.2-full/cmake/variables.cmake
+@@ -26,6 +26,7 @@
+ option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled patched ones." OFF)
+ option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bundled patched one." OFF)
+ option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." OFF)
++option(DESKTOP_APP_DISABLE_JEMALLOC "Disable use of the jemalloc allocator (Linux only)." OFF)
+ option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
+ option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
+ option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch
new file mode 100644
index 000000000000..4c34d107913e
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch
@@ -0,0 +1,33 @@
+Stub out some glibc-specific functions
+
+This allows support for alternative libcs like musl
+
+--- tdesktop-3.5.2-full.orig/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
++++ tdesktop-3.5.2-full/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include <sys/utsname.h>
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ #include <gnu/libc-version.h>
+ #endif // Q_OS_LINUX
+ 
+@@ -200,7 +200,7 @@
+ }
+ 
+ QString GetLibcName() {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ 	return "glibc";
+ #endif // Q_OS_LINUX
+ 
+@@ -208,7 +208,7 @@
+ }
+ 
+ QString GetLibcVersion() {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ 	static const auto result = [&] {
+ 		const auto version = QString::fromLatin1(gnu_get_libc_version());
+ 		return QVersionNumber::fromString(version).isNull() ? QString() : version;
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
new file mode 100644
index 000000000000..6836e6935049
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
@@ -0,0 +1,41 @@
+Only link jemalloc for the Telegram binary
+
+Some combination of factors is making the different codegen tools hang when
+jemalloc is linked for those, and they're ran under portage's sandbox. Since
+this is only used during build-time, and jemalloc is merely necessary to
+improve runtime memory use, it's unnecessary to use it for anything else.
+
+--- tdesktop-3.6.0-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-3.6.0-full/Telegram/CMakeLists.txt
+@@ -1376,6 +1376,14 @@
+             desktop-app::external_kwayland
+         )
+     endif()
++
++    if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
++        target_link_libraries(Telegram
++        INTERFACE
++            $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
++            $<LINK_ONLY:desktop-app::external_jemalloc>
++        )
++    endif()
+ endif()
+ 
+ if (build_macstore)
+--- tdesktop-3.6.0-full.orig/cmake/options_linux.cmake
++++ tdesktop-3.6.0-full/cmake/options_linux.cmake
+@@ -62,14 +62,6 @@
+     target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
+ endif()
+ 
+-if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
+-	target_link_libraries(common_options
+-	INTERFACE
+-	    $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
+-	    $<LINK_ONLY:desktop-app::external_jemalloc>
+-	)
+-endif()
+-
+ target_link_libraries(common_options
+ INTERFACE
+     ${CMAKE_DL_LIBS}
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch
new file mode 100644
index 000000000000..32959acd5482
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch
@@ -0,0 +1,75 @@
+Support FFmpeg 5
+
+I'm not comfortable changing the _durationInMilliseconds formula on older
+versions of ffmpeg. Doing that only for newer versions also reduces the amount
+of testing this patch needs (of which it'll get very minimal amounts, this is a
+job better left for upstream when they get to it).
+
+Also it doesn't compile under ffmpeg 4 if the variables are constants :/
+
+--- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp
++++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp
+@@ -104,7 +104,11 @@
+ 
+     _frame = av_frame_alloc();
+ 
++#if LIBAVFORMAT_VERSION_MAJOR >= 59
++    const AVInputFormat *inputFormat = av_find_input_format(container.c_str());
++#else
+     AVInputFormat *inputFormat = av_find_input_format(container.c_str());
++#endif
+     if (!inputFormat) {
+         _didReadToEnd = true;
+         return;
+@@ -144,7 +148,11 @@
+         
+         _streamId = i;
+ 
++#if LIBAVFORMAT_VERSION_MAJOR >= 59
++        _durationInMilliseconds = inStream->duration * 1000 / 48000;
++#else
+         _durationInMilliseconds = (int)((inStream->duration + inStream->first_dts) * 1000 / 48000);
++#endif
+ 
+         if (inStream->metadata) {
+             AVDictionaryEntry *entry = av_dict_get(inStream->metadata, "TG_META", nullptr, 0);
+--- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp
++++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp
+@@ -32,7 +32,11 @@
+     AudioStreamingPartPersistentDecoderState(AVCodecParameters const *codecParameters, AVRational timeBase) :
+     _codecParameters(codecParameters),
+     _timeBase(timeBase) {
++#ifdef LIBAVCODEC_VERSION_MAJOR >= 59
++        const AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id);
++#else
+         AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id);
++#endif
+         if (codec) {
+             _codecContext = avcodec_alloc_context3(codec);
+             int ret = avcodec_parameters_to_context(_codecContext, codecParameters);
+--- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp
++++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp
+@@ -280,7 +280,11 @@
+ 
+         int ret = 0;
+ 
++#if LIBAVFORMAT_VERSION_MAJOR >= 59
++        const AVInputFormat *inputFormat = av_find_input_format(container.c_str());
++#else
+         AVInputFormat *inputFormat = av_find_input_format(container.c_str());
++#endif
+         if (!inputFormat) {
+             _didReadToEnd = true;
+             return;
+@@ -323,7 +327,11 @@
+         }
+ 
+         if (videoCodecParameters && videoStream) {
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++            const AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id);
++#else
+             AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id);
++#endif
+             if (codec) {
+                 _codecContext = avcodec_alloc_context3(codec);
+                 ret = avcodec_parameters_to_context(_codecContext, videoCodecParameters);
diff --git a/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
deleted file mode 100644
index 9a17e6963f61..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit xdg cmake python-any-r1
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X"
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-	webkit? ( dbus )
-"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	dev-libs/jemalloc:=[-lazy-lock]
-	dev-libs/openssl:=
-	dev-libs/xxhash
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
-	>=dev-qt/qtimageformats-5.15:5
-	>=dev-qt/qtnetwork-5.15:5[ssl]
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5[png,X?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20210302
-	>=media-libs/libtgvoip-2.4.4_p20210302-r2
-	media-libs/openal
-	media-libs/opus:=
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20210914[screencast=,X=]
-	media-video/ffmpeg:=[opus]
-	sys-libs/zlib:=[minizip]
-	dbus? (
-		dev-cpp/glibmm:2
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	wayland? ( kde-frameworks/kwayland:= )
-	webkit? ( net-libs/webkit-gtk:= )
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
-	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# no explicit toggle, doesn't build with the system one #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
-		-DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # 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_pkg_postinst
-	if ! use X && ! use screencast; then
-		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
-	fi
-	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
-		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
-		ewarn "to crash when pasting big images from the clipboard."
-	fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild b/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild
index 5282d22ec82f..ce7da5f009ff 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
 REQUIRED_USE="
 	spell? (
diff --git a/net-im/telegram-desktop/telegram-desktop-3.4.3.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
index 21f0978de9d5..98ffdd9164d6 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.4.3.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit xdg cmake python-any-r1 optfeature flag-o-matic
 
@@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
-IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X"
 REQUIRED_USE="
 	spell? (
 		^^ ( enchant hunspell )
@@ -28,7 +28,6 @@ RDEPEND="
 	!net-im/telegram-desktop-bin
 	app-arch/lz4:=
 	dev-cpp/abseil-cpp:=
-	dev-libs/jemalloc:=[-lazy-lock]
 	dev-libs/libdispatch
 	dev-libs/openssl:=
 	dev-libs/xxhash
@@ -40,11 +39,11 @@ RDEPEND="
 	>=dev-qt/qtwidgets-5.15:5[png,X?]
 	media-fonts/open-sans
 	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20211129
+	~media-libs/libtgvoip-2.4.4_p20220117
 	media-libs/openal
 	media-libs/opus:=
 	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20211207[screencast=,X=]
+	~media-libs/tg_owt-0_pre20220209[screencast=,X=]
 	media-video/ffmpeg:=[opus]
 	sys-libs/zlib:=[minizip]
 	dbus? (
@@ -54,6 +53,7 @@ RDEPEND="
 	)
 	enchant? ( app-text/enchant:= )
 	hunspell? ( >=app-text/hunspell-1.7:= )
+	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
 	wayland? ( kde-frameworks/kwayland:= )
 	X? ( x11-libs/libxcb:= )
 "
@@ -69,10 +69,15 @@ BDEPEND="
 # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 PATCHES=(
-	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.5.2-jemalloc-only-telegram.patch"
 	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
+	"${FILESDIR}/tdesktop-3.5.2-musl.patch"
+	"${FILESDIR}/tdesktop-3.5.2-jemalloc-optional.patch"
 )
 
+# Current desktop-file-utils-0.26 does not understand Version=1.5
+QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop"
+
 pkg_pretend() {
 	if has ccache ${FEATURES}; then
 		ewarn
@@ -88,26 +93,24 @@ src_prepare() {
 	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
 		cmake/external/rlottie/CMakeLists.txt || die
 
-	# fix linking with missing libdl (introduced in 3.2.0->3.2.4 upgrade,
-	#  not sure if thanks to removing the -pie flag in the cmakelists...)
-	sed -i 's/${JEMALLOC_LINK_LIBRARIES}/& dl/' \
-		cmake/external/jemalloc/CMakeLists.txt || die
-
 	cmake_src_prepare
 }
 
 src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
 	local mycmakeargs=(
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
 		-DDESKTOP_APP_QT6=OFF
 
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell)  # enables hunspell (recommended)
 		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+
+		# This option is heavily discouraged by upstream.
+		# See files/tdesktop-*-jemalloc-optional.patch
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
 	)
 
 	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
@@ -133,10 +136,6 @@ src_configure() {
 		)
 	fi
 
-	# Fix for RISCV, as well as any other platforms that might generate libatomic calls
-	# Upstreamed in >3.4.3
-	append-ldflags '-pthread'
-
 	cmake_src_configure
 }
 
@@ -144,10 +143,17 @@ pkg_postinst() {
 	xdg_pkg_postinst
 	if ! use X && ! use screencast; then
 		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
+		elog
 	fi
 	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
 		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
 		ewarn "to crash when pasting big images from the clipboard."
+		ewarn
+	fi
+	if ! use jemalloc && use elibc_glibc; then
+		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
+		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
+		ewarn
 	fi
 	optfeature_header
 	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
diff --git a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.6.0.ebuild
index 04a19cbd9bfe..5d77d8964fd7 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit xdg cmake python-any-r1 optfeature
 
@@ -12,11 +12,12 @@ HOMEPAGE="https://desktop.telegram.org"
 
 MY_P="tdesktop-${PV}-full"
 SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X"
 REQUIRED_USE="
 	spell? (
 		^^ ( enchant hunspell )
@@ -27,7 +28,7 @@ RDEPEND="
 	!net-im/telegram-desktop-bin
 	app-arch/lz4:=
 	dev-cpp/abseil-cpp:=
-	dev-libs/jemalloc:=[-lazy-lock]
+	dev-libs/libdispatch
 	dev-libs/openssl:=
 	dev-libs/xxhash
 	>=dev-qt/qtcore-5.15:5
@@ -38,11 +39,11 @@ RDEPEND="
 	>=dev-qt/qtwidgets-5.15:5[png,X?]
 	media-fonts/open-sans
 	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20211129
+	~media-libs/libtgvoip-2.4.4_p20220117
 	media-libs/openal
 	media-libs/opus:=
 	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20211207[screencast=,X=]
+	~media-libs/tg_owt-0_pre20220209[screencast=,X=]
 	media-video/ffmpeg:=[opus]
 	sys-libs/zlib:=[minizip]
 	dbus? (
@@ -52,7 +53,11 @@ RDEPEND="
 	)
 	enchant? ( app-text/enchant:= )
 	hunspell? ( >=app-text/hunspell-1.7:= )
-	wayland? ( kde-frameworks/kwayland:= )
+	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
+	wayland? (
+		dev-qt/qtwayland:=
+		kde-frameworks/kwayland:=
+	)
 	X? ( x11-libs/libxcb:= )
 "
 DEPEND="${RDEPEND}
@@ -66,14 +71,16 @@ BDEPEND="
 "
 # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
-	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
-	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
+	"${FILESDIR}/tdesktop-3.6.0-jemalloc-only-telegram.patch"
 	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
+	"${FILESDIR}/tdesktop-3.5.2-musl.patch"
+	"${FILESDIR}/tdesktop-3.6.0-support-ffmpeg5.patch"
 )
 
+# Current desktop-file-utils-0.26 does not understand Version=1.5
+QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop"
+
 pkg_pretend() {
 	if has ccache ${FEATURES}; then
 		ewarn
@@ -89,26 +96,24 @@ src_prepare() {
 	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
 		cmake/external/rlottie/CMakeLists.txt || die
 
-	# fix linking with missing libdl (introduced in 3.2.0->3.2.4 upgrade,
-	#  not sure if thanks to removing the -pie flag in the cmakelists...)
-	sed -i 's/${JEMALLOC_LINK_LIBRARIES}/& dl/' \
-		cmake/external/jemalloc/CMakeLists.txt || die
-
 	cmake_src_prepare
 }
 
 src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
 	local mycmakeargs=(
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
 		-DDESKTOP_APP_QT6=OFF
 
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell)  # enables hunspell (recommended)
 		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+
+		# This option is heavily discouraged by upstream.
+		# See files/tdesktop-*-jemalloc-optional.patch
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
 	)
 
 	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
@@ -141,10 +146,17 @@ pkg_postinst() {
 	xdg_pkg_postinst
 	if ! use X && ! use screencast; then
 		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
+		elog
 	fi
 	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
 		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
 		ewarn "to crash when pasting big images from the clipboard."
+		ewarn
+	fi
+	if ! use jemalloc && use elibc_glibc; then
+		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
+		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
+		ewarn
 	fi
 	optfeature_header
 	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
diff --git a/net-im/transwhat/Manifest b/net-im/transwhat/Manifest
index 8102aaaaab6e..3c6ab1cd2a05 100644
--- a/net-im/transwhat/Manifest
+++ b/net-im/transwhat/Manifest
@@ -1,3 +1,3 @@
 DIST transwhat-0.2.2_p20190426.tar.gz 38373 BLAKE2B 3addf2ae66d042eaf4a5f6b54015b9592fea68b69f4c542c5ec0d97040c0eb473d15b893af35f6d6cf83671417ed718c9c91b6268242e667fa34397fc230d2d5 SHA512 7079d1015bf5dfcd97e729219306320055ef86ac3203bb727bebb1e96abb60a26787882a12f9a8f4cce2ef45652bebfbd824a98d37d97ed72ebe0269004c1a71
-EBUILD transwhat-0.2.2_p20190426-r2.ebuild 948 BLAKE2B 9c0709e3ef1eff3b50672bf7b02b8616171cb84882884f989d2fe14f48e21e98a445f5fd658b4f9185fa82911afcb165d1bfb2d04f7c0a5aa453d7992d1691a0 SHA512 82cf78cb43289ee3c87b313e6a4f59558b9357482b17b0e11d693f09b319b56df261ae54e7e233ca504c2e146160992526daeca680b03717e806c94b13885a45
+EBUILD transwhat-0.2.2_p20190426-r3.ebuild 948 BLAKE2B 5089a0db195db00f0bbb7d527d22963a133423c17a4ba1b24bdd90e7cfbb44d96c203fe0295126d8898fe01286cd003048f4dc809bb259f472e45ff81b478c16 SHA512 28992daa6b7b1e323c127596ea592771ed895c5435ea94c75d3e7d3fcc2f0bb891aff6f906d0e51a1de3d590c5ac9456e07cd052e1b598dac6e16f1fa4daadae
 MISC metadata.xml 588 BLAKE2B f77a7b84b1d4bf96a606911a0086b19bac8f9589768c4fcbcf858242f665e2119d7664903cee678f5feae9b606624da069030c44c33a0ba7eeb302fd0c31a0af SHA512 159bfd2d01c75dc9d98ca64927e5cc776719554a505a33244e5acaf528c5484a0b45b311e68c6164ffb21d2a977dbdb890945a990e1c35d6b9763c4bef14e499
diff --git a/net-im/transwhat/transwhat-0.2.2_p20190426-r2.ebuild b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild
index 338805c70b2c..f35a0c3ca42c 100644
--- a/net-im/transwhat/transwhat-0.2.2_p20190426-r2.ebuild
+++ b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 EGIT_COMMIT="d022243f6c7b23674d3c87a09819f00b10df1165"
 PYTHON_COMPAT=( python3_{8..10} )
diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index 77bad8317c8c..460826ac0c8c 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1,4 +1,4 @@
 AUX yowsup-3.2.3_p20190905-fix-install-path.patch 819 BLAKE2B c1b30327dc0e56eb2516d4c397779a129d04ff1727b9c0b2a41f971a0ca27d855c59a58abf5d05c3a832756c951b281bda4c50bcec7bc75a44fe02a618a651b4 SHA512 2ee5d15f48d891f05c567e4bdf3b2b249963241dfdb825fab7c9dbce9d71007ed4f947a57a9565f6a4b49a79a4edf5043f9b651b6ba194a8761bc5a4d973c02d
-DIST yowsup-3.2.3_p20190905.tar.gz 150149 BLAKE2B 149c49df1a3b4df9163abcb1625b7e15e41d81f6a1a649c08d8cca88cce6cf10488778301fc96af3b2fe9e668e855023e56da6e6e8b3b9038994273f19404b78 SHA512 4b59a30bf73797750b92aecf45bf2e551fcbb249688efac631400bf532e21b739e9a6628ed01da4d520ed9296657ae8c5463c3560b165c5d696fd18f1e700be7
-EBUILD yowsup-3.2.3_p20190905.ebuild 1595 BLAKE2B 19fc0ac44fd1a15b218f44fa0f6a9c0fe8d519b2d88c842ee68109350412be62c960d38e6f1ed9e2049a29be8232daca6a76a633a7fe99543e30a006314557f2 SHA512 4db85ddff8449513af7482c359e44996a7233b05e9a2cc14dddb9c96a2657b36ff8445f0ba848850365895bbe57042c99ae2e13b9092942566bb268d6fbf6802
+DIST yowsup-3.3.0.tar.gz 155950 BLAKE2B 7ade7f7e05aff14d5154d35d5c2a1841ee66893059bd995facb8297d7e6f1dde4468105dc3f03b5462efbf92cbd079c457440bb1580235bbbcfaddeab2244b56 SHA512 304409f02aa3720b0f70a83fe4dbe288fa1c5659642878d7bd1354359524a66c39b9f5baa9899224497f61f974d9b64ba67e07d866fda2589413070bb9ef1aad
+EBUILD yowsup-3.3.0.ebuild 1228 BLAKE2B 705f9313872049d62c475fa59475fb4f2c7172ab0eee707105669567ac1a457ed9ede39254065cc03d08f0931c3b3a32e1e790c474721107dff69ce0fb903350 SHA512 fc8399b919dec4402223319d67e68b524f8d1326e3a163b42ee3037ed9d23c69761edc5f077b99acff7e2a7fcae6553359f3611e2c431bfb5d54a57e54a36369
 MISC metadata.xml 756 BLAKE2B d0513b15622bb24f287bc5b987d3865ef2681a183edd7d2d1fb725c2d953124cc5341e08fc5811ef049fd78bb60225607490cf81c8e534e6830ac7b55081c6b7 SHA512 c28211cb67f9fa1ce01508dcdf0193e62cbd11266c2a0b9c5f2cd5d01dfaf330991ed8ac5451fe1034d9f9e32dc331f750aea206275e4c1548ae260b1f01568d
diff --git a/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild b/net-im/yowsup/yowsup-3.3.0.ebuild
index 05be23ec4c12..8c23695dc49f 100644
--- a/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
+++ b/net-im/yowsup/yowsup-3.3.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS="bdepend"
-EGIT_COMMIT="2adc067f306d9e7d8b634f66e96c52d80a42e1ff"
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="readline"
 
@@ -12,8 +11,7 @@ inherit distutils-r1
 
 DESCRIPTION="A library that enables you to build applications which use the WhatsApp service"
 HOMEPAGE="https://github.com/tgalal/yowsup"
-SRC_URI="https://github.com/tgalal/yowsup/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+SRC_URI="https://github.com/tgalal/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -34,19 +32,12 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PF}-fix-install-path.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.2.3_p20190905-fix-install-path.patch" )
 
 src_prepare() {
 	default
 
 	# After talking to upstream, version restriction can be lifted
 	# and also 'argparse' needs to be removed.
-	sed -e 's/==0.1.3-1//' -e 's/==0.2.2//' -e 's/==1.10//' -e 's/argparse//' -i setup.py || die
-}
-
-pkg_postinst() {
-	einfo "Warning: It seems that recently yowsup gets detected during registration"
-	einfo "resulting in an instant ban for your number right after registering"
-	einfo "with the code you receive by sms/voice."
-	einfo "See https://github.com/tgalal/yowsup/issues/2829 for more information."
+	sed -e 's/==0.1.5//' -e 's/==0.2.2//' -e 's/==1.10//' -e 's/>=3.6.0//' -e 's/argparse//' -i setup.py || die
 }
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 5d76611bd6e3..680f72675dac 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,8 +1,8 @@
 AUX README.gentoo 446 BLAKE2B e4307a45b86109e63d8057050ad66d1f77a2382ae717f1fad521756a356ff08203fc3aad20e39e437606797351b8c7f453b7d01ac1b299256ce8ed64ece888a8 SHA512 dd4c927bff4b8f66b8e149929e766378ecef0832952898a0070f0c0eb1b303b7c0cda7b8c3ed4031f12490785a593375c3aac8f30f305fa3245096eab36d189c
 DIST zoom-5.8.6.739_x86_64.tar.xz 55756408 BLAKE2B 5a0def3ebc239a55fbcba3aebfcf47d9121d0c7ad7bfb10477a0adce40fba278a15e74253261960c7c8fe452c1b0661c05aa9f48a79cd20e0e33048c247d9aba SHA512 5b2dbc9c914a8ec75978664b1cab19c3c7f8bc4a1e75772e5194b45c35e7ae8a2e5ed6c6fedd4be6ffd8af8736805163581ea5daefca1c9b914eff450f250200
-DIST zoom-5.9.1.1380_x86_64.tar.xz 57213592 BLAKE2B 5ff5202f36d97f7396d7b416ac84278177b3d15e42f05ab25420128b67ce69b5caab87b6df0737a143cc38a2afdb3cc245d05a17e7a82a2c1000b6ff875abe18 SHA512 95bc9572d94648ccbfdec95779ae8e9fc3d8be87da014263b744031e4144b3c7930f31b20443c9c4ff8651dff8cb9b1f93582de32eda97a21126e999d0e9b939
 DIST zoom-5.9.3.1911_x86_64.tar.xz 57314312 BLAKE2B e5f95d0962327e74e51515ba4449936b39e0ea75e7de98f02c85686f4697eb95e3ba0299d19221cbc0ac9eaf4ef5b92bcb404f39bf866fad12696c90d5b18440 SHA512 43adaaab774828b90c9924567680693c3d84fa2ad63f38f24eb2223e3c0c771e36eb7be6ac554e4cea23a0763f312675c863ef32219a7b675029a2dd21af18e6
+DIST zoom-5.9.6.2225_x86_64.tar.xz 57384044 BLAKE2B a6712499d903fa715170b9a50bf3fd1fadf7f403f4c9a9ff5ed890faf65ffd5564d06f64f26ca596598ef2c5cb53b4a477d8b08f7f7d44282911a890a00900d2 SHA512 f2899377c66cada60bf08326b7cd06a64b659d06fbdc19f0d6f1f0a6458bbfa0a40e59bdfb7ab4fe4877c0bde2f29fd0bfb8e05227b3c7cca66880e713345f10
 EBUILD zoom-5.8.6.739.ebuild 4637 BLAKE2B a0bbffc95c4918a7164e274f80b1d7508eedd41120a87b80f414f704ee6b8681f2cbfd306e99b0f7928ef56dad7e8b94ac42edcd0930927536896c72b4698e9d SHA512 10ec6559a7e0f11e759adfa8a7b7334ca462a69418a295dfa94dadbecf98fd8e8e1edf41e334b200fb13ad5d1614ca2d234df4b3dbea573bd58dd7b826c1a341
-EBUILD zoom-5.9.1.1380.ebuild 4736 BLAKE2B a1f3b1426840aca652dbd712c8681220834c102a4e5d322d95c810b9eeb2a6517af8dbbfc6881c7931f120f1db1752c20027691b8cad08039d927c774056517d SHA512 f8868d67d2b7481f215a40bfaedc9534b9303fb26a88040a69102027f51b33b340cd69ba129c40ba18a4247e38c27b5053c025ff7abb7b1cbad5f0ac1823a244
 EBUILD zoom-5.9.3.1911.ebuild 4736 BLAKE2B a1f3b1426840aca652dbd712c8681220834c102a4e5d322d95c810b9eeb2a6517af8dbbfc6881c7931f120f1db1752c20027691b8cad08039d927c774056517d SHA512 f8868d67d2b7481f215a40bfaedc9534b9303fb26a88040a69102027f51b33b340cd69ba129c40ba18a4247e38c27b5053c025ff7abb7b1cbad5f0ac1823a244
+EBUILD zoom-5.9.6.2225-r1.ebuild 4790 BLAKE2B dd44f435b9acd3e342d252f11f80661eccbe4b0a05277c729029167208a221f763ef0bf9989bf14e3e0d1ab88b75dc953fba7b542901405256db1bb307e72c10 SHA512 aad93a7fcb53bf6dbcfff9c36737d5a77933d099dcaf96e2f7908305e8469d0ceb68235dd42f91d8b64beba8924dd1943133abec651235630c8a1d98639b2ff1
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.9.1.1380.ebuild b/net-im/zoom/zoom-5.9.6.2225-r1.ebuild
index b30f73c773bf..64fb8851e99d 100644
--- a/net-im/zoom/zoom-5.9.1.1380.ebuild
+++ b/net-im/zoom/zoom-5.9.6.2225-r1.ebuild
@@ -139,7 +139,10 @@ src_install() {
 	make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)
 	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
 		"Network;VideoConference;" \
-		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+		"MimeType=$(printf '%s;' \
+			x-scheme-handler/zoommtg \
+			x-scheme-handler/zoomus \
+			application/x-zoom)"
 	doicon videoconference-zoom.svg
 	doicon -s scalable videoconference-zoom.svg
 	readme.gentoo_create_doc