gentoo resync : 22.12.2021

37 files changed, 717 insertions, 262 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index f073cf575976..8a7f1ad91f9e 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index f20e985aad64..23bcfa28c8d2 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
 DIST discord-0.0.16.deb 77079990 BLAKE2B 17cb04baa4eab3494593c54bc556a8e1d01352aa1ba7d1d27da722e53f5445386054b038b57281c5955f46416eccef9fc3521c1b91b3b593c495c29e2537d0c0 SHA512 4ea06420b27cc6dff813798c23d44478bbe4fea2919011796d271f94fcc2e25bae65e7c5c952a6723daa928d3ac99b913198a8500c76a0eef56138dda610c5de
-EBUILD discord-bin-0.0.16-r4.ebuild 2185 BLAKE2B 2943f2337c1f279db1b12906e15fe4fd0c3921253a1d5964a15f466be9562f804defdd93569309ae993a2de5364c02e9020e490b03aa177eabd9d2aa4389c0d2 SHA512 43bd7b871041df604007cd39a828276e931eecb31be0e89ce4a37d711144dff861f6f049a2118f60b0f39a035a89634161893a3b5fa33a959189c13f87d08808
+EBUILD discord-bin-0.0.16-r4.ebuild 2184 BLAKE2B 29eed49ce6930cb57c32758ed18883be68841e0a04f6351348574fab7d7b538f719417a04343d75c913944745f45280babd222ed5fae15441725565dbf7c2e5d SHA512 7ba68d1275d9c4e5073fc2c35d660bb37a0ff87e33aef10b104495974a260bf2e1cb433064fee932a051fcb1bb85108532377fb3d34dbe58afcfa476864a1f65
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-im/discord-bin/discord-bin-0.0.16-r4.ebuild b/net-im/discord-bin/discord-bin-0.0.16-r4.ebuild
index 48e53417c99b..e8d74ae05be7 100644
--- a/net-im/discord-bin/discord-bin-0.0.16-r4.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.16-r4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="mirror bindist"
 
 # libXScrnSaver is used through dlopen (bug #825370)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 1298ba2c3532..0272979c5fe1 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,4 @@
+AUX adjust-ejabberd.service.template-to-Gentoo.patch 1088 BLAKE2B 38405d4fa1119a8eca09fb22c1055182e7dfc5f4ce89440382694ba4da2bebf85934bde40204884e777343276448a8d7f256ae795db0c61e02ae82a8021116af SHA512 6c1417d40c17951c8187a4df72fbd755a4b408405a23aaed879e6cd7c01d4df0b7c52f3b8f64c2950f3a3d9996dfc4b29e77ebc5f035d5b13ab5c741c24038b6
 AUX ejabberd-17.04-0002-Dont-overwrite-service-file.patch 470 BLAKE2B 0dd597eaa63ccedafbb5c2903f948cc078c4951c551f76827f66198b4a25ac71f81dfaa36a0e0f443a8567c5d4309d00bc7ed59732a945dd0696d08edea5189f SHA512 a6b38ae82a0fe5d5d643eb2a122921aff3a9701381f6162213cee11b4950bdb9f16add78465a01eb6df5824dfa4ba2adae6dc0451749f76eefd224f5f97b8b01
 AUX ejabberd-19.08-ejabberdctl.patch 1238 BLAKE2B 04b4317661afb77525b3d09fc2b1499faeb8ba49f32971f5302e64849808d7da21530d351aa728790e00cef076b8d679d1ca2ebb39e72d999ba3e628637ba00f SHA512 34e3aaecae83b8c00998dec3c8f26389a00af4aebf59592dcc0fa0afb917fbe33b057e83b38d3f5c24dad9e877d0a02c6b14a6d3396a6549e98e372fc293e9be
 AUX ejabberd.confd 161 BLAKE2B f08ab6310c950d3d248fbaf5e6e35bca2e31289ae476b2379a779ebc38926e091cf04883cce94cedff1e4dcf6ec3224079e7828502b97451a8a96fd278a4d102 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb
@@ -7,6 +8,9 @@ AUX ejabberd.tmpfiles.conf 78 BLAKE2B d516116f500baf9972b4bdee069ab9930bcc8aa309
 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449
 DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
 DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
+DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
 EBUILD ejabberd-20.04.ebuild 9084 BLAKE2B eaf5b71f770f15df5697b52aafcd06c45f7f23ceae80e488bb9d815a2b6996349470541b6d4dc94bf1a98d2f78733f39236263dd6bec70a852ee800d1f9af994 SHA512 963b849ffb6d2a6879777205a7bc84349fb379eb00b8afbd4d574c77fa276246e943c92598bfeba0badfe0a7b92e4b07c6357e0b91ca7cb49cce90c1b8653d60
+EBUILD ejabberd-21.04-r2.ebuild 7519 BLAKE2B e7e934bac544603e9160004a534f59e121cfa167fbc6889e070c0eb0353a925cfa51b19c4c37002aa3e0e25632eeff0f10c5f0ae4174b2dde99d8a097c987be5 SHA512 219c906693f428947a1d2d213779432d3dbf801b8ed48a7b0eb03febbc0fb26f7fea2ec8cdc1afb340abfe0a3c236de192d206a8930d92e13d27e014246e01b9
 EBUILD ejabberd-21.04.ebuild 8513 BLAKE2B d6f4f4b124f0adadf319caedbf6fe29f63423c8a1b204f9e7577f8b2752264cd754682b7ea61ada493326c41dee9d2b77f819d833a4b9179cc6f4686924ce752 SHA512 606f72c427143783f2f0555c2aca330fff0c8e10dee3e6c1c267f537d8eebaaf7ac4a6ef723e3e8cbfe900bc9b8fe91529268b08f19ecfda43e54317472ea8f2
+EBUILD ejabberd-21.12.ebuild 6995 BLAKE2B 51b085c1d217041aef06efee30c967eb1f19559d13353f694ae6d563cb024832c8b43b2da7ad86480bdc69449279b6972f60e807314777d65fce01b5e4e8a54c SHA512 2c2d6ef5626132098eaebe185e455e0c5b48f372b7328ec9785abbbeac5c86d35adf784c809c8adfc328220e36a0a246cea0c8f1c80072d1e05cb82a63be3b23
 MISC metadata.xml 1517 BLAKE2B 5db739eeebcfcb1be6ee3fe281e40bbd3f98943c26910247fce1d491f6300b6c5e1814906838b846a2716b2a50bc8ed26219db49cd1101a9263e23d607d5afdb SHA512 a1856f7fea3d1add4503f1c3b92c6318bbfce0946f44d8e18c44be98d11e814bf56d73b626ee825787871a5adc834541853c7350709ef8204182fafd6dec1710
