gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /net-im
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
31 files changed, 834 insertions, 340 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9a1420d79066..55f9575d179b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index df96034f4526..f1ab6190eb33 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,6 +1,6 @@
-DIST dino-0.1.0.tar.gz 441638 BLAKE2B 08f332d38af866eed1049fae7d0e207da5a3486fdaf07eb5327e7abf614ac4adc130fd8f2d9465d6cb248ecfe4b809e022a69c72df5879d98719d24635771b33 SHA512 b63bf87dbf7f728f038f22d0dba34770a06d7eb1be2ec249293ff876e16c151165add895ff3cb20a3216c3581d20e10634d454ee8b024b895012efb34f9d7de8
 DIST dino-0.2.0.tar.gz 514257 BLAKE2B a4536372a806fa60e157a6492381b0204f33041b113dc26dfd4d494c86c96e5b94e928c400fde3198e481aecbfc79d0358979d4a20c550e35f762b3520e2f7c0 SHA512 296576f91d45a4dd8c548a7ca5b47bcaf847f6ff0f8e5dbafaa4eb49a2d4f1ed7e2bbfac94f1b32e22f5ec61b23748ac76b12bb4ceb710889aff166953ca7a2e
-EBUILD dino-0.1.0.ebuild 1597 BLAKE2B ddcce77114ef37406b2c31eec69eb8d38a7cd476c150f0c9305aabcb9afd2e5c6f46d6310a78a8811d0c04f98b154638982cc354eb03d1667d136bbb7bc782c9 SHA512 c67877d9465cd93175f6d591fde849cc6667c84ba0000848f5a40a1233583c1d59afbb90f82584d478e85a2b2a30788898062af77cd6dbaa3b5ff960b08120c5
+DIST dino-0.2.1.tar.gz 514504 BLAKE2B 42fae18bb7cda276c1eadeefdea130069f9929dfde62855f00ab6b88912fe9db3374315f40ff8f53350cf38e45fe61b0fd6256ef390cdbed6a65a3f2d79ac80a SHA512 b71497ec115945eadf7d33bb973f68465a20284aa75f37f1ae25fc30c1c423ce28cb10f7e9123c47f82e77e97170b8fa72c75389dacc3a2aa3d487a9c9610d49
 EBUILD dino-0.2.0.ebuild 1815 BLAKE2B 2bac790b5fa98c59ef5f51a9929fcb4f61a45dbfeb944a41285577746fbe451343e085def64d1337ece3d629cb57b735688ed57b73ecc65ca3feff11dc2bd0b8 SHA512 4d6a1211c7c5c4118ca536cddf736e6682bb8001769added6f434a0d4c1cb5255369e0fab7c070c440c694fc8d41ded3842a664b1cc6471a47e87d1a26c50d21
-EBUILD dino-9999.ebuild 1822 BLAKE2B d787f85c4bd3af160c43f0a186acc5f9b1cc7a93de014bed90a8c1fcc0c0153dd147128792216c81e2c77bca6e2a03898cded1a473baf0fe8044ccf65c0d8d3b SHA512 f0f08d5db829cb8caf40942abc7447cf28512e5f6ac4cc95edca91d73afd720a10ef0ef359fdab198b047bee0b5dc15dbc7d2eaa106d007e2859df71a8a79d8e
+EBUILD dino-0.2.1.ebuild 1820 BLAKE2B 7b3ab574fbeca05dafb1df85b5af8d0c69edbcf606f5dadb06a4f73f1b3384022b2f55854c1570c248a8d15b983b26c7152d19a7c6627c2cd6823ff3df92396c SHA512 9fefc28a8334c858ef59421f06f0f88c2208d57484bdeb4bd5ac582164ce7838ac39c6f8833a36a19cd1625b2a559a223214eb25241fb7f7961a42372cc6a715
+EBUILD dino-9999.ebuild 1869 BLAKE2B 02a95b918e0fc456f2731d8253fbd67ce4eeb659e19a21749ee8aba87bff85693ba4342d9f12fcd73f0a466ee252b31f5bb1e3273bf944b181e85392ab5bf63e SHA512 86a3193e2a90172aa52b42ae6fcca6b8ccdc37be5c63a9783fef2ca9912dc5b4ec2dbe9688b23dadf38280d5e2e96c0cbffd963b3643da148618bd93823473da
 MISC metadata.xml 641 BLAKE2B 31f6c748c2bfe6279a574bf88b94caf476e1769159bdefc2fe4c35095d4e46cb30d6ad232f84cc614f83d1d319004398947fe65f0f9d1fc80dbdeef9497942de SHA512 a1b16eca16c3b7df169db8c7f8a2670cf97fab0c2913dad3ece312aa4e90429944148438b9d2bfd01661912ecffd950104b8324e83b691243841f810e6105ad5
diff --git a/net-im/dino/dino-0.1.0.ebuild b/net-im/dino/dino-0.2.1.ebuild
index 51136f838055..c640a0cc338e 100644
--- a/net-im/dino/dino-0.1.0.ebuild
+++ b/net-im/dino/dino-0.2.1.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 VALA_MIN_API_VERSION="0.34"
-inherit cmake-utils gnome2-utils vala xdg-utils
+inherit cmake gnome2-utils vala xdg-utils
 
 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
 HOMEPAGE="https://dino.im"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+gpg +http +omemo"
+IUSE="+gpg +http +omemo +notification-sound"
 
 MY_REPO_URI="https://github.com/dino/dino"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="${MY_REPO_URI}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 	SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
 fi
 
 RDEPEND="
+	app-text/gspell[vala]
 	dev-db/sqlite:3
 	dev-libs/glib:2
 	dev-libs/icu
 	dev-libs/libgee:0.8
 	net-libs/glib-networking
-	~net-libs/libsignal-protocol-c-2.3.2
+	net-libs/libsignal-protocol-c
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
@@ -39,6 +40,7 @@ RDEPEND="
 		dev-libs/libgcrypt:0
 		media-gfx/qrencode
 	)
+	notification-sound? ( media-libs/libcanberra:0[sound] )
 "
 DEPEND="
 	$(vala_depend)
@@ -47,7 +49,7 @@ DEPEND="
 "
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	vala_src_prepare
 }
 
@@ -57,7 +59,11 @@ src_configure() {
 		$(usex omemo "" "omemo")
 		$(usex http  "" "http-files")
 	)
+	local enabled_plugins=(
+		$(usex notification-sound "notification-sound" "")
+	)
 	local mycmakeargs+=(
+		"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
 		"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
 		"-DVALA_EXECUTABLE=${VALAC}"
 	)
