gentoo resync : 24.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
commit: b49088575eb777ced2551f484da86317332d6087 (patch)
tree: bf9a151cf2d61956340d555659ffc098ee1da466 /net-im
parent: 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)
32 files changed, 255 insertions, 550 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index b189fec04ba9..70d7b8680b06 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index 2a26896c81bd..b47cfada6531 100644
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -1,4 +1,4 @@
 DIST ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz 1177484 BLAKE2B 7bf6918a7f75738ac34eeae64ac53d3c90acd72795711c856206b79ca96c94b2ce397132ee31dfa8a9060d91d7b4b9aa23834596fca190dadf476660c6e5cd71 SHA512 ba28b66233290bd6c9b6a9602a5409c0fb2d847993bda638172da2f68430b5b5cf9bc0ff0d327983939fa0fd078bf6030069c60cd8bdd8449c349964b23e1f44
-EBUILD ekg2-0.4_pre20190315.ebuild 2560 BLAKE2B ecf8bcd9bb4f9b3a82beebdadab8f450c3feaad23e93dd77b72cee6cb598d1acb98fe7c0bf95cb75b39beea34152685c0779a2ee79432788a0649517a5d5ddcd SHA512 1dd125ea8a170e4fed1d32d1ffc18d85a63964e37e377547aa27c29e23c1bf840778af81e34cb9b4c15b78c748d23d33b71693dc1f65fffb18a49b3061bd8555
-EBUILD ekg2-9999.ebuild 2421 BLAKE2B 6fbf8d13f7b3719bac089e325c72f4b5b10e659ae54d3034b995a2b99b057464367dc083fb4eb49ce16016e61a8c0e900db736c803a13b472e3927c6f369903e SHA512 1918e71293fa657da19e1ed00c1d7935094c0a367d09fa7956fe2c89d8460b9735380d9b252113336c68b39c87e88776c7d43a0bec7f8a05cf5358f30da1d41f
+EBUILD ekg2-0.4_pre20190315-r1.ebuild 2562 BLAKE2B 5f70dfc40838b5b3bc5ad0917a275c7017386e3735196fdd4f25e340baea01ca0236e4d609f7cdb68aab1b401dcaf0da7ee3536dd05d9a8cd5cec726f30169a3 SHA512 a96beb077027f9b79b247867a1c6dfbd3c0cf35dbc3936cdc6eaf6e153dda2d46c98e70d0de6e0fa720fe6c0be5788caff3efda39a4ca00f8376a9dac3253ccd
+EBUILD ekg2-9999.ebuild 2423 BLAKE2B a8e61ca7fffbae8d50a79aad4f0830b7aae190d760466b733fc9e78c3fb3e4d131444e45182ef77739aee7ee6ef0430a9174d4da8290348f50b1eda2272c2b26 SHA512 2c7c091d5039cd29e559875c9f407b8cdce64a98c8f91bdd27c3613b750b251cd5ec378bba0d9c7ac34b101a5499803b748a74ec7e35772c57a4a730fdf2c645
 MISC metadata.xml 710 BLAKE2B 1967d906b644580b49cfc5fb42488d14604de37150a1dd5fb78495e801499daf9e3709ca7b00aa4e1624be7f9d371eaacc77ea2b6c8fcdb2e0d6cd7bbdf62d26 SHA512 a606056720a8186f0353c44530ec838f2583c11d2235a43d84e00e0b6334326c8e76f8690c194e743a103bf6b3fa906eb3636d57159bae4d3d4e819f9b04141f
diff --git a/net-im/ekg2/ekg2-0.4_pre20190315.ebuild b/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
index daeedb74a570..f1e09d360c6b 100644
--- a/net-im/ekg2/ekg2-0.4_pre20190315.ebuild
+++ b/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="dev-libs/glib:2
 	xmpp? ( dev-libs/expat:0= )
 	zlib? ( sys-libs/zlib:0= )
 
