gentoo resync : 25.09.2021

21 files changed, 583 insertions, 35 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 562eda1b843f..3a6557265fdf 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 1dfe525ed975..3a69e28b2cb3 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.15.deb 71614892 BLAKE2B b97488d0d1b9e1d2cbf5bd92b689b63ca2cd83adda55b18283409bd47914f83193299d07102ab779149e405dd0fbeb327cf63fa98d58e7e59e40f3948342c9ad SHA512 32d6fb819d419b0b7dd1929ad88d5210361136ff3d159af55efde0db6281ff85bdea74be401b3a2235fdc0e0f7b1411bee57d623fe26fe940d658e9f97dd2675
-EBUILD discord-bin-0.0.15.ebuild 1874 BLAKE2B 7ab8b632507ca38850996fdd6c946e6c77ed273f8e56ad04fb9b484fda20143298f2a5b44f339435383671063676ba7d7ff8a3d2544e5ce181a186d507c9d197 SHA512 3d3d5c4d4f2dc84b4701856985cece726cfda69dd352eeb262fc10998b6ef4dd8c64c4bc24e1e9f4518d754074b39a498762866158313d4720097e771ba0509e
+DIST discord-0.0.16.deb 77079990 BLAKE2B 17cb04baa4eab3494593c54bc556a8e1d01352aa1ba7d1d27da722e53f5445386054b038b57281c5955f46416eccef9fc3521c1b91b3b593c495c29e2537d0c0 SHA512 4ea06420b27cc6dff813798c23d44478bbe4fea2919011796d271f94fcc2e25bae65e7c5c952a6723daa928d3ac99b913198a8500c76a0eef56138dda610c5de
+EBUILD discord-bin-0.0.16.ebuild 1874 BLAKE2B 7ab8b632507ca38850996fdd6c946e6c77ed273f8e56ad04fb9b484fda20143298f2a5b44f339435383671063676ba7d7ff8a3d2544e5ce181a186d507c9d197 SHA512 3d3d5c4d4f2dc84b4701856985cece726cfda69dd352eeb262fc10998b6ef4dd8c64c4bc24e1e9f4518d754074b39a498762866158313d4720097e771ba0509e
 MISC metadata.xml 246 BLAKE2B 9ee65595d2ce7d0c82f8bfa5110c981e55be2592e0ab8beb2abf163268dcbbe4ac2c1825bc1f3619c26fd447ef95a3153ce7ca7f627ca806030c217493fd51f0 SHA512 79818ad9d4436efa7bbeb3c302aee6b3c72ceadb118aab6d390fc4431110d2fdbc6cfe2d2c3c4e360688449279001e52acc9ace257b5ac401eb5c401e299bec1
diff --git a/net-im/discord-bin/discord-bin-0.0.15.ebuild b/net-im/discord-bin/discord-bin-0.0.16.ebuild
index 085aa80b0b9c..085aa80b0b9c 100644
--- a/net-im/discord-bin/discord-bin-0.0.15.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.16.ebuild
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 13386b579119..65aed8e3ebee 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -3,6 +3,8 @@ AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc347fc10731606e44de537d2a451c9cec17d17c44d88e0eefda110927c471788ae6128a7e006666603bdc6d842c9b1 SHA512 3aa00156e73643c7a23bc3a1ff26ecd7ee89c0d91571a23bf00e54aa87f25d2b604990d33263e8f74f6499d8e08646aa524e14063e8000e60d1b49d74c5cc784
 DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b
+DIST pidgin-2.14.7.tar.bz2 8713379 BLAKE2B d48670c8b7419df67c6dddedf8eb15c0c4d61877386f65793b1423b659c6131d92eb58ae6cf63a31432426c8a09da0bdab0be8770517436bae51610a60886b59 SHA512 189b02b5500ca3560972cad9c84e94007e1c8cedd56d39214293412b31ee38bc2dbb33ab2f9320338bb226131f51cc8a1f6a4c66ba889a0f55d91edc15ac7465
 EBUILD pidgin-2.14.5-r1.ebuild 7569 BLAKE2B e9093afec931c7a48d730f0cc531f904001a7e9d0f80f4f7d771b5dc9bf14ed669457996ec0ee50fd7ae1d993243ae1ee1b860a815927b13d9bb705abbfa72c7 SHA512 33ff1a4da14c4fdd6f6d66b96397641b8d9c836f6589eb519e9080ff26bb6709d4f153f9a9c76bd3aed5df4dc128ef636be51a4beeb9a649c361a5b8dd98a41a
