gentoo resync : 29.06.2021

17 files changed, 351 insertions, 202 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 435689fa64d0..b516addc4245 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index a749debd8284..c9bb021c714e 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-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
+DIST element-desktop_1.7.31_amd64.deb 81607506 BLAKE2B 4a8ae5594982fe533380f5ad1e1965f54899214aaafe4501d22c7ed7d055d3f6a98217c60317fc9d603c726a6908294e23359545c34277a563dede5381815ad4 SHA512 e9ba9c1f8f9267b81bcf9f0f32651a3031b90e9ee1d5ccfaf92e1121802cc6e10488b2e973ede7b827c431715009e681a87aeb1f579d10cdae5a542ba3e1bf56
+EBUILD element-desktop-bin-1.7.31.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.30.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.31.ebuild
index af28b3f1fe7f..af28b3f1fe7f 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.7.30.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.7.31.ebuild
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index ab3f9c3000e5..f3042b99c5dc 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,4 +1,7 @@
 DIST mattermost-desktop-4.6.2-linux-ia32.tar.gz 116280086 BLAKE2B f0770b12abf23c43ae1a71b068045abcbbc44d7cd40de3ef84e4cde7e22210c911cd8401a8ad330bd5ea19f664087d423fadd43834a351e48b479693686e9ba8 SHA512 409966b02256f5250da976ca825d75ea5690f667bfafb30cfae7e16cf96aa39f8a2fc797768bc1b8b9bfc0e511dfabd85a9033161830077d0a424deac22bb362
 DIST mattermost-desktop-4.6.2-linux-x64.tar.gz 114689112 BLAKE2B 9efc54fc424dc1be2544b6f1901387ef4ee2ad976dfa1a2c0fa18c4410f16393a471e9549dc0c36219eedefde2d246d9c6a054f8a7c38bde68f700bd5574116b SHA512 19e1f3a273ae5ab202bbd380f68f3acbc3b42748ad978897bac05be8ba264026fe3466ddfa73b711bc3b1bd331661a49fcd6f800ca23e11a463e5b97ee9f35eb
+DIST mattermost-desktop-4.7.0-linux-ia32.tar.gz 83111746 BLAKE2B 81b7f50570e29a562b5abb9f84296212d7e0b48f9346a0cd9b3f46411010aaf4da05ce96508743f083f7519b2e5ee6fdaedae211228d2e9ea1a00b62eda4d70e SHA512 7520384b61efa0cf80feb9028fcb632d5e4fc29b907a53436c59359aa1d4f2ebbed0be4da41ead97f7450fe389815e69f2513acc9e63cd3cea2286a49e96ff83
+DIST mattermost-desktop-4.7.0-linux-x64.tar.gz 84882264 BLAKE2B b9667ee63fe9fe756d431efbe53c259a96cccf05d29a8a47e660f835ebad3ae826bc274aa8a8daa481c333a28d38bce9025b5a22dd730927bab901d87538c5de SHA512 225fa12e684f3735f4c55869ee27ee3cf26385bdfadeedc01c1fe070ebe585277fd701611a7275bd5bc894a0d0460e484ff31f959aa41a0b0b98c19d486986b6
 EBUILD mattermost-desktop-bin-4.6.2.ebuild 1546 BLAKE2B b6ea0855a44175147beb7c4f1b37b52301cd086df1644b4883e91fbf2a2b4738d1b48e02aa15ae1de52a92533bb90a47086cd7b3512f28b96ee6b665d364a41c SHA512 71c8fd446631197bafc34f38e7dc49f99d6d75118a96e4e6c989941b1c491cb7f0238336cb1ecebfd3401e0fb445bbca75b785e7bd15baf76bc163d7f185a6d7
