gentoo auto-resync : 15:07:2023 - 22:41:20

13 files changed, 315 insertions, 23 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index bf44ecca4846..beef02372c57 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index e462736d387a..a6985905dd32 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,5 +1,5 @@
 DIST neochat-23.04.2.tar.xz 565584 BLAKE2B 7e72214d7bfdb0a30e767ce91116fae71f341c37ef7f830f071a7303e25e35107d2f8c481f05373a8493d06c94c34a4f2d88dc424f3143144e41d8418b9be671 SHA512 f02e1cee3f71211f6dbf319ce983002046af27d08a6a82a41678384f68e5f0602fb18b30cad925deae7f6a0b352e4000e497f800020a89d5331f85557c9abf06
 DIST neochat-23.04.3.tar.xz 570776 BLAKE2B 7d5a9d724ecefc6f64a18629b24c80ef16f1e650ef3e8ae793590c44865d057d6f2905c199337dccf53c551fb4e00a8322238060731e2a3433e5e9e146acef67 SHA512 9e453c3bab98a45fe1d1d7139b574ff25e6d7a78749b38966eec17fa67ff366eea955aa82cde0743135c8ac35ca218a761abced055743545db760d67849e3a96
-EBUILD neochat-23.04.2.ebuild 1470 BLAKE2B 7b5549d6531ee921b3cc65394dec09d4aa2b66e3ee809117c63c3aab7d86ca3706307eb167cba30e0bef4ea934d3c5e9e7eab5173d7af21e07f477134ab167cd SHA512 60e92532465825e1d82b3fb7d5e59ef215690f2b689dcdce9b1be35db003355078466b750b4746882319f06729b9c106d185e52a67ff3d1b3edc132c97ada9dc
+EBUILD neochat-23.04.2.ebuild 1469 BLAKE2B 1639bcb3895f97536c8c25e3b6784ff2165e8766f16a11c6b750210a7a0a3f56b7e94f7725d2943cd8dff258642d75249e32577558d92ad271ffd42451ee499b SHA512 255a85ad5bb5d73a4fb9b9cfa13e03e4379baec3b74c62ac0084704cfe8f6336102ad9ba972588aac996783f99f2553f2faecdd83dee2c495f63a02013da0473
 EBUILD neochat-23.04.3.ebuild 1472 BLAKE2B cbbfcc6e9c94ff5afefbbd93db9a045165a0952cfe71432bca66df93a97219a8402cf1d0997b68ea9c18ee4efbd106a4d3d10d2255686feef9d11de1a1178087 SHA512 4243ba43aef28855100b6fd7328d293a68a507c00d9a215d3b85b11480587fd095a73e1037bafa333f3f0c433f422f041e4db412315abb9258cce9b386f2afe6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-im/neochat/neochat-23.04.2.ebuild b/net-im/neochat/neochat-23.04.2.ebuild
index 24d808c9365e..c475a36889cd 100644
--- a/net-im/neochat/neochat-23.04.2.ebuild
+++ b/net-im/neochat/neochat-23.04.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/neochat/"
 
 LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 DEPEND="
 	app-text/cmark:=
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 37522578025d..34c5973e320e 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,9 +1,11 @@
 AUX tdesktop-4.2.4-jemalloc-only-telegram-r1.patch 1307 BLAKE2B b27f65973a6fa8c83469e0c6419a600ca04ebbf35f6c4a406129867eee644082c4f0164fb71afbc6ae729bb4037d0cf6c68ea1ad78f6268bfe245b83e4290400 SHA512 d2c33dd18e354ebe6cb7143b58e9f61dc4cd664bb1e7ad9c60f562efbb05cc72d5b36270af96b866583b366b59cc34cadee3a62dcbd40433276b80b2511e1fcb
 AUX tdesktop-4.4.1-fix-dupe-main-decl.patch 853 BLAKE2B 6a3ce346467a3b6450674a77157f3fa45d9e1991160ce33e9cc58292a8441310468943225d5d5b2ba5e5c23feaba544d52f19c964130a8e8c724a99392072abe SHA512 edaad94a901181f0bca4a64b4ab2277a247073005b351156df02532dfff470a4060e6b709197da0778b5484d39a4c1bc1f75e9df068872d68209dd47eca9ac54
 AUX tdesktop-4.8.3-fix-clang.patch 2217 BLAKE2B d487e97730032d81e063fd509aa2bea642d471c103da8754b56e9b5096861762f719ef891ae9ba7f7d275247904af616d614e6c5581d6b1b2ac53598ba8bf967 SHA512 e9d603ef61d819e2cbaacdd0e77439ee1580e7613b3867e468f0fc9d670558489915e4c12a30841685af6cead8d44bc6b23f6c839cfc04720e293322f794d4c7