@@ -66,7 +72,7 @@ src_configure() {
 		mycmakeargs+=("-DBUILD_TESTS=yes")
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index b16ee80986da..e0058ccbf6e7 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -29,7 +29,9 @@ RDEPEND="
 	dev-libs/icu
 	dev-libs/libgee:0.8
 	net-libs/glib-networking
+	>=net-libs/libnice-0.1.15
 	net-libs/libsignal-protocol-c
+	net-libs/libsrtp:2
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 3ed9411ba676..3c9795d86cbe 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -7,6 +7,8 @@ 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-20.07.tar.gz 2029485 BLAKE2B c6d9e177b150135595c4670b96386e752d795fab219619edbd5f887975b1edfc79bfe2606b57d2edb34af9fe15c8a545dc70b8d50faa7f667bac5fcef985bb4c SHA512 d31bea2bcf83c2404104a1153664abceda900dca1ef86216970eac32115da521826ee1b80b020d21dafbdff2cfee8b210de6e68ba795068f7fc51545e0e381fc
+DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
 EBUILD ejabberd-20.04.ebuild 9045 BLAKE2B 446556a5dd96d34c6287f6d7fe212efd6f679753ab9ce98e359dafca6a82ce1b78d1848a6803177dacd7299dd8e54493dfdb3c3fb1ca6e89d2b948e2309b0af5 SHA512 75671043e79bdebbadb53befafe7014806bdf493d88c54eeae8cdd5d34bca1d519aee2d0e852a9b3de6cc160dfbc0a13d61ff9ea0f7d92c321039ff2d857af87
 EBUILD ejabberd-20.07.ebuild 9049 BLAKE2B efc3a2bfccd5e26254af9c73e4db65767c8d64b0c4b752321a446ad76c4306c4efff9089b5fa5b8a917a5a93446ce6d10ddf0db7d02ed80570baafec94cfc9ec SHA512 a56a46e8a1e8423329aa20b90ebecdfec0175c3d7f92fd78a376efa3ab05965c8c12652e2e393b9143bda8548152a07da7ae02103cc560c9db1c9dc1dfb91a2f
+EBUILD ejabberd-21.04.ebuild 8476 BLAKE2B 971c64233b7ca9ca346ed2d6f00b6e7eb85ee0d69bba45f2acdcde03b7b5fe180e22631d91d731e87a4932ac6acbfcdaf73130dfd145f0b41fe9a83815c91d44 SHA512 753914dc7e413720d4bb3ce1de356fcf4c418e523e5aa97dce844f47d7dd250bb2f6441ed77f4fd9424afaaa92cf94459e0d96618a5082d297c3b211838c96d9
 MISC metadata.xml 1516 BLAKE2B e156fd8588db78fd863ed478db344d54ed4b401426c602b63b3652a2bdf0db426eac2f46797f40443225abc9fd4f45060701030e7002a31b5162a61712cc8c9b SHA512 091f443f98785ac57d5c9a8c5dfa258029cf5f2b3f6ca90ec4330881b7331c7490cd885f1a477574bc8d6af6a75ec3ea9c8a6d1051194f3cb0636c5672d63671
diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild b/net-im/ejabberd/ejabberd-21.04.ebuild
new file mode 100644
index 000000000000..b161498bc6ad
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-21.04.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit pam rebar ssl-cert systemd tmpfiles
+
+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
+	>=net-im/jabber-base-0.01
+	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}
+	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")
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificate.
+adjust_config() {
+	sed -rne "/^#?\s+certfiles:/{p;a\  - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+	sed -re 's/^#\s+(certfiles)/\1/' \
+		-i "${S}/ejabberd.yml.example" \
+		|| die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="${1}"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Check if we are missing a default certificate.
+ejabberd_cert_missing() {
+	if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then
+		if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then
+			# default certificate is present in config and exists - not installing
+			return 1
+		else
+			# default certificate is present in config
+			# but doesn't exist - need to install one
+			return 0
+		fi
+	fi
+	# no default certificate in config - not installing
+	return 1
+}
+
+# Generate and install sample ejabberd certificate. It's installed into
+# EJABBERD_CERT path.
+ejabberd_cert_install() {
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
+	install_cert "${EJABBERD_CERT%.*}"
+	chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+	chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
+		-e 's!^(User|Group)=(.*)!\1=jabber!' \
+		-e 's!^(After)=(.*)!\1=epmd.service network.target!' \
+		-e '/^After=/ a Requires=epmd.service' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+# Set paths to defined by net-im/jabber-base.
+set_jabberbase_paths() {
+	sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
+		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
+		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set paths in Makefile.in'
+	sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \
+		-e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \
+		-e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set paths ejabberdctl.template'
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	set_jabberbase_paths
+	make_ejabberd_service
+	adjust_config
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-user=jabber \
+		$(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
+
+	keepdir /var/lib/lock/ejabberdctl
+	rm -rf "${ED%/}/var/log" || die
+	rm -rf "${ED%/}/var/spool" || die
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+	dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_preinst() {
+	if use pam; then
+		einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam jabber || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  https://docs.ejabberd.im/"
+		echo
+	fi
+	if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then
+		ewarn If you are updating from an older version like 17.x
+		ewarn you may need to add an access_rules section to your
+		ewarn ejabberd.yml config file.
+		ewarn Otherwise authentication will be broken and users
+		ewarn will not be able to log in.
+		echo
+	fi
+
+	if ejabberd_cert_missing; then
+		ejabberd_cert_install
+	fi
+}
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index e4a0d12e9953..a749debd8284 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.7.29_amd64.deb 81537768 BLAKE2B e28d5c419bc8546841402d321100e9b79d23e3b41eef56918037182b189ec7d8a4b00f001dc2f63c9eb8b2e8325079bcbb8ca9697bdb6d3158d2e43bb7fae0be SHA512 fa832ff42bfb533277753eebb9b0e5ed960334138eb00b8aee067788343eb2e89197ac8658908c0faa5bdd45a72290ca14e65e997ed2dbf77f90be447802308c
-EBUILD element-desktop-bin-1.7.29.ebuild 1763 BLAKE2B 6b4fc1c9bbecd883cf9625beb43810d42c57ab3772093fe9f21905abf0459507c7c6165ed34ca0696a96e6344adb6f78458ff88c0b9810d1c7797c3c5c5279f0 SHA512 83a54e2ead27279d918ac34da9103b31192c2d03e7ee1f2462221e7ddcb5c3c27aa3f4c9889e9a086ca7cd80f893bec2c7a61ded580d78914f5e4205c84568c8
+DIST element-desktop_1.7.30_amd64.deb 81607832 BLAKE2B 690019b30129bc941d9992fca66321079c0840f13596f2e89a05751b431f2ca8f66d0d6baeb3d06819a1fe08e8ab24f49d6f84b9184a2ac47696173ee438f329 SHA512 a85df796f5536598494658d43ff19802a081b2790715406733adecd2959c87c29c2b44f0c9addc1faf6ec3cc25e710a6eb52bea90c1b21f5668148611c754244
+EBUILD element-desktop-bin-1.7.30.ebuild 1785 BLAKE2B b0b4f43004c390dfcc933e6db8079b95b81ce689dc433f61e400aa1f8b2c40b6bbcf94ad2c5776c9cc413c33407fdc7e38534e3d836b9a1e3bcd5e31883ee029 SHA512 808e02467dab7f6fb2203ca29e8c0a03b03f44cd48974615964715e2253e0e6d8a65f8cf6af715080929605e8e6eed894d65f9fcf15cdf913285de7a51e4e9a0
 MISC metadata.xml 349 BLAKE2B 28ef90d142ba536df4df0e57bc4b9dd3ea565b038bebefe71c2a2d9325761625922f928707a99833e3edb4cd2bb8083757b02ad81abc620571d4eb3620df72c1 SHA512 20596473ae86afc73bf80be067fdc7104ba8fcea6aa319e5fcc26397612dad2a724876a5748babff0f13f020d2bd246ae24f9805c8db9da70e86ae52ea3dc61e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.29.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.30.ebuild
index a48d5ee174cd..af28b3f1fe7f 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.7.29.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.7.30.ebuild
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+emoji"
+RESTRICT="splitdebug"
 
 RDEPEND="app-accessibility/at-spi2-atk:2
 	app-crypt/libsecret
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index a965076a6042..1aba0cd2efc6 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -6,11 +6,11 @@ AUX pidgin-2.13.0-metainfo.patch 345 BLAKE2B 7f0a56f0de53860c3963bd88c1646570ca0
 AUX pidgin-2.14.0-gold.patch 284 BLAKE2B 3d658d69f4d226adf238cd6e624067741ea9d80e3d56ac235b766f8fdb7a926bd97769f4723871cb32672123ae84d04cee4c9936e39cff9430d087de9601362c SHA512 f754357cceb88053af2ee074e5926e0fb11613ba42a375a38aaec1b11172f55f9b1b99fca651a3f4af2c16326c5ae0f871b70df28b08f384917a97acc312579e
 AUX pidgin-2.14.3-remove_oscar_tests.patch 396 BLAKE2B 139f898c82283b896a50edb8d2e6825513b8549dee63f51d0d90b4e71a55685a2e5886a4fe84cf361ef1fb5f607876469d0501c7711afacd9b722b3401e19bf8 SHA512 cf6fe751035d4756f13843141d0ead9ad25275702143c2b2b30f8e3160545c3c72e9bb0e67ea258a622f950b4c3431c28943b9d63cf185c73bed2cb559e93508
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
-DIST pidgin-2.14.1.tar.bz2 8849275 BLAKE2B 27cd58a79f36c0176147c2e5bac7c4c18ec74c446c556e2326465c3607a95c3a58c1bdbbf9b4fb9741783ae982a6ce8fe0556ccff5b1608c9bba98626560412c SHA512 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
 DIST pidgin-2.14.3.tar.bz2 8688849 BLAKE2B 5d1f28ca5c452b13d2a6d6ab0c9101f14da3b5a291a838dab4b7cda99c76b3e411414b186ae493f08bd9764c65eab4b41eb9a45d340fe885f8bf9bf092911d43 SHA512 70f426900ce76afcdad76bcd06ebc320f562fe4089ec87c639d8d0d90823077f5e815932b62c3ff3da6270b3acfde3c8222d9b8c5cbb211421239c9dcc69b909
 DIST pidgin-2.14.4.tar.bz2 8724096 BLAKE2B 674b8cc306b5179c95a546f13e7ec7c2a13a22ff2ab502460435e2449e1a9fdb9e33baf2d8b81867a40251e3fe004dce5a0a371deab70587c694a10c6419f89d SHA512 78550b7c4678242861bc0b0a3c32ab03c9fd6e4f509a9b83f872f2e201fe69617c8407d4cc90205e74598f1b8fdddfeddc8f59b47179524a7af7a241eaf1fa0b
+DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc347fc10731606e44de537d2a451c9cec17d17c44d88e0eefda110927c471788ae6128a7e006666603bdc6d842c9b1 SHA512 3aa00156e73643c7a23bc3a1ff26ecd7ee89c0d91571a23bf00e54aa87f25d2b604990d33263e8f74f6499d8e08646aa524e14063e8000e60d1b49d74c5cc784
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.14.1.ebuild 7878 BLAKE2B 59062608078edceed4583384f9567c2fc6cd6da05ff9d70d99022fe8728c5ee7b083ca800a3f4d2ae0d572b3f637cbc1e3cadf91da16a213f1bcfca175d143e4 SHA512 edb48e42c5a84a00f29ce989fa3a130e8daf69156835fd857ef352a248edaab29ea11426d911ed917e28e0f21b20d81b16d616a9070998f7a5821eaebda19569
 EBUILD pidgin-2.14.3-r1.ebuild 7896 BLAKE2B da92c7b805ada2398e14ac3bea9e7bf18e2e6ff8e22681a09ccfa26a2f042baa425c81820deb95ebe55d314c67f94d1f8bc5dba681a172033ccae7895aa0d5b6 SHA512 75eeee3de9fc161a67c9113b34b2533b927b42882745ad1ced19717aaa99e0e325ab239f67d084ab7093282434ba25ad49c5923f17b1b9b74c090c52888c61ce
 EBUILD pidgin-2.14.4.ebuild 7569 BLAKE2B 7d512481c9c9dc2e48e07d78c245cf604bdcaff4e597db838fecd1dcb077aae8f4eb21a9ccb449d9b57c0d4148b0dc90f3c39410972927ae83c16f6b903ba4e3 SHA512 0733a0adb26ac17a9b40f88b48e313a125532f64666d0f5ea7b98f3e20ea5630cc1272d075a8301b17b697c0e1f7a3222b44bc8fb76ee4e5bf288bc806250b97
+EBUILD pidgin-2.14.5.ebuild 7569 BLAKE2B 7d512481c9c9dc2e48e07d78c245cf604bdcaff4e597db838fecd1dcb077aae8f4eb21a9ccb449d9b57c0d4148b0dc90f3c39410972927ae83c16f6b903ba4e3 SHA512 0733a0adb26ac17a9b40f88b48e313a125532f64666d0f5ea7b98f3e20ea5630cc1272d075a8301b17b697c0e1f7a3222b44bc8fb76ee4e5bf288bc806250b97
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.14.1.ebuild b/net-im/pidgin/pidgin-2.14.5.ebuild
index f90cd8e94cd7..0dacd39bee84 100644
--- a/net-im/pidgin/pidgin-2.14.1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
 
@@ -12,12 +12,11 @@ DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="https://pidgin.im/"
 SRC_URI="
 	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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"
@@ -72,7 +71,6 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl:2 )
 	networkmanager? ( net-misc/networkmanager )
 	idn? ( net-dns/libidn:= )
-	!<x11-plugins/pidgin-facebookchat-1.69-r1
 "
 
 # We want nls in case gtk is enabled, bug #
@@ -102,7 +100,7 @@ REQUIRED_USE="
 "
 
 # Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,simple"
+DYNAMIC_PRPLS="irc,jabber,simple"
 
 # List of plugins
 #   app-accessibility/pidgin-festival
@@ -136,14 +134,9 @@ DYNAMIC_PRPLS="irc,jabber,oscar,simple"
 #	x11-plugins/pidgimpd
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.14.0-gold.patch"
-	"${WORKDIR}/${PN}-eds-3.6.patch"
-	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
-	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
 	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
 	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
 	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-	"${FILESDIR}/${PN}-2.13.0-metainfo.patch"
 )
 
 pkg_pretend() {
@@ -187,6 +180,7 @@ src_configure() {
 
 	local myconf=(
 		--disable-mono
+		--disable-static
 		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
 		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
 		--x-includes="${EPREFIX}"/usr/include/X11
@@ -232,9 +226,9 @@ src_configure() {
 	fi
 
 	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python=${PYTHON} )
+		myconf+=( --with-python3=${PYTHON} )
 	else
-		myconf+=( --without-python )
+		myconf+=( --without-python3 )
 	fi
 
 	econf "${myconf[@]}"
@@ -248,9 +242,9 @@ src_install() {
 	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 pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+		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
@@ -261,7 +255,7 @@ src_install() {
 	fi
 	use perl && perl_delete_localpod
 
-	if use python && use dbus ; then
+	if use python || use dbus ; then
 		python_fix_shebang "${ED}"
 		python_optimize
 	fi
@@ -269,7 +263,7 @@ src_install() {
 	dodoc ${DOCS[@]} finch/plugins/pietray.py
 	docompress -x /usr/share/doc/${PF}/pietray.py
 
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
 
 src_test() {
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index e7f07546860d..cf703ee1179a 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_5.3.0_amd64.deb 111641678 BLAKE2B 9163f08f60e394680e5b5849b6890c13e178f535010c35666328e923fb22d98988a7e4823ddfe4b463190687b683c0bf70fb6bd519e1a933e4ad26f971256dfb SHA512 3bdd024f3874070ee8acff58fdfcd31c033bfbef88e1ed6525bf73c8319c7110f3851ff4896361dfc9581f255d516e602d036c9a3c573f58b134fc3a4a7bfd11
-EBUILD signal-desktop-bin-5.3.0.ebuild 4539 BLAKE2B 68fbffd904eb5151818c7a09c390b15ab6a3cb274cd334bbbb670ec93e88ba8e67a66cfce553c442344e22c9400f6799d6514172f05018eb6211e0deaa374bc2 SHA512 3b107e732006c53e882c3dce1aaae720a9992ddca0833aa4f8926f23e59bef2277fef788ae1241bbcfe2f73d75ea31d4791eadd9bcf0007ad5fa13bf09c1f4a5
+DIST signal-desktop_5.4.1_amd64.deb 112108696 BLAKE2B 5da2692db14f8a67affdc92a3a8515680855a7d81b9341629772ac826cd187b67e13fcbb461e2d51d71c3920ab09c1c4e119c46936d1bf47a09ba4b3c53bdcd1 SHA512 6b076554d0841c60b803b57055fdcc1c1b75a17e5e0f1068d65b6716f17153fa03fe514fc46c84f41430a3a430c3b0beafc2b7d6166432c5f0b1a86cbc7081d0
+EBUILD signal-desktop-bin-5.4.1.ebuild 4539 BLAKE2B 68fbffd904eb5151818c7a09c390b15ab6a3cb274cd334bbbb670ec93e88ba8e67a66cfce553c442344e22c9400f6799d6514172f05018eb6211e0deaa374bc2 SHA512 3b107e732006c53e882c3dce1aaae720a9992ddca0833aa4f8926f23e59bef2277fef788ae1241bbcfe2f73d75ea31d4791eadd9bcf0007ad5fa13bf09c1f4a5
 MISC metadata.xml 396 BLAKE2B 38a79e09275e5b085003b4fd511917b1ada4b25a7f7d8693da9fa35be6f924fd3a8cac88aa689a482391b3ccc89a07ec1946b8d0dc1ec5c45f23b94f65095ade SHA512 e173a6d2920e003012ffa756fc3e0aa15bbea2eb63b37b9387ec016680cdef7d7db0d510f4663e2a941df4b587c367d3af66ef0fa8d0c4b069648b1dbfd0d4ad
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.3.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.4.1.ebuild
index 31d7022a98d0..31d7022a98d0 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.3.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.4.1.ebuild
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 9fe3f2b2e0ee..b33005aa0c7f 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,9 +1,5 @@
-DIST skypeforlinux_8.69.0.77-1.x86_64.rpm 117875764 BLAKE2B 8f817c595b09f5e9c0e0ca10c2e34d76cc3d56da115950adebe6e43ca7d8715d2a20df862a76fd51fef639cc0664ba3b19976b93406e98da50b8ec07a7323c39 SHA512 a04a2e357192ee9390ebeb00aeeec3a230eb0b7b3cf00f32aab1323dfe61b8ebf980a459db779f1b14266c5b7ff9b1f749ce1bba56025ada06d137ff552db35c
-DIST skypeforlinux_8.71.0.36-1.x86_64.rpm 118012057 BLAKE2B 510df394ef98ea5ca60d68e73624e5ba499126c9a47a2254882aa66ecd8e36e38080eeea1b591c249d1cb2aea6c9b9299a74d56e4d4620de1b4a87e15795a286 SHA512 41f9e8bd76bd8af0aaa2c56d9e354b6ec6c4eb63e7a35bdc75f91b2925a90b8267dc2a3426be4016bf2d89a5cb4bf41b1c53216caa351d5080e1dcd23e465a1f
-DIST skypeforlinux_8.72.0.82-1.x86_64.rpm 118228602 BLAKE2B 2725e1eb8603ad2d95686ff322338f0c7cbbf9059d344284c27486ccd9a78ed1e33414d7750523e7d59fb70b07b9d42185cfdca20baf69a39bbe7db4263b29d0 SHA512 a7c554f9500bc065b4be83ab989543e35d4767acef1d831d6aa0ec365b9a2a661310fe36a834fdc6ac57700cfc59a2a438029eac1372627b7ba27480272d517f
 DIST skypeforlinux_8.72.0.94-1.x86_64.rpm 118230043 BLAKE2B 9d7d8609c117947fbab4e2ac68a9bbe909f94f2ae82bc910cad66412aaced2ba13f35ce785a4f0d95690125c42789cbc4bbec6831bc0038add7fe7a98469f20b SHA512 349550d69efce07e3c9fa92ea659fc0d4b87e4e110c0bdfac9ecd365685b4d5623362b315cb3eaab7eb91078dde7e1c286165ce487e8b93585e59272e8cca3e3
-EBUILD skypeforlinux-8.69.0.77.ebuild 3117 BLAKE2B f86fd9f5d06faf193363c05a558970bee5204162d426491f2a1ef3690fc5267f7c9d91e0bca1124af40e3c3b84c33da9333847077b00b4a7a9066942c22572b2 SHA512 fba2e33a98ad2f56d6997a814918709f3215793eadb1a7b2d37398d738ab4684e3434724db17ba0ee139b174038436abe15d14c5273f82d5e6e1155b758d132c
-EBUILD skypeforlinux-8.71.0.36.ebuild 3117 BLAKE2B f86fd9f5d06faf193363c05a558970bee5204162d426491f2a1ef3690fc5267f7c9d91e0bca1124af40e3c3b84c33da9333847077b00b4a7a9066942c22572b2 SHA512 fba2e33a98ad2f56d6997a814918709f3215793eadb1a7b2d37398d738ab4684e3434724db17ba0ee139b174038436abe15d14c5273f82d5e6e1155b758d132c
-EBUILD skypeforlinux-8.72.0.82.ebuild 3117 BLAKE2B f86fd9f5d06faf193363c05a558970bee5204162d426491f2a1ef3690fc5267f7c9d91e0bca1124af40e3c3b84c33da9333847077b00b4a7a9066942c22572b2 SHA512 fba2e33a98ad2f56d6997a814918709f3215793eadb1a7b2d37398d738ab4684e3434724db17ba0ee139b174038436abe15d14c5273f82d5e6e1155b758d132c
-EBUILD skypeforlinux-8.72.0.94.ebuild 3117 BLAKE2B f86fd9f5d06faf193363c05a558970bee5204162d426491f2a1ef3690fc5267f7c9d91e0bca1124af40e3c3b84c33da9333847077b00b4a7a9066942c22572b2 SHA512 fba2e33a98ad2f56d6997a814918709f3215793eadb1a7b2d37398d738ab4684e3434724db17ba0ee139b174038436abe15d14c5273f82d5e6e1155b758d132c
+DIST skypeforlinux_8.73.0.92-1.x86_64.rpm 119323419 BLAKE2B e201be43c6f331555d3759e9484d13c1d0613dd9e60ce67c3dafec27fa9d183ddc89e1c23feb1722ace2fd492185f8402be6abec80c748e6ad1f666878a72025 SHA512 dc6b72dc43443ad7747a30adef7b08afb50b4cc40a61cff2eb8989c9f68ae817c221d4ce2812d5d54cb9a4ac5f2accfe350efdfab622096d2d0805953fbddd13
+EBUILD skypeforlinux-8.72.0.94.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
+EBUILD skypeforlinux-8.73.0.92.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.69.0.77.ebuild b/net-im/skypeforlinux/skypeforlinux-8.69.0.77.ebuild
deleted file mode 100644
index 01550d2ccb08..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.69.0.77.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit chromium-2 desktop pax-utils rpm multilib-build xdg
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-		-i usr/bin/skypeforlinux || die
-	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${ED}"/opt || die
-
-	# remove chrome-sandbox binary, users should use kernel namespaces
-	# https://bugs.gentoo.org/692692#c18
-	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
-
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	dodoc -r usr/share/doc/skypeforlinux/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${PF} usr/share/doc/skypeforlinux
-
-	doicon usr/share/pixmaps/skypeforlinux.png
-
-	local res
-	for res in 16 32 256 512; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
-	done
-
-	domenu usr/share/applications/skypeforlinux.desktop
-
-	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.72.0.82.ebuild b/net-im/skypeforlinux/skypeforlinux-8.72.0.82.ebuild
deleted file mode 100644
index 01550d2ccb08..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.72.0.82.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit chromium-2 desktop pax-utils rpm multilib-build xdg
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-S="${WORKDIR}"
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
-	app-crypt/libsecret[${MULTILIB_USEDEP}]
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libv4l[${MULTILIB_USEDEP}]
-	net-print/cups[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-devel/gcc[cxx]
-	virtual/ttf-fonts
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]"
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	rpm_src_unpack ${A}
-}
-
-src_prepare() {
-	default
-	sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
-		-i usr/bin/skypeforlinux || die
-	sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
-		-e "/^OnlyShowIn=/d" \
-		-i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
-	dodir /opt
-	cp -a usr/share/skypeforlinux "${ED}"/opt || die
-
-	# remove chrome-sandbox binary, users should use kernel namespaces
-	# https://bugs.gentoo.org/692692#c18
-	rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
-
-	dobin usr/bin/skypeforlinux
-
-	dodoc usr/share/skypeforlinux/*.html
-	dodoc -r usr/share/doc/skypeforlinux/.
-	# symlink required for the "Help->3rd Party Notes" menu entry  (otherwise frozen skype -> xdg-open)
-	dosym ${PF} usr/share/doc/skypeforlinux
-
-	doicon usr/share/pixmaps/skypeforlinux.png
-
-	local res
-	for res in 16 32 256 512; do
-		newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
-	done
-
-	domenu usr/share/applications/skypeforlinux.desktop
-
-	pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
-	pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.72.0.94.ebuild b/net-im/skypeforlinux/skypeforlinux-8.72.0.94.ebuild
index 01550d2ccb08..a44feb7c8927 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.72.0.94.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.72.0.94.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
 	x11-libs/libXrender[${MULTILIB_USEDEP}]
 	x11-libs/libXtst[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
 	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
 	x11-libs/pango[${MULTILIB_USEDEP}]"
 
diff --git a/net-im/skypeforlinux/skypeforlinux-8.71.0.36.ebuild b/net-im/skypeforlinux/skypeforlinux-8.73.0.92.ebuild
index 01550d2ccb08..a44feb7c8927 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.71.0.36.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.73.0.92.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
 	x11-libs/libXrender[${MULTILIB_USEDEP}]
 	x11-libs/libXtst[${MULTILIB_USEDEP}]
 	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
 	x11-libs/libxkbfile[${MULTILIB_USEDEP}]
 	x11-libs/pango[${MULTILIB_USEDEP}]"
 
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index ee46de7bec6d..4589a88d71ba 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,10 +1,13 @@
 AUX fix-tgcalls-gcc10.patch 949 BLAKE2B 7a065fcbf5b8e7b49b6b866d199c67315484312ca527a517a09f890f09d39fa0c97787c586990ba92c0ce2ee83e7c2387eef100f630a74f003ddc06adb93c379 SHA512 dbc61a8520f3698fdeec6c9849cfd8241b8b778589f89277f82d6c748d8ed7a81db90daa0a69dedc3ab2b81bba848ee68e1df79a9cb3fb055f99bd7d19f46e5d
-AUX tdesktop-2.7.1-fix-disable-dbus-integration.patch 632 BLAKE2B 92aa9006febe4cb52e4273233f8592827e5d74afebc9d996c41cfc33588c0040b3b573a3730d0541ba8e0641e6733c491861c1bb60a5dc0f26f53b7941bf4572 SHA512 74557a9ac798f47d76cc9a0a514d3891c1a9f3c0667d5938be11d53d44704390dbf97d1e7be3c304cce2c9b8e3110ee04e6759ed28bf5f39d1cfee9f5c77f703
-AUX tdesktop-2.7.3-disable-webkit-separately.patch 3536 BLAKE2B 1bf255ba137c12a4d4a75321763327192f6cff81879843f042716daef0a9f9eb18b2a88e3048917adc5f36b9e4959be2a2c757f74a6aeeb9ca312ffcd7f55554 SHA512 aa62ae0319ad5ec86334e763e4c751f6508d7768a8916661fb217b91bf6a897802bc8f4820d058dc341bae69f6a0f0c34321e2a97e63bd0c715d36aa56532fef
-AUX tdesktop-2.7.3-webview-include-gdkx.patch 570 BLAKE2B 4d92c1e14e9df4609ab332c057977a9485867b3a23fc96c46a97d092a5f7083fccb479f87681bfc66964e4be13b4883c0d86ee079e9fd67e932daa2140c9610b SHA512 446a59387f3a76270d9242a19648d86acc0e589833e3aaedff708da0a90d5b55ae0108f28d79da45b4c8dc68c5ac6f6af4ec50203b411c0fcf2eccf4f8c9c753
-AUX tdesktop-2.7.4-webview-fix-gcc11.patch 880 BLAKE2B 581425190b3951d1027c572587e1039d0cf2c5b91d0cebe6be8bd25943eedc3b9e481729f94c920e699526d864ac660d295b4a50ad6aba9ef178513a00b08099 SHA512 7098bca2a1538f66badac21639b3e10a3988acf1e16e50b3f32ed06571687493e87280b992ea1c24fcbd3e3215ccc6e27f327eec8acc7318f9c53b5dfa290c90
+AUX tdesktop-2.7.1-fix-disable-dbus-integration.patch 482 BLAKE2B 70ea7d327b5e26433193f96ce6ad9f3daf534fd127277e58f9564aa88d49046ebb03b51359c84ab9063fef98468aa10b317842f4648357c8a9b225ec230e986e SHA512 8c788e21b674d02e4241c2c9699c69bbd03f8e8e3254f4c70ceb59e7f64823ba9a9dae60660598a7daea95bcc06de8a08c805d71ce74935d1cc3280b241752c8
+AUX tdesktop-2.7.3-webview-include-gdkx.patch 404 BLAKE2B cb9d282c79bfb7441b5eddf7fa1f3255ed1bee03d00fc71682f6b7acc2624a60d034a536e07c77f01433c93c8afa3383b1e57ba1a474de66078623ce2231b37b SHA512 92a60a59724597ce5daabe6a327a445182d6eac91ed009d72f833216393c7e55789caf88b914b0aa8d62eb11e6449b58c24239372d655af1fbe18a30c72b4ade
+AUX tdesktop-2.7.4-disable-webkit-separately.patch 2804 BLAKE2B 71feb3b5ed92fc136236d1c4638330003f7d57427404c72d8e0f83676c58c244b5dd58612b45dd7987615e0f87a5ec9ed29fcd9e75334750b401a4b58ba1137f SHA512 21061e74a54cac1621b701cfdb06c2212136cf135fcb94747dc7c5cdce0f2704e22a16500b360e67cc1bfcd401c143b8f26bccb4bdf18ef0f151ea84e4aead24
+AUX tdesktop-2.7.4-fix-disable-dbus-integration.patch 494 BLAKE2B 75e8be933873cc19a863423cb3996d14512586442abeb56ea83ef1a0ce3b58265611044285a6ebde390581e8206677136b97bd2361eaf612702ebd44411f2eed SHA512 bd223c7afabb72cacb89e689707aaff01509aafa1271aac5533f57ab88b52624b1f08647be51ea5c40123262eaeb3ea5646cecd00872465d5afd66f262e4bd98
+AUX tdesktop-2.7.4-voice-crash.patch 8437 BLAKE2B 6d03b16e8d60318e135340feeb39d6a077bc935f3ca6789da72ab063575128f356f8d4187552ac1ae1c270aed857802375016f84f8d2666facb7ea89c72284c3 SHA512 cabdadddc7a6873c7c6fc8128ceddf2712c0c73d3316520482162e5c67937bda2a627ddb2f078558a52e812c2a876351196488a5a75381d84a43815b873bac5b
+AUX tdesktop-2.7.4-voice-ffmpeg44.patch 1118 BLAKE2B 21b34c6fbb002be362beb807a8323119b46bf6875de3367006a981808d4648fa56e859728ee10ae51a5655fc921e49412ac4bb81e17667b2e28017a64a10a3f2 SHA512 72ef9bddef1f40e09b9c4334153f1ab8aaddf63d95d9f25dc1b0a0826b7f2ae24f7c5fc4cb5ce90aae2c3144a5d52c4cb870d643f447d654190c4a2c78079354
+AUX tdesktop-2.7.4-webview-fix-gcc11.patch 1035 BLAKE2B 929ff52fdadc65d7ce8bc53850adc48ec17c80d6f1e450a50e421c2fc28ee4f07ca88f1371f9812f3e7e2ef402d465418755ce392abd60fe032fa31c216c2753 SHA512 545e307974eff96ff27d9e99ba1272ff0094c403bcbfed4f67f72d8c45c2c6d0682edcee873a11d6aaed8d4f2b7dd820cbc13dc89e7c1072e04105b99a638831
 DIST tdesktop-2.7.1-full.tar.gz 36770178 BLAKE2B 21379cc970da07725e7a46d18a4f0bc459b1da1b730587595448b8f78133ce701e374e7faefc649a973342c203eee510872b5a4ed2ff6be92daec25157e400a4 SHA512 dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b
 DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14
 EBUILD telegram-desktop-2.7.1-r2.ebuild 3955 BLAKE2B ebd8a7ce7cbb217f7277879a0b65cf13d99a78af157fb85f7453f8239fce90523ac0644146cc7a0ad8f87e66eb327c061896df4fafbf40931475713e693f5d9c SHA512 6a388a597113e102213b591f91395a59eef26458d4d4173d6a2e6e8d76c45a1f6e4b34dd83ae495bf4ff1d2639861608a73031460c43f9af97542eb9c755a68a
-EBUILD telegram-desktop-2.7.4.ebuild 4266 BLAKE2B b7102112ec4afb170ff44ec54b34e0795d361e07dec623e7e3775ef4d993b8e0562124f5ec9dd74453aff20758f0ce7ef56c6dbfb5fd7cdcaba96191314f734d SHA512 d213159ee7e55e19d59aa693e841cf71df6a637e50d4eaea35a67af00a4f091d378c69a9e587925b3b59f538223f27b51a10affcec93c61635e84c24eb74475b
+EBUILD telegram-desktop-2.7.4-r1.ebuild 4589 BLAKE2B fee2f81578a4c774fe33592641a6a19592e8fd67623f3424ea599c2adbf425861478f34f01fad970fca31d9fe7545f15fe3d53ec195f60933e701fe287fa59d5 SHA512 ed7de5b99a43621b38ee7589a1f842647f7a9e2619b6984d061183ea3ec5d891c55df2cc5e04568924e30252de26bd3450ec1abce6e8d8edd2ff8be6104900dd
 MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
index 5351a808ec4c..8563ee5fdca0 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-===================================================================
 --- tdesktop-2.7.1-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp
 +++ tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
 @@ -754,10 +754,12 @@ void InstallLauncher(bool force) {
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch
deleted file mode 100644
index a143071401a9..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt
-===================================================================
---- tdesktop-2.7.3-full.orig/Telegram/lib_webview/CMakeLists.txt
-+++ tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt
-@@ -116,7 +116,7 @@ if (WIN32)
-         desktop-app::lib_webview_winrt
-     )
- elseif (LINUX)
--    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
-+    if (NOT DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION)
-         find_package(PkgConfig REQUIRED)
- 
-         if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
-Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-===================================================================
---- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-+++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-@@ -11,14 +11,14 @@
- namespace Webview {
- 
- Available Availability() {
--#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION
- 	return WebKit2Gtk::Availability();
--#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#else // !DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION
- 	return Available{
- 		.error = Available::Error::NoGtkOrWebkit2Gtk,
- 		.details = "This feature was disabled at build time.",
- 	};
--#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#endif // DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION
- }
- 
- bool SupportsEmbedAfterCreate() {
-@@ -26,11 +26,11 @@ bool SupportsEmbedAfterCreate() {
- }
- 
- std::unique_ptr<Interface> CreateInstance(Config config) {
--#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION
- 	return WebKit2Gtk::CreateInstance(std::move(config));
--#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#else // !DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION
- 	return nullptr;
--#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#endif // DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION
- }
- 
- } // namespace Webview
-Index: tdesktop-2.7.3-full/cmake/options.cmake
-===================================================================
---- tdesktop-2.7.3-full.orig/cmake/options.cmake
-+++ tdesktop-2.7.3-full/cmake/options.cmake
-@@ -49,6 +49,13 @@ if (DESKTOP_APP_DISABLE_GTK_INTEGRATION)
-     )
- endif()
- 
-+if (DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION)
-+    target_compile_definitions(common_options
-+    INTERFACE
-+        DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION
-+    )
-+endif()
-+
- if (DESKTOP_APP_USE_PACKAGED)
-     target_compile_definitions(common_options
-     INTERFACE
-Index: tdesktop-2.7.3-full/cmake/variables.cmake
-===================================================================
---- tdesktop-2.7.3-full.orig/cmake/variables.cmake
-+++ tdesktop-2.7.3-full/cmake/variables.cmake
-@@ -32,6 +32,7 @@ option(DESKTOP_APP_DISABLE_DBUS_INTEGRAT
- option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration (Linux only)." OFF)
- option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration (Linux only)." OFF)
- option(DESKTOP_APP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." OFF)
-+option(DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION "Disable all code for WebkitGTK integration (Linux only)." OFF)
- option(DESKTOP_APP_USE_GLIBC_WRAPS "Use wraps for new GLIBC features." OFF)
- option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ${no_special_target})
- option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
index 2f06bda3272a..491a8cd3e1dc 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-===================================================================
 --- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
 +++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
 @@ -12,6 +12,7 @@ extern "C" {
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch
new file mode 100644
index 000000000000..e54aca2ffa05
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch
@@ -0,0 +1,72 @@
+--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/CMakeLists.txt
++++ tdesktop-2.7.4-full/Telegram/lib_webview/CMakeLists.txt
+@@ -116,7 +116,7 @@
+         desktop-app::lib_webview_winrt
+     )
+ elseif (LINUX)
+-    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
++    if (NOT DESKTOP_APP_DISABLE_WEBKIT)
+         find_package(PkgConfig REQUIRED)
+ 
+         if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
+--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
+@@ -11,14 +11,14 @@
+ namespace Webview {
+ 
+ Available Availability() {
+-#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#ifndef DESKTOP_APP_DISABLE_WEBKIT
+ 	return WebKit2Gtk::Availability();
+-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#else // !DESKTOP_APP_DISABLE_WEBKIT
+ 	return Available{
+ 		.error = Available::Error::NoGtkOrWebkit2Gtk,
+ 		.details = "This feature was disabled at build time.",
+ 	};
+-#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#endif // DESKTOP_APP_DISABLE_WEBKIT
+ }
+ 
+ bool SupportsEmbedAfterCreate() {
+@@ -26,11 +26,11 @@
+ }
+ 
+ std::unique_ptr<Interface> CreateInstance(Config config) {
+-#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#ifndef DESKTOP_APP_DISABLE_WEBKIT
+ 	return WebKit2Gtk::CreateInstance(std::move(config));
+-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#else // !DESKTOP_APP_DISABLE_WEBKIT
+ 	return nullptr;
+-#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
++#endif // DESKTOP_APP_DISABLE_WEBKIT
+ }
+ 
+ } // namespace Webview
+--- tdesktop-2.7.4-full.orig/cmake/options.cmake
++++ tdesktop-2.7.4-full/cmake/options.cmake
+@@ -49,6 +49,13 @@
+     )
+ endif()
+ 
++if (DESKTOP_APP_DISABLE_WEBKIT)
++    target_compile_definitions(common_options
++    INTERFACE
++        DESKTOP_APP_DISABLE_WEBKIT
++    )
++endif()
++
+ if (DESKTOP_APP_USE_PACKAGED)
+     target_compile_definitions(common_options
+     INTERFACE
+--- tdesktop-2.7.4-full.orig/cmake/variables.cmake
++++ tdesktop-2.7.4-full/cmake/variables.cmake
+@@ -38,6 +38,7 @@
+ option(DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES "Bundle recommended Qt platform themes for self-contained packages. (Linux only)" ${DESKTOP_APP_USE_PACKAGED_LAZY})
+ option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF)
+ option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
++option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (Linux only)." OFF)
+ option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
+ option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
+ option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch
new file mode 100644
index 000000000000..941a4ecc09cb
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch
@@ -0,0 +1,21 @@
+--- tdesktop-2.7.4-full.orig/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
++++ tdesktop-2.7.4-full/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
+@@ -13,15 +13,15 @@
+ namespace Platform {
+ namespace Notifications {
+ 
+-bool SkipAudio() {
++bool SkipAudioForCustom() {
+ 	return false;
+ }
+ 
+-bool SkipToast() {
++bool SkipToastForCustom() {
+ 	return false;
+ }
+ 
+-bool SkipFlashBounce() {
++bool SkipFlashBounceForCustom() {
+ 	return false;
+ }
+ 
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch
new file mode 100644
index 000000000000..41e447989cb2
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch
@@ -0,0 +1,262 @@
+From 71deaa48afab2bcf9df67b9b347b1f44aad3a9ce Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail@gmail.com>
+Date: Thu, 13 May 2021 15:17:54 +0400
+Subject: [PATCH] Don't crash on voice recording error.
+
+Fixes #16217.
+---
+ .../media/audio/media_audio_capture.cpp       | 89 +++++++++++--------
+ 1 file changed, 54 insertions(+), 35 deletions(-)
+
+diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+index a5965e0d1988..deb2474d7891 100644
+--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
++++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+@@ -47,17 +47,17 @@ class Instance::Inner final : public QObject {
+ 	void start(Fn<void(Update)> updated, Fn<void()> error);
+ 	void stop(Fn<void(Result&&)> callback = nullptr);
+ 
+-	void timeout();
+-
+ private:
+-	void processFrame(int32 offset, int32 framesize);
++	void process();
++
++	[[nodiscard]] bool processFrame(int32 offset, int32 framesize);
+ 	void fail();
+ 
+-	void writeFrame(AVFrame *frame);
++	[[nodiscard]] bool writeFrame(AVFrame *frame);
+ 
+ 	// Writes the packets till EAGAIN is got from av_receive_packet()
+ 	// Returns number of packets written or -1 on error
+-	int writePackets();
++	[[nodiscard]] int writePackets();
+ 
+ 	Fn<void(Update)> _updated;
+ 	Fn<void()> _error;
+@@ -150,6 +150,7 @@ struct Instance::Inner::Private {
+ 	AVCodec *codec = nullptr;
+ 	AVCodecContext *codecContext = nullptr;
+ 	bool opened = false;
++	bool processing = false;
+ 
+ 	int srcSamples = 0;
+ 	int dstSamples = 0;
+@@ -217,7 +218,7 @@ struct Instance::Inner::Private {
+ 
+ Instance::Inner::Inner(QThread *thread)
+ : d(std::make_unique<Private>())
+-, _timer(thread, [=] { timeout(); }) {
++, _timer(thread, [=] { process(); }) {
+ 	moveToThread(thread);
+ }
+ 
+@@ -226,10 +227,10 @@ Instance::Inner::~Inner() {
+ }
+ 
+ void Instance::Inner::fail() {
+-	Expects(_error != nullptr);
+-
+ 	stop();
+-	_error();
++	if (const auto error = base::take(_error)) {
++		InvokeQueued(this, error);
++	}
+ }
+ 
+ void Instance::Inner::start(Fn<void(Update)> updated, Fn<void()> error) {
+@@ -384,13 +385,21 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
+ 	}
+ 	_timer.cancel();
+ 
+-	if (d->device) {
++	const auto needResult = (callback != nullptr);
++	const auto hadDevice = (d->device != nullptr);
++	if (hadDevice) {
+ 		alcCaptureStop(d->device);
+-		timeout(); // get last data
++		if (d->processing) {
++			Assert(!needResult); // stop in the middle of processing - error.
++		} else {
++			process(); // get last data
++		}
++		alcCaptureCloseDevice(d->device);
++		d->device = nullptr;
+ 	}
+ 
+ 	// Write what is left
+-	if (!_captured.isEmpty()) {
++	if (needResult && !_captured.isEmpty()) {
+ 		auto fadeSamples = kCaptureFadeInDuration * kCaptureFrequency / 1000;
+ 		auto capturedSamples = static_cast<int>(_captured.size() / sizeof(short));
+ 		if ((_captured.size() % sizeof(short)) || (d->fullSamples + capturedSamples < kCaptureFrequency) || (capturedSamples < fadeSamples)) {
+@@ -414,11 +423,13 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
+ 
+ 			int32 framesize = d->srcSamples * d->codecContext->channels * sizeof(short), encoded = 0;
+ 			while (_captured.size() >= encoded + framesize) {
+-				processFrame(encoded, framesize);
++				if (!processFrame(encoded, framesize)) {
++					break;
++				}
+ 				encoded += framesize;
+ 			}
+-			writeFrame(nullptr); // drain the codec
+-			if (encoded != _captured.size()) {
++			// Drain the codec.
++			if (!writeFrame(nullptr) || encoded != _captured.size()) {
+ 				d->fullSamples = 0;
+ 				d->dataPos = 0;
+ 				d->data.clear();
+@@ -436,14 +447,14 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
+ 	_captured = QByteArray();
+ 
+ 	// Finish stream
+-	if (d->device) {
++	if (needResult && hadDevice) {
+ 		av_write_trailer(d->fmtContext);
+ 	}
+ 
+ 	QByteArray result = d->fullSamples ? d->data : QByteArray();
+ 	VoiceWaveform waveform;
+ 	qint32 samples = d->fullSamples;
+-	if (samples && !d->waveform.isEmpty()) {
++	if (needResult && samples && !d->waveform.isEmpty()) {
+ 		int64 count = d->waveform.size(), sum = 0;
+ 		if (count >= Player::kWaveformSamplesCount) {
+ 			QVector<uint16> peaks;
+@@ -472,11 +483,7 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
+ 			}
+ 		}
+ 	}
+-	if (d->device) {
+-		alcCaptureStop(d->device);
+-		alcCaptureCloseDevice(d->device);
+-		d->device = nullptr;
+-
++	if (hadDevice) {
+ 		if (d->codecContext) {
+ 			avcodec_free_context(&d->codecContext);
+ 			d->codecContext = nullptr;
+@@ -528,12 +535,17 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
+ 		d->waveform.clear();
+ 	}
+ 
+-	if (callback) {
++	if (needResult) {
+ 		callback({ result, waveform, samples });
+ 	}
+ }
+ 
+-void Instance::Inner::timeout() {
++void Instance::Inner::process() {
++	Expects(!d->processing);
++
++	d->processing = true;
++	const auto guard = gsl::finally([&] { d->processing = false; });
++
+ 	if (!d->device) {
+ 		_timer.cancel();
+ 		return;
+@@ -582,7 +594,9 @@ void Instance::Inner::timeout() {
+ 		// Write frames
+ 		int32 framesize = d->srcSamples * d->codecContext->channels * sizeof(short), encoded = 0;
+ 		while (uint32(_captured.size()) >= encoded + framesize + fadeSamples * sizeof(short)) {
+-			processFrame(encoded, framesize);
++			if (!processFrame(encoded, framesize)) {
++				return;
++			}
+ 			encoded += framesize;
+ 		}
+ 
+@@ -597,13 +611,13 @@ void Instance::Inner::timeout() {
+ 	}
+ }
+ 
+-void Instance::Inner::processFrame(int32 offset, int32 framesize) {
++bool Instance::Inner::processFrame(int32 offset, int32 framesize) {
+ 	// Prepare audio frame
+ 
+ 	if (framesize % sizeof(short)) { // in the middle of a sample
+ 		LOG(("Audio Error: Bad framesize in writeFrame() for capture, framesize %1, %2").arg(framesize));
+ 		fail();
+-		return;
++		return false;
+ 	}
+ 	auto samplesCnt = static_cast<int>(framesize / sizeof(short));
+ 
+@@ -650,7 +664,7 @@ void Instance::Inner::processFrame(int32 offset, int32 framesize) {
+ 		if ((res = av_samples_alloc(d->dstSamplesData, 0, d->codecContext->channels, d->dstSamples, d->codecContext->sample_fmt, 1)) < 0) {
+ 			LOG(("Audio Error: Unable to av_samples_alloc for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+ 			fail();
+-			return;
++			return false;
+ 		}
+ 		d->dstSamplesSize = av_samples_get_buffer_size(0, d->codecContext->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0);
+ 	}
+@@ -658,7 +672,7 @@ void Instance::Inner::processFrame(int32 offset, int32 framesize) {
+ 	if ((res = swr_convert(d->swrContext, d->dstSamplesData, d->dstSamples, (const uint8_t **)srcSamplesData, d->srcSamples)) < 0) {
+ 		LOG(("Audio Error: Unable to swr_convert for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+ 		fail();
+-		return;
++		return false;
+ 	}
+ 
+ 	// Write audio frame
+@@ -670,45 +684,50 @@ void Instance::Inner::processFrame(int32 offset, int32 framesize) {
+ 
+ 	avcodec_fill_audio_frame(frame, d->codecContext->channels, d->codecContext->sample_fmt, d->dstSamplesData[0], d->dstSamplesSize, 0);
+ 
+-	writeFrame(frame);
++	if (!writeFrame(frame)) {
++		return false;
++	}
+ 
+ 	d->fullSamples += samplesCnt;
+ 
+ 	av_frame_free(&frame);
++	return true;
+ }
+ 
+-void Instance::Inner::writeFrame(AVFrame *frame) {
++bool Instance::Inner::writeFrame(AVFrame *frame) {
+ 	int res = 0;
+ 	char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
+ 
+ 	res = avcodec_send_frame(d->codecContext, frame);
+ 	if (res == AVERROR(EAGAIN)) {
+-		int packetsWritten = writePackets();
++		const auto packetsWritten = writePackets();
+ 		if (packetsWritten < 0) {
+ 			if (frame && packetsWritten == AVERROR_EOF) {
+ 				LOG(("Audio Error: EOF in packets received when EAGAIN was got in avcodec_send_frame()"));
+ 				fail();
+ 			}
+-			return;
++			return false;
+ 		} else if (!packetsWritten) {
+ 			LOG(("Audio Error: No packets received when EAGAIN was got in avcodec_send_frame()"));
+ 			fail();
+-			return;
++			return false;
+ 		}
+ 		res = avcodec_send_frame(d->codecContext, frame);
+ 	}
+ 	if (res < 0) {
+ 		LOG(("Audio Error: Unable to avcodec_send_frame for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
+ 		fail();
+-		return;
++		return false;
+ 	}
+ 
+ 	if (!frame) { // drain
+ 		if ((res = writePackets()) != AVERROR_EOF) {
+ 			LOG(("Audio Error: not EOF in packets received when draining the codec, result %1").arg(res));
+ 			fail();
++			return false;
+ 		}
+ 	}
++	return true;
+ }
+ 
+ int Instance::Inner::writePackets() {
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch
new file mode 100644
index 000000000000..4156956032d4
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch
@@ -0,0 +1,25 @@
+From a8807bc915f2439acc7c84f06d931d96d6ca602a Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail@gmail.com>
+Date: Thu, 13 May 2021 15:33:42 +0400
+Subject: [PATCH] Fix voice recoding with FFmpeg 4.4.
+
+Fixes #16217.
+---
+ Telegram/SourceFiles/media/audio/media_audio_capture.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+index deb2474d789..d129168783d 100644
+--- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
++++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
+@@ -679,6 +679,10 @@ bool Instance::Inner::processFrame(int32 offset, int32 framesize) {
+ 
+ 	AVFrame *frame = av_frame_alloc();
+ 
++	frame->format = d->codecContext->sample_fmt;
++	frame->channels = d->codecContext->channels;
++	frame->channel_layout = d->codecContext->channel_layout;
++	frame->sample_rate = d->codecContext->sample_rate;
+ 	frame->nb_samples = d->dstSamples;
+ 	frame->pts = av_rescale_q(d->fullSamples, AVRational { 1, d->codecContext->sample_rate }, d->codecContext->time_base);
+ 
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
index 0188eaf76f8a..7f4b3f2601f5 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
@@ -1,5 +1,13 @@
-Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
-===================================================================
+--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
+@@ -6,6 +6,7 @@
+ //
+ #include "webview/platform/linux/webview_linux_webkit_gtk.h"
+ 
++#include "base/optional.h"
+ #include "base/platform/linux/base_linux_gtk_integration.h"
+ #include "base/platform/linux/base_linux_gtk_integration_p.h"
+ 
 --- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.cpp
 +++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
 @@ -14,7 +14,6 @@
@@ -10,8 +18,6 @@ Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
  
  namespace Webview {
  namespace {
-Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
-===================================================================
 --- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.h
 +++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
 @@ -9,6 +9,8 @@
diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
index 8081b9da583e..1f51780319cc 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
 
 RDEPEND="
@@ -61,6 +61,7 @@ REQUIRED_USE="
 	spell? (
 		^^ ( enchant hunspell )
 	)
+	webkit? ( gtk )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -68,11 +69,16 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	# https://github.com/desktop-app/cmake_helpers/pull/91
 	# https://github.com/desktop-app/lib_webview/pull/2
-	"${FILESDIR}/tdesktop-2.7.3-disable-webkit-separately.patch"
+	"${FILESDIR}/tdesktop-2.7.4-disable-webkit-separately.patch"
 	# https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a
 	"${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch"
 	# https://github.com/desktop-app/lib_webview/pull/3
 	"${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
+	# https://github.com/telegramdesktop/tdesktop/issues/16217
+	"${FILESDIR}/tdesktop-2.7.4-voice-crash.patch"
+	"${FILESDIR}/tdesktop-2.7.4-voice-ffmpeg44.patch"
+	# https://github.com/telegramdesktop/tdesktop/commit/404538c98968d44d207671de3adde91b8df50721
+	"${FILESDIR}/tdesktop-2.7.4-fix-disable-dbus-integration.patch"
 )
 
 pkg_pretend() {
@@ -103,7 +109,7 @@ src_configure() {
 		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
 		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
-		-DDESKTOP_APP_DISABLE_WEBKIT_INTEGRATION=$(usex webkit OFF ON)
+		-DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
 		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON)  # enables hunspell (recommended)
 		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF)  # enables enchant and disables hunspell
 	)
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 8ad2d534e9e2..744cf33e22b0 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,5 +1,7 @@
 DIST toxic-0.10.0.tar.gz 1160161 BLAKE2B 30089398211945f366fd7b52ab4014cd9b020f58b7d3e47ec1a12a87055f10cdb723211f38d1028a3fb149cd76aa7771591e37f7961cda37b7bcbb8e21b33181 SHA512 bfbe8e4c90b4fcbdbe7cc96cb402e4c2f1609e2970e51d6d2ad2c8596350ce96ac9f4d06fbb71350e56d8892e2ed4ee8c5adf4f66cdad6b152c959802bddc6cc
+DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
 EBUILD toxic-0.10.0-r1.ebuild 2714 BLAKE2B 5473d9c4b78e94abe0827f9b8191cfd1f44b42ee5c07ef22c38be41474c812d542380a4af0f4b655e6590d4abaeff4fbdf67e3f802ccf48f98732b0a55c6c19f SHA512 bdf5e716b072843570bfbafa234b636871e71e20dbcf2a20a5b4e455e26ef104c78634a8bf854a3dd214cdd114768d6efb4111f061755ba3db266d0824d39ee7
+EBUILD toxic-0.10.1.ebuild 2697 BLAKE2B 1d9745a20a753ac3bf38cc9ae14ad85b24f99df947bb6a5bc7d057c23afd6b9d65897336c0574411bd41a51fbaf3b3b459256acf18bfca827c70b97f2594340a SHA512 5cce18abf16ec4d64034df723c56cc72a09cef70d2f09ac14d746379f4e78132cddb82898d9ba8955be5dae2d33c5838ea114e724ef567348a20b0bfea10564d
 EBUILD toxic-0.8.3-r2.ebuild 1817 BLAKE2B 73f8276337997cc2ea695cf691a47241ba981d414d6055b6f466503db0e79a14985cd1e08736570196c3196119f1db60edc668b5f271dfeca8dc2352b06682de SHA512 d94d058e687405ab6361babd1f3a8e7b8d98d456c4b7a8f06d55a7831cf88eedf041e778b605731d130baef1839b993280bfcf92ec7d54b46b703a56e8f69d29
 MISC metadata.xml 1154 BLAKE2B 5f94676351ad071b3278cc986d715ac5980fafa89a2be08253ac05787027b7a4cdbd3a9de8c88fece1ad35c8442956cbd089568d3c340f3ad6832186ed1d341b SHA512 2a65c022688774e5f892e7be3e69283e17164a47484f311544bc1bacbf3c5374c80736568adaa00db9b18f2ae1ff8946cc6a7c0912aaeb0a2c3b33f42ab7609b
diff --git a/net-im/toxic/toxic-0.10.1.ebuild b/net-im/toxic/toxic-0.10.1.ebuild
new file mode 100644
index 000000000000..4f0639961dc5
--- /dev/null
+++ b/net-im/toxic/toxic-0.10.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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 ) "
+
+RDEPEND="dev-libs/libconfig:=
+	net-libs/tox:=
+	net-misc/curl
+	sys-libs/ncurses:=
+	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"
+}
+
+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/zoom/Manifest b/net-im/zoom/Manifest
index 57790d51f2fa..a4fd6ed27163 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,9 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
 DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.6.16888.0424_x86_64.tar.xz 51534688 BLAKE2B 324655d6a2ddc840f3b518f0e743f33d29122cd9d9ad8b858745319b86108f2b81adfc756668a1cf750fd8eea1dc34692a00bdd068a00f5e5361eab9e347595a SHA512 cf035c6622ea1f0b3870cf8dc2337f3ba919482980aac1b4fce62b28d6f375f70f63f59ae4702cb0ccc915b824a5fe016d4ebc885338dd365080f5f2ab771538
 DIST zoom-5.6.20278.0524_x86_64.tar.xz 51720368 BLAKE2B 98d1455393fab1e9c9a1a912d566e25273e4e32ac0339b15104f8b83ff86d3496099e0c878e79c2a9d5cfb04670b67bb7c78b2840cc951d2c44244bcaf738b6a SHA512 58a07469634b9a81c47395fc940fcadd083308c93ee07e5a8dfd7737047c0b9b683da65a6e4df6674ddfc281bfc0e75c5e472a2a847442b096de1114c3343eb6
+DIST zoom-5.6.22045.0607_x86_64.tar.xz 51749804 BLAKE2B 73d37f9118bc8b3dd424ec903e72cb6f1da9c7a8b87319845befe0b4f10f9793ef603481d8e3e6c6af51dd7b342eb5bb157fbb8eb495b48641a70b62ae96534f SHA512 04e7c1b483c769b4d809f31fa615a2fedd3229edba13da7f51231c38a810d6cef7458c6b9aa504097c2bf1b4fbf81df1a6d9e0921dc6df1b9a8cb02038fcdd7a
 EBUILD zoom-5.4.53391.1108-r3.ebuild 3167 BLAKE2B 9aba2dc82ebd4c97f7dc97b6718141e35416316f51111ce145b9844bf1172fea80c3080a1d8ff34964e42742e243d1fc157906e2c55450b39170f01cb36a55b4 SHA512 52fc56dcfadaa4b9822475525a7958d8bbe5351038ee209426e1440af613598bed0f75dabdd79450206b6c9a36564f3ecf43dd3a98182368789744c99a589cbf
-EBUILD zoom-5.6.16888.0424.ebuild 4194 BLAKE2B 8d18adc760fce0811107e6d095eba5ced1848643c7a379ccd6a6071c8f6a94e690f084b405b26dd0c003e2f1d68919a18db6ac09f29aea9d89a2a8d706b0d46f SHA512 198cc8d29de4d6ee2a0ff66cd690bd7e60c94095d0d7bfd05a96700467e702fcc159a3b0f672801a337e923b6f85cdab67af51071650826b526ae10889216bf5
 EBUILD zoom-5.6.20278.0524.ebuild 4067 BLAKE2B 34f531a6d88b26c1e87d4435c70f26d958a5d93d56c23bff4beab0718ae21a7c44df9e86ab473c07b934bff77f750e6436f80ad5135dfd83c5f142abf799fec8 SHA512 5869d42749458346455f341dea4baeaae6a4e879696dbfcd68833f6bdb171809b905ecc0b6038e666c50b870ad44718782b0038e573fb7154e2887e20f40a0de
+EBUILD zoom-5.6.22045.0607.ebuild 4067 BLAKE2B 34f531a6d88b26c1e87d4435c70f26d958a5d93d56c23bff4beab0718ae21a7c44df9e86ab473c07b934bff77f750e6436f80ad5135dfd83c5f142abf799fec8 SHA512 5869d42749458346455f341dea4baeaae6a4e879696dbfcd68833f6bdb171809b905ecc0b6038e666c50b870ad44718782b0038e573fb7154e2887e20f40a0de
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/zoom-5.6.16888.0424.ebuild b/net-im/zoom/zoom-5.6.22045.0607.ebuild
index 49ebda48755d..514387cfdd02 100644
--- a/net-im/zoom/zoom-5.6.16888.0424.ebuild
+++ b/net-im/zoom/zoom-5.6.22045.0607.ebuild
@@ -137,11 +137,6 @@ src_install() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
-
-	local FORCE_PRINT_ELOG v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
-	done
 	readme.gentoo_print_elog
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /net-im
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)