+EBUILD mattermost-desktop-bin-4.7.0.ebuild 1498 BLAKE2B f0602e18772c9efceb5cbb48d2ddf7ab7e2a7e898a0ff1495d25e9fc6e545f75429376744cd2f7d6deaa3d41c234a50e9c63c059a9d9bff41b6b83b0f8f09237 SHA512 7cfed21d67a1a221ed6ed137017d693f4bad4105951c7ee4d6739ca22e09aceb3c12eb318b1f10240ac8a12ee7638d2deec2634311d91565363fceed4da2ae76
 MISC metadata.xml 485 BLAKE2B 35760e18fc4421046f98f05a9a959a76fdf880ae88bc27617c0a969bd9c10352f803ea17b9e81851e4886801662273bdd70b8bbe61981bdbcd84c964107a3781 SHA512 ccc78798b891f43ff9e0b9cd050706417f9f6771b20847b4d08ac36ddf8441fc30f1200780d5a62d978c25b181373d0e7d26e29ec158f2d58cb4b1218981eba0
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.0.ebuild
new file mode 100644
index 000000000000..294315d57b10
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%-*}"
+
+inherit desktop
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+	amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+	x86?   ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2[X]
+	dev-libs/expat
+	dev-libs/nss
+	media-libs/alsa-lib
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/gtk+:3[X]
+	x11-libs/libXScrnSaver
+"
+
+QA_PREBUILT="
+	opt/mattermost-desktop/mattermost-desktop
+	opt/mattermost-desktop/libnode.so
+	opt/mattermost-desktop/libffmpeg.so
+	opt/mattermost-desktop/libGLESv2.so
+	opt/mattermost-desktop/libEGL.so
+"
+
+DOCS=(
+	NOTICE.txt
+)
+
+S="${WORKDIR}"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" || die
+	elif use x86; then
+		cd "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" || die
+	fi
+
+	insinto "/opt/${MY_PN}/locales"
+	doins locales/*.pak
+
+	insinto "/opt/${MY_PN}/resources"
+	doins resources/*.asar
+
+	insinto "/opt/${MY_PN}"
+	doins *.pak *.bin *.dat
+	exeinto "/opt/${MY_PN}"
+	doexe *.so "${MY_PN}"
+
+	dosym "../../opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+	make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+	einstalldocs
+}
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index 3e5d2f3be05b..c7a42e4dceae 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,6 +1,6 @@
 AUX fix-url-opening-1.4.00.4855.patch 439 BLAKE2B 57c5a432cf829c58942ac5b9910fee17fe6e08c7bd200d72e474e3919a46258f169b364c999c9b177236e55c318da20d9527475859e55e7f76d919563b3653d9 SHA512 a06d8e576b8a687e552173cff26071778f75b85a5ce3e36c40ba15b7d21d4c9e8323a07dbac2e6d7a5e834d9cbdc359c31868aaef796e4a17e968771d8aa070e
-DIST teams_1.4.00.4855_amd64.deb 76579552 BLAKE2B 3b03451d5a333a0e3736fd48d21252498a0b08041104a97b33a6166263ee8a5d2149f138e5598356bb42aa0c8d7a0619c6b1cd954d2ac5793b063c9bdbb3b929 SHA512 5596db57e8019068e8dac94cc6da8df2b1b6c813e8b67b4a61717fb7775f28973b09b49d77d001ab2dfd65ffe99ef2aaeaba8bc722f1348a474677b3d7a84df8
+DIST teams_1.4.00.13653_amd64.deb 83232268 BLAKE2B bc59aa1f4b9d5f1740fedc7bfc3c2cec6f8b4c1979a55e5a68742c36ea4399ba0e8c276de2d9e5b8de39363a9359136a5d1be59a6019af8bd5ac9922a5aab2c9 SHA512 d15b6cca0321e5e569e6a1f4ad0801f7a2de1e9312e8f584f07a4bc8bcac8a55626eb060a41baf31b9f4cfcd1cf2757e2f2b946f671f0e4c95c81f9eea0f8e2c
 DIST teams_1.4.00.7556_amd64.deb 77232550 BLAKE2B f663a79a9edb29aecb240722f46cb29aa6f4e2cca6dbe1a29801aee2e9c408b1ad00ab0d2b8fac3c7c4c227429b0382a06b46114921d2f435fbe1c80415ea9d4 SHA512 0afe2714e290e8b2d30039e27a2af4d22cbd03bc4bfe90d6979714ae1cc75bc5226af8932dc38528a5dc5bd6b4820c4b9d9444abcb558a76438c62cff285ffac
-EBUILD teams-1.4.00.4855-r1.ebuild 3278 BLAKE2B eb3309642ec7d762ed86415f95e4eedea20b36eaf6f188714c399f7896eb4a54aef1c8daffbcc96ab680b5882456f086fc5a0fc5a9d382a85162c59a1f6872f6 SHA512 4df12fb0bce9bd38bd6094e3c8269a5d59291b57a63a35412b30f5e7bf9a1cfe0fe1955033864780431ecff44dbfef8af5c3e8dc7fdfa83f4afda79565e93475
+EBUILD teams-1.4.00.13653.ebuild 3457 BLAKE2B e01bf0f83107de551fdf6228a71b4734468c9401d6726fc0b78ce8ec4fd148104086404d4b1f8265c006c9bc6409a9279518e0ebdc1a398806a907785bbd51bb SHA512 b11f8411ac7073a7027f491ba5521cb4776d7569bcba4e86764f03023f4e479c104fb79ed8d1fa3836f73a4f75d33f07f75abd45e991322fe72b13a1cadc3dc4
 EBUILD teams-1.4.00.7556.ebuild 3222 BLAKE2B 9f3cf836f60bd9560525b2551a41db63fffcbc0918f7dbb383f08c4c6a30a0f3558fb135c008eb4bbb0ef92bf27ab70eaa1f6a52a7f04125562ce44b4d61d08f SHA512 7d92835f11d66c694a291ae8c89187304c86c5db314b66e5c7ecd0e6f7d8358e80580497dc415db7e8b9198250224c812e48235c40b135a7b99053bc191d2906
-MISC metadata.xml 488 BLAKE2B 8a110d1b3cf045e0a0fb8d53252534752a7b561a32c7f1e15a46585aaeafe025272f682dc857f9ee42098b3db7fbcacf7720f16f42af145f05d7a55edbaf1d9f SHA512 25b924038e4c4bf04267cd6c945254203f7d70ae19b9f7ffe7c7c777b58083758bc71849282ef89ef1c16e5cbbc8c1d7d3bb81268ece2d4825143dd4dbca0e2a
+MISC metadata.xml 556 BLAKE2B 8d746368e0e1e3951e0b8541a03a46314310158809ce4324420f6b84af2efb7fe0559a1a93e17ea2c0f1f5050696405c5e06edbf3e5053eb17a09631f34c5035 SHA512 2c498682eafc737bbaf618801a4ca8fcc767bb2dc73b25599a3f8df7ff257bbf7fb5036a4403f486356d8e3cf165c7226be2dbed38067128c422e8d9040588df
diff --git a/net-im/teams/metadata.xml b/net-im/teams/metadata.xml
index a141f350b4fe..fa147c289cb9 100644
--- a/net-im/teams/metadata.xml
+++ b/net-im/teams/metadata.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
+    <email>sultan@gentoo.org</email>
+    <name>Stephan Hartmann</name>
   </maintainer>
   <use>
+    <flag name="swiftshader">Install SwiftShader OpenGL libaries.</flag>
     <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
     <flag name="system-mesa">Use the system-wide <pkg>media-libs/mesa</pkg> instead of bundled.</flag>
   </use>
diff --git a/net-im/teams/teams-1.4.00.13653.ebuild b/net-im/teams/teams-1.4.00.13653.ebuild
new file mode 100644
index 000000000000..2e508b9fb6ef
--- /dev/null
+++ b/net-im/teams/teams-1.4.00.13653.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 desktop unpacker xdg
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror splitdebug test"
+IUSE="swiftshader system-ffmpeg"
+
+QA_PREBUILT="*"
+# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 2.2.0), libatspi2.0-0 (>= 2.9.90), libc6 (>= 2.17), libcairo2 (>= 1.10.0),
+# libcups2 (>= 1.7.0), libdrm2 (>= 2.4.38), libexpat1 (>= 2.0.1), libgbm1 (>= 17.1.0~rc2), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0),
+# libglib2.0-0 (>= 2.39.4), libgtk-3-0 (>= 3.19.12), libnspr4 (>= 2:4.9-2~), libnss3 (>= 2:3.22), libpango-1.0-0 (>= 1.14.0),
+# libpangocairo-1.0-0 (>= 1.14.0), libx11-6 (>= 2:1.4.99.1), libx11-xcb1, libxcb-dri3-0, libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1),
+# libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6,
+# apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	app-accessibility/at-spi2-atk:2
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/mesa[gbm]
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	x11-libs/pango
+	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	sed -i '/OnlyShowIn=/d' usr/share/applications/${PN}.desktop || die
+	sed -e "s@^TEAMS_PATH=.*@TEAMS_PATH=${EPREFIX}/opt/teams/teams@" \
+		-i usr/bin/teams || die
+}
+
+src_install() {
+	rm _gpgorigin || die
+	rm -r "usr/share/${PN}/resources/assets/"{.gitignore,macos,tlb,windows,x86,x64,arm64} || die
+	rm -r "usr/share/${PN}/resources/tmp" || die
+	rm "usr/share/${PN}/chrome-sandbox" || die
+
+	insinto /opt
+	doins -r usr/share/${PN}
+
+	dobin usr/bin/${PN}
+	domenu usr/share/applications/${PN}.desktop
+	doicon usr/share/pixmaps/${PN}.png
+
+	pushd "${ED}/opt/${PN}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	if use system-ffmpeg; then
+		rm "${ED}/opt/${PN}/libffmpeg.so" || die
+		dosym "../../$(get_libdir)/chromium/libffmpeg.so" "opt/${PN}/libffmpeg.so" || die
+		elog "Using system ffmpeg. This is experimental and may lead to crashes."
+	fi
+
+	if ! use swiftshader; then
+		rm -r "${ED}/opt/${PN}/swiftshader" || die
+		elog "Running without SwiftShader OpenGL implementation. If Teams doesn't start "
+		elog "or you experience graphic issues, then try with USE=swiftshader enabled."
+	fi
+
+	fperms +x /usr/bin/${PN}
+	fperms +x /opt/${PN}/${PN}
+}
diff --git a/net-im/teams/teams-1.4.00.4855-r1.ebuild b/net-im/teams/teams-1.4.00.4855-r1.ebuild
deleted file mode 100644
index 12ce91e2eb97..000000000000
--- a/net-im/teams/teams-1.4.00.4855-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop unpacker xdg-utils chromium-2
-
-DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
-HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
-SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
-
-LICENSE="ms-teams-pre"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror splitdebug test"
-IUSE="system-ffmpeg system-mesa"
-
-QA_PREBUILT="*"
-
-# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0),
-# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3
-# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1,
-# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
-# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
-RDEPEND="
-	app-accessibility/at-spi2-atk
-	app-crypt/libsecret
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	x11-libs/pango
-	system-mesa? ( media-libs/mesa )
-	system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
-"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/fix-url-opening-1.4.00.4855.patch"
-)
-
-pkg_pretend() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_configure() {
-	chromium_suid_sandbox_check_kernel_config
-	default
-}
-
-src_install() {
-	rm _gpgorigin || die
-	doins -r .
-
-	fperms +x /usr/bin/teams
-	fperms +x /usr/share/teams/teams
-
-	if use system-ffmpeg ; then
-		rm -f "${D}"/usr/share/teams/libffmpeg.so || die
-
-		cat > 99teams <<-EOF
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/chromium"
-		EOF
-		doenvd 99teams
-		elog "Using system ffmpeg. This is experimental and may lead to crashes."
-	fi
-
-	if use system-mesa ; then
-		rm -f "${D}"/usr/share/teams/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/libGLESv2.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libEGL.so || die
-		rm -f "${D}"/usr/share/teams/swiftshader/libGLESv2.so || die
-		elog "Using system mesa. This is experimental and may lead to crashes."
-	fi
-
-	rm -rf "${D}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die
-
-	sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die
-	domenu usr/share/applications/teams.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 5473df76ff3d..151f64c601fd 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -2,10 +2,13 @@ AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab
 DIST tdesktop-2.6.1.tar.gz 15071996 BLAKE2B 927c571e8a35c30cdf0c974895e3a7d2a3257077959e9a6a0b7b5c819833a83cf6d5e7136f0e8909490310cac01863de88bf3ebd2c82fe60c8ed85f988ed3887 SHA512 abd0630c4bd979cdc36b61c7c9b3223f7cdc090805d88f6a3173466b092934a3400313c7af3a170c5b116ec2aefa7577d008cd41085a94aca5e20759a3957995
 DIST tdesktop-2.7.1.tar.gz 15117072 BLAKE2B caf01d2d4c6b5ec8d9621e1cf2b4d5a906230caeb29fc484b64d69de3bce070f42f9efa43b31149cffbbab4adbbea17fdda65b24dad702db8df01f232b4ad5e6 SHA512 148299b00348129950e92be4f7ea6dc38d0ec6dd4cd673c05126ba724caa9bde3f9b10ba42b55803116f5f145097c83f93fdcdd541a6f9894406ca19a395b583
 DIST tdesktop-2.7.4.tar.gz 15226377 BLAKE2B eeb889c6027e889d08b8df2f74a8a7df964475d62bea500122ad455202c6e590f1908877f38c0d0249c9ab6bfe8f99c610804919e36ab0cb2a39c50331e5b7f1 SHA512 f4f896d725bc96c221e70cff19105834dcb0223ad9b4da6bcb00485204fa77447f7cb82e8fd5fd43c841e44376ee763f9707bd3eb18ff4ee53c16bc523002802
+DIST tdesktop-2.8.1.tar.gz 15334528 BLAKE2B 915823eef057634404dd2bf1e75afdeb5c8768d7c7c7435216f31eec058b1cb8e5f96a47b1faeeecdfa46b4d0acb9dd1839978c3120ef8d41144608d89e45710 SHA512 2da82e6f6c33b5f404d20687e849aff17ce5de24c741adf2276e252643273f558a822c449d1acfd7deeb64644da94d472ddb55eb1881464390efa5d95219e489
 DIST tsetup.2.6.1.tar.xz 35300412 BLAKE2B cf4e616c4957b8a6ee91b621a79556a588c5d736583457d4fa35c3f0b4266b929f41b488764330c5f5d06314ac57a853613f9fcf70e5d129dceb9ac9e8059c8d SHA512 f8b9f78b4d7f6cf886a9368731733f598749babf6ed50541b5332dfef20ccc24616f399448d17cc523409b6e1dcdd2c137bbe0e5eb13e4e9ade902a6e26cf1ea
 DIST tsetup.2.7.1.tar.xz 35867608 BLAKE2B 13ae89d4c7e98dbb0ec536c22554cd5d2ef6905a07e9eb1684fa536ccd0b6469791955a581bc2d0e71e8727ca5b3c4735a5658d6ec2aa7aecfd2b68c4906c110 SHA512 732d0be95e63e5948258e64fd33ab171adf610706714115fcd4715034d95f3edf030dbc1a7000f1fd01ce140234056b0f1db1d94cb512286789681ade1b0d739
 DIST tsetup.2.7.4.tar.xz 36173288 BLAKE2B 7b25475c2e64a23a658e96bf2bee1495946cdf4c17eb412e3cb385fd3d003cfe99ff67ec66e68590e22d5c818a9c6f4f9060a589edeb17c1b7c69aa222e66d00 SHA512 bd070c1efc9d5db60ebb82e4f0d0145ddadf04760314fa0b37e5a8920f9955dbb475b062911c3857fd6176a4bd8469e1e5764b1c855baf35b2289bb6d12cdcee
+DIST tsetup.2.8.1.tar.xz 37205872 BLAKE2B 915041cf403feca63b796747c3a072be555b729401a4290ad3773794a0d6df22eddbfea930fb2b17d8aa5aab337e6d8b45e28e710ffe34b80a7e033ae10e83be SHA512 e84cbec26420a633c93adcebe514b530bcb7fe425926795521d06f8f60377107f4174b57713fe248b9bfa7642ef1ff7709a825e96cf0b8d76e0e7e2ec7454aa2
 EBUILD telegram-desktop-bin-2.6.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
 EBUILD telegram-desktop-bin-2.7.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
 EBUILD telegram-desktop-bin-2.7.4.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
+EBUILD telegram-desktop-bin-2.8.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
 MISC metadata.xml 616 BLAKE2B d92266b23ce1be2d3180a55b0723b6ea1bd2383e95ca7b216f845b13b5b86a23f44ba42998c13de91bc6b468ba5d0b0ac04a8093454fd512c9a2c3daf3106c17 SHA512 3db845ccdac1b80efeaf903a82bd11a23df8e93458143fb82499053a14a1bed515380d96a2c32f1ad94f58107b61453e8dcdddb4ec71fd570fd04ff35bc9ca21
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.1.ebuild
new file mode 100644
index 000000000000..6821536278c0
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/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
+	x11-libs/libSM
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 4589a88d71ba..67e6595d805d 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,13 +1,11 @@
-AUX fix-tgcalls-gcc10.patch 949 BLAKE2B 7a065fcbf5b8e7b49b6b866d199c67315484312ca527a517a09f890f09d39fa0c97787c586990ba92c0ce2ee83e7c2387eef100f630a74f003ddc06adb93c379 SHA512 dbc61a8520f3698fdeec6c9849cfd8241b8b778589f89277f82d6c748d8ed7a81db90daa0a69dedc3ab2b81bba848ee68e1df79a9cb3fb055f99bd7d19f46e5d
-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
+DIST tdesktop-2.8.1-full.tar.gz 37129127 BLAKE2B 06f2a3050f0e0f321c766c54e19faf3ea172c41088e2ffdbb5928a41ba01de1fc845a84addded17d113316857c68f265642a8ab32feb79a87beef548c739b56c SHA512 df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69
 EBUILD telegram-desktop-2.7.4-r1.ebuild 4589 BLAKE2B fee2f81578a4c774fe33592641a6a19592e8fd67623f3424ea599c2adbf425861478f34f01fad970fca31d9fe7545f15fe3d53ec195f60933e701fe287fa59d5 SHA512 ed7de5b99a43621b38ee7589a1f842647f7a9e2619b6984d061183ea3ec5d891c55df2cc5e04568924e30252de26bd3450ec1abce6e8d8edd2ff8be6104900dd
+EBUILD telegram-desktop-2.8.1.ebuild 4362 BLAKE2B 8388d5963edc83635719974c4c1372becc37e3a4c53aab0b63883c0c4b3c49f8f312d6781ce7a976dde5f066738398245b0fddb899e5440e96622ad99b736b2d SHA512 b351769398c4585e65382200954732e4574d0bb19e05899f67a600102e2ec604086cf07cbc724a6d108f42081a367f47170bfef94bdf356cef1de8665e8e9c19
 MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f
diff --git a/net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch b/net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch
deleted file mode 100644
index ac7e067f3ab4..000000000000
--- a/net-im/telegram-desktop/files/fix-tgcalls-gcc10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From eded7cc540123eaf26361958b9a61c65cb2f7cfc Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail@gmail.com>
-Date: Mon, 22 Mar 2021 19:24:10 +0400
-Subject: [PATCH] Fix build on GCC 10, second attempt.
-
----
- tgcalls/group/StreamingPart.cpp | 1 -
- tgcalls/group/StreamingPart.h   | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tgcalls/group/StreamingPart.cpp b/tgcalls/group/StreamingPart.cpp
-index a7f2e00..6b0206f 100644
---- a/tgcalls/group/StreamingPart.cpp
-+++ b/tgcalls/group/StreamingPart.cpp
-@@ -12,7 +12,6 @@ extern "C" {
- #include <string>
- #include <set>
- #include <map>
--#include <stdint.h>
- 
- namespace tgcalls {
- 
-diff --git a/tgcalls/group/StreamingPart.h b/tgcalls/group/StreamingPart.h
-index 08859d6..6e0812c 100644
---- a/tgcalls/group/StreamingPart.h
-+++ b/tgcalls/group/StreamingPart.h
-@@ -3,6 +3,7 @@
- 
- #include "absl/types/optional.h"
- #include <vector>
-+#include <stdint.h>
- 
- namespace tgcalls {
- 
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
deleted file mode 100644
index 8563ee5fdca0..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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) {
- 
- void RegisterCustomScheme(bool force) {
- 	try {
-+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
- 		if (InSnap()) {
- 			SnapDefaultHandler(qsl("tg"));
- 			return;
- 		}
-+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
- 
- 		if (cExeName().isEmpty()) {
- 			return;
diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.1.ebuild
index ef9ecd0fd657..ceaf8f8b8b03 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.7.1-r2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.8.1.ebuild
@@ -7,44 +7,53 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit xdg cmake python-any-r1 flag-o-matic
 
-MY_P="tdesktop-${PV}-full"
-
 DESCRIPTION="Official desktop client for Telegram"
 HOMEPAGE="https://desktop.telegram.org"
+
+MY_P="tdesktop-${PV}-full"
 SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell pulseaudio +spell wayland +X"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+	webkit? ( gtk )
+"
 
 RDEPEND="
 	!net-im/telegram-desktop-bin
 	app-arch/lz4:=
 	dev-cpp/glibmm:2
 	dev-libs/xxhash
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?]
-	dev-qt/qtimageformats:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png,X(-)?]
+	>=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/libtgvoip-2.4.4_p20210302[pulseaudio=]
-	media-libs/openal[alsa]
-	~media-libs/tg_owt-0_pre20210309[pulseaudio=]
-	media-video/ffmpeg:=[alsa,opus]
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20210626
+	media-video/ffmpeg:=[opus]
 	sys-libs/zlib:=[minizip]
 	dbus? (
 		dev-qt/qtdbus:5
 		dev-libs/libdbusmenu-qt[qt5(+)]
 	)
 	enchant? ( app-text/enchant:= )
-	gtk? ( x11-libs/gtk+:3[X?] )
+	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
 	hunspell? ( >=app-text/hunspell-1.7:= )
 	wayland? ( kde-frameworks/kwayland:= )
+	webkit? ( net-libs/webkit-gtk:= )
 	X? ( x11-libs/libxcb:= )
 "
 DEPEND="${RDEPEND}
@@ -57,16 +66,15 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="
-	spell? (
-		^^ ( enchant hunspell )
-	)
-"
-
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/tdesktop-2.7.1-fix-disable-dbus-integration.patch"
+	# https://github.com/desktop-app/cmake_helpers/pull/91
+	# https://github.com/desktop-app/lib_webview/pull/2
+	"${FILESDIR}/tdesktop-2.7.4-disable-webkit-separately.patch"
+	# https://github.com/desktop-app/lib_webview/pull/3
+	# https://github.com/desktop-app/lib_base/commit/01d152af4c6282756585f1405c4bcbb75960a509 (landed in 2.8.0, patch is harmless)
+	"${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
 )
 
 pkg_pretend() {
@@ -80,10 +88,6 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	cd "${S}/Telegram/ThirdParty/tgcalls" || die
-	eapply "${FILESDIR}/fix-tgcalls-gcc10.patch"
-
-	cd "${S}" || die
 	# 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
@@ -99,8 +103,9 @@ src_configure() {
 
 		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON)
 		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
-		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
+		-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk 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
 	)
@@ -133,5 +138,5 @@ src_configure() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	use gtk || einfo "enable 'gtk' useflag if you have image copy-paste problems"
+	use gtk || elog "enable 'gtk' useflag if you have image copy-paste problems"
 }
diff --git a/net-im/webex/Manifest b/net-im/webex/Manifest
index c7dcc9e9ce5c..0062c90ff550 100644
--- a/net-im/webex/Manifest
+++ b/net-im/webex/Manifest
@@ -1,5 +1,7 @@
 DIST webex-41.5.0.18815.1.rpm 207061576 BLAKE2B e1c4cf2cd966c0bfa36f20e595769e4b39a3a814f351e6b0fe19755fbb96a2192733f052b8e926b83d20d16cfe4cf9f2ce751a8e2c82a9e5d0470d9c185b6db1 SHA512 88beb2b3e8ec116cbb72733c5835da7d33e6a00cdfbb07b05e6e5fbfe17cfc553c4ed61721eca2d53e55b623833bfe89d5ea8b16df966f28f49118e3dcbbb79c
 DIST webex-41.5.0.18911.1.rpm 207073948 BLAKE2B d65da3e5bf058a7bcd44ca59dd1724990db5288dea328c445212608baa1d0b9eccac3dd89fc440b4e04b6401e1e0ee6cd8ff21c51f609d4cd953c4bb75ec9102 SHA512 a32d2d3581aea65f91f876dc9dfe6390514ebca8fde19f667a5a4f670d3b6431d80f579dcbf0fec8399e007a854141d02e018864085ca6b1173cde6a0f92b44d
+DIST webex-41.6.1.19162.1.rpm 210334860 BLAKE2B a5b9a3fb1254527ccceb75852b21f46baff7ce6dfe942b4270feda1d9e15a0348433c87e44ec52655f8c824e35fc037b8e824dfa48529a8bf4d746c556b9440d SHA512 766f712af49942db5f86ab1cc9d9c10d43ea775de05be092205025e8f2a0b661b0463223f0ffb810f40d937e13ffb1cda6d755e3e595ce5e2678656c78da3c88
 EBUILD webex-41.5.0.18815.1-r2.ebuild 1450 BLAKE2B 00bf47091dbfc6422400b498a81158ad4cbc190268ff01b89e5a2c7089f5fd3f852e4d12e3f33a1c9e4dd812153526413e2484aaa10b5f6d288d4c819b2c2b87 SHA512 7a099261fad39de65e585e94530f7e9c4062d511d64b485abeacab9b50b46557ea41e0a28cf28f603068073dfa9b2f05c8e6b932c87c542645b133e3444bed7f
 EBUILD webex-41.5.0.18911.1-r2.ebuild 1450 BLAKE2B 00bf47091dbfc6422400b498a81158ad4cbc190268ff01b89e5a2c7089f5fd3f852e4d12e3f33a1c9e4dd812153526413e2484aaa10b5f6d288d4c819b2c2b87 SHA512 7a099261fad39de65e585e94530f7e9c4062d511d64b485abeacab9b50b46557ea41e0a28cf28f603068073dfa9b2f05c8e6b932c87c542645b133e3444bed7f
+EBUILD webex-41.6.1.19162.1.ebuild 1450 BLAKE2B 00bf47091dbfc6422400b498a81158ad4cbc190268ff01b89e5a2c7089f5fd3f852e4d12e3f33a1c9e4dd812153526413e2484aaa10b5f6d288d4c819b2c2b87 SHA512 7a099261fad39de65e585e94530f7e9c4062d511d64b485abeacab9b50b46557ea41e0a28cf28f603068073dfa9b2f05c8e6b932c87c542645b133e3444bed7f
 MISC metadata.xml 254 BLAKE2B 2ebef6b0e20635c1c0660b01b61190fff6ee347560493836fb431ad31e42f626a7720162e8a53b8b774886921d8691d64a56294517e1428db97f98b16cedc1b7 SHA512 29a065d900df54b041d81ea385dbdccc5fcb5c0e1b4a244d38005ce603720a278062d025852ba6c0d7ffbac1c1777904695da5b4ef6be8273f07e5612eb7900e
diff --git a/net-im/webex/webex-41.6.1.19162.1.ebuild b/net-im/webex/webex-41.6.1.19162.1.ebuild
new file mode 100644
index 000000000000..7e2ebf186457
--- /dev/null
+++ b/net-im/webex/webex-41.6.1.19162.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg rpm
+
+DESCRIPTION="Cisco video conferencing and online meeting software"
+HOMEPAGE="https://www.webex.com/"
+SRC_URI="https://binaries.webex.com/WebexDesktop-CentOS-Official-Package/Webex.rpm -> ${P}.rpm"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+
+# systemd-libs => virtual/libudev
+RDEPEND="
+	media-libs/alsa-lib
+	app-accessibility/at-spi2-atk
+	dev-libs/atk
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libnotify
+	app-crypt/libsecret
+	dev-libs/wayland
+	x11-libs/libxkbcommon
+	sys-apps/lshw
+	media-libs/libglvnd
+	media-libs/mesa
+	dev-libs/nss
+	x11-libs/pango
+	media-sound/pulseaudio
+	virtual/libudev
+	sys-power/upower
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
+	|| (
+		sys-libs/glibc[crypt(+)]
+		sys-libs/libxcrypt[compat]
+	)
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	mv opt "${D}/" || die
+
+	# dodir /usr/lib/debug
+	# mv usr/lib/.build-id "${D}/usr/lib/debug/" || die
+
+	sed -e 's:Utility;Application;:Network;InstantMessaging;:g' -i "${D}/opt/Webex/bin/webex.desktop"
+	sed -e '/^Version=.*$/d' -i "${D}/opt/Webex/bin/webex.desktop"
+
+	domenu "${D}/opt/Webex/bin/webex.desktop"
+	doicon "${D}/opt/Webex/bin/sparklogosmall.png"
+}