-AUX tdesktop-4.8.3-system-cppgir.patch 1865 BLAKE2B 2f95ded0cca158eb8c6245d72338ef12914965bad04aacd53710293f0ab3f279e884f6e57ddbe689100291ba1a2b51ee2303c108f0e6005bc1292fa5f8a03253 SHA512 62c4233b703ad5016b4f95cc5d399bbad30738ac481d0aaedaf9b8415946d082f8d5acbc09fb6e0abe3c7326f3215d407fb47a5f8df29a982af08e7942012cac
+AUX tdesktop-4.8.4-remove-private-qt.patch 1754 BLAKE2B 60d2c2c0a4fbe85f8715d3aeb1abdfb336f94ec0d61e48e6152f29867fa9868dd5d1d9ded1f2b8e1c7515f4af3d28d67f71d775b5eac81fbf5ebea9363c6b78d SHA512 6697373493800f7f597e507579c6195a5c4c050ccbdd65fe8d78fef945ce79fea3f6b29c2ae413d752201af89ef5ad67e91b0a80db3a48330031c13ef0cddbee
+AUX tdesktop-4.8.4-system-cppgir.patch 1882 BLAKE2B 05073b4cefb6e9cac75906f5beaec8c425fe5fa249494f9b5d29d9d23822f71c7f8c513688101481004b31f4a0cf520d61fab8f5918429e52ed6781d89e269d8 SHA512 179155ef27453bcc9fc46a90d1cfa832c4d9ed76481270e8a6c6eba5ff51ff6fa94ace5cc8b1cb79b494147474ef93100d97767d0442c9802de32a72f61330e4
 DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567
-DIST tdesktop-4.8.3-full.tar.gz 64351425 BLAKE2B b2f18abee66364f9075dc9a924221092b511d092f755ebf44705efdc96b2cbfe71b77a1a375624fa48e072f2b3f9bd19795b456c5f03f236b164dba35febacf9 SHA512 11fdd39319d1fdae07094d0ab2cb919355015bee14567d88daf98f9e5332bfee7a938415800397e6f24224e97f6425fe0a1d7549d7de14b63f84ab7cb7741872
-EBUILD telegram-desktop-4.8.1-r2.ebuild 6502 BLAKE2B 97677472923a77720a1be13ca921ed1e33bd57cf594988e6408e201555665d4ed1689bb4e074feacd1d48dc9e97e580d45651cd585dac86690efd756711b2167 SHA512 dbaed713e5a546538257c7f305d9a44e51b7045b01cdcf9fc53611ed05d82a3551c641a545ab2cdfdacfc2876b9f6055d9b0672d59e4c383295b37fbe047a073
-EBUILD telegram-desktop-4.8.3.ebuild 6519 BLAKE2B 21fc338a23370a8ab4352073154f28751dfd602eb5a8f40bc306d36b232217784c2dac43683a421b109d91ed91a35d61051ada18017b69fb563a9d1396217839 SHA512 ea29af144e883fbaedd28cb2bd13276672ac772591a218fbb20d2f7edeeda5eb9d68dc7638e9f33ab45da2e94e8bd427987169bdf13fd28fb4f3699c005fca22
+DIST tdesktop-4.8.4-full.tar.gz 69090626 BLAKE2B e2c6072b7b90911068ed57ed651176fb4d772f14710d2a4012bda47dae50be7f3050242c3a6950035f3f33a4041257cadac54e639691735f6acfda98c8db8b7b SHA512 7988d047cb72888e303f9902f04bd2168f67fb18a4451e5122ce80b0aef726173f0ee10f83b8bb713a46e02c9ec4150ad6128e4288be432ed3d590011f80e4dd
+EBUILD telegram-desktop-4.8.1-r3.ebuild 6537 BLAKE2B 7cd698ad91e5ce00b4d6dba7a696a4cb9250b1aa696fe446ca08086e155c511b2419a384cbd03179280fd6e206964ac648732f66b64e476f4fcf44abd873bc11 SHA512 703eb9c6afd01d9ffa901dbb1d710bfd8dd9956ade0eed49cec16948a49b1da49cc6af3a81c604c0bf1de3b5b838e4bff65178a99cde99bfae97c911fe9dc917
+EBUILD telegram-desktop-4.8.4-r1.ebuild 6664 BLAKE2B 2f12560bae1643edebc244d1dcd1a04a588427ebe36dd4f136b8c9ac03e402eede3133a7b570b5abb38ffafb32d57c535b4312e5f24a85c08f7f344b5a93947e SHA512 c78bfbc8b972832edd2cfc11d2cef6b029c69f987bc8fc875c6c7c0e7841a547a7024fbe0d17f420b7ba8ef5b56c0ce811168cb9a3f1951f579b6e2ae8d6df15
+EBUILD telegram-desktop-4.8.4-r2.ebuild 6982 BLAKE2B ab3a8274c0534153cffbc3c1b1af33c546a56c8c46179648f7d635ce60080d3e457a8727961c7364ab49cb182d3fd111df13d1bb03fd69d344d63c2f5a9f627f SHA512 15a63bcf6355fe003306f3a98c1b266d89f2695c8a13f1c662ed33eea557bd792f2b2436f30ec060c4f8a4330a7327465b2e37c474c6a195d95e87717ea8a324
 MISC metadata.xml 1055 BLAKE2B a8f873793835f741c0a5efef1c4ef7231b0d2b90b6237093625e351de26e230c6ce5a0eedfb36706bb266ae472370034bbb60a6ef90d05e0f7b4f847c9f0116a SHA512 72d90db2dd9e96ff0f6e6ea2d078242ae6cc6c8ec0afed4df8c84acf100706bbd7cb3bff4d5603a11718250c43ae8d22b18687f4c16676173ca84527f53a5c1d