-EBUILD pidgin-2.14.6-r1.ebuild 7588 BLAKE2B 035d1d47a1e93b7d26964c6002c87a885ec94da0b7be45d4cd1d806d60e9b06b6fb403e01d882b7e599f38223eddb1f17b8581e042ed1b8655deaf64da89559d SHA512 5528c1d6385dd1aaa3fe736581f4881bfd68bd5eeb11f702c74e5bb05e754f13e6a903222634ca7808a4d51ab6a49ec0ad9b46d321c19bc276e561ebd439cc17
+EBUILD pidgin-2.14.6-r1.ebuild 7583 BLAKE2B 90efcc7558cdeb162601d225780fdb61b11c2da664fcc4075564000ac1faa89e09a705cf7513044fdcd60be2d2846cc06a3ee8c1ce17a4f2fa3ea13e4e8bacb5 SHA512 fffade129e46fa5b59c84afca453d02ea8f6ffc60cda0d5cc2b62c663a1bf0497a02b2708358cea6557cc4c8b8ac6b78eb8d27cea417a3c9a23450a37ef745a9
+EBUILD pidgin-2.14.7.ebuild 7524 BLAKE2B e96334e50940ab294f6f1da6ebb63c6e8b5fce110b96ce4a23d772f3cdae60398ab4d22b4a23a151e85e38db29ecce3a55d3028bb872f201904d6ee296cf4cee SHA512 a360b21703c418b7ad5d31c34a81e913e8c4b3e68abfedc284c9c68f5b9cbb9d54571b5f5178f43b84eb59d319f61c1e2b7b9f9e1db6201efe9f041b25d8f0b8
 MISC metadata.xml 1419 BLAKE2B 6b87c11749b1e15503eddb0d73d18ed264e86d8d8e515cd30ba6787117401f8f07ea5030accd5cbf86da7c059eaf4f4d2fa3ff5d0c2bf5db1f987f5f536ac448 SHA512 c7bc589c6ddd1fb628832105691f08555f0fd7e5578bd3c5905a6b082198c36a34f86182a8772b8e8aa14b75f2b99eeba99c2c77ef480f3d80fa199aa792067d