diff --git a/net-im/ejabberd/ejabberd-21.04-r2.ebuild b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
new file mode 100644
index 000000000000..63128525a5ca
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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.28
+	>=dev-erlang/eimp-1.0.20
+	>=dev-erlang/fast_tls-1.1.12
+	>=dev-erlang/fast_xml-1.1.46
+	>=dev-erlang/fast_yaml-1.0.31
+	>=dev-erlang/yconf-1.0.11
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/jose-1.9.0
+	>=dev-erlang/lager-3.6.10
+	>=dev-erlang/p1_oauth2-0.6.9
+	>=dev-erlang/p1_utils-1.0.22
+	>=dev-erlang/stringprep-1.0.25
+	>=dev-erlang/xmpp-1.5.3
+	>=dev-erlang/pkix-1.0.7
+	>=dev-erlang/mqtree-1.0.13
+	>=dev-erlang/idna-6.0.0-r1
+	>=dev-erlang/p1_acme-1.0.12
+	>=dev-erlang/base64url-1.0.1
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.18 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.10 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.11 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	sip? ( >=dev-erlang/esip-1.0.42 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.12 )
+	stun? ( >=dev-erlang/stun-1.0.43 )
+	zlib? ( >=dev-erlang/ezlib-1.0.9 )"
+RDEPEND="${DEPEND}
+	acct-user/ejabberd
+	captcha? ( media-gfx/imagemagick[truetype,png] )
+	selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+	"${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="${1}"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
+		-e 's!^(After)=(.*)!\1=epmd.service network.target!' \
+		-e '/^After=/ a Requires=epmd.service' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	make_ejabberd_service
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+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() {
+	emake REBAR='rebar -v' src
+}
+
+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}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+	# /var/lock/ejabberdctl is unused, see
+	# https://github.com/processone/ejabberd/pull/3724
+	rmdir "${ED}/var/lock/ejabberdctl" || die
+	rmdir "${ED}/var/lock" || die
+
+	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
+		echo
+		elog "For configuration instructions, please see"
+		elog "  https://docs.ejabberd.im/"
+		echo
+	else
+		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
+		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
+
+		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
+		ewarn "(just as upstream) and *not* /etc/ejabber."
+		ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
+		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
+		ewarn "Please check your configuration."
+	fi
+}
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild b/net-im/ejabberd/ejabberd-21.12.ebuild
new file mode 100644
index 000000000000..3f4d03ad5e89
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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.29
+	>=dev-erlang/eimp-1.0.21
+	>=dev-erlang/fast_tls-1.1.13
+	>=dev-erlang/fast_xml-1.1.48
+	>=dev-erlang/fast_yaml-1.0.32
+	>=dev-erlang/yconf-1.0.12
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/jose-1.11.1
+	>=dev-erlang/lager-3.9.1
+	>=dev-erlang/p1_oauth2-0.6.10
+	>=dev-erlang/p1_utils-1.0.23
+	>=dev-erlang/stringprep-1.0.27
+	>=dev-erlang/xmpp-1.5.6
+	>=dev-erlang/pkix-1.0.8
+	>=dev-erlang/mqtree-1.0.14
+	>=dev-erlang/idna-6.0.0-r1
+	>=dev-erlang/p1_acme-1.0.16
+	>=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.16 )
+	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.0.47 )
+	zlib? ( >=dev-erlang/ezlib-1.0.10 )"
+RDEPEND="${DEPEND}
+	acct-user/ejabberd
+	captcha? ( media-gfx/imagemagick[truetype,png] )
+	selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+	"${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+	"${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="${1}"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# 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
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+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() {
+	emake REBAR='rebar -v' src
+}
+
+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}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.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
+		echo
+		elog "For configuration instructions, please see"
+		elog "  https://docs.ejabberd.im/"
+		echo
+	else
+		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
+		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
+
+		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
+		ewarn "(just as upstream) and *not* /etc/ejabber."
+		ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
+		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
+		ewarn "Please check your configuration."
+	fi
+}
diff --git a/net-im/ejabberd/files/adjust-ejabberd.service.template-to-Gentoo.patch b/net-im/ejabberd/files/adjust-ejabberd.service.template-to-Gentoo.patch
new file mode 100644
index 000000000000..9bf8e10f87a9
--- /dev/null
+++ b/net-im/ejabberd/files/adjust-ejabberd.service.template-to-Gentoo.patch
@@ -0,0 +1,39 @@
+From c0af543fc3b6047f66bfe820e7ce75abd3ed2049 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Fri, 10 Dec 2021 12:36:45 +0100
+Subject: [PATCH] Adjust ejabberd.service.template to Gentoo
+
+---
+ Makefile.in               | 2 +-
+ ejabberd.service.template | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ab0e9d96702e..4d97570733aa 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -300,7 +300,7 @@ install: copy-files
+ 	chmod 755 ejabberd.init
+ 	#
+ 	# Service script
+-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
++	$(SED) -e "s*@ctlscriptpath@*/usr/sbin*g" \
+ 		-e "s*@installuser@*$(INIT_USER)*g" ejabberd.service.template \
+ 		> ejabberd.service
+ 	chmod 644 ejabberd.service
+diff --git a/ejabberd.service.template b/ejabberd.service.template
+index 685a104d00ae..e384e920280b 100644
+--- a/ejabberd.service.template
++++ b/ejabberd.service.template
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=XMPP Server
+-After=network.target
++After=epmd.service network.target
++Requires=epmd.service
+ 
+ [Service]
+ Type=notify
+-- 
+2.33.1
+
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 0b3b48b654ce..c32cd811c4af 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.9.5_amd64.deb 81353792 BLAKE2B ef965955b54b9b9ce9af5ab8539e91bba4878c53d200143a82e47dbb946981d96df7b5a94f77aadb493fb46904794c6d73d04ee2d09b45c2b8922405b921f437 SHA512 f9e5cfcb81568dd4763279ccc0375ac45d9ff02cb0f897b35fda79d0b33a5dcbd529111972faed59e1f05d07f38653f57a324c1055b0da8839dd6a669e3e6d07
-EBUILD element-desktop-bin-1.9.5.ebuild 1775 BLAKE2B fceebd338ba37c6b99e77173d1fc46a72ea0d31a99874cce4d8049d61d6d18a1a5d68f2d30fa76e97d8d6940a4ad00ca346b7fdab08fa9f79a2df4b0a7037a99 SHA512 ea696a699ad1d7b53dd98be0f2eaa91929c56b12f9bb36e534ceb8e2984cd1250ab9a569231221d76336d4f787057b691aa9a2e5297b6f476660573b21468539
+DIST element-desktop_1.9.7_amd64.deb 81377812 BLAKE2B 41d271827ad0e2f12f1e79813c06c179741f7a938017bb2f8a893f92ae351c732c62d250aa645ddccadcddb1310c1bd0a1567c785483ad3048a9907a18bf9f8c SHA512 d04bc76344e8648f1ba872f83133f01753a346616adf172e3588e54ef50caf1aaa16268aa5da6e28d14cfc94f2c2e1017707478a8b76b55e46962811520917e7
+EBUILD element-desktop-bin-1.9.7.ebuild 1775 BLAKE2B fceebd338ba37c6b99e77173d1fc46a72ea0d31a99874cce4d8049d61d6d18a1a5d68f2d30fa76e97d8d6940a4ad00ca346b7fdab08fa9f79a2df4b0a7037a99 SHA512 ea696a699ad1d7b53dd98be0f2eaa91929c56b12f9bb36e534ceb8e2984cd1250ab9a569231221d76336d4f787057b691aa9a2e5297b6f476660573b21468539
 MISC metadata.xml 350 BLAKE2B 050eceeb985e81547b5f0c590916c9f8bdb33558e0adfbd4f3a648abafcf12e07e1942be0151b1ac1dd1e637cfb6fd5ba68e549ed1982e044896e07c18522917 SHA512 55e9b181e332a870595c816bea6093007d60642b0271a88e047cc85e820311340d609618070643accd77cfb5df335b90187a01c15c349cb65e9d96b6f188978c
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.9.5.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.9.7.ebuild
index 52197085f09a..52197085f09a 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.9.5.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.9.7.ebuild
diff --git a/net-im/kouchat/Manifest b/net-im/kouchat/Manifest
deleted file mode 100644
index da6fa42ad9a8..000000000000
--- a/net-im/kouchat/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST kouchat-1.1.0-buildfiles.tar.gz 2793 BLAKE2B 0b852a4cc65ef16993b01205f81cb2a3f7a4238425d62b499672529396cf6cc2506a50a9bbfc87c56fd4e6780064f6a8cb84920a00d2f0200520369bb02849d9 SHA512 daae5a4f3374ab588214321793725f4b9add063f4c7b98f64f6db0ab71cc2d07f2ae9f27fb0ed12c7704604fd97781b0cfa9bdb0a188782c4f5bd0172e167c89
-DIST kouchat-1.1.0-src.tar.gz 363491 BLAKE2B 3b4c72678a10892cd4b145c496b5d1042f8b6820806326f985f3313d5b764ee0beb85b0594cc532370f459ac630045a71f9a994d21dfe87c6ad744ecc163c0be SHA512 838d2afac858d698a543ad9ca6e249fa6439cd6f31bf67d20bc44961c9dcbed843fefb51430202666c74c02ec71b8bd30edbd5dcfe5a15d2c364426e99350c27
-EBUILD kouchat-1.1.0.ebuild 846 BLAKE2B 7b66192382e4141a8c2312ebd1505634acdd8e8c4fda3fbcefe79112fad053a778b5a345f0e6c4e90de47174c5cca8c0f5cbffad05d9257bd0a88d513cd53b0d SHA512 f99457f26122995b0ca1df1515a2326d62ed3dd4a08ab25f4f5532a0e88d0d468006a43e9b398f09f202a1a75ab08c0b01e73d7e043cd421473fdd18afe0cdb2
-MISC metadata.xml 314 BLAKE2B c826748044b08bb8ae6730a6f8c304f0533b78b3c71b1ea62caee54403e35654762ba6392a8eaaafa97ab5a05830954c9a6c01cc6485a23218e2955c197f87b8 SHA512 de0d574fd0fb1a9691ed196870d81b937c26388cee961824c16853256790d3ad2ea96c12ae3be15931434a550110bf80f60621d1ca6fa5c7fdacec055368db98
diff --git a/net-im/kouchat/kouchat-1.1.0.ebuild b/net-im/kouchat/kouchat-1.1.0.ebuild
deleted file mode 100644
index b719616ecc03..000000000000
--- a/net-im/kouchat/kouchat-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE=""
-
-inherit desktop java-pkg-2 java-ant-2
-
-DESCRIPTION="KouChat is a simple serverless chat client for local area networks"
-HOMEPAGE="https://kouchat.googlecode.com/"
-SRC_URI="https://kouchat.googlecode.com/files/${P}-src.tar.gz
-	https://dev.gentoo.org/~serkan/distfiles/${P}-buildfiles.tar.gz"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S=${WORKDIR}/${P}-src
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	java-pkg_dolauncher ${PN} --main net.usikkert.kouchat.KouChat
-	java-pkg_dolauncher ${PN}-console --main net.usikkert.kouchat.KouChat --pkg_args "--console"
-	newicon kou_shortcut.png ${PN}.png
-	make_desktop_entry ${PN} "KouChat"
-}
diff --git a/net-im/kouchat/metadata.xml b/net-im/kouchat/metadata.xml
deleted file mode 100644
index ddb383dcaaf6..000000000000
--- a/net-im/kouchat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">kouchat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 7ea833e6e83a..743a160406a0 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -5,5 +5,5 @@ DIST pidgin-2.14.7.tar.bz2 8713379 BLAKE2B d48670c8b7419df67c6dddedf8eb15c0c4d61
 DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
 EBUILD pidgin-2.14.6-r1.ebuild 7552 BLAKE2B df1322c043eea5f238ae31e356126a5051b15a5c2e23ff2cb85655cffc19324d85f2c98d1bacc28ef4a58342037ad278e08f194ff7d35317e4ed816f17d9d83f SHA512 6d0d0dd56fd925166dbd9bf43721a07e8b6077574ea31d3e98a23fa83a53f05801701b55f754c1c7686825e1fb2ca5dc4eab90ee733d8705a1548da591bf22af
 EBUILD pidgin-2.14.7.ebuild 7495 BLAKE2B d2ff2260170869d9ca447e325ac12a174b1a8cdeff8c86a66f5e15faada00b96a8fa0ee68f194058c67a041e963ce668b0ed76d04a9a470cd89d829b3569db4b SHA512 6ad1f97c37079222dd11118ea76e83cabf193505a51159473efefa5c144ab94ba49ee6305f6bfd1c6a5c67715b4d3788fdf3a88c927ff6637984e9cbb4aef9ed