diff --git a/net-im/telegram-desktop/files/tdesktop-4.8.4-remove-private-qt.patch b/net-im/telegram-desktop/files/tdesktop-4.8.4-remove-private-qt.patch
new file mode 100644
index 000000000000..3dcf17662564
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-4.8.4-remove-private-qt.patch
@@ -0,0 +1,50 @@
+Remove uses of private Qt classes
+
+Currently, this is used to fix compatibility with odd environments, and only
+for Qt6. This causes more trouble than it's worth, because it means telegram
+must be rebuilt with every minor Qt bump.
+
+https://bugs.gentoo.org/908500
+
+--- tdesktop-4.8.4-full.orig/Telegram/lib_ui/ui/rp_widget.cpp
++++ tdesktop-4.8.4-full/Telegram/lib_ui/ui/rp_widget.cpp
+@@ -12,38 +12,9 @@
+ 
+ #include <QtGui/QWindow>
+ #include <QtGui/QtEvents>
+-#include <private/qwidget_p.h>
+-
+-class TWidgetPrivate : public QWidgetPrivate {
+-public:
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+-	QPlatformBackingStoreRhiConfig rhiConfig() const override {
+-		const auto q = static_cast<TWidget*>(q_ptr);
+-		if (!q->testAttribute(Qt::WA_WState_Created)) {
+-			return QWidgetPrivate::rhiConfig();
+-		}
+-		if (const auto config = q->rhiConfig()) {
+-			return *config;
+-		}
+-		if (::Platform::IsMac10_14OrGreater()) {
+-			return { QPlatformBackingStoreRhiConfig::Metal };
+-		}
+-		// We can't specify the widget here as q_evaluateRhiConfig is called
+-		// in QWidgetWindow constructor, while windowHandle is set right after
+-		// the constructor is completed
+-		if (::Platform::IsWayland() // old versions of mutter produce flicker without OpenGL
+-			&& Ui::GL::ChooseBackendDefault(
+-					Ui::GL::CheckCapabilities(nullptr))
+-				== Ui::GL::Backend::OpenGL) {
+-			return { QPlatformBackingStoreRhiConfig::OpenGL };
+-		}
+-		return QWidgetPrivate::rhiConfig();
+-	}
+-#endif // Qt >= 6.4.0
+-};
+ 
+ TWidget::TWidget(QWidget *parent)
+-: TWidgetHelper<QWidget>(*(new TWidgetPrivate), parent, {}) {
++: TWidgetHelper<QWidget>(parent, {}) {
+ 	[[maybe_unused]] static const auto Once = [] {
+ 		auto format = QSurfaceFormat::defaultFormat();
+ 		format.setSwapInterval(0);
diff --git a/net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch b/net-im/telegram-desktop/files/tdesktop-4.8.4-system-cppgir.patch
index 54c79b3e5a0c..d8bd00aae907 100644
--- a/net-im/telegram-desktop/files/tdesktop-4.8.3-system-cppgir.patch
+++ b/net-im/telegram-desktop/files/tdesktop-4.8.4-system-cppgir.patch
@@ -1,7 +1,7 @@
 Use system cppgir
 
---- tdesktop-4.8.3-full.orig/cmake/external/glib/CMakeLists.txt
-+++ tdesktop-4.8.3-full/cmake/external/glib/CMakeLists.txt
+--- tdesktop-4.8.4-full.orig/cmake/external/glib/CMakeLists.txt
++++ tdesktop-4.8.4-full/cmake/external/glib/CMakeLists.txt
 @@ -7,14 +7,6 @@
  add_library(external_glib INTERFACE IMPORTED GLOBAL)
  add_library(desktop-app::external_glib ALIAS external_glib)
@@ -10,15 +10,15 @@ Use system cppgir
 -    set(BUILD_TESTING OFF)
 -    set(BUILD_DOC OFF)
 -    set(CMAKE_DISABLE_FIND_PACKAGE_Qt5Core ON)
--    add_subdirectory(cppgir)
+-    add_subdirectory(cppgir EXCLUDE_FROM_ALL)
 -endfunction()
 -add_cppgir()
 -
  include(generate_cppgir.cmake)
  generate_cppgir(external_glib Gio-2.0)
  
---- tdesktop-4.8.3-full.orig/cmake/external/glib/generate_cppgir.cmake
-+++ tdesktop-4.8.3-full/cmake/external/glib/generate_cppgir.cmake
+--- tdesktop-4.8.4-full.orig/cmake/external/glib/generate_cppgir.cmake
++++ tdesktop-4.8.4-full/cmake/external/glib/generate_cppgir.cmake
 @@ -4,6 +4,8 @@
  # For license and copyright information please follow this link:
  # https://github.com/desktop-app/legal/blob/master/LEGAL
diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.1-r3.ebuild
index 22674e426296..d4aa40df0c04 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.8.1-r2.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.8.1-r3.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
 	!qt6? (
 		>=dev-qt/qtcore-5.15:5
-		>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
+		>=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
@@ -62,11 +62,14 @@ RDEPEND="
 	)
 	qt6? (
 		dev-qt/qt5compat:6
-		dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?]
+		dev-qt/qtbase:6=[dbus?,gui,network,opengl,widgets,X?]
 		dev-qt/qtimageformats:6
 		dev-qt/qtsvg:6
 		wayland? ( dev-qt/qtwayland:6 )
-		qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} )
+		qt6-imageformats? (
+			dev-qt/qtimageformats:6=
+			${KIMAGEFORMATS_RDEPEND}
+		)
 	)
 	X? (
 		x11-libs/libxcb:=
diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.4-r1.ebuild
index cbc4a581fa36..aff33b06a923 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.8.3.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.8.4-r1.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	media-libs/libjpeg-turbo:=
 	~media-libs/libtgvoip-2.4.4_p20221208
 	media-libs/openal
-	media-libs/opus:=
+	media-libs/opus
 	media-libs/rnnoise
 	~media-libs/tg_owt-0_pre20230428:=[screencast=,X=]
 	media-video/ffmpeg:=[opus,vpx]
@@ -53,7 +53,7 @@ RDEPEND="
 	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
 	!qt6? (
 		>=dev-qt/qtcore-5.15:5
-		>=dev-qt/qtgui-5.15:5[dbus,jpeg,png,wayland?,X?]
+		>=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
@@ -61,11 +61,14 @@ RDEPEND="
 		kde-frameworks/kcoreaddons:=
 	)
 	qt6? (
-		dev-qt/qtbase:6[dbus,gui,network,opengl,widgets,X?]
+		dev-qt/qtbase:6=[dbus,gui,network,opengl,widgets,X?]
 		dev-qt/qtimageformats:6
 		dev-qt/qtsvg:6
 		wayland? ( dev-qt/qtwayland:6 )
-		qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} )
+		qt6-imageformats? (
+			dev-qt/qtimageformats:6=
+			${KIMAGEFORMATS_RDEPEND}
+		)
 	)
 	X? (
 		x11-libs/libxcb:=
@@ -88,8 +91,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch"
-	"${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch"
-	"${FILESDIR}/tdesktop-4.8.3-system-cppgir.patch"
+	"${FILESDIR}/tdesktop-4.8.4-system-cppgir.patch"
 	"${FILESDIR}/tdesktop-4.8.3-fix-clang.patch"
 )
 
