gentoo resync : 02.02.2022

42 files changed, 959 insertions, 764 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 774fd9aa67b8..17deda26e01c 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/biboumi/Manifest b/net-im/biboumi/Manifest
new file mode 100644
index 000000000000..13726a938684
--- /dev/null
+++ b/net-im/biboumi/Manifest
@@ -0,0 +1,5 @@
+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
+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-r2.ebuild
new file mode 100644
index 000000000000..4f571807cf7e
--- /dev/null
+++ b/net-im/biboumi/biboumi-9.0-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="XMPP gateway to IRC"
+HOMEPAGE="https://biboumi.louiz.org/"
+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"
+
+DEPEND="
+	dev-libs/expat
+	virtual/libiconv
+	sys-apps/util-linux
+	sqlite? ( dev-db/sqlite:3 )
+	postgres? ( dev-db/postgresql:* )
+	idn? ( net-dns/libidn:= )
+	udns? ( net-libs/udns )
+	ssl? ( dev-libs/botan:2= )
+	!ssl? ( dev-libs/libgcrypt )
+	systemd? ( sys-apps/systemd:= )
+"
+BDEPEND="dev-python/sphinx"
+RDEPEND="
+	${DEPEND}
+	acct-user/biboumi
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DOCS=( README.rst CHANGELOG.rst doc/user.rst )
+
+src_configure() {
+	local mycmakeargs=(
+		-DSERVICE_USER="${PN}"
+		-DSERVICE_GROUP="${PN}"
+	)
+
+	# Account for biboumi's atypical configuration system.
+	if use systemd; then
+		mycmakeargs+=(-DWITH_SYSTEMD=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_SYSTEMD=yes)
+	fi
+
+	if use idn; then
+		mycmakeargs+=(-DWITH_LIBIDN=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_LIBIDN=yes)
+	fi
+
+	if use ssl; then
+		mycmakeargs+=(-DWITH_BOTAN=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_BOTAN=yes)
+	fi
+
+	if use udns; then
+		mycmakeargs+=(-DWITH_UDNS=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_UDNS=yes)
+	fi
+
+	if use sqlite; then
+		mycmakeargs+=(-DWITH_SQLITE3=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_SQLITE3=yes)
+	fi
+
+	if use postgres; then
+		mycmakeargs+=(-DWITH_POSTGRESQL=yes)
+	else
+		mycmakeargs+=(-DWITHOUT_POSTGRESQL=yes)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	cmake_build man
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+	diropts --owner=biboumi --group=biboumi --mode=750
+	if use sqlite; then
+		keepdir /var/lib/biboumi
+	fi
+	keepdir /var/log/biboumi
+
+	insinto /etc/biboumi
+	insopts --group=biboumi --mode=640
+	newins conf/biboumi.cfg biboumi.cfg.example
+}
diff --git a/net-im/biboumi/files/biboumi.initd b/net-im/biboumi/files/biboumi.initd
new file mode 100644
index 000000000000..665db9120c9c
--- /dev/null
+++ b/net-im/biboumi/files/biboumi.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="XMPP gateway to IRC"
+pidfile="/var/run/biboumi.pid"
+command="/usr/bin/biboumi"
+command_args="${BIBOUMI_CONFIG:-/etc/biboumi/biboumi.cfg}"
+command_user="${BIBOUMI_USER:-biboumi}"
+command_background="true"
+extra_commands="reload"
+
+depend() {
+	use jabber-server
+}
+
+reload() {
+	ebegin "Reloading configuration of Biboumi"
+	start-stop-daemon --pidfile ${pidfile} --signal USR1
+	eend $?
+}
diff --git a/net-im/biboumi/files/biboumi.logrotate b/net-im/biboumi/files/biboumi.logrotate
new file mode 100644
index 000000000000..19964cf60f3f
--- /dev/null
+++ b/net-im/biboumi/files/biboumi.logrotate
@@ -0,0 +1,10 @@
+/var/log/biboumi/*.log {
+	missingok
+	notifempty
+	sharedscripts
+	postrotate
+		for service in /etc/init.d/biboumi*; do
+			rc-service $(basename ${service}) reload > /dev/null
+		done
+	endscript
+}
diff --git a/net-im/biboumi/metadata.xml b/net-im/biboumi/metadata.xml
new file mode 100644
index 000000000000..cbe709768d65
--- /dev/null
+++ b/net-im/biboumi/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Biboumi is an XMPP gateway that connects to IRC servers and translates
+		between the two protocols. It can be used to access IRC channels using
+		any XMPP client as if these channels were XMPP MUCs.
+	</longdescription>
+	<upstream>
+		<doc>https://doc.biboumi.louiz.org/</doc>
+		<bugs-to> https://lab.louiz.org/louiz/biboumi/-/issues</bugs-to>
+	</upstream>
+	<use>
+		<flag name="udns">Asynchronously resolve domain names using
+		net-libs/udns</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 0272979c5fe1..95c712d11cf4 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -10,7 +10,7 @@ DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c5176
 DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
 DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
 EBUILD ejabberd-20.04.ebuild 9084 BLAKE2B eaf5b71f770f15df5697b52aafcd06c45f7f23ceae80e488bb9d815a2b6996349470541b6d4dc94bf1a98d2f78733f39236263dd6bec70a852ee800d1f9af994 SHA512 963b849ffb6d2a6879777205a7bc84349fb379eb00b8afbd4d574c77fa276246e943c92598bfeba0badfe0a7b92e4b07c6357e0b91ca7cb49cce90c1b8653d60
-EBUILD ejabberd-21.04-r2.ebuild 7519 BLAKE2B e7e934bac544603e9160004a534f59e121cfa167fbc6889e070c0eb0353a925cfa51b19c4c37002aa3e0e25632eeff0f10c5f0ae4174b2dde99d8a097c987be5 SHA512 219c906693f428947a1d2d213779432d3dbf801b8ed48a7b0eb03febbc0fb26f7fea2ec8cdc1afb340abfe0a3c236de192d206a8930d92e13d27e014246e01b9
+EBUILD ejabberd-21.04-r2.ebuild 7518 BLAKE2B fd8b91125137ce9317ee54bacddadda34178128c1f34984aeec826e3cb5f5d2b3e2695966bb89a6f6490a4a5fe212d96e7d4b8e195b71bac5cbf931745cdf5af SHA512 8a5589b0e14c66e32ecc23643c5cd609ea883b1e0d87d32a23c936475e649f95b8d1eebcc626dfe856f284bfb6521d4345a14b47d2cc0cb29956fed17c1be5a9
 EBUILD ejabberd-21.04.ebuild 8513 BLAKE2B d6f4f4b124f0adadf319caedbf6fe29f63423c8a1b204f9e7577f8b2752264cd754682b7ea61ada493326c41dee9d2b77f819d833a4b9179cc6f4686924ce752 SHA512 606f72c427143783f2f0555c2aca330fff0c8e10dee3e6c1c267f537d8eebaaf7ac4a6ef723e3e8cbfe900bc9b8fe91529268b08f19ecfda43e54317472ea8f2
-EBUILD ejabberd-21.12.ebuild 6995 BLAKE2B 51b085c1d217041aef06efee30c967eb1f19559d13353f694ae6d563cb024832c8b43b2da7ad86480bdc69449279b6972f60e807314777d65fce01b5e4e8a54c SHA512 2c2d6ef5626132098eaebe185e455e0c5b48f372b7328ec9785abbbeac5c86d35adf784c809c8adfc328220e36a0a246cea0c8f1c80072d1e05cb82a63be3b23
+EBUILD ejabberd-21.12.ebuild 6993 BLAKE2B a36c94f7b9bd08479b678c43cb881a086bfe36245028ab68afea96441b8a9db54a0d919e099d3d72d337b5a5d38c8e78a078d2114299121b6d373c4909e1b90c SHA512 2fdfe51005e975228fae04eeb7bbb15d12500885321af3bcefa69a3dedbf215db3ca56268e4cb58be0203cae43b78a7e9dd3e0832acaced05a361f26d966d7ee
 MISC metadata.xml 1517 BLAKE2B 5db739eeebcfcb1be6ee3fe281e40bbd3f98943c26910247fce1d491f6300b6c5e1814906838b846a2716b2a50bc8ed26219db49cd1101a9263e23d607d5afdb SHA512 a1856f7fea3d1add4503f1c3b92c6318bbfce0946f44d8e18c44be98d11e814bf56d73b626ee825787871a5adc834541853c7350709ef8204182fafd6dec1710
diff --git a/net-im/ejabberd/ejabberd-21.04-r2.ebuild b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
index 63128525a5ca..d8911b3b288c 100644
--- a/net-im/ejabberd/ejabberd-21.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04-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
@@ -237,7 +237,7 @@ pkg_postinst() {
 		done
 
 		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
-		ewarn "(just as upstream) and *not* /etc/ejabber."
+		ewarn "(just as upstream) and *not* /etc/jabber."
 		ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
 		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
 		ewarn "Please check your configuration."
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild b/net-im/ejabberd/ejabberd-21.12.ebuild
index 3f4d03ad5e89..2b533f549d33 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12.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
@@ -12,7 +12,7 @@ SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86"
 REQUIRED_USE="mssql? ( odbc )"
 # TODO: Add 'tools' flag.
 IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
@@ -223,7 +223,7 @@ pkg_postinst() {
 		done
 
 		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
-		ewarn "(just as upstream) and *not* /etc/ejabber."
+		ewarn "(just as upstream) and *not* /etc/jabber."
 		ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
 		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
 		ewarn "Please check your configuration."
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 2bca3d166501..f371187e67ae 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,8 +1,10 @@
 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
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.3.3_p2.ebuild b/net-im/gajim/gajim-1.3.3_p2.ebuild
new file mode 100644
index 000000000000..e58f75e2f5cd
--- /dev/null
+++ b/net-im/gajim/gajim-1.3.3_p2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+S="${WORKDIR}/${P%_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.4[${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
+}
+
+# tests in this release don't work, see also:
+# https://dev.gajim.org/gajim/gajim/-/issues/10755
+RESTRICT="test"
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 743a160406a0..1065ab95f687 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,9 +1,5 @@
-AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993
+AUX pidgin-2.14.8-libpurple_test_fix.patch 1895 BLAKE2B 2174772177ff0b906dc9dc90545469207e96671171e4f3b5bd60e361c935160362687b373aa89eacdd22c80bdb2291718a2e6165e628b7bb86b8f76f4f4c3da1 SHA512 9b328516173c8c81bc99c3045fc91c1cd99a4b74a26b37b93ba9ec2fbfb7560bcaf0c5b8890a8ee02bbb19052a774f608d9a4061eb9966f70e5b19cd1dc144eb
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
-DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b
-DIST pidgin-2.14.7.tar.bz2 8713379 BLAKE2B d48670c8b7419df67c6dddedf8eb15c0c4d61877386f65793b1423b659c6131d92eb58ae6cf63a31432426c8a09da0bdab0be8770517436bae51610a60886b59 SHA512 189b02b5500ca3560972cad9c84e94007e1c8cedd56d39214293412b31ee38bc2dbb33ab2f9320338bb226131f51cc8a1f6a4c66ba889a0f55d91edc15ac7465
 DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
-EBUILD pidgin-2.14.6-r1.ebuild 7552 BLAKE2B df1322c043eea5f238ae31e356126a5051b15a5c2e23ff2cb85655cffc19324d85f2c98d1bacc28ef4a58342037ad278e08f194ff7d35317e4ed816f17d9d83f SHA512 6d0d0dd56fd925166dbd9bf43721a07e8b6077574ea31d3e98a23fa83a53f05801701b55f754c1c7686825e1fb2ca5dc4eab90ee733d8705a1548da591bf22af
-EBUILD pidgin-2.14.7.ebuild 7495 BLAKE2B d2ff2260170869d9ca447e325ac12a174b1a8cdeff8c86a66f5e15faada00b96a8fa0ee68f194058c67a041e963ce668b0ed76d04a9a470cd89d829b3569db4b SHA512 6ad1f97c37079222dd11118ea76e83cabf193505a51159473efefa5c144ab94ba49ee6305f6bfd1c6a5c67715b4d3788fdf3a88c927ff6637984e9cbb4aef9ed
-EBUILD pidgin-2.14.8.ebuild 7490 BLAKE2B bb47ba2fb8d1d3c280ccfe4f3abe43e10cb8e3f384c8ff8d7ff8853e01ef7abcbd8c75e2ce15ebd7a3b41057c7f4d39f61a28d2432e7ff9810801a3585f33054 SHA512 45f60542459d1a03830fc1c083d4ce25f598e9ee7254329cb7255b607f1c2df1b40fa1666acfdc358256223b0fb808c3b30da2b9826ae3b742326a4cc310fb21
+EBUILD pidgin-2.14.8.ebuild 7541 BLAKE2B 1a17044f45b46eeb68c2fdf5a26bc5108fdd04e80e2e48e9fbc962d2253de698f04fe3e18ac504250a50647e3537a7ebbf9f399f0a8fc3f6e3eb4463dc162d55 SHA512 c08924d8ae02003f8aaf69210207fddb31480ea1d7fd180841a1f011f7976efd4d7073c955b5d06f49d8500fb61ec54a74e7404673c9d8f0dbf2300d668993d0
 MISC metadata.xml 1419 BLAKE2B 6b87c11749b1e15503eddb0d73d18ed264e86d8d8e515cd30ba6787117401f8f07ea5030accd5cbf86da7c059eaf4f4d2fa3ff5d0c2bf5db1f987f5f536ac448 SHA512 c7bc589c6ddd1fb628832105691f08555f0fd7e5578bd3c5905a6b082198c36a34f86182a8772b8e8aa14b75f2b99eeba99c2c77ef480f3d80fa199aa792067d
diff --git a/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch b/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch
deleted file mode 100644
index cf3a6de7bfb2..000000000000
--- a/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/593338
-
-Workaround one failing test. test fails on all platforms.
-Needs to be fixed upstream.
-
---- a/libpurple/tests/test_jabber_jutil.c
-+++ b/libpurple/tests/test_jabber_jutil.c
-@@ -144,7 +144,16 @@ START_TEST(test_jabber_id_new)
- 	 *  string MUST NOT contain any LCat character."
- 	 * The character is U+066D (ARABIC FIVE POINTED STAR).
- 	 */
-+#if 0
-+	/*
-+		Fails in gentoo: https://bugs.gentoo.org/593338
-+
-+		98%: Checks: 87, Failures: 1, Errors: 0
-+		test_jabber_jutil.c:147:F:JID validate:test_jabber_id_new:0: JID 'foo@example.com/٭simplexe٭' is invalid but jabber_id_new() allowed it
-+		FAIL check_libpurple (exit status: 1)
-+	*/
- 	assert_invalid_jid("foo@example.com/٭simplexe٭");
-+#endif
- 
- 	/* Ensure that jabber_id_new is properly lowercasing node and domains */
- 	assert_jid_parts("paul", "darkrain42.org", "PaUL@darkrain42.org");
diff --git a/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch b/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch
new file mode 100644
index 000000000000..30caaa92e9c5
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch
@@ -0,0 +1,52 @@
+# HG changeset patch
+# Node ID e8f8e1558e11
+# Parent  930e4fb71321
+diff --git a/libpurple/tests/test_util.c b/libpurple/tests/test_util.c
+--- a/libpurple/tests/test_util.c
++++ b/libpurple/tests/test_util.c
+@@ -172,7 +172,7 @@
+ 	fail_unless(1282941722 == purple_str_to_time("2010-08-27.204202", TRUE, NULL, NULL, NULL));
+ 	fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21.3234", TRUE, NULL, NULL, NULL));
+ 	fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21Z", TRUE, NULL, NULL, NULL));
+-	fail_unless(1631512800 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL));
++	fail_unless(1631491200 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL));
+ 
+ 	/* For testing local time we use Asia/Kathmandu because it's +05:45 and
+ 	 * doesn't have DST which means the test should always pass regardless of
+@@ -195,9 +195,14 @@
+ 	 * localtime.
+ 	 */
+ 	timestamp = purple_str_to_time("09/13/202115:34:34", TRUE, NULL, NULL, &rest);
+-	fail_unless(1631470500 == timestamp);
++	fail_unless(1631491200 == timestamp);
+ 	assert_string_equal("15:34:34", rest);
+ 
++	timestamp = purple_str_to_time("2010-08-27.134202-0700PDT", FALSE, &tm, &tz_off, &rest);
++	fail_unless(1282941722 == timestamp);
++	fail_unless((-7 * 60 * 60) == tz_off);
++	assert_string_equal("PDT", rest);
++
+ 	/* finally revert the TZ environment variable */
+ 	if(oldtz != NULL) {
+ 		g_setenv("TZ", oldtz, TRUE);
+diff --git a/libpurple/util.c b/libpurple/util.c
+--- a/libpurple/util.c
++++ b/libpurple/util.c
+@@ -887,6 +887,17 @@
+ 				t.tm_isdst = -1; /* -1 means dst info is not available */
+ 			}
+ 		}
++	} else {
++		/* If we have a time, figure out if we need to adjust our tz offset. */
++		if(!mktime_with_utc) {
++			if(utc) {
++				mktime_with_utc = TRUE;
++				tzoff = 0;
++			} else {
++				/* Local Time */
++				t.tm_isdst = -1; /* -1 means dst info is not available */
++			}
++		}
+ 	}
+ 
+ 	g_free(hours);
diff --git a/net-im/pidgin/pidgin-2.14.6-r1.ebuild b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
deleted file mode 100644
index a912c204bcb5..000000000000
--- a/net-im/pidgin/pidgin-2.14.6-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="https://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-LICENSE="GPL-2"
-SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:=[unicode(+)]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		>=x11-libs/pango-1.4.0
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		>=net-libs/farstream-0.2.7:0.2
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( >=net-libs/libgadu-1.11.0 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	meanwhile? ( net-libs/meanwhile )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn:= )
-"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )
-"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--disable-static
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=(
-			--enable-nss=no
-			--enable-gnutls=yes
-			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
-			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=(
-			--enable-gnutls=no
-			--enable-nss=yes
-		)
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python3=${PYTHON} )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# setting this here because gnome2.eclass is not EAPI-7 ready
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	default
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not compliant with new hicolor theme yet, #323355
-		local d f pixmapdir
-		for d in 16 22 32 48 ; do
-			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	use dbus && python_fix_shebang "${ED}"
-	if use python || use dbus ; then
-		python_optimize
-	fi
-
-	dodoc ${DOCS[@]} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
-	emake check VERBOSE=1
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/net-im/pidgin/pidgin-2.14.7.ebuild b/net-im/pidgin/pidgin-2.14.7.ebuild
deleted file mode 100644
index 5b28584d138a..000000000000
--- a/net-im/pidgin/pidgin-2.14.7.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="https://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-LICENSE="GPL-2"
-SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:=[unicode(+)]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		>=x11-libs/pango-1.4.0
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		>=net-libs/farstream-0.2.7:0.2
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? (
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( >=net-libs/libgadu-1.11.0 )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/nspr
-		dev-libs/nss
-	)
-	meanwhile? ( net-libs/meanwhile )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn:= )
-"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )
-"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--disable-static
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=(
-			--enable-nss=no
-			--enable-gnutls=yes
-			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
-			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
-		)
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=(
-			--enable-gnutls=no
-			--enable-nss=yes
-		)
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python3=${PYTHON} )
-	else
-		myconf+=( --without-python3 )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# setting this here because gnome2.eclass is not EAPI-7 ready
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	default
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not compliant with new hicolor theme yet, #323355
-		local d f pixmapdir
-		for d in 16 22 32 48 ; do
-			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	use dbus && python_fix_shebang "${ED}"
-	if use python || use dbus ; then
-		python_optimize
-	fi
-
-	dodoc ${DOCS[@]} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
-	emake check VERBOSE=1
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/net-im/pidgin/pidgin-2.14.8.ebuild b/net-im/pidgin/pidgin-2.14.8.ebuild
index 9fa6d8518eac..9dc37e46de11 100644
--- a/net-im/pidgin/pidgin-2.14.8.ebuild
+++ b/net-im/pidgin/pidgin-2.14.8.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
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 tk +xscreensaver zephyr zeroconf"
@@ -134,6 +134,7 @@ DYNAMIC_PRPLS="irc,jabber,simple"
 
 PATCHES=(
 	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+	"${FILESDIR}/${P}-libpurple_test_fix.patch" #819774
 )
 
 pkg_pretend() {
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 6ca8240206bf..cd3642707cec 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -3,5 +3,7 @@ AUX prosody.initd-r5 987 BLAKE2B 3e381f48cbc9c5361bdc6cb9ab4a13daf055cd35389036b
 AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafbf7f691c36910f41d0b81d701bf8f287aea89fa368071c0c94a38f56ff3134055eb01842b578d8b57991 SHA512 0499588d1fd6e970575785b4bdaf631428601bec8a57051558c1d4c82bc74462f17d7568b8d433b14f15c51c94b181f4240d9f4574d51dcfeda291f0a68eb6f1
 AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
 DIST prosody-0.11.12.tar.gz 439656 BLAKE2B 593bb24d7e84ed337e8d8a11b387ac50abd27ea62be0fd18e8c8441472c09565a6603ccb070250b620b3f50f4d1e33fad579f988e68250c083b8a9aa25a8e03b SHA512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2
+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
 MISC metadata.xml 670 BLAKE2B 448bf5ede2b6f09940c51fdff4642e18be22d9c3dac637271c7c8bcfde1b4af0853e2623c55c00efcd8757ef863ac37fdb895606e572911a62a1c9d5f32cc693 SHA512 6177b8e3d2ed1aeeae2f369dc693283a3f811953f71be0e004eea402aa421d89973dbefe79c8fd198e9f9f82e4b345552dc3a2c3597c05927dc1a518cacbaf1d
diff --git a/net-im/prosody/prosody-0.11.13.ebuild b/net-im/prosody/prosody-0.11.13.ebuild
new file mode 100644
index 000000000000..9a4dc0782f50
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.13.ebuild
@@ -0,0 +1,102 @@
+# 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/qtox/Manifest b/net-im/qtox/Manifest
index 462ae826fdcd..e7ca6a0002b8 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD qtox-1.17.3.ebuild 1777 BLAKE2B 662bf5e9a1b535dcd25f1032bfb2257316cc41e484c0ff92a4f60b2f440bb8488969a5b532f2e529ac36daeb28a729e2be8dc5862a0980ef81e317934a99dbe5 SHA512 456680cca3cf840351814d20a69615a225c0db6592b51290a362ef3a6316e9d5243b66bdec78fafa02564c18057fa57c62ce65e3183cefcbe987f51c2c601ebf
-EBUILD qtox-9999.ebuild 1906 BLAKE2B 3b89d9ff6d85407c3259a61f1c95feeea81e2318c6e5043fab060199c69f0e41952652cd80f234d0527c3365fb79977d01775b3c08862f6b705282c02944cb2f SHA512 57f284a0ea372daafd9af746fa9db1118edab004c569864cc61c18cc859a21396510a214819c8ee30ba19bdb2632fdf246f75efe93e9908df3b59c2563014496
+EBUILD qtox-1.17.4.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/qtox-1.17.4.ebuild b/net-im/qtox/qtox-1.17.4.ebuild
new file mode 100644
index 000000000000..825ce6aa14d1
--- /dev/null
+++ b/net-im/qtox/qtox-1.17.4.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/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index f3d034bc3f34..f9ff34f329b6 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-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=8
@@ -9,8 +9,10 @@ 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"
@@ -41,9 +43,9 @@ RDEPEND="
 	media-libs/libexif
 	media-libs/openal
 	media-video/ffmpeg:=[webp,v4l]
-	net-libs/tox:=[av]
-	net-libs/toxext
-	net-libs/tox_extension_messages
+	>=net-libs/tox-0.2.13:=[av]
+	>=net-libs/toxext-0.0.3
+	>=net-libs/tox_extension_messages-0.0.3
 	notification? ( x11-libs/snorenotify )
 	spellcheck? ( kde-frameworks/sonnet:5 )
 	X? (
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index ae8530266351..6de9a77768da 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST rocketchat-3.7.5.x86_64.rpm 72083048 BLAKE2B 136b0a1051d52b5a9c3c5d66eba8e0cde809bf5086bf6d0dbeb1dc319cbe73ff26c5d33f0a0e989b18c18f38406dedcad344f14ba532953679c7da53aebf4d74 SHA512 48fb9ce3602e7b3ebd2e049975941795cd00a1c89987b267988357af48bdaad958f2c1976c848a7be7e29f4726619531fbb6994cab927d39f13f50f182519818
-EBUILD rocketchat-desktop-bin-3.7.5.ebuild 1074 BLAKE2B c5b5c736b5ddb211485f8ce499b7f90ef4e5aefbf0b69701665b91016330a24c760bad4b16029eca52a80a13ad94139fe1da8f601ddf8026b71305ab5c30a250 SHA512 5aee5a90e44d77212dc4b06876315ffcc8096bfa9379a68c7c2095f6d378b4f418a8ee3854718cffca76407db607fb0e83135ea425ebe5390762ac77bf982af2
+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
 MISC metadata.xml 434 BLAKE2B 2253702089149978e030c97d8a21ef29c0870683e6896d105e9000e77d32d3c66c3482c2b0d2ecbbac6bc281a85be9267918f4d5691ea6c5cf6fab3ebc80db96 SHA512 9cba4c7855c123b866f6a24e99320ddb3b6a450fd5f37eadf364bd92e1e58fe7e0c3f4a6892bb26f0142869d983fe12f5b3753b1960763ffe63a0c8d0d54ebe0
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild
index 4a153a7e3205..9953c00c594d 100644
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.6.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	media-fonts/noto-emoji
 	media-libs/alsa-lib
 	net-print/cups
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
@@ -43,7 +44,7 @@ RDEPEND="
 	x11-libs/pango
 "
 
-QA_PREBUILT="/opt/Rocket.Chat/*"
+QA_PREBUILT="opt/Rocket.Chat/*"
 
 S="${WORKDIR}"
 
diff --git a/net-im/sendxmpp-amm/Manifest b/net-im/sendxmpp-amm/Manifest
index 822dc0ac25ed..f56dabd7625d 100644
--- a/net-im/sendxmpp-amm/Manifest
+++ b/net-im/sendxmpp-amm/Manifest
@@ -1,4 +1,4 @@
 DIST sendxmpp-amm-1.1.1.tar.gz 14012 BLAKE2B 769f888ad5522a5566f4b6fa4478ebe9321850eb3c21c9677dd96b36244a62dd7bdcc70c7093f5cd27721c14cd056c58cb740e6b5f2469afb32130dabc34ca3f SHA512 64b813647e50ec1cb1c6d123ce93ad89abcb1d734a9bf2867d6be8e8b9eae1f315db18f7c5fde6504cfcaa31dd4aad619006c97c4ffc1fa54056287f3b194198
-EBUILD sendxmpp-amm-1.1.1.ebuild 718 BLAKE2B 2475a5c62e217b99f32ba860af98f589c5b8fff161f8773e997a3f27ed2d4853d50cd77869109cf16b1ca47f6fed26062124ce772d2dffb704cab8b5b55ca368 SHA512 92f61c5c7ddc6f3acfb9cf41beba2df7fdaeb4a00b4441a2cd27fbbeb0d880214c34cd333f1d2c1dbaea2e2087bb6ae500f20c232ac5a14bde7511e02f504090
-EBUILD sendxmpp-amm-9999.ebuild 675 BLAKE2B c0111f9dc32ac76e82d187d0bce26de90f331179386f7fe3e1d4e3d536121e899f5f859885752ac9a16c567fd2df4df4b5af5acd579d9d64d33d43ea9152987b SHA512 cfad85bb2cbbe544bb243466a53d0834feac9546d2c32198f83ea0176ae2c199cd16106a5a8d914f6c61036179665340a49b2a11dfb8f4749feb383135dc4cc5
-MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53
+EBUILD sendxmpp-amm-1.1.1.ebuild 663 BLAKE2B 2f484991a51b5f7036fbaeb3922ad6f6c9044140c8c0cd57c93b84a52604f5027d0a0ffc8ac2a30e1feae362286474b7891328bad5a1627a54ddd87d25225567 SHA512 649040fd936b5fc6a12ebda8d15bbc6fb2177f56114592aa894a6ba8c2e66eccf338477a282b80b9769c394ff7780570b10655636cc61ae88e58cc00a715c9fd
+EBUILD sendxmpp-amm-9999.ebuild 620 BLAKE2B 1c3c9cfbde18bfbe3b0ed19aa14d0c136292963effe90081680f4b068f091c9ac2c0a4bcf51de1a87c8e330ab94284fb765c33e0ea26d5427df58d16502e156d SHA512 6c2c4da1b943c3a0fedea563b855980c6732a6dab9df5aeb2d9b77aa64a2ffad6ac9078bd0562c4a1de93a43377f66ee732f682f20c3fd9eaef0491b40992b9d
+MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
diff --git a/net-im/sendxmpp-amm/metadata.xml b/net-im/sendxmpp-amm/metadata.xml
index 87a759d410cf..a7fa285c7476 100644
--- a/net-im/sendxmpp-amm/metadata.xml
+++ b/net-im/sendxmpp-amm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<name>Florian Schmaus</name>
diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
index 49c9aed88173..faee439560d1 100644
--- a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
+++ b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
@@ -11,9 +11,6 @@ HOMEPAGE="https://github.com/flowdalic/sendxmpp"
 if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
 	EGIT_REPO_URI="https://github.com/Flowdalic/${ORIG_PN}.git"
 	inherit git-r3
-	if [[ "${PV}" == "9999" ]]; then
-		MY_KEYWORDS=""
-	fi
 else
 	SRC_URI="https://github.com/flowdalic/${ORIG_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64"
diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
index ef6656d8a9fc..782316d17024 100644
--- a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
+++ b/net-im/sendxmpp-amm/sendxmpp-amm-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=8
@@ -11,9 +11,6 @@ HOMEPAGE="https://github.com/flowdalic/sendxmpp"
 if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
 	EGIT_REPO_URI="https://github.com/Flowdalic/${ORIG_PN}.git"
 	inherit git-r3
-	if [[ "${PV}" == "9999" ]]; then
-		MY_KEYWORDS=""
-	fi
 else
 	SRC_URI="https://github.com/flowdalic/${ORIG_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index c12acdc533a5..f54d4daa6036 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,5 +1,5 @@
-DIST signal-desktop_5.26.1_amd64.deb 127893190 BLAKE2B 0d7dedf5370c1010d204ad0e13e1ca46f886eef4e2e51af1fd6f3cf163c7d6bc464d21719018dbc168818b696550fbc709a1ce6dbc242125ea856d62b2a24a4f SHA512 dffd694e637528587b4bcfa6303e41129e2872022f9e97b338ad71b4a763fedc52650d5b94a5cd1282119163968df599cf3b8bb7639879dfc4132fdcedfe7b2f
-DIST signal-desktop_5.27.1_amd64.deb 125206928 BLAKE2B 67f39b1c52564f8768307b56ef3f879e2130a3cb2aa1f650c8cfee3bf6d26f1ece6b4267fc3911802bc23c2c91875e1aff0d9f5d4cdb7e5f02d1a022063e35fd SHA512 1e81e2bb7c94b5866f7fcb93800c606c88696df5fb06791c52071dad1b7c9df2d7a2936a006c55d3d7a1b9155d4681212a6b41123447f2d76120ecbbeaba51a3
-EBUILD signal-desktop-bin-5.26.1.ebuild 2450 BLAKE2B 6c8154c7125e07452a3088420667113cd30555968c894d1cacaf51880e1eee8cf53b4c5964aaa664a578c15b73656fee0e3dd41d4362d458b579c790e5132d68 SHA512 89e75598601c1b10ac82ca6ce23fda506ec8417ef13541897998d45559e24b08d546b080e54207d3027a9c1a08fc612789f0466d9585a2a6d9c7ebc5732df244
-EBUILD signal-desktop-bin-5.27.1.ebuild 2428 BLAKE2B 6bfeb2dadd272d73589a0926ae2cd2e68c6f84d5f5dd399b8cfa32721aeb084a76bbdfb4e8ec8256a1007ceee240db7aacf569db8625022821e92b767c4c2158 SHA512 fa474101f607d0f6db4f858222075e55d409ad015dac8fec417c23837077336453e3add2174417110184be78c17de61d3b4739084808665cfc3ff51bdb11b73e
+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
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.26.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.28.0.ebuild
index f2db453688b1..75db5c2f8043 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.26.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.28.0.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
@@ -43,7 +43,6 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXrandr
-	x11-libs/libxshmfence
 	x11-libs/pango
 	sound? (
 		|| (
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.27.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.29.1.ebuild
index 47f9a77095de..47f9a77095de 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.27.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.29.1.ebuild
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 9a78597e1083..f74982478f03 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,7 +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
 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.4.8.ebuild
new file mode 100644
index 000000000000..ffa0e5b21490
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/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="
+	dev-libs/glib:2
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	newbin Telegram telegram-desktop
+
+	insinto /etc/tdesktop
+	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index f7231828f768..e57dafaa44a7 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,10 +1,13 @@
 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
+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
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch
new file mode 100644
index 000000000000..e99cd2e4bf91
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch
@@ -0,0 +1,31 @@
+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.4.8-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-3.4.8-full/Telegram/CMakeLists.txt
+@@ -1331,6 +1331,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.4.8-full.orig/cmake/options_linux.cmake
++++ tdesktop-3.4.8-full/cmake/options_linux.cmake
+@@ -65,7 +65,6 @@
+ 
+ target_link_libraries(common_options
+ INTERFACE
+-    desktop-app::external_jemalloc
+     ${CMAKE_DL_LIBS}
+ )
+ 
diff --git a/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild b/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild
new file mode 100644
index 000000000000..5282d22ec82f
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit xdg cmake python-any-r1 optfeature flag-o-matic
+
+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"
+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"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+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
+	>=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_p20211129
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20211207[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:= )
+	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
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-3.4.8-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.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
+		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_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_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
+
+	# 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
+}
+
+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
+	optfeature_header
+	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
+}
diff --git a/net-im/whatsapp-desktop-bin/Manifest b/net-im/whatsapp-desktop-bin/Manifest
index eb83366fbc2f..3d389518c1be 100644
--- a/net-im/whatsapp-desktop-bin/Manifest
+++ b/net-im/whatsapp-desktop-bin/Manifest
@@ -1,4 +1,4 @@
 DIST whatsapp-desktop-bin-amd64-0.5.1.deb 39705544 BLAKE2B abdf7091f8b10e614e78e457e501bf878f7462f54257e5b96ca2118ddd872bd71fc4c000c24f881741a252932d7bd0bb3d8654cdaeddf2e42ee2d8de5788f565 SHA512 96411b1bcf064a9b5836b64687389898bebf3b8636a95adb8c55b74b4405b9b5c45d099fb594947130b6618520f1f0d1bd84618537fa8a19c001db4ddc630f7c
 DIST whatsapp-desktop-bin-x86-0.5.1.deb 40671520 BLAKE2B 06f6b2c3168c48de9caa2b834ab41ee47a43a534751eac6ddffc29acc981281e3d0d54b96bbd44dfc870257c9561f88ba72fd26a85cd13168fd1eb4a3ddb56dd SHA512 b87fa9b901fec104284e55c2747ad742da9d484fb13b9e8259ae99f60b5d293ae93831ca7daefa38cab04ea50c764de089b0422c797e693ebebaa136932fd6e0
-EBUILD whatsapp-desktop-bin-0.5.1.ebuild 1206 BLAKE2B 73b4c35f33d4cc0d0707c9be47a3075b1fe3d72187d9a840f9424d28be55be1d1477798b3c77303c4ac6710ef291da58fc2eb146daaca8c42f2881b5ee93ecef SHA512 c19acfbad1e0e25fe809e42140a19340096a5447ae6d818092b616cfff1c731c1605222fcb208522b469c8fd2d1cc84aca155a1f973cda67dd45f44d3a12cbf5
+EBUILD whatsapp-desktop-bin-0.5.1.ebuild 1222 BLAKE2B 3bf6ab615ee4cf1c81127c5ac8eaa4a1ebb5ac65fdb613e5fbfc84319c9cd7ceade237f9e6328aabe43a873d5616e7e52a867153490aa0c5560f53348e652157 SHA512 e62509b529cb4dbadba327d4c761d125b1071bd5d86f22bd60906f0823c471f4a9f141206fb66dab248f4871fa7b327206b3560697ed5795bbbbbce0b565559d
 MISC metadata.xml 420 BLAKE2B e54fc393304f277cf58dca4f650ebf8536e6c16673a357cb5c8ac021ec1284d2bb3963f3c1793750255ec91c35099448e0a945abc8c718b98dc25e98e46751fd SHA512 8bd96dff0a0eb33262bbaf0dab744aa718b15498f4e8c38b1036829dc4d1f509fe3fefa29334322609b2a3247a60d16c42d83842f8b6efc212d06031ce3a4ee5
diff --git a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
index 1358c9b70bc6..f5747bb58c8b 100644
--- a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
+++ b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 	media-fonts/noto-emoji
 	media-libs/alsa-lib
 	net-print/cups
+	sys-libs/glibc
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 85222dcc0c8d..5d76611bd6e3 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,8 @@
 AUX README.gentoo 446 BLAKE2B e4307a45b86109e63d8057050ad66d1f77a2382ae717f1fad521756a356ff08203fc3aad20e39e437606797351b8c7f453b7d01ac1b299256ce8ed64ece888a8 SHA512 dd4c927bff4b8f66b8e149929e766378ecef0832952898a0070f0c0eb1b303b7c0cda7b8c3ed4031f12490785a593375c3aac8f30f305fa3245096eab36d189c
-DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
-DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
 DIST zoom-5.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
-EBUILD zoom-5.4.53391.1108-r3.ebuild 3167 BLAKE2B 9aba2dc82ebd4c97f7dc97b6718141e35416316f51111ce145b9844bf1172fea80c3080a1d8ff34964e42742e243d1fc157906e2c55450b39170f01cb36a55b4 SHA512 52fc56dcfadaa4b9822475525a7958d8bbe5351038ee209426e1440af613598bed0f75dabdd79450206b6c9a36564f3ecf43dd3a98182368789744c99a589cbf
+DIST zoom-5.9.3.1911_x86_64.tar.xz 57314312 BLAKE2B e5f95d0962327e74e51515ba4449936b39e0ea75e7de98f02c85686f4697eb95e3ba0299d19221cbc0ac9eaf4ef5b92bcb404f39bf866fad12696c90d5b18440 SHA512 43adaaab774828b90c9924567680693c3d84fa2ad63f38f24eb2223e3c0c771e36eb7be6ac554e4cea23a0763f312675c863ef32219a7b675029a2dd21af18e6
 EBUILD zoom-5.8.6.739.ebuild 4637 BLAKE2B a0bbffc95c4918a7164e274f80b1d7508eedd41120a87b80f414f704ee6b8681f2cbfd306e99b0f7928ef56dad7e8b94ac42edcd0930927536896c72b4698e9d SHA512 10ec6559a7e0f11e759adfa8a7b7334ca462a69418a295dfa94dadbecf98fd8e8e1edf41e334b200fb13ad5d1614ca2d234df4b3dbea573bd58dd7b826c1a341
-EBUILD zoom-5.9.1.1380.ebuild 4720 BLAKE2B 5a3762eb06e3df137c90de059f4a9a9bd4b447ab16c0641c26d0ec8d37d15cec194cd7b69afed26ed6839f08419ac77c41dddf658195ecd40afff5b86ac51487 SHA512 2e07e1e3b6a19c5757a2aeed6e62aa69f011ccc3db4d9e312ecdf7776c801a5e17888f93cce27ad8867e8f9b89d0587be81453bdb7a11b92e0467ca88d290448
+EBUILD zoom-5.9.1.1380.ebuild 4736 BLAKE2B a1f3b1426840aca652dbd712c8681220834c102a4e5d322d95c810b9eeb2a6517af8dbbfc6881c7931f120f1db1752c20027691b8cad08039d927c774056517d SHA512 f8868d67d2b7481f215a40bfaedc9534b9303fb26a88040a69102027f51b33b340cd69ba129c40ba18a4247e38c27b5053c025ff7abb7b1cbad5f0ac1823a244
+EBUILD zoom-5.9.3.1911.ebuild 4736 BLAKE2B a1f3b1426840aca652dbd712c8681220834c102a4e5d322d95c810b9eeb2a6517af8dbbfc6881c7931f120f1db1752c20027691b8cad08039d927c774056517d SHA512 f8868d67d2b7481f215a40bfaedc9534b9303fb26a88040a69102027f51b33b340cd69ba129c40ba18a4247e38c27b5053c025ff7abb7b1cbad5f0ac1823a244
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.4.53391.1108-r3.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r3.ebuild
deleted file mode 100644
index 6b437d523e63..000000000000
--- a/net-im/zoom/zoom-5.4.53391.1108-r3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
-	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libjpeg-turbo pulseaudio"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/quazip:0=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtdiag:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtlocation:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-sound/mpg123
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-libs/alsa-lib )"
-
-BDEPEND="dev-util/bbe
-	bundled-libjpeg-turbo? ( dev-util/patchelf )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-
-	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>zoom-icon.svg && [[ -s zoom-icon.svg ]] \
-		|| die "Extraction of icon failed"
-
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-
-	if use bundled-libjpeg-turbo; then
-		# Remove insecure RPATH from bundled lib
-		patchelf --remove-rpath libturbojpeg.so || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r json ringtone sip timezones translations
-	doins *.pcm *.pem *.sh Embedded.properties version.txt
-	doexe zoom zoom.sh zopen ZoomLauncher
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-
-	local quazip_so="libquazip1-qt5.so"
-	if has_version "<dev-libs/quazip-1.0"; then
-		quazip_so="libquazip5.so"
-	fi
-	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so
-	else
-		dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
-	fi
-
-	make_wrapper zoom /opt/zoom{/zoom,}
-	make_desktop_entry "zoom %U" Zoom zoom-icon "" \
-		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	doicon zoom-icon.svg
-	doicon -s scalable zoom-icon.svg
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	local FORCE_PRINT_ELOG v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-5.9.1.1380.ebuild b/net-im/zoom/zoom-5.9.1.1380.ebuild
index ace44f92c150..b30f73c773bf 100644
--- a/net-im/zoom/zoom-5.9.1.1380.ebuild
+++ b/net-im/zoom/zoom-5.9.1.1380.ebuild
@@ -25,6 +25,7 @@ RDEPEND="!games-engines/zoom
 	media-sound/mpg123
 	sys-apps/dbus
 	sys-apps/util-linux
+	sys-libs/glibc
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libxcb
diff --git a/net-im/zoom/zoom-5.9.3.1911.ebuild b/net-im/zoom/zoom-5.9.3.1911.ebuild
new file mode 100644
index 000000000000..b30f73c773bf
--- /dev/null
+++ b/net-im/zoom/zoom-5.9.3.1911.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="!games-engines/zoom
+	dev-libs/glib:2
+	>=dev-libs/quazip-1.0:0=
+	media-libs/fdk-aac:0/2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-sound/mpg123
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	opencl? ( virtual/opencl )
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-libs/alsa-lib )
+	wayland? ( dev-libs/wayland )
+	!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
+	!bundled-qt? (
+		dev-libs/icu
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtdiag:5
+		dev-qt/qtgraphicaleffects:5
+		dev-qt/qtgui:5
+		dev-qt/qtlocation:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols:5[widgets]
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		wayland? ( dev-qt/qtwayland )
+	)"
+
+BDEPEND="dev-util/bbe
+	bundled-libjpeg-turbo? ( dev-util/patchelf )"
+
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+
+	# The tarball doesn't contain an icon, so extract it from the binary
+	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
+		|| die "Extraction of icon failed"
+
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+
+	if use bundled-libjpeg-turbo; then
+		# Remove insecure RPATH from bundled lib
+		patchelf --remove-rpath libturbojpeg.so || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	doins -r json ringtone sip timezones translations
+	doins *.pcm Embedded.properties version.txt
+	doexe zoom zopen ZoomLauncher *.sh
+	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
+
+	if use opencl; then
+		doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
+	fi
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so
+	else
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
+	fi
+
+	if use bundled-qt; then
+		doexe libicu*.so.56 libQt5*.so.5
+		doins qt.conf
+
+		local dirs="Qt* bearer generic iconengines imageformats \
+			platforminputcontexts platforms wayland* xcbglintegrations"
+		doins -r ${dirs}
+		find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
+			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
+
+		(	# Remove libs and plugins with unresolved soname dependencies
+			cd "${ED}"/opt/zoom || die
+			rm -r Qt/labs/location QtQml/RemoteObjects \
+				QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \
+				QtQuick/Scene3D QtQuick/XmlListModel \
+				platforms/libqeglfs.so platforms/libqlinuxfb.so || die
+			use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
+				platforms/libqwayland*.so || die
+		)
+	else
+		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
+		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
+			ewarn "You have disabled the bundled-qt USE flag."
+			ewarn "You may experience problems when running Zoom with"
+			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
+			ewarn "See https://bugs.gentoo.org/798681 for details."
+		fi
+	fi
+
+	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;"
+	doicon videoconference-zoom.svg
+	doicon -s scalable videoconference-zoom.svg
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	local FORCE_PRINT_ELOG v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}