-EBUILD pidgin-2.14.8.ebuild 7495 BLAKE2B d2ff2260170869d9ca447e325ac12a174b1a8cdeff8c86a66f5e15faada00b96a8fa0ee68f194058c67a041e963ce668b0ed76d04a9a470cd89d829b3569db4b SHA512 6ad1f97c37079222dd11118ea76e83cabf193505a51159473efefa5c144ab94ba49ee6305f6bfd1c6a5c67715b4d3788fdf3a88c927ff6637984e9cbb4aef9ed
+EBUILD pidgin-2.14.8.ebuild 7490 BLAKE2B bb47ba2fb8d1d3c280ccfe4f3abe43e10cb8e3f384c8ff8d7ff8853e01ef7abcbd8c75e2ce15ebd7a3b41057c7f4d39f61a28d2432e7ff9810801a3585f33054 SHA512 45f60542459d1a03830fc1c083d4ce25f598e9ee7254329cb7255b607f1c2df1b40fa1666acfdc358256223b0fb808c3b30da2b9826ae3b742326a4cc310fb21
 MISC metadata.xml 1419 BLAKE2B 6b87c11749b1e15503eddb0d73d18ed264e86d8d8e515cd30ba6787117401f8f07ea5030accd5cbf86da7c059eaf4f4d2fa3ff5d0c2bf5db1f987f5f536ac448 SHA512 c7bc589c6ddd1fb628832105691f08555f0fd7e5578bd3c5905a6b082198c36a34f86182a8772b8e8aa14b75f2b99eeba99c2c77ef480f3d80fa199aa792067d
diff --git a/net-im/pidgin/pidgin-2.14.8.ebuild b/net-im/pidgin/pidgin-2.14.8.ebuild
index 5b28584d138a..9fa6d8518eac 100644
--- a/net-im/pidgin/pidgin-2.14.8.ebuild
+++ b/net-im/pidgin/pidgin-2.14.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 tk +xscreensaver zephyr zeroconf"
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 9351ad83fd23..2cbaaa5fa866 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -3,5 +3,7 @@ AUX prosody.initd-r5 987 BLAKE2B 3e381f48cbc9c5361bdc6cb9ab4a13daf055cd35389036b
 AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafbf7f691c36910f41d0b81d701bf8f287aea89fa368071c0c94a38f56ff3134055eb01842b578d8b57991 SHA512 0499588d1fd6e970575785b4bdaf631428601bec8a57051558c1d4c82bc74462f17d7568b8d433b14f15c51c94b181f4240d9f4574d51dcfeda291f0a68eb6f1
 AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
 DIST prosody-0.11.10.tar.gz 438888 BLAKE2B 590f97f4eb8a333701eca516de3c3bcee9cf093267d2000af03b48d32396a1be21a0cf2f8ff542e7fbcb8419138bab5cf411f71b17666593559004a8a9674367 SHA512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb
+DIST prosody-0.11.11.tar.gz 439395 BLAKE2B d9662ff9e5a767aaee86c2b0762249c702e755191359ee276f37019ac98fab52d75a23590f0c3a14f3bfde356cc2bd9802e842e1f1a7ea5da8ec3d034fa028a0 SHA512 eb9851e1b279bef894d556ca6bc6210d1cd55e0c02a9d475f74e6e6b4a2dfef704fd3de77b71cff97909925c48c60940c34cfb541e6f3801e23e90ea21d119a9
 EBUILD prosody-0.11.10.ebuild 2855 BLAKE2B 5ef0b0509a1785f01fd408585cbea1d9de23e65df65768eaa4f0e7e6aae65f321cc8e19c2a539283445b23034ba1a2238f14c7f51152d265c3d814668ac63ec2 SHA512 fdac2d0644f9e0f4f8544cca19ee3bedcecce696125d10af6709432f6001b0df02b24f57c6ad0367b2b89b67f03f6681e9a3d357f803c5c0a0db1956c1b7bba2