@@ -105,6 +107,13 @@ pkg_pretend() {
 	fi
 }
 
+pkg_setup() {
+	# Having inaccessible paths sneak into the build environment through the
+	# XDG_DATA_DIRS variable breaks cppgir.
+	# bug 909038
+	unset XDG_DATA_DIRS
+}
+
 src_prepare() {
 	# Bundle kde-frameworks/kimageformats for qt6, since it's impossible to
 	#   build in gentoo right now.
diff --git a/net-im/telegram-desktop/telegram-desktop-4.8.4-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.8.4-r2.ebuild
new file mode 100644
index 000000000000..c58885293abd
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-4.8.4-r2.ebuild
@@ -0,0 +1,227 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit xdg cmake python-any-r1 optfeature flag-o-matic
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+
+MY_P="tdesktop-${PV}-full"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland +X"
+REQUIRED_USE="
+	qt6-imageformats? ( qt6 )
+"
+
+KIMAGEFORMATS_RDEPEND="
+	media-libs/libavif:=
+	media-libs/libheif:=
+	media-libs/libjxl
+"
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	>=dev-cpp/glibmm-2.76:2.68
+	dev-libs/glib:2
+	dev-libs/libdispatch
+	dev-libs/libsigc++:2
+	dev-libs/openssl:=
+	dev-libs/protobuf
+	dev-libs/xxhash
+	media-libs/fontconfig:=
+	media-libs/libjpeg-turbo:=
+	~media-libs/libtgvoip-2.4.4_p20221208
+	media-libs/openal
+	media-libs/opus
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20230428:=[screencast=,X=]
+	media-video/ffmpeg:=[opus,vpx]
+	sys-libs/zlib:=[minizip]
+	virtual/opengl
+	!enchant? ( >=app-text/hunspell-1.7:= )
+	enchant? ( app-text/enchant:= )
+	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
+	!qt6? (
+		>=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?]
+		kde-frameworks/kcoreaddons:=
+	)
+	qt6? (
+		dev-qt/qtbase:6[dbus,gui,network,opengl,widgets,X?]
+		dev-qt/qtimageformats:6
+		dev-qt/qtsvg:6
+		wayland? ( dev-qt/qtwayland:6 )
+		qt6-imageformats? (
+			dev-qt/qtimageformats:6=
+			${KIMAGEFORMATS_RDEPEND}
+		)
+	)
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	dev-cpp/cppgir
+	>=dev-cpp/ms-gsl-4
+	dev-cpp/range-v3
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/cppgir
+	>=dev-util/cmake-3.16
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+"
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch"
+	"${FILESDIR}/tdesktop-4.8.4-system-cppgir.patch"
+	"${FILESDIR}/tdesktop-4.8.3-fix-clang.patch"
+	"${FILESDIR}/tdesktop-4.8.4-remove-private-qt.patch"
+)
+
+# Current desktop-file-utils-0.26 does not understand Version=1.5
+QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop"
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	# Having inaccessible paths sneak into the build environment through the
+	# XDG_DATA_DIRS variable breaks cppgir.
+	# bug 909038
+	unset XDG_DATA_DIRS
+}
+
+src_prepare() {
+	# Bundle kde-frameworks/kimageformats for qt6, since it's impossible to
+	#   build in gentoo right now.
+	if use qt6-imageformats; then
+		sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \
+			cmake/external/kimageformats/CMakeLists.txt || die
+		printf '%s\n' \
+			'Q_IMPORT_PLUGIN(QAVIFPlugin)' \
+			'Q_IMPORT_PLUGIN(HEIFPlugin)' \
+			'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \
+			>> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die
+	fi
+
+	# kde-frameworks/kcoreaddons is bundled when using qt6, see:
+	#   cmake/external/kcoreaddons/CMakeLists.txt
+
+	# Happily fail if libraries aren't found...
+	find -type f -name 'CMakeLists.txt' \
+		\! -path "./cmake/external/expected/CMakeLists.txt" \
+		-print0 | xargs -0 sed -i \
+		-e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \
+		-e '/find_package(/s/)/ REQUIRED)/' || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep
+	# the same state across both projects.
+	# See https://bugs.gentoo.org/866055
+	append-cppflags '-DNDEBUG'
+
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+		-DQT_VERSION_MAJOR=$(usex qt6 6 5)
+
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)  # use system fonts instead of bundled ones
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use X && ! use screencast; then
+		ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!"
+		ewarn
+	fi
+	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
+		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
+		ewarn "to crash when pasting big images from the clipboard."
+		ewarn
+	fi
+	if ! use jemalloc && use elibc_glibc; then
+		# https://github.com/telegramdesktop/tdesktop/issues/16084
+		# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
+		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
+		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
+		ewarn
+	fi
+	if use qt6; then
+		ewarn "Qt6 support in gentoo is experimental."
+		ewarn "Please report any issues you may find, but don't expect"
+		ewarn "everything to work correctly as of yet."
+		ewarn
+	fi
+	if use wayland && ! use qt6; then
+		ewarn "Wayland-specific integrations have been deprecated with Qt5."
+		ewarn "The app will continue to function under wayland, but some"
+		ewarn "functionality may be reduced."
+		ewarn "These integrations are only supported when built with Qt6."
+		ewarn
+	fi
+	if use qt6 && ! use qt6-imageformats; then
+		elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support"
+		elog
+	fi
+	optfeature_header
+	optfeature "shop payment support" net-libs/webkit-gtk:4
+	if ! use qt6; then
+		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
+	fi
+}
diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest
index 7082d21995ca..5cdc92989f72 100644
--- a/net-im/tokodon/Manifest
+++ b/net-im/tokodon/Manifest
@@ -1,5 +1,5 @@
 DIST tokodon-23.04.2.tar.xz 233084 BLAKE2B ab32b4bdc649f0175001173e715bdb5a171d078332109074eeef043d9874c244ed63cb1c6aea6d0bce5c24e85742401b66db7031a77a8a97ce43da2f760c8f86 SHA512 a867b19788a84dfd5eded1170050d944120a928156b1df1dcafeda7377c7b90efc0625cf47477d9181a697d3c1e67ea098a98dfa4f7ada8a5b2ba56b9b4747a4
 DIST tokodon-23.04.3.tar.xz 237344 BLAKE2B 22742d44e2ffa9346753072b11dcba20da163ab11a98d39cfb719cfe271844c994eba5c5dfaa776aa7b35122bfb59f92a401ebab9853dca2f082b11360e42b63 SHA512 defc13e91088affc5c840921ae052b94f6da96dbd935e3ed43ea1b6f330139a64bc53d81e5d31bcbb19d0bef3bfbcda6cb85cdd8f42bba7aa68f8431a64784b1