diff --git a/net-im/pidgin/pidgin-2.14.6-r1.ebuild b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
index f61c190bd83d..b1f6fe4fbaf2 100644
--- a/net-im/pidgin/pidgin-2.14.6-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.6-r1.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/pidgin/pidgin-2.14.7.ebuild b/net-im/pidgin/pidgin-2.14.7.ebuild
new file mode 100644
index 000000000000..5cd269016d6a
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.7.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="https://pidgin.im/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+LICENSE="GPL-2"
+SLOT="0/2" # libpurple version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
+meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
+tk +xscreensaver zephyr zeroconf"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	ncurses? (
+		>=dev-libs/libgnt-$(ver_cut 1-2)
+		sys-libs/ncurses:=[unicode(+)]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.10:2[aqua=]
+		x11-libs/libSM
+		>=x11-libs/pango-1.4.0
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		spell? ( >=app-text/gtkspell-2.0.2:2 )
+		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+		prediction? ( >=dev-db/sqlite-3.3:3 )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		>=net-libs/farstream-0.2.7:0.2
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+	dbus? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-0.90
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	perl? ( >=dev-lang/perl-5.16:= )
+	gadu? ( >=net-libs/libgadu-1.11.0 )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	meanwhile? ( net-libs/meanwhile )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	networkmanager? ( net-misc/networkmanager )
+	idn? ( net-dns/libidn:= )
+"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	gtk? (
+		x11-base/xorg-proto
+		${NLS_DEPEND}
+	)
+	dbus? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )
+"
+
+DOCS=( AUTHORS HACKING NEWS README ChangeLog )
+
+REQUIRED_USE="
+	dbus? ( ${PYTHON_REQUIRED_USE} )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,simple"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgin-latex
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+PATCHES=(
+	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls ; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python ; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+pkg_setup() {
+	if use python || use dbus ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	use gadu 	&& DYNAMIC_PRPLS+=",gg"
+	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
+	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
+	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
+	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
+
+	local myconf=(
+		--disable-mono
+		--disable-static
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable ncurses consoleui)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable xscreensaver screensaver)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable spell gtkspell)
+		$(use_enable perl)
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable debug)
+		$(use_enable dbus)
+		$(use_enable meanwhile)
+		$(use_enable gstreamer)
+		$(use_with gstreamer gstreamer 1.0)
+		$(use_enable gstreamer farstream)
+		$(use_enable gstreamer vv)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable doc doxygen)
+		$(use_enable networkmanager nm)
+		$(use_enable zeroconf avahi)
+		$(use_enable idn)
+	)
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=(
+			--enable-nss=no
+			--enable-gnutls=yes
+			--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
+			--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
+		)
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=(
+			--enable-gnutls=no
+			--enable-nss=yes
+		)
+	fi
+
+	if use dbus || { use ncurses && use python ; } ; then
+		myconf+=( --with-python3=${PYTHON} )
+	else
+		myconf+=( --without-python3 )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	# setting this here because gnome2.eclass is not EAPI-7 ready
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	default
+
+	if use gtk ; then
+		# Fix tray paths for e16 (x11-wm/enlightenment) and other
+		# implementations that are not compliant with new hicolor theme yet, #323355
+		local d f pixmapdir
+		for d in 16 22 32 48 ; do
+			pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null || die
+		done
+	fi
+	use perl && perl_delete_localpod
+
+	use dbus && python_fix_shebang "${ED}"
+	if use python || use dbus ; then
+		python_optimize
+	fi
+
+	dodoc ${DOCS[@]} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+src_test() {
+	# make default build logs slightly more useful
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	emake check VERBOSE=1
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index a241857959f3..e9ead3d73002 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -1,3 +1,5 @@
+DIST profanity-0.11.0.tar.gz 887566 BLAKE2B 373b49670d00aa741e1957a8d3ca0282f6e7215c53c6c89088268d92fa6bd8f396e6c8e69f17aeb65f9183f620376613672c7f71c879ece31b97382df5d7a781 SHA512 14164921e151a9201728afc3835e08649036702d1fcdef6e37f83de6da4b9bd9c5e9ba54db69e3a9e16fb7e360369b4e92b6b771bc5e005e343a9a526738a268
 DIST profanity-0.9.5.tar.gz 830966 BLAKE2B fc1b755b1a92dbde62aacb31cb5d9190cea951e98501a5b48495dbd31266f343cf436de1fa0f69caec34324cd1f781d0bd4f5f7ebdd984324c5d1d6edb91452a SHA512 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
+EBUILD profanity-0.11.0-r1.ebuild 1056 BLAKE2B 2c09a9a88b89a3b0e335583fbea06a5798ab395af529a3dac98bc38999b46e2945ab7311fcef1f2728d0136ddde3c3e98505f5c2627b530daf84b0a786bf0947 SHA512 f6b9643f0fe819d8e082c5c2b51ae6d61806ad39a884a3cacee776ead18cc083e1a7af17406defd5136d6d154d2b047753006ac18fe78d60cd807b8703ab20ba
 EBUILD profanity-0.9.5-r1.ebuild 1035 BLAKE2B 94078ea301009255f2b9b57b0835558ebc797ad3c0c75393be2c95c4b368832dabc0be1d596e45c2b421e3c2e58ea099d0238c55dc9a9ceaf0ccc3519b4c96ce SHA512 c21319345910123603041d916f0712c4eac3851bb71efee3906d8e2423e2aef3032139bb663ce3a4d2bcf13254456c03948a10511ef8dc2d72f214f023db19ed
 MISC metadata.xml 693 BLAKE2B e95d3933a403ac601c8a6e286dab57a592543dde78e6d04ef8ada15c12ae0f4625a6706e8c7c58831140214ad6ed76dc2aaf82d1a707808b4d4cbb91d438a47a SHA512 ea6745842648608bc79ac809648827c15630a8d0e2429c907f8a6816b0644838f49eb2e6da81d1f29ef9450c532c1ef7e214dd39c63da88e0862d49743b70a89
diff --git a/net-im/profanity/profanity-0.11.0-r1.ebuild b/net-im/profanity/profanity-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..1ca09eb39937
--- /dev/null
+++ b/net-im/profanity/profanity-0.11.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A console based XMPP client inspired by Irssi"
+HOMEPAGE="https://profanity-im.github.io"
+SRC_URI="https://profanity-im.github.io/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="libnotify omemo otr gpg test xscreensaver"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/libstrophe:=
+	dev-libs/openssl:0=
+	net-misc/curl
+	sys-apps/util-linux
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libcrypt:=
+	gpg? ( app-crypt/gpgme:= )
+	libnotify? ( x11-libs/libnotify )
+	omemo? (
+		net-libs/libsignal-protocol-c
+		dev-libs/libgcrypt
+	)
+	otr? ( net-libs/libotr )
+	xscreensaver? (
+		x11-libs/libXScrnSaver
+		x11-libs/libX11 )
+	"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notifications) \
+		$(use_enable omemo) \
+		$(use_enable otr) \
+		$(use_enable gpg pgp) \
+		$(use_with xscreensaver)
+}
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index b061f624b27c..d1c5784e882a 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST rocketchat-3.5.4.x86_64.rpm 58601052 BLAKE2B 72ab756661822e50f44b68cd5e1138f0d73fd7b3000375716a06306b034c9ab62c8d2a38ec8389cbc27a1f63b2483deccf02a481cbd28902e2bba8596cf81da9 SHA512 3c46905410d60ac380e8a0addf3cdf942de13dfc72e781e73b300f7a6e4ade96b4835fad13a21efea044b7d910f20584d3bc58958f3d117afe2ebb33bc3bf3c6
-EBUILD rocketchat-desktop-bin-3.5.4.ebuild 1074 BLAKE2B c550bb783cf67c5e7d18896258360e4d6621fd8439aac7742f99b4792a667b9061eecc29ff9b0798febe809e785a952c2f8deaf5c2589bc551f053042a6d7fa2 SHA512 cd5e05036880fa65d35ae2cd109b88c6a8a5824bc3ec13d37538e804cf0cf309bd3ef8d7f990c8a63f85fbdcc30c4a510a1aef61face5364a86eddec09515913
+DIST rocketchat-3.5.6.x86_64.rpm 58606472 BLAKE2B 53ac80902188314b3b820ec0f7fdfa42ee9fbace83655240eeec7375f5ba110fb1bb2729ca901c870c50ae915cf1cec621c9e3c0e4eae7ffdf0a87100cf8e816 SHA512 d89fbd99132e3758b67ec45492f0b1f5013779b612b793e54f9ea64040ab75951246500f0c9c0c860f411ce92781af37f2aff2588c8424b3659ee2aa0ea4f4e2
+EBUILD rocketchat-desktop-bin-3.5.6.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.5.4.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.5.6.ebuild
index 46fc3d26d958..46fc3d26d958 100644
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.5.4.ebuild
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.5.6.ebuild
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 57d9d38e714a..319640a65f0a 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,8 +1,8 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-DIST tdesktop-2.9.2.tar.gz 15021694 BLAKE2B 4b68ca1129529fc3834121b3c7de0f4f7a790ea0af4eb47c3778cfe11c3a5cac7dd591af0f22f887852674705371aea33809c4b3228a416764771b392dac28d5 SHA512 45993a463d0f2fd5c694e5c28ff6b85c6db5026522b10ca26fe1b8bb57ae9ad4fe0e09e3a1eee6079653aa460f613ffe6eee41810a82d9bc4e19ddbc6d236df8
 DIST tdesktop-3.0.1.tar.gz 15202460 BLAKE2B aa81844c2cef095089371a65a9784f0f6f5bff1923a31ad3fd5a06ebbc6fb8e11a23dd4eec7baca656297dfd3838ee378dc6dc05de4db5c646d8cc1f7479f6c0 SHA512 1d913be9c557953610197b068d778d682fd00a1967e82ff02dac75fa899dcf1eaab9be0e6441c58e131c282674dcd13dd60aac573f24c93be49752194cf1c92f