+EBUILD prosody-0.11.11.ebuild 2859 BLAKE2B 1843bcffff044c16f4ea44fc1d5df451348f670b0d0c5f044e8e6637fd461821cac7b48ab9b4eeb030fba823ec6b37792cc7be3718c92583f9cfc414df28d444 SHA512 685b158625923e67336104f6937f56ba742c7af66f7ccda252a162332efc7be054d731d26c9ffd354de3a4c19ad12e2317b4b0a87151614ede20251eae54b0fa
 MISC metadata.xml 670 BLAKE2B 448bf5ede2b6f09940c51fdff4642e18be22d9c3dac637271c7c8bcfde1b4af0853e2623c55c00efcd8757ef863ac37fdb895606e572911a62a1c9d5f32cc693 SHA512 6177b8e3d2ed1aeeae2f369dc693283a3f811953f71be0e004eea402aa421d89973dbefe79c8fd198e9f9f82e4b345552dc3a2c3597c05927dc1a518cacbaf1d
diff --git a/net-im/prosody/prosody-0.11.11.ebuild b/net-im/prosody/prosody-0.11.11.ebuild
new file mode 100644
index 000000000000..c8a34767663f
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.11.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_REQ_USE="deprecated(+)"
+
+inherit lua-single systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="Prosody is a modern XMPP communication server"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="icu +idn +libevent mysql postgres selinux +sqlite +ssl test +zlib"
+REQUIRED_USE="
+	^^ ( icu idn )
+	${LUA_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	$(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
+	net-im/jabber-base
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
+	dev-libs/openssl:0=
+	lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
+	mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
+	postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
+	sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
+	ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
+	zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
+	${LUA_DEPS}
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-jabber )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.11.7-gentoo.patch" )
+
+src_prepare() {
+	default
+
+	# Set correct plugin path for optional net-im/prosody-modules package
+	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--add-cflags="${CFLAGS}"
+		--add-ldflags="${LDFLAGS}"
+		--c-compiler="$(tc-getCC)"
+		--datadir="${EPREFIX}/var/spool/jabber"
+		--idn-library="$(usex idn 'idn' 'icu')"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--linker="$(tc-getCC)"
+		--lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
+		--no-example-certs
+		--ostype="linux"
+		--prefix="${EPREFIX}/usr"
+		--runwith="${ELUA}"
+		--sysconfdir="${EPREFIX}/etc/jabber"
+		--with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
+		--with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure "${myeconfargs[@]}" || die
+
+	rm makefile || die
+	mv GNUmakefile Makefile || die
+}
+
+src_install() {
+	default
+
+	keepdir /var/spool/jabber
+
+	newinitd "${FILESDIR}"/prosody.initd-r5 prosody
+	systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
+
+	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process prosody.conf
+}
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index 2b886cd6f55f..b37e45759a4b 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST rocketchat-3.6.0.x86_64.rpm 58643360 BLAKE2B 23e630112c8c28d39dbeb6824aa75d7289ad59e6cf061f2e61165511e2f57062832fb4ec64d9c985b1de94b0a28025b7f374d2a1428bc72eb6259f80cf79428d SHA512 8cc6b6842f9bdc3d13c4d293aa1aa75daba2bc66fab1262c051407fbe686fac1980e0abba3ccfa8d7cc6d96fc6391e24101b6baa9af3751edf4bf680968df142
-EBUILD rocketchat-desktop-bin-3.6.0.ebuild 1074 BLAKE2B c550bb783cf67c5e7d18896258360e4d6621fd8439aac7742f99b4792a667b9061eecc29ff9b0798febe809e785a952c2f8deaf5c2589bc551f053042a6d7fa2 SHA512 cd5e05036880fa65d35ae2cd109b88c6a8a5824bc3ec13d37538e804cf0cf309bd3ef8d7f990c8a63f85fbdcc30c4a510a1aef61face5364a86eddec09515913
+DIST rocketchat-3.7.0.x86_64.rpm 72048484 BLAKE2B c7f2d81df1cde64caf0699ac706891bd3d5bb38a976354abb344a6ea65f465fb32ceeb08c445621f5a65eda1b886b836520095ee295f7c1c6dd32ab498ea77ff SHA512 c4574520bdb60666eefde5899e304b65dc7cc9eb2cce7221d84cef6e3d003ecee0630c2175357591b5545d682be16c7bade490f37df86f80db1948c30a50e52c
+EBUILD rocketchat-desktop-bin-3.7.0.ebuild 1074 BLAKE2B c550bb783cf67c5e7d18896258360e4d6621fd8439aac7742f99b4792a667b9061eecc29ff9b0798febe809e785a952c2f8deaf5c2589bc551f053042a6d7fa2 SHA512 cd5e05036880fa65d35ae2cd109b88c6a8a5824bc3ec13d37538e804cf0cf309bd3ef8d7f990c8a63f85fbdcc30c4a510a1aef61face5364a86eddec09515913
 MISC metadata.xml 434 BLAKE2B 2253702089149978e030c97d8a21ef29c0870683e6896d105e9000e77d32d3c66c3482c2b0d2ecbbac6bc281a85be9267918f4d5691ea6c5cf6fab3ebc80db96 SHA512 9cba4c7855c123b866f6a24e99320ddb3b6a450fd5f37eadf364bd92e1e58fe7e0c3f4a6892bb26f0142869d983fe12f5b3753b1960763ffe63a0c8d0d54ebe0
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.6.0.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.0.ebuild
index 46fc3d26d958..46fc3d26d958 100644
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.6.0.ebuild
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.0.ebuild
diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index ef4678d37e0c..0f01d94207fd 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,11 +1,11 @@
-AUX signal-cli-bin-0.8.1-use-working-java-version.patch 984 BLAKE2B 3aacac42e6eb8a21da23c6d2036f8c0c13a185284c547225b2705cd069c7c2f676c49cbc36d73c3ebfd4aeb7190075c5861442d79c63f23ce73a8374ea031693 SHA512 52b1b94ebd140d3d24cb70a0f84a83b49850791e2566b258e90b5f0f44b56274f97b4bad8ab5e75de12cbae683d4e3ebcc1b8aa3e6b5a06fc09ce71b8c26ea55
 AUX signal-cli-bin-0.8.5-use-working-java-version.patch 985 BLAKE2B bb4d609753259033da89971aa297c9ed1a0371564bcfa4743df3169190c02450ea30a3667d9fec30b1ccf818e0ed26791d8c2863ea7a5674fbe9c4ecca9bdd35 SHA512 1c93e8b856a6b10aff56a15e14025588a907b1b599bf16a1d4ebc012d19636a2ee8679a8456f0989feeca743093cc83267454060797c68489512b32569782bcd
-DIST signal-cli-bin-0.8.1.README.md 5216 BLAKE2B 18c481074db03bbe3895389f81bc76c2dba63cf728d7595567c2b19a35b5254009b83c1fd3e05be23d4d63990603f01a8270d59afd8397b8135d85f9102d2a6b SHA512 bd8bf9d329c6ec6b844b0a87e0b728352a615beca0e1c64161057911a76dfd942372a7e9b92e193b374e3773eae20331d19e33190547fd6072f79ae4afee9370
-DIST signal-cli-bin-0.8.1.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2
-DIST signal-cli-bin-0.8.1.tar.gz 16870784 BLAKE2B e08f740fef6da4e7b1e4751e5cc83130a260f637f6f8a56e54dc8f91f417df9f037b7ab2e5e416e89db2e211137091132631755a3af05658eb1f30e3ef20f4f7 SHA512 3507c14730ab4a77ebb8f403d0ab13f3e42e8e91aa94c6dfc066fe494f0acb2a92aed562c55a13a5b88c69addca96c5f2aacbe731e913bf39d33f2eae0e6d9f4
+AUX signal-cli-bin-0.9.2-use-working-java-version.patch 1123 BLAKE2B a3d6606bd77eb5fdb88794c368db4fc01b2a933f450d49b2e469215cb31c6cb10093bb474f083f7c0f8e3e21b11f327ea8b890f0e0ffe8b4a6fd0b097ae399f3 SHA512 77fcb2a6cbad909ec5bdb585e6a732a0214923c95e6fbdc48027cb20e39a28296196464c66e3302e40948e03f1859649c78383535632b82aecfd3d7596a5f20b
 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
-EBUILD signal-cli-bin-0.8.1-r1.ebuild 1659 BLAKE2B 4720e70365000d46662f81af3b0572a32e9bbff4f79cb945a09d0e882446b5822df460703873fd33fa5d70e16edea4e821956170935946c734eb37bcbef06ced SHA512 11b88ee9980735edd8b640959a548813c1f8eeb2eb314c6e0cf5b0444b49cc9a9b9bf6e0abf0cd42457b8a5ac57753b9615b4778441113129308dff7a81b5381
+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.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.8.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch
index b39745214944..b7ead7d0327a 100644
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch
@@ -1,16 +1,19 @@
+This patch searches the jre 11 binary in the gentoo specific directories.
+
 Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
---- a/bin/signal-cli
-+++ b/bin/signal-cli
-@@ -84,13 +84,19 @@
+
+--- a/bin/signal-cli	1970-01-02 01:00:00.000000000 +0100
++++ b/bin/signal-cli	2021-12-08 20:43:30.490613238 +0100
+@@ -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"
+-        JAVACMD=$JAVA_HOME/jre/sh/java
 -    else
--        JAVACMD="$JAVA_HOME/bin/java"
+-        JAVACMD=$JAVA_HOME/bin/java
 -    fi
 +# This package needs Java 11, but Java 11 is currently not part of the gentoo eselect config system
 +# so we must search for matching java binaries
@@ -19,7 +22,7 @@ Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
 +	if [ -x "$J_TRY" ] ; then
 +		"$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "11."
 +		if [ $? -eq 0 ] ; then
-+        		JAVACMD="$J_TRY"
++			JAVACMD="$J_TRY"
 +			break
 +		fi
 +	fi
diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild
index e49d162dba04..e49d162dba04 100644
--- a/net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 0c53f573e71a..b627b635f790 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.25.0_amd64.deb 125668506 BLAKE2B 5200ae5e37cce808e12e6561602c313ae41f5148a95f06e4763923ac65673738d41a1b384cca659264c8161dc53b6e5728c13762df875778ddbec868782e9cb3 SHA512 9c136f30dd1ac93e51e46c0d0412b6b7e626943fcffe4b0941e634b94d81d7f227ea4efd084d7379ba0868f617b8384d0a28f3849e7ec6507629edb89dbb7582
-EBUILD signal-desktop-bin-5.25.0-r1.ebuild 2451 BLAKE2B 03428f224b207174b42cb741c2d516fc6b14a65e9d9750697c7a0a6aad3947b627963c5e5b841bd6103b4c35f8dc02299fafb82d98158a108f140cd5e1e0d0dd SHA512 e37c6569545ef52e1c8081391fc0f0c5483da6012c05704075768231c8ee8dfabe807d9fb7fec750e8cc1fa96bb9b82c4e5e8886a59a857b439d18d188699434
+DIST signal-desktop_5.26.1_amd64.deb 127893190 BLAKE2B 0d7dedf5370c1010d204ad0e13e1ca46f886eef4e2e51af1fd6f3cf163c7d6bc464d21719018dbc168818b696550fbc709a1ce6dbc242125ea856d62b2a24a4f SHA512 dffd694e637528587b4bcfa6303e41129e2872022f9e97b338ad71b4a763fedc52650d5b94a5cd1282119163968df599cf3b8bb7639879dfc4132fdcedfe7b2f
+EBUILD signal-desktop-bin-5.26.1.ebuild 2450 BLAKE2B 6c8154c7125e07452a3088420667113cd30555968c894d1cacaf51880e1eee8cf53b4c5964aaa664a578c15b73656fee0e3dd41d4362d458b579c790e5132d68 SHA512 89e75598601c1b10ac82ca6ce23fda506ec8417ef13541897998d45559e24b08d546b080e54207d3027a9c1a08fc612789f0466d9585a2a6d9c7ebc5732df244
 MISC metadata.xml 397 BLAKE2B 8b09559d9ab0428415fb6301596386acc0983bb312f099c6c5299492043f59d6b2e1145f29885e9fc429f4e0d28fccac19cdd7afb5c5ed5f70383a9075d0e466 SHA512 8fa1b372993842145229779dc730c574f688411efd3da415b00928d81947a91c1dabb7c53412aa3c413a5e1071d113b182c54b113a933c0d5ddf3de08869267b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.25.0-r1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.26.1.ebuild
index 2ef57a2b62fe..f2db453688b1 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.25.0-r1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.26.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="${PN/-bin/}"
 
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="+sound"
 RESTRICT="splitdebug"
 
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 350b5c01dca0..5735bed02f89 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,9 +1,9 @@
-DIST skypeforlinux_8.75.0.140-1.x86_64.rpm 123300996 BLAKE2B a1b0d4696489be33721fb38a832756edc0a437b93c269e512aba6ccd882e66fc9c84ba7d7a741e2761a097d7697985e32b0a65766c556cf17045a26fec6fc010 SHA512 21eb3cea11878e41f0694951dbf6447d225983c026ab7572ed8a9a5f31c38231c7b7f3ca7363535f27ef958c58db500c6d61ddfb95056145500500a9f0b30aed
 DIST skypeforlinux_8.77.0.90-1.x86_64.rpm 123643165 BLAKE2B 12c578f99f482012f54d5f9faa2d017358376902aa6879fd35ce6eba1b16e3458d4831450574158c69436b9c6103a8dd00233451b56415542e2b6e81eb9346b8 SHA512 ee1fdae1ad10f1fba91886bea52eef261151463e184746af288150bebb69d4bf0dd87d0ac4030d8d11f86054f7b2cb663b8647ce795b1bf924f23c2b7559574b
 DIST skypeforlinux_8.78.0.161-1.x86_64.rpm 123910012 BLAKE2B 560b9548f99d681c916e55a939659ab925096c7bd135a44cca99f12fa9fe913a1fbdbeaf584414e626215f313d09aec4320bfa2859892029c822b5adfc388f23 SHA512 fca1f839611d1ec46eebeacc0e90141a36fc305da90e02df1eecd529256e2609726d180b4839a2874973eb6f842bc332302f041b0b3be49293f64f2a18e7060f
 DIST skypeforlinux_8.79.0.92-1.x86_64.rpm 117949890 BLAKE2B a7150c362f117096d554c446357789f51595ff403061f81adf8be3e59452b7bf7970ff10e2fe31413f793a0a137f8f0822fd6710932e9aea2197959ef2976cfa SHA512 2094870f227acb7e0a24af4d96d39bc0cf94ea0d3e5fb5907c75ad0ff6704c55882b104a306ad5d1e350c4adf5fd4f0d8444a9ddb07d7a39ef79a8cacd7faf3d
-EBUILD skypeforlinux-8.75.0.140.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
+DIST skypeforlinux_8.79.0.95-1.x86_64.rpm 118002157 BLAKE2B 0e836e3fd0c06bb5bd57d2806b3a51772e307a9555e573fdc366ebf1b82f2f8f1e422d64981f1973962d0ed1fa689c26482a48bf8193eedb65fe009056ff651c SHA512 eda292a1cd624c9a4819362820430769ead67f08113c66e58d6a4db17af4323f5483b6dadec41075b53feb25e7d7ef4c7ab738289246724678d2af9414fe58ad
 EBUILD skypeforlinux-8.77.0.90.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 EBUILD skypeforlinux-8.78.0.161-r2.ebuild 3299 BLAKE2B c9f1e65dffa9b2ff06d5f78cfa58186488f50119a052bef11576ca5ed2b0189af3299f35a03913afce1a6ded30831d81ea759ac0cb8fa86b7b90a6db9e75e8f8 SHA512 7e2600db2c8c7b823a20257a206962d25c77654d504cae69f654f0b39a61c36fead87b0cac53d38c38d47c6fda58fcd4862ef9b1f7dfed7f60ddf0564a8c25bb
 EBUILD skypeforlinux-8.79.0.92.ebuild 3160 BLAKE2B 6c1166b7c763cdebc043131414e8d78b26f5f75b8aaa7884e06b83672da9f6b020b25a3c13a21f2c9b6359cc55c6b06cbb1914db2f63ba4490f3ff8aae28558f SHA512 7c175e3d0a531e49d5513459597fc82803c55d5ccb0f26a11fef265f7a68f9028a9ebdb79b495511d5fc6ded1fdc32691b0b99aa1cf39f3df069dc19bd4c9c4b
+EBUILD skypeforlinux-8.79.0.95.ebuild 3160 BLAKE2B 6c1166b7c763cdebc043131414e8d78b26f5f75b8aaa7884e06b83672da9f6b020b25a3c13a21f2c9b6359cc55c6b06cbb1914db2f63ba4490f3ff8aae28558f SHA512 7c175e3d0a531e49d5513459597fc82803c55d5ccb0f26a11fef265f7a68f9028a9ebdb79b495511d5fc6ded1fdc32691b0b99aa1cf39f3df069dc19bd4c9c4b
 MISC metadata.xml 461 BLAKE2B 9bcbfe1d6892c40ce917a76c600baad338b5b86967e5656f79b9bf29e75c3ba474dc11444d8e347769f37934610a971097f96b22ae171ea46cd3f1aef2e9f3e5 SHA512 81df3ef175eafabad357f3d5792c71534b85ffd2c1bd9280ea7ef9cbea17aceb396bc7ac65abdb09e5fba8c3d98384c0d67c58a8daa2d42a657e1a7b150b52e7
diff --git a/net-im/skypeforlinux/skypeforlinux-8.75.0.140.ebuild b/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild
index a44feb7c8927..9627b561f6f1 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.75.0.140.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_64 )
 