-EBUILD tokodon-23.04.2.ebuild 1277 BLAKE2B 29c491a60c672b5bee2f284ece57cdd60c0776cb76227c21b36550b42f8379e4157710ffed40bc6f85f4797fe0e33105c507ce1d895a6f7f367d68816d4d4c90 SHA512 caa3b67e2bf4194c1f9d2ef326d160eae8f6503021c0af9fe92dcb6d3b6c1c522e5d5db06c02701390e0fceb592b790b3c941d67cf1706505744a97a9b825656
+EBUILD tokodon-23.04.2.ebuild 1276 BLAKE2B eb7181798dec5bebe61008f0e0f53723198f82d88550f07b16f77984ba10c2239a5aa3bb3e045a606bea7e15d13bd016df725d1c46d7a58ba896a0b2490b938e SHA512 b92084af531b4f29d84e3ae3560e3a7da561e965a960f4eb0b10282f13fbb7cc860fa3dfc20d12838b4848734cca886021239e5a9711e94ddeac00783e8358dc
 EBUILD tokodon-23.04.3.ebuild 1279 BLAKE2B 68feb5c67f55a5c83135dfec8fa613286c5800afed5a247dee897b062d875cac894a182fd11fab133c5073851e07f05ea0f732791db76b308c3233284bf6a311 SHA512 e859036247f52f96d4c50c763fc96737dcbcceaca121b691f918b545612da28bbdda474d99315eca925dac957cd27a0cd3cc06a13991595d7af3917bf41ee8b8
 MISC metadata.xml 377 BLAKE2B e70a23a324a1d14fbba036ceeeb7e5a974eca12759fee38b1869fd486f2386f4552c5a0172b4c13b937da414b6cf3bb762cea06a553447868d21911c9946b06c SHA512 914e345e6869d9d18210855bb27cc02206e62fcc4917be7968411f9b82d640ac71d40d07f3494a756971cc1412de529cf4b12a9ae47852208dfbe2920d56c3b3