-DIST tsetup.2.9.2.tar.xz 38859712 BLAKE2B c1fd3852dd22afbbfaef57971dd084f7d2f4ed59a0c7a879dae63f68936d23a9ceb51ba29fe06cdaf82095058288c56be1be25c13f3af08b07e1c2ea9567f852 SHA512 5937d8e4107d58631e47e82a316b7ea0b2d61beab1bebf85268222a14088ab199cf8c64030e8852674add15f8d733c91e162b6b5504217058ecfa7c786649189
+DIST tdesktop-3.1.0.tar.gz 16117688 BLAKE2B 2b3b32c5353ddf67705fafa6e0a8e66779747674ea902ce800b1dd6b76dc2dff5c1fe1a5bb74fc4332640962dbecd57a539bf6b7825021626567b6c59eeee598 SHA512 e29fd9ff77ca022bf71ccf9dc34b9a8089e54f20892974302286685300d7d44aeb3f7bf4e1cacae6a3653eedf1766f9d70eaf1b31ee2eb34593ab94db4abf4f6
 DIST tsetup.3.0.1.tar.xz 39191516 BLAKE2B e48189962e618ce4678bffc09f75c53bb4dec71b2d65e7cfdf0f6662c09b7999ab5512262a84fa14a22a60a011c595b6216385771185dba4035d930730dd00fd SHA512 870eda7af0ca25712eee15b45c5958d8e1be012fda46ac6c3ebdc622067dda98896eaff969574e120b7d33dad06cef9a323cf0c08cbb33a3b542e9691740cbb0