@@ -10,12 +10,12 @@ inherit chromium-2 desktop pax-utils rpm multilib-build xdg
 DESCRIPTION="Instant messaging client, with support for audio and video"
 HOMEPAGE="https://www.skype.com/"
 SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+S="${WORKDIR}"
 
 LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 
-S="${WORKDIR}"
 QA_PREBUILT="*"
 RESTRICT="mirror bindist strip" #299368
 
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 55bbcf9aeca8..5a980e816603 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,7 +1,10 @@
 DIST tdesktop-3.2.2.tar.gz 16167652 BLAKE2B 0600905c0234b5aeef742311669223df4a165463e6f32b7cc40a2ce1eba5dcccc0599ab0a4a8f2d4c10aed5f5ed985873393c0606ecbdaac22885cbde11750fd SHA512 10c7ef1f18f8b6bf16e7ea2c68a04e537c231bc26d66b86c321d7d656216881df4ecd8a9eee456974e76924d2acc80ae89eef83ed31343dc403681ef1c6a1b59
 DIST tdesktop-3.2.4.tar.gz 16167130 BLAKE2B a00350f837f55a2bf0a9206e657260a906c8a970cf9cfa6fbfd3cbb83ccdf16f5d7589bc24f297e105f9e7b0ebc5141166c2dc3f5edd09144143d295a6e65a6c SHA512 0cd7d8eeac4933db62f9a7a1350d88bf9717a567a775027d7052d0ea4d4ca4a6f3c1367482e24522c188f4cd5ad5157b6387314f87a6010b58a9366ce1f8f384