diff --git a/net-im/tokodon/tokodon-23.04.2.ebuild b/net-im/tokodon/tokodon-23.04.2.ebuild
index f64aa7d284f5..ed97b28b7ef0 100644
--- a/net-im/tokodon/tokodon-23.04.2.ebuild
+++ b/net-im/tokodon/tokodon-23.04.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/tokodon/"
 
 LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/kirigami-addons-0.7.2:5
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 1176654c53dd..6e367117352b 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,5 +1,5 @@
 DIST zoom-5.15.2.4260_x86_64.tar.xz 177327616 BLAKE2B 4c0b73fe7b3cb70cbef4e3bb6c8838afefc9f0202b4ad391bf07d15e26b6a959dd74766474fb420bc1682b6eb0a2cb8fef881021edf511e07c7aca3d66ec3df5 SHA512 f297ad46cf144de25f430ba662b388102f981b2183db7585f5aff49e776c8f1f30141c610962577eb00412e381b360085071888482d80444edcd27b206c1310a
 DIST zoom-5.15.3.4839_x86_64.tar.xz 177317572 BLAKE2B 806cb89ccc8ba61c1b9be15ebe1ac040616ded0f6bb3944616b8910f51bb5d1244953af7d523519ecf89be9548ab09bf09d54c546b516e7405e062ce49f67c31 SHA512 5605789ffa2246f6037e816a11e9ff10a397560264558453d85f8d9af8fccdd4be0c4eb1f0824c1029d94d4984afc89c0857604afa8fe9815bfe17a884dd2074
 EBUILD zoom-5.15.2.4260.ebuild 5716 BLAKE2B 6c8c518a5427802272b9b0e86263a7811dc877bf63172379e9c651d09a1b7babdc58dbb3f324ad7d32b23035e4f036bd86014403fc02b20410abcaaa4b6aecb6 SHA512 dbbd0764288b1e9c56340047a517120de2c8c26ab6f54349b55bc6d2f0fb8010c49129a3974223d9c925404a364b1a4283bc8bba751c629b7938396299478ab6
