gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-im
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
81 files changed, 2212 insertions, 597 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3c64d46f5249..a5e6ac8bf738 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 90fa0280e084..daf97640ad03 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -5,6 +5,6 @@ AUX bitlbee-3.6-disabled-plugins-use.patch 1695 BLAKE2B 5c5ab3f330921a471da5fcc3
 AUX bitlbee.confd-r2 303 BLAKE2B 01ac57be4d6d50be227d6528425909a98231d3e5e2d7718ee71195890123145169a4be1568514b41b9509b992e747c4169022d31fb33c62e00a00f757307d8d8 SHA512 4ba7b8a81d5b77bd8ccd94431b065d4850c97bb153ca715f5f4ea6a1f9a6c90ab2c99fb9d6342311ae948bd34904a9cc2b3696f1b8f09e2475b79d254f744ae4
 AUX bitlbee.initd-r2 244 BLAKE2B 1f4900c9bcad2469ad97e4a4c34e58124e4e3634bbcb8d3c6d30b16ab343995870cfa27a33cfaff04df59fc52f888368d173966a2d5306b2adae98c72c28a305 SHA512 c965f8bbd2b3d13a6c66455a3cc503a94ea0c8000a0e41e283ce1828ee59105d162552979343e8ebb6513fd15bf44a4274b0558928ae0e89b424773cdb8b7b97
 DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
-EBUILD bitlbee-3.6-r1.ebuild 3342 BLAKE2B 9021e9595a47267eabc7955c6a68b89021c57e082834749db7413f511929a9cb5a192000784f6c48f7cc95cd7f55f6a79621f789c5cdded6b72b322b3ddd491a SHA512 d0feac7423a4830c65453b61e030c77e31719060055974ad24ae9865eb10a9caa808b1a75a7987a4fc6b17c03445dd116fdbe8479f570ecc1c2cfe56bd0a1dff
+EBUILD bitlbee-3.6-r1.ebuild 3349 BLAKE2B 189604b45e34853c1b20076fe92c2319f5a6f7eb3381e552a3a727bf94d582f6e613eec0c02d34cbf974f9dd8ae6b78e7c3d9f31bdf323fb97c9e44eecf92489 SHA512 91b7d4dc665d0149486fb9a616ec7c68dc0e2c7ab0116400f67839a3033d87f869c9b6c391e1586dd504d196a44eecbf55f557ef064869927e21ea818ea28343
 EBUILD bitlbee-9999.ebuild 3218 BLAKE2B 8231cd3ec7dcd56b6d3e9dedc16715698fa83825a57696c4b8e10c4293da034d6b99338a8288e4b969cfe4905523e1a5c8d5bb6cfd04a2526884f83be726c241 SHA512 f68f23551d8efe102585e4541903e882a8e623754cdb1d6500b65cf922af8bd6ce56adbc9b4f7ed25b9f57f1963ea25dbc143d973e2575d2d02ff7e65afe6a4d
 MISC metadata.xml 1169 BLAKE2B b384f4ab61b50fdaf1630d410115ec567cf9bceb10df90e1781f4e133d644c146ac9db005c831735acf2f0ff2e167980dd7b07ca30527330777314e1d69756bb SHA512 fce71cd423777ffa60edc7e45805c1e622c2a9590409772c77566f6945f25389aca1d8d9e5424effa2008ded1ae394d3b9636197bb59e0b74c294eaa97419753
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 16e04e799848..592437d7f4bb 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
diff --git a/net-im/cawbird/Manifest b/net-im/cawbird/Manifest
index 361159e7bf85..be4a30564295 100644
--- a/net-im/cawbird/Manifest
+++ b/net-im/cawbird/Manifest
@@ -1,3 +1,3 @@
 DIST cawbird-1.5.tar.gz 675527 BLAKE2B d94bf61faba01fc1159fabbf0da24ab49a697112ccd5bb631133c21f52ffe29e9ede214c9eccf553cbbb039b08e487467e4ecc56d0e0ef63f68d4c23d39414aa SHA512 917480ac79606a1ab572f0837fd48e100bbb6d70ad3551a8d86486843d9bfb0e4814c75c56ff0e2aa41fd7d32a614bbff4e6121831b3da7da7614fb5a0d3f6e1
-EBUILD cawbird-1.5-r1.ebuild 1357 BLAKE2B 21e0cbbbc8667d56ae263780a21f7ae4abef9ecc4e9881fe20e5726b04dea5f404757c820c23a7e94b2c2ac423994881854a223c9065e9fc4a9a69b2db74a71f SHA512 e30f1ba05839dd9a09c5f5fd2617f7fb692ac798ef90eb8e4185ecf53ad49e70b35514e06b6f4a0e75ebc076d76e18b5174bf205cc44283021ce6ff17ba067fb
+EBUILD cawbird-1.5-r2.ebuild 1424 BLAKE2B b533022b087c66ecde5c95e6eec51254ca1eb2a8bb485d200c0945e7ade9b402ffd73ce49ca31241e1a1dc73390f124108a6477a06c31293593514f5350dbaa4 SHA512 f6c85400e496d88a1e8d0aa1b5072912fcbc2fd52a5f7df7ab5c672a04e6f34f21964bf3e7c1b000c41f15b19d4694ad0fe2d7b3e0d800cdfe065992d56349aa
 MISC metadata.xml 324 BLAKE2B f548750610b0b02bf35efb78ee01ef1d2d7a68d65d9d1e88b29639ad576b139fecd3d8b40a2c9ff88f4613a1b6e8fea28efccfcdbc6e83d32855c4414ede7728 SHA512 4aed49f42c279faf8c819e1a1cb1bf0aad5ccd46de295fff062734e68f98aee1cdc96f383a3c45a452fb7cf9e344ddde1f33e3b9287535fec1edfb4f710d6a8a
diff --git a/net-im/cawbird/cawbird-1.5-r1.ebuild b/net-im/cawbird/cawbird-1.5-r2.ebuild
index f7f08d155805..aee227728983 100644
--- a/net-im/cawbird/cawbird-1.5-r1.ebuild
+++ b/net-im/cawbird/cawbird-1.5-r2.ebuild
@@ -28,7 +28,11 @@ RDEPEND="
 	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/pango
-	gstreamer? ( media-plugins/gst-plugins-meta[ffmpeg,http,X] )
+	gstreamer? (
+		media-plugins/gst-plugins-gtk
+		media-plugins/gst-plugins-hls
+		media-plugins/gst-plugins-meta[ffmpeg,http,X]
+	)
 	spell? ( app-text/gspell:=[vala] )
 "
 DEPEND="${RDEPEND}"
diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest
index c8e419557e39..7009a214e92f 100644
--- a/net-im/coturn/Manifest
+++ b/net-im/coturn/Manifest
@@ -1,8 +1,9 @@
+AUX coturn-4.5.2-respect-TMPDIR.patch 479 BLAKE2B 75e20f0927bcb080c354579d2dd0d7d3674a1f41cf4644519499b0b2fd17c819a613fa94b9cceac68bb7e442228e9996265cf358005924458710e4fefab2c3bd SHA512 660fdfa1284c5abd5075fd0bce9f123ab0caac9b18cf499fba78022368b04c2904be0df477b7c5070a8cca46b5ac53d686664015747718c228d8c1aa2a1e8945
 AUX coturn.conf 46 BLAKE2B 8ae3300f7a0a6e09fde5259b660ec69c7b15cd08d2edcd7a5f77db9beda773d313b5625c44f75b922efc6205b06d17aadcfba98c8b8c8638b6a8de12801245b1 SHA512 f5b813fef017b995d036fc968c6b44cd969867c0233d36ef450357ab5f104a9f38fb27100c22fa14ed4ef49ec410e86c077f400ba7cde1b0e2466368fd02a2dc
 AUX coturn.service 470 BLAKE2B 21b1cc005b5b91a8cb80b05a45afc16d73ad88e5b0a851294a6fab79d01a3bebbd048dc0bdd2423b62c2b56fe16dece95613846ad45bc9d5c3642a79fa726eff SHA512 f4228af88e51a38b06b0f91e1494d4e61a9a9f18cbab9fe85c323267e28045ebaae2832bae114da6e326cf22bf8efbd2bd5677cbcdde8fe994eca60802a6dc66
 AUX logrotate.coturn 345 BLAKE2B 26edd2ad44d947bf943757fb3e3255cafea64fac5d495402bbc3a7088ed6ffd822cc8f07010669f9faf856eb8a893d9ba9ab48d4b417f8c3fd27772ffb71cae0 SHA512 ebfadc7e6435061b7120baffce76a65c224768ab85e59e3b8cd140e394fa6e4eaa258eccce76f3152fd6a1adab0c84e39feb51663c76359401e04df4d8db2c1d
 AUX turnserver.init 633 BLAKE2B 78da89afc2be30bac969bb2a393d454d32ba77e199f2ccb5e34557ce34cf3a242402210afe6e30400b4a47ef9dc7880cded44a1932f7769f21f4143261a3569e SHA512 3b86b2186499c96ec0cfd3a124ea058a622c21cc870e079414f6055f7ba85830a5b85c424c809c010144f9270fcada80ef20bcab4cbc9c7fe0949b24fef02b59
 DIST coturn-4.5.2.tar.gz 442745 BLAKE2B c18d5f5cfedd600875c0bfa08b874ef6316a5aa9af34c27e2901825da412b794d437e08f0706f9651bdf6d3d19e151486af39a42f2326c7ab6bb802d33fd0ba4 SHA512 00e86a3a273a8e4e69deaefd338bdd6c44739a807f21a72a2d68efc089053e16efd1d5b34b0c6dea7a0fa2b66f70821d8c3e1107561e1f08dfac2c93933a6121
-EBUILD coturn-4.5.2-r1.ebuild 2200 BLAKE2B 38032e1b8dc5a675cb571a39b3163310c37a859b30e0da9e127ee98850d887b273b4fe510588cc1f517bc1f41cdc0e40546ecce41a2d00ca6d8491d83d494b5b SHA512 db86075f9d5eb20191880496c9fc4ed483031638fef2cf35ab08baa3b621fc2f3e00d78f3b014aa8f7df0acc2e207eccb264e046afbf296b82912be6e4c73dbd
-EBUILD coturn-9999.ebuild 2207 BLAKE2B bf6f18e15176d185d60983d84c0c19ec32d60f0426e13f449d8d1aceba9fa64d860749b958d2b3e23cda3fa0a884d4f101e27f7f61c6731d1b7d0810cb53a4a2 SHA512 c7de60a0b5f5af1c9edf1ccff8c9a6a26a012f92c4b041a8b2767e9a3d214e794f100cd6cd49c9d9b350c13b8243c1d3386817b685cd1bdc38486a825a58ce1f
+EBUILD coturn-4.5.2-r1.ebuild 2397 BLAKE2B 5c2a056db7dc714a73f6e49ac5e4d0cf3a8c4555dcdab39276bdd845353860475acccd09dad8dae9358f6623b9bd4449ac0f17dbd6ead186c14e7c31c66b2808 SHA512 6a278b46b214dd6d7f0d3599d72aa1961a54a83a0ac47f50259461d82bebac3483cdaba7ec289aed118c980849a6693512b2b9670ac4219af0b8a64cf664f714
+EBUILD coturn-9999.ebuild 2397 BLAKE2B 5c2a056db7dc714a73f6e49ac5e4d0cf3a8c4555dcdab39276bdd845353860475acccd09dad8dae9358f6623b9bd4449ac0f17dbd6ead186c14e7c31c66b2808 SHA512 6a278b46b214dd6d7f0d3599d72aa1961a54a83a0ac47f50259461d82bebac3483cdaba7ec289aed118c980849a6693512b2b9670ac4219af0b8a64cf664f714
 MISC metadata.xml 498 BLAKE2B 59313fc116427a965c6b1583f6d0832d52da36ef4e9e62d1ed2039cd750281e82679d351f960dbff0ec9077d8c6f4bc44a2aba237748aea668f2237fa4ffdfbf SHA512 23c885a01456773028feab711122e844a61022b6c2aae440c41f5def70a504ac0842c1a3ef43349d248011e1256e7dde37516d13dac36435a6c8d8b972e4319f
diff --git a/net-im/coturn/coturn-4.5.2-r1.ebuild b/net-im/coturn/coturn-4.5.2-r1.ebuild
index 37dde1c42c28..d3a3c8813604 100644
--- a/net-im/coturn/coturn-4.5.2-r1.ebuild
+++ b/net-im/coturn/coturn-4.5.2-r1.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit systemd tmpfiles
+
+inherit toolchain-funcs systemd tmpfiles
 DESCRIPTION="coturn TURN server project"
 HOMEPAGE="https://github.com/coturn/coturn"
 
 if [ ${PV} = 9999 ]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
-	DEPEND="dev-vcs/git"
 #	S="${WORKDIR}/${PN}-master"
 else
 	KEYWORDS="~amd64 ~x86"
@@ -22,13 +22,18 @@ IUSE="mongodb mysql postgres redis sqlite"
 RDEPEND="acct-group/turnserver
 	acct-user/turnserver
 	>dev-libs/libevent-2.1.8:=
+	dev-libs/openssl:=
 	mongodb? ( dev-libs/mongo-c-driver )
 	mysql?  ( dev-db/mysql-connector-c:= )
 	postgres? ( dev-db/postgresql:* )
 	redis? ( dev-libs/hiredis:= )
 	sqlite? ( dev-db/sqlite )"