+DIST tdesktop-3.3.0.tar.gz 16276886 BLAKE2B c75da01d8cfe440c8cbeb3cc580d49c7cb2494b776b48d9da1005ff7627fcffb0f7f7d6c43887d162cc0c8f261d1b67e3af6544dbf616732c8dbfd785cf9e8e3 SHA512 fd9eee472579edd902e9e31c1442f7a21ada86af3a59f1ab0310ec41134b9a345ddf7972e638b3551c0de1b95a3ffc36e7714e2657b95b25bd3436ebd507a7ef
 DIST tsetup.3.2.2.tar.xz 40145920 BLAKE2B b1fa782af6678ae1d6511d1c066849c157a59597dc372dbf2db2a957388c8a3193dd6e8b01217fcddefac4d28c8df01a1c3791100aaef64cb4c9561cdc985dc6 SHA512 15b544563024bb7949d5527849db4c031947aba14ff1fb864261b3b02421ec20a5976232c2130ab30712b359366407959b6fc6b66e96cf1eebf0c2b14829b722
 DIST tsetup.3.2.4.tar.xz 40143108 BLAKE2B d1fd9fbcc6458e395db607c69eed4ac583d60ac57ad6370642d289719cc2dabd7ef3f13e3878f384590c4bd32d7f88d902be0871afe8219fc527af2e6eaa2225 SHA512 0c75f91afa2a71e0231a87ef4f6da82b63af3ce1de0c5ae6e5912714e5650a56b53201ef457f19acf4cd2a15daeba1ca7733858cad001fe8baf61d34144219b7
+DIST tsetup.3.3.0.tar.xz 41132564 BLAKE2B 7d3cc8de1cd56f21b988b7ae15ec96ec66fdba30cedb7f609a9c15d0a45b10cc5e0b94d5d9ed32e36c850e678e34835a44b527f7a62aac68376d2c1d09073f6e SHA512 665662f5a177475d32b49515600789374f989db1c3e7972fc5b9360c936f9d2a197e0bb0599bcb1d7b2707eb85f214e65fe7d6f9809aac3ae5c20a2c6f9dd04c
 EBUILD telegram-desktop-bin-3.2.2.ebuild 1202 BLAKE2B 08907be9fbe8435e8976c8dec97fe30c94900a3a493b2a0eed70f1abf3666fb1e12af9df29b7ed946a9d6b5b5328b2ef030343e504cb128eb582e7b87a39c4ae SHA512 bf748ef0559f940d6dd9f688a84421667ea01146008eaf3260d9a6b44f21565dc216c9a67334d47ea97040ed90ce55b022f1b2ca01777a02d0234b0e6a6b3315
 EBUILD telegram-desktop-bin-3.2.4.ebuild 1202 BLAKE2B 08907be9fbe8435e8976c8dec97fe30c94900a3a493b2a0eed70f1abf3666fb1e12af9df29b7ed946a9d6b5b5328b2ef030343e504cb128eb582e7b87a39c4ae SHA512 bf748ef0559f940d6dd9f688a84421667ea01146008eaf3260d9a6b44f21565dc216c9a67334d47ea97040ed90ce55b022f1b2ca01777a02d0234b0e6a6b3315
+EBUILD telegram-desktop-bin-3.3.0.ebuild 1202 BLAKE2B 08907be9fbe8435e8976c8dec97fe30c94900a3a493b2a0eed70f1abf3666fb1e12af9df29b7ed946a9d6b5b5328b2ef030343e504cb128eb582e7b87a39c4ae SHA512 bf748ef0559f940d6dd9f688a84421667ea01146008eaf3260d9a6b44f21565dc216c9a67334d47ea97040ed90ce55b022f1b2ca01777a02d0234b0e6a6b3315
 MISC metadata.xml 617 BLAKE2B 5aed21ce280bfc0d23ba9c4e75dbc8841637ef702cb67686ee91b46dc0830308ab6ff687bed89274d3217f665f989295341735f506182a0461f968d05af187b3 SHA512 ec61f9dec317a9625ffcc0e1aaf2dbf323f218a6705375cd23a14827e1bc30bb496849efdebbe2a8f4fd7a28d37e170e87f0f6d6f49c56d6292220c955a27a0a
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.3.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.3.0.ebuild
new file mode 100644
index 000000000000..015193a01c6f
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 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="
+	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 9dc8673fa70e..fc2235dd4045 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,10 +1,7 @@
-AUX tdesktop-2.9.3-jemalloc-only-telegram.patch 988 BLAKE2B 487ce32454a5bfb51a081c7bd6803ff6cc956b349569d5ddf17d2abb7d7d5f0714002de654e149d8aefe6880e6b827c2ffb42c22e3ffa3fc6f10286c3e805463 SHA512 a1645bac4b715bad17a78226b9e76e30117f64715b1833df17950c882940a2ebbf18c70ab9ec628002408859292b57b9c4a48f9212bd15d9d2903867012eb3cf
 AUX tdesktop-3.1.0-fix-openssl3.patch 641 BLAKE2B 0354e0c8931311e5b6561c601cd0e78d436aeda53f14332803484b278fe60c90fa74e761ac005f79d6f44f18053fa870dc9246de1ab6e63986d7bf9b7214e12c SHA512 cfbf1798a290674e1f4589db1f5f43e61a6c691c19d936090ec9b7396e6cb720aa86b86cfdbff197de68a8723c04a20e7bf858f8511b48cc8e7b924a8d6876ec
 AUX tdesktop-3.1.0-jemalloc-only-telegram.patch 1136 BLAKE2B 06811696df84c1648f63843e937d18542ec5185aee6c3fde99dcfabe982aaad49e97387910882e405ec0ec9e8a12bef615f6f920c7f603224bce347bbff3bf22 SHA512 59c3f508c4be10e182fca52e4069e88af8cd26d150625dbe14214e505f9a5461e1492450896b1e9e229444a4f403eff43e4066d7f0c866bc9631c76f2c1f847e
-DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
 DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
-DIST tdesktop-3.2.4-full.tar.gz 38537053 BLAKE2B d31f354d5efe51b6268eb42a39e1c54af7c3b570534b6f206a7e6bd5cf96555f1c6633b79eda919ffcd25ca38a48d6e297db5a1b071434bbdaddf724068fcb13 SHA512 a4651e0af49195f4f3ff15d74a616a5ccd056f15d0448687138947ab0f816b45c05dec81029b59c5e7b5eefed3059618245ad1b3b3f27f894c6accad697ecd94
-EBUILD telegram-desktop-3.0.1-r1.ebuild 4374 BLAKE2B 1bec2055cdc156572815286d0050aeacd2c388a7cd62d3b60af8140902c0b2dec0ba03a64c8ecc8e143949bcaafe24c84a4e3c79b90593c6246129ff0f60db7d SHA512 754094c452ce7c7e81034c816bab884a6b95f092e619f5774fe887fd4627db0209198e9ef666ed174ee22a3aae78f17c3373c2556c14ef94bca41a7688a90487
+DIST tdesktop-3.3.0-full.tar.gz 38662573 BLAKE2B f6cba2be02faccde77c510742dc57680a2731cd3b2bc4a2d680f6cda7fd1a634e2fa0406855a491241434daa080e782f561e5e472dcc42a8b8376c16e038b6af SHA512 ff0ac1abe264f19812c2e0b40d4861caddd6c01a3f863ccb68de9c5227282872b2bde878dcf751d7d04d36c6e0e77912619ac7863d54f25f739f3744e9bca53a
 EBUILD telegram-desktop-3.1.8.ebuild 4358 BLAKE2B a305bba1349c0bc884014cd50c06308d831f7fc27e2b4aea0136a303f1eedaeb67631a6b27dc5860614cc6018c1e692833c272ea7ce7d29e00b0768c76dd44f4 SHA512 917c1ecd3c35ef953d3b71f5f1e3adaf74ea8aaa203e550dc775dfc1eb418675f5fc1aae08eebe4e0f5fc62edf64beb9e2ae6bee8fbfd73870cbcf66d5647ef9