-EBUILD telegram-desktop-bin-2.9.2.ebuild 1327 BLAKE2B e60335f603996ebcd6d52896542d170ce624db0ef870b79e25903513d9f15975e4541b9c2b942ee204fa0d5c6b2b725665dbb19c6efb9c875531f1229e1364b2 SHA512 3be2436e171b335d1e92f52778e1a9c8fa504c62c46a1068a0c47ac570417c195084d6eb1a65038eb360b26d2dca6fb7d9a44154d97e1050960523576ae4fa30
+DIST tsetup.3.1.0.tar.xz 38188512 BLAKE2B ae6d29e8f8a1e06c3cc9fb67f29852cacff3d60a033730e248deae104b055dfe5906217ac1ce699b7b6f1a0c07e92e6e0895b69fc6e8048e01d30135eba5edd7 SHA512 d0722eda91b7dd3714d746b4b05dfb5883a937b47ad9bd6f79a7472aeb38c9e3a2bc7137af1b37d646354459443dd66ac9893521cdf0dfb4faec02b156ce1d70
 EBUILD telegram-desktop-bin-3.0.1.ebuild 1212 BLAKE2B 723980b9f1f2e2cac0edf5112dde41ce0546ecd70735bf462b550e8139795d8df71111be34512cbe9f089b20907e607ab374834d46568d2f64c3246c14987978 SHA512 147c7b1c6d669df0e6a8983a98fe187d885a8c1147c6ba453e23a6c14a24a078a8d87cea01b712c7c107658324fc7d59a8f2320991ceade2be446932410a8be7
+EBUILD telegram-desktop-bin-3.1.0.ebuild 1164 BLAKE2B f3245c2f8284f8f356736247f77586cca88015b44232c3e18ebcc25182fecda578943c007c247843a03630aa6375d4ab7dc87e186b2811f705c9c16e57b8f029 SHA512 07d72d0f55b44cc0695bf1f0a722d0ca6bb0543f1e5347c2b11751691a137d226d7c1fb5504bad09f1e8db1b4678bbdc46959038c5cc84608d56f9673e900d9f
 MISC metadata.xml 617 BLAKE2B 5aed21ce280bfc0d23ba9c4e75dbc8841637ef702cb67686ee91b46dc0830308ab6ff687bed89274d3217f665f989295341735f506182a0461f968d05af187b3 SHA512 ec61f9dec317a9625ffcc0e1aaf2dbf323f218a6705375cd23a14827e1bc30bb496849efdebbe2a8f4fd7a28d37e170e87f0f6d6f49c56d6292220c955a27a0a
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.9.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0.ebuild
index 5d9bb593c191..18ad635fcc20 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.9.2.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.0.ebuild
@@ -20,17 +20,9 @@ QA_PREBUILT="usr/lib/${PN}/Telegram"
 
 RDEPEND="
 	dev-libs/glib:2
-	dev-libs/gobject-introspection
 	>=media-libs/fontconfig-2.13
 	media-libs/freetype:2
-	media-libs/libglvnd[X]
-	>=sys-apps/dbus-1.4.2[X]
-	sys-libs/zlib
 	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/libX11
 	>=x11-libs/libxcb-1.10[xkb]
 "
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 8e25acbfb57b..4b4dc82bf440 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,7 +1,11 @@
 AUX tdesktop-2.9.3-add-libdl-dependency.patch 615 BLAKE2B f87d48b6c36116bad13f4f930fc69de132e9b916f02b6055fb5b770e9ab4944c4d8c0e0b7d3e7da580ba1e3b848fd94636a36221c35b29518ca349cd0ed727bf SHA512 86f54fd463c6a681d17e1beb0cbbe0f67e6fd74fa8e5dce350a61ff92da19f3879e81cbb996b97195091794bca174742cb1203aba08d1b95e9389d878f05f254
 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-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c88889a5db8e5b167a09d6d6c1270ac965ac4
 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