-	ncurses? ( sys-libs/ncurses:0=[unicode=]
+	ncurses? ( sys-libs/ncurses:=[unicode(+)=]
 		gpm? ( sys-libs/gpm:0= )
 		spell? ( app-text/aspell:0= ) )
 	sqlite? ( dev-db/sqlite:3= )"
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index 3ab02569cca2..95e8a266ea8d 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ RDEPEND="dev-libs/glib:2
 	xmpp? ( dev-libs/expat:0= )
 	zlib? ( sys-libs/zlib:0= )
 
-	ncurses? ( sys-libs/ncurses:0=[unicode=]
+	ncurses? ( sys-libs/ncurses:=[unicode(+)=]
 		gpm? ( sys-libs/gpm:0= )
 		spell? ( app-text/aspell:0= ) )
 	sqlite? ( dev-db/sqlite:3= )"
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index c9bb021c714e..0cf623cfe185 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-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
+DIST element-desktop_1.7.32_amd64.deb 81626504 BLAKE2B af4cc2e7e853988fe4a89301943f3a72b45f21a3b3023ceb2ebc735ec89b6e011e40312057289d5856084f1a5415f040410b355c5da655465202a646202708d0 SHA512 69bba229161f303c6e69761db2356a561838e3047da7f7a766886fc55c627f78029958bf3ec93be7c7cd24eff1ac0396fc92eb443905024c35f2d12f642c6a08
+EBUILD element-desktop-bin-1.7.32.ebuild 1775 BLAKE2B fcad580d6600d42ce5ed10431ab199ee7c7d1557d2f3848235403874f0f5ea93d6a0dc6e781afab8472114b6e6b93993342353735bbdd627b47420a5a54b52d3 SHA512 c8f174c0c675bba2c115c100de73f297534285d3b602d7fd7d65db83753788973c4ed38ee2f1567da32b5362fed4b19bb4efbb8fc1721962b941f9cac4eaa7cf
 MISC metadata.xml 349 BLAKE2B 28ef90d142ba536df4df0e57bc4b9dd3ea565b038bebefe71c2a2d9325761625922f928707a99833e3edb4cd2bb8083757b02ad81abc620571d4eb3620df72c1 SHA512 20596473ae86afc73bf80be067fdc7104ba8fcea6aa319e5fcc26397612dad2a724876a5748babff0f13f020d2bd246ae24f9805c8db9da70e86ae52ea3dc61e
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.31.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.32.ebuild
index af28b3f1fe7f..acb8fc1ce31c 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.7.31.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.7.32.ebuild
@@ -48,16 +48,15 @@ RDEPEND="app-accessibility/at-spi2-atk:2
 	emoji? ( media-fonts/noto-emoji )"
 DEPEND="${RDEPEND}"
 
-QA_PREBUILT="
-	/opt/Element/chrome-sandbox
-	/opt/Element/element-desktop
-	/opt/Element/libEGL.so
-	/opt/Element/libGLESv2.so
-	/opt/Element/libffmpeg.so
-	/opt/Element/libvk_swiftshader.so
-	/opt/Element/libvulkan.so.1
-	/opt/Element/swiftshader/libEGL.so
-	/opt/Element/swiftshader/libGLESv2.so"
+QA_PREBUILT="opt/Element/chrome-sandbox
+	opt/Element/element-desktop
+	opt/Element/libEGL.so
+	opt/Element/libGLESv2.so
+	opt/Element/libffmpeg.so
+	opt/Element/libvk_swiftshader.so
+	opt/Element/libvulkan.so.1
+	opt/Element/swiftshader/libEGL.so
+	opt/Element/swiftshader/libGLESv2.so"
 
 src_prepare() {
 	default
@@ -73,7 +72,7 @@ src_install() {
 	doins -r opt
 	local f
 	for f in ${QA_PREBUILT}; do
-		fperms +x "${f}"
+		fperms +x "/${f}"
 	done
 	fperms u+s /opt/Element/chrome-sandbox
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 67ed4e8f5197..028e804b811f 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,11 +1,6 @@
-DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
-DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326fbf5b652ae15710bb46798ac8a1514dc2e1361e89bef4a80f43d5f64cf09879f3faffa927aa4407fe696b564 SHA512 297afa2b0ac44aad59b203907b1479fb8f004e2dc2a00681fa8034d76e4fb89ee3dcb4fb96011028382659bcb978cf214c396073d29b3dd0a7a711454915057b
-DIST gajim-1.3.0.tar.gz 9886259 BLAKE2B c9d0912f4d2cb76668978ca48fb1bc2db203cae7ea8dba7fd03c40d1cfee3da84131e2cd82ed6b27ed4c9a70a37328c57551fe1190e29bbd0c9a3cd6f9fa4a66 SHA512 4b68b97f6e4edcc2aa4b009a0131e4781c4ca52340ce98369154c602f7ee71e974e0840af0ae6ab28fc9e2fd34433ec0f304e10847e6cc257de3cde60b90b349
+AUX gajim-1.3.2-fix-historymanager.diff 1315 BLAKE2B b3520b7730f3b408759003498963fe6dd77bb0b4b313a3cf49ce4f77fde99763ee0c8616c839aed6edfe2e47a5aa992b7c71f1e3b9ba5e8bb04599137e6fb90c SHA512 5708f62c7f3903ff8b01808d955e51930281dc1e9d818897681e5368464b191b2c24f76a82ad015711e60b59504c43db21db5f54fa684f6d78b48acfa961e5b6
 DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642
-DIST gajim-1.3.1.tar.gz 9885129 BLAKE2B ee1fac7f1354576879c5ef14d167d4f7248e497f5b7c468d4bdeb9bf93b749482e221e4ad7a965c86799baa959020303b1b3e49ca99ce1607fc721d0722cbffd SHA512 840b9424c4f93281fe32569331917ba3bdd0afc51428d778ec357b1b0dfc9aecdf77a48c44fa4b66259d82633ca277ccab6b4d6ead47e7eb66d22f078e8ebb84
-EBUILD gajim-1.2.1.ebuild 2354 BLAKE2B 6f3ce6c6363e69d6be10a0fdbb20195b68a2ded9f037c9e40948e8897e4a0234f4c111fdb408684d50ea3f3bdbd886318263fe712a04e5317506436273c8b614 SHA512 da1f7e0e70fb08e81ac7ff9fed60f694af7002a77047c3c89f352aa30bf090929defc1a032fb3b410f4fa3c16c651060ccac1d2474525d4059d47e76c368405f
-EBUILD gajim-1.2.2.ebuild 2356 BLAKE2B 2b8063e45e51d32f0d2399f802c658f256a54be2f2e92d5127627ded7c367391a1899aeeb1b6fe456ea6a9acb722f2ac78c4aab4ffb335a69d1d9f8c53193721 SHA512 7902589bc9b94037bf8d4867b4ba9777900ba0b9ff8e75a5409efb63b7eb4953fd6cbfa228a77a01ef26f601203ef63ba61f565a4bf936b5acaadccaafb1587d
-EBUILD gajim-1.3.0.ebuild 2377 BLAKE2B 45da45a8eb0c7548af69ae436a732148c96d900523f408625d4db037ec3363ff6be23c0ebcfbd3c76244fd178ff5a0ef76702b632292181900dbe3a216ad072a SHA512 ea8e95ec72c246013699c595c174450d34959757c31dda003abf53a3f5ed965fdd70ec8307898610ea42d6751605e1bedde5de809cc06503554ac91af6980215
-EBUILD gajim-1.3.1.ebuild 2375 BLAKE2B 79eb66fd1c81029f25b9a65205ec6eb9d97933ca6df45879e8f4d01b80d08ad52bb304839502c2ceeb3accd18fe20e119b007edaff95330169dce44b4a7484cf SHA512 a772430a49f87279ebcb2b9dfaf1b4694ce9570b74bde0e1525ff5838e7340b16a448cc5c8cc0a9debf224fe94c8f457ff0418f59a3a3f19bf8b3286b504d3ee
+DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4195633141ad1e9fa96145e61b54acff32891aadbdb93d0a775d69f2491e56f97fc67d2a1b2a76fcaab09f7ef SHA512 92c86d1fa2fab51b402b6ddc0b838f321ab744c9c2add743b3f1820215eef84cafabc50227606088d077bdd9f52998f4ca6f98ad153346b9fb37691b71e9c267
 EBUILD gajim-1.3.1_p2.ebuild 2393 BLAKE2B 29e9137608241890d52a59ce27beec4f38f9789e66627c7d03d8646614149adeaaa1ea728a59b6ee62f3fe3b6b9eacc63f186b779abd29d6dc1687dedf373837 SHA512 809c01bfb5cd847ebdfa087877695be7d644ace122e546df1e47c1b2b848a02029dd42fd2735ec00b575f4822d4c8a755836afabfd0e8109e88854dd4b72c747
-MISC metadata.xml 787 BLAKE2B addb4c1ccffe612899495903543df528872a87ab0128459e34fdca346fa7c8c3fe45f27cba541baae9971eba00d282d77f88d964de5ebde47181a8d417d0ef60 SHA512 5425930f8c15ba0a4f9fb13eab27f11b6874453732b1fec601cf1811a796431ee7feaff62c7967f3ac1dfa4009b9acd5de1d0f42ef28543444e7cb887088be09
+EBUILD gajim-1.3.2.ebuild 2680 BLAKE2B 7c42ef6db2251790a159475c9ad6235f2329c700316cee4487b008546467bac85ab1efc206bfe5cfa93ec0fca63bba0b88337905a6c6dc0cb2dca69c78452eb5 SHA512 e5a9fef65f8415d8510888a2d4bac393115cb969d246f23eb0504891979f5e53e305e11d7456121fc89c240d80ae10323eb00595800d4b4708e15c016d8ff78a
+MISC metadata.xml 866 BLAKE2B 5199f029cac2e80f2e3acf9d0373d65f7a2c5e70c2c9a7e1a2af812ea8b9570778f9cd3bf9be0ca5480846648ed4ea4199e13195ab2bea84958b4762204fb832 SHA512 745b3c132ff83fa300e21c01ba9fac2958dcbbb0eabe38652a287836f144510a61891eecbaface58896f9f9b0620547dda57b9958e1fe88256beca549b99951c
diff --git a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff b/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
new file mode 100644
index 000000000000..04428d3acbe5
--- /dev/null
+++ b/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
@@ -0,0 +1,44 @@
+diff --git a/gajim/history_manager.py b/gajim/history_manager.py
+index 1598ea46b385951710a9298093f491dd29e5e6f8..3e767840295f5404687ec6bb298fbdc4e369b4ca 100644
+--- a/gajim/history_manager.py
++++ b/gajim/history_manager.py
+@@ -55,7 +55,6 @@
+ from gajim.common.const import JIDConstant
+ from gajim.common.const import KindConstant
+ from gajim.common.const import ShowConstant
+-from gajim.common.settings import Settings
+ 
+ 
+ def is_standalone():
+@@ -76,6 +75,8 @@ def init_gtk():
+ if is_standalone():
+     init_gtk()
+ 
++    from gajim.common.settings import Settings
++
+     try:
+         shortargs = 'hvsc:l:p:'
+         longargs = 'help verbose separate config-path= loglevel= profile='
+@@ -100,6 +101,8 @@ def init_gtk():
+     app.settings = Settings()
+     app.settings.init()
+     app.load_css_config()
++else:
++    from gajim.common.settings import Settings
+ 
+ from gajim.common import helpers
+ from gajim.gui.dialogs import ErrorDialog
+diff --git a/test/unit/test_gui_interface.py b/test/unit/test_gui_interface.py
+index 41274dfd4447a89b6ea33bdd36538212e4d28d8c..6ad2d734b5bcc093e1d2e8e627cfbd3a0653b53e 100644
+--- a/test/unit/test_gui_interface.py
++++ b/test/unit/test_gui_interface.py
+@@ -3,6 +3,9 @@
+ '''
+ import unittest
+ 
++import gajim.gui
++gajim.gui.init('gtk')
++
+ from test import lib
+ lib.setup_env()
+ 
diff --git a/net-im/gajim/gajim-1.2.1.ebuild b/net-im/gajim/gajim-1.2.1.ebuild
deleted file mode 100644
index 94a9cb349704..000000000000
--- a/net-im/gajim/gajim-1.2.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-1.0.1[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup[introspection]
-		media-libs/gsound[introspection]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.2.2.ebuild b/net-im/gajim/gajim-1.2.2.ebuild
deleted file mode 100644
index 92a23399d45c..000000000000
--- a/net-im/gajim/gajim-1.2.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-1.0.2[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup[introspection]
-		media-libs/gsound[introspection]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.3.1.ebuild b/net-im/gajim/gajim-1.3.1.ebuild
deleted file mode 100644
index 192769880a80..000000000000
--- a/net-im/gajim/gajim-1.3.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-S="${WORKDIR}/${PN}-${P}"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo(+)]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/precis-i18n[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
-		x11-libs/libXScrnSaver
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-		dev-python/css-parser[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		net-libs/libsoup[introspection]
-		media-libs/gsound[introspection]
-		crypt? (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-		geolocation? ( app-misc/geoclue[introspection] )
-		jingle? (
-			net-libs/farstream:0.2[introspection]
-			media-libs/gstreamer:1.0[introspection]
-			media-libs/gst-plugins-base:1.0[introspection]
-			media-libs/gst-plugins-ugly:1.0
-		)
-		remote? (
-			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-			sys-apps/dbus[X]
-		)
-		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-		spell? (
-			app-text/gspell[introspection]
-			app-text/hunspell
-		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
-		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	')"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.3.0.ebuild b/net-im/gajim/gajim-1.3.2.ebuild
index 3e2cb3f1105e..3786de899854 100644
--- a/net-im/gajim/gajim-1.3.0.ebuild
+++ b/net-im/gajim/gajim-1.3.2.ebuild
@@ -14,11 +14,14 @@ DESCRIPTION="Jabber client written in PyGTK"
 HOMEPAGE="https://gajim.org/"
 SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
 
+# See https://dev.gajim.org/gajim/gajim/-/merge_requests/761
+PATCHES=( "${FILESDIR}/gajim-1.3.2-fix-historymanager.diff" )
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-S="${WORKDIR}/${PN}-${P}"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+S="${WORKDIR}/${P}"
 
 COMMON_DEPEND="
 	dev-libs/gobject-introspection[cairo(+)]
@@ -55,6 +58,12 @@ RDEPEND="${COMMON_DEPEND}
 			media-libs/gstreamer:1.0[introspection]
 			media-libs/gst-plugins-base:1.0[introspection]
 			media-libs/gst-plugins-ugly:1.0
+			media-plugins/gst-plugins-gtk
+		)
+		omemo? (
+			dev-python/python-axolotl[${PYTHON_USEDEP}]
+			dev-python/qrcode[${PYTHON_USEDEP}]
+			dev-python/cryptography[${PYTHON_USEDEP}]
 		)
 		remote? (
 			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index d4e7cc8f23d5..c9ce2f629c37 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -13,5 +13,6 @@
     <flag name="spell">Spellchecking of composed messages</flag>
     <flag name="upnp">Ability to request your router to forward port for file transfer</flag>
     <flag name="webp">Support WebP avatars</flag>
+    <flag name="omemo">Install dependencies for OMEMO encryption plugin</flag>
   </use>
 </pkgmetadata>
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 24142f5142b6..f5bdd8c25137 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -10,7 +10,7 @@ DIST pidgin-2.14.3.tar.bz2 8688849 BLAKE2B 5d1f28ca5c452b13d2a6d6ab0c9101f14da3b
 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-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.14.3-r1.ebuild 7896 BLAKE2B da92c7b805ada2398e14ac3bea9e7bf18e2e6ff8e22681a09ccfa26a2f042baa425c81820deb95ebe55d314c67f94d1f8bc5dba681a172033ccae7895aa0d5b6 SHA512 75eeee3de9fc161a67c9113b34b2533b927b42882745ad1ced19717aaa99e0e325ab239f67d084ab7093282434ba25ad49c5923f17b1b9b74c090c52888c61ce
-EBUILD pidgin-2.14.5.ebuild 7562 BLAKE2B d8d867a76c4a95379cfc95638c8e15b2433792d49fbc7c98a26d4aee840842cbff97c748924cca9e2fefc5ce7e66be7c7effbf1f1cbe76ac5dc90217dc807d58 SHA512 fb64ce4d38c7327b2e4c0ef66b356f63077d955f2c3c468fb9fc300d866d03f185454a392e8080e785c4d73cf7343d4bb514dfc575d60071ae32fe5fade80b5d
-EBUILD pidgin-2.14.6.ebuild 7528 BLAKE2B e52ef0a392052d35a9d5baef958e8e090212d7fd51aabe20648dae787cddc0cc84c1ef46d99deff8cfd7e29f64c4677aa7a495d052198764c90d05d75fb70113 SHA512 e78ebfd31d3297d6c4932622c02762d73ab6c5ea195bd509ab8262d91eb77e3c1df649b251da3516139420809a8bd2f49f7f7c784a43d5f4cd642c4b8f66f6f2
+EBUILD pidgin-2.14.3-r2.ebuild 7892 BLAKE2B 2ca7042ea5e1c1c8b43d98921b164ac46024892e9d013a2cb2901f3fbe4d2062933f90d5a4b7842b20ef02325986df5f570a61eb04d7074b95dac29d46a21dd7 SHA512 0e54da4e56dbe215cd5d06e1daca6ec8ae9f5200a3c887a263da40f0a1ea66e28d4d68a7e31bad16f78b121d1d66396d1d5242d99e288c600b5928fa6ea84776
+EBUILD pidgin-2.14.5-r1.ebuild 7558 BLAKE2B 1cad17311a17cf600f9ca3473108d43b9d94f7375663ad6e3b483b46a8b94e8f811066c73b5b736591061e520ddcbc24d2d1200bb659b26e411ae1e731a4b60f SHA512 23b23f488475e17b351efec647d13d875f692b53eef32af1620d921b8441e90c6947c42ebc536fd2ad25e9a04ef4a6f541ff57cc6420fab6dbaa7262a7fda407
+EBUILD pidgin-2.14.6-r1.ebuild 7524 BLAKE2B 667cd32d96a26e121eab48311fcf81ccf2dc33a5f3f9407c269de3edaca89bc54e5d2f1ff08282651e8f4811cad6673fd432b2690550ce7bd87c4cd83e2a9754 SHA512 f76eff2b24246254f1e6039b881cbb778a611d0023efa75d21c3d14e763271144f6d9c459458185dfe2982a70f2f0a67b524bfbf4d79400cf3804d9f3c18abe1
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.14.3-r1.ebuild b/net-im/pidgin/pidgin-2.14.3-r2.ebuild
index 195abc7995c5..fca4c0679d35 100644
--- a/net-im/pidgin/pidgin-2.14.3-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.3-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
 
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2.6.18
 	ncurses? (
 		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:=[unicode(+)]
 		dbus? ( ${PYTHON_DEPS} )
 		python? ( ${PYTHON_DEPS} )
 	)
@@ -56,7 +56,7 @@ RDEPEND="
 		>=dev-libs/dbus-glib-0.71
 		>=sys-apps/dbus-0.90
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	perl? ( >=dev-lang/perl-5.16:= )
diff --git a/net-im/pidgin/pidgin-2.14.5.ebuild b/net-im/pidgin/pidgin-2.14.5-r1.ebuild
index 602e11022512..21139390fc9e 100644
--- a/net-im/pidgin/pidgin-2.14.5.ebuild
+++ b/net-im/pidgin/pidgin-2.14.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
 
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2.6.18
 	ncurses? (
 		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:=[unicode(+)]
 		dbus? ( ${PYTHON_DEPS} )
 		python? ( ${PYTHON_DEPS} )
 	)
@@ -55,7 +55,7 @@ RDEPEND="
 		>=dev-libs/dbus-glib-0.71
 		>=sys-apps/dbus-0.90
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	perl? ( >=dev-lang/perl-5.16:= )
diff --git a/net-im/pidgin/pidgin-2.14.6.ebuild b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
index 1d200e58f3cc..a9ab6bb11e2b 100644
--- a/net-im/pidgin/pidgin-2.14.6.ebuild
+++ b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
 
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2.6.18
 	ncurses? (
 		>=dev-libs/libgnt-$(ver_cut 1-2)
-		sys-libs/ncurses:0=[unicode]
+		sys-libs/ncurses:=[unicode(+)]
 		dbus? ( ${PYTHON_DEPS} )
 		python? ( ${PYTHON_DEPS} )
 	)
@@ -55,7 +55,7 @@ RDEPEND="
 		>=dev-libs/dbus-glib-0.71
 		>=sys-apps/dbus-0.90
 		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	perl? ( >=dev-lang/perl-5.16:= )
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index 9a52e6545836..4e170dc96234 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -1,3 +1,3 @@
 DIST profanity-0.9.5.tar.gz 830966 BLAKE2B fc1b755b1a92dbde62aacb31cb5d9190cea951e98501a5b48495dbd31266f343cf436de1fa0f69caec34324cd1f781d0bd4f5f7ebdd984324c5d1d6edb91452a SHA512 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
-EBUILD profanity-0.9.5.ebuild 1032 BLAKE2B b33c741b25c04ed7e9b70f24612aff0ce7cda6e62b5a9c2b54b0b966bd0c6cedf3f41338dde60a9750b42901339b4eb655abb7c5394f75551172f3bf49ffdc17 SHA512 04cec15cf7803d180e21d412b19fca734a01f8fb16e3c3b8552f1aa77d9b695fc445f66ed7e81b7ca0f611ea77d81a5c35cc3f8be76c054c89beb87413355417
+EBUILD profanity-0.9.5-r1.ebuild 1035 BLAKE2B 94078ea301009255f2b9b57b0835558ebc797ad3c0c75393be2c95c4b368832dabc0be1d596e45c2b421e3c2e58ea099d0238c55dc9a9ceaf0ccc3519b4c96ce SHA512 c21319345910123603041d916f0712c4eac3851bb71efee3906d8e2423e2aef3032139bb663ce3a4d2bcf13254456c03948a10511ef8dc2d72f214f023db19ed
 MISC metadata.xml 605 BLAKE2B d26bea42cbf668507f197cc43a131cebc4a2569806e2789f608c68d41ff3b8b679ed1ad9cdd9df706e539cea71150f8b13157c1750aa313e1b1067f968b8eb3f SHA512 bf7004fa94e5515e3e54da31797e52d13096483a1d7f356fcccb0ceff1d3ae4c157929aadd4ccf24d54078070ba8ba94e3d6e641f85fa5c30cbd113cd487eae8
diff --git a/net-im/profanity/profanity-0.9.5.ebuild b/net-im/profanity/profanity-0.9.5-r1.ebuild
index 9b0fc0ae5fdd..24acf02ba694 100644
--- a/net-im/profanity/profanity-0.9.5.ebuild
+++ b/net-im/profanity/profanity-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	dev-libs/openssl:0=
 	net-misc/curl
 	sys-apps/util-linux
-	sys-libs/ncurses:=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	gpg? ( app-crypt/gpgme:= )
 	libnotify? ( x11-libs/libnotify )
 	omemo? (
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 7d8f00ba9b18..0843fc92976e 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,7 +1,9 @@
 DIST skypeforlinux_8.72.0.94-1.x86_64.rpm 118230043 BLAKE2B 9d7d8609c117947fbab4e2ac68a9bbe909f94f2ae82bc910cad66412aaced2ba13f35ce785a4f0d95690125c42789cbc4bbec6831bc0038add7fe7a98469f20b SHA512 349550d69efce07e3c9fa92ea659fc0d4b87e4e110c0bdfac9ecd365685b4d5623362b315cb3eaab7eb91078dde7e1c286165ce487e8b93585e59272e8cca3e3
 DIST skypeforlinux_8.73.0.129-1.x86_64.rpm 123370656 BLAKE2B 831188ea01a8ae27b6c5b557f7e752740a3f32928bd113bd6d8fffd31badfbff4a8f088e8e0b8fdc1b1b133ff5e6b692db3b83df4669da5d92725847a3555280 SHA512 153afbf9e7b3ad8d3ca9002835d54038e8450868df2506a61cd278ddfe3329241a913d0caef9ad0179c3f8a6a2d8f7138e4fff74c7ef7b12ddbdbe60f78e58a2
 DIST skypeforlinux_8.73.0.92-1.x86_64.rpm 119323419 BLAKE2B e201be43c6f331555d3759e9484d13c1d0613dd9e60ce67c3dafec27fa9d183ddc89e1c23feb1722ace2fd492185f8402be6abec80c748e6ad1f666878a72025 SHA512 dc6b72dc43443ad7747a30adef7b08afb50b4cc40a61cff2eb8989c9f68ae817c221d4ce2812d5d54cb9a4ac5f2accfe350efdfab622096d2d0805953fbddd13
+DIST skypeforlinux_8.74.0.152-1.x86_64.rpm 123390893 BLAKE2B 746f1ac2f777ff79a47444052fdad86d2a67f7278eb809d57fedc681ca5648320d16b32e100b50b36bcaea853dff266eb0b47bdb9c8ba48582c63a09b3eeabda SHA512 f1c40c58305cecec899f9be1a477103ff9dc7e0d02ea68a9ebc15b4e80292d5a3925fbcf6451cae0c2b854b3b3f74abe101715a7f3afdc2ea954e18759cab37d
 EBUILD skypeforlinux-8.72.0.94.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 EBUILD skypeforlinux-8.73.0.129.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 EBUILD skypeforlinux-8.73.0.92.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
+EBUILD skypeforlinux-8.74.0.152.ebuild 3160 BLAKE2B 4ada892e98d1c7c911ee821382f57bf8d17748862143a2e178a5e4402ea3bb13a63d65b4719ff4126d4005cfd28b3ab5ceb5d0fee697dcf5509d717ac8fc5f0a SHA512 978a18853d478585145a3187ab242d33785a79f7f67cd97ac51e3fea67b6e2717e0cc04e1bab0b800e95f46b6ce288e8606b4ea86bfec2b53e419e6f7595db69
 MISC metadata.xml 460 BLAKE2B 136f61594a68e6efed725d448cd9fcd0e0c72f884cd64ef5f8c3adbc39fd4322a4ed8ef692fa500bb00488e616520efdec943be7c4d0381345247776a8258d42 SHA512 d82b35cfa2dc12b2629f7084f071d3d3cd83e2d6246cb4c2544883f28becde6677a1739f7c028e69352267561441419d135774daa1177a803d485d38880191a8
diff --git a/net-im/skypeforlinux/skypeforlinux-8.74.0.152.ebuild b/net-im/skypeforlinux/skypeforlinux-8.74.0.152.ebuild
new file mode 100644
index 000000000000..a44feb7c8927
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.74.0.152.ebuild
@@ -0,0 +1,99 @@
+# 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/libxkbcommon[${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/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 151f64c601fd..6520c15e49a3 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,14 +1,8 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
-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 tdesktop-2.8.9.tar.gz 15383963 BLAKE2B 2b156a5b4557c4aa5f358dbc6105cca2ff9d838160e71d6476332c2d4d9b78ea13b659cd95e7620e854d3116e44c537d2080dee424f6a942a0d9c0aa97c73e0d SHA512 537177e47d37772ae623ea4cca68df1e068362edd56a9af86fa02cabc44693403afe020460af709454148333711a34f34169dd239a9ef56e9996b5b0b44ef9c5
 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
+DIST tsetup.2.8.9.tar.xz 38714912 BLAKE2B fa1049d2c921dd8e7bfcf4777c5017ec1deb3508d24c79250dae774194c7e4e26bcc9313378e6c58255012baef7302545cd12a70ab64d908d68ef1475af1677a SHA512 b8c6ac6be16b4bc143c17c711ee46c73c986712f0fd89e3d4467f108c3b9e675f83a479569cf5cfc06c81c581080b75c2610fecf54644e600985d9b650d2f55a
 EBUILD telegram-desktop-bin-2.8.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
+EBUILD telegram-desktop-bin-2.8.9.ebuild 1327 BLAKE2B e60335f603996ebcd6d52896542d170ce624db0ef870b79e25903513d9f15975e4541b9c2b942ee204fa0d5c6b2b725665dbb19c6efb9c875531f1229e1364b2 SHA512 3be2436e171b335d1e92f52778e1a9c8fa504c62c46a1068a0c47ac570417c195084d6eb1a65038eb360b26d2dca6fb7d9a44154d97e1050960523576ae4fa30
 MISC metadata.xml 616 BLAKE2B d92266b23ce1be2d3180a55b0723b6ea1bd2383e95ca7b216f845b13b5b86a23f44ba42998c13de91bc6b468ba5d0b0ac04a8093454fd512c9a2c3daf3106c17 SHA512 3db845ccdac1b80efeaf903a82bd11a23df8e93458143fb82499053a14a1bed515380d96a2c32f1ad94f58107b61453e8dcdddb4ec71fd570fd04ff35bc9ca21
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.1.ebuild
deleted file mode 100644
index 6821536278c0..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-bin/telegram-desktop-bin-2.7.4.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.4.ebuild
deleted file mode 100644
index 6821536278c0..000000000000
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-bin/telegram-desktop-bin-2.7.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild
index 6821536278c0..5d9bb593c191 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 	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
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 6a15a2f9a7ac..bc4090bc2325 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -4,13 +4,13 @@ AUX tdesktop-2.7.4-fix-disable-dbus-integration.patch 494 BLAKE2B 75e8be933873cc
 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
-AUX tdesktop-2.8.9-disable-jemalloc-separately.patch 3723 BLAKE2B 1597dff53ee7a7045b0216ef263fd4c10656a270d0b4fdc3fa9827ba8f2d58288e053c230910717e892854fcf7bb7513b08693d8377f301f5a9d1b74d71d9eb3 SHA512 7cf20bd994a48322f9d3034617a5bf041a1ae7ab5e7cc3da0ac2a9e741ca74975dc5a4188036412317fc77da6b7badf56c582f831daa6a1badfcfb82b6cc2bd3
+AUX tdesktop-2.8.10-jemalloc-only-telegram.patch 973 BLAKE2B 6efc62db44ea8d26f469d937fc91135c77eea38e6e51b1c6cc772bc91afb7372292731b0369544ea52f67075ce9800fdcadc150ec72df571c29f2818b88cc56d SHA512 754e7286aebd183891b3808b66979df4b8e62355147a8f6bd860bf37360e089928247073b7adf9fc8d09ed4edc35746e50a4eff3d0bdc2d74888e8cb74042cf0
 AUX tdesktop-2.8.9-disable-webkit-separately.patch 4643 BLAKE2B 7d84cedd4b7b5879fb402193774e40c2b72f6028592e4dc1df1c4a9002dd4e9cbaff505dceb77e443b84c26b4dff6abfc5a99ff28699fb031cc9cb0ea3612280 SHA512 fc3da934e04d19b6f1be42cb095e3aba2a13f0e6a14164558f3da45152b9fa19bc8235d08fd6537933b9fb25d7aee27ec7763173e6395f55bcb9869f71b31088
 AUX tdesktop-2.8.9-webview-fix-glib.patch 1838 BLAKE2B 16b861f0fda72ba1725779880eb67b3adfd0a3dad4c7614beb8f96fa55fecc613f248477557569904c44e6875adbf7912ac9281f1ff71b4b8a6e5d97f9f71e97 SHA512 c3932b6471150d71469606bdbc93d26b57e8eb556e24df9366bad9e51aed073ab18dd7ee14b7445f8df180806a0ca591afdc8c00b0ce34db29575d2dc114b58a
 DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14
 DIST tdesktop-2.8.1-full.tar.gz 37129127 BLAKE2B 06f2a3050f0e0f321c766c54e19faf3ea172c41088e2ffdbb5928a41ba01de1fc845a84addded17d113316857c68f265642a8ab32feb79a87beef548c739b56c SHA512 df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69
-DIST tdesktop-2.8.10-full.tar.gz 37105631 BLAKE2B 71a08e0d2fda90898e711dd285478e565ddf7f6bd71db8910688c7f0bb550f04136cb3ccec101d5e89860471ffdd7a868dd90a6317924e96c8ad558d4e3079f2 SHA512 910e34718a061d643937393fa105f2236549059eaecc56aab1203a0efa3a7538f7a2d9b432c8b0a9269118ef3bff56dc1edf856476629efe666d16851e68932f
+DIST tdesktop-2.8.11-full.tar.gz 37105468 BLAKE2B 1ec5a0003bd1b948b45213509fa0649dfde5ec8e3dff097bf45aa0951c7963930788b0bee853f286d04b008b78704c464b6614b8391350767affebc2623b25af SHA512 a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860
 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
-EBUILD telegram-desktop-2.8.10.ebuild 4492 BLAKE2B 1499b0b473e0d4be84048009de7279a6b47795b9242ec2e3eee3e126f7902bb67963e22888cb10a67e8fdc33589d6591cf9905c38f1a3e8b68a84a2c84dd3fb0 SHA512 258dcacb57cb3326d4e17638c593f71227d8a277e9255183be6548c136dadb7d9e925618df37066611cf121c5647a6b58000047cdde6020eb992215b2b2e9345
+EBUILD telegram-desktop-2.8.11.ebuild 4340 BLAKE2B 276357e4e6783eee86a125490deb8ddd3e759df56162a65b5f4762ef69f92c92cb757230c997d7aa1a3d13640b1ed949c535450d2f3cbecd67c0d6e283cf5413 SHA512 492610a0170b36b29fe2a64ea4bb6780004499bd3ca87951e362471aada0967c6ce0cfc29e0f0561b5e9e2a1ffc75a56081acd7aba0a4710a939a62aa9e4ec76
 MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f
diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch
new file mode 100644
index 000000000000..8604acc6a74d
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch
@@ -0,0 +1,31 @@
+Only link jemalloc for the Telegram binary
+
+Some combination of factors is making the different codegen tools hang when
+jemalloc is linked for those, and they're ran under portage's sandbox. Since
+this is only used during build-time, and jemalloc is merely necessary to
+improve runtime memory use, it's unnecessary to use it for anything else.
+
+--- tdesktop-2.8.10-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-2.8.10-full/Telegram/CMakeLists.txt
+@@ -87,6 +87,7 @@
+     PRIVATE
+         desktop-app::external_glibmm
+         desktop-app::external_glib
++        desktop-app::external_jemalloc
+     )
+ 
+     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
+--- tdesktop-2.8.10-full.orig/cmake/options_linux.cmake
++++ tdesktop-2.8.10-full/cmake/options_linux.cmake
+@@ -58,11 +58,6 @@
+     endif()
+ endif()
+ 
+-target_link_libraries(common_options
+-INTERFACE
+-    desktop-app::external_jemalloc
+-)
+-
+ if (DESKTOP_APP_USE_PACKAGED)
+     find_library(ATOMIC_LIBRARY atomic)
+ else()
diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch
deleted file mode 100644
index dff2455d4e3d..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-jemalloc-separately.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Allow controlling the use of jemalloc
-
-Jemalloc is often controlled through USE=jemalloc in Gentoo. Removing or
-replacing it is trivial, and I'm not aware of any particular advantages that
-come with using this allocator, especially for an IM client. Benchmarks
-regarding this allocator provide a huge variety of results depending on the
-workload and system, so it's hard to establish when this allocator provides any
-tangible advantage.
-
-Considering things like Hardened Gentoo, the user might prefer to use a more
-exploit-resistant allocator, like GrapheneOS/hardened_malloc, and I've heard
-Musl is hardening their allocator as well.
-
-I trust the user can better judge if they need this in their particular setup.
-
-If a telegram dev is reading this, feel free to drop me a message (metadata.xml
-contains the maintainer's address), if you believe it should be forced due to
-usability concerns, or if you can provide me with some context I might be
-missing. Jemalloc is currently enabled by default.
-
---- tdesktop-2.8.9-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-+++ tdesktop-2.8.9-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-@@ -48,7 +48,10 @@
- #include <gio/gio.h>
- #include <glibmm.h>
- #include <giomm.h>
-+
-+#ifndef DESKTOP_APP_DISABLE_JEMALLOC
- #include <jemalloc/jemalloc.h>
-+#endif // !DESKTOP_APP_DISABLE_JEMALLOC
- 
- #include <sys/stat.h>
- #include <sys/types.h>
-@@ -727,8 +730,10 @@
- namespace Platform {
- 
- void start() {
-+#ifndef DESKTOP_APP_DISABLE_JEMALLOC
- 	auto backgroundThread = true;
- 	mallctl("background_thread", nullptr, nullptr, &backgroundThread, sizeof(bool));
-+#endif // !DESKTOP_APP_DISABLE_JEMALLOC
- 
- 	LOG(("Launcher filename: %1").arg(QGuiApplication::desktopFileName()));
- 
---- tdesktop-2.8.9-full.orig/cmake/external/CMakeLists.txt
-+++ tdesktop-2.8.9-full/cmake/external/CMakeLists.txt
-@@ -37,7 +37,7 @@
- 	add_checked_subdirectory(hunspell)
- endif()
- add_checked_subdirectory(iconv)
--if (LINUX)
-+if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
-     add_checked_subdirectory(jemalloc)
- endif()
- add_checked_subdirectory(jpeg)
---- tdesktop-2.8.9-full.orig/cmake/options.cmake
-+++ tdesktop-2.8.9-full/cmake/options.cmake
-@@ -56,6 +56,13 @@
-     )
- endif()
- 
-+if (DESKTOP_APP_DISABLE_JEMALLOC)
-+    target_compile_definitions(common_options
-+    INTERFACE
-+        DESKTOP_APP_DISABLE_JEMALLOC
-+    )
-+endif()
-+
- if (DESKTOP_APP_USE_PACKAGED)
-     target_compile_definitions(common_options
-     INTERFACE
---- tdesktop-2.8.9-full.orig/cmake/options_linux.cmake
-+++ tdesktop-2.8.9-full/cmake/options_linux.cmake
-@@ -58,10 +58,12 @@
-     endif()
- endif()
- 
--target_link_libraries(common_options
--INTERFACE
--    desktop-app::external_jemalloc
--)
-+if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-+    target_link_libraries(common_options
-+    INTERFACE
-+        desktop-app::external_jemalloc
-+    )
-+endif()
- 
- if (DESKTOP_APP_USE_PACKAGED)
-     find_library(ATOMIC_LIBRARY atomic)
---- tdesktop-2.8.9-full.orig/cmake/variables.cmake
-+++ tdesktop-2.8.9-full/cmake/variables.cmake
-@@ -38,6 +38,7 @@
- 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_JEMALLOC "Disable use of the jemalloc allocator (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/telegram-desktop-2.8.10.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild
index 69bfb7c3a172..aaa30fc0f334 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.8.10.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild
@@ -16,7 +16,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"
-IUSE="+dbus enchant +gtk +hunspell +jemalloc +spell wayland webkit +X"
+IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
 REQUIRED_USE="
 	spell? (
 		^^ ( enchant hunspell )
@@ -29,6 +29,7 @@ RDEPEND="
 	!net-im/telegram-desktop-bin
 	app-arch/lz4:=
 	dev-cpp/glibmm:2
+	dev-libs/jemalloc:=
 	dev-libs/xxhash
 	>=dev-qt/qtcore-5.15:5
 	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X(-)?]
@@ -53,7 +54,6 @@ RDEPEND="
 	enchant? ( app-text/enchant:= )
 	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
 	hunspell? ( >=app-text/hunspell-1.7:= )
-	jemalloc? ( dev-libs/jemalloc:= )
 	wayland? ( kde-frameworks/kwayland:= )
 	webkit? ( net-libs/webkit-gtk:= )
 	X? ( x11-libs/libxcb:= )
@@ -74,11 +74,10 @@ PATCHES=(
 	# https://github.com/desktop-app/cmake_helpers/pull/91
 	# https://github.com/desktop-app/lib_webview/pull/2
 	"${FILESDIR}/tdesktop-2.8.9-disable-webkit-separately.patch"
-	# Not going to attempt upstreaming this after the reaction to
-	#  "disable-webkit-separately"
-	"${FILESDIR}/tdesktop-2.8.9-disable-jemalloc-separately.patch"
 	# Not a proper fix, not upstreamed
 	"${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch"
+	# Not upstreamed (yet)
+	"${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch"
 )
 
 pkg_pretend() {
@@ -110,7 +109,6 @@ src_configure() {
 		-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_JEMALLOC=$(usex jemalloc 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
 	)
@@ -143,5 +141,5 @@ src_configure() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	use gtk || elog "enable 'gtk' useflag if you have image copy-paste problems"
+	use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems"
 }
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 8cff239745d1..92402a95c5f7 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,9 @@
-AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
+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.6.22045.0607_x86_64.tar.xz 51749804 BLAKE2B 73d37f9118bc8b3dd424ec903e72cb6f1da9c7a8b87319845befe0b4f10f9793ef603481d8e3e6c6af51dd7b342eb5bb157fbb8eb495b48641a70b62ae96534f SHA512 04e7c1b483c769b4d809f31fa615a2fedd3229edba13da7f51231c38a810d6cef7458c6b9aa504097c2bf1b4fbf81df1a6d9e0921dc6df1b9a8cb02038fcdd7a
 DIST zoom-5.7.26030.0627_x86_64.tar.xz 52351944 BLAKE2B d34e11aa148945e9b1093c5f78b5930a58a7e4011b07e1ae3b6873ba0d1b1774ca6ef28fba6678b962e70b7340079dc4795d54e1bf4ce4702fc653a5dd06a21d SHA512 aa0af2d95c8c65a4f1af7a3de6cb9626b8c88f662922ccc7f59fbcc9cc5ba3c3398c50687b381126a3fbd84c9662e926727635fcc50025c834bedb08bcaf9961
+DIST zoom-5.7.28852.0718_x86_64.tar.xz 52589228 BLAKE2B 61337f7722a48b258c13cd389f7bae9d3cbc4c2c3468c7b413bde4a87b24e5f64989a516f3073882cbf70f898b6ad188c9a5876ab3d75e2dd5f688ff94f706a4 SHA512 8a00fb01f5af0dfcc1a9e13058f7d3e492545d827d157effe3d19a0846a53ce2427172ce4b33a95f0420259876b5e16c44122f5753632278e5967ec222657f2b
 EBUILD zoom-5.4.53391.1108-r3.ebuild 3167 BLAKE2B 9aba2dc82ebd4c97f7dc97b6718141e35416316f51111ce145b9844bf1172fea80c3080a1d8ff34964e42742e243d1fc157906e2c55450b39170f01cb36a55b4 SHA512 52fc56dcfadaa4b9822475525a7958d8bbe5351038ee209426e1440af613598bed0f75dabdd79450206b6c9a36564f3ecf43dd3a98182368789744c99a589cbf
-EBUILD zoom-5.6.22045.0607.ebuild 4067 BLAKE2B 34f531a6d88b26c1e87d4435c70f26d958a5d93d56c23bff4beab0718ae21a7c44df9e86ab473c07b934bff77f750e6436f80ad5135dfd83c5f142abf799fec8 SHA512 5869d42749458346455f341dea4baeaae6a4e879696dbfcd68833f6bdb171809b905ecc0b6038e666c50b870ad44718782b0038e573fb7154e2887e20f40a0de
 EBUILD zoom-5.7.26030.0627.ebuild 4067 BLAKE2B 34f531a6d88b26c1e87d4435c70f26d958a5d93d56c23bff4beab0718ae21a7c44df9e86ab473c07b934bff77f750e6436f80ad5135dfd83c5f142abf799fec8 SHA512 5869d42749458346455f341dea4baeaae6a4e879696dbfcd68833f6bdb171809b905ecc0b6038e666c50b870ad44718782b0038e573fb7154e2887e20f40a0de
+EBUILD zoom-5.7.28852.0718.ebuild 4189 BLAKE2B a024abc94ef953f75d770b041adf50f8b2e9f3edcc9dc77f0c9295bcda21a32b503c10aff773cc8866e6d83f27ff8dc5517e2a208f7752de37490dbb9676e723 SHA512 81db6cc78abc3e8939fb030cfe5ddffdd66b98a235de8708716fa92f87f94dea3debd512df9ab1a6f77d1c7502785e87f37b2f7476679f10691b99c97fb9cd03
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/files/README.gentoo b/net-im/zoom/files/README.gentoo
index 06f1f9b3dce0..12e5058b397a 100644
--- a/net-im/zoom/files/README.gentoo
+++ b/net-im/zoom/files/README.gentoo
@@ -3,3 +3,6 @@ display compositing. If you encounter a black window when sharing
 the screen, then one of the following actions should help:
 - Enable compositing in your window manager if it is supported
 - Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)
+
+To enable screen sharing on GNOME Wayland, edit ~/.config/zoomus.conf
+and change the value of enableWaylandShare to true.
diff --git a/net-im/zoom/zoom-5.6.22045.0607.ebuild b/net-im/zoom/zoom-5.7.28852.0718.ebuild
index 514387cfdd02..2d1b6688d0d6 100644
--- a/net-im/zoom/zoom-5.6.22045.0607.ebuild
+++ b/net-im/zoom/zoom-5.7.28852.0718.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
 
 DESCRIPTION="Video conferencing and web conferencing service"
 HOMEPAGE="https://zoom.us/"
@@ -90,19 +90,19 @@ src_install() {
 	doins -r json ringtone sip timezones translations
 	doins *.pcm *.sh Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
 
 	local quazip_so="libquazip1-qt5.so"
 	if has_version "<dev-libs/quazip-1.0"; then
 		quazip_so="libquazip5.so"
 	fi
-	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
+	dosym -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
 	else
-		dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
+		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
 	fi
 
 	if use bundled-qt; then
@@ -126,7 +126,7 @@ src_install() {
 		)
 	fi
 
-	make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "")
+	make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)
 	make_desktop_entry "zoom %U" Zoom zoom-icon "" \
 		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
 	doicon zoom-icon.svg
@@ -137,6 +137,11 @@ 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} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1
+	done
 	readme.gentoo_print_elog
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
commit	b49088575eb777ced2551f484da86317332d6087 (patch)
tree	bf9a151cf2d61956340d555659ffc098ee1da466 /net-im
parent	514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)