-EBUILD telegram-desktop-3.2.4.ebuild 4618 BLAKE2B 31504988f3f9bb9979c6e7bdaa61dc5e658f82f23d968daf70d6ad8ca5e98349e6f5bccd371b1e0ff748fb647c1011a6baa7f6ae583ef659065a21af75de837f SHA512 844da601946e54902b7f47ec68f0c211653ad8f6655f1eb440a0a1cb1edeae0e87903ee5cb0ed66ff073ff8b49ac31bbeaacdd7e82fac979bf90ca5f25a253cd
+EBUILD telegram-desktop-3.3.0.ebuild 4575 BLAKE2B 62d7cd93ecdc12f9f322c69914b65ab21d8a5e93c03b5f05b441b50531aacdfb34edaf29d52526579fdd97666a1cccd94937f71b1552208a20d4c1a360adfe0c SHA512 bf3e7a3a1bef2eab3f76b3902e8603cdeafdc0826591bb0b326266362fdbf0fee43e35ca07814b90e3fd80c07aeeea7d88984773d02ca4739d312447ac2e6631
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/files/tdesktop-2.9.3-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-2.9.3-jemalloc-only-telegram.patch
deleted file mode 100644
index f90270fccee3..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.9.3-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Only link jemalloc for the Telegram binary
-
-Some combination of factors is making the different codegen tools hang when
-jemalloc is linked for those, and they're ran under portage's sandbox. Since
-this is only used during build-time, and jemalloc is merely necessary to
-improve runtime memory use, it's unnecessary to use it for anything else.
-
---- tdesktop-2.9.3-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-2.9.3-full/Telegram/CMakeLists.txt
-@@ -1264,6 +1264,7 @@
-     PRIVATE
-         desktop-app::external_glibmm
-         desktop-app::external_glib
-+        desktop-app::external_jemalloc
-     )
- 
-     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
---- tdesktop-2.9.3-full.orig/cmake/options_linux.cmake
-+++ tdesktop-2.9.3-full/cmake/options_linux.cmake
-@@ -45,11 +45,6 @@
-     endif()
- endif()
- 
--target_link_libraries(common_options
--INTERFACE
--    desktop-app::external_jemalloc
--)
--
- if (DESKTOP_APP_USE_ALLOCATION_TRACER)
-     target_link_options(common_options
-     INTERFACE
diff --git a/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
deleted file mode 100644
index 090b6a2773bc..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit xdg cmake python-any-r1 flag-o-matic
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X"
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-	gtk? ( dbus )
-	webkit? ( dbus )
-"
-
-RDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	dev-cpp/glibmm:2
-	dev-libs/jemalloc:=[-lazy-lock]
-	dev-libs/openssl:=
-	dev-libs/xxhash
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
-	>=dev-qt/qtimageformats-5.15:5
-	>=dev-qt/qtnetwork-5.15:5[ssl]
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5[png,X?]
-	media-fonts/open-sans
-	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20210302
-	>=media-libs/libtgvoip-2.4.4_p20210302-r2
-	media-libs/openal
-	media-libs/opus:=
-	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20210626[screencast=,X=]
-	media-video/ffmpeg:=[opus]
-	sys-libs/zlib:=[minizip]
-	dbus? (
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
-	enchant? ( app-text/enchant:= )
-	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
-	hunspell? ( >=app-text/hunspell-1.7:= )
-	wayland? ( kde-frameworks/kwayland:= )
-	webkit? ( net-libs/webkit-gtk:= )
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-"
-# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/tdesktop-2.9.3-jemalloc-only-telegram.patch"
-	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
-)
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "ccache does not work with ${PN} out of the box"
-		ewarn "due to usage of precompiled headers"
-		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# no explicit toggle, doesn't build with the system one #752417
-	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
-		cmake/external/rlottie/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
-	local mycmakeargs=(
-		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
-		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
-		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk no yes)
-		-DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes)
-		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
-	)
-
-	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
-		einfo "Found custom API credentials"
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
-			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
-		)
-	else
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
-		# Building with snapcraft API credentials by default
-		# Custom API credentials can be obtained here:
-		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
-		# After getting credentials you can export variables:
-		#  export MY_TDESKTOP_API_ID="17349""
-		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
-		# and restart the build"
-		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
-		# portage will use custom variable every build automatically
-		mycmakeargs+=(
-			-DTDESKTOP_API_ID="611335"
-			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems"
-	if ! use X && ! use screencast; then
-		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
-	fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-3.2.4.ebuild b/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
index ce2c80774863..cedaf383018b 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.2.4.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
@@ -38,12 +38,11 @@ RDEPEND="
 	>=dev-qt/qtwidgets-5.15:5[png,X?]
 	media-fonts/open-sans
 	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20210302
-	>=media-libs/libtgvoip-2.4.4_p20210302-r2
+	~media-libs/libtgvoip-2.4.4_p20211129
 	media-libs/openal
 	media-libs/opus:=
 	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20210914[screencast=,X=]
+	~media-libs/tg_owt-0_pre20211207[screencast=,X=]
 	media-video/ffmpeg:=[opus]
 	sys-libs/zlib:=[minizip]
 	dbus? (
diff --git a/net-im/telepathy-logger/Manifest b/net-im/telepathy-logger/Manifest
index c4d8a1bec76e..d6b31817669d 100644
--- a/net-im/telepathy-logger/Manifest
+++ b/net-im/telepathy-logger/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-logger-0.8.2-py3.patch 15181 BLAKE2B bebd153a519ee6cd4d7e3e04b4516e6fb53b6efea1d0693133ca5807686e115d08998e9e3ad0d6308d01945a0ac1b66010c3e312346dd238c43be1418574e11e SHA512 98cd5f9af7d4781be30b15c58ca6cd3a131b52dbc5cc38eae3423fc3377a02451782838d9f32575a71dd8d6ce7f46657e17f3dee29059a728bb8988d05c716ea
 DIST telepathy-logger-0.8.2.tar.bz2 562670 BLAKE2B 357d717136fe099ee3788bcd004d3eb14e83520c39a8412f4586181e0a1c98ac21be26931759b8f0439ab6f2f9b32aaf6cbf586619ab0fe40ef0f9581b301a29 SHA512 f3eda26133a4c38eeb79b01cbe3b7801a5eb773e8b4e6ce621c47d3ca701025364c6b2b890caea00104f01ba85ae891a6fad82d7a9dc487fd7a980221cede451
-EBUILD telepathy-logger-0.8.2-r1.ebuild 1402 BLAKE2B 664a06d22c0d0d992ead95532ae76fb47087ffbf2a24e56fb77060f33ba0e1b0fed477ea14b7d475987337e0fb1fa98bf7e66ecc12256d5776785493cd0a48ce SHA512 68f24367fb7bed790daa4a2a95113926ae781d570900ca38ad3db171d047d8a186bca6970bb0c3dfd3431a1d9737c72284617217106790de597dceca56f0771a
+EBUILD telepathy-logger-0.8.2-r1.ebuild 1403 BLAKE2B 645bba895ca554fd8ea9da64ebb09e7c58655f25a937d4a8b6ba0ccb7c2e316dd0d1c5c3497fecfd98ab9f4678650ef67ea8cc6bdcede1cfbdb1fc6382d386e2 SHA512 4d12c7338fdd561be56da0344bbc99e58d81e89591743558c21f358ea9ccc96f0b908a7cdd6e3826915243d4901d787b3f010aa4a18f23bc8cae917b37d3de27
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
index a319bc8e49fe..4459caa0abcb 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit gnome2 python-any-r1 virtualx
 
 DESCRIPTION="Daemon that centralizes the communication logging within the Telepathy framework"
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index 1fe5d91fad73..1322ba87ac5c 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-mission-control-5.16.6.tar.gz 1127785 BLAKE2B 82055a86d102292dec44ddeadd99458b1cf083f5d74be09326cfae41d627f1792468a180b5cb9f5bb5712989198cc46116f39e41343ca35b3bac101e3db6003a SHA512 56d62bc7270d2d62a490361f3ef3bc39384fde05ee5d69cb7e20db4f41665bd99d05b4cd2b5992b84dbfee5400684503e44c5b8c63cfa101e0cfe6a85b005e5e
-EBUILD telepathy-mission-control-5.16.6.ebuild 1022 BLAKE2B e71c0841baf6128566b168d5ec59901e6dea5a353c091aad51e94bddf27d400e812d152f6ce83df1e389e2b4d1da89cb03175138de74d813ac601d7d7a275aa9 SHA512 fcf7b82e137999d7f0cba5c93be8e391b3bcddacdf2c560c759fa6e6a65624e059038d0f221a002bb0004ffdc3aa37e5fc42b55666314bd1132d040e6d07d8e9
+EBUILD telepathy-mission-control-5.16.6.ebuild 1023 BLAKE2B cc79d75a47aa3c1cb8119f5fab4bda9bde6baf341c4f4a3279e8d386d48c840dcebe0a7ae4c9f0aa96f848c8a5834497a893ccb1330f8c95b0b0a8b6b978a8b7 SHA512 132fad4cad992a2b55954f7e79bd72aa4c3db0c1612f9590e70699727c1584476606c02e616fd205f440181723991d5925e3cc623315fb0d85bdc16564e9675c
 MISC metadata.xml 600 BLAKE2B d42b031fce957841cb348db2630d3bc900ec4aa02d9ff4b89e165cc9426c74ef63b938cc509af873caeab900bc34d69f9d30373d0a03d95a27017f9498e9cfb8 SHA512 ae7d9b18ab50243065dbe76512c4d0167048c5fcaa4d9ca12a75d5a0ab5e083ab5f6acf83dd7f83ab5dc16a0490bed081d725954bd409356473fe6d016bed95b
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
index 8befb67a258e..c68b09c31f35 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome2 python-any-r1
 
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index b45d93c0fc90..16007ed11d12 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -5,6 +5,6 @@ DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e
 DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
 EBUILD toxic-0.10.1-r1.ebuild 3051 BLAKE2B 44a340be721ec9ae43739225f3ed695ca98f3561deece983f1e9b196d7b530b568dab07dc9118536b28cc620ebe0e064128ca3c29a459ccc3c4ca86735b330c4 SHA512 670856e91e0074648fc9decbfec57dd3a4d707dae7a680f6c83e729829065157ae79efd48798f1dddadcb6c8193f7a91688683735230ae871edfffc93cf4a835
-EBUILD toxic-0.11.1.ebuild 3027 BLAKE2B cfc32823322febc37941787bf1e489c2c235339373ac95821c82c7dfd2067b8fadcde3820dbf7e86b647174a59f8ab2e27db518eac9e04c64b53e03990a2f483 SHA512 0189331ae0a633867c9de2897d0be804d409ba661794c1f62f21929e071d87058919c2220194e8a862335419c305159f9452e9795b8c27c3f5da7debf406c552
+EBUILD toxic-0.11.1.ebuild 3025 BLAKE2B b081ad285865a067de261e4a3ea49f65c4a1777f5c7bac07978a2ab5c9a2b0b38fa32fa1b037916a7dc3defdc6860ef3549b9454b6fc36ca7e5e7ebc93832213 SHA512 e2d54f02e91f4de80a3f6d50701b4adacc785b411e6e5feee1303dc70634e16b7449d079b8427fa9b2140d1b8d1383e81613d3892d24f2611c98bcd7892a4983
 EBUILD toxic-0.8.3-r3.ebuild 2009 BLAKE2B 2d2888afcd59c4b087071182e3e7b612e608a0b733a064eb69f5e5317cd2146937e27bd1c757dff1ceecbbf9155c9b302135258f3beedf3f41babecfb4a66249 SHA512 63ae73ffea094e32a11f1a9d8bb1ab28f49e0eeafc7ce1c1b3cc6941fdbc109c447fc454d98148d2fa1320be77e4d5bccac8091b22390a3512d234215947c837
 MISC metadata.xml 1213 BLAKE2B 27cb3884fcbdaf0f702710b26b6a28ea42ed810a0c9eaa024d6067d4a8f20b79020f84abb4b730ef8ae01694b0dbfaa13e72f843f43efd6741b3d487894485a9 SHA512 1997d11602350b2cc9d8a684c2720876ab97319c89a055b9629540ee17fe7fad946ac28472f1ef6d3f0680fc4be4210aeec1f14775e0ad1bb6b236742369015a
diff --git a/net-im/toxic/toxic-0.11.1.ebuild b/net-im/toxic/toxic-0.11.1.ebuild
index d2d629d69b60..de06e0e5aea2 100644
--- a/net-im/toxic/toxic-0.11.1.ebuild
+++ b/net-im/toxic/toxic-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+audio-notify debug games llvm notification png python qrcode +sound +video +X"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	video? ( sound X ) "