-EBUILD telegram-desktop-2.9.3.ebuild 4336 BLAKE2B ca0dd4416d7b2bbda13e8adfa548eca9db4140f50970c20fdeb2893ef019eb6a201006acda6e87ec4cd667750f37289f5fcae5e47e944a90d0c6325b26018254 SHA512 0d4ee5774bca8406eda829a119ef7e01e37824cddbf21c3033d6cf7d5dd3896fc055093a924c7eabd5f859d3af60701df72aec75b733c45b69327b014f6055cd
-EBUILD telegram-desktop-3.0.1.ebuild 4216 BLAKE2B 3c74c83e74625be07b36b867bd7c6722c1dc7003e724aaa2bfc40ce824783cb2cb1659865fb068ba2940b9dc35aa5953f0431b5d676c55aac86919bcfd021665 SHA512 8f21fdb4bab4fca0636ea0da87f7ba2ab5f90601e20b67862852fdcf6150ad62e89c3c5994b67d0d2757658b238ec3efde620c6cf170d5e7a18a066109bf5603
+DIST tdesktop-3.1.0-full.tar.gz 38465279 BLAKE2B c9442507d3ec6f6e36e68d44ec86a9c1dfb864498ee90eef5f50b12482de4e1c93256352fc21bf997c38cda0dfce03f53776c47afe1a3066b109c1675ffc8749 SHA512 7fbb5722917c482aed820154e425642c4a3c7649defebae7076e48ac25da8744933877b70539d5cd6952e9f80493ccc5f144bf2c0c01083bade3473f00a23ec4
+EBUILD telegram-desktop-2.9.3-r1.ebuild 4378 BLAKE2B e93eb591dfb85de579398166b565d473d51edcbe5da9463b6e495ef4190574780ad626e5542019a032dff09de4fed94eb35f2029ae3860ad700eb6451093d45e SHA512 6f2b955352ad244d39286af4c1001e4bb67101d4dd9fa42bf338ac90cc5c15ae3f8b6fb09f8a955a447b5f13e963f4ac33624e3c5197e36936fabdb8e6bd8dc0
+EBUILD telegram-desktop-3.0.1-r1.ebuild 4326 BLAKE2B c5643127d791d9bab485163fd6b4d38771750f6c2e1457d02b0d40012421aad5ec3b6bf94fe9f08e08920f121aba827d057a7c62f5ab889a88a250345df62f77 SHA512 23ebe675b4d967ebc083fcbd6bf2363cf15bf646df2bd7a38240291f6764e1354c8206819819a0c9f88c051ed4f700aed5fdc2b122ae583d291acf936392db48
+EBUILD telegram-desktop-3.1.0.ebuild 4372 BLAKE2B 36240b358bb02e5a4dd43bebd5ef27598db90207b4d242083ded672d0c8704fd57b02761d60c253558cf4ce38a019df8ade44141e227fc32cf8681eb0db26943 SHA512 7442d197978235bb587c422b1f3052e7bfb2a904cfc23c138f180134220856ec843c9024e13b11e878e051b1f70dedc48d38e0c8e014b266dc59c4603db06ab2
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch b/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
new file mode 100644
index 000000000000..2b92e8adce4f
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
@@ -0,0 +1,19 @@
+Fix openssl 3.x compatibility
+
+FIPS_mode_set was merely used to clean up resources. This isn't necessary
+anymore on the newer openssl version.
+
+There's still a lot of functions that are used that were deprecated. I hope
+upstream can fix those, as I'm unsure what to do with them.
+
+--- tdesktop-3.1.0-full.orig/Telegram/SourceFiles/core/utils.cpp
++++ tdesktop-3.1.0-full/Telegram/SourceFiles/core/utils.cpp
+@@ -124,7 +124,7 @@
+ 
+ 	void finish() {
+ 		CRYPTO_cleanup_all_ex_data();
+-#ifndef LIBRESSL_VERSION_NUMBER
++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x20000000L
+ 		FIPS_mode_set(0);
+ #endif
+ 		ENGINE_cleanup();
diff --git a/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
new file mode 100644
index 000000000000..7ad3e75e49ba
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
@@ -0,0 +1,35 @@
+Only link jemalloc for the Telegram binary
+
+Some combination of factors is making the different codegen tools hang when
+jemalloc is linked for those, and they're ran under portage's sandbox. Since
+this is only used during build-time, and jemalloc is merely necessary to
+improve runtime memory use, it's unnecessary to use it for anything else.
+
+--- tdesktop-3.1.0-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-3.1.0-full/Telegram/CMakeLists.txt
+@@ -1256,6 +1256,11 @@
+         endif()
+     endif()
+ else()
++    target_link_libraries(Telegram
++    PRIVATE
++        desktop-app::external_jemalloc
++    )
++
+     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
+         target_link_libraries(Telegram
+         PRIVATE
+--- tdesktop-3.1.0-full.orig/cmake/options_linux.cmake
++++ tdesktop-3.1.0-full/cmake/options_linux.cmake
+@@ -45,11 +45,6 @@
+     target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
+ endif()
+ 
+-target_link_libraries(common_options
+-INTERFACE
+-    desktop-app::external_jemalloc
+-)
+-
+ if (DESKTOP_APP_USE_ALLOCATION_TRACER)
+     target_link_options(common_options
+     INTERFACE
diff --git a/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild b/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild
index 9e09efaee54e..eda146962285 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild
@@ -29,8 +29,10 @@ REQUIRED_USE="
 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?]
diff --git a/net-im/telegram-desktop/telegram-desktop-3.0.1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
index 4c3ae78f28d6..f17835c3420d 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.0.1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
@@ -28,8 +28,10 @@ REQUIRED_USE="
 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?]
@@ -67,6 +69,7 @@ BDEPEND="
 	>=dev-util/cmake-3.16
 	virtual/pkgconfig
 "
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild
new file mode 100644
index 000000000000..675c8aefaa4d
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild
@@ -0,0 +1,146 @@
+# 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 +hunspell screencast +spell wayland webkit +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+	webkit? ( dbus )
+"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	dev-libs/jemalloc:=[-lazy-lock]
+	dev-libs/openssl:=
+	dev-libs/xxhash
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
+	>=dev-qt/qtimageformats-5.15:5
+	>=dev-qt/qtnetwork-5.15:5[ssl]
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5[png,X?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	~media-libs/libtgvoip-2.4.4_p20210302
+	>=media-libs/libtgvoip-2.4.4_p20210302-r2
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20210914[screencast=,X=]
+	media-video/ffmpeg:=[opus]
+	sys-libs/zlib:=[minizip]
+	dbus? (
+		dev-cpp/glibmm:2
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	wayland? ( kde-frameworks/kwayland:= )
+	webkit? ( net-libs/webkit-gtk:= )
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/range-v3
+	=dev-cpp/ms-gsl-3*
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
+)
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# no explicit toggle, doesn't build with the system one #752417
+	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+		cmake/external/rlottie/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
+	local mycmakeargs=(
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
+		-DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use X && ! use screencast; then
+		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
+	fi
+	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
+		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
+		ewarn "to crash when pasting big images from the clipboard."
+	fi
+}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 9562cc2d1624..bdf2f077b4f9 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,9 @@
 AUX README.gentoo 446 BLAKE2B e4307a45b86109e63d8057050ad66d1f77a2382ae717f1fad521756a356ff08203fc3aad20e39e437606797351b8c7f453b7d01ac1b299256ce8ed64ece888a8 SHA512 dd4c927bff4b8f66b8e149929e766378ecef0832952898a0070f0c0eb1b303b7c0cda7b8c3ed4031f12490785a593375c3aac8f30f305fa3245096eab36d189c
 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
 DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.7.29123.0808_x86_64.tar.xz 52593340 BLAKE2B 25b2bdc4d9531b31d1ce74989c6ab4561fa7b39874a956194133c14c8331fdf1e024b4c8355675e2f964faea2ae1681cc377a85f800e547de7232a478ae40dd8 SHA512 65eddd5a11f9ac11ac0cc0402f989ac0afd3edf1f56f0c39ebe2875f2341c5e0d2a1a454ed0c09138c65e2a9e4543ae575b1c1bcef0c8f8465a6a488f0faf265
 DIST zoom-5.7.31792.0820_x86_64.tar.xz 62059660 BLAKE2B bb15170f9a87143b50171041006ad65ffe5ce80b711769c83f0c5936bcad3e8f9417b32cb9f1f71734eb990744cb4be5d3e4b10c93b579af59b8fcc6337b75e9 SHA512 0248eb4b1d5d8b289eb67d8e55da7f20eb06c33698fc9f1beeaf8c36a133a9edae2aa2fd51f8866049c88e7bc6c47df80dfe9a0c8c24776dc6ddfe8ca646b27b
+DIST zoom-5.8.0.16_x86_64.tar.xz 55714984 BLAKE2B 1e9cecc3ae838976cdd7e343d9eca27a615290df079e60edef44d03fe66ff6be8715162a66ceb0030a9f798123b4a7c68622b5ad402f0d4c5f6d76c5f315b74c SHA512 ddc20b57a58c9f102651b3361f7eb7daecbcf943684470247ba23f911dc52c4ea015aeaf9f2ed7d9b378617dc6fa69d2b37103ea7826f5bfd61b150d6e6cb3c6
 EBUILD zoom-5.4.53391.1108-r3.ebuild 3167 BLAKE2B 9aba2dc82ebd4c97f7dc97b6718141e35416316f51111ce145b9844bf1172fea80c3080a1d8ff34964e42742e243d1fc157906e2c55450b39170f01cb36a55b4 SHA512 52fc56dcfadaa4b9822475525a7958d8bbe5351038ee209426e1440af613598bed0f75dabdd79450206b6c9a36564f3ecf43dd3a98182368789744c99a589cbf
-EBUILD zoom-5.7.29123.0808.ebuild 4189 BLAKE2B a024abc94ef953f75d770b041adf50f8b2e9f3edcc9dc77f0c9295bcda21a32b503c10aff773cc8866e6d83f27ff8dc5517e2a208f7752de37490dbb9676e723 SHA512 81db6cc78abc3e8939fb030cfe5ddffdd66b98a235de8708716fa92f87f94dea3debd512df9ab1a6f77d1c7502785e87f37b2f7476679f10691b99c97fb9cd03
 EBUILD zoom-5.7.31792.0820.ebuild 4085 BLAKE2B ca206778b4acea7bd0628f4b9d1af91a9eb67ff49b51de8fd0537ecf02d6ab1b5254010f0e5b2c5aa6ddfc1bda049c337dde09dd809aa35d04ea7af4b8c87a54 SHA512 6a88e45fb45f3afbee7301dd079d6b5caa0dee5547a3580f363ca986155821dbe2dcb242d7e23f228bf12456726a8cec0e02e322a116d95c5ce1eb15b2cca21c
-MISC metadata.xml 616 BLAKE2B f57de9a9f963b3521a735f3ccef1d4b79ab9925ceacd51bb2d7f5bfcd60bd7ecfb16f5d03e9a28d391c50c4f827cbbe80b84d49b458dd61da37257e7f12b5b20 SHA512 59acdbb6cce4333f80977da909c746025b8d4677f6949cc26cc3c5db7a4a3f3a5ad834617c954b49e55d7eccf39b700f10bcb59dc1abfbefa6e7ded3e8e8b01b
+EBUILD zoom-5.8.0.16.ebuild 4243 BLAKE2B 2deb0cbf7114084bf2017edc760c836ae3805b3ab16d187e2baf0b4a159617c41a69aed5e83f09e6e5d5fc19122d78ffff6a4c9d7c0fd71bdc52a547af8a8713 SHA512 83030731be137d6eba1d93873bf9569eeac1ee3a3d638f1cbfb0a39de23fbb043bfc8f82bc213a8ea515d12eca09a18ce43f7caf5a53d90d3c3fe1c326111714
+MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/metadata.xml b/net-im/zoom/metadata.xml
index e476fbb646d4..641677fd6fef 100644
--- a/net-im/zoom/metadata.xml
+++ b/net-im/zoom/metadata.xml
@@ -11,9 +11,14 @@
     <email>mva@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="bundled-libjpeg-turbo">Use bundled libturbojpeg
-      instead of <pkg>media-libs/libjpeg-turbo</pkg></flag>
-    <flag name="bundled-qt">Use bundled Qt and icu instead of
-      system-wide libs</flag>
+    <flag name="bundled-libjpeg-turbo">
+      Use bundled libturbojpeg instead of <pkg>media-libs/libjpeg-turbo</pkg>
+    </flag>
+    <flag name="bundled-qt">
+      Use bundled Qt and icu instead of system-wide libs
+    </flag>
+    <flag name="opencl">
+      Use OpenCL for virtual background support (<pkg>virtual/opencl</pkg>)
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/net-im/zoom/zoom-5.7.29123.0808.ebuild b/net-im/zoom/zoom-5.8.0.16.ebuild
index 2d1b6688d0d6..263454606292 100644
--- a/net-im/zoom/zoom-5.7.29123.0808.ebuild
+++ b/net-im/zoom/zoom-5.8.0.16.ebuild
@@ -13,12 +13,12 @@ S="${WORKDIR}/${PN}"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland"
+IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
 RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
-	dev-libs/quazip:0=
+	>=dev-libs/quazip-1.0:0=
 	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
@@ -35,6 +35,7 @@ RDEPEND="!games-engines/zoom
 	x11-libs/libXtst
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-keysyms
+	opencl? ( virtual/opencl )
 	pulseaudio? ( media-sound/pulseaudio )
 	!pulseaudio? ( media-libs/alsa-lib )
 	wayland? ( dev-libs/wayland )
@@ -51,7 +52,6 @@ RDEPEND="!games-engines/zoom
 		dev-qt/qtnetwork:5
 		dev-qt/qtquickcontrols:5[widgets]
 		dev-qt/qtquickcontrols2:5
-		dev-qt/qtscript:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
 		wayland? ( dev-qt/qtwayland )
@@ -88,16 +88,16 @@ src_install() {
 	insinto /opt/zoom
 	exeinto /opt/zoom
 	doins -r json ringtone sip timezones translations
-	doins *.pcm *.sh Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher
+	doins *.pcm Embedded.properties version.txt
+	doexe zoom zopen ZoomLauncher *.sh
 	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
 	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
 
-	local quazip_so="libquazip1-qt5.so"
-	if has_version "<dev-libs/quazip-1.0"; then
-		quazip_so="libquazip5.so"
+	if use opencl; then
+		doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
 	fi
-	dosym -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so