-
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.2-respect-TMPDIR.patch
+)
 
 src_configure() {
 	if [ -n "${AR}" ]; then
@@ -56,7 +61,13 @@ src_configure() {
 	if ! use sqlite; then
 		export TURN_NO_SQLITE=yes
 	fi
+
+	tc-export CC
+
+	export ARCHIVERCMD="$(tc-getAR) -r"
+	export PKGCONFIG="$(tc-getPKG_CONFIG)"
 	export DOCSDIR="/usr/share/doc/${PN}-${PV}"
+
 	econf $(use_with sqlite)
 }
 
diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild
index 4f65686782b4..d3a3c8813604 100644
--- a/net-im/coturn/coturn-9999.ebuild
+++ b/net-im/coturn/coturn-9999.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit systemd tmpfiles
+
+inherit toolchain-funcs systemd tmpfiles
 DESCRIPTION="coturn TURN server project"
 HOMEPAGE="https://github.com/coturn/coturn"
 
 if [ ${PV} = 9999 ]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
-	DEPEND="dev-vcs/git"
 #	S="${WORKDIR}/${PN}-master"
 else
 	KEYWORDS="~amd64 ~x86"
@@ -20,15 +20,20 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="mongodb mysql postgres redis sqlite"
 RDEPEND="acct-group/turnserver
-	 acct-user/turnserver
-	 >dev-libs/libevent-2.1.8:=
-	 mongodb? ( dev-libs/mongo-c-driver )
-	 mysql?  ( dev-db/mysql-connector-c:= )
-	 postgres? ( dev-db/postgresql:* )
-	 redis? ( dev-libs/hiredis:= )
-	 sqlite? ( dev-db/sqlite )"
-
+	acct-user/turnserver
+	>dev-libs/libevent-2.1.8:=
+	dev-libs/openssl:=
+	mongodb? ( dev-libs/mongo-c-driver )
+	mysql?  ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	redis? ( dev-libs/hiredis:= )
+	sqlite? ( dev-db/sqlite )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.2-respect-TMPDIR.patch
+)
 
 src_configure() {
 	if [ -n "${AR}" ]; then
@@ -56,7 +61,13 @@ src_configure() {
 	if ! use sqlite; then
 		export TURN_NO_SQLITE=yes
 	fi
+
+	tc-export CC
+
+	export ARCHIVERCMD="$(tc-getAR) -r"
+	export PKGCONFIG="$(tc-getPKG_CONFIG)"
 	export DOCSDIR="/usr/share/doc/${PN}-${PV}"
+
 	econf $(use_with sqlite)
 }
 
diff --git a/net-im/coturn/files/coturn-4.5.2-respect-TMPDIR.patch b/net-im/coturn/files/coturn-4.5.2-respect-TMPDIR.patch
new file mode 100644
index 000000000000..036705afc1f2
--- /dev/null
+++ b/net-im/coturn/files/coturn-4.5.2-respect-TMPDIR.patch
@@ -0,0 +1,24 @@
+diff --git a/configure b/configure
+index caf11f5..003da8d 100755
+--- a/configure
++++ b/configure
+@@ -513,12 +513,13 @@ fi
+ # Temporary DIR location:
+ #########################
+ 
+-TMPDIR="."
+-
+-if [ -d /var/tmp ] ; then
+-  TMPDIR="/var/tmp"
+-elif [ -d /tmp ] ; then
+-  TMPDIR=/tmp
++TMPDIR=${TMPDIR:-.}
++if test x"${TMPDIR}" = "." ; then
++  if [ -d /var/tmp ] ; then
++    TMPDIR="/var/tmp"
++  elif [ -d /tmp ] ; then
++    TMPDIR=/tmp
++  fi
+ fi
+ 
+ ${ECHO_CMD} Use TMP dir ${TMPDIR}
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 98036b008b57..5666c09db695 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.17.deb 77105376 BLAKE2B b11d9d6798beb3dbb36892c9c948535fee453c258a91f48b04a686813fb82dc43f7872fcb4e68d17e6fb366a84825aa0e7b4f1ad45ab4efec403a05fb88c4f2a SHA512 b51d8e019b9c8c365aedbc7c77e53febec95d0c0f1b773e008d4d72e3880303b6f2d3381f363eedc8e08492ee2d2e8ef6d65353e852a8db9d708a70caabbb3cb
-EBUILD discord-bin-0.0.17.ebuild 2048 BLAKE2B 68683bc15f12d875161c75d382b8e4fe4547ad4b1b57566b28a56577b0dc118a92e908c355b55bbf1c5cfa8907a01150a1e9bf01f77a2573a8240db7de387ffb SHA512 7da8315c5467e4f4c83308fdc372843f61663445c9a1d9b62cedf36dec395e4bde2366f7bf5e9b7cd118a526c0ffbeccb0b97ea50632842b1764ac54e90398ce
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+DIST discord-0.0.18.tar.gz 77398558 BLAKE2B e25ad448dd9f89e460a4380cde850506298a443be2b70fb243b92ab6a139815fea36260b879ece044c5c607561fde6adf36a188c186c48c34052ec105b23d732 SHA512 a9c5de48186542fa4385c5cf4ffb54484dee008cde5230a9f8a0e71a84e1e7ce680e170aca2018ad2217618ed2d4a4882836a408a5d0a5cab054c0954c1b55be
+EBUILD discord-bin-0.0.18.ebuild 3217 BLAKE2B e81d1de7ed447d25fb0c8d4c4f97466cfa66af58ca1d2477edbd8c99c3c2e04247a4b7e7880357d8360507b8461a214022c408ed9883cc3dc30d5729ffc980d7 SHA512 d1a222d6abece6e3ee4af7af3735a136d5b3dcb7ed67ee01909f790e8746bcf366e4e04b6ed85d1bb6241fd263112a1b79a75d137f06daf097d9c319cf89d74d
+MISC metadata.xml 401 BLAKE2B bfadde60f5ced8839f9268c03217b5908e6f5cf4ecf3069cbca236b1d8f7c56a3a887655a4afebc74f18cc11584079620828ebe15b9e2ee6879730d90fc603e7 SHA512 77bc1c0db6255f39790b7a9a87dabcec7352142f341b9d7a41c7e073118a7613948e63f65dad9ec672f6ed5026188cdbf1b09cb4073ff67c49ddac3fff2301dd
diff --git a/net-im/discord-bin/discord-bin-0.0.17.ebuild b/net-im/discord-bin/discord-bin-0.0.17.ebuild
deleted file mode 100644
index 542c2a913ed1..000000000000
--- a/net-im/discord-bin/discord-bin-0.0.17.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-bin}"
-MY_BIN="${MY_PN^}"
-
-inherit desktop linux-info optfeature pax-utils unpacker
-
-DESCRIPTION="All-in-one voice and text chat for gamers"
-HOMEPAGE="https://discordapp.com"
-SRC_URI="https://dl.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
-S="${WORKDIR}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64"
-RESTRICT="mirror bindist"
-
-# libXScrnSaver is used through dlopen (bug #825370)
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	opt/discord/${MY_BIN}
-	opt/discord/chrome-sandbox
-	opt/discord/libffmpeg.so
-	opt/discord/libvk_swiftshader.so
-	opt/discord/libvulkan.so
-	opt/discord/libEGL.so
-	opt/discord/libGLESv2.so
-	opt/discord/libVkICD_mock_icd.so
-	opt/discord/swiftshader/libEGL.so
-	opt/discord/swiftshader/libGLESv2.so
-	opt/discord/swiftshader/libvk_swiftshader.so
-"
-
-CONFIG_CHECK="~USER_NS"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/share/discord/Discord:discord:" \
-		usr/share/${MY_PN}/${MY_PN}.desktop || die
-}
-
-src_install() {
-	doicon usr/share/${MY_PN}/${MY_PN}.png
-	domenu usr/share/${MY_PN}/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/share/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_BIN}
-	dosym -r /opt/${MY_PN}/${MY_BIN} /usr/bin/${MY_PN}
-
-	pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
-}
-
-pkg_postinst() {
-	optfeature "sound support" \
-		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
-	optfeature "system tray support" dev-libs/libappindicator
-}
diff --git a/net-im/discord-bin/discord-bin-0.0.18.ebuild b/net-im/discord-bin/discord-bin-0.0.18.ebuild
new file mode 100644
index 000000000000..e40d2077e427
--- /dev/null
+++ b/net-im/discord-bin/discord-bin-0.0.18.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/-bin}"
+MY_PV="${PV/-r*}"
+
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop linux-info optfeature unpacker xdg
+
+DESCRIPTION="All-in-one voice and text chat for gamers"
+HOMEPAGE="https://discordapp.com"
+SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# libXScrnSaver is used through dlopen (bug #825370)
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa[gbm(+)]
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+RESTRICT="bindist mirror strip test"
+
+DESTDIR="/opt/${MY_PN}"
+
+QA_PREBUILT="
+	${DESTDIR#/}/${MY_PN^}
+	${DESTDIR#/}/chrome-sandbox
+	${DESTDIR#/}/libffmpeg.so
+	${DESTDIR#/}/libvk_swiftshader.so
+	${DESTDIR#/}/libvulkan.so
+	${DESTDIR#/}/libEGL.so
+	${DESTDIR#/}/libGLESv2.so
+	${DESTDIR#/}/libVkICD_mock_icd.so
+	${DESTDIR#/}/swiftshader/libEGL.so
+	${DESTDIR#/}/swiftshader/libGLESv2.so
+	${DESTDIR#/}/swiftshader/libvk_swiftshader.so
+"
+
+CONFIG_CHECK="~USER_NS"
+
+S="${WORKDIR}/${MY_PN^}"
+
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	unpack ${MY_PN}-${MY_PV}.tar.gz
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+
+	default
+}
+
+src_prepare() {
+	default
+	# remove post-install script
+	rm postinst.sh || die "the removal of the unneeded post-install script failed"
+	# cleanup languages
+	pushd "locales/" || die "location change for language cleanup failed"
+	chromium_remove_language_paks
+	popd || die "location reset for language cleanup failed"
+	# fix .desktop exec location
+	sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" ${MY_PN}.desktop || die "fixing of exec location on .desktop failed"
+}
+
+src_install() {
+	doicon -s 256 ${MY_PN}.png
+
+	# install .desktop file
+	domenu ${MY_PN}.desktop
+
+	exeinto "${DESTDIR}"
+	doexe ${MY_PN^} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so
+
+	insinto "${DESTDIR}"
+	doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin
+	insopts -m0755
+	doins -r locales resources swiftshader
+
+	# Chrome-sandbox requires the setuid bit to be specifically set.
+	# see https://github.com/electron/electron/issues/17972
+	fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+	dosym "${DESTDIR}"/${MY_PN^} /usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "sound support" \
+		media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
+	optfeature "system tray support" dev-libs/libappindicator
+}
diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml
index 115e9d64a669..f485c452f77f 100644
--- a/net-im/discord-bin/metadata.xml
+++ b/net-im/discord-bin/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>ran.dall@icloud.com</email>
+		<name>Randall T. Vasquez</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index ee0df6e66aba..48638dbb7687 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,10 +1,15 @@
 AUX adjust-ejabberd.service.template-to-Gentoo.patch 1088 BLAKE2B 38405d4fa1119a8eca09fb22c1055182e7dfc5f4ce89440382694ba4da2bebf85934bde40204884e777343276448a8d7f256ae795db0c61e02ae82a8021116af SHA512 6c1417d40c17951c8187a4df72fbd755a4b408405a23aaed879e6cd7c01d4df0b7c52f3b8f64c2950f3a3d9996dfc4b29e77ebc5f035d5b13ab5c741c24038b6
 AUX ejabberd-19.08-ejabberdctl.patch 1238 BLAKE2B 04b4317661afb77525b3d09fc2b1499faeb8ba49f32971f5302e64849808d7da21530d351aa728790e00cef076b8d679d1ca2ebb39e72d999ba3e628637ba00f SHA512 34e3aaecae83b8c00998dec3c8f26389a00af4aebf59592dcc0fa0afb917fbe33b057e83b38d3f5c24dad9e877d0a02c6b14a6d3396a6549e98e372fc293e9be
+AUX ejabberd-22.05.initd 1065 BLAKE2B 7efbc0a228665243e9cb83ed36fb335cae81c2ccda08c3c433b59e1a29ca2567fe5c68c8ae8ed4c3c70196c3851cc5694c6ff919d2cc94b5596805c9edb809cf SHA512 2e7ee126e9335e70c16f8b53cae2601fc16d83c233b154fa565164a46099765a9720f3a9e54417ac642d5edf5f2c0e05ec75ceb4d4ed196afd962373a44a4b70
+AUX ejabberd-22.05.logrotate 209 BLAKE2B f4da9d1ce350f192804e89a6dfea49ac72a432d8657f6f3e49b68e187d3ffe35818ded52859fb333078e5752100b0195bfc52f45e29fdad97c2dff1bc9f7d77d SHA512 7fee49e82d34fc04028fcf0dc39af7e416be05d9fc3e19e520fa139841657f91e6f8ef37676daad1b31334f631f875cb1619046f3d57f509443a92a8f546de86
 AUX ejabberd.confd 161 BLAKE2B f08ab6310c950d3d248fbaf5e6e35bca2e31289ae476b2379a779ebc38926e091cf04883cce94cedff1e4dcf6ec3224079e7828502b97451a8a96fd278a4d102 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb
 AUX ejabberd.initd 1071 BLAKE2B 226a0d4593df3504e30fbf40e9daffed6d903cf797b4ce0ce19b23ed29059d52a4e43d9f94354f6a1724966413cff7dcf0c13a4ede7dd2fff0da405c59bf8f39 SHA512 64839da9c369bf570389e95b0b1b67e1c4b339927c2f1fd4ca113a18410deb3fbe1ecdd41bb46df3d3b52b38149218dfe26b798ff43398151f08799566515352
 AUX ejabberd.logrotate 203 BLAKE2B f523a30cf927d403523f618a6ab28fe4281a95ce6a1e639b4075b0ce98a8a985deec5446655c41288258a286a1ceb46cb64422be554d1de754fd97fc86e67555 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2
 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449
 DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
 DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B 6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093 SHA512 81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1
+DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
+DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
 EBUILD ejabberd-21.12-r1.ebuild 7369 BLAKE2B 66110d244c7f54eab73be0a34b02be5e3cd6f754e5a19fbe4d4e784973cc3174443f4f390c191f5e42dde24601f553a827def643c00de82e88db56d05f8bc294 SHA512 cdcb08aed7802b5ab13bba4c10671552c6b35290ffcbbd9ba1365d748a1023cdeef1f20c9c8d8e703b5e8042d25f31fedbd20ad8e0d6b772aa382eb36caa01fe
-MISC metadata.xml 1446 BLAKE2B 0e3200841024d54c2a47184239ba3266ebd3cecb22e51d16d0d98c2e07ec592b9d87c27ae0d9a01f9260aa6132e565ecadf8109948e5a317af8937f321338c2c SHA512 05d59e6213d8408197706db55f3ff35bdd93717872e85a58f34dd26d4edcef1704d195b87a62b215862f53d4bf7cdf98081267e96efb3b5b73b20b0235a0be32
+EBUILD ejabberd-22.05-r1.ebuild 7585 BLAKE2B 9eff1bd3156b201d3f23baf211af11c4d2165f9cc8c270e242bf780236b3c63b4ea206395edf3fd547dafd0717d93f0c40e6d58f81cfc75fe0f4b3cc38a5dc66 SHA512 a651753d279b56fd7f113d71237693692d65be3ec61f4cf2351aaeec766549e3649a6d6ed38fdf1e7b80880dda24a3ef2751c353d79e9abb0c0842963d25804a
+MISC metadata.xml 1484 BLAKE2B 74f0ec404b37dfe72d8751dd8bc8f0ba0b56f334939a5311af70df4616f19e536209b9be7361b35c8e5d316fbce623afdbf7e3ce53a139eb0d2e0d895275ae3c SHA512 793584e1e44c3a651b15eed84a91a801cd809392ccf7623f1a1b222e65641f8dca18515fb90e42e4a51178f4686d3c61778e14834be23feb23b269b4f07c91fb
diff --git a/net-im/ejabberd/ejabberd-22.05-r1.ebuild b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
new file mode 100644
index 000000000000..eae32ae4c02d
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam rebar systemd verify-sig
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="
+	https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	verify-sig? ( https://github.com/processone/${PN}/releases/download/${PV}/${P}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
+
+LICENSE="GPL-2"
+SLOT="0"
+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
+	roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:		>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND="
+	>=dev-lang/erlang-19.3[odbc?,ssl]
+	>=dev-erlang/cache_tab-1.0.30
+	>=dev-erlang/eimp-1.0.22
+	>=dev-erlang/fast_tls-1.1.15
+	>=dev-erlang/fast_xml-1.1.49
+	>=dev-erlang/fast_yaml-1.0.33
+	>=dev-erlang/yconf-1.0.13
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/jose-1.11.2
+	>=dev-erlang/lager-3.9.1
+	>=dev-erlang/p1_oauth2-0.6.11
+	>=dev-erlang/p1_utils-1.0.25
+	>=dev-erlang/stringprep-1.0.28
+	>=dev-erlang/xmpp-1.5.6
+	>=dev-erlang/pkix-1.0.9
+	>=dev-erlang/mqtree-1.0.15
+	>=dev-erlang/idna-6.0.0-r1
+	>=dev-erlang/p1_acme-1.0.19
+	>=dev-erlang/base64url-1.0.1
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.12 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.18 )
+	redis? ( >=dev-erlang/eredis-1.2.0 )
+	sip? ( >=dev-erlang/esip-1.0.45 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
+	stun? ( >=dev-erlang/stun-1.2.2 )
+	zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+	${DEPEND}
+	>=acct-user/ejabberd-1
+	captcha? ( media-gfx/imagemagick[truetype,png] )
+	selinux? ( sec-policy/selinux-jabber )
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+	"${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	rebar_remove_deps
+
+	# Set paths to ejabberd lib directory consistently to point always to directory
+	# suffixed with version.
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+
+	# Get epam-wrapper from 'files' directory and correct path to lib directory in
+	# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+	# file exists there already.
+	local epam_wrapper_src="${FILESDIR}/epam-wrapper"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\)'{{libdir}}'\.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-user=${PN} \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable sip) \
+		$(use_enable stun) \
+		$(use_enable zlib)
+
+	# more options to support
+	# --enable-elixir requires https://github.com/elixir-lang/elixir
+}
+
+src_compile() {
+	# Note that we also add ejabberdctl.example, which will be used by
+	# ejabberd's build system to create /usr/sbin/ejabberdctl, as
+	# target. Otherwise, ejabberdctl.example is due to be created by the
+	# 'install' target (as per upstream's Makefile.in). However when
+	# invoke the 'install' target (in src_install below), DESTDIR is
+	# set, which causes DESTDIR to scope into the ejabberdctl.example
+	# generation.
+	emake REBAR='rebar -v' src ejabberdctl.example
+}
+
+src_install() {
+	default
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}"
+
+	keepdir /var/{lib,log}/ejabberd
+}
+
+pkg_preinst() {
+	if use pam; then
+		einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam ejabberd || die
+	fi
+}
+
+pkg_postinst() {
+	local migrate_to_ejabberd_user=false
+
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 21.04-r1; then
+				migrate_to_ejabberd_user=true
+				break
+			fi
+		done
+	fi
+
+	# Sarting with >=21.04-r1, the ejabberd configuration is now in
+	# /etc/ejabberd and no longer in /etc/jabber. See if we need to
+	# migrate the configuration. Furthermore, ejabberd no longer runs
+	# under the, shared via net-im/jabber-base, 'jabber' use, but under
+	# its own user. This increase isolation and hence robustness and
+	# security.
+	if $migrate_to_ejabberd_user; then
+		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
+		ewarn "(just as upstream) and *not* /etc/jabber."
+		ewarn "The files from /etc/jabber will now be copied to /etc/ejabberd."
+		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
+		ewarn "Please check your configuration, and finish the migration by stopping ejabberd"
+		ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd."
+
+		local -A dirs_to_migrate=(
+			[/etc/jabber]=/etc/ejabberd
+			[/var/spool/jabber]=/var/lib/ejabberd
+		)
+
+		for src_dir in "${!dirs_to_migrate[@]}"; do
+			local eroot_src_dir="${EROOT}${src_dir}"
+			local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}"
+
+			cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
+
+			if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
+				rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
+			fi
+			if ! use prefix; then
+				chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die
+			fi
+		done
+	fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-22.05.initd b/net-im/ejabberd/files/ejabberd-22.05.initd
new file mode 100644
index 000000000000..57f9cd5aa335
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-22.05.initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+depend() {
+	use dns
+	need epmd net
+	provide jabber-server
+}
+
+start() {
+	if ejabberdctl status >/dev/null 2>&1; then
+		ewarn "ejabberd is already started (manually?)."
+		return 0
+	fi
+	ebegin "Starting ejabberd"
+	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ejabberd configuration"
+	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config
+	eend $?
+}
+
+stop() {
+	ejabberdctl status >/dev/null 2>&1
+	if test $? = 3; then
+		ewarn "ejabberd is already stopped (manually?)."
+		return 0
+	fi
+	ebegin "Stopping ejabberd"
+	if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
+		cnt=0
+		sleep 1
+		while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
+			echo .
+			cnt=`expr $cnt + 1`
+			if [ $cnt -ge 60 ] ; then
+				eend 1
+				break
+			fi
+			sleep 1
+		done
+		eend 0
+	else
+		eend 1
+		einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on."
+	fi
+	eend 0
+}
diff --git a/net-im/ejabberd/files/ejabberd-22.05.logrotate b/net-im/ejabberd/files/ejabberd-22.05.logrotate
new file mode 100644
index 000000000000..fd51673fc428
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-22.05.logrotate
@@ -0,0 +1,13 @@
+/var/log/ejabberd/*.log {
+	su ejabberd ejabberd
+	weekly
+	rotate 4
+	missingok
+	nocreate
+	sharedscripts
+	notifempty
+	compress
+	postrotate
+		/usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true
+	endscript
+}
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index df085f63589b..f894e535971b 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -26,6 +26,7 @@
 		<!-- TODO Add later: flag name="tools">Build development tools</flag -->
 	</use>
 	<upstream>
+		<doc>https://docs.ejabberd.im</doc>
 		<remote-id type="github">processone/ejabberd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index dd8e16bf240d..6210191ab823 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.10.11_amd64.deb 95957128 BLAKE2B 9ca2f74b3d08847f347df2b6c7e4e2cc34e38d7a8ecf4a4f9e1f260330821a176455644ab944445a2d267608fd9d1e6eec7b121aaf8f88a2ebf67ab4a1425f03 SHA512 553b681b1b4a857ed38e49d56113e5af0d51f37609f9fcd4c9251c3d6ffcfd9e262a433d39f017b0421849af10274d7c2ec93b11f2448110a1bd23d3fbc286fb
-EBUILD element-desktop-bin-1.10.11.ebuild 1820 BLAKE2B 13fa4f92e62134412d6d1b5d29094a3cc60f3b5f2706b3f03ac6b6b64a40a0c6a4b0cce746e88db9893350b700ec262e93bdce708c5d77eb5ec298bcf0f26a1a SHA512 21efffbc1e6ad228ac3ce6693609ede28538ad923ae283b24df82135aa6a2685a8440b6971570f71e5e8193c083dbe348429513f5bcdfc65cee66769fceae8e1
+DIST element-desktop_1.10.15_amd64.deb 77384226 BLAKE2B 3681293b6838c5ee20024784d9348d8d213316b260e883bd3de2655a675702d41179498711203dd04f0c0bbabc1e83422d4294cc511f8ae59443f8fbdf1043e6 SHA512 57a81d8d89c850a0103414c1605cec04cbdebab7a7d9ad58363f56f3242a46acce2ce88ab324cba3c76273423e6247e49acb2e4d81e656e32a1b059f66bac6e6
+EBUILD element-desktop-bin-1.10.15.ebuild 1820 BLAKE2B 13fa4f92e62134412d6d1b5d29094a3cc60f3b5f2706b3f03ac6b6b64a40a0c6a4b0cce746e88db9893350b700ec262e93bdce708c5d77eb5ec298bcf0f26a1a SHA512 21efffbc1e6ad228ac3ce6693609ede28538ad923ae283b24df82135aa6a2685a8440b6971570f71e5e8193c083dbe348429513f5bcdfc65cee66769fceae8e1
 MISC metadata.xml 248 BLAKE2B 88afa54e3134b10ecc3f3f7e19fb6b209f3908a517788151cfe6c6ced2b21d368f19a6de982c28575b14a8769069c02b70f639ab73618a9b949c0e9eaf4f17a0 SHA512 3ec152d35cfd434c4ba49a51afd5f2eeaed478983f49f5e61e0713af7da791faee69713a3740182302d8129fb538e8296d0b40152e23e7d5e6d1a996322e7122
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.10.11.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild
index 82b460c20465..82b460c20465 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.10.11.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 21b8d19ede8b..e78da125830b 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,3 @@
 DIST empathy-3.12.14.tar.xz 5017776 BLAKE2B 15f4c71a4f40988afd51d0665ee24164fb7e1d14994e577c23fa29a995503e78f8b784d26edd90503f9825c64dc814f07860aa6792eec6948c566dc3ff669dad SHA512 f467277278a9e8d330e4ab656b3edb2acac6efec211baa146a5ea0a6d0da299e68cdb83ceb1a27a1aa4744c2ce1a441fa287001003c523036ada517029a40123
-EBUILD empathy-3.12.14.ebuild 2996 BLAKE2B 388357b6b9d390e80507abfaac1734ad78cad4ea68e78f86a8f6c703f8b67d5c338b283754eeb9f7e5914007739f6ffdf6d2ccee08da4e04e180fe9315496362 SHA512 b131096515772e253d2f2c2e44bb57bb7c0d251901b6a7f494d359e04c4fd05f5d842ca6effb0a0883e1536376319afc4881cd2893c054ced33cf2f86255a13c
+EBUILD empathy-3.12.14.ebuild 2997 BLAKE2B 8e98ac36a1cdf9949117a4dc6423ba6344074c98d4402ccdbcd4f23b3f532fc40bb197e01dc55edeeb031d65879602d14e97cea6369c17ee1b589e2b4233a467 SHA512 e9e2340e6a729281696c6dfb97be08507efd004df54398cb1db25c0f9faba3e614a86fc0d7aa664f5fda8065cf1f67275366aa23bcc81666c7a2a7076d6e7e07
 MISC metadata.xml 947 BLAKE2B f8baadcc31b2a0a3f849f31f0b4677368be9a3962aae93bb3527f9eb9d082b9b3c371c3c330048b4ccb0c6363b98001e0a0cfff333093cade5b5209cb57c7fb6 SHA512 39485bd2525e2c71e141e59ea9706697316622c5ad9f47940e6e5ff37045cff3d6d6be8807af7e5191390ab2d63805180d4e48b03ef66433a993cc5f1ded9c06
diff --git a/net-im/empathy/empathy-3.12.14.ebuild b/net-im/empathy/empathy-3.12.14.ebuild
index 5d3a4bc0e9b0..c8262cd9b808 100644
--- a/net-im/empathy/empathy-3.12.14.ebuild
+++ b/net-im/empathy/empathy-3.12.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 2acda117e831..852fd53db61c 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -3,6 +3,8 @@ AUX errd.confd 167 BLAKE2B b55dc0ba17dfc50d6958ee7a547f1db1dfcedec6d117507b5a7b5
 AUX errd.initd.2 512 BLAKE2B 48eed9e9e2bd5c1f23c63bbae10750c8e638c4f6ce286dc7e56799a45f986dbdcd359ee9f6c06e9bc33bd249c41ea08f0e6692f47b17229b9e7eb51e52d0f6e5 SHA512 caa47f7252c3ff04c47ed6c3174e4121dd600d1f4601f8a08275d1bc072e25f3b6125ba73d6c9c90af67dcc72da3ffbe875c83f756d75208af916a5d7ef672fb
 DIST err-6.1.7.tar.gz 1359383 BLAKE2B 400bbf4a4180f74993a4414dc55f07a69b34b04277fecd073bd860df9dcd5da4873949df766c0c2f6b7a43b4e87153d0aa77b0abaf95bf9702d76c3c7b290abe SHA512 cd0dadc5ff380c71631bae7711bdba7345046fbe14e369c8efa8eed98752b9ea03f6e4fa3171df257a9d76686c610e28fac5f39f7e8e107348a5746e4354694b
 DIST err-6.1.8.tar.gz 1609310 BLAKE2B e3682bfccd548c92160322287a17e26448322abd3956d464b393f333c0cc521d6d5183dab799d280603995a4508a2eb300fefb9c6159da6ed1c550247fa375d9 SHA512 5413f667ee4e121134b791f0dc8fd709ecbd9093a237b9637d282f41458c40076615ffc9167cfa95f297ae416c38b16ded8ae97aece55a81d88dc46b324ec851
+DIST err-6.1.9.tar.gz 1554146 BLAKE2B 62a715d57c213b8d68c40afad92c14d26ff23fdce1df6b489be23817d33d8bc01c7c400ca7360546abc880b4a7e6205f92a3787cabfce3e14500ef8918a4b010 SHA512 cc8f7a00bc9bd7680d978b4c2e6c9ac78f32e0a99796cc9933802206b2c2998caf060d474aca374d8102923bf8eb64f69a01846c5761b13a8624641796893c9b
 EBUILD err-6.1.7.ebuild 2301 BLAKE2B db443e087f79581fe8b2923c2ade30fbc2d5f895972407388aece1e8bfa49c8c6c5acd69c45a60286ea3a87c3be5b98fd18bebd9a1a67ac379ec30d6b6e3357a SHA512 a26edde9eb6479a18a216a3538551d1bd5a0c6f69600f55e3abb9e7029b5359ff8c29c3efdeff96119d12e8d97a587fb12b812348969c46aadf87d59da7e91ef
 EBUILD err-6.1.8-r1.ebuild 2380 BLAKE2B 63ff506e09bdfa17e46c0d4f475a67f23829d4034db8db4a0fa32dc1b6c8fe9d71afd345e4a09bd887d5d3fbdb0762192205c339baf2849a46b3e1a45fc727fb SHA512 73943908459006ad55d4f3d468be526dbcd2953475fc5e099f7378e198467cd588ffbf18c065837f4b20240b6aa2e63f34801f8f593452702eb79883200fcb02
+EBUILD err-6.1.9.ebuild 2342 BLAKE2B 47a3c0ed5f4f055d61035c1464d47d17114650bd04590722c35f6afe1b4bb126878d1a875dc093f1d3da2cea761256881cd04d85c8170827de0c9381ac7d21d8 SHA512 ed8a8b3fbb9db6b1ed09abed36c8be5843040081283368ffd0f0324bf0e6a852da73ac1944983a5d3de7da3b5227b5ef4edc00d4a75b2b1a03e7760a7fe2fce4
 MISC metadata.xml 624 BLAKE2B 82482586c0927ad0e4857a951aea4dba50adf18250c20a6794dc4f2f35c2b39026cd326be5bcb75db42dbd847db89c44d71956d474e89828f529a58d662a07a0 SHA512 c0159fbb1e2c0d8bea6e3b1c39bb126e005152a4c2ae7d8d738942ee21eafa8a6a2f22a819ef9668e7436dffccd346d0558ed3f2720ff7ad54ba9e03688b6ad0
diff --git a/net-im/err/err-6.1.9.ebuild b/net-im/err/err-6.1.9.ebuild
new file mode 100644
index 000000000000..850051e19231
--- /dev/null
+++ b/net-im/err/err-6.1.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+MY_PN="errbot"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
+HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~riscv"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +xmpp"
+
+DEPEND="
+	acct-group/err
+	acct-user/err"
+RDEPEND="${DEPEND}
+	dev-python/ansi[${PYTHON_USEDEP}]
+	dev-python/bottle[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/daemonize[${PYTHON_USEDEP}]
+	dev-python/deepmerge[${PYTHON_USEDEP}]
+	dev-python/dulwich[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webtest[${PYTHON_USEDEP}]
+	irc? (
+		dev-python/irc[${PYTHON_USEDEP}]
+	)
+	xmpp? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/slixmpp[${PYTHON_USEDEP}]
+	)"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/pygments-markdown-lexer/d' setup.py || die
+
+	# NameError: name 'slack' is not defined
+	rm tests/backend_tests/slack_test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		tests/commands_test.py::test_plugin_cycle
+		tests/commands_test.py::test_broken_plugin
+		tests/commands_test.py::test_backup
+		tests/plugin_management_test.py::test_check_dependencies_requi
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}"/errd.initd.2 errd
+	newconfd "${FILESDIR}"/errd.confd errd
+
+	dodir /etc/${PN}
+	keepdir /var/lib/${PN}
+	keepdir /var/log/${PN}
+	fowners -R err:err /var/lib/${PN}
+	fowners -R err:err /var/log/${PN}
+
+	insinto /etc/${PN}
+	newins errbot/config-template.py config.py
+}
+
+pkg_postinst() {
+	elog "For more backends (Slack, Telegram) support, use pip install \"errbot[slack]\""
+}
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index a855fa8a887c..45f21cf0ddb9 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,5 +1,12 @@
 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.3-r1.ebuild 2513 BLAKE2B e2536b23b31c4609654c26ebf38cda6bfeff98eb032a4bf88809c406dda4575004416d9d1ec2ac1ad5efa110f3a71c9132bde35c5354c16aa616eebac35e6333 SHA512 aef65122835adf7fc44c5d22c01416e9c990aaf3331889d5be337f04089b0e883cefe113a5971e12a1bba9b396ba6ab1d667dbaccef11e99a6846258021b2b30
-EBUILD gajim-1.3.3_p2.ebuild 2633 BLAKE2B 95067aed248fb1bfe978f3268d8dd2f4905652428bed3c0069821e17aad7c6709bfd9a527b7e6a6f6a8f69d16f0ec96b3908656510167fcd7a2ca19130ce2a0d SHA512 eb8d9f82336521db25263eb88a537f7de16487161b771a0ebdc7717cb3c49866ee99389fcc017d8f2be3d0acd9daad120daee2757ea3c5267004b92ef66a0dd2
+DIST gajim-1.4.0.tar.gz 8932710 BLAKE2B 66924bf2e0f39c74e0ce45bfb24c6bd41c547f170c149611dc08e45db1f665f1159be6586dde1a64f1037de029dc2d83c1146545c36645dd67b63509ce156043 SHA512 9fb2b967325d04d7cfa8cb97d0dcebdd5cfd8b8a0a4f8928e7d8c547d90567b7fb0d84d48cdd151b5e38ce72f65de2679c8cc1543ff3ed25d792e6de070042a0
+DIST gajim-1.4.1.tar.gz 7321296 BLAKE2B 2b170800a1ee6304831e1ec7c006e2133c577dd6b34da4e89ab35a6032677c7db61939834a5b3ad73026b7417703321dc43bb63aa2d0c03676cddb728c7294e6 SHA512 614b96d1e64e8601992d608de279abdd38fcfa637094eeffef6adab725446b8955d07725a3d7577d71be4b883943e3341f84540a86e9a61c32ec51ae8999cfcc
+DIST gajim-1.4.2.tar.gz 7315938 BLAKE2B 2315be3d8efa98bf45cc7479a38a83f6d297bc4af9550ce70ccbb9f4fce681cdec57658f2c5c12c4b3b1b97d7623b1da32b675be971e186623957a267010d85c SHA512 d3402b39c9253334523538b86c3e2d6f272f576824048b344a235a12982c53280c3638b0b299c536ed38bcb8648388ba5bea8056c722cc8a5dc5d98012f6d57c
+EBUILD gajim-1.3.3-r2.ebuild 2559 BLAKE2B dc00ce8f2c8fb60465fb07d5da2cf6c724c4c4f16df35f25f2842684c43ff2f8e3805eaab3e712420fee417037f891c4c4a3c4223299280d12578de36b125c7e SHA512 da8db083680225b94bf7cc9667d903ab2bc910e00d60519898d7ff26d06e3eaff72e63460e48642af8ac76decb7c5054da2868496bfc2ecaba2fc5b9810f3eca
+EBUILD gajim-1.3.3_p2-r1.ebuild 2678 BLAKE2B aaf2c3f3afcfab309dd76372e10a964db0b51faabd2f64d433eec3c7b76fd3726fe24d62a92cda93090454d066117bff31e49881ad1db0e439403b4ea81e62da SHA512 4d3cdbcb20aa2bb5f999d691e0a78a11482ca9556ac98a44320db4a436f43222c161684fdf9fab6b8816363f41fe5cbb1375d621809c54cb6e4b63b80cfab4c1
+EBUILD gajim-1.4.0-r1.ebuild 2655 BLAKE2B dae2f3b7556ae5dfe003fd32fe3a4a4e70253306620b267e0b19e2332f778efa46f3cc228097a43b5002d83a7dc5925b44a1820e032d952247ef9eaf8e3b4133 SHA512 a4bc6fb7557ae61d93e3375859b407da1a1f1656f9feacda54fd572e0cf8e7f56d774b393dc6ea11177487c438d025a9e0a5b4456dac34f17544cdbaa0764897
+EBUILD gajim-1.4.0.ebuild 2629 BLAKE2B 4accd1c410318eef440b86058c1fecfc1a1d9dba700ff5be6a2b51264253b90b5a593132571f02b2c498f1738a4714610abbf4a60dbbd94cdbb532ec6bbd20d8 SHA512 3a790e4dafdad6a51753acf4ea3c28b617032e4cd7ef8541f56566a02440759eb9588a3eaa78fa0114ca40a725ca0675e18fe1c77349628fa1b661a0e3f9a56d
+EBUILD gajim-1.4.1.ebuild 2655 BLAKE2B dae2f3b7556ae5dfe003fd32fe3a4a4e70253306620b267e0b19e2332f778efa46f3cc228097a43b5002d83a7dc5925b44a1820e032d952247ef9eaf8e3b4133 SHA512 a4bc6fb7557ae61d93e3375859b407da1a1f1656f9feacda54fd572e0cf8e7f56d774b393dc6ea11177487c438d025a9e0a5b4456dac34f17544cdbaa0764897
+EBUILD gajim-1.4.2.ebuild 2655 BLAKE2B dae2f3b7556ae5dfe003fd32fe3a4a4e70253306620b267e0b19e2332f778efa46f3cc228097a43b5002d83a7dc5925b44a1820e032d952247ef9eaf8e3b4133 SHA512 a4bc6fb7557ae61d93e3375859b407da1a1f1656f9feacda54fd572e0cf8e7f56d774b393dc6ea11177487c438d025a9e0a5b4456dac34f17544cdbaa0764897
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.3.3-r1.ebuild b/net-im/gajim/gajim-1.3.3-r2.ebuild
index d1a222c2bc02..726c404f14f1 100644
--- a/net-im/gajim/gajim-1.3.3-r1.ebuild
+++ b/net-im/gajim/gajim-1.3.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite,xml"
 DISTUTILS_SINGLE_IMPL=1
 
@@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		<dev-python/python-nbxmpp-3[${PYTHON_USEDEP}]
 		>=dev-python/python-nbxmpp-2.0.4[${PYTHON_USEDEP}]
 		x11-libs/libXScrnSaver
 		app-crypt/libsecret[crypt,introspection]
diff --git a/net-im/gajim/gajim-1.3.3_p2.ebuild b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
index 8253e660e160..9228c4d00e2f 100644
--- a/net-im/gajim/gajim-1.3.3_p2.ebuild
+++ b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite,xml"
 DISTUTILS_SINGLE_IMPL=1
 
@@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		<dev-python/python-nbxmpp-3[${PYTHON_USEDEP}]
 		>=dev-python/python-nbxmpp-2.0.4[${PYTHON_USEDEP}]
 		x11-libs/libXScrnSaver
 		app-crypt/libsecret[crypt,introspection]
diff --git a/net-im/gajim/gajim-1.4.0-r1.ebuild b/net-im/gajim/gajim-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..60900668dd5d
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.0-r1.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_{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]
+	x11-libs/gtksourceview:4"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	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-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/python-nbxmpp-4.0.0[${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 are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-im/gajim/gajim-1.4.0.ebuild b/net-im/gajim/gajim-1.4.0.ebuild
new file mode 100644
index 000000000000..dbb2ac846a85
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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
+	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-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/python-nbxmpp-4.0.0[${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 are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-im/gajim/gajim-1.4.1.ebuild b/net-im/gajim/gajim-1.4.1.ebuild
new file mode 100644
index 000000000000..60900668dd5d
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.1.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_{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]
+	x11-libs/gtksourceview:4"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	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-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/python-nbxmpp-4.0.0[${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 are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-im/gajim/gajim-1.4.2.ebuild b/net-im/gajim/gajim-1.4.2.ebuild
new file mode 100644
index 000000000000..60900668dd5d
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.2.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_{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]
+	x11-libs/gtksourceview:4"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	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-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/python-nbxmpp-4.0.0[${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 are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
deleted file mode 100644
index 65b552bf975b..000000000000
--- a/net-im/jabber-base/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD jabber-base-0.01-r3.ebuild 1244 BLAKE2B d2395b817577ccb314efe49ae173d3c55b7388e3e1f450c334023f0f426e9510614d166b9f536fa1d42c786924871b228ac6fc7f704664199e3ce9c8809679b0 SHA512 66f7ef9ccfeab3019d2d28929b577dc57ecb583aeb20ba1c8918b328664f74cf770abb7413ad96f84cb5a656d1b8740db3626c5ad2118fe3a89f67d3edcdc38e
-MISC metadata.xml 433 BLAKE2B a4c354f8541c76d06b80b0bb5f5369ddd5febaa60e3e2f14768827ab8ef1bc1276886d585f28c741c56e61e97c167c2f46ba752cc8953eb4fa56ecd2e0f9aa0a SHA512 47904b9cc57064bd3db54de9d49666884e11b83a52a36429a92f16399d65a061ff7ec4cf33eb715c42c57e3ccd266dd9c7de3c268312e7980c82f148aff12249
diff --git a/net-im/jabber-base/jabber-base-0.01-r3.ebuild b/net-im/jabber-base/jabber-base-0.01-r3.ebuild
deleted file mode 100644
index 858d3ba2224a..000000000000
--- a/net-im/jabber-base/jabber-base-0.01-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Base layout package for various jabber services"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	acct-group/jabber
-	acct-user/jabber
-"
-
-# This package provides the base layout for all jabber related services.
-# Each service should use the user 'jabber' and the group 'jabber.
-#
-# The base layout contains of the following directories:
-# '/etc/jabber/'	: All main configuration, by jabber services used, is stored here.
-# '(/var)/run/jabber'	: All pid files, used by jabber services, are stored here.
-#			: Please note, that this directory should be
-#			: created dynamically by each jabber service during startup.
-# '/var/log/jabber/'	: All log files, used by jabber services, are stored here.
-# '/var/spool/jabber'	: All (flat) database files, used by jabber services, are stored here.
-
-src_install() {
-	local paths=(
-		"/etc/jabber"
-		"/var/log/jabber"
-		"/var/spool/jabber"
-	)
-
-	for path in ${paths[@]}; do
-		keepdir "${path}"
-		fowners "jabber:jabber" "${path}"
-		fperms 770 "${path}"
-	done
-}
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
deleted file mode 100644
index 3ee268c59de6..000000000000
--- a/net-im/jabber-base/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This package creates the base layout,
-		which is used by several jabber services.
-		See ebuild for more information.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 772075eceb31..e365a76e9afb 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,4 +1,4 @@
-DIST mattermost-desktop-5.0.4-linux-ia32.tar.gz 86957532 BLAKE2B d52f2cbabdecaac15ce14fcd3a0d6092eb571fa83fbd529aae664a492c5d1def6dd94b2c6dcac57984ecfcb4809c25cb08396836cc05d31f99e9dd080280a0ec SHA512 0dc778c0db232784108a5c980f67b8306602cd15005a18dce1571e6de6a7a774f8d51c7feb76f94eaae29d62ef6f046e637e37d787530696a4223ed31067d37e
-DIST mattermost-desktop-5.0.4-linux-x64.tar.gz 87315900 BLAKE2B 9d4bd3297a0d6c0eb016902d731608d12e9187e88c3c72fd57a2b47735438ff3a8369553adb7412a0339d729f177649ae0459790257307f6458ca99322ac8d02 SHA512 b95b9559950f7e7333e522fbbaafeae1e0f5c55cfa2acfe569b9987d75b8c4ce85a34997e4448a9e007522070f47a09a53d971ffe567bfbdde2f95f747ace622
-EBUILD mattermost-desktop-bin-5.0.4.ebuild 1853 BLAKE2B bfff05a92b98544df2a2f60d01b804e52a0b83942d9b85e212f5a8a3bf5f65647c9a0d93ef286d2880ada34a8d8367bf81b98f90525de9ddc2e666b283fbd24e SHA512 9377b023d65d9d35fd9725b435c16625897cecac36af84634e2254d7309cb03cf4fe6d3bcd8ab3f0d7f52a974efd98aa6a7b15d82705b1af11f1a51e119609b0
+DIST mattermost-desktop-5.1.0-linux-ia32.tar.gz 102235544 BLAKE2B f7427aa195ec3be706243ce1f1aeb2cbad594905f86b6493796de2ebb7fa161e06b910af9a285583018bad9709e6ce16ee5bc168f2d98f26534af3de3b753b41 SHA512 a94be8235c5c1927c89615297c7e82ff2d1bc61e3600133a5af262bc25b6b6a7c50b516d58c7a387f672510736572aacc0bd9a657e5d25351eea4df2dc8958fc
+DIST mattermost-desktop-5.1.0-linux-x64.tar.gz 102764810 BLAKE2B 7e555d70aa15b308cea637b7ad12a11a16a93cb80693157afbfcf782efff03458e880eabbbd52292e476159669a6ebd809197ba4b2f6154093515cb7f51b7e6e SHA512 5fb3abaf93cdb4e76ba29e56f1da800d665171ade8aa475ccc927f667d513db34db37ee2e1326e59584a38260d32e6c0420ac36822e6b22564d76391a44c7e18
+EBUILD mattermost-desktop-bin-5.1.0.ebuild 1847 BLAKE2B c473c67dc9652f89e2d9583dcc480e5f8db7844957ab25bbaba52bb2b0671f5d73d6f59766d89b714638b2fc17c176babbaf8207679724d9f353904da7084def SHA512 84df1f9c87a02d95dbcab5af4fbc758a4e6699503fc68b423e4e99c72dadc165a4aee376dfdd3d15ce31faa30915dd52401ceb0fb7a6d99586df289076a0b1e4
 MISC metadata.xml 486 BLAKE2B b4d9156a6a958b7ce307e104f7491e99534b1e33328c5899db2b7583ecc7d5cca411cabb8e21085a4138a78dd88056032b5412ea9a19fe7445a72b8e4faf6692 SHA512 369f7df04ae2c994c25fcb082a16b0dff78c255ad859c88f2e15b0b3463a25b2241518cf1e2259a8da3fd05c468ac96201a2421285f5b3fc1d499f2b9c9cb67f
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.4.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.0.ebuild
index ccf40a4e5d93..ca1c0b052808 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.4.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.0.ebuild
@@ -8,7 +8,7 @@ MY_PN="${PN%-*}"
 inherit desktop
 
 DESCRIPTION="Mattermost Desktop application"
-HOMEPAGE="https://about.mattermost.com/"
+HOMEPAGE="https://mattermost.com/"
 
 SRC_URI="
 	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index 1deadad45af1..7686aa655fec 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,3 +1,3 @@
 DIST neochat-1.2.0.tar.xz 244064 BLAKE2B dcf728036269e3aefc524c1fea56f07f76c4132d810e2edb2c199ff8df7fd77ff8d90a5fbd6d13d59dae8894ccc312cf38107a3b5ba5a08fd80b31a0f8a53a0c SHA512 50837f44b899999753208363283c20a6b858bdaf26bba9e9762a04c2e65534014df88a9404ce7659a87d5e896e08a5e5f4ac23e3922ebe4cb6c7715b07058af7
-EBUILD neochat-1.2.0.ebuild 1223 BLAKE2B e47931d4fae6c76714030e9d9cbc868359e1c862944c7c6818749ad9351ebc304c69d7608c087a8375b717514899fa2fbf40fda82ca00ecace0d8a46fb40260d SHA512 14f2f41b9ccde648165d71322d6bb533fee2db0ebc079fee942d066dfcc0ce8b6cd61557bae43251765f14aed5e072952e2414647c8b82373c81e05b086bac38
+EBUILD neochat-1.2.0.ebuild 1230 BLAKE2B 08c43f26e1278cd5c5d251a4f40d76fb37cfa50ac6144d7c8204c719531471397de566071f6380a063acb73f026a985cdbded53910ad54950ef69dd38e38d423 SHA512 5ae77134fd6b30b10a35d2f826c58cb478b987c199530a2ff500a02871c5919508fa0ce288779c1d163d9b2f6f5f3ef23eedd336a09e8ea59cf59533b818491c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-im/neochat/neochat-1.2.0.ebuild b/net-im/neochat/neochat-1.2.0.ebuild
index 79151e390d1f..357579f37efd 100644
--- a/net-im/neochat/neochat-1.2.0.ebuild
+++ b/net-im/neochat/neochat-1.2.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=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/neochat/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index c0dbbacdd704..180a65d9a702 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,7 +1,9 @@
 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.10.tar.bz2 8229328 BLAKE2B 9f004abda0f00b315e763e8b17e4e938b44b8a971d5411d775b9428363ab2ae071462d6d16654fcc09270123c434ef2d1f639d7f6d85c08a83b05c0ba4342c21 SHA512 53241e9f62170fe7a8ea27ac03176d442f8aad4ed16da0033164b0949b00c3d476539b182e761950e7d6c385f22a891524c5f40a9cf8fe543b3003c37693314d
 DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
 DIST pidgin-2.14.9.tar.bz2 8254729 BLAKE2B 3151e1ba21894f3c16ce615223e56e8ebff8f4098fe448b15752ed93e26d7895094fe584dfe0ebc6d8e4e0dba8a51ac57e90e2b7e286f4a840edcac2630df7c2 SHA512 fa610b49f77711df9ec76d886c836a80c5ea1563da4e861cbfcc7f7aba3130eeb5db7bb217e2aac571f9aea5d03da8b15c1aeec300468ab2ede6c409cce60d4f
-EBUILD pidgin-2.14.8.ebuild 7541 BLAKE2B 1a17044f45b46eeb68c2fdf5a26bc5108fdd04e80e2e48e9fbc962d2253de698f04fe3e18ac504250a50647e3537a7ebbf9f399f0a8fc3f6e3eb4463dc162d55 SHA512 c08924d8ae02003f8aaf69210207fddb31480ea1d7fd180841a1f011f7976efd4d7073c955b5d06f49d8500fb61ec54a74e7404673c9d8f0dbf2300d668993d0
-EBUILD pidgin-2.14.9.ebuild 7573 BLAKE2B b5140c4073f79452a6a263174ff7c1c04c323d55189f78719f84a6197803f5bf188285da5ab2a285a25aeb2883f4a738cfc846eb0af4f4a610a9ff3a9e87bb3b SHA512 92797aed21c7af1fb3640029cc227497a17b4ae1d99c0f46596fb2f5c81dcacd314407ba20a2790ba26c4013d68be5504e4d35fb7c40c3c4b70ab176ee1c6ba2
-MISC metadata.xml 1419 BLAKE2B 6b87c11749b1e15503eddb0d73d18ed264e86d8d8e515cd30ba6787117401f8f07ea5030accd5cbf86da7c059eaf4f4d2fa3ff5d0c2bf5db1f987f5f536ac448 SHA512 c7bc589c6ddd1fb628832105691f08555f0fd7e5578bd3c5905a6b082198c36a34f86182a8772b8e8aa14b75f2b99eeba99c2c77ef480f3d80fa199aa792067d
+EBUILD pidgin-2.14.10.ebuild 7568 BLAKE2B 25a563e46e906f1a1a48f925622d8a4b5321c9bb46b3a1be45b14672e0ef944e9617702777b29d1b2b2817f2e4671122753fd01bd2120434e68da3b973660587 SHA512 365608529a3cc38886a82c6923fb7492332bcdb7aef9d1ba698981fe148fa5153995f95ca5f30e734e397ec16e16d9e3f60d988092517350ab77c168e95724a5
+EBUILD pidgin-2.14.8.ebuild 7541 BLAKE2B 3813c7a35d002323a7fc2c34a9291a8e6390d088c4a40b07cee561c8d0bffd4931f0235bd212f5fcb0400b2b68b41e4e42fda6af62fdfb81c4f892d7b480f3fb SHA512 0fec4f6843bd23db31d25aede171e68e5635199effa30ab55535976a9dc544bd572140c28d3429a299da5082fbe50470d42f858c910ca6ff232fb44a4cdf2179
+EBUILD pidgin-2.14.9.ebuild 7573 BLAKE2B b873c266a9537b2fba5e71e3a508414e6f0542bc0e7bff28a3a76a1fd5231f928e1f63010bff83a5fd99ce78802a665075c6a90148fcd10869aafb9d510eee58 SHA512 8ae131355363d70989a0aa3b3687fa1d8d200c2aa80c92caec0e5a22c1aa975042fee8b5ac0895865e6d07f4a61c4f8fd792af6a6879a2d5911b75814243cd6f
+MISC metadata.xml 1335 BLAKE2B 8d5230fc8c5b162d554279eff7091a987b04ea5374541e459edd658f49be9c3d4c528c10ff859fb0d6ae268d87f3bfe4d167be9a1ddedb32334b56ceb4ff1bde SHA512 0203995da946b5b76a3fdfc42302afd3229c25f95db450876a1d80d9a04019ce932e5bbcc19e7340d36a9d47d95617ed49e4fa74a11f222f5604bca4d50237b8
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 4ae4682ad008..9d0e3f3f6588 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 	Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SIMPLE, and Zephyr.
 	</longdescription>
diff --git a/net-im/pidgin/pidgin-2.14.10.ebuild b/net-im/pidgin/pidgin-2.14.10.ebuild
new file mode 100644
index 000000000000..e1c4288370b3
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.10.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools gnome2-utils flag-o-matic 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 v4l +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
+	dbus? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	gadu? ( >=net-libs/libgadu-1.11.0 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2
+	)
+	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 )
+	)
+	idn? ( net-dns/libidn:= )
+	meanwhile? ( net-libs/meanwhile )
+	ncurses? (
+		>=dev-libs/libgnt-$(ver_cut 1-2)
+		sys-libs/ncurses:=[unicode(+)]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	networkmanager? ( net-misc/networkmanager )
+	perl? ( >=dev-lang/perl-5.16:= )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	v4l? ( media-plugins/gst-plugins-v4l2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+
+# 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} )
+	v4l? ( gstreamer )
+"
+
+# Enable Default protocols
+DEFAULT_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_environment_reset
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	use gadu 	&& DEFAULT_PRPLS+=",gg"
+	use groupwise 	&& DEFAULT_PRPLS+=",novell"
+	use meanwhile 	&& DEFAULT_PRPLS+=",sametime"
+	use zephyr 	&& DEFAULT_PRPLS+=",zephyr"
+	use zeroconf 	&& DEFAULT_PRPLS+=",bonjour"
+
+	local myconf=(
+		--disable-mono
+		--disable-static
+		--with-dynamic-prpls="${DEFAULT_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable doc doxygen)
+		$(use_enable gstreamer)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(use_enable idn)
+		$(use_enable meanwhile)
+		$(use_enable networkmanager nm)
+		$(use_enable ncurses consoleui)
+		$(use_enable perl)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable v4l farstream)
+		$(use_enable v4l gstreamer-video)
+		$(use_enable v4l vv)
+		$(use_enable zeroconf avahi)
+		$(use_with gstreamer gstreamer 1.0)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable spell gtkspell)
+		$(use gtk && use_enable xscreensaver screensaver)
+	)
+
+	if use gnutls ; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=(
+			--enable-gnutls=yes
+			--enable-nss=no
+			--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 we no longer use gnome2.eclass
+	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 9dc37e46de11..dfdb2ffb0211 100644
--- a/net-im/pidgin/pidgin-2.14.8.ebuild
+++ b/net-im/pidgin/pidgin-2.14.8.ebuild
@@ -100,7 +100,7 @@ REQUIRED_USE="
 "
 
 # Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
+DEFAULT_PRPLS="irc,jabber,simple"
 
 # List of plugins
 #   app-accessibility/pidgin-festival
@@ -170,16 +170,16 @@ src_configure() {
 	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"
+	use gadu 	&& DEFAULT_PRPLS+=",gg"
+	use groupwise 	&& DEFAULT_PRPLS+=",novell"
+	use meanwhile 	&& DEFAULT_PRPLS+=",sametime"
+	use zephyr 	&& DEFAULT_PRPLS+=",zephyr"
+	use zeroconf 	&& DEFAULT_PRPLS+=",bonjour"
 
 	local myconf=(
 		--disable-mono
 		--disable-static
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-dynamic-prpls="${DEFAULT_PRPLS}"
 		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
 		--x-includes="${EPREFIX}"/usr/include/X11
 		$(use_enable ncurses consoleui)
diff --git a/net-im/pidgin/pidgin-2.14.9.ebuild b/net-im/pidgin/pidgin-2.14.9.ebuild
index 8b7a3577b542..5fa3ae3e271a 100644
--- a/net-im/pidgin/pidgin-2.14.9.ebuild
+++ b/net-im/pidgin/pidgin-2.14.9.ebuild
@@ -102,7 +102,7 @@ REQUIRED_USE="
 "
 
 # Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
+DEFAULT_PRPLS="irc,jabber,simple"
 
 # List of plugins
 #   app-accessibility/pidgin-festival
@@ -172,16 +172,16 @@ src_configure() {
 	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"
+	use gadu 	&& DEFAULT_PRPLS+=",gg"
+	use groupwise 	&& DEFAULT_PRPLS+=",novell"
+	use meanwhile 	&& DEFAULT_PRPLS+=",sametime"
+	use zephyr 	&& DEFAULT_PRPLS+=",zephyr"
+	use zeroconf 	&& DEFAULT_PRPLS+=",bonjour"
 
 	local myconf=(
 		--disable-mono
 		--disable-static
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-dynamic-prpls="${DEFAULT_PRPLS}"
 		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
 		--x-includes="${EPREFIX}"/usr/include/X11
 		$(use_enable dbus)
diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index 332940fcaec9..d1f1a1caa6f2 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1,7 +1,5 @@
 AUX Do-not-install-man-pages-and-files-in-usr-share-poez.patch 1030 BLAKE2B 5ce807a6a3346a980f6fc5aa2da1d5df6f5c3cc1ea5a2743f39a64f81830387e8388cbf0791b1f21de60136f6b53cb072917b86c365c3c01460c06a4814abc0b SHA512 9b878fae63f108b54726805aa123ce6a361a67a44a02a8bdf3af3ef22e37a6770b4827ec9d83f507d3973b1c8df741cc956fba1d06e6c14a125f54c0b2028b6a
-DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
 DIST poezio-0.14.tar.gz 662379 BLAKE2B 467741d82945c084c79811d41ff85358ad236d0dcefca7e6f1f8ed5d78aa127f800d2370d624ebaf9e2eb20e1038f280c2e874694ea2b86965fe329b82c4b7d8 SHA512 6e68954a918c645592e2d2f8a265e2f2445a39e256c0525a5517e758a90cc404e066cc08d67ad0f8a3c7d6f3efd61f13a776737d110dd23df7a5f7fab54fc6b5
-EBUILD poezio-0.13.1-r2.ebuild 1412 BLAKE2B cc4c82be986be3adcbdd51617585c3a4b36212332ae12f70225494b7ef564b5acf548a24c3ec0aa8cc458f0c3220ed4b71f32e6c4e238e71988c7647948c6da3 SHA512 56158c6f8958ccc150b3d2c2b46d1aa781e389647c735b1296521c8b5bcbeb6a015b44025c4eeaffa5e64870edc75b5e80336a7cc8239c54e4a6522c32d19847
-EBUILD poezio-0.14.ebuild 1673 BLAKE2B 453f9cb83349950e01b0a2219b834d97dde47aeb69be2360934cb1982196a9606f6e132e49b32e5773a4df53271093c791c7d950488edd544eeda448bca0a9f6 SHA512 703ca18cb28caefc3c0010d0737fa34cb6e87a59f5aad3dae3fc5feec8696e9f66a2205df82e3b1bb0ecb32fb1a5cf8b51676e42a0ac5dcab0cb518f2994420d
+EBUILD poezio-0.14.ebuild 1672 BLAKE2B 874e4f96b9473e2d7d3816d3338bce1590899fb6fed2d0f0591acf74ac5db5f56baa83dfc74e12ae19677f44b869ee6e75f62c0d65e3cf03f9dc37c5a4be673d SHA512 f0d875ca920101397deb9aa33183111dbd96d91a397caffd6c7b03808b64b0beb8fcc60a99e37bc9629afe6433ca1a152dc70ec1b83ac33b88eea53b46326090
 EBUILD poezio-9999.ebuild 1673 BLAKE2B eeba0a2331ae0a77c90643282a79c1a1b4ef31d24756ec7f16676a51389bd32d51f882f37b0721d591806e45f7f800ba6541d90468f6bdb98c2d2bb2874a4f8d SHA512 148c09904886410923724af0f5a6647b36fdaa0abd7aecbdfc070133f8f4041030e999ab7a78fda3dabb13dc6ea23f0d9bea1ba2873479c83513f65480bce487
 MISC metadata.xml 316 BLAKE2B f37c478624b1cf9ad87b583797f031272cb5cce0d1d3059207515785d58675b8f494fef623f03562f9db4fcd276962f590ecfdf3f2153eabee49f2272bc6e357 SHA512 809370619be912f600c10610cc7c3923a73e8f5fd2cb05d755786764e62c446b187203ff324803ea8efce0172519bf2543d923c536b8561df0901454c83b62a6
diff --git a/net-im/poezio/poezio-0.13.1-r2.ebuild b/net-im/poezio/poezio-0.13.1-r2.ebuild
deleted file mode 100644
index a43f1e0504f7..000000000000
--- a/net-im/poezio/poezio-0.13.1-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1 optfeature xdg
-
-DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
-HOMEPAGE="https://poez.io/"
-LICENSE="ZLIB"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
-	inherit git-r3
-
-	# We build the html documentation using sphinx.
-	BDEPEND="dev-python/sphinx"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/slixmpp-1.5.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/Do-not-install-man-pages-and-files-in-usr-share-poez.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	# Delete unmaintained plugin which requires an excessive external dep
-	rm plugins/mpd_client.py || die
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if [[ -n "${EGIT_REPO_URI}" ]]; then
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman data/poezio.1 data/poezio_logs.1
-
-	if [[ -n "${EGIT_REPO_URI}" ]]; then
-		docinto html
-		dodoc -r doc/build/html/*
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "screen autoaway support" dev-python/pyinotify
-}
diff --git a/net-im/poezio/poezio-0.14.ebuild b/net-im/poezio/poezio-0.14.ebuild
index 81e2f3ab9a0b..b89e69da45ff 100644
--- a/net-im/poezio/poezio-0.14.ebuild
+++ b/net-im/poezio/poezio-0.14.ebuild
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BDEPEND="dev-python/sphinx"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 RDEPEND="
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 7730d2b373be..04150f9739af 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -3,5 +3,7 @@ AUX prosody.initd-r6 1114 BLAKE2B a988b584eb49d21261776fa0a651dc01d3943a5a75c9bf
 AUX prosody.service-r3 439 BLAKE2B abd128f236f2c28f54542388a38aaa3d0e5030510dddc16240273de90c13ddee62d01d26d7c9e1be0635dc59ad9ca5e93a30f2b5fa42106489a95d26a037314a SHA512 b540e5d4389439cdd2886f9ccaf189d20ffcaf29a982a26e4ed296b0c529df95aade88751d22919cb36b27db94530dade754044d50cee2e5244d37983b933517
 AUX prosody.tmpfilesd-r2 39 BLAKE2B 1e004bf2bf1495d219c12bea1973206fae135fb4a5b453c6692f0143413626ec83889bb84b5086a6e507d3b8af14877b3820f3d9560df17e1ca49e2cbee85e0b SHA512 81b855c6bf496f0e6f20c41b8be5538c4edd1fbc6e4f2ca6e9a2d0a06bd5237223a4d42bcbdb75746cb01e46ff0eb36dac6952d9c076c6a72d1bbd733aca07eb
 DIST prosody-0.12.0.tar.gz 610330 BLAKE2B 14694ee95dc6eb6d053278a9d7718fd7487fe7ef862b4e2ee0d57f2b60cdeb22d1c74eac4a4df7447ea3e9ff57fb3734a9c9997f2767ed3aa04682f265b82185 SHA512 b7144a413a5bc72b1e677504d5ced6583c7399c8334b39b4c9157da60f951300832b34a1d47703a0b217caa4f1d3a0f52ab59cef08b27c6b43e876e1dffca3ce
+DIST prosody-0.12.1.tar.gz 611898 BLAKE2B 0b65ffbd6d4703f9e5fbac80e8887a4a41297afd22a776fb2eaa718b309f46c55a9d78f1d3ea97d4434c6ea2ebfe7a9051532ceda25ad78611769bd031894084 SHA512 705d2bcd38ffb19e90dab19992711aebf3d81f7bca7f9791ae5149510d465ec837ddf26a8c547eff2f2d131e5a694ddc3d0aac0b8921df65808192ae00527a85
 EBUILD prosody-0.12.0.ebuild 5129 BLAKE2B 75cdba4ad8d2ea935d800385b1397d90dd3df43a5f03e0e6d3afec15001d8897b6eb271f7c91843b19ca672d46642b92f9f20d5ac00f57fe7ed73a0f9658f7df SHA512 c2fa2d60436e6b8d433b069f3f9266369ed87bd73142a07364e555c748169f25bb1c2c45504a427d827cac8b52a3d2ce6c74fce9674d9b4c7cb22f9fe7d0e536
+EBUILD prosody-0.12.1.ebuild 5131 BLAKE2B 32986fdee941501782c3a6f211401e0b53b404e5823d466bd3b89ec16a475d8b5f5fd874c028167ace137d7856556b3010341f3878b846210b63440c6ba35520 SHA512 52c336be8e9a097c0d3a76b487d63b37cbd4d925107e7cc6b9ee187a05612ca03f53fba9aa6c98044c134d06f303a4e13802e7421c081ec2d7a7fdfbfcdedb9f
 MISC metadata.xml 670 BLAKE2B 448bf5ede2b6f09940c51fdff4642e18be22d9c3dac637271c7c8bcfde1b4af0853e2623c55c00efcd8757ef863ac37fdb895606e572911a62a1c9d5f32cc693 SHA512 6177b8e3d2ed1aeeae2f369dc693283a3f811953f71be0e004eea402aa421d89973dbefe79c8fd198e9f9f82e4b345552dc3a2c3597c05927dc1a518cacbaf1d
diff --git a/net-im/prosody/prosody-0.12.1.ebuild b/net-im/prosody/prosody-0.12.1.ebuild
new file mode 100644
index 000000000000..e9cab9fb7d64
--- /dev/null
+++ b/net-im/prosody/prosody-0.12.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+LUA_REQ_USE="deprecated(+)"
+
+inherit lua-single systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Prosody is a modern XMPP communication server"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib"
+REQUIRED_USE="
+	^^ ( icu idn )
+	${LUA_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-group/prosody
+	acct-user/prosody
+	$(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
+	dev-lua/luarocks[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/lua-unbound[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/readline[${LUA_USEDEP}]')
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	ldap? ( $(lua_gen_cond_dep 'dev-lua/lualdap[${LUA_USEDEP}]') )
+	libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
+	dev-libs/openssl:0=
+	lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
+	mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
+	postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
+	sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
+	ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
+	zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
+	${LUA_DEPS}
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-jabber )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.12.0-gentoo.patch" )
+
+src_prepare() {
+	default
+
+	# Set correct plugin path for optional net-im/prosody-modules package
+	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--add-cflags="${CFLAGS}"
+		--add-ldflags="${LDFLAGS}"
+		--c-compiler="$(tc-getCC)"
+		--datadir="${EPREFIX}/var/lib/prosody"
+		--idn-library="$(usex idn 'idn' 'icu')"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--linker="$(tc-getCC)"
+		--lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
+		--no-example-certs
+		--ostype="linux"
+		--prefix="${EPREFIX}/usr"
+		--runwith="${ELUA}"
+		--sysconfdir="${EPREFIX}/etc/prosody"
+		--with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
+		--with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure "${myeconfargs[@]}" || die
+
+	rm makefile || die
+	mv GNUmakefile Makefile || die
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/prosody
+
+	newinitd "${FILESDIR}"/prosody.initd-r6 prosody
+	systemd_newunit "${FILESDIR}"/prosody.service-r3 prosody.service
+
+	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r2 prosody.conf
+}
+
+pkg_postinst() {
+	local migrate_to_prosody_user="false"
+	tmpfiles_process prosody.conf
+
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 0.12.0; then
+				migrate_to_prosody_user="true"
+				break
+			fi
+		done
+	fi
+
+	# Sarting with >=0.12.0, the prosody configuration is now in
+	# /etc/prosody and no longer in /etc/jabber.
+	# See if we need to migrate the configuration. Furthermore,
+	# prosody no longer runs under the, shared via net-im/jabber-base,
+	# 'jabber' use, but under its own user.
+	# This increase isolation and hence robustness and security.
+	if ${migrate_to_prosody_user}; then
+		local -A dirs_to_migrate=(
+			[/etc/jabber]=/etc/prosody
+			[/var/log/jabber]=/var/log/prosody
+			[/var/spool/jabber]=/var/lib/prosody
+		)
+
+		for src_dir in "${!dirs_to_migrate[@]}"; do
+			local eroot_src_dir="${EROOT}/${src_dir}"
+			local eroot_dst_dir="${EROOT}/${dirs_to_migrate[${src_dir}]}"
+
+			cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
+
+			if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
+				rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
+			fi
+
+			if ! use prefix; then
+				chown --recursive prosody:prosody "${eroot_dst_dir}" || die
+			fi
+		done
+
+		# Update configuration file to match new pathes and permissions
+		local mysedargs=(
+			-e "'s#/etc/jabber#/etc/prosody#g'"
+			-e "'s#/run/jabber#/run/prosody#g'"
+			-e "'s#/var/log/jabber#/var/log/prosody#g'"
+			-e "'s/prosody_user.*/prosody_user = \"prosody\";/g'"
+			-e "'s/prosody_group.*/prosody_group = \"prosody\";/g'"
+			-i /etc/prosody/prosody.cfg.lua
+		)
+
+		eval sed "${mysedargs[@]}" || die
+
+		ewarn "Newer versions of the prosody (Gentoo) package use ${EROOT}/etc/prosody"
+		ewarn "(just as upstream) and *not* anymore ${EROOT}/etc/jabber."
+		ewarn "The files from ${EROOT}/etc/jabber where copied to ${EROOT}/etc/prosody."
+		ewarn "Also prosody's spool directory became ${EROOT}/var/lib/prosody (was ${EROOT}/var/spool/jabbber)."
+		ewarn "Please check your configuration."
+	fi
+}
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index fa3b004fb36e..d468c964a1e0 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,5 @@
 DIST psi-1.5.tar.xz 2125104 BLAKE2B ee4114749b5958c61dccc45c2562d868f30a2f4765229c904c32d54d5730e2eaa9ab03e966fa5b83aba7e31d37fafb2b194c74a72f2404f3b51815bc525c5080 SHA512 c2e17dad346b5f7e8c97dc8959d99eaf4c30c1ba11c2d04b562af7b30482d5dbdc3a86508c4c29881ea0fc72db5a9d5fb4017768732cafee6a1d3025a39d8520
 DIST psi-l10n-1.5.tar.gz 3037979 BLAKE2B a1baef1b3c86c1b0a528d4395bd6aabf99e1ec4c077d5d0358d4fd9566fcc2d929f46688c3bb2f56ad1de840fa1699f33c211fa4c7597b66ba0842cccbfbc19c SHA512 d5ed8244fbaa9fdd9a40a14ef3660085c8c9c5a18352900fa8d947fad01aea5894c23d83dc16e8ebf9fe007905ecbb8eca7dfaa4e1cf0fa160af341967886cae
 EBUILD psi-1.5.ebuild 2949 BLAKE2B c19b5b54c239133bf204a4372c4928033345e6e17891910d2f8114ad1fc6ef189f505ab13932401e9759360147717bdf3c2e3dea9e541e75f032df4932085a6b SHA512 a116b517ff0e1fe094453f9cbde5cf00837aa6cf64686e7be412336059b0f485df43a4e6876998aa9cddc873226000a40152d8b0028884e8192ae841a89ad346
-EBUILD psi-9999.ebuild 4042 BLAKE2B 2f891acf25c296f848dca6892fe4bd68ebc4d940605086d08ee7ce8ddeccd594e1c0a61411b490270b6c860bc81eea0cdae57a64086b653a3041dad9706ab202 SHA512 af5eb0e86fe405722c7aa993fa599940670f51119966ebd2ba6e3f369141005f2c4b97abb0feb5572369f948178a4ac4b07a8d6915f13ecfb2f567ea3f7516bf
+EBUILD psi-9999.ebuild 4076 BLAKE2B 84b988c4426e0f17098eb8007bb4b7340d8add5ed5294b34156e26a830475184946b2b8ba0110f15cc010775179287cd268ae1323bd3f1b9d273fc18e8821355 SHA512 b9dc5e8a6ded501c1a3041e9101cd801443cc5c52761c9838f98b7d6c46b631cf08f4b933e2c7dcedd6d24d4071fcaa281eeec68c078205300446446d6c3f6ba
 MISC metadata.xml 1524 BLAKE2B bcc68deebb60ba3c012a40edd64b1e3be31a0724867582d940477e35abf31eba7b1ad2d79fcfba6f4de076f83f5a38461ce752399a6e34e83ad263cc8e9c8a2c SHA512 df6efb244311ada4e8b13fc9733c3ab5ca3cd88c28000af17852fc5db5e967c7129b0a18ce8ee25864ea9cb5a63d1d2bbe9e9c673adbeed873f5bce377af351f
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 64f2fd8a4875..6dc0701912e8 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -17,7 +17,7 @@ EGIT_REPO_URI="${PSI_URI}/${PN}.git"
 PSI_LANGS_URI="${PSI_URI}/psi-l10n.git"
 PSI_PLUS_LANGS_URI="${PSI_PLUS_URI}/psi-plus-l10n.git"
 EGIT_MIN_CLONE_TYPE="single"
-LICENSE="GPL-2"
+LICENSE="GPL-2 iconsets? ( all-rights-reserved )"
 SLOT="0"
 KEYWORDS=""
 IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine xscreensaver"
diff --git a/net-im/purple-events/Manifest b/net-im/purple-events/Manifest
index 6ca6237a6d05..d20b1f3cbac6 100644
--- a/net-im/purple-events/Manifest
+++ b/net-im/purple-events/Manifest
@@ -1,3 +1,3 @@
 DIST purple-events-0.99.1.tar.gz 24437 BLAKE2B c4952de806deb6357cfcd59b0392319522c26ac267e991de40adcf1ab622b1df4156854951543a6ad8e0f05b160b31bbf38352a1b5f4a980e24fb37fd8f61dca SHA512 105126fd0dbcc74d6a5878308e43ff27df4c9f1ec20601f382419cb8ebbe1a39e44da6327be86d779dbc66f6251699126776fc8389cdf48dc1569ae6bd8fa6fb
-EBUILD purple-events-0.99.1.ebuild 609 BLAKE2B 05ebb83bd2b84b683b67684704038dc3c7ce04c2c74516d655af1d98ecdda705354d028dcd1f3fc4463a898684cac8cdf35c6e2e7797152220267a2eb91b3303 SHA512 a1cb0d1e6efc7f46685a664e3204c4e52726826ec6406010ad2e746baa7bcef3588ce77cb2f4af75ecf9e4acdba9800cbfc44281aafae2d389b8f5e7fa89aa8b
+EBUILD purple-events-0.99.1.ebuild 616 BLAKE2B 25d3c6ae845cc218d19b015458491eabed87995706a6ebeb5d5558a22837d078eceefbde82ca8b6653b7266b4704de6118b928f829d681bcdd771862c89ffa82 SHA512 160038771d65c188b0e37de11e02e8784b1bf499187599403f3035953f00882a3fbcd1470985e58be30ce084b76bc525387f5f793d39d82abc61aeb0987d2b54
 MISC metadata.xml 398 BLAKE2B 0c45ced9972e38cd15a467c622ed2b5d6b476dc20065bd00fe9aa9266a172ed8e6051e50b5a98d6fdb846f8c7cf3838506718bfaeda47a44487df864214677de SHA512 4520868469d584d3952d3d88463700da250e5466329ffd5bd34d68b18da56b1b52c0a413a7f80e5918c3280fd6d5f382b031c55143b815a5e17f3be97a6366c3
diff --git a/net-im/purple-events/purple-events-0.99.1.ebuild b/net-im/purple-events/purple-events-0.99.1.ebuild
index e4d139ae3b6f..b415329f383f 100644
--- a/net-im/purple-events/purple-events-0.99.1.ebuild
+++ b/net-im/purple-events/purple-events-0.99.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Allows a fine-grained control over libpurple events"
-HOMEPAGE="http://purple-events.sardemff7.net/"
+HOMEPAGE="https://github.com/sardemff7/purple-events"
 SRC_URI="https://github.com/sardemff7/purple-events/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index 3e5e1393cb96..83055225af91 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST rocketchat-3.8.6-linux-x86_64.rpm 62305896 BLAKE2B 5dca26208bd965678e35a08a66d08b2fed368ccde2e991e19e6891ead9364693d0660ae3941cf3a15eb4fd3c6c18ed6f167dd33f0bfb1159fa39e0db7a31aa38 SHA512 0218a5cf0a897f3b0d0c80bd372e86791e47e6d60e291389b6554beb1d54e8e709eac733eb8ddf5686249521b990d6b2f6b43b8454f122aaea2ea95feb0c1565
-EBUILD rocketchat-desktop-bin-3.8.6.ebuild 1094 BLAKE2B e9907f9724d0dd503ca294fe4f1ef7ef75193e7b35efd64922aefb2cffa16f1ba5c8378c91a853977f5d1c08964ad759c3e9b8c77c250625c54135ac4867a811 SHA512 0a6c8633af9c18749c4c59595416f773a283b7be5a97d88c6aaa95c75681bb3ccd44b5075c9bbe79e8bfc225384615d3b63817c2ca62cd41467643010a53003a
+DIST rocketchat-3.8.7-linux-x86_64.rpm 62302012 BLAKE2B 2e5b36191abcb783e126e92bc608716efc910151484399cbbaf2fe0837fe8a40eb5c84b71e33052c5a950adfa0851d30be2e964754b08f3a9f3754169c5dc169 SHA512 833abf90425b5f9d0feb28acba4559d8d410ef2f5276b03fac8c781b9eab3ae7e0eebd613bc84e28a0dfa6005778a9afd91d528b6fa67ab825564e98241548c6
+EBUILD rocketchat-desktop-bin-3.8.7.ebuild 2444 BLAKE2B 10ceb17a682af48db443d2e164309f7d1bb2904505f23d8a2dc7c717780953ed93036f16f4bcd391e67bc43211c1cb238e6c11143b80dd55d4ef0d3a87e83d97 SHA512 8eab93452b75d9881c20fb18d3fb46bca3ce6360e14eec3039d81f69f833bb594b16c397414f463cc6854fb7025e166b348b2dbbabc4f3c6b59ab27de940a64c
 MISC metadata.xml 434 BLAKE2B 2253702089149978e030c97d8a21ef29c0870683e6896d105e9000e77d32d3c66c3482c2b0d2ecbbac6bc281a85be9267918f4d5691ea6c5cf6fab3ebc80db96 SHA512 9cba4c7855c123b866f6a24e99320ddb3b6a450fd5f37eadf364bd92e1e58fe7e0c3f4a6892bb26f0142869d983fe12f5b3753b1960763ffe63a0c8d0d54ebe0
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.6.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.6.ebuild
deleted file mode 100644
index 258071fcfef4..000000000000
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit rpm xdg
-
-DESCRIPTION="The Ultimate Open Source Web Chat Platform"
-HOMEPAGE="https://rocket.chat"
-SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}-linux-x86_64.rpm"
-S="${WORKDIR}"
-
-KEYWORDS="-* ~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/libappindicator
-	dev-libs/nspr
-	dev-libs/nss
-	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
-	x11-libs/libnotify
-	x11-libs/libxcb
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-"
-
-QA_PREBUILT="opt/Rocket.Chat/*"
-
-src_install() {
-	# remove files useless for Gentoo
-	rm -r usr/lib || die
-	mv "${S}"/* "${ED}" || die
-}
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild
new file mode 100644
index 000000000000..355c5e06379d
--- /dev/null
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop rpm xdg
+
+DESCRIPTION="The Ultimate Open Source Web Chat Platform"
+HOMEPAGE="https://rocket.chat"
+SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}-linux-x86_64.rpm"
+S="${WORKDIR}"
+
+KEYWORDS="-* ~amd64"
+# Electron bundles a bunch of things
+LICENSE="
+	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
+	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+"
+SLOT="0"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/libappindicator
+	dev-libs/nspr
+	dev-libs/nss
+	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
+	x11-libs/libnotify
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+"
+
+QA_PREBUILT="opt/Rocket.Chat/*"
+
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+	# cleanup languages
+	pushd "opt/Rocket.Chat/locales" || die
+	chromium_remove_language_paks
+	popd || die
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+	default
+}
+
+src_install() {
+	for size in {16,32,48,64,128,256,512}; do
+		doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/rocketchat-desktop.png"
+	done
+
+	domenu usr/share/applications/rocketchat-desktop.desktop
+
+	local DESTDIR="/opt/Rocket.Chat"
+	pushd "opt/Rocket.Chat" || die
+
+	exeinto "${DESTDIR}"
+	doexe chrome-sandbox rocketchat-desktop *.so*
+
+	exeinto "${DESTDIR}/swiftshader"
+	doexe swiftshader/*.so*
+
+	insinto "${DESTDIR}"
+	doins *.pak *.bin *.json *.dat
+	insopts -m0755
+	doins -r locales resources
+
+	# Chrome-sandbox requires the setuid bit to be specifically set.
+	# see https://github.com/electron/electron/issues/17972
+	fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+	dosym "${DESTDIR}"/rocketchat-desktop /opt/bin/rocketchat-desktop
+	popd || die
+}
diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 0f01d94207fd..e5bc6990dce0 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,11 +1,16 @@
+AUX signal-cli-bin-0.10.6-use-working-java-version.patch 981 BLAKE2B 73aadb2cb82278eb93837e09341b49170b5e0424f536091ec1513d37e2f466b4d8ad3d8e4c9f36b8de435e8fe1a19f452caed48f24d4b257a42d576d763da8b2 SHA512 dd27a600234c7e83ca2aef7ccb6d053731308745658b75d991ab4c5fbd5f60d4f3cfe85375be40e1a80d56a0c3577ba1bf28dd15f8c40e5137f2ce1b06462004
 AUX signal-cli-bin-0.8.5-use-working-java-version.patch 985 BLAKE2B bb4d609753259033da89971aa297c9ed1a0371564bcfa4743df3169190c02450ea30a3667d9fec30b1ccf818e0ed26791d8c2863ea7a5674fbe9c4ecca9bdd35 SHA512 1c93e8b856a6b10aff56a15e14025588a907b1b599bf16a1d4ebc012d19636a2ee8679a8456f0989feeca743093cc83267454060797c68489512b32569782bcd
 AUX signal-cli-bin-0.9.2-use-working-java-version.patch 1123 BLAKE2B a3d6606bd77eb5fdb88794c368db4fc01b2a933f450d49b2e469215cb31c6cb10093bb474f083f7c0f8e3e21b11f327ea8b890f0e0ffe8b4a6fd0b097ae399f3 SHA512 77fcb2a6cbad909ec5bdb585e6a732a0214923c95e6fbdc48027cb20e39a28296196464c66e3302e40948e03f1859649c78383535632b82aecfd3d7596a5f20b
+DIST signal-cli-bin-0.10.6.README.md 5916 BLAKE2B e7fc8646b1bcafe5145fec9d14450dcc235380d8f1e776f30432b3235a2ed87043a55ba4da48c058f83b04750e0e1dcd97ee5e50ce079e7bb906f04f9e77fb38 SHA512 a7347ea5134982fa76442702b9d7892b1bbdbf5f36b1823461e14c320cf38cdf3f2379178c7864ef21285f8f3a0c26d4e2fb9ea9546b2fb4d1271d552bf7c37e
+DIST signal-cli-bin-0.10.6.signal-cli.1.adoc 19971 BLAKE2B 1642c6e463d0c536abfba4fa2e5c91f5fbb7c9d9817684924be82a43c7fbca7b92f07718507582721c63c32d1844c5c016f02dfb7b03b8ae7494f090ffdb7d00 SHA512 361098a70d3ee7f114a8f0f95794c24380363f782b4778d70a1cb2cc8bfee107e9b0f88c4cdd236f51960a14bcf18d60cb9920d4abac09fe58c0df9f5d4a5551
+DIST signal-cli-bin-0.10.6.tar.gz 34191841 BLAKE2B 3a0d4ae9c938aaadb59803550d56d4ae17cb8c0d3ea1f2874654207423679ca42ab42d1aa7894b897794298f94b2f57eac84120b7fbf7a0e4d6e0153a9565681 SHA512 4a7d5381bbcdde516d25e6a580854213ba5b144aa942d3cdea48b3e587d9db9e448c1bcf8c91a7632157747d00c5da4a4dbf1c366ae5a332f922c6d9a6ad33d1
 DIST signal-cli-bin-0.8.5.README.md 5626 BLAKE2B e8a70135622a7eeaa9b4c965f75f001e641745c60a10d61ab96a014194034a1daf2ec077cb7798bf32c5f9218af6103dc9de7bbb2811b9a4aa162f55697f2232 SHA512 feed6673b56c4ac812d5038157f08bef36b48725211ad06a146a0f349c20213527eec814a5e940aacc0de0fdf7d74931fcd12a0d764df82340025a71a7f22a35
 DIST signal-cli-bin-0.8.5.signal-cli.1.adoc 15222 BLAKE2B d5075011c82bb79f2de7f7b2f2cbf060428281b0f1d054e1cba09632e6e2b7dd472e8dfa3f0d7863acd9d8e93cfa51af1e241153baeb4d5f2e0e8698a158e6a1 SHA512 cd076fde6cdeca70734bb385d7dbf574fa859da9b2ba01c5dfbd8fde0f3457c400be41d790cd7cdc05932731693f4114e4708b7d42e405bf8dd6f982309c0ca2
 DIST signal-cli-bin-0.8.5.tar.gz 17563403 BLAKE2B d400285d513c893475c74cbbfa7cb01391545d88e5e1504d9a5175428b31e7308cfc1c9526dc8cef4aab9a75e916a1b596f7939eeeaf5544ffb351c7dfcb3b59 SHA512 1d1931a568d9f95e020ee21dbf2d594b0d43d59e4621a7ef1ff21ab2e3cd4ea00da363bd5d86e12745015c643e4ebde4f58bec4a51be807e401ebb127430fa70
 DIST signal-cli-bin-0.9.2.README.md 5715 BLAKE2B 17be982049fd2ecadf009f2d4e2988c1d58105b2c9cf43c733a9f4e573565861be1c9707d0fd23f2c7a09e1d149671b854b98ed23da96a3df18cf3ec51cf437b SHA512 ea0f89513b9a9180d8d59fafffbe7a2ec253e0907c5666d9d9a50bc853a8ab1ec270850ca73cf3eb4d66b3c40d101ca641a00520fdbe1190c3ce3f34b775908c
 DIST signal-cli-bin-0.9.2.signal-cli.1.adoc 16754 BLAKE2B 5bb5423496c84d450eba4039c45d23da9f927470a152b59d2e6b3cea3c8f3166237964588759d70a5e17086dfc69b0da3674bdb47a4eda0e2a258e87d1f5e6ff SHA512 2e3a8075b7c45901c762e410b9ec50ee9674439af861174aa116f74e8133e0804c9ddded9593e90bf916c50f5a74205edda2691204a320dcae1db291fe52dc20
 DIST signal-cli-bin-0.9.2.tar.gz 22875145 BLAKE2B d650629e5b7667f6d40f18e4bf364843d1e348019eb47d76e73a5a48652850c17e045667409e2b3c0adf2586dc69a7423a8a502ce18dc349a48f472f764012b3 SHA512 944d6ec443d17219feebd7712e783b238017cd1a74b7595a37ca865738a83b67f1a044eb3f7b2435687fb94d20ee94353866ed33a25d3abea3bb5aa79ef8fb77
+EBUILD signal-cli-bin-0.10.6.ebuild 1331 BLAKE2B 344933c950d00c149bfd28930f50a980f3af1f9594f6be1043f3bd8607a425748cb4af09a7b26f3106a5b58d30ef5e4cdba0bb0f06fe78eaf8a15935316f318b SHA512 592e4dc0447c4bb27c60ed9ecb0fe83a3dc4cf6be9838b41a2142747b6bc821aec191b2387095d6eeb36a8a0c81a2bb400ba76d18730bb94ac926e2d0e729e1e
 EBUILD signal-cli-bin-0.8.5.ebuild 1659 BLAKE2B 4720e70365000d46662f81af3b0572a32e9bbff4f79cb945a09d0e882446b5822df460703873fd33fa5d70e16edea4e821956170935946c734eb37bcbef06ced SHA512 11b88ee9980735edd8b640959a548813c1f8eeb2eb314c6e0cf5b0444b49cc9a9b9bf6e0abf0cd42457b8a5ac57753b9615b4778441113129308dff7a81b5381
 EBUILD signal-cli-bin-0.9.2.ebuild 1659 BLAKE2B 4720e70365000d46662f81af3b0572a32e9bbff4f79cb945a09d0e882446b5822df460703873fd33fa5d70e16edea4e821956170935946c734eb37bcbef06ced SHA512 11b88ee9980735edd8b640959a548813c1f8eeb2eb314c6e0cf5b0444b49cc9a9b9bf6e0abf0cd42457b8a5ac57753b9615b4778441113129308dff7a81b5381
 MISC metadata.xml 398 BLAKE2B 445ffd891e67241252fcac645e4506315a23501976a36522f4bc9065b712e5b519f78bc523707014ab71dfccc796248094cc51edc43a0ecf9a1a3957a31d07c1 SHA512 a6364c26016b8fdcb0388f839fd1c04c83c0f83eff1661df75173eb81b426b6df9e3bb7ed1f44cce89010e8a94fbf12323d39a6534c4ae5105d7aa0a4883b0e3
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch
new file mode 100644
index 000000000000..02b77bc54dd4
--- /dev/null
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch
@@ -0,0 +1,33 @@
+This patch searches the jre 17 binary in the gentoo specific directories.
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+
+--- a/bin/signal-cli
++++ b/bin/signal-cli
+@@ -118,13 +118,19 @@
+ 
+ 
+ # Determine the Java command to use to start the JVM.
+-if [ -n "$JAVA_HOME" ] ; then
+-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+-        # IBM's JDK on AIX uses strange locations for the executables
+-        JAVACMD=$JAVA_HOME/jre/sh/java
+-    else
+-        JAVACMD=$JAVA_HOME/bin/java
+-    fi
++# This package needs Java 17,
++# so we must search for matching java binaries
++for I in /usr/lib*/openjdk-17 /opt/openjdk-bin-17 /opt/openjdk-jre-bin-17; do
++	J_TRY="$I/bin/java"
++	if [ -x "$J_TRY" ] ; then
++		"$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "17."
++		if [ $? -eq 0 ] ; then
++			JAVACMD="$J_TRY"
++			break
++		fi
++	fi
++done
++if [ -n "$JAVACMD" ] ; then
+     if [ ! -x "$JAVACMD" ] ; then
+         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+ 
diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild
new file mode 100644
index 000000000000..29710caad87a
--- /dev/null
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="signal-cli-${PV}"
+DESCRIPTION="Send and receive messages of Signal Messenger over a command line interface"
+HOMEPAGE="https://github.com/AsamK/signal-cli/wiki"
+SRC_URI="
+	https://github.com/AsamK/signal-cli/releases/download/v${PV}/${MY_P}-Linux.tar.gz -> ${P}.tar.gz
+	https://github.com/AsamK/signal-cli/raw/v${PV}/README.md -> ${P}.README.md
+	https://github.com/AsamK/signal-cli/raw/v${PV}/man/signal-cli.1.adoc -> ${P}.signal-cli.1.adoc
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	|| ( virtual/jdk:17 virtual/jre:17 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-text/asciidoc
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-use-working-java-version.patch"
+)
+
+src_unpack() {
+	default
+	cp "${DISTDIR}/${P}.signal-cli.1.adoc" signal-cli.1.adoc || die
+}
+
+src_compile() {
+	default
+	a2x --no-xmllint --doctype manpage --format manpage "${WORKDIR}/signal-cli.1.adoc" || die
+}
+
+src_install() {
+	insinto /usr
+	doins -r lib
+	dobin bin/signal-cli
+	newdoc "${DISTDIR}/${P}.README.md" README.md
+	doman "${WORKDIR}/signal-cli.1"
+}
+
+pkg_postinst() {
+	elog "Please read /usr/share/doc/${PF}/README.md.bz2"
+	elog "how to register signal-cli with the signal service and how to send"
+	elog "and receive messages"
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 605c0c725357..170a7511b8dc 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.42.0_amd64.deb 116405706 BLAKE2B 68d1d92397d2afc04abdf33e66f0ee7ac762745dda30e76190a6f91686163494a23fc70001ffa7ccd007bd30bdb7f47276a725a823e77f575f4842067f3f98c2 SHA512 9b776642bfefba20deea238243463e48334c6007af10a542a4134d3334867d7cf5327907654bcb7bb1cd5fc331faff24cf71a0c51c35bcea0defade9e21ec548
-EBUILD signal-desktop-bin-5.42.0.ebuild 2427 BLAKE2B a95cd9809345ce6a1220720278dd2e876bee3804377628fcaa81c3e0e6a66c18f40ee0f45512cfe5dc3c0640a69690ce6cd7428b74b6f19dd13b15fdf7698a80 SHA512 ec1fd4c473d491a54a71e715dfa48df453871dc11659a56ab33295a629b21b8d70cebd88c2ce8898978e1de598e1f152eafe85a07bf01b27a4c013b81aee8cdb
+DIST signal-desktop_5.47.0_amd64.deb 116729716 BLAKE2B 57a96ddc6a5eeb6d524eedd5feaaed090b8bcafd8521c96f34c26eed5a4f8a46e5449deea257ab50ffa7320bfd839d94cdda555984ad4ae721998d9ce2c8442f SHA512 af0053b00f1598002a9aded9008ddce629b1f73f09ea3e067738c16c2085fe57fbcbd4e003fee591e5a609b525cf91dfea4675080929a63e1e37dd27d2583bca
+EBUILD signal-desktop-bin-5.47.0.ebuild 2427 BLAKE2B a95cd9809345ce6a1220720278dd2e876bee3804377628fcaa81c3e0e6a66c18f40ee0f45512cfe5dc3c0640a69690ce6cd7428b74b6f19dd13b15fdf7698a80 SHA512 ec1fd4c473d491a54a71e715dfa48df453871dc11659a56ab33295a629b21b8d70cebd88c2ce8898978e1de598e1f152eafe85a07bf01b27a4c013b81aee8cdb
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.42.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.47.0.ebuild
index 75db5c2f8043..75db5c2f8043 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.42.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.47.0.ebuild
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index f88bf9d40c0d..1b2d6bf450bd 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,11 +1,11 @@
-DIST skypeforlinux_8.79.0.95-1.x86_64.rpm 118002157 BLAKE2B 0e836e3fd0c06bb5bd57d2806b3a51772e307a9555e573fdc366ebf1b82f2f8f1e422d64981f1973962d0ed1fa689c26482a48bf8193eedb65fe009056ff651c SHA512 eda292a1cd624c9a4819362820430769ead67f08113c66e58d6a4db17af4323f5483b6dadec41075b53feb25e7d7ef4c7ab738289246724678d2af9414fe58ad
-DIST skypeforlinux_8.80.0.143-1.x86_64.rpm 118601687 BLAKE2B 8686eeb83a9e5df927a366cd05168224ac5869f83a11e59efb68af54f4c734b914e44f0993e3fa93b3b2e9749092063bdba77bb4fc4ce2dfedbddd523dc2617d SHA512 23c2a4db2831775bb20a709576319bdade0bc17d6e29af55a7953c54fdb626ec020066f5c54fbcb0d40aab534596ccb558211b76f2a656a9edc5daf49818e610
 DIST skypeforlinux_8.81.0.268-1.x86_64.rpm 140540850 BLAKE2B 5d6cca460c5ad663ba5ac90d3d22f7c7eab7869b6b34413de7e8a479d7461d8b7aa9112798722a38c6b9ed0bf0321a37300bf410fc123e0bb8c7164cb027b2a7 SHA512 e2b077cca85c9fdbdac7b50cbfe3fa5bb628c7321dc30d5d6eac5d3c8b83d2a365bbe226f33cf35d2e5614a1b48eb9971ada4c87b98dd161c985e99a5008a9c9
 DIST skypeforlinux_8.82.0.403-1.x86_64.rpm 140817695 BLAKE2B 94a1038a534dce77e014e3823e4e5f2a8e6a951d3a644ed1562a5d50dad92f73152910286d797c50b882662f6f85cbf30bc4d80e5fcee7ac956f2c18177c00e1 SHA512 97920148290f9a4e7091f90a9e46f20ba663ad3f07c15a8540947d4b9a4390c217ac4eea5e80a5aad3a83e4110588fb7038b6359f34f4774ca6912f91db76346
 DIST skypeforlinux_8.83.0.408-1.x86_64.rpm 140847167 BLAKE2B 79d00a80bdb9cfa131094de2d702b1c8031307c6614ed962567cfeb3868bd542f5483b4ef87ab7146f9aa94e4548d9339ce7f4f28e65c2bfb5add25a3d3e5d26 SHA512 66865836f6e44ec54f14b26bdb0bcf2b9aec11379d4b16386814a44137e6eb1dd83cfbe2f4248cf6b2b4ba2513ebdcc64fec5f1819ee3a67e2ae04bcf4f7e028
-EBUILD skypeforlinux-8.79.0.95.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
-EBUILD skypeforlinux-8.80.0.143.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
+DIST skypeforlinux_8.83.0.411-1.x86_64.rpm 140568859 BLAKE2B 3e429e5c60fe812092a2da1cd6ed4012d81e65a4f69c18772a7e34721c1549e18c401ea2fc6d0263bdbace85265c48467835e97f7fa50eca1ae8dbbbf4cf0b3c SHA512 ebab053e75e81e294e434aa7f573843017a97d749cdf9fdf1768ba35a8172e17b1c98f5cb68e7445ab19bd44c4b1d6b8defdcff6bcd24128b5fa176466f10752
+DIST skypeforlinux_8.85.0.409-1.x86_64.rpm 125943432 BLAKE2B 7300c53c85387df71a7b1ccdd56a12a659a0e8ddbf8b274c32ac956e0bd67269815bc56e4d3a91cbc3f8214a3259026147ae3e8467efec934d06424495bf502d SHA512 2ee36ea93259390bb1061aae5ea86ac5617ac411f058b62607324fc36debbd7c914e872b9a2741ff72b37bc5e1b4683d862d3c01b84f9a3fe98de2e20959c911
 EBUILD skypeforlinux-8.81.0.268.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
 EBUILD skypeforlinux-8.82.0.403.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
 EBUILD skypeforlinux-8.83.0.408.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
+EBUILD skypeforlinux-8.83.0.411.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
+EBUILD skypeforlinux-8.85.0.409.ebuild 3176 BLAKE2B 9b9cea0627d8390def0198b862781c7d03399c1062143cf3e0c779c08142164ba20b41b24d2392f94d07be813cba6fb3428c7cb478e1ce11ac720b0170512728 SHA512 6a08d650925f18c12121fceab079f286fb3413fe5d56eb51a47fabe43775ec8ab3c67bc71f85d5d958f9f41de460f4be35e1bbf4b5aaf85fb2843605d5d333d7
 MISC metadata.xml 461 BLAKE2B 9bcbfe1d6892c40ce917a76c600baad338b5b86967e5656f79b9bf29e75c3ba474dc11444d8e347769f37934610a971097f96b22ae171ea46cd3f1aef2e9f3e5 SHA512 81df3ef175eafabad357f3d5792c71534b85ffd2c1bd9280ea7ef9cbea17aceb396bc7ac65abdb09e5fba8c3d98384c0d67c58a8daa2d42a657e1a7b150b52e7
diff --git a/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild b/net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild
index 911974eaca88..911974eaca88 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild
diff --git a/net-im/skypeforlinux/skypeforlinux-8.80.0.143.ebuild b/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild
index 911974eaca88..911974eaca88 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.80.0.143.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 18e96944b9af..261ab57d8035 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,4 +1,7 @@
 DIST tdesktop-3.7.3.tar.gz 16335926 BLAKE2B 7e7760a3684b50541144c72c1b0e3e36f1b1e9bc6eef20c3fdc151f0658f7d3c867eb895242efdf916fa6057ee61ea54ce822bab8fc82a6e17e41c26f9dfdd84 SHA512 359325cf6fefc29234b7032235cc033b9844ff597aeb7b3c6b99e8e6923d52994e8767524ff37afd5d098e4005e03d1f9c8308d6a04481831fa53e22935ee049
+DIST tdesktop-4.0.2.tar.gz 16636296 BLAKE2B afd9e8277532b21367b9f75059e9bb4efa69231dae2ad9a78119fee3eddfd804507a647da663a26bcdf7ca0749eb1ab4e2824d81452836f4804dd7a19dedd0e6 SHA512 0a8f587e55e634b500346cd77508fc9b4f76f75eaf080d50c4f2a6867eeabcecb3f814624971b97cc465f6f8d88aa79998899c299b70ada43a43904a830b5ad0
 DIST tsetup.3.7.3.tar.xz 41978536 BLAKE2B 1ab5b63479acedee3b3059382761e887c7a9eca899e6496b223f32758a4f23a17da296940203765593cdac9df8a4d80264adbdf9a51b7f70d9ffc90a41661346 SHA512 05339778ea218c84406cceff7b6dfd357ff55d02f8082d222a9430aebe0a34561e9801fb4ebb44ce01c127cbca17ea53e3d61ab4d9288976d556453b9d06bce8
+DIST tsetup.4.0.2.tar.xz 43401944 BLAKE2B 705da23c4c68498c693e6908374447fd24a24434a866b4a51a11b7dbe250f6268d56f0a16a64b5aefb8ed5d4ca13fd1dacc4b1e0cf57df873403eb07f96e34cc SHA512 790a1bcc0e34ddc8d483978d9c32fe3409b1e42092647e106fef3731066cb5bd5b7c045143ef949d341be7981a8ba5d3906dd2b50eaf22c4e0b2d23ab4805c36
 EBUILD telegram-desktop-bin-3.7.3.ebuild 1417 BLAKE2B 83a97c9171023d4fa603dbcb1dd9f42c84a70dee86a1012c0f939142f0003f877b31a47f75c4bab413d6029c5857bf485c397e6bfa50921f10d0dcd55537b6ed SHA512 fe820fc44b912dc05f5368b83c493e85b5df15e1906bde818ecbb95c0be89ac8082deda2b40a1edb2cd3e9b86090b7c5c74e33203ff6715e203e95b8bfedc756
+EBUILD telegram-desktop-bin-4.0.2.ebuild 1218 BLAKE2B f8ee866f6b639c6828b62af1821e97fd3db717585341fde795e9b08330328387aca0a67667c59cc8c44fff4854baf0e5745c5b4451af4923b2b035eeed62a68d SHA512 cf82cb9cdf030274bcfce0f56205594f3e06aa6f51fb5d005d528ea374ef27bdc1016b83fc9eaec372ca2e8ef03dbae115e5d573258367a68e4983c11702dbce
 MISC metadata.xml 617 BLAKE2B 5aed21ce280bfc0d23ba9c4e75dbc8841637ef702cb67686ee91b46dc0830308ab6ff687bed89274d3217f665f989295341735f506182a0461f968d05af187b3 SHA512 ec61f9dec317a9625ffcc0e1aaf2dbf323f218a6705375cd23a14827e1bc30bb496849efdebbe2a8f4fd7a28d37e170e87f0f6d6f49c56d6292220c955a27a0a
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild
new file mode 100644
index 000000000000..d0558b783945
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild
@@ -0,0 +1,52 @@
+# 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"
+
+RDEPEND="
+	sys-libs/glibc
+	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 9d264a6d50fb..e8d3196f59c3 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -8,6 +8,6 @@ AUX tdesktop-3.6.1-fix-kwayland-5.93.patch 1835 BLAKE2B dbc414e1543be96faff17928
 AUX tdesktop-3.6.1-fix-use-after-free.patch 1627 BLAKE2B 867dde2d1d8d6535e2305f841fe97477bd08c37e96684196563f9ce6dbfb12c7b2941ddc3e00182126e24ec08e1692ec201006d2c46548fcbf2f9bae09dca532 SHA512 e52369b6aee6c772bef56b73cf4656813614694af714eb83432ffbe7a2234dde4be9888e927c1304350c5c31a0a9cf37a53ea41df2e9b47a00de6dc4433a1c1b
 DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B 5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b SHA512 adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e
 DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba
-EBUILD telegram-desktop-3.5.2-r1.ebuild 4944 BLAKE2B 7a9ab13b3120d9ee38c20bd36594f6a1baa5eab19ce8f4191823520b693745fdffaa64d153e72216c02f9272bf0ee461d9ef664f8878323856fe3c812301f04e SHA512 0d48d09e1ebb41c480df1ba0f101b7233c17950430bb15b64a249ff25400b31422f6799c00d6e1191616279b7738e1120caab94f43fb2bc97a8e55459ebc0c3c
-EBUILD telegram-desktop-3.6.1-r1.ebuild 5008 BLAKE2B 9353cb74512081bfdc765d0c922b337cd84414115335c7955251688ecf49cf60cf61860ab4f3a7bdc2c67f97df6c387a7398ebe8b49a810567f61437cdb87c89 SHA512 20ccf714e586516970020f6a57138edde91edefed62499f254ff8533e5bb5a4bd48679e145667356f6a0989764dfe6b0f8fff21e66f8bdf3a1eca37fe5c1d652
+EBUILD telegram-desktop-3.5.2-r1.ebuild 4822 BLAKE2B 2511fe0122a1784d393ea19f3d0453ead0a2038c99c8b4d15f370e254f3bdd3f7dd349fc70c39a42c3ca67f7b9b4b984f452563ffe227956443d6f2d55ee0c1b SHA512 7d6d91c054a38b118f7ca028b6ceeb9b40312626cf2489f2abbc3b77bff1fbb409cc9d714ff3a299426272a33fc595ba44df696e2fc9fb23b0fb043ce7770519
+EBUILD telegram-desktop-3.6.1-r1.ebuild 4886 BLAKE2B e82263eb280dbf9443beaeeaf960be7381953c69cfc6c800aae6b8d02a273350062dd42d31f85467990c71584c6f6d33ee811260ef202866cd4df9ef65e4b190 SHA512 3a700af06f41db67a8d33ed6e2def3ab38d95770b41b444921725ef00cb5fcced425adfa3bfb69942cee5539a8284fd587df495fb43b4d4673a5f62cfa2ceb27
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
index e5bd2fb2c389..757e0eab2ba4 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
@@ -76,9 +76,6 @@ PATCHES=(
 	"${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.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
diff --git a/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild
index e17ba415be1e..ed70c3f67a7b 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild
@@ -80,9 +80,6 @@ PATCHES=(
 	"${FILESDIR}/tdesktop-3.6.1-fix-use-after-free.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
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 0ae13818614d..b607b4579059 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,10 +1,7 @@
-AUX toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch 1221 BLAKE2B 2410d954710fd59ae26a308490aca577680f1db283cbf4e6b1c403e778492bd9b889c2d7f32674a844a36b8ee4f396129fa6a3ee4a65c3c13f0b130efdb860d4 SHA512 21c493de57a1d0bc72ddccf6c1b42348ae4aae48ff009e1bc006dd22d7bfc5bfd70b76a40db1b63a03156514306fb240965053844b841988adcab15d666effbc
 AUX toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch 1274 BLAKE2B cb5f7b6e7d73c6f42b8ef30ac09ea6e9cc33d46ed4089c9fd29176ee92c1fa763108b2dd0c0cba199000c8011bb9189ab82c5aa3345341c883b31c12862d45a5 SHA512 0acd682f2657f57975ca01f353cf172b68d34edf9f08b4489b6904f956d516966ab65b38e13af3f7df5a139d3626e6efc1769e57c353daf1c29b86a5a80d6d59
 AUX toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch 746 BLAKE2B 36f533e0d6ae288f034a130c82d633d83eb881e87a724cb850dab9f0588722e509722a5f186791b542a5fb6e3a100ca60cae2e195a2adee1cf108c281e3c09ef SHA512 fa8274d334aa073919664aea8e3bdfa15e138b4acd424a8250ad9cc7652bdde2836cd108ff6a92b39570ff2405ffa27fcdcd1e04884253989acba978ddd51f14
-DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d
 DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787
 DIST toxic-0.11.3.tar.gz 1197252 BLAKE2B 4a7a3c4eed270330c6d79ad400778debda1b98b66beed1196cf4e36858d300141c468c4963d012b77d8232f7b3b3b419138505e46098bfac3cde48e9bc0b0e1c SHA512 2c8408004d9644b52cbe9477d7c486622fcef52f1d10a1bcdf7555656a2f2e1bd4c6f0594a7b0b3156fd6908c470c5b41c55e6e0914c3eb2067614013f0f259f
-EBUILD toxic-0.10.1-r1.ebuild 3051 BLAKE2B 44a340be721ec9ae43739225f3ed695ca98f3561deece983f1e9b196d7b530b568dab07dc9118536b28cc620ebe0e064128ca3c29a459ccc3c4ca86735b330c4 SHA512 670856e91e0074648fc9decbfec57dd3a4d707dae7a680f6c83e729829065157ae79efd48798f1dddadcb6c8193f7a91688683735230ae871edfffc93cf4a835
 EBUILD toxic-0.11.1.ebuild 3025 BLAKE2B b081ad285865a067de261e4a3ea49f65c4a1777f5c7bac07978a2ab5c9a2b0b38fa32fa1b037916a7dc3defdc6860ef3549b9454b6fc36ca7e5e7ebc93832213 SHA512 e2d54f02e91f4de80a3f6d50701b4adacc785b411e6e5feee1303dc70634e16b7449d079b8427fa9b2140d1b8d1383e81613d3892d24f2611c98bcd7892a4983
 EBUILD toxic-0.11.3.ebuild 3027 BLAKE2B cf907853a96a89ed1c5a59e2cdb328c796821bcb730da1670cd7d82d4933aef902deea0243b60476aedcc1a5e44ce503290807481cc3ed0c6229c835bff9b7e5 SHA512 fd34ee65ca8d421fbcacbb72b2bfce86236f878db42b250adb36b9107c9f96c67e1e8b541812220d796b70266a3710fd57ea56f6df08a29c64879c4ad1f1d91e
 MISC metadata.xml 1213 BLAKE2B 27cb3884fcbdaf0f702710b26b6a28ea42ed810a0c9eaa024d6067d4a8f20b79020f84abb4b730ef8ae01694b0dbfaa13e72f843f43efd6741b3d487894485a9 SHA512 1997d11602350b2cc9d8a684c2720876ab97319c89a055b9629540ee17fe7fad946ac28472f1ef6d3f0680fc4be4210aeec1f14775e0ad1bb6b236742369015a
diff --git a/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 68cb0bb59ccc..000000000000
--- a/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN src/autocomplete.c src/autocomplete.c
---- src/autocomplete.c	2021-07-26 15:04:59.172715491 -0400
-+++ src/autocomplete.c	2021-07-26 15:22:06.652686609 -0400
-@@ -25,10 +25,12 @@
- #include <string.h>
- 
- #ifdef __APPLE__
--#include <sys/types.h>
- #include <sys/dir.h>
-+#include <sys/types.h>
-+#include <sys/sysinfo.h>
- #else
- #include <dirent.h>
-+#include <linux/limits.h>
- #endif /* __APPLE__ */
- 
- #include "configdir.h"
-diff -ruN src/file_transfers.h src/file_transfers.h
---- src/file_transfers.h	2021-07-26 15:39:36.765990567 -0400
-+++ src/file_transfers.h	2021-07-26 15:39:41.899323757 -0400
-@@ -24,6 +24,12 @@
- #define FILE_TRANSFERS_H
- 
- #include <limits.h>
-+//This includes NAME_MAX and PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
- 
- #include "notify.h"
- #include "toxic.h"
-diff -ruN src/settings.h src/settings.h
---- src/settings.h	2021-07-26 15:04:59.176048823 -0400
-+++ src/settings.h	2021-07-26 15:12:01.772703590 -0400
-@@ -24,6 +24,12 @@
- #define SETTINGS_H
- 
- #include <limits.h>
-+//This includes NAME_MAX and PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
- 
- #include <tox/tox.h>
- 
diff --git a/net-im/toxic/toxic-0.10.1-r1.ebuild b/net-im/toxic/toxic-0.10.1-r1.ebuild
deleted file mode 100644
index 931dd62fc29a..000000000000
--- a/net-im/toxic/toxic-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="A curses-based client for Tox"
-HOMEPAGE="https://github.com/JFreegman/toxic"
-SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video +X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	video? ( sound X ) "
-
-BDEPEND="dev-libs/libconfig"
-
-RDEPEND="net-libs/tox:=
-	net-misc/curl
-	sys-libs/ncurses:=
-	sys-kernel/linux-headers
-	audio-notify? (
-		media-libs/freealut
-		media-libs/openal
-	)
-	notification? ( x11-libs/libnotify )
-	debug? ( llvm? ( sys-devel/llvm:* ) )
-	python? ( ${PYTHON_DEPS} )
-	qrcode? (
-		media-gfx/qrencode:=
-		png? ( media-libs/libpng )
-	)
-	sound? (
-		media-libs/openal
-		net-libs/tox:=[av]
-	)
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	#prevent man files from being compressed.
-	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
-	#Fix incorrect linkage of pthread (may be optional)
-	sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread."
-	#Makefile sets some required CFLAGS only if CFLAGS variable is undefined,
-	#This line changes the "lazy set if absent" assignment to a "lazy set" assignment.
-	#look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS
-	sed -i -e 's/?=/=/g' Makefile || die "Unable to force CFLAGS and LDFLAGS"
-	#Fix incomplete invocation of python-config
-	sed -i -e "s/--ldflags/--ldflags --embed/" cfg/checks/python.mk || die "Unable to fix python linking"
-	#Fix incorrect include statements for NAME_MAX and PATH_MAX macros
-	eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix header inclusion"
-}
-
-src_configure() {
-	if ! use audio-notify; then
-		USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
-	fi
-	if use debug; then
-		USER_CFLAGS+="-DENABLE_RELEASE=0 "
-		if use llvm; then
-			USER_CFLAGS+="-DENABLE_ASAN=1 "
-		fi
-	fi
-	if ! use notification; then
-		USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
-	fi
-	if ! use png; then
-		USER_CFLAGS+="-DDISABLE_QRPNG=1 "
-	fi
-	if use python; then
-		USER_CFLAGS+="-DENABLE_PYTHON=1"
-	fi
-	if ! use qrcode; then
-		USER_CFLAGS+="-DDISABLE_QRCODE=1"
-	fi
-	if ! use sound; then
-		USER_CFLAGS+="-DDISABLE_AV=1 "
-	fi
-	if ! use video; then
-		USER_CFLAGS+="-DDISABLE_VI=1"
-	fi
-	if ! use X; then
-		USER_CFLAGS+="-DDISABLE_X11=1 "
-	fi
-	USER_CFLAGS+="${CFLAGS}"
-	export USER_CFLAGS
-	export USER_LDFLAGS="${LDFLAGS}"
-	#set install directory to /usr.
-	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
-}
-
-src_install() {
-	default
-	if ! use audio-notify; then
-		rm -r "${ED}"/usr/share/"${PN}"/sounds || die "Could not remove sounds directory"
-	fi
-}
diff --git a/net-im/wazzapp-bin/Manifest b/net-im/wazzapp-bin/Manifest
new file mode 100644
index 000000000000..b6fbebc8fb4d
--- /dev/null
+++ b/net-im/wazzapp-bin/Manifest
@@ -0,0 +1,3 @@
+DIST wazzapp-0.4.2.x86_64.rpm 56402809 BLAKE2B 11a6f8db4fe91014218b09992e1e3fa36819eb73efc9081ef56af5e6aa5b0dbee78e8974eca86b28701160eb823ae58350f9da4c6d5c0e1826ee95a7ea413a55 SHA512 808fa3721d62def5d93b4b3411f1f7489d22d5c70af07174b41579263d562bb139e951434a211c36e08e7c672925f89e60eb7fdb1d79148c3adc1a9c7beafad7
+EBUILD wazzapp-bin-0.4.2-r1.ebuild 2373 BLAKE2B 162a3a7a9e009fb3a383f67ba144aff1f25a332414e552184e55175c53f8f7bda6433026601fd5aadbce421f02ef79f15f98fd6dbab5d369a1bab7cf39594dfe SHA512 e1e614e06676c8e549b2b34ed8b5ed47fa2ccdcaa0393df6210a5b1b20bd7c61faf9c229fb21818f3e73815884cbe4afdc3cedd6e825b0624edf2d60d69fa05e
+MISC metadata.xml 414 BLAKE2B 9dff28d8ba0b8447b16c0c53f3e9511528e6365b0a628192cd7ef39378e93911d7a10a0753105d679ac6a9c5eae0807ea8ea66589ed45931b3827ecb8535a5e2 SHA512 c52dfd6e0a67fcf96565a746878a48876e8e55af5e2dde074cc0c1986fe6f1c70909b72cabe8100378a7cdbfe2e610a37b19c1d8b986429ad45124bc6fd323d0
diff --git a/net-im/wazzapp-bin/metadata.xml b/net-im/wazzapp-bin/metadata.xml
new file mode 100644
index 000000000000..2b6f2305c1f4
--- /dev/null
+++ b/net-im/wazzapp-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">diospiroverde/WazzApp</remote-id>
+		<bugs-to>https://github.com/diospiroverde/WazzApp/issues</bugs-to>
+	</upstream>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild b/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..878a21a4c1b2
--- /dev/null
+++ b/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop rpm xdg
+
+DESCRIPTION="Unofficial electron-based wrapper around WhatsApp Web"
+HOMEPAGE="https://github.com/diospiroverde/WazzApp"
+SRC_URI="https://lx-dynamics.com/wazzapp-${PV}.x86_64.rpm"
+S="${WORKDIR}"
+
+KEYWORDS="-* ~amd64"
+# Electron bundles a bunch of things
+LICENSE="
+	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
+	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+"
+SLOT="0"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/pango
+"
+
+QA_PREBUILT="opt/wazzapp/*"
+
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+	# Fix desktop file to pass validation
+	sed -i -e '/MimeType=whatsapp/d' usr/share/applications/wazzapp.desktop || die
+	# cleanup languages
+	pushd "opt/wazzapp/locales" || die
+	chromium_remove_language_paks
+	popd || die
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+	default
+}
+
+src_install() {
+	for size in {64,128,512}; do
+		doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/wazzapp.png"
+	done
+
+	domenu usr/share/applications/wazzapp.desktop
+
+	local DESTDIR="/opt/wazzapp"
+	pushd "opt/wazzapp" || die
+
+	exeinto "${DESTDIR}"
+	doexe chrome-sandbox wazzapp *.so*
+
+	exeinto "${DESTDIR}/swiftshader"
+	doexe swiftshader/*.so*
+
+	insinto "${DESTDIR}"
+	doins *.pak *.bin *.json *.dat
+	insopts -m0755
+	doins -r locales resources
+
+	# Chrome-sandbox requires the setuid bit to be specifically set.
+	# see https://github.com/electron/electron/issues/17972
+	fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+	dosym "${DESTDIR}"/wazzapp /opt/bin/wazzapp
+	popd || die
+}
diff --git a/net-im/whatsapp-desktop-bin/Manifest b/net-im/whatsapp-desktop-bin/Manifest
index 3d389518c1be..938fd7a4cf14 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 1222 BLAKE2B 3bf6ab615ee4cf1c81127c5ac8eaa4a1ebb5ac65fdb613e5fbfc84319c9cd7ceade237f9e6328aabe43a873d5616e7e52a867153490aa0c5560f53348e652157 SHA512 e62509b529cb4dbadba327d4c761d125b1071bd5d86f22bd60906f0823c471f4a9f141206fb66dab248f4871fa7b327206b3560697ed5795bbbbbce0b565559d
+DIST whatsapp-desktop-bin-amd64-0.5.2.deb 79421814 BLAKE2B db9a2c29b1fc02a265f42d87c3582917bdbbeb99debf09a0e4ba97446b962483f6b6c06f36c1bbae826142085f9445b895f16c98e1f1d847f8730cd81889ace8 SHA512 4b5fecfeea2eebeadebacc96bcb217fe030f23a37b7979f3ea2444f5f7bccada3d126512853ad431b997c7b46ca8d86e396143c8dd36ffdc6a0beb542b77b41e
+DIST whatsapp-desktop-bin-x86-0.5.2.deb 68963072 BLAKE2B fb03f73e489369a5911cc5bf44595227cdc6de7a3c08a89dae8077c940a8a59b99829fc59885f276efa4829e43e94ad2ad5abd8373f673461753d07500f3f327 SHA512 f388a7db11b84de6283501057a28b42aaa4834582ed6e389c8d0ffff20146f890842e266cca40cd2ac71c4eae6d9f43eb2a794c5d4db4f1b435a93fcf7c25b83
+EBUILD whatsapp-desktop-bin-0.5.2.ebuild 2576 BLAKE2B 88b7476ee6ee855810cb864871f9b442325bc599c4458cf052abecc3a313291ec83363038428831d9d3827d7fdec55edfbb98f36845f285ecbc9226c56143612 SHA512 5e99475afcf11850baf79d0843064f34e82199e03d528f01228703077354480f1b5da94e1cf716428825ff8d491b87c0ebabe2aa10dc86452a2f545391e20898
 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
deleted file mode 100644
index f5747bb58c8b..000000000000
--- a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker xdg
-
-DESCRIPTION="Unofficial electron-based wrapper around WhatsApp Web"
-HOMEPAGE="https://github.com/oOthkOo/whatsapp-desktop"
-SRC_URI="
-	amd64? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v${PV}/whatsapp-desktop-x64.deb -> ${PN}-amd64-${PV}.deb )
-	x86? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v${PV}/whatsapp-desktop-x32.deb -> ${PN}-x86-${PV}.deb )
-"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/libappindicator
-	dev-libs/nspr
-	dev-libs/nss
-	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
-	x11-libs/libnotify
-	x11-libs/libxcb
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-"
-
-QA_PREBUILT="/opt/whatsapp-desktop/*"
-
-S="${WORKDIR}"
-
-src_install() {
-	cp -a "${S}"/* "${ED}" || die
-}
diff --git a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild
new file mode 100644
index 000000000000..dec45a3a26f8
--- /dev/null
+++ b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+DESCRIPTION="Unofficial electron-based wrapper around WhatsApp Web"
+HOMEPAGE="https://github.com/oOthkOo/whatsapp-desktop"
+SRC_URI="
+	amd64? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v${PV}/whatsapp-desktop-x64.deb -> ${PN}-amd64-${PV}.deb )
+	x86? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v${PV}/whatsapp-desktop-x32.deb -> ${PN}-x86-${PV}.deb )
+"
+S="${WORKDIR}"
+
+KEYWORDS="-* ~amd64 ~x86"
+# Electron bundles a bunch of things
+LICENSE="
+	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 GPL-3 LGPL-2.1 APSL-2
+	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+"
+SLOT="0"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/libappindicator
+	dev-libs/nspr
+	dev-libs/nss
+	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
+	x11-libs/libnotify
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+"
+
+QA_PREBUILT="opt/whatsapp-desktop/*"
+
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+	# cleanup languages
+	pushd "opt/whatsapp-desktop/locales" || die
+	chromium_remove_language_paks
+	popd || die
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+	default
+}
+
+src_install() {
+	for size in {64,128}; do
+		doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/whatsapp.png"
+	done
+
+	domenu usr/share/applications/whatsapp.desktop
+
+	local DESTDIR="/opt/whatsapp-desktop"
+	pushd "opt/whatsapp-desktop" || die
+
+	exeinto "${DESTDIR}"
+	doexe chrome-sandbox WhatsApp *.so*
+
+	exeinto "${DESTDIR}/swiftshader"
+	doexe swiftshader/*.so*
+
+	insinto "${DESTDIR}"
+	doins *.pak *.bin *.json *.dat
+	insopts -m0755
+	doins -r locales resources
+
+	# Chrome-sandbox requires the setuid bit to be specifically set.
+	# see https://github.com/electron/electron/issues/17972
+	fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+	dosym "${DESTDIR}"/WhatsApp /opt/bin/WhatsApp
+	popd || die
+}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 678b8b6d1eb8..fa1e493ae031 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,5 +1,7 @@
-DIST zoom-5.10.4.2845_x86_64.tar.xz 129882272 BLAKE2B e1d1e4aa460e56afc906ec2a0b9f8fd3c4ef40bfcc303993b01bde8d84f9935ab867c1527922771c19df451c4452b3838bcb262fbd43bcb65c2b35c021c56c07 SHA512 60115858e391c064893cdb85362fba733c48326acc8bb46e01fd8d6b1875ec0f2b53bf9c85b64a0d33456a781a9c613208705fa4cf03d87959d5254caf00c14f
-DIST zoom-5.9.6.2225_x86_64.tar.xz 57384044 BLAKE2B a6712499d903fa715170b9a50bf3fd1fadf7f403f4c9a9ff5ed890faf65ffd5564d06f64f26ca596598ef2c5cb53b4a477d8b08f7f7d44282911a890a00900d2 SHA512 f2899377c66cada60bf08326b7cd06a64b659d06fbdc19f0d6f1f0a6458bbfa0a40e59bdfb7ab4fe4877c0bde2f29fd0bfb8e05227b3c7cca66880e713345f10
-EBUILD zoom-5.10.4.2845-r2.ebuild 5735 BLAKE2B c036cdd9727db8da6ce14ba85e59e757be3343d409bf2e5a51c74bd94cdde345969e4c47807297fbe8a76b2654eeb0409b06f76337a5b2cdbe2bb614f1bec38e SHA512 6965dfeb4e66dab5feca573b29c48533d355b23b133fba63a52f8f14b227f9a5d722fa4a98cd55183cbe8b8ba4ebe81d6146c397c8f068bb51287e52f865a804
-EBUILD zoom-5.9.6.2225-r2.ebuild 5164 BLAKE2B 08d55d7c77006a0d3a3552b88fe0705e7dbe0241bb2a517fbdfb58ecc29d4154c5bfc878dd869b94bbdad1fd023d18e41f0d99d153fad05f62a8a299ed769f9f SHA512 cee75567e1a0298cbfd0a90de46da4fdc43fc05d340c104f281c70c9094192cf968fdd5529d858cf12de31604f95fa2e1ab3f90cdd92b763c0f1308518a155ca
+DIST zoom-5.10.7.3311_x86_64.tar.xz 130117904 BLAKE2B d3ad7501ec6fc495c62bb783c79690f5424c7e07b0cad1a3e71e20633e9df088c918a0b9a4cc5a956b016e6144da4998567ebb3ef393452caf8814d4e300c186 SHA512 acf31bc5e983500f534ccfcfe0b935a735e4a259bcfb37d99109bed41d0f3f561a664c5cbf728f907feb8ec5e79a13a27dc39c01948ee2e9f1bab2288e450231
+DIST zoom-5.11.0.3540_x86_64.tar.xz 131577872 BLAKE2B 11d40635b83469672bd9da1aea3312b735ff924d85faf515f435dba1e11c2b957c76d56a05490b2d55d4f3db3fc84b46a96a3cdd23ab2e137e4f4e9d8c87d109 SHA512 6b58e1978710f1293438164edb02ab0920e479851f7fee137bdbdc13b9d70d168a253ec140f68c6922d523e183808a31bb3527fea893bf480e1a34f7e703b5f6
+DIST zoom-5.11.1.3595_x86_64.tar.xz 131583416 BLAKE2B 9848b198bc8c523287e68d85ec42bbb5c1fc6448210c4104273bf6680f4fa2f460a5f880f07d6d5d65aa83cd58c82b071be83205e505c097c205370cd1304c35 SHA512 9e02dcbd33369334521cc51f8a64db1f677fe887773fa73e4ade10f01a0e0ac48cce3ff6ce962d52208935ecf19f82c22c9d81702e9839c30f0cdaa3fd9fde4e
+EBUILD zoom-5.10.7.3311.ebuild 5458 BLAKE2B cdc8359fd0a0850fbba3199ce9d0bcf6e1cebe45e97a502a762dcf0ea479c080cd496ddc5e0e39db15adc8f4f5fa27bfb65938e4f8f11182d15df645aa9af04f SHA512 376c2c1a1f59314001cf52fb9dcc65b19fdd300ddf73593f5c1dd16cb62ea19a3b0bbc4cc467756c533a2b880794737b157b2cf40bb5c7a2a574b049d7a23b00
+EBUILD zoom-5.11.0.3540.ebuild 5458 BLAKE2B cdc8359fd0a0850fbba3199ce9d0bcf6e1cebe45e97a502a762dcf0ea479c080cd496ddc5e0e39db15adc8f4f5fa27bfb65938e4f8f11182d15df645aa9af04f SHA512 376c2c1a1f59314001cf52fb9dcc65b19fdd300ddf73593f5c1dd16cb62ea19a3b0bbc4cc467756c533a2b880794737b157b2cf40bb5c7a2a574b049d7a23b00
+EBUILD zoom-5.11.1.3595.ebuild 5458 BLAKE2B cdc8359fd0a0850fbba3199ce9d0bcf6e1cebe45e97a502a762dcf0ea479c080cd496ddc5e0e39db15adc8f4f5fa27bfb65938e4f8f11182d15df645aa9af04f SHA512 376c2c1a1f59314001cf52fb9dcc65b19fdd300ddf73593f5c1dd16cb62ea19a3b0bbc4cc467756c533a2b880794737b157b2cf40bb5c7a2a574b049d7a23b00
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.10.4.2845-r2.ebuild b/net-im/zoom/zoom-5.10.7.3311.ebuild
index ed1876ca6598..de370171be34 100644
--- a/net-im/zoom/zoom-5.10.4.2845-r2.ebuild
+++ b/net-im/zoom/zoom-5.10.7.3311.ebuild
@@ -170,12 +170,6 @@ src_install() {
 		&& DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland,
 			edit ~/.config/zoomus.conf and change the value of
 			enableWaylandShare to true."
-	if has_version ">=sys-libs/glibc-2.34[clone3(+)]"; then
-		local w warn=( "If you encounter illegal instruction errors with zoom,"
-			"try disabling the clone3 use flag of sys-libs/glibc." )
-		DOC_CONTENTS+="\\n\\n${warn[*]}"
-		for w in "${warn[@]}"; do ewarn "${w}"; done
-	fi
 	readme.gentoo_create_doc
 }
 
diff --git a/net-im/zoom/zoom-5.9.6.2225-r2.ebuild b/net-im/zoom/zoom-5.11.0.3540.ebuild
index 01a338330463..de370171be34 100644
--- a/net-im/zoom/zoom-5.9.6.2225-r2.ebuild
+++ b/net-im/zoom/zoom-5.11.0.3540.ebuild
@@ -17,28 +17,43 @@ IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
 RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
 	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
 	>=dev-libs/quazip-1.0:0=
+	media-libs/alsa-lib
 	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
+	media-libs/mesa[gbm(+)]
 	media-sound/mpg123
+	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
 	sys-libs/glibc
 	virtual/opengl
+	x11-libs/cairo
+	x11-libs/libdrm
 	x11-libs/libX11
 	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
 	x11-libs/libXrender
+	x11-libs/libxshmfence
 	x11-libs/libXtst
+	x11-libs/pango
 	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? (
@@ -89,7 +104,7 @@ src_prepare() {
 src_install() {
 	insinto /opt/zoom
 	exeinto /opt/zoom
-	doins -r json ringtone sip timezones translations
+	doins -r cef json ringtone scheduler sip timezones translations
 	doins *.pcm Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher *.sh
 	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
@@ -119,9 +134,8 @@ src_install() {
 
 		(	# 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 \
+			rm -r Qt/labs/location 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
@@ -136,7 +150,7 @@ src_install() {
 		fi
 	fi
 
-	make_wrapper zoom /opt/zoom{/zoom,,}
+	make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef
 	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
 		"Network;VideoConference;" \
 		"MimeType=$(printf '%s;' \
diff --git a/net-im/zoom/zoom-5.11.1.3595.ebuild b/net-im/zoom/zoom-5.11.1.3595.ebuild
new file mode 100644
index 000000000000..de370171be34
--- /dev/null
+++ b/net-im/zoom/zoom-5.11.1.3595.ebuild
@@ -0,0 +1,185 @@
+# 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
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/quazip-1.0:0=
+	media-libs/alsa-lib
+	media-libs/fdk-aac:0/2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa[gbm(+)]
+	media-sound/mpg123
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/glibc
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon[X]
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libxshmfence
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	opencl? ( virtual/opencl )
+	pulseaudio? ( media-sound/pulseaudio )
+	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" height="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 cef json ringtone scheduler 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 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,} /opt/zoom:/opt/zoom/cef
+	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
+		"Network;VideoConference;" \
+		"MimeType=$(printf '%s;' \
+			x-scheme-handler/zoommtg \
+			x-scheme-handler/zoomus \
+			application/x-zoom)"
+	doicon videoconference-zoom.svg
+	doicon -s scalable videoconference-zoom.svg
+
+	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
+		the whiteboard) require display compositing. If you encounter
+		a black window when sharing the screen, then one of the following
+		actions should help:
+		\\n- Enable compositing in your window manager if it is supported
+		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
+	use wayland \
+		&& DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland,
+			edit ~/.config/zoomus.conf and change the value of
+			enableWaylandShare to true."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-im
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)