-EBUILD zoom-5.15.3.4839.ebuild 5716 BLAKE2B 6c8c518a5427802272b9b0e86263a7811dc877bf63172379e9c651d09a1b7babdc58dbb3f324ad7d32b23035e4f036bd86014403fc02b20410abcaaa4b6aecb6 SHA512 dbbd0764288b1e9c56340047a517120de2c8c26ab6f54349b55bc6d2f0fb8010c49129a3974223d9c925404a364b1a4283bc8bba751c629b7938396299478ab6
+EBUILD zoom-5.15.3.4839.ebuild 5731 BLAKE2B 5b45f8739817d78dc456c3486e913914f9a9e384dcbbfdfccb778bb2cd6e046167716b6980ef52a0ffb68ca1a9b9af0579e7765420b36a7eb8e8f81c7e077ed5 SHA512 cb39995a999dea609cda9f5c1088e98e502a9fd12ee96b3214221b0e368637ff145a958e6dbb9ab5eaf2cbb86ff68f288a5a2416a241e7dda6e00ee1d3b4a720
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.15.3.4839.ebuild b/net-im/zoom/zoom-5.15.3.4839.ebuild
index d5834012a981..e8bd0b000b49 100644
--- a/net-im/zoom/zoom-5.15.3.4839.ebuild
+++ b/net-im/zoom/zoom-5.15.3.4839.ebuild
@@ -34,6 +34,7 @@ RDEPEND="!games-engines/zoom
 	sys-apps/dbus
 	sys-apps/util-linux
 	sys-libs/glibc
+	sys-libs/zlib
 	virtual/opengl
 	x11-libs/cairo
 	x11-